gentoo resync : 27.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
commit: 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree: 4d26462d027b14926335894749d2e01d982234d0 /dev-python
parent: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
319 files changed, 4105 insertions, 2931 deletions
diff --git a/dev-python/Faker/Faker-6.6.3.ebuild b/dev-python/Faker/Faker-6.6.3.ebuild
new file mode 100644
index 000000000000..44adab5d87c2
--- /dev/null
+++ b/dev-python/Faker/Faker-6.6.3.ebuild
@@ -0,0 +1,28 @@
+# 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=rdepend
+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 78f2747c2b99..ebe8221adc7e 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -5,10 +5,12 @@ DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c282166
 DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47
 DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a
 DIST Faker-6.6.2.tar.gz 1115505 BLAKE2B 40bc09cafa1dfdda05bbf6c78380c5c3c0de85157dae856251063b0f099e32a08009a223dff70e3b3c037d572e4249cfee942b8749f78bd52506191dc180a13c SHA512 b6b75fd1891644e49d47acacfab9e705540003f18a8df413683e7ff0a3fb1283ede9f6020b19aee1a242a4a002ac1a34713701f283aae2089ee52d84c00764f4
+DIST Faker-6.6.3.tar.gz 1142318 BLAKE2B 7708b5fe576adee33bdd86076bd3bbf6ec785822183ac070ac8dad045e238291cb42367342b2d8ccb9bec4e36fda77680cfd08adedc7caf165e682d96ad833cf SHA512 d846e2a51f5b40d067abf4baa36aca3a8dfbaad585ca61c7146a33fb42e255a1a8ce173f74a379c5701b5aee02987bb89e0670287347ca866cacba93d0936dbf
 EBUILD Faker-5.6.5.ebuild 797 BLAKE2B 79802fa2f75b54f955f02417689548235864e29e38d53afca8e80f5c9d07327daec7f9a877440420ddf80a3e63a873744cffabc9022715519abf75f4f4660a69 SHA512 4d4cd1bb4f17dfbcd41eec4e5dadc73d66438ae552ff7be1ec3dba2f8a61c13d902f857185df3d3083a53adf144ce4407d2ca95be6cb7d3bf3661326bf478501
 EBUILD Faker-6.4.1.ebuild 682 BLAKE2B 592c09b3f0caa3336c660c348a9a2cb09f6eb2e97a5d5c7594fd4d8d884062cea8f16d5c27867b282f59565dc0ad075832866f386158d6ab553ff68126f5555a SHA512 dcb4a5100c6b5779d283890a98c4bca15a1d77051e82802c0d4ab3eb264b2fa89b3230958b02071e367b65a9bf489a2de7c13aa79bb901ac886b4dc03001cbfb
 EBUILD Faker-6.5.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-6.6.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-6.6.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-6.6.2.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
+EBUILD Faker-6.6.3.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f0c88fe75d38..60822b9b43e6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 642b36352944..dfb39976b01f 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,5 @@
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
+DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 EBUILD PyQt5-sip-4.19.24.ebuild 2050 BLAKE2B 27b6b0e239c8a3bd6c6baad5fdcd54841efd837c964871c23e2863b0119c6c422a4ffd700ad7b86669a72be6265894ddf4c81f61493ce8ba9f9cdde9ce971d38 SHA512 e9456fddec595c94939fda72c2ccc9d1ab74ffc81cdaf96bb18af9dc1d80a416c2c535593cb1c66ee7277fa2742ae612efb29ad61078560bbc66c8663f28155b
+EBUILD PyQt5-sip-4.19.25.ebuild 2054 BLAKE2B c7e8afab358629231f45960fce9fe0eb06c04a0b9a636a06e79b8d8fbe595e0c03aff4921f6ec8b26f79e4a1a73f802808d70b6f3a1a7d6a9fba181458142550 SHA512 2546957e724657684f1373304a4f40098b1a768b89822cc36787db2b4edd2cc70c4836a7e14c80e045ef13eee2f3447cca9162255c09e7472e3cac1df00e718b
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
new file mode 100644
index 000000000000..b58bf735689c
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.25.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="Private sip module for PyQt5"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
+
+MY_PN=sip
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
+SLOT="0/12"
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!<dev-python/PyQt5-5.12.2
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
+	default
+}
+
+src_configure() {
+	configuration() {
+		local myconf=(
+			"${PYTHON}"
+			"${S}"/configure.py
+			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
+			--no-tools
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+	}
+	python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installation() {
+		emake DESTDIR="${D}" install
+	}
+	python_foreach_impl run_in_build_dir installation
+
+	einstalldocs
+}
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index eadb7e73c650..4559fd59a413 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 1251 BLAKE2B b0282817a22e426b7aec570d23b877cf03975addf3d9422b07fcf1e690a5356f9bbb2acbc347666c1e05512ac70866e318097b53e4ee6c4714ca746f4b98d43f SHA512 a2a3b0ee330339c7240843806e32dea8028a3935433567b9cbc7fadfa9857047cb77a4768ba0df46dfcdf74aac67e08970f7477cde668640426d88cf2b12f440
-MISC metadata.xml 499 BLAKE2B ed49272da46497a0f3801982987b2ca067d14fd5b062599741f196c4497c7f5689723bd56cb6f071404efd94725cb8e6091bd4207c9cd7d1ecf6ec5768385070 SHA512 0d0f290e39aefa9bc99390fbb6193e4e6a88bb573b4fd338116ad81930310366199368ff97ae1b9559acf4189fc69045cc6106fd47833bd1ffd78a21bdd9d3ad
+MISC metadata.xml 524 BLAKE2B 10bf143a946a442804d9c53707b5f38e541f3ee95c21647df87d1c492ef230a455a6b895ee1fdc57cf2e7e3fa59c0dcdab55ed9d4583935def2aedb95cb0c80f SHA512 d1132eca2cb2856c99e00e5de8aea5fd554419499c2c867df513b832ed4d2326762ec460ea648a7a1fc8196f38d1c85a18a0eac2d1bed2b4a6e5c9e007268d6b
diff --git a/dev-python/PySocks/metadata.xml b/dev-python/PySocks/metadata.xml
index 60c80b67d4ad..3c41a6b6471f 100644
--- a/dev-python/PySocks/metadata.xml
+++ b/dev-python/PySocks/metadata.xml
@@ -5,12 +5,13 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
-    <remote-id type="pypi">PySocks</remote-id>
     <maintainer status="unknown">
       <email>anorov.vorona@gmail.com</email>
       <name>Anorov</name>
     </maintainer>
+    <remote-id type="pypi">PySocks</remote-id>
     <remote-id type="github">Anorov/PySocks</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 1afaa18437f1..4bc7f2fbf45c 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,7 @@
 DIST aesara-rel-2.0.1.tar.gz 7975083 BLAKE2B 6dfeffb5abbd2a9b8097b9f91b537f215b1d2ee8ec9d2ad2abcb823761b722c2e4de75843c74584445c96add175366ac4e2a62eced88ad75c58d0c31f2b4df87 SHA512 8dad298ada2d4a20151cf86c08424b02e1c0afc5060915844ba06a492866b04225e6cb0407bf1de8d651c0e7ed8bca34e184f2f9a2778a66ed41f08d4b51bfd2
 DIST aesara-rel-2.0.2.tar.gz 7974102 BLAKE2B 53ddfada4304776694553d491e80a8b20cec5b5b46819adcc099a7b4cf32dfc68b46d83ba7b769f22f0d088a42e8de269c3385aed4e185920a37c4a349b4a1d5 SHA512 f8f34a1750b5ad250e9243fc0d47f19cd0f8847650e98ea3cef6da03d5a50b884d03e7b6f5cab36d65948a6dd904742a851ac8ea475a0113eb9cbe230a5c834d
+DIST aesara-rel-2.0.3.tar.gz 8019978 BLAKE2B 5e3a7cdca08569a06b7731ff55894c618599c1ebfbaa168cae2d5b8d5b29c5a638b96daa934e663b7cdca6a10ca4b32562c26ab5d240d741ba869863b1701ef4 SHA512 a72c142f9eb1dae34eb0ea172dad7758771e9e8da471a2563798b33fc622e26210f0081013b9a6fb61a927e9ca07e53399ced1fcedc4648f6d76384a3c5c386e
 EBUILD aesara-2.0.1-r1.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
 EBUILD aesara-2.0.2.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
+EBUILD aesara-2.0.3.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
 MISC metadata.xml 402 BLAKE2B a82c76dff3cfcbf83936f2815e15d051d4ab26a739a970848573f5856610e763d9f346e2d265b2d38e53460df6bcba879ce50d6e60bffea77af6052d03d8dc5d SHA512 f3c86b74cbaaadb63bb98ffc2a3e6e1d121c141b33edd574cfdee3652a43e9f8b05e3276050bd407f00ddbec1d6fb6eda87983520075ad368ab8792e0ae17143
diff --git a/dev-python/aesara/aesara-2.0.3.ebuild b/dev-python/aesara/aesara-2.0.3.ebuild
new file mode 100644
index 000000000000..e637143ab45e
--- /dev/null
+++ b/dev-python/aesara/aesara-2.0.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 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 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 --via-root
+	pytest -vv ${exclude[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+# 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/alembic/Manifest b/dev-python/alembic/Manifest
index de7124c94e4e..dfe321bda226 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,9 +1,9 @@
-DIST alembic-1.5.4.tar.gz 1133598 BLAKE2B 88e1f40ef1935b90de789f1adc99edb5fc580c96a3e86a672cc9cfd694e79e940ba696efe560db3bf2878420a168382ed4342cbf1b8c7b9bbbf084532b8da402 SHA512 190f8fe96f18541fd62802e026e93c332f6046618cb89d4f9a6b478505742671d363de1161feeccd8873036a458743165080b5a0e2e55e1d0dd81e617c8cd4ad
 DIST alembic-1.5.5.tar.gz 1150308 BLAKE2B 33db8a0ea00802b37d3e24ca43232a993bfc333e232fa08b8dd0560dfec5f18f4fa82bcc3c34a776c88c8fc8d3645c4501a9dde8e4e5411bc255eb654183d01a SHA512 a4078c66bbe1627620224f965b879c46453bc74e6a2a902619df28912f55b27f086cba68f08bc8c0a37bd221ac16e195f7f905379fd5d191854adb7f90f86530
 DIST alembic-1.5.6.tar.gz 1153606 BLAKE2B ef790285975101f5f17a629c812ef56053dcd2878a02a54d6c79aebd9b97e1d253dc63e98e99eb10eeee74ab85ac0f0483c7e0d993920f120373dd40d6dfc2c6 SHA512 95b57dd920fb36e36b7c249d369b1835492f8e4b74086d39f1100590c827b76b49a1aede1d484cfb1f600662bfb99d38ddead468ec8ffb92e8110d8c3523e23d
 DIST alembic-1.5.7.tar.gz 1154141 BLAKE2B 9932889b31d6afb49c91b3b5681285869867119f493123ccabac8d24d8a4de6c8700aa1bd5578bfbfd4e13adda10cfb4a59ad4de1a51a6180a3e9455acde928e SHA512 a0bd6104405302ab9155438e980223c0ac97c0bb9026afa701f02cd6b79233cdbb7e1f953314542ebed829c1db96bc73def47eeff42f63c75c31e1fb8e981829
-EBUILD alembic-1.5.4.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
-EBUILD alembic-1.5.5.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+DIST alembic-1.5.8.tar.gz 1154284 BLAKE2B 704a7aeb15fcfae8746238ef7ae4533ecbaaf83ab9248035c35cea343a4d02e02c00dfa3c8186826a437c839053fc6292c3f8343945ca32273ee608f6572f513 SHA512 e68f3709ed969764cff4c9f755781a10123631d2d07a970674fda2226c84cb92c140bc5ae81e44c8b279823718d4f0544236d260fd04fb7107f3d8293c85b4f0
+EBUILD alembic-1.5.5.ebuild 771 BLAKE2B 5135004eb121ed720404cf1935bcfc2394a2c0193f438552b34303f23db704a193fb695bf926e63bf8dfa2fb44097ef4e089aafb479aad08475f2df42a868a88 SHA512 9ad90f45ada8b63d8685d072373adea49aebae62e53b6416264d48ad8b4bf017c4fad9595a47e01dc14f4ffdb7849bebb3192b5a900f529480425ccd5799ce2c
 EBUILD alembic-1.5.6.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
 EBUILD alembic-1.5.7.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
+EBUILD alembic-1.5.8.ebuild 773 BLAKE2B ee30f61abd6a43633de146454e043bcaa6a9a6f9ba04a80aeae6eab8bb9c714951be0dcbce4edf4d79045b0c9a729150a910d62f1041e4af44ac596e06b0dd9b SHA512 89c70ac4a4ea7151e529a65e3d4a8750c776d5cd65a997bf689f613c5b73584a9b9cd69fad2378521541695cda48addda5655c737c92eb6207b2f8104662380f
 MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.5.5.ebuild b/dev-python/alembic/alembic-1.5.5.ebuild
index 32d428a7bdf3..b0a59134f8e1 100644
--- a/dev-python/alembic/alembic-1.5.5.ebuild
+++ b/dev-python/alembic/alembic-1.5.5.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"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/alembic-1.5.4.ebuild b/dev-python/alembic/alembic-1.5.8.ebuild
index b0a59134f8e1..32d428a7bdf3 100644
--- a/dev-python/alembic/alembic-1.5.4.ebuild
+++ b/dev-python/alembic/alembic-1.5.8.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"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index 4b32ba96bed3..0395af37700c 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,7 +1,5 @@
-DIST aniso8601-8.1.1.tar.gz 39143 BLAKE2B d72161923e164032e1b9e4ed317d688d70b2a16bec6c23966f76abbb4d10f24def18df41fcca4e8f45e6145f4f067ec5483f34305a33eee3445d4706df188a99 SHA512 f9c3412c5e7dec04cca56df5806a747779848adb90137293368b4d50c365692b1d1f792a00f57172925229ccdee34ef5b50cc2d06f4c9b4d697c651e5a2e3674
 DIST aniso8601-9.0.0.tar.gz 46924 BLAKE2B 2dc0d24b536de48b3c1367203d685b00fcde8b257fc407ad38461422d4b278af1f29bd32dd74136c72204530d874d427d967f711aa69c9224c47ea3883a70102 SHA512 e0fc9ab1de36ddc7a78c0fdd139769312302bb2f8d7ce874aba1e714c7da25ed153a883ef92e62ad9f1a0c4d192c43cc939b8e82405f9f60b7d4b400f104e348
 DIST aniso8601-9.0.1.tar.gz 47345 BLAKE2B d8167bff8fdde88799e165c12aa0ea10a34d2edc91f8eeba93105e669dab52ab73e688467370927ef749395491baa128b55c984feb4f1d972e75242ec1c1efbc SHA512 a17c363a3a67b69a2fde50cc37b080b52615cebc453ef70090498ffce909775b0109c889b63e87381c795c2d8531efd6048542627c88e97297ac22ce81c10c8c
-EBUILD aniso8601-8.1.1.ebuild 519 BLAKE2B 4b744278aba261a5220f2bcbcdd45d687db07b10f87371e894b7c0cd755d8dcac555ea0ac88bf487c7375ec3e83eaf77d3aa4929bbd44b18701031b0249127da SHA512 ef3ec7ecaaab29180180efff0f1f1b64579114a5e59f26cde8a89d58ca1523026a80c3c4fac72435307aa673eb1bbc11cae7d7cd22f95668c098be163bf6fe86
-EBUILD aniso8601-9.0.0.ebuild 522 BLAKE2B 46cab7fecb64e924bec095fa03d9351604e7a1a163f11f0d7d9418d2539b86f3f0f86d7fe6e6ccc5c2daeae03fa6e8c24ae632795e7c96dc367e3aea2dd643b2 SHA512 5cad45128bae9d96eccfbb831449b6a046deed8edd22b8215c36b673e51a41ab930aa363c66fd20f82525383fb9c60ad4b452e8dfe9c413f6adcd899fc225cca
+EBUILD aniso8601-9.0.0.ebuild 519 BLAKE2B 4b744278aba261a5220f2bcbcdd45d687db07b10f87371e894b7c0cd755d8dcac555ea0ac88bf487c7375ec3e83eaf77d3aa4929bbd44b18701031b0249127da SHA512 ef3ec7ecaaab29180180efff0f1f1b64579114a5e59f26cde8a89d58ca1523026a80c3c4fac72435307aa673eb1bbc11cae7d7cd22f95668c098be163bf6fe86
 EBUILD aniso8601-9.0.1.ebuild 522 BLAKE2B 46cab7fecb64e924bec095fa03d9351604e7a1a163f11f0d7d9418d2539b86f3f0f86d7fe6e6ccc5c2daeae03fa6e8c24ae632795e7c96dc367e3aea2dd643b2 SHA512 5cad45128bae9d96eccfbb831449b6a046deed8edd22b8215c36b673e51a41ab930aa363c66fd20f82525383fb9c60ad4b452e8dfe9c413f6adcd899fc225cca
 MISC metadata.xml 410 BLAKE2B a90d3f803fe5f99e83046d3cc1ebf5ec993c18e8aafdbddc2c8928a6b5e4b961e511a027366a59b4133fad65c425393513c1ab9960c32d8119c06da7ec113ee9 SHA512 2ea6cd3e1268d3e14817f2334e3946671161422cba8be852cb7b74ddbe60ceb89fdde07629d2d8be5677cb2820e05db7f67c335a95b74d42a3e23a91a7d8b603
diff --git a/dev-python/aniso8601/aniso8601-8.1.1.ebuild b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
deleted file mode 100644
index c3e8d0ec9ebe..000000000000
--- a/dev-python/aniso8601/aniso8601-8.1.1.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..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/aniso8601/aniso8601-9.0.0.ebuild b/dev-python/aniso8601/aniso8601-9.0.0.ebuild
index 298eb44a792c..c3e8d0ec9ebe 100644
--- a/dev-python/aniso8601/aniso8601-9.0.0.ebuild
+++ b/dev-python/aniso8601/aniso8601-9.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index c7d370a17ae1..26b35852ac8b 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,3 +1,5 @@
 DIST aws-xray-sdk-python-2.6.0.gh.tar.gz 255978 BLAKE2B f43204a25027d0ec135222879bf9158aef65ba5ca948e734be0b984d8f2582741bb36d9ae0a874dffae6ffc5209e25fa1c69069c261256c3bee71a4fe717411c SHA512 17a4716467b7f6dc2912d969143e0b7c8c0b9ab15bc57f873ec415876ad2080218c3c526f4aa2c1bbf4d1caaca62eaf122c87debb45c925fd84a1bcf00ab741f
+DIST aws-xray-sdk-python-2.7.0.gh.tar.gz 265934 BLAKE2B f697c2bbe21db4b20b200ba9e9c264df81e3a6ff64d73639756d8f51a1abe0ecfaf1b852a3befde535757dfa3f75348e2eee1d5124147f04d11f5b5f20976b95 SHA512 d9ff1a190e5503f904258ac47cd7b1c686a9c74d0699f69f053df19ec7ea197da1c9c29a97624ff0758346a0dca9e3a292bf54ba3f340fcd392248602a85bfd9
 EBUILD aws-xray-sdk-python-2.6.0.ebuild 1472 BLAKE2B 84088445ef9afafe1e2641c117392a5816bfd2bf0b66bd933fae5bb2fe2111c4e8c32ae46ea7f0e28a3b47a9fb834192f2ea0407cc0dc9691e0349927e7f3952 SHA512 7f2664894e4d0145795731918956d06ba873e276855f6223bf128ed911b27c66cdac61f2cd629d50d3ffd36ea4ab77a9faa7bbe263044622829890e2d1641c7c
+EBUILD aws-xray-sdk-python-2.7.0.ebuild 1893 BLAKE2B f58fc37135f35acdfc581b9023f7306c4555afa7c0cec5ba1eab120fc429ad0640cf6243243280c5256fb2ecf04cbf750a8421c6fcae2b785a028e6a94080558 SHA512 4b4d173b224b3e01669d33e4b328ce1ac8afae3cdc2e553149bf213d46c32a1478ab924f2f9cf41749476b342cc224fc50d26035a572ab4b701beb9f0b578ba0
 MISC metadata.xml 477 BLAKE2B e68a8686e491164d7f547d858c230a47290cec6062dc7feff60322135dcb269d59ee0b53208d8eaed14eb6b3c03183898888bb42663309818010a6ab3529b45a SHA512 fdfad8d869df01fccdfd19b3395374c67793cc2c96f9e8e02962921d8357df5ddb0fae391907c7f1e987ae57618616a3263a1f0dcde0a8f84576f605ed15ae34
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
new file mode 100644
index 000000000000..69afaff0bca7
--- /dev/null
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.7.0.ebuild
@@ -0,0 +1,72 @@
+# 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="AWS X-Ray SDK for Python"
+HOMEPAGE="https://github.com/aws/aws-xray-sdk-python https://pypi.org/project/aws-xray-sdk/"
+SRC_URI="
+	https://github.com/aws/aws-xray-sdk-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.ext.django.app.settings
+	local -x AWS_SECRET_ACCESS_KEY=fake_key
+	local -x AWS_ACCESS_KEY_ID=fake_id
+
+	local args=(
+		# unpackaged deps
+		--ignore tests/ext/aiobotocore
+		--ignore tests/ext/pg8000
+		--ignore tests/ext/psycopg2
+		--ignore tests/ext/pymysql
+		--ignore tests/ext/pynamodb
+		--deselect tests/ext/django/test_db.py
+
+		# Internet access
+		--deselect
+		tests/test_patcher.py::test_external_file
+		--deselect
+		tests/test_patcher.py::test_external_module
+		--deselect
+		tests/test_patcher.py::test_external_submodules_full
+		--deselect
+		tests/test_patcher.py::test_external_submodules_ignores_file
+		--deselect
+		tests/test_patcher.py::test_external_submodules_ignores_module
+		--deselect
+		tests/ext/aiohttp/test_client.py
+		--ignore
+		tests/ext/httplib
+		--ignore
+		tests/ext/requests
+	)
+
+	epytest "${args[@]}"
+}
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 3c9e7bff4ecb..4c05a30f5d41 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,5 +1,5 @@
 DIST awscli-1.18.160.tar.gz 1882701 BLAKE2B cb797537646f27f8e09ac4674417ecac75fc691d6a7153d92cc810372721f3609ef37288cc8f226f09e1668b732bbe7d0b9195c2d0a29daca537b95181253fe9 SHA512 c69c617af4370f4d646051361cbf6d20add410a70bbc55a3fe3e8d5d957990dcaefa3991d61d14379d156919a2696303adb327ebb45f519fa557493c60f50489
 DIST awscli-1.19.3.tar.gz 1950305 BLAKE2B de9e11c2de811dea812e77a18dc9306044840ea586094cf57602cf4255723a7d94a20de414f8674d1ed6af2eed523024f61719299a3efcc492380d5d80c75575 SHA512 1034b82a9f1f0e92ae65bd28918f6f4422b0347435b4d2567b5004c370cbe1517d7fe275b672afd850ef6b99bee6f0b821097640a482626c800d19d095f42072
 EBUILD awscli-1.18.160.ebuild 1292 BLAKE2B b46ef4c0a11ea5c8e7a089365a9b9ccfe22fca2fb34cbbb69385de3a1b8d9c936c56ff833ce8db38ca881ca7d9ad62fc79e8930a2a16dc57c866740d96c8868f SHA512 ace912a19289c9e30356c61fcb94409f21cc1d7ae2ba4f7b12998ba810fb77745d845b1b95d199251c32144ba7a6244f3d318e46fc87d8495a1e0f5c1d777cd7
-EBUILD awscli-1.19.3.ebuild 1279 BLAKE2B 6cfb48d2b1241a914df1fdafecbf0be159ff582a59c5cd4f14f3a5d96ed2c4efd763d99ff7078eee23ea78e042b2ea31bb22c90600a3a21c75c86bc4399c0905 SHA512 0fafb7bfff58cf1612090ae5cd9c4f8ea284ae1151c10ba87e83c427af656711c6f8db4071225199ae31a910de2d1656741612681c7e5148dd6cdb6295588604
+EBUILD awscli-1.19.3.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
index a8cb483409f0..73e39dc7c9d6 100644
--- a/dev-python/awscli/awscli-1.19.3.ebuild
+++ b/dev-python/awscli/awscli-1.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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/bitarray/Manifest b/dev-python/bitarray/Manifest
index 31fe0fd7d482..9f52adc54637 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,7 +1,11 @@
 DIST bitarray-1.6.3.tar.gz 57799 BLAKE2B e6c1c1b143d8be4b7aa8e9a02daabaada56dc37715ec2cd36d970767f482cd6239b2ba2f5d28b96e0eabe8e7163077aad6584dadea0d8d10887a385bc96dd68e SHA512 11605959b8d94ad3a2ec947663401a6987058ec6298bef7bb6368711c3aa1f9d47b2245bd820395f0b75399f24065ad38e038e6d1d91f2535af48edbac9de3ba
 DIST bitarray-1.7.0.tar.gz 58400 BLAKE2B 04c7abea55e41914b56daf23efcf3e365d9ff1aa7d7e59c0e9b400a882d0080f393f1e07e7e0141fd84223e9b42fb2bce22bbeeb79543dcd49189b2cd302e24a SHA512 211f678977dcbf8adadc93204a6edbf915123daa518616ba6a8587d0b29f3873281bdf796c60ea12988b37b0fba4e6ad5fbfadde03eea7c3ad5179af246fc492
 DIST bitarray-1.7.1.tar.gz 58441 BLAKE2B f09fa3ffe2cc6534984e9da05ddff767dcca59075f5f08977237eab592a8e3e28ebec2d2bde89a21bba14f4c59a5e0411be50abfe562ebfbaaeca01339786dec SHA512 f45461699f5e48b97001c64c514cdafe208fe31f7cf6c211aa0fb2f32d46028717fcbeb38b812bc8f349226537a3ec6dfec97bc7ecf7253d484332307504abd0
+DIST bitarray-1.8.0.tar.gz 61509 BLAKE2B 5a1285d6bac702760293d3d75a454497c2a214f70de0844c762a64eb503838284b9cf1ae47aab50b525ae075d3864be14e7dccb7d97c7c476c3dbe77ac00e742 SHA512 7078dfb28db9c630782b9a74fcd678517a66a9728cda3ac5797c2f7eabca11980ff5207e485c4d0b372e7002b488bf54fac45128ba36ad57bd9e872493baefd8
+DIST bitarray-1.8.1.tar.gz 62258 BLAKE2B b82b34e49be923822f4ecac1cdab04a44f0cbadc3d20f2d1b32f510029862c079de6a935559ce4811dfbb9b1a6547bf6e44de07a5e437e445d1541790809ea6c SHA512 35bbfff1957f0e647f654f0281b02925bb9c49af84b068e1cd71fb5e28e5ad3847cff16c1b864050c9ff8cf2b516aec8a6eb55d2808247bad6680e9a28ebd64a
 EBUILD bitarray-1.6.3.ebuild 554 BLAKE2B 51800881a48929c4ed60f5db5a6ab4c4ee05eee904db2833f344f6a22b7a201e695b57d80f6aee9dcad937c58dca4c4277905634be9d62acd661d6138b7236ff SHA512 bda6a3406692187c4cf0882c7d3437f922df41726163cc5306ccb1c445079a0dbfd86382e6c576743ee56cf588833bf5fd4b58c4c56e90879bff83c9cb9e3c7a
 EBUILD bitarray-1.7.0.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
 EBUILD bitarray-1.7.1.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
+EBUILD bitarray-1.8.0.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
+EBUILD bitarray-1.8.1.ebuild 556 BLAKE2B bc09b2837e04d04fcf87afe2fa42de7c39855e70814a2cf40d1f9e7871a71d835d1a04d6a4cd55f72d6562af4b0b0435732de84ec1d144844609f31bbf8c4be4 SHA512 fcf62aa40cab0ece093d3b908732c54adf518e4546e73a638d89d0a1bd846735b93108b48cc468175ed40bc42a13f045654bd7fd3ea69b601ee1aa5220df28ac
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-1.8.0.ebuild b/dev-python/bitarray/bitarray-1.8.0.ebuild
new file mode 100644
index 000000000000..f28d7d9d5c18
--- /dev/null
+++ b/dev-python/bitarray/bitarray-1.8.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..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.8.1.ebuild b/dev-python/bitarray/bitarray-1.8.1.ebuild
new file mode 100644
index 000000000000..f28d7d9d5c18
--- /dev/null
+++ b/dev-python/bitarray/bitarray-1.8.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..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/boto3/Manifest b/dev-python/boto3/Manifest
index 562537874ffe..b31e51967b47 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -17,9 +17,14 @@ DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3
 DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
 DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
 DIST boto3-1.17.33.tar.gz 352659 BLAKE2B b78e3ce86b32d23ade26d93d0c3ba86020a94becb42a866be6ee02f268819eb78fde398b4bd3125c5be6b493b28434c448411b9bd83eb631a3687019aa384ae0 SHA512 452cb1d165afe03a7603999033348524212d62742a026bc51677f5b64e9de98be2920c89f7aaf5999dd676c0c9ff098af055edc01edd97bad239815263ffbd38
+DIST boto3-1.17.34.tar.gz 353010 BLAKE2B a50c6a7d5fa6cf0336fe69d5a78d3dd5b651f6b475ec34bdb3242a3efc0614d567e6dbed1029f7b0483c9b699b30c9c42a676b23671677f1ee89ecbbf06e10f8 SHA512 f1b79b1b626aaa25631f3d99f44a15b2862face3aedff273910f43d44c04bd4211aff240d8f3231280170c5403b75e0058f4a466bdc9d9fb8ce044f32eb998ab
+DIST boto3-1.17.35.tar.gz 353497 BLAKE2B cf250901bfd67254c91dc468678d5935f076e37f5ead8a57bd8083ded3a0f24fbfa078b220c8c93310f2a75690226d374063ad9d0e022d39c2aaeab844e00bd3 SHA512 2d26f0009f4d3cd7a39c1b82426cfc3be18210ba7effaa31ce5ff0e1aa4ec26d0854f235f3e15be9db853242d348095c0c4691fd05a39921c25e948b4b1fef19
+DIST boto3-1.17.36.tar.gz 353804 BLAKE2B e7a863dc2b9761a15191e43dd32f50243934d163b1a2b3a08577579a5b5ff4496062699a2287ce8cc3445e8ffbda0ddcf9e4c24b98d57a43153cb0d0fac4b695 SHA512 a786499b2147ce6b2920230b9700fe0941b332290675e5897ad94b15d262452e93f9bcaf56f676f52eeea383269af553b95e478d9b554b3596721e578dc6160d
+DIST boto3-1.17.38.tar.gz 354416 BLAKE2B ac29b9bb2d589170567b0bf42ef7e3404bed83f9a5f5795b4468cd516c1f4e25c0f47e28e1c7f0dbbeb564782af32ae24c4a7429949f1e092045b974bcbfd96c SHA512 558a75f5e855997e98e20eebeb410fb2f7b125eb5c908e5aab873b89956d3c18be75d32c14a44e1cc7e838bb2ae1fdf37a1b4e4697bb311f4d47dc85e4e57831
+DIST boto3-1.17.39.tar.gz 354720 BLAKE2B bd5f9f676c346efc9264e42e802d0c5af5a3674cd4693019d39409e11958947c4a19982ce8572cc1be400f604b85428f6e964df175a71c35ffe11023b19cf733 SHA512 e12c08d06f68900291b36c71252d613a3a26298bdb9c665a1378ab5d26eacd65b496057aee74fedab6d5d955312d9225e63f7e0f1438d8fa739c2c1581d62297
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
 EBUILD boto3-1.16.63.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
-EBUILD boto3-1.17.12.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.12.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.17.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.18.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.19.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -37,6 +42,11 @@ EBUILD boto3-1.17.30.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2
 EBUILD boto3-1.17.31.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.32.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.33.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.34.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.35.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.36.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.38.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.39.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.12.ebuild b/dev-python/boto3/boto3-1.17.12.ebuild
index 74b9170a9119..2f9ae1e99fda 100644
--- a/dev-python/boto3/boto3-1.17.12.ebuild
+++ b/dev-python/boto3/boto3-1.17.12.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	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"
+	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-)"
diff --git a/dev-python/boto3/boto3-1.17.34.ebuild b/dev-python/boto3/boto3-1.17.34.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.34.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.35.ebuild b/dev-python/boto3/boto3-1.17.35.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.35.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.36.ebuild b/dev-python/boto3/boto3-1.17.36.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.36.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.38.ebuild b/dev-python/boto3/boto3-1.17.38.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.38.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.39.ebuild b/dev-python/boto3/boto3-1.17.39.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.39.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7da71fb16f3f..35bde21a5514 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -19,9 +19,14 @@ DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6
 DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
 DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
 DIST botocore-1.20.33.tar.gz 7543656 BLAKE2B eefd7b06c5a43780982616cfd640c6a1c5d9e919b403c0f78be06833e8e618b142cabacf2dd3b3e13cf351bbd5d0d42ef23b314355f68f7d9dc6aa9cae6e377f SHA512 6354ed7ebbe467ea96c0ea0e059acd2be0a40973d55998c0e006e73a67f2a69bd8009099f761af83e47022ad27698d3a21ffc2824ad4b74a687bc490239420e0
+DIST botocore-1.20.34.tar.gz 7545620 BLAKE2B 49f44aa2b4799ddf03adeb48790bcf23744a13e61cc1a64be67bfadf54a51213b99ae4cf26cdfc948482b7ffeff391a06f34eb4628bf2cbf6d8af1adb78f1932 SHA512 b85878eb36507687171136fd6d8b2d00a9a9fe0123d36b42906026ff3bad3580b0e6e6e8ee50c35f14a237acf9f354c6ecdfe38b14cce83fd65fa6873aa25d84
+DIST botocore-1.20.35.tar.gz 7547346 BLAKE2B 7fb58d475e8e57501346916759f4e0801f7c0ff61a60a1ffded2ff16cab6ef67d72f40169990673f294fe54bcd99eedd0ad4e2cf1fba39a237a17925d6c0f123 SHA512 b5fa8478ef7849951339ccc6d06948fd4e654deea5668eb0fd82813f3c095af8d67ad0986aa630e3cf579a1f2442100481e7a69ba7933e73b9178a1c599b05f0
+DIST botocore-1.20.36.tar.gz 7548154 BLAKE2B 6e96c80320cd782978b44086e02af13496ed4969c535e523552fde41dada5f21990f0eb5060cfbd229ab0524a862c547c32fb3ea5c860b69fd11ef11f94bca49 SHA512 970f40e3c9b8b8a97dfeb4e5add80758d9f63b7ffd3e757903830d3458d635fc38e44f8f497fb99c65a407c56ed4f96ea1a32f794fbcfd490ba45747148d4cea
+DIST botocore-1.20.38.tar.gz 7557920 BLAKE2B 9912f48f334a76e5dd9a4ddd7f79a4e1a958bfd6cbc4ebf66ff257882b49a27be28114747479148317caeba1198c486771f23f0953d8c2840b9b108c69258cec SHA512 ed068e799314881dfbd40c1e100e7572b70d302c6b694f0759f151e0acc643dde7cdcc3e3345e2607637761595fc5fc9162a2d931d8d8dfbcac02f6421953e28
+DIST botocore-1.20.39.tar.gz 7560051 BLAKE2B 0605b39e28e494add04d0f5ca559a3c1eac0011e332445fc66b4ee6a75c38f127eead72da287fdbc6da8cdb0f5ad90d18e4c71bc6641f2fe8784a1399cfd32d1 SHA512 2de58a1b585106280d292edd2a4d2f13c3c5d7ecddc24daf5a7ab65106f42a32bb700906cc19342c600cdb99d8f2ac1b951d4de5eb7f223a1c8f910ceae764d6
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
 EBUILD botocore-1.19.63.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
-EBUILD botocore-1.20.12.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.12.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.17.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.18.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.19.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
@@ -39,6 +44,11 @@ EBUILD botocore-1.20.30.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659
 EBUILD botocore-1.20.31.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.32.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.33.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.34.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.35.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.36.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.38.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.39.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.12.ebuild b/dev-python/botocore/botocore-1.20.12.ebuild
index 4e5d698e619b..51bb10d67391 100644
--- a/dev-python/botocore/botocore-1.20.12.ebuild
+++ b/dev-python/botocore/botocore-1.20.12.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.20.34.ebuild b/dev-python/botocore/botocore-1.20.34.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.34.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.35.ebuild b/dev-python/botocore/botocore-1.20.35.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.35.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.36.ebuild b/dev-python/botocore/botocore-1.20.36.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.36.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.38.ebuild b/dev-python/botocore/botocore-1.20.38.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.38.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.39.ebuild b/dev-python/botocore/botocore-1.20.39.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.39.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/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index 7266e1083286..dd66acf6af60 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,7 +1,4 @@
-AUX brotlicffi-0.8.0-remove-dict.patch 5333 BLAKE2B e68065d06c072f61b0115925706e1476ef58d4217635c2d29e32a503cc0a98a2b55a9155f8bc189659b986a8bc7ca213b4b1f1405b0379e3f2813db50b5b949b SHA512 8e1acde07e98c609e295d0c2408823de026ffdfa88b3a45880ab5321b5293ce19791000bc5fd0d37ba96ccecb243151ac52ac2beaa2447ca912ae21d5a4a711c
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
-DIST brotlicffi-0.8.0.gh.tar.gz 21997 BLAKE2B 5e817e228ce01cd7a831c59cca5bab3e851d676f1daa5efab8f61a203c0854bcc92605c88896dff5f4ce27fc880718da5ddfcf02a3bddbbd7b2e18c33f1e77a4 SHA512 fd0c64b400d3b48e0e2d113b4d75e32a2b33fd99505c7661d6d51ba9aedf5cc1f58be09bc90a5f1f7e3424addef2b54cc085a41e6291c87d53dd7d4e8fc7eb4e
 DIST brotlicffi-1.0.9.1.gh.tar.gz 22589 BLAKE2B 14ebb3f6168d334abe3ba72bd88697ee98aba87ace6aaf634395ef50ecd9325723f0da0a9ce56a5e4dcfebfe3183a190e2ec183eff95492b25e3542161b32322 SHA512 669c73ed6dd18be6b916bb8cfb240657dcc10d67df5a32b3359f05cadf75aa654c27b53e8b964251f6d6cd74870e159efddf87ef0cfb59b7777eacd3cda66852
-EBUILD brotlicffi-0.8.0.ebuild 1340 BLAKE2B 48039a8d87f6a9108fd9bf0556a596ef9e69ffd5e30034b960023696638de4cb1f7d87e3c24d936c57f642926cc049714cd4f013f8ef81dc739528357f57b0b8 SHA512 b31f7b9941c0bcbce2ab56fe2158ae861f5cfe87edd0981e361a8a15000a885a886f0967d16a93a25547c9a83efd8c933553ce2f0774c11f098cfed04583468c
-EBUILD brotlicffi-1.0.9.1.ebuild 1424 BLAKE2B dd67807ef9042427f1d3f2db9919f0938ac9fa036797dc98b7b0a2eca110f79292fab27c8f314aa64bae3dba50c4359ec896f10799ca36fba6c2b490fc4e6358 SHA512 da9c110153113322183c6a0a3e2fa80d7e047c0f9a1834aa114b4c6e4839f109c138f3577a7a16451583c2a7d33966ee32977441d527ef9a80f7f8c59a7963d2
+EBUILD brotlicffi-1.0.9.1.ebuild 1423 BLAKE2B b9ae8a682323abd0a1fbd306554f7bc0c81cad737ed613154678690b91c5294d59fe824bb4e922e7cdf22a4113b63bb6e49663edcabbab8be88fffc683ac12e7 SHA512 0f39e19b66b0675c0ffd2ce374ce609bfad05f0369cc8656cea8edad6716d2c0b959b8b74f3ecbf888311b357ce735fda91b6a31bd44f15d47f1c3ce79bbafd0
 MISC metadata.xml 376 BLAKE2B 7044a00a2d66d5f983cc9485bc9a3124d24162cb72fb65c716653f1b4bddf7c6a1d3e7a407726098650167f74d5c10bab2582cabbb533cbf966ac0b8292cbe70 SHA512 51fee847f41d497493f69a12962df09d1229357502538b00c1941025230745bda4595619dca1277e6c01840c788e677ec0d1033d897350373e84ca6e9222ddd4
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
deleted file mode 100644
index 2afad43d1940..000000000000
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.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..9} pypy3 )
-
-inherit distutils-r1
-
-# Commit of the Brotli library bundled within brotlipy.
-BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
-
-DESCRIPTION="Python binding to the Brotli library"
-HOMEPAGE="
-	https://github.com/python-hyper/brotlicffi/
-	https://pypi.org/project/brotlicffi/"
-SRC_URI="
-	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz
-			-> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
-	)"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli:=
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# remove custom dictionary code that isn't supported by new brotli
-	"${FILESDIR}"/brotlicffi-0.8.0-remove-dict.patch
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die
-	fi
-}
-
-src_configure() {
-	export USE_SHARED_BROTLI=1
-}
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
index 0ef276a501d1..55423b5c51be 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch b/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
deleted file mode 100644
index bfb1b61b951b..000000000000
--- a/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 0fe3dc70240ea62b56861ab830f9ab44644b18e5 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <sethmichaellarson@gmail.com>
-Date: Sat, 28 Nov 2020 14:36:59 -0600
-Subject: [PATCH] Update libbrotli to 1.0.9
-
-(stripped down to removing custom dictionary support)
-
----
- src/brotlicffi/_api.py          | 21 ++----------
- src/brotlicffi/_build.py        | 25 +-------------
- test/test_simple_compression.py |  8 -----
-
-diff --git a/src/brotlicffi/_api.py b/src/brotlicffi/_api.py
-index 49da0a3..8358d3f 100644
---- a/src/brotlicffi/_api.py
-+++ b/src/brotlicffi/_api.py
-@@ -95,8 +95,7 @@ def compress(data,
-              mode=DEFAULT_MODE,
-              quality=lib.BROTLI_DEFAULT_QUALITY,
-              lgwin=lib.BROTLI_DEFAULT_WINDOW,
--             lgblock=0,
--             dictionary=b''):
-+             lgblock=0):
-     """
-     Compress a string using Brotli.
- 
-@@ -124,11 +123,6 @@ def compress(data,
-         based on ``quality``.
-     :type lgblock: ``int``
- 
--    :param dictionary: A pre-set dictionary for LZ77. Please use this with
--        caution: if a dictionary is used for compression, the same dictionary
--        **must** be used for decompression!
--    :type dictionary: ``bytes``
--
-     :returns: The compressed bytestring.
-     :rtype: ``bytes``
-     """
-@@ -141,8 +135,7 @@ def compress(data,
-         mode=mode,
-         quality=quality,
-         lgwin=lgwin,
--        lgblock=lgblock,
--        dictionary=dictionary
-+        lgblock=lgblock
-     )
-     compressed_data = compressor._compress(data, lib.BROTLI_OPERATION_FINISH)
-     assert lib.BrotliEncoderIsFinished(compressor._encoder) == lib.BROTLI_TRUE
-@@ -255,8 +248,7 @@ def __init__(self,
-                  mode=DEFAULT_MODE,
-                  quality=lib.BROTLI_DEFAULT_QUALITY,
-                  lgwin=lib.BROTLI_DEFAULT_WINDOW,
--                 lgblock=0,
--                 dictionary=b''):
-+                 lgblock=0):
-         enc = lib.BrotliEncoderCreateInstance(
-             ffi.NULL, ffi.NULL, ffi.NULL
-         )
-@@ -271,13 +263,6 @@ def __init__(self,
-         _set_parameter(enc, lib.BROTLI_PARAM_LGWIN, "lgwin", lgwin)
-         _set_parameter(enc, lib.BROTLI_PARAM_LGBLOCK, "lgblock", lgblock)
- 
--        if dictionary:
--            self._dictionary = ffi.new("uint8_t []", dictionary)
--            self._dictionary_size = len(dictionary)
--            lib.BrotliEncoderSetCustomDictionary(
--                enc, self._dictionary_size, self._dictionary
--            )
--
-         self._encoder = enc
- 
-     def _compress(self, data, operation):
-diff --git a/src/brotlicffi/_build.py b/src/brotlicffi/_build.py
-index d2a2d85..45dccb6 100644
---- a/src/brotlicffi/_build.py
-+++ b/src/brotlicffi/_build.py
-@@ -93,20 +93,6 @@
-                                                       uint8_t** next_out,
-                                                       size_t* total_out);
- 
--    /* Fills the new state with a dictionary for LZ77, warming up the
--       ringbuffer, e.g. for custom static dictionaries for data formats.
--       Not to be confused with the built-in transformable dictionary of Brotli.
--       |size| should be less or equal to 2^24 (16MiB), otherwise the dictionary
--       will be ignored. The dictionary must exist in memory until decoding is
--       done and is owned by the caller. To use:
--        1) Allocate and initialize state with BrotliCreateInstance
--        2) Use BrotliSetCustomDictionary
--        3) Use BrotliDecompressStream
--        4) Clean up and free state with BrotliDestroyState
--    */
--    void BrotliDecoderSetCustomDictionary(
--        BrotliDecoderState* s, size_t size, const uint8_t* dict);
--
-     /* Returns true, if decoder has some unconsumed output.
-        Otherwise returns false. */
-     BROTLI_BOOL BrotliDecoderHasMoreOutput(const BrotliDecoderState* s);
-@@ -205,15 +191,6 @@
-                                           BrotliEncoderParameter p,
-                                           uint32_t value);
- 
--    /* Fills the new state with a dictionary for LZ77, warming up the
--       ringbuffer, e.g. for custom static dictionaries for data formats.
--       Not to be confused with the built-in transformable dictionary of Brotli.
--       To decode, use BrotliSetCustomDictionary() of the decoder with the same
--       dictionary. */
--    void BrotliEncoderSetCustomDictionary(BrotliEncoderState* state,
--                                          size_t size,
--                                          const uint8_t* dict);
--
-     /* Check if encoder is in "finished" state, i.e. no more input is
-        acceptable and no more output will be produced.
-        Works only with BrotliEncoderCompressStream workflow.
-diff --git a/test/test_simple_compression.py b/test/test_simple_compression.py
-index 45c322d..a480587 100644
---- a/test/test_simple_compression.py
-+++ b/test/test_simple_compression.py
-@@ -110,14 +110,6 @@ def test_compressed_data_roundtrips(s):
-     assert brotlicffi.decompress(brotlicffi.compress(s)) == s
- 
- 
--@given(binary(), binary())
--def test_compressed_data_with_dictionaries(s, dictionary):
--    d = brotlicffi.Decompressor(dictionary)
--    compressed = brotlicffi.compress(s, dictionary=dictionary)
--    uncompressed = d.decompress(compressed)
--    assert uncompressed == s
--
--
- @given(binary())
- def test_process_alias(s):
-     c1 = brotlicffi.Compressor()
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 9564c56e94d9..004e1dda2eac 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 896 BLAKE2B 063f14614963d60c90aabf14f001bf724ad3b135c6e80329dfa6af71632628aa528223c605252b18e52d07394fae67451f5d1feecf23353e054b1bfd517a374b SHA512 cc731c63785f9d929f456553b4c2e2f7e9bfd3e50067cad9def7c08c58e43a0af05f5caa72a4b171ee3058f22abc8b93bf1016de696d19b6d5a590cc81ca91d2
+EBUILD cbor2-5.2.0.ebuild 895 BLAKE2B eacb6ba237f46e6cfd783633c75331fb6792143759eeddde8b434904dda8e390bb5a5102e03f2598b1082e37cfc91148c97f3080ef64bda8b49922f5bbc42311 SHA512 bd9482420502781d41425399238c8410219eb28711f4f321d37c83111125de5e5073db5ce713a5ba6f3b6be80fbcf56eaac9f7ee520b0884dd1c0b3d9863a44a
 MISC metadata.xml 893 BLAKE2B a56c40664c6526d741a1f4e6be15cb582e0a0402182545262e3f1f489441e94a2c17072c01797e95cbea02d40b2d6addc14027596e4cd2fa49ccb4cb0feadd09 SHA512 1695d3be04f9cb86ea83f3676f5e8628b196b7044bee019ba8ce234500ee1501d013144155fe86ca8f21a10abb35074cd98fbec7da9db7f33c1046229fca9f5e
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index 2c4aa4f6195e..bd8736fafac9 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/cffi/Manifest b/dev-python/cffi/Manifest
index b47a97345151..aa89c62f9540 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,5 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a
 DIST cffi-1.14.5.tar.gz 475055 BLAKE2B d8a1f83aace8329216f5d36b2e8a27f62803fe9ad12c2d29aa1b3f730d1beb8bad0f50e17102c8673471a7bef57b0755157c4e1bf1a50779ed20b1cfcbb2043a SHA512 7428b3f6e4ee9f3b91011e43304dd63e5cc48479120ae58298c646c1ec1f5c24525d5f08655a7fed70c5fad7ae0c2e0539e512b5fa49d2bc57669c4ab703cc2a
 EBUILD cffi-1.14.4.ebuild 1540 BLAKE2B f08c6a66b21ad371e414e81999821fd7ee49b6b7bb436b8f214161cfd24afabfa490e4faeedbcd72f574b2f96bcd164c40cb4b0041105dd1deed61cb3217195a SHA512 28566fad5dcbf8d0775671c2f17ebbcac70a3a14af9f666a35e425ebcf3b37cc85bd90781f017092d0b27b60a920c6d63ae660e80f0fe6c05fd8a840947f7651
-EBUILD cffi-1.14.5.ebuild 1509 BLAKE2B fc5ac48fb475106823506a16a1a3e2885231bce2e62f1269994363bc9655eff9bbf1d6748e87ed043aa54137e06b0371c00247202569010b8f7200f37df8fd90 SHA512 f736e6fe9eb28f6c2ec8a4227fb34e5178d3729a8e83fd425189156ad26f027422559fb9d521c214de8a3c68cc6efcd18fcd865b58efe0fe262f253ee0332dfc
+EBUILD cffi-1.14.5.ebuild 1508 BLAKE2B fc7d91e44f356ca65863b76dcbf26da55605bc2f2d4bd6016cbe5f9775bfb95ec36f56481219115f1509f66274a8d3135e7c55922a654d9bcc4162ef391c1ea6 SHA512 7c839e8c89ffcc58493e2b361b9e9af567bcae0c9ecec3b3b67f86b3cfa3ea58e5ed95551a85a64b7263a54b8323a70a2b74e55f1a82acba793e55e32e50798c
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.5.ebuild b/dev-python/cffi/cffi-1.14.5.ebuild
index 985d93d6c73b..a3a9d66ec3fd 100644
--- a/dev-python/cffi/cffi-1.14.5.ebuild
+++ b/dev-python/cffi/cffi-1.14.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index a1fdfe93ddb9..26641b9aa3c2 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -2,7 +2,11 @@ AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f655
 DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4
 DIST cfn-python-lint-0.46.0.tar.gz 6287874 BLAKE2B 7ec2665596b50697c95e32b40f736822d718d4682d3a41f72b94e45f1b42a386d2d44cb5447826010c01ccd8da655e394b7379764e5e8ca2a79db22c274cc033 SHA512 b87751a719fc037dca2533bb8e14a483bc85d4460b73c7ef2a2d2fff188bd1c611d9828dbf13eca16781e21124123a85c723054bc460243df8ee9fcba5d8e104
 DIST cfn-python-lint-0.47.2.tar.gz 6478541 BLAKE2B 1955c6aa43512d4249741db982a6e4e5fe46daa3197d028590269d74690de2f67a1615e4907bfc434fb1e265770780a5c0da2a19c2bdfa8b44dfc7b0386e4405 SHA512 26e2e4cc26090e6da54ff0f90b9e35767e1d5677321cfb84ff00f820477d6ab576e7f58219346f48eb838dccf662df3a8a75e709cfa9690868d85130745f0cc8
+DIST cfn-python-lint-0.48.0.tar.gz 6528354 BLAKE2B 083f154f04c301dda2e84bbfdbf82f84f38516b865e085b16c9d4acdaff47849dd143cdbd7c26dbfca44608d9a402a16ecf627c8a89c01a69e1a9980d1b1ea61 SHA512 2df97e731c01d9cfe5d85dbed9bb03e487bbb86b293187f8ae66022cc2b7f85916397bcbb1b67ab179136599e4204fd058ba37d0f69f0d1c5605e34d8e56e4ce
+DIST cfn-python-lint-0.48.1.tar.gz 6531054 BLAKE2B 76aab248bf8d043c274b6a6d17c9ecada3b92fb0688a32989095771206a2f37728216fe1eb5d247237457d88279b04870a5808f7a93c15f77cf53c6734a3e4aa SHA512 11373f9755d0955d57dfb48fb806565cc22d2f6deeba261dbf1446b95960bce915b4b2d0bb3e1884b59a7874ead18b0cc196bd599bcdcc935a4ab0f18b4276aa
 EBUILD cfn-python-lint-0.44.7.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
 EBUILD cfn-python-lint-0.46.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
 EBUILD cfn-python-lint-0.47.2.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
+EBUILD cfn-python-lint-0.48.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
+EBUILD cfn-python-lint-0.48.1.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild
new file mode 100644
index 000000000000..c3edcec5c4eb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.48.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.48.1.ebuild
new file mode 100644
index 000000000000..c3edcec5c4eb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.48.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..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 9e450b635bf2..bb2715243a45 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,8 +1,3 @@
-AUX click-6.7-fix-tests.patch 1971 BLAKE2B 67c0b66f8668851eb48899aab98b4437846f65cec5389957645f5dd637b6e2a0fc2934856815a85b958c8326a8c33bb1c97bdf963d1774173051eb3ea05c7096 SHA512 fb864761ae8bea93096b9d090eef9cecef7707751d58fa40f846aeccaa8f59e8e01af38f8f79624b94c6ad081b9a388bef287b33b7659bdbbc292f1ae87abda6
-AUX click-6.7-support-sphinx-1.7.patch 1243 BLAKE2B d4939d49d43b50a3cddb77899ed2aae9ef6ede0941ca1e7e2d8d23d4f5afa0875df7d126adb498639839efb18790d021549018a355da3d4d71a77d4a6e80db79 SHA512 e497364ebf6243feb7281609d82ac73a73f1e399c1fcaf8a6c97a870c738d21605bcc98397adec7b4b0e1ebba209adf6eb1c6708c157e81e4baef1af1375e15d
-DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44d84a493c0fe9b5a6f7f616e8a4c440ae211fca811a2bf904ddb75d93618f3c6ac7bbe6b1ed022710dab1f SHA512 d454369fe1acb01c2210a61e15f45ac9cc77102c93345257f4ef3090bd8f31f1ccc49d9fd6ea670cddca9f715ad5db29368b4eecd95abff50d1033c4f7a967d6
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
-EBUILD click-6.7-r2.ebuild 838 BLAKE2B 608a2d022c059f918754df5755b29d848e8b30fb12122eecd5396e83775ddd2ea0ebae860ca2e2602d34c705de954a0c196b1770a29e38a6ec6ad37ba3d71265 SHA512 a1def50b7d240f7abfa5b1d42aa3b5126e35b6907ce03fe78b77610df8e1a7027833f82118310c9b5a3d2ca7942c87e3287b29cf1e42df447d4c48cb1deb6df0
-EBUILD click-6.7-r3.ebuild 975 BLAKE2B 435031938814afa6d19b056a1afbeec60d4e4bb230683ede187b49893bc0e42ab96f2afacff6c56dcae8ffed29a4549386bae975378f472914a2841d08c03cfb SHA512 7014fd220332c4280add5a57fbf09a8b79867ac254c7298ec681470653a305ff84b7016a889ca84f12e5e5ac1378f445c8bdb20f55ec85b6d5782d99f228776a
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B 095cfcf03856893fbb93140a12ad1f52c6cd30f32367ff466ae798dc9fc6a1cee978eed1826685d698f8f4698fd3751d672083bbc8f067ce77de3304440b0759 SHA512 d606e2c5508c25eebe0cc72faccb248281651fb0d5574a5c5a6ef04af218c047a021f7ce1983fc42c4c89842626dceb6f366a421fdbc64023ada25e4d4d49f2a
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-6.7-r2.ebuild b/dev-python/click/click-6.7-r2.ebuild
deleted file mode 100644
index 4a02313d5fb2..000000000000
--- a/dev-python/click/click-6.7-r2.ebuild
+++ /dev/null
@@ -1,31 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${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 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# From upstream, can be removed in next release.
-	"${FILESDIR}"/${PN}-6.7-fix-tests.patch
-	# From upstream, can be removed in next release.
-	"${FILESDIR}"/${PN}-6.7-support-sphinx-1.7.patch
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-6.7-r3.ebuild b/dev-python/click/click-6.7-r3.ebuild
deleted file mode 100644
index 6a6ff97cc066..000000000000
--- a/dev-python/click/click-6.7-r3.ebuild
+++ /dev/null
@@ -1,38 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-fix-tests.patch"
-	# From upstream, can be removed in next release.
-	"${FILESDIR}/${PN}-6.7-support-sphinx-1.7.patch"
-)
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/files/click-6.7-fix-tests.patch b/dev-python/click/files/click-6.7-fix-tests.patch
deleted file mode 100644
index 8a305e3665dd..000000000000
--- a/dev-python/click/files/click-6.7-fix-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 20b4b1c0d1564ab4ef44b7d27d5b650735e28be3 Mon Sep 17 00:00:00 2001
-From: Armin Ronacher <armin.ronacher@active-4.com>
-Date: Sat, 23 Dec 2017 09:27:57 +0100
-Subject: [PATCH] Updated tests to work with newer pytest versions
-
----
- tests/test_basic.py   | 2 +-
- tests/test_compat.py  | 9 +++++----
- tests/test_options.py | 2 +-
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_basic.py b/tests/test_basic.py
-index 045f608..960cd32 100644
---- a/tests/test_basic.py
-+++ b/tests/test_basic.py
-@@ -357,7 +357,7 @@ def test_required_option(runner):
- def test_evaluation_order(runner):
-     called = []
- 
--    def memo(ctx, value):
-+    def memo(ctx, param, value):
-         called.append(value)
-         return value
- 
-diff --git a/tests/test_compat.py b/tests/test_compat.py
-index e4ecdc8..9dacc21 100644
---- a/tests/test_compat.py
-+++ b/tests/test_compat.py
-@@ -1,4 +1,5 @@
- import click
-+import pytest
- 
- 
- if click.__version__ >= '3.0':
-@@ -11,10 +12,10 @@ if click.__version__ >= '3.0':
-         def cli(foo):
-             click.echo(foo)
- 
--        result = runner.invoke(cli, ['--foo', 'wat'])
--        assert result.exit_code == 0
--        assert 'WAT' in result.output
--        assert 'Invoked legacy parameter callback' in result.output
-+        with pytest.warns(Warning, match='Invoked legacy parameter callback'):
-+            result = runner.invoke(cli, ['--foo', 'wat'])
-+            assert result.exit_code == 0
-+            assert 'WAT' in result.output
- 
- 
- def test_bash_func_name():
-diff --git a/tests/test_options.py b/tests/test_options.py
-index 9dd8cdf..8bdda1f 100644
---- a/tests/test_options.py
-+++ b/tests/test_options.py
-@@ -199,7 +199,7 @@ def test_nargs_envvar(runner):
- 
- 
- def test_custom_validation(runner):
--    def validate_pos_int(ctx, value):
-+    def validate_pos_int(ctx, param, value):
-         if value < 0:
-             raise click.BadParameter('Value needs to be positive')
-         return value
--- 
-2.16.4
-
diff --git a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch b/dev-python/click/files/click-6.7-support-sphinx-1.7.patch
deleted file mode 100644
index 1076c2decad1..000000000000
--- a/dev-python/click/files/click-6.7-support-sphinx-1.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c7929511114494350e26d7b0c790fb8ca82f605 Mon Sep 17 00:00:00 2001
-From: Daw-Ran Liou <dawran6@gmail.com>
-Date: Mon, 14 May 2018 13:34:23 -0400
-Subject: [PATCH] Support Sphinx 1.7+
-
-Move: from sphinx.util.compat import Directive
-To: from docutils.parsers.rst import Directive
----
- docs/clickdoctools.py | 2 +-
- setup.py              | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/docs/clickdoctools.py b/docs/clickdoctools.py
-index c3db195..1dd47d3 100644
---- a/docs/clickdoctools.py
-+++ b/docs/clickdoctools.py
-@@ -15,7 +15,7 @@ from docutils import nodes
- from docutils.statemachine import ViewList
- 
- from sphinx.domains import Domain
--from sphinx.util.compat import Directive
-+from docutils.parsers.rst import Directive
- 
- PY2 = sys.version_info[0] == 2
- 
-diff --git a/setup.py b/setup.py
-index b78403e..f1bcdcf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -24,6 +24,11 @@ setup(
-     maintainer_email='contact@palletsprojects.com',
-     long_description=readme,
-     packages=['click'],
-+    extras_require={
-+        'docs': [
-+            'sphinx',
-+        ],
-+    },
-     description='A simple wrapper around optparse for '
-                 'powerful command line utilities.',
-     license='BSD',
--- 
-2.16.4
-
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 5b027a32de13..8325c0e5b5d6 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,3 +1,5 @@
 DIST colorlog-4.7.2.tar.gz 28764 BLAKE2B 35cfba0aa03879786a41eb09601f0b4227c5fbaca91f560810e4a4626d9b3a15b8072df06315f81739d27b410c587a062132d5315bd1e0db059baecf757709d7 SHA512 103640e0a4bff6bd81d26c1019fe954f52870947c0b68b3b2a85f178c8f50040e3eeafe08b2a25aa130433c1c8f144b722e4f3795fcbcc0ed4c2386cee626884
+DIST colorlog-4.8.0.tar.gz 28770 BLAKE2B ea4d955c7b60651731547d27b35a09fe93e33feb51f007c622be4fd2611a706befc9565d51b17af4ae2a97d96bf7d9177b834a1bf302a50a2cbb9822134a696f SHA512 b335df74e4b10acd835e3f301c8ed9e77bd42b964a6b890682f28ff50f9302143805591ba80d567725b90df6a01601aab7fac89a8a71a119d6dff6f6bf94b1ad
 EBUILD colorlog-4.7.2.ebuild 436 BLAKE2B 4383df4cc1117562ea1a192dbbe2f31c8d099c0887633a41269b051341e21908dccf95505c7c5e0b6b761610fb87ab294ca7c3cedaf17d29cd0466a93e02ca5e SHA512 eb00f779a89e0422718fdbc705854b850baa80c97d1bbc8d0a0909dbae358ea82a52544fc61e23b91f2d9fe45dc7e1b60cd11a207c2c0ac7350091482be07bbf
+EBUILD colorlog-4.8.0.ebuild 438 BLAKE2B 831298220f1dd8210c6e7db9c36a8076497008f61b73297e0488a9e4c156725fdc866ad4d9afad97c9ab64c108deba8c881fc6e752ed849b41e4c49feb89db91 SHA512 128121fb3b165ab6d063f6a9476210de63fcba3b5e625ad4f337eded40df23c5f27f6a77c332dbb759d1cfef837bc2bfc662a6af5edebc73e142a7243488ee20
 MISC metadata.xml 414 BLAKE2B 6d745b11747e4fbe68606289b2fccd8433a73d9e26531dc966af716ea2309c023aff26f42f496f7ecc8f280476c7dbb46d0411c863dbf51921c1b7dbbd16ab29 SHA512 eda6c7896513bb601ee87038cb35f32b556007a0312821dd8024588ea766267931998d7276656761a41f6475a1bbefb79aebb5e82b05e010ca26f312c52a30d6
diff --git a/dev-python/colorlog/colorlog-4.8.0.ebuild b/dev-python/colorlog/colorlog-4.8.0.ebuild
new file mode 100644
index 000000000000..0aff57a0f429
--- /dev/null
+++ b/dev-python/colorlog/colorlog-4.8.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=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 199ff212b022..fbcca879560b 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,7 +1,5 @@
-DIST ConfigArgParse-1.2.3.gh.tar.gz 27858 BLAKE2B f8dbb1dfc9312107abcd0c715b93736cdb86a7742270932d13b768ac7a13f805902f026d5cb34e196a8c5c659af65c13698c2cc301b522b99bb0c019b2c0e68d SHA512 bfa8f9ca8ab5c6d4cdf2a7e7c577c99fafdf7f743c81057bebbb6045c45de2cdbf5d738f7765e5dcac5a45baa92e2a8bc7ad3879776b9cf4862e3da94e78c4cc
 DIST ConfigArgParse-1.3.gh.tar.gz 28274 BLAKE2B 0ea46747425d978da0de35e7ac29c91ee637f1c793265eeecf702ec504b1d1083d31bdaa48134de2916733f845cd68690af2ff0765b3a5bdc98365d03aad4492 SHA512 7f7048babacaada3495ece42d6bd484b07d648c2b2c1a8e700379aae6c65d96c37bf15a20f90281e2c0d83948e22986689c4b02e0388d9bf01e77d9d1561b0c5
 DIST ConfigArgParse-1.4.gh.tar.gz 30079 BLAKE2B c070e245665bc331efb3a0b4d2e5ad0486859a7f28dbad2669d897d1857b58b1b1b48cb57d34ab2e5de5c21aa2a3554d728d6e48d5aa4c3a8c494fdc2ad9f615 SHA512 a2284da53e2417022c60dc637c6e4f6c7eea6b56790926982e35483bdcdce0cb349c09d02968625ac3888a0cb13cd0b5182f739c31a95425f9daf12c8b00f5c0
-EBUILD configargparse-1.2.3.ebuild 724 BLAKE2B d4c63814f7c0e638961e225b5e70c9c0f905065940aeeb0fdacb9c5b686593c2013b7423a9b8605264d0be8428306469568132d85881e5dd8d9c88aeade3e7c0 SHA512 422753e0534d5a8e0f762604ba4c7ce3651818edde0b00d1dc9c88eefdfb9bb9f3de70d249a6d8197ca51cd813c87e3bddea226a4e0cd13abb6724fc8fff98a6
-EBUILD configargparse-1.3.ebuild 726 BLAKE2B 757e0a3331a1c4d444d683ce1c9e9cbaa14f0c2710d384d20321a16dff02bd4607af89f240de4e916138f82f0d9432bd5100031bec8d4668e83f535e0a1009df SHA512 9a45b05452df4ec1c51ca6646d99180e09cf8bce88e716ff1c5bf0d948a1c1dcf73ecea7ecb814329228164d8d9252fa02deacd441bc885d162f9f57e51e817f
+EBUILD configargparse-1.3.ebuild 724 BLAKE2B e162af581e35afb6f734aff1b6933bd7f7316b704afa8a9fab77d599cda98060bedf3902e1086ac78839ecf0b9c2ec075e530cef09a2969e6da4ca9d5e3d6529 SHA512 1cd847101cdedbb41948ef28b543e834555874954f1aebc7d756ba6e39ab183db6340fa765943971bb681d2a2eea536e2ae272667f4ab6283ef4e43f0758939d
 EBUILD configargparse-1.4.ebuild 770 BLAKE2B 5a8bd6e5f7a62b050be366afec306031df76216f74f33f1c320af62cabdbe48dde5207ef539a89d4c77923bfe2fb64b6341758429503cdfbf87fd0c20d6ce5c8 SHA512 d05444669f81301fe15c616c93460939d99681ded9cf1b37403c7405d674e736ef5835a37570e2c2fa761d2b6fad9605c5acec8004484caddbb23b1fe82b2173
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.2.3.ebuild b/dev-python/configargparse/configargparse-1.2.3.ebuild
deleted file mode 100644
index ce813f5e3b07..000000000000
--- a/dev-python/configargparse/configargparse-1.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ConfigArgParse"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
-SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	local -x COLUMNS=80
-	esetup.py test
-}
diff --git a/dev-python/configargparse/configargparse-1.3.ebuild b/dev-python/configargparse/configargparse-1.3.ebuild
index 1c8ac6ffd0a9..a6b4ad280333 100644
--- a/dev-python/configargparse/configargparse-1.3.ebuild
+++ b/dev-python/configargparse/configargparse-1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 1a9344d76e46..1298f8b87e19 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,7 +1,5 @@
-DIST construct-2.10.59.tar.gz 1185999 BLAKE2B 35c861d5d4f5d68a158f25cffccda76621e0fe901e5f8bdf9c0aea61e3ddd2174c71767601be3533092a6a28748597cd1a044e4721436748b9a2dac81b81b41b SHA512 bf5867efdb9e1a27ddede6844f5f3466714e38dd97aae09c6990582989801605eebf90099fb3a0ab78deaed4f3b6be38421b635f6332461efd033d5fb8c2c1af
-DIST construct-2.10.60.tar.gz 1185983 BLAKE2B e263c15db9d8055db854508f767906e51fb260c47e2df17e2786277a3ed66e9a8599f21299b21d0629997c6ce2afd7651e18aee4c7f22d3e38bdc5db5bd53bd4 SHA512 597e4fd9f0264450fe221e100041a897d25794bea4dd5cbf5f58df8a0829a34490daff10764e6329ade165df631ddce661dceae4417d8f55472b2fad2a53e53d
 DIST construct-2.10.61.tar.gz 1185872 BLAKE2B 03eb83b707f607f65f13f6430815af3f91f728e133cc1a889f4ff37e34b249cff8f8b13ffb764fbffbba2bec699ce94173e3b80498c42f8fc7628a125b659188 SHA512 dd25f9646d55c4914fbb506b795dced01a5a2d58a9d8378ceaa4d5ba666c9547e96f7a658e8d521ef9a3f53065e89b90e0c8560bc2eb4095b9ff8077b840eec4
-EBUILD construct-2.10.59.ebuild 1013 BLAKE2B b5711fe7ac6b15cee8e6ec6bbf56d7eda79080b667d7f9be0f936b2c73aecf14b5a4592b549113e76824a3dadffaf41ef96ff2f5ccb2f2799fa983afcd7fdda9 SHA512 54d9f8a6f75ce3e7ba482e895aaefeeeb24b85ec166cf99c66f673aa2f7dee67343add9814caa367e2ca82ffbb8b9051fc5ea32e94197fd6a7814f95212d97e2
-EBUILD construct-2.10.60.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
-EBUILD construct-2.10.61.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
+DIST construct-2.10.63.tar.gz 1186101 BLAKE2B c0996f1228f36679d58ca931b27abb0b62da989d1554763295cf56086c9e288b3a02a4de23cca78a726a84c6483581662b01c8eb516d59a165b38eca8cc150f7 SHA512 6d3202f4c98f9c14edaf0c3ea90875eb43c9e3ca454f54a2fe3c6d7810957781a0fe95c60cb6b28445ab80a9ad3ae52c4a397cf9b3531f42d1cb443564427a9c
+EBUILD construct-2.10.61.ebuild 1048 BLAKE2B 631dbcaf685bf05bbdbecffc5df0a9eea55ccea7cd6083ef5588deaac43637e0700c118c342ee8479ced90887dfb2f9b6d1b1ca6f4f680f656be4c603ce46d49 SHA512 7dedb0189ecd92594ad89214d0865c0626081af605541b2c933509c0ba0e6d917444d2fe08dd9aa098f6a2acab7992c57734c9195611d71106e5c34be970ac36
+EBUILD construct-2.10.63.ebuild 1050 BLAKE2B c0a03dd249eb1ebdd1c7564e40d9e47053533b540f1ff4e9f44b0f58d6564bb87cac709a1158c5e07cf135bf32542930ef618402035bf3dce6333e94b6bdd337 SHA512 3dce47f01f7228cce377f0d098a29f683e7a6f27c4d38aac98b7f8b2850511d76dc3071cf5d7a76705c17421e05b6e0532d245b5344051b5be636796d8f14d96
 MISC metadata.xml 529 BLAKE2B d84b9d53c6bf6326dca24517df887c8edcb5ddce3c991bbcbbbe0b88df079f26e42d7bd1c634e6c769c9c784976f183e1f74f05d5476be4a5aabd22ad1be15e0 SHA512 6ccf55b1d39223fee6b243d86f918d236f8dbbc7583b7af4ca0c30d539a3998f74ed5d405d8f7381ca9a06ace0a7b405db0eec669e6bbbcaa33b6767639428f0
diff --git a/dev-python/construct/construct-2.10.59.ebuild b/dev-python/construct/construct-2.10.59.ebuild
deleted file mode 100644
index c6e6d2e95211..000000000000
--- a/dev-python/construct/construct-2.10.59.ebuild
+++ /dev/null
@@ -1,37 +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="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm tests/test_benchmarks.py || die
-}
-
-pkg_postinst() {
-	ewarn "Version 2.10.x has significant API and implementation changes from"
-	ewarn "previous 2.9.x releases. Please read the documentation at"
-	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
-	ewarn "for more info."
-}
diff --git a/dev-python/construct/construct-2.10.61.ebuild b/dev-python/construct/construct-2.10.61.ebuild
index 8382a5e82e73..9e4a2225ce5c 100644
--- a/dev-python/construct/construct-2.10.61.ebuild
+++ b/dev-python/construct/construct-2.10.61.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/construct/construct-2.10.60.ebuild b/dev-python/construct/construct-2.10.63.ebuild
index 8382a5e82e73..8382a5e82e73 100644
--- a/dev-python/construct/construct-2.10.60.ebuild
+++ b/dev-python/construct/construct-2.10.63.ebuild
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index d57e29f413e3..1b31d6472e36 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,9 @@
+DIST croniter-1.0.10.tar.gz 31547 BLAKE2B 7cb8d5c68fa567250c2d1a6aa7667bf07dff6864ee2d03308bd7d2348cc67c3254b74f97caa433e135746325170b8b75b7c84c45d2f93a535819e57391aea551 SHA512 46065a402e1d294104c564fc3229560499584eae1a2714e3760c547b24c1ab563c9bad73ef7510a7bda6dd4f3f3b4821ad56a0d51aeace96eea88079a5bf9973
 DIST croniter-1.0.6.tar.gz 30489 BLAKE2B a3caf1d0606dbec7a978e5089b08bf6edb13533524f5a3f1639483547b14a83f099276f4c63e9b84031202c088a8237326f70ecaca0bf3503f4a33173ce0d358 SHA512 1ca37c7dbd6a7365db112ccd474d76babc890aad1e2c341677be13c4f4e28a98219266efc065442e2077588a36b60c01d8e2996f0a32def690cf49e2c7c584bc
 DIST croniter-1.0.8.tar.gz 31019 BLAKE2B a637f7df806a85aeb236c38a9fa19ed0929fd257268cbe98bf7b281f1c52a9bfe98c91063da48b1344946f6619c5ac8f0e89051c1672fa6997c830dd97b7d9f2 SHA512 cf620baa55709c2379cc7f8f0123bd79e03b7dabaecd539633b8f52f97aa617c48e5692e0a45c08f4b30b2fab52c47cfc502c2ea550329083db2353ecdc56635
+DIST croniter-1.0.9.tar.gz 31258 BLAKE2B 01033a483f9f996ede903f9f0f648c9c2e5b270e0cce29845e264d0bbd6f792eeef69ada03ceca6b747ce4db98d79b7875f1fd9304492e40517d04f72f5a57da SHA512 3f8ceb2b759b8b80d296ac1e7994e6fa6ae7fe5b3921f9653edfbd325f88e66964366427df0b2e897abfc9d0b18b23524d8b4a8a2ab2536e37e357295edde6ab
+EBUILD croniter-1.0.10.ebuild 612 BLAKE2B 98d29bb4022d9d184f3d83bcf11d1d507a3b1a57098e8206bab552aff48b3dc42ba1a40263b46c3f8c369c00afb51b12e63418a34d6981d91e9b8ea9a9d8fdff SHA512 71242c8babd3eada845732b6506d428540397e2df10e852edb447c56918907b68bf2d0551908bd5ce9a244fb1ef26f4805c817f4005ea67576f9c2496c401e01
 EBUILD croniter-1.0.6.ebuild 685 BLAKE2B 4d70d54a476f912717c3e10434c97671dd62073a638fa4953f48fe3da31bb211c651b47c45ff53179d5c8899877427d20f8f32a78f3dca4966ae97f3ef0b5902 SHA512 d078347e938ab3b48902042c64128a200821baa3466cb4213278cc4ebc9688a520d205ec32ebc97af58b4f05a44b684ca0e53d6fb49f405867e05cbc26297f4d
 EBUILD croniter-1.0.8.ebuild 687 BLAKE2B 5b0092b53e7fd30c1e2822eeeb223eaf8e099448beda766cdc86b37c5ec21e6cf39fa86ac887d8533be3e7787cacbba9e4664a65c7124bc28a55848ee7494b89 SHA512 e805ae20ff19f5f05606df6d3a8969be7cba5e448f49030eaf098fb4ace60ae166e3f6e8d1f0ab193f82fa336f778e6ac06840a95794876e055d1626a3ddcc40
+EBUILD croniter-1.0.9.ebuild 650 BLAKE2B 8cefb050b6a3cf461d37e42857df4e3e695c24042b3fbc04a99bbf4d18f903fb413fa9f4d47e9cf4acd7a527b1e027dac8b9e18646b616a3980706e0bbc79230 SHA512 967cbb03c0c53ed7974d836e9313be2e523940306c6ebcfbefe22fec347d07ac04e5e73182c1c71393e8596da27f960453228f1cee0dd4d0cf78e44d673fc65f
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-1.0.10.ebuild b/dev-python/croniter/croniter-1.0.10.ebuild
new file mode 100644
index 000000000000..0eecd9d8c05e
--- /dev/null
+++ b/dev-python/croniter/croniter-1.0.10.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="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.0.9.ebuild b/dev-python/croniter/croniter-1.0.9.ebuild
new file mode 100644
index 000000000000..705594075b4d
--- /dev/null
+++ b/dev-python/croniter/croniter-1.0.9.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
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index a47db2b62c11..ecf81fbc0209 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,10 +1,13 @@
 DIST cryptography-3.2.1.tar.gz 540994 BLAKE2B 667f09ac81423ecdc84c8646f0d02ee3a2955f55d35623e59c07696810a93c47332f7f8d877918eeeb6581d8e02bde3b70aae8e9d32be7ffbc8011e5e7e382a9 SHA512 e3f1806693c24aadc3ef0df374ce1845760e87ad7c243226b75e80820b50bdc0760e4bb5f6ce26d62a6d23736b3109f72cd30b52ae2a36b26ec5656ec96c6175
 DIST cryptography-3.3.1.tar.gz 539756 BLAKE2B a3eb52d756565ae83d9f2e06045be1d3439a2464b633a9a168101796a448d7c7531e8247862f7996d04500347d32dcebf6b1352e9c9f2e4f0d8008d4bbd000dc SHA512 62192fe0fd3bb8844ccc0056ab72a42b038db2a4ecb0928543c520b85e1de93066dab0d604acf23d37395d68172b9618f81c6022a59ec49725bc1862096d15d1
 DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16fbf37fce6bcd5d6f3fe32e5a9bb60de8edbebcb1ff0450fabc9c244d4b1a4618c720b630f28c747fea17e9bf008f01f SHA512 55f6ee13342b3209b1fcb310f4c4d33d22856ee785cb2347e6ad36c34e9b42f6e0d5bece8e458b09663a5b78e34c4567fe7a211b51ca71f55ccc93e3f62dc5e4
+DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
 DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e62f8ce444526c051d7562467446d3e59c66064568fdfcbfb1fd35419fd79079ff9a02a2f3a97f870f7adef6cc9a0fd23b4edf514 SHA512 a102535bd3cf72118106ca7268d5a9921738d41f81247940c550961d61cb0d1869095b7891c39e8dc15816f7d38230622846747b4b7a3f226f09306cf86220bd
 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.2.1.ebuild 1939 BLAKE2B 864e5132848b955c862df3540b3358ead1d91a98807e7270eec064e19d5c99ad66eed9aa1d971751b5552da9f2f5db0d8da5a23894d0cc84051dfc1074e13fce SHA512 0a4452744993e5db8210dcdb0a9913113c26b276972e703e905e49de2d2dd0d03af094624b9e5338dc1faeec798cb8e2554d41edd0729f3502deaea4ae5ff598
 EBUILD cryptography-3.3.1.ebuild 1941 BLAKE2B b02de77b6a7a9cd982859e899acc43da80a5a877effaa7e4db7107ea09a56c919989a67017330582c6b0a891ef829e4846728f05f30b220c3355ba4a14802144 SHA512 7465483567f1306457cdc1d468e886d553fecefa10fe79e3bdb95d960f4a444a49b3ad099cb06988828c98dc594506bcd5041e3c34d75f9210a3368904ff9e40
 EBUILD cryptography-3.3.2.ebuild 1940 BLAKE2B c134594c15c4bd282db7a28682f6ba968d0fd3c1110f795dec457bb5cd4dc15b46448aaf64f405baba145ad8d50e0494f7a6cc188248fb2715ad01aec91ec0dd SHA512 43ba7342011798ef09884483439aa789079fa3f1a0324f17434d8fd9fd977f01f9c63b47b586b8d561052d89be8422b5b26eb18d046de89533520df4fc933497
+EBUILD cryptography-3.4.7.ebuild 1904 BLAKE2B f706aab2be57e3ade88f35244881e35035a4794e081f0130c5e6fa6459fd38ec23d708a8b23a384a102b35b976c2f5fcea22c18a54b834d3a2049383b5d9e6d4 SHA512 97c62c22c991f4302c31cdb4632fa54ff3588aed85d1cabb4f0877f7e9a06c4faa6edac9a1dbf73768d952759eab5d85c02f76f66e2fe4710bdf3442d439c6a0
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.4.7.ebuild b/dev-python/cryptography/cryptography-3.4.7.ebuild
new file mode 100644
index 000000000000..a659a036dd4d
--- /dev/null
+++ b/dev-python/cryptography/cryptography-3.4.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} 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="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	$(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-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	"
+RDEPEND+=${DEPEND}
+
+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
+
+	# this version does not really use Rust, it just creates a dummy
+	# extension to break stuff
+	export CRYPTOGRAPHY_DONT_BUILD_RUST=1
+	sed -e 's:from setuptools_rust import RustExtension:pass:' \
+		-e '/setup_requires/d' \
+		-i setup.py || die
+}
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index e847e8af88ee..2870ee0f7688 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,3 +1,5 @@
 DIST python-dbusmock-0.22.0.tar.gz 68626 BLAKE2B 51b897ad95bc547afe6cd59abed243dcaecd3c6ce8c47825f3a2eeaf7364c5aba04d23247c876f748b071f30753a86da954493bc63f0ae503085974e7e769658 SHA512 2c3430f4178a16acc376ce582f4a1a9bbe8b917efcd7eee58dab85ee3addf60ba355ae9e7b318ec2cdf7ca771183c37d16520a1e5bcab8414c66e2d2a36d26fe
+DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
 EBUILD dbusmock-0.22.0.ebuild 804 BLAKE2B 2db9472ddf0b454ba63b8048982f021d4ca089420e054fe0c459a4e0c88a22b55c29217950b24c16aeaf445c2f62dd04af72b89601af1ad4994f2d9567af4163 SHA512 c27e8c362edbd8d9375c89dd3c3caca559c750d379a84550a33b5adaf959676f9ba3915ab28980009333afa319198808a5d7ce0cac6d16be05752cacd6c6299b
+EBUILD dbusmock-0.23.0.ebuild 891 BLAKE2B c3ec1574b411b25461de9f1b95fc55e3ee14fa3873a31928bc6472f0845d9563762493331532e690b81a15fae220b72b4e8fa6fad729ee526e55ea55914deaaa SHA512 cfb50bfdfb3baf57ad78a284770304237cba3d873c9ada89994709c27fa1ffb2bc6db25f469f3acfefa3cbbddfcf915bb301d72c310f8e60c05008f8be3160e4
 MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.23.0.ebuild b/dev-python/dbusmock/dbusmock-0.23.0.ebuild
new file mode 100644
index 000000000000..f2d09692c7eb
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.23.0.ebuild
@@ -0,0 +1,36 @@
+# 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
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 885484fa1180..8809581ce1e5 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,7 +1,9 @@
 DIST denonavr-0.10.1.tar.gz 111775 BLAKE2B c96cd3f4597766fdd1d4d5182ad5eadcc3808f6aa7cd1f4029d29bfe204df561283ebb7cc7ecac836bb1d6614c43d8d56f12bd2b0a7dceb2d0c6fd92e8321d22 SHA512 a13d357f88b10fe9d75f81e3baf26232fe557c4c06d0205a12f40b858dd41a159d9a2b88ccd8b0138414f53195036ef4bb49aea2d9bcddfc03079faecea84fc4
+DIST denonavr-0.10.3.tar.gz 120245 BLAKE2B 573e6b97a5b1af102e8e23e67d0edc339d27188f0d233a2890fac37da7848c6f6f28e31ae7b5d9c419aac2512bd29e4320901b16aa3d1ae423b446522bed93a4 SHA512 b025a64e3d97ad6941e1850b66cadc5163b0fef309b6a978f1f823142ec4897f45a47e00726f6a92d1ab22fadaa4c5ba74d955bab7d821a69e3a7dd10435579a
 DIST denonavr-0.9.10.tar.gz 102045 BLAKE2B 2b0cde47d5ea50b218b04b696756d003494ff92f99ba88509312e1a2a8ce19f0bdc0c51671a7097fa1e7d7f63194d6435ddcfb31d902bf855368d69643c4c64a SHA512 8e0bb6a25eb38e798759dbee301371691c1b34e934054897d65d8829b7f7593044522fe4667c005abcf428ed1234016fb8bbf083e05c51502f722e4d8df3b155
 DIST denonavr-0.9.9.tar.gz 101902 BLAKE2B de30ad9520781eaa66a651f8a77ed88c76daa191f0de716f2cc00e21a8c8ae8883c5aa0c32167754062517763f903949626e04342a2342894a632cb9b94d2e20 SHA512 45d3b4fc6f8487caed0911ff7dd90dd28482de688429b8d0fae68db9a5d78959005ab2aab1b34eab34e964f4e82bccb6d57aadea367f81fc4a7927e54d771728
 EBUILD denonavr-0.10.1.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
+EBUILD denonavr-0.10.3.ebuild 792 BLAKE2B fca18b5a9cb941d63c304c381228b449f47032384877693f347fcb08ea34ca2241d7de8c01f408df00ef7cb7d8f957596fc8be4124646df38370f514baa2a121 SHA512 90b6e000ddaf4ffc9e9bc2ab122703c4d43e106c71b27b2f25745fd3b36acfb245c5ab079a2e290b8963cf0a36bcb481a27a6f9f7d7c60c2ec4f8cbc8e6774f7
 EBUILD denonavr-0.9.10.ebuild 641 BLAKE2B 97d82fad59ce2c8475d4a846714b5d7232136f6b518909acc2404548d94522bec1df9114b2c24d2f56a722130cf5c3d28eb5f3f036b6e787385932897ef383d0 SHA512 bc09e7386064ca14d35f12a5c0639f7ac727ee29d522243d5f1c520ad8709288d5f382b02fed049a5bf13bfb72c47dacd4437923a74b36a0e2dc23323b67228f
 EBUILD denonavr-0.9.9.ebuild 641 BLAKE2B 5d2b116310078139d8717fabe9e9ef3b11001f9e65ac905ad98dbfc033ecceaf8c839f4a83a413540e289015b68a324f31406d7fbb8a628c07f9a92560730fc4 SHA512 a63d635168f4599f3b01bb920493b27ec6a32f461d6c5ac7f8d9149d19884923ac0d3d2777354412c80a08f2546e53f47517c7cd0dbb426901006f195977f612
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.10.3.ebuild b/dev-python/denonavr/denonavr-0.10.3.ebuild
new file mode 100644
index 000000000000..31c4eb7e4c8f
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.10.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/async-lru[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/requests[${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/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index 1c3a4c9b9e40..83062cdd13fe 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,3 +1,3 @@
-DIST djangorestframework-3.12.2.tar.gz 842597 BLAKE2B f450d55ade3d9d2d21bedba50c8dd6437bde383f6b30a2987a1a4fd224b6a72a03fdaf878ce72f02c2791fe2ebee02f3d9e0915d979e4f70e2f0cb9615d4a299 SHA512 d3a43212a4fb2caec27f815af0c52f3c0d2c9933febfea246429b24640b3cf23668640a4c3ddb3e3453e74a904a2b439443bb01cf24b664d19e896c353f2cba3
-EBUILD djangorestframework-3.12.2.ebuild 480 BLAKE2B c32fbf2c196aa6957fb2bc45c1b2fa979adddc29b31e67c786d960175920c4829fba201dd1757b86730f3b466daa6f42945e65b80c4d131b5c29e31f25dcbcf5 SHA512 7074d87445929e827b46944855fa193daf81dea47b741af4dd71046a5f876c3aef022db1c6aa61e32a5ab6cb4401b008f9aa7a772080346ea80db228da77db7b
-MISC metadata.xml 330 BLAKE2B afda95e14e1db06af5da809e3466dcc99e4fabd85ef3b4b1c0ea9afad2e5d742eef67a46e89a915900d5d98569f5772c8977c391cc476924be51d021d0c0023c SHA512 1833829abd241267c19a2c94f54c56baac0bcb7fe478f56faea6690d8990acd35750439229f056ffe4a3059e159a732750623b317524a141d00c3cc40a52a8a0
+DIST django-rest-framework-3.12.2.gh.tar.gz 8856613 BLAKE2B 77d0b3bad38c7829387de752d913eb758935615213d8f8ada9422ecf25142383c1b11a1c95d5fc9f4cf7634e494119ddcb236c810e85429fa8cd4ecd1ef88132 SHA512 7c3e712897562eff14ddfa4ded6627d6b4263001e0c9a4047b92da43c0fd86e8ac9d09bb54bb87ce0d4e7743553c4733a60b18327f7e4d481cb9898593731467
+EBUILD djangorestframework-3.12.2.ebuild 897 BLAKE2B 5363888f5bb74b56a863bde2b9406b5976db952037ce7df5ec75db96bd75d46841d52eb278201ea817847497fdf7e76de0ea82fecdd9040d7e9df6aa9af6e394 SHA512 f1987c8a4122fc653ab8bf9b95730f58657dde1502887bbd78f6cd8a02d3ccdcb14350ebd602c3d7f2cd320929fa64cdb166adcfd24601f3ee2cccddb9502c2f
+MISC metadata.xml 431 BLAKE2B 4e9fd677093de3074b75e24f0d768494886befde22707fa528f9549739010c51d483887496723a7ec2e3dfafe1260278e4b31d1815798f0315128223043887cd SHA512 7cfa16ab9c37969620ac236ed11fc6a347091ffc861c6ee740d9dbca3717f5092e5a2b2bca7cafba24c1b527581210bbc0d1f1ab602960f5f8b71787346a9a77
diff --git a/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild b/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild
index b280f1c308d8..8530587f35df 100644
--- a/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.12.2.ebuild
@@ -7,16 +7,34 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
+MY_P=django-rest-framework-${PV}
 DESCRIPTION="Web APIs with django made easy"
-HOMEPAGE="https://www.django-rest-framework.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.django-rest-framework.org/"
+SRC_URI="
+	https://github.com/encode/django-rest-framework/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"
 
 RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/coreapi[${PYTHON_USEDEP}]
+		dev-python/coreschema[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
 
-distutils_enable_tests setup.py
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		tests/test_description.py::TestViewNamesAndDescriptions::test_markdown
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/djangorestframework/metadata.xml b/dev-python/djangorestframework/metadata.xml
index 6650f6a06ae6..d50c8767ecd4 100644
--- a/dev-python/djangorestframework/metadata.xml
+++ b/dev-python/djangorestframework/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">djangorestframework</remote-id>
 	</upstream>
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 83622769b363..a248221d13c5 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,9 +1,5 @@
-DIST docker-py-4.4.0.tar.gz 246544 BLAKE2B d19b923499bb32f85728f88e479db330f442ddc32da06cad6f56cfff3386a020e45a0ede1afff635ce3d0e2d5e9112b0a4022969f75647eb6e57c13ef1bd6cb0 SHA512 8882a6547570d64c4cf9db7e1bd5ad13dca9a5b439631f3436587aecc1ed3386b230f9b6f82c07d9614f7d29d918ec6a3733fa6af6d8784a698e1b8459d4dcbc
-DIST docker-py-4.4.2.tar.gz 247164 BLAKE2B dc341e78642a8b44cb1f8eb2e8c58231779426343bee7afd41c0fd6a1ec089a26b96bb00be93f51fb0ad8e162e7442084c3ac74525785e7972b88aa6705c3435 SHA512 f42eef12c51307338aa5b73016f4033cb2f99c469fbc80c481753a2a8427e6661f82fe228328b4bc67cfb482ebda4e68e6bb435217e64e6f1299d32237d815f4
 DIST docker-py-4.4.3.tar.gz 247491 BLAKE2B 1cc69a700e58abf89588831bd6f99da4b3bab0d8d51e7c193568a9291bce9f13c3d0415a135612439154d2e0651a3ac79b0365386eabcf47059f2ed8e0ed66d9 SHA512 270323f2f096714d7b63f2382da233d061a3dc228279aa3fb89a1dd295321f63f8dd1a883d5cf7afb400341962ec4e060607a03e5e6df43f4f1e629d4e217d73
 DIST docker-py-4.4.4.tar.gz 247640 BLAKE2B 68b2e0d41e68fdf4826d61b7ab167321467b1b30f122f0b29955a62ac5f036fc0b60b02a8c9a6776ffd9a7cafb5744de44ec3b9284d0f266a1dd5c72fbec2879 SHA512 4106ffe353ce8c3227c30c38347f107e0f7da660f1c3ae68bf2c576fc6b270f6fae6774747c46491eae0fc85a48dfe246b7a22d8e45c74eff89ed43be285f0df
-EBUILD docker-py-4.4.0.ebuild 1113 BLAKE2B c5be2065ae90782a0b533f76fb7048d10f83a3db5b049b98409a85c94e9cb84c077b0434ffb3fb423bb8f491751efc58228d7006a4a6b087ae26f182a5ef8582 SHA512 b8f837c6bb07d948fad16ff2f79a4f1061ca1b87672b8bcb81761cb8b0af2852606a4c095aa4b498f8bb0c0f6e0be50e60212a33de63bdbb4ce0820659e9d223
-EBUILD docker-py-4.4.2.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
-EBUILD docker-py-4.4.3.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
+EBUILD docker-py-4.4.3.ebuild 1065 BLAKE2B 3a5aaf6e50cfde0db4323f0168d584c390bc0bbe3191b7a2e2696cec452f81ca259002d2a082a5eab8d4ae4109d7851f6b07a4185722722c720f7b3921d37a46 SHA512 815167957b5cb6356611516dd5c57f0b378c636380cace7ab6d40cf193d8ccbf494c6dfe2971bd83abe5196aef8664969fd48850c898f5a5b003ac039f582455
 EBUILD docker-py-4.4.4.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
 MISC metadata.xml 434 BLAKE2B a6fd9237a338297a004bc72f08239cc92642aba95c590bf7f2f287c5b3d196b632998dfe5c32cf8155498df1472fc84f4d41290880b14161c8d43d0a70ed7f5c SHA512 fb6af1a1021d752928bfad27313ccbba2f09ad88249ddb9cc7db4c1f1fd591035f636eb35d79f675b5fcfb984f1d201fdd7a8d4b38cb2193abbd31f2d62f039e
diff --git a/dev-python/docker-py/docker-py-4.4.0.ebuild b/dev-python/docker-py/docker-py-4.4.0.ebuild
deleted file mode 100644
index 5125e5f9a539..000000000000
--- a/dev-python/docker-py/docker-py-4.4.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..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.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${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-4.4.2.ebuild b/dev-python/docker-py/docker-py-4.4.2.ebuild
deleted file mode 100644
index 6cfc62e02e87..000000000000
--- a/dev-python/docker-py/docker-py-4.4.2.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-4.4.3.ebuild b/dev-python/docker-py/docker-py-4.4.3.ebuild
index 6cfc62e02e87..911b9fb84a08 100644
--- a/dev-python/docker-py/docker-py-4.4.3.ebuild
+++ b/dev-python/docker-py/docker-py-4.4.3.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/dulwich/Manifest b/dev-python/dulwich/Manifest
index 97f1864a3756..e19a68b4744a 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,10 +2,12 @@ DIST dulwich-0.20.15.tar.gz 391841 BLAKE2B 8db19f84154dff0851fd16bc534d92b506c93
 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 1622 BLAKE2B 4575bf17b5e18a6c9b24e874ecfca0d0570011c7192ff015df65e0ef61410dd3f9db3b0d514cbba33a58321bee9c94375460a4d570b03355b11f55d7263cfdae SHA512 30e6a165a3b63a84d4e107b70a6a7a9bbe9fac37dfd7ca1b195b282a51c4a5547b948fcb5e7a57801d3e782c2cdd654261864ba46f7c9c7f8ca3aeba05b91297
 EBUILD dulwich-0.20.18.ebuild 1623 BLAKE2B d30b2cc83dfed6b4497f7995bc7a5ce80370478e54dd507e061d088cb291484f1b8d518e6f46a5a744b11c67e0a16086ed18b62355c6ce9776460cc0636a0672 SHA512 ebfed958f09bead470ad802824438a7f6d3ee6a934a87f7a3a5b812b61322a9ce390af4d179fd94f95471fede1711315a183a4224d385288949b7ddf9d7bebe8
 EBUILD dulwich-0.20.19.ebuild 1622 BLAKE2B 762f7f22e8fadab0af20458eb9e8e8728587e7b7407b9efe36aea1168e31bd06ca5ab00d134e373cb7164c9d86c0bc47ef182fb33109883dec2a4ef756bfe399 SHA512 17a7eef4f7ed4a79477434b887ade22941b724775f8b6f8ed56ab3f69fa4c1dca17ae788dec4eb3eea54892e6c16509e377b97b29b7d501b77c048b7bd6775bc
 EBUILD dulwich-0.20.20.ebuild 1634 BLAKE2B efc98f7ef54b9d9f4edd2ade18aa8c6033357c5215b4258b6aa6fa12f990501749512871676e506bdc2723aad490f44f73276b749f83d462b410860fdcf70548 SHA512 b2d2169bc5693b78f8e3c29e460d2d0b658fa68ee8002aefbd513ff4e7791dc5122d138d4ecd238b6f7774f96d59e445d43a17c5964f9f68fe6563ec6506b881
+EBUILD dulwich-0.20.21.ebuild 1634 BLAKE2B efc98f7ef54b9d9f4edd2ade18aa8c6033357c5215b4258b6aa6fa12f990501749512871676e506bdc2723aad490f44f73276b749f83d462b410860fdcf70548 SHA512 b2d2169bc5693b78f8e3c29e460d2d0b658fa68ee8002aefbd513ff4e7791dc5122d138d4ecd238b6f7774f96d59e445d43a17c5964f9f68fe6563ec6506b881
 EBUILD dulwich-0.20.6.ebuild 1616 BLAKE2B d82dd9edb8fe9e96bf7bd7adc8d78f8fefd1e3a853fa851d5de6c5b48310d7bd15bbde07215586efc8721ad0408bf69ed5ea3f350415b337dc4a1f2d0109c6bb SHA512 867cf515ebb647f25bcb356f924739e412aa9746cc4842cbbab63ac23e8431ef2a06103fa3324aeff6ee04a9f66b3b142f06b7515cbfd2a20be6ec87e68f490e
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.21.ebuild b/dev-python/dulwich/dulwich-0.20.21.ebuild
new file mode 100644
index 000000000000..dca05e756a2a
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.21.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=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+ 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"
+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/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/elementpath/Manifest b/dev-python/elementpath/Manifest
index cc1f0701b80e..2824e14229c3 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,7 @@
 DIST elementpath-2.1.4.tar.gz 208691 BLAKE2B 8317c8fa90d7feaff76357c19ed8373644d60985b1d53a1e0a702e26bf80887523a0f1dcf601800ac1618e8f681b3898b5d56fb4edbbffaacbb4a0efe58f67b1 SHA512 d965bd58254e601000da5be309ab18d3f5964cbc1224092e5e38b4523eb3ac2f7ae6e71fa6c3698b40b13484ed1d07bf93c80d45a9b3ad04f69f63bd18a42975
 DIST elementpath-2.2.0.gh.tar.gz 222412 BLAKE2B ac05a3ef816713377ec304962732c60f587972e903541748f0f4958aab0456da9aafbccf66d981b852a98d63b37224499af89125e34dae3fec6094f793f823b3 SHA512 db9950fc1d02d3207db73ad0066d681a8e3b293817e2b4fe0c133eff9e8d822f72d2fca4cd631802765d3ee82c2cae69beeae1332b427adac90bca61978d47a9
+DIST elementpath-2.2.1.gh.tar.gz 228166 BLAKE2B 0fb0f338a28d155056bd551dc00e634a00a820945e8147ac8a1eb4811aca9e25c563e9011f1a0de9d2aad5761322fb8d9167b64cc5653bbc4012d0631c81fb05 SHA512 eadeb7fbdaa5470c39a59c8f02047aa8f8e76bfa03087bf2a3206f3fad57ae78da82ccee1de5e6c13207c9e22ca5a45de4c1b4b42c62f8141c8f2bacece02ebf
 EBUILD elementpath-2.1.4.ebuild 679 BLAKE2B eab5968905b8fc6c6872de574ee336e1bccef21c2dda88dcaa24b3b77e65a6125eba54f67e4e56a220aa7c387a3cfd1e3cdf05da722da75c17c18c84098f0551 SHA512 efe4c68ba47f3cc462eb07079a3302e5a82250003199eac7c4b7af5b778af7f0f7df1f1d5d314901738ec0f32935e89faed7df904068293d7c26b78e7f10fbac
 EBUILD elementpath-2.2.0.ebuild 734 BLAKE2B 99b4edf3644f4228e31ce338ced8664e83d346bdfa3ccfe1464391a0886dae6450a86846ec1c7e97666bf8fad69c453cc176dd6c3c7d0fd52e4eab6883b6928b SHA512 0cd6e57ad641928f76c7188720b7b94d7b71baa94b020e76bac44518a0b1613e9fdef7367ec4f9994ed9c59b05a0c702cb6ef9db1edad0ca5e48aa3eb10cd555
+EBUILD elementpath-2.2.1.ebuild 734 BLAKE2B 99b4edf3644f4228e31ce338ced8664e83d346bdfa3ccfe1464391a0886dae6450a86846ec1c7e97666bf8fad69c453cc176dd6c3c7d0fd52e4eab6883b6928b SHA512 0cd6e57ad641928f76c7188720b7b94d7b71baa94b020e76bac44518a0b1613e9fdef7367ec4f9994ed9c59b05a0c702cb6ef9db1edad0ca5e48aa3eb10cd555
 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
new file mode 100644
index 000000000000..3beb456d1bf3
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.2.1.ebuild
@@ -0,0 +1,28 @@
+# 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/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 403c32dd7bc1..20dc33438a2f 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,5 @@
 DIST fakeredis-1.4.5.gh.tar.gz 66197 BLAKE2B f0f36d1e209673f7722849e835c2a33fac9f7e8bfb1294ecf2e69478295f14af514d0fc4a5732a20ce099333b136d682591fef031ce90d6262fa8c9025cbfa2e SHA512 e16ae5c5947a924b0c9c40ae68efebad5cccea9f88d1b5c3f1677e1ccb8c1fa75dbafc9b413c2359b774f3043c387ff91ecd4e2e21204036883175944338d59b
+DIST fakeredis-1.5.0.gh.tar.gz 66371 BLAKE2B da9a961b9e163ba8221193c9c353f17bd23a710bd105b4fc6b9249a857828ece0b3551e3890818b0519f96aa9691166658332c25b796b22827f0951d3f50cebf SHA512 5bd4965c36abada4b937b635318d58e88ba76d30ff577b0f9b9134a94a3407a8c0e92d953e6b5299cabfe11ebe5a785e9d75406e8a07a4257674be64f6b8cffb
 EBUILD fakeredis-1.4.5.ebuild 1063 BLAKE2B a907f50bed37d3701ce8cb8fe89d653508ed2e7fccc1804e5faa5401895273f074901c2b968ae233a526eb9a35e880f86ed8a94c2369737aa3464f17af52529e SHA512 097dfdeb44895349af3fda7921d0e9c3a22a9a966ece80639cfbfa96a5a594bbad271a3b6047152a152c11640ad7be59072edc364cfe7b944ff014c7af1b40f3
+EBUILD fakeredis-1.5.0.ebuild 1026 BLAKE2B 65591f5dc04edb14528ca2b1cd8ccd06330c78693bced3f80704fc2a1a12f68421c14ae89459a097b10efba2192b39de0d498198b1edf8c7877488dea35d3e7e SHA512 ae3997c461c698463f9f631602f1a01e7c60a1f194b0c8deecd0bec665a56cba38760fc21a894f367e329c3e52e4ad9a1a5bf181ea6d2647ea963400acf41e0a
 MISC metadata.xml 371 BLAKE2B 5d6b5f058881d62662d45b5f0207912d915fc731a4816b16ee098d19f7e8aa98f63e45bc68c6a41db7c09a84b4a82177a74e4edf566e506f287dc806bc461d54 SHA512 f43716bb013e8bcf042b0c75393686f1ae7eeac8b1f4b9c2d1acd27738d1f82427ded18f51d857032361ba2f4a3ea9679d3bcbb9ad2d99c3def5beac2873af3b
diff --git a/dev-python/fakeredis/fakeredis-1.5.0.ebuild b/dev-python/fakeredis/fakeredis-1.5.0.ebuild
new file mode 100644
index 000000000000..7c66ea7651cb
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.5.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=( pypy3 python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/jamesls/fakeredis/
+	https://pypi.org/project/fakeredis/"
+SRC_URI="
+	https://github.com/jamesls/fakeredis/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# tests for use with aioredis, not packaged in ::gentoo
+		--ignore test/test_aioredis.py
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+
+	epytest "${excludes[@]}"
+}
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 13bc191546d5..35c3087d315c 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Compress-1.8.0.tar.gz 10182 BLAKE2B ff292503dd0a141ffb3d49e57f62755c59244129e53268f97d0ab5bdf4644108d9eea5567982fbb000afe54d7a418751f5b8ecb685b3e42c25413e7740d03004 SHA512 9bdc45b6d189e8b896a781dc48b761ac99a551a32bdaa9695556e7dabfd76f7ef98249397a31492e629ea35d82c5104d99b5803b9ecf9b2637cc802a87939f1c
 DIST Flask-Compress-1.9.0.tar.gz 10322 BLAKE2B 4dddfd8a5c4c182a0cb3c5f346ccca611517ab6471dd23512c885e3e370ac09f9a099994afd2ee28eae47cca6cba2d49220d8733103e6cdcfbae03b98a2480f1 SHA512 5f13f20a3a2f8e646a4324cf75a419ea5111252db701a17dd37bbafdb9228d0e279a6c957c5cfd69468bbdffb435e37a50e0dcf5d1a160f7397df1e6a9e6ac9e
-EBUILD flask-compress-1.8.0.ebuild 580 BLAKE2B b5d52f10dbee1163498c4749e0d34f7321c404a62e99ca0114e76a551b1a8cd22ed824eb8473d490004b8a125c84069179d2c25cba1fb1cafb39bccf64aca2b3 SHA512 5295788039e66aa309e43f294288c997192cf4e847630395c79122b52366d8e2c859d3fb528c5c4d037d7499ff4242652cbee5e5ac8001f5564b58a79d5170bc
-EBUILD flask-compress-1.9.0.ebuild 581 BLAKE2B 613116444f4b14052f19093aea47c01c99bc9f0ca0369f193856a46610e5adb85e0759d2cdc53f0dfdbc22decaf08d53725508245206ebbb1fc4523b5cb9e6b7 SHA512 e24e6b6a7d4d8617ba17291d806d5413f8d29a4fb352988cfc22086e9829acc5c68f86576b9f7f65ab0b92639db2f35ac54eafe936d8a3cd655901c2d7d7e61f
+EBUILD flask-compress-1.9.0.ebuild 579 BLAKE2B a032f06bf8635092eb5dc958ec57596e5ea4cdf819597d7300b259444f1ed56a3b23654f4cb9311abcf7876fbbfa4ec794021df825c955ecdf0b34b3d53e3794 SHA512 040e25f773b8168308cd3a8ef316a9c4aa63e1a225d89bd42662f097e31b638cfc0fd14560bec9a1b272e5df9ea2fd23374710cade29d5bcdc28fc841d83f34f
 MISC metadata.xml 455 BLAKE2B 32bea36b88ad19fed08198fe3ac37b3853dd3a50b1d24c67f56e06a222537e48ca275a701a11bd5d2027ef3533d1603f44daa9aa7d2c5b41081bf78e1c1ad842 SHA512 c3f44e2c49cda143874476662b0fb3458d2bd1f2651d2664e10e45cf373886765e0d6ffd1125bc9e8de9c0c0ce9ee1d9b23279ff4afc1ce40e60e5bb748850f9
diff --git a/dev-python/flask-compress/flask-compress-1.8.0.ebuild b/dev-python/flask-compress/flask-compress-1.8.0.ebuild
deleted file mode 100644
index a72cc1bc0717..000000000000
--- a/dev-python/flask-compress/flask-compress-1.8.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,8,9} )
-
-inherit distutils-r1
-
-MY_PN="Flask-Compress"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="https://pypi.org/project/Flask-Compress/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-compress/flask-compress-1.9.0.ebuild b/dev-python/flask-compress/flask-compress-1.9.0.ebuild
index 09ca669397be..ea7d69efc9ad 100644
--- a/dev-python/flask-compress/flask-compress-1.9.0.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.9.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index c7a269991175..d46eb0e330d3 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,9 +1,3 @@
-DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b
-DIST Flask-Migrate-2.5.3.tar.gz 12652 BLAKE2B 4a43cb3849ffa31afa00031ffbdfc130d07a8282184ca43c58a9b49fe94c456ee46a735fd6df9f9e3fa00ae0c82c1688852a68f2bf278afc5b08d64b31a473e7 SHA512 f26db1c6ceddceb635cce4259b4508ecc8dc26dbfa67397205668883129835840050d909337a73712d3b1ff3e0bbfab74f5ac94c2ac472ec64f86e64789107ac
-DIST Flask-Migrate-2.6.0.tar.gz 12671 BLAKE2B d8d1ab6fc7c077cc9c6dfe5de26c7ab0f2bcb45455f28fdb1bc03b6ac23a063f5c4103d57050a3e0818debd59cd9927ed4833d1cd924a2147ae16f766c045d82 SHA512 91ce86079b8f438357e5bffa809dd737c26ca5cb553ac9bd315ce5039112842e2a52fbf3cec3f6548eb13def8d641be2a4e12dcbe01995b1ab073af989dbbb68
 DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab
-EBUILD flask-migrate-2.5.2.ebuild 861 BLAKE2B 2d3459c197039ae77db7b77ec0ae3c7bcbe705650de1ce4c8fb1c3cb7ed305e1a9b51b8ca4d41128671905e78ed6aa89477a93094ed3793d7c578494d8a225c2 SHA512 115f6fb886680ffe5b03c4991a645d1a62e1f06703f2c895dfb025278568b75173d5f475adb404aee9548e4f5be5646a15c471e4e3ee207f3fa2ef0344c8efd2
-EBUILD flask-migrate-2.5.3.ebuild 773 BLAKE2B 5a63c31af79952d09ed28481dcca49fed98e5f1d6e1be27616017c0286267bf17095edb26bade3f3cd0348251b8f8f1e005723d7b99187ac228a3097c0d217cf SHA512 bbc8844ebcc889240a8426bc13c472eb310ce160c6aff1fa951431ad48dab05b3b81abf7e473a0f1ff1abbaaa3ea03aaec54f7959778235a7c5cba3535c89b57
-EBUILD flask-migrate-2.6.0.ebuild 767 BLAKE2B 7047b2c454f80ce023606feb9488cda75fba4e4fc2810035d60274b6df62dbabaf16b0da5d17d6a530a3c59f8c916f929897f78d4b8b4c2d5174b775970ae38b SHA512 e4a1e22eecdcc339a028c6c0ad079905c6a057c874fb299296c664d525798e5d525f9762c6cdb7741a964e244af052a392af2745a35b1a29f2335b7786a0b247
-EBUILD flask-migrate-2.7.0.ebuild 769 BLAKE2B 67b5cad5c9be9025cce56618293bb2af69d0ca13077ac5322db12e47428e6c48d917a835031eb867a84b1ebca8326f3bfca5d3fd5527943fbd14a8cb270e7e13 SHA512 0165d0d3c2aa0e949dac289762d8b464b479b7c26aa310c8cac941f3c72565c30cae8d204c0a535aa5ea3f8b692e5052e786b4e59fceb115adbd75b889b02750
+EBUILD flask-migrate-2.7.0.ebuild 767 BLAKE2B 7047b2c454f80ce023606feb9488cda75fba4e4fc2810035d60274b6df62dbabaf16b0da5d17d6a530a3c59f8c916f929897f78d4b8b4c2d5174b775970ae38b SHA512 e4a1e22eecdcc339a028c6c0ad079905c6a057c874fb299296c664d525798e5d525f9762c6cdb7741a964e244af052a392af2745a35b1a29f2335b7786a0b247
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
deleted file mode 100644
index be3781444a5c..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
+++ /dev/null
@@ -1,36 +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
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	esetup.py test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
deleted file mode 100644
index c5751ef98fe8..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.5.3.ebuild
+++ /dev/null
@@ -1,33 +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
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild
deleted file mode 100644
index e72818dcefbe..000000000000
--- a/dev-python/flask-migrate/flask-migrate-2.6.0.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} )
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
-	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
index 862a4f3171e1..e72818dcefbe 100644
--- a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 21a42256e22a..23459d8b96b1 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,3 +1,5 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
+DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e29257fb1c488e3eefe79121634ef4f272db7e96d9621962de2e576da5b684c64653475ebb702bee313564b7fb41cd SHA512 660b787f0a4fc85d8d893087369b378ba5583e1dad82feb8ca3737e70c8c0a5ab5d95a38b7d3e9edff481d5207e946f6e6c7e60f22f96a1de0d2daeef6f16c2b
 EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
-MISC metadata.xml 387 BLAKE2B 558c51622108fda31f6d402dcac0a289a358a2ca78394c2bb426ad37522a72ae7528db2f926529c376f79431976cb31861f504e9298d443f4fb56d6c029cd06e SHA512 5e0806b66ecdfecabf8705ffe986dc33cfe6a9e33dfd18d4c06ff2e31503f59d35b009ec1ab1d01d01df612c7a2889d81753d9900fd12edc6cd1838ef14fdf5c
+EBUILD flit_core-3.2.0.ebuild 672 BLAKE2B b2201182b6e265b0175af97ba112fafdeafbf26cb7cf4b9611ff060608a6d64bbd0abc1b0e8d5b3976351d6d259b31689a909c7c1fc3208197535a0f8b7bd96d SHA512 e411e5bb4f5c343b219a1ecc10ca49df46501015859a853a3ff1e9a0a4dcd342cec9a2da4eb285373e13c74d0bcae0f0f7042489ffbc4c25ef8a22364cfa7f5d
+MISC metadata.xml 494 BLAKE2B 45cafc5e7fbac4425836c2af8bf464438ee852077e82512ef8964af26957337530744a1e65d54904a6c9469c2d9f501e15309daa468bd3bc474de91bab0fe5e0 SHA512 9d48e122ac8238876796333b91c422ec0f4f35b58970ea4d0e806758ca8e47670dc03a266b0f6e6ede0961d1aa88efd7ab6ae9cb90e02004ef2f4017912dacca
diff --git a/dev-python/flit_core/flit_core-3.2.0.ebuild b/dev-python/flit_core/flit_core-3.2.0.ebuild
new file mode 100644
index 000000000000..bfb5ad97f0cc
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="https://pypi.org/project/flit-core/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flit_core/metadata.xml b/dev-python/flit_core/metadata.xml
index 099e985116fb..e8b963cbb1a1 100644
--- a/dev-python/flit_core/metadata.xml
+++ b/dev-python/flit_core/metadata.xml
@@ -5,6 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">flit-core</remote-id>
     <remote-id type="github">takluyver/flit</remote-id>
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index a943963f9e41..45189113630e 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,7 @@
 DIST gitdb-4.0.5.tar.gz 392815 BLAKE2B ab0c557f1233ec6f454769c3d72d982c876cf7b8f67d8b36f9ed8a6a2ee4a04a7a22e1a7453aad0d128436e679940ffea9b2c1e6d433083634b47ffff08b396c SHA512 a3f562928a863121c4051663a0674aa94937527b2fc40a7f392d2913d4d1443bda278e2f7cf362d499389691d24a2d965ab89a6533d42a157db3ab629a377e83
+DIST gitdb-4.0.6.tar.gz 394670 BLAKE2B 579579981a4597fa540d7f2987fb24b81ee64066349ed479816ce010a94358af9d0821b8abb10886a5b6fdb56e158c398688690d9570495f041f974e3964b5a6 SHA512 b9cf964390cf18894c02e8854ef5099ef239bf4a43ae8659bf3def22a0fc35814c7416fd8b8312d9d0a170e5e0ea84380edbcac47cc435dc9ec1d98cf7f6463f
+DIST gitdb-4.0.7.tar.gz 394664 BLAKE2B 4a4586ac276c719110e7ad9ddccca8c0f45cca42f6740d990a974b043a749148088c495ad1939794382ff4094afa712cfa7f17619f371423f1b7a10e65ce72d2 SHA512 db63a613ee59249a3fccbd09fc0eca5747b166180bb5885737f849e339e81dfacd04f65e438fef241cf013cde33fe8c99a569c1599b2b5defd37b50e87dbdb0a
 EBUILD gitdb-4.0.5-r1.ebuild 1354 BLAKE2B f8d9d018ae2dcbcd902c608cfbff10e3d1033e54a48e375e374bc15a2b97514ff2d5c2cb8a3d01a29687a663d36fd9a724aedd958407589910a865aa2772bbcd SHA512 55c9b2ca5988f2c7a1f71aa947e69e7e073635ff54c6d0ede3befef7f8fefd0f91ed0dd6cd81aa8f16631439fe8f337750c09b7fbf5e00121d1c9bf8d7974a83
+EBUILD gitdb-4.0.6.ebuild 1357 BLAKE2B dc8a6bf537984e8837f1da5839de84a449b361a6599cf9e7a7f7d70a36e0804ae4ca385cb82814e681b3c67f3e58482e0bf58b61478e59c543eecd1fada06a4e SHA512 6325c4caed5c4f2e57c70a3431ee7ca7efcaf03b3c8840f1984bbb72e5bf33b0ab70f78baad299f032ecf9a3e50333b3c724999a6ede66b1b9936217a0467eed
+EBUILD gitdb-4.0.7.ebuild 1357 BLAKE2B dc8a6bf537984e8837f1da5839de84a449b361a6599cf9e7a7f7d70a36e0804ae4ca385cb82814e681b3c67f3e58482e0bf58b61478e59c543eecd1fada06a4e SHA512 6325c4caed5c4f2e57c70a3431ee7ca7efcaf03b3c8840f1984bbb72e5bf33b0ab70f78baad299f032ecf9a3e50333b3c724999a6ede66b1b9936217a0467eed
 MISC metadata.xml 411 BLAKE2B 270925cade7731451404999603981322c15224b7a6a2580c957af06cf8dbc940adeb40a63452ae6ce11f725a01af58ff56e85c4ba63a92e2027f4c13c81e1689 SHA512 361528c0a12026a9bef55a22d172ca8fbb0f82389ad2e867a2d8bcf65913cff9a2d510121f6b54be00a1d8ccb2bca471e2c3579054d3746fcedae910d4f3b361
diff --git a/dev-python/gitdb/gitdb-4.0.6.ebuild b/dev-python/gitdb/gitdb-4.0.6.ebuild
new file mode 100644
index 000000000000..7b465b4d702f
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.6.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
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.org/project/gitdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# remove unnecessary version restriction
+	# https://github.com/gitpython-developers/gitdb/issues/67
+	sed -i -e '/smmap/s:,<4::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/gitdb/gitdb-4.0.7.ebuild b/dev-python/gitdb/gitdb-4.0.7.ebuild
new file mode 100644
index 000000000000..7b465b4d702f
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.7.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
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb
+	https://pypi.org/project/gitdb/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# remove unnecessary version restriction
+	# https://github.com/gitpython-developers/gitdb/issues/67
+	sed -i -e '/smmap/s:,<4::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index b2b3e3a64abe..375720247c7e 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,5 +1,8 @@
 DIST google-api-core-1.26.0.tar.gz 132817 BLAKE2B f077e5f7a50de69ef3707d3e9a54f3b4948c458ee1eda058778fda618b202e7fd5fb7a116b9b153bf77bdbda858a91616e2f201d2aac45d8654a44001f52c71f SHA512 2e35f231936d06a6c05dbc4930da881e17c53d10224ed394d7deec9fcc45647ccb3dc72316912c31300bc5d3776467d6aab160660695c9919f28fdf73bfd2ffe
 DIST google-api-core-1.26.1.tar.gz 132880 BLAKE2B f1872c1240b0b40385fce0496c676c2408501600710ec51cdcbfa8c5f0f15858ef62860f33022bd9ceaffbca25ec83cc1879b7ec7c3a3b119e5e3cc4ac043a0f SHA512 138bd10895006885761f34932bf8f4b0776c2f3a2c2038d97d1837d961088b4a19cbd84321a493b81cad4727374949e87c59b7f649507a7cb356e6457a94cb1f
+DIST google-api-core-1.26.2.tar.gz 133082 BLAKE2B ea574b5ef08406c2452b6e9b5acf055f675bb1a0b966d7adc83c830f761d2ac5fe53d2ea6fa6d47e75b1fa1dcbf144836f4865b7f1ab0688aee20d54df214b01 SHA512 da58f871cbe95d5dc040a50da192750afee9804145aa0fba07434d085f799bf8c18ac29fd1c733ffe76c9109be7e76323b0c307d48d74fcd0d73e51e5120ccce
 EBUILD google-api-core-1.26.0.ebuild 1220 BLAKE2B 998bc8b03c3c5e1364def5a34324dcf2a2f83a7e67b93ee39c56660392abd0240833963aed60746807476a24ddfb2abe33a695e7cc1914c339f63946404b2b3d SHA512 a6521e2eba9b86d54f35660429f21a280032ac316bcac7cc835ea7cc6eefdbef08ccdef41f8b380556be21d66f49d95cb4806c14dea5de4f202cd35c9f7e58a3
+EBUILD google-api-core-1.26.1-r1.ebuild 1262 BLAKE2B 80d50ffd74520f2ecd050586bedb1067db37be45bc7879ca0abecb09d2e027f4a1c70e0bfc38750ace23ba4acd28235e09464c966a95239511b04454a97d8f51 SHA512 1840aa564a0b56f8d887e6446ce68f57f109e63029fe6dfa50bf1ad0df174656ab4f9bbce50498e3c1f937d855c20d9f4aa0df039e709ed8ee04b32c3dbde11a
 EBUILD google-api-core-1.26.1.ebuild 1222 BLAKE2B 042cb59845de1b8618513cd397267fc88c0eb17aefe098fd298158129140e475f4459ae85c71e88bf959b4c368c483490a6473bf15104aad13356e86ef5d40ca SHA512 18c69a18757c1e953340d950eb5587456f8b083183ad9502f7ee953e71268d1e122ee3a15a29ee8d31e82f7c144ca4e3bc4d70e1b256c30af9ed5bebefc70338
+EBUILD google-api-core-1.26.2.ebuild 1262 BLAKE2B 80d50ffd74520f2ecd050586bedb1067db37be45bc7879ca0abecb09d2e027f4a1c70e0bfc38750ace23ba4acd28235e09464c966a95239511b04454a97d8f51 SHA512 1840aa564a0b56f8d887e6446ce68f57f109e63029fe6dfa50bf1ad0df174656ab4f9bbce50498e3c1f937d855c20d9f4aa0df039e709ed8ee04b32c3dbde11a
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild b/dev-python/google-api-core/google-api-core-1.26.1-r1.ebuild
new file mode 100644
index 000000000000..af52a0d1189f
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.26.1-r1.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.26.2.ebuild b/dev-python/google-api-core/google-api-core-1.26.2.ebuild
new file mode 100644
index 000000000000..af52a0d1189f
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.26.2.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-auth/Manifest b/dev-python/google-auth/Manifest
index a37b105e0264..a513e3e7dafe 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,7 @@
-DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
 DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
 DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
 DIST google-auth-1.28.0.tar.gz 158266 BLAKE2B 7e1fcdd0a6d155c0170012d43062fa5df2c9dd731105990af6d055c0dc8f9c36917776876a25caedd4b804acf24cdebd93a0953a9f7642563a5abc05cc946156 SHA512 a02db23132950c99e032d8318451cd67127f1e9fc57731a8a76505a360d77484aef1859e54d8e4efa1bcde3f6f5379c3324d54cf57c0a95fb1fa7765f43e9581
-EBUILD google-auth-1.26.1.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
-EBUILD google-auth-1.27.0.ebuild 1634 BLAKE2B 4bb0f2cd679828176bbb5599afbef8de92b2b14b6de3570059ce9e6e69b84bd8a5759d189835ce31c29bd34fc69a2684dcf89b3df6697bf88b71f6f2d4a642a6 SHA512 b7220099a99c3a3caf55e7a06b2efc6872de9c949366e1cceb05d1fd4b776e3fd751f62c6057471c6c40450b1f1e03982889d9e2f5090215dbb6a1c2ed7d9384
+EBUILD google-auth-1.27.0.ebuild 1632 BLAKE2B 3a64c4915bfe8626f7c240b27704a77f7cafa3697f85922f6fc74f612390908d34814dad94ffb649e7298b8e93b833e4f71dc8153bd725643d09c6f7ba4b1171 SHA512 c32bd705495a1be9e276e9de185cfc4f498cc186f71f89d5396f10dc7a4b16b8cf139209cd00a4d74f43ba027bf251e58f3ec79744cf8b64290e305889b78cee
 EBUILD google-auth-1.27.1.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
 EBUILD google-auth-1.28.0.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.26.1.ebuild b/dev-python/google-auth/google-auth-1.26.1.ebuild
deleted file mode 100644
index 4686417faf35..000000000000
--- a/dev-python/google-auth/google-auth-1.26.1.ebuild
+++ /dev/null
@@ -1,59 +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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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}]
-	"
-DEPEND="${RDEPEND}
-	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/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.27.0.ebuild b/dev-python/google-auth/google-auth-1.27.0.ebuild
index 61a646b39ce4..4686417faf35 100644
--- a/dev-python/google-auth/google-auth-1.27.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.27.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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 653e0e848932..9927149462a9 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,5 @@
 DIST humanize-3.2.0.tar.gz 53976 BLAKE2B 2e9347418ffa103c6a66583136aa0c79bce669b48fcbc01bf482ba16659af14d4b4a88e78167e8013a8ede6467ed7b7f5eea8f46ed4234294a79b0c63fabd17c SHA512 448919e762e0ecc95f5a7158e0dd8bc028d173ee236be8e15fd0283741af037af1bcdc671ed83b0c16c1998dc0a70debf11cb1c349085530e458bc7aa2f6dde4
+DIST humanize-3.3.0.tar.gz 54639 BLAKE2B 7861a5e0403aa9ea047e39f9aa42fdfd7c7f38f295e93b9790f7fea3a86a57e33e65cb302165f1f962a46bf84238fc8b53b2e3e786eb1804b674dca97f959fae SHA512 a25bbaaa8cdd8fc0a7375637c19f91f892b33b8576e4c88b9adc431e976cb4f8937f1f98d71f442547626276c75cb6be445cac9b11b6504b6a444740df486faf
 EBUILD humanize-3.2.0.ebuild 704 BLAKE2B 1e0572ce76ed41f14f69f03bb34676b070d896a7886ccf3155fc9c0a93176a7c5ed27f5d98884af75ad7e91e1ae88d0b1fcf9ff98c5d6c37feb66924986cc6f4 SHA512 30d21d3a8b6f05582b85553d9f079433847c789fd94905481439d62b1e9819fb148aba5783f7a9740f2a02e2cb9876bb0cb6a213ac3433ae8deb48d74c806190
+EBUILD humanize-3.3.0.ebuild 548 BLAKE2B 2b86d4aa8a9585e8daf3fcf9a896596ac6104c9f76c9803dfa5934b7f3ab9f13eac36831867941677865f86e27ccd489e7f867e537ce965709c043f137d496ef SHA512 46f45b8ec4517f65b5488e91aebd1c583ca6bf6e51a50d2f7da29fa27dd3dea9bab27e5b0a287be370b6365a4cc02ce7a469f71da74207fe2505c88929776cf5
 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
new file mode 100644
index 000000000000..7bc5554aa175
--- /dev/null
+++ b/dev-python/humanize/humanize-3.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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/intreehooks/Manifest b/dev-python/intreehooks/Manifest
index 1befa1b94548..30a080b1035f 100644
--- a/dev-python/intreehooks/Manifest
+++ b/dev-python/intreehooks/Manifest
@@ -1,3 +1,3 @@
 DIST intreehooks-1.0.tar.gz 2701 BLAKE2B 2c82bae05cf3fc3bde13e8dd2ffb9d1ef79edc6711b5038f6f9b3dddd863492be24a425bf848c9868ecf730f813243fb5fa50ebfad52b44341be18e72727f195 SHA512 5a020dd6bd7994eca5f476618f57e2d86567756fae74f6fa50b6fbc96accfe8db910f3175bafa3ce85f37b05edc05ca1042dcec78407a241cfaffc0a0e997f4e
-EBUILD intreehooks-1.0.ebuild 860 BLAKE2B 5406f1318b43aa81b3a994c21f2c8ce038ab91fbfe7e5b96433834e7dea95007df064aa311703bd36726d7baed8a11ec2132ac9af043611418db6da835fe2942 SHA512 97fc95a8c0d7b5f57d8177fa9bda000785f6df1ece79993aa43d4beeb476f99e9900079997e51188a5dcfeab9de1a7c3a1ab5c62b338f31e70df417fd7a01cec
-MISC metadata.xml 396 BLAKE2B 7a7135eb22e2320fa89acd56960cb899f5f012978c61d6c177b02847907729724ba5f86d6ab8f5e6a04667512f1c8d2de8e4b6ee99b47b00062fd0194ed9f054 SHA512 a4acec94f49fa4eb1fdc476740668b6293847e17da1c8472312ac08d7796675ac51a29dec9485b45e894d8d1b0f9149cb9e7ae8c3d02ab5634a8b7d6e8a85781
+EBUILD intreehooks-1.0.ebuild 803 BLAKE2B 8165333b80e334f7cdd938d778f7c261677691a6f9b4c4eb8b99d49c7f713319c32a995e9b987dd16df7612abcf1e0db5f7f651f508f9a29427d639426249be7 SHA512 77f1f93f63a7b6ca196cc2f98ac7d52562c6665f9e2e3f8a4a789763a7edb654fd6120c3fa11646b620f7c579a9c9ac7007d153cb9fe6a526f932f40c01b02e9
+MISC metadata.xml 503 BLAKE2B bf6af8da27cb19f77cb35df083ab385eb3f88d36fb5c159f01edf11e7737c0b61984126c835ea0b9be95ef3601f7ceee4f8b5d0ec169ac717d0e8fcb56610271 SHA512 41223615acfe458c4a3ab3b2716292b024f563f6ed62d9ea06225c79b90ba08196c71c3a5af50747839081c57e500303e5a7fcca79db1304e622106de8b847b4
diff --git a/dev-python/intreehooks/intreehooks-1.0.ebuild b/dev-python/intreehooks/intreehooks-1.0.ebuild
index b4757923117b..cba27a4650e6 100644
--- a/dev-python/intreehooks/intreehooks-1.0.ebuild
+++ b/dev-python/intreehooks/intreehooks-1.0.ebuild
@@ -1,13 +1,15 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Load a PEP 517 backend from inside the source tree"
-HOMEPAGE="https://pypi.org/project/intreehooks https://github.com/takluyver/intreehooks"
+HOMEPAGE="
+	https://pypi.org/project/intreehooks/
+	https://github.com/takluyver/intreehooks/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -18,9 +20,6 @@ IUSE="examples"
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/intreehooks/metadata.xml b/dev-python/intreehooks/metadata.xml
index b877c5c9271d..3f61140b6691 100644
--- a/dev-python/intreehooks/metadata.xml
+++ b/dev-python/intreehooks/metadata.xml
@@ -5,6 +5,10 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">intreehooks</remote-id>
     <remote-id type="github">takluyver/intreehooks</remote-id>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index ed645e17cef5..e5157e6a8526 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,3 @@
-DIST ipykernel-5.4.3.tar.gz 111751 BLAKE2B 01e4af9fe94599c912d6d6504ee4af9666b05155b43031aced3acf7512bd8b67689fdbdadea505d961ab569d313d92992cf7b50791a38bbe1bd3d67ab2a844de SHA512 4959de99ecca609f8123c01dc9904711a03cf0de5a388b9e04aa3ec0be985b6f37ac64bce2fe395039b16b7b54ad0632fef04fec30f2439d05499d8afbfd5258
 DIST ipykernel-5.5.0.tar.gz 112600 BLAKE2B d1df26095e9badd5eb1fe4665bac01c254375407ac3af1f014d78b9e6dd6613c6a5830c09a63191ea84c36fc31a5d9faf73b1a29dab1a020e225636f6f2f0c90 SHA512 b1726d765f4debbb4c5efcc5e2d9745d8e51ada8e1417b31463b7c9546c6887cc6c0787fd32729b4013544e2bd41829dfd289dbb45b0c5dbb026eb57a47ec51a
-EBUILD ipykernel-5.4.3.ebuild 1079 BLAKE2B 1b0b13e792c84e73cbbb2f752422858e69ad90950e4a33467904ed73c7332753e224b139816cf387108c821bad9052b69dfc783261402c6a1b748799e15f5afe SHA512 f9272d0811c0ac4cc3d3b0ca897c0f432fad43e02d9132c980d2f87c913d9079397e2fe8e51ecef255f58c78c54e6a8c18ee41a8394d14164e56292efff06fda
-EBUILD ipykernel-5.5.0.ebuild 1023 BLAKE2B d52ce75939892e8f55728188426d219261fb0c81c916a7773fd882feed5c5e64a48ecc61f559970680a430c0db41b022e1f508f35f65d9d3c833ab5d15d7c7a0 SHA512 8a9428b3042cd951a7ae957fc85903560f2b17f8ca783c65027c843ceffa4d7cc6eddbd1a63b0cb3b9a78a02f901d7cbdf6d760ceee6bf231893152b98435d37
+EBUILD ipykernel-5.5.0.ebuild 1020 BLAKE2B 28988db99d41907f4fe3ac16687b7c9fe3c5342ffbcc84f523b1b22c52fd115d25733047fb0279dc517e0712ff0e45d2dcc1b147dafc0d89932e9555acd3c629 SHA512 bb3e5e1313bbe5d6f2eee2268b3e0531e8fbcb14bb62cb48c082e215bf5a7de376565ba672c9f731e19cd40b29777fdc9defe9f8ebdcbabf019d8622cbdb032d
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.4.3.ebuild b/dev-python/ipykernel/ipykernel-5.4.3.ebuild
deleted file mode 100644
index b48515088d38..000000000000
--- a/dev-python/ipykernel/ipykernel-5.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} )
-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="amd64 arm64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		<dev-python/jedi-0.17.3
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# skip tests that require numpy, also some of them fail
-	# https://github.com/ipython/ipykernel/issues/574
-	rm ipykernel/tests/test_serialize.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ipykernel/ipykernel-5.5.0.ebuild b/dev-python/ipykernel/ipykernel-5.5.0.ebuild
index 348b95bfdf81..b8734e19204b 100644
--- a/dev-python/ipykernel/ipykernel-5.5.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index df46187cf165..9271b643a90d 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,5 @@
 DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
+DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
 EBUILD isort-5.7.0.ebuild 1706 BLAKE2B 55086f0ce409bf2e4f0bfc6cb1c2271bd79c228843c91a7da9410dbfd2eecc2cedf8c18972e9ad8714f5930c0086b31be71d372d50a7aa8819bc09606436b614 SHA512 e8919533c647fdf22347d68946d03632379655129866674a2894599d5191b50d2b12f64a759db3b28d0ce2f9e071c5446ce2c9ca7bc2f4aff2f1c4e3afbdbefd
+EBUILD isort-5.8.0.ebuild 1616 BLAKE2B a26795fce1847097d753430f0adb82b4d77faa9ffd1cac8adb7bc875dc5e7aa7e65320b14a28493874677b1802da14d2aa1d56044bc6867110364c490f448877 SHA512 cf1461f8fc070513a87399d10bba3df5418f33a3c20b09b2b5288113f0482b10c4fc4b56735ec1698754604cd0f666752a2668e7ff886269dbc8a8f601ff5403
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.8.0.ebuild b/dev-python/isort/isort-5.8.0.ebuild
new file mode 100644
index 000000000000..4fb03c0631f5
--- /dev/null
+++ b/dev-python/isort/isort-5.8.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=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+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 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing
+
+	local skipped_tests=(
+		# Fails without -s, run it separately to avoid unnecessary output
+		tests/unit/test_importable.py
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+		# Require "example_isort_formatting_plugin", we're not going
+		# to add an example package just to run a few tests
+		tests/unit/test_literal.py::test_value_assignment_list
+		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
+		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
+		# Same here: requires "example_shared_isort_profile"
+		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
+	)
+	epytest -s tests/unit/test_importable.py
+	epytest tests/unit ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 9abe8d064cfb..0296231a8545 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.classes-3.2.0.tar.gz 12277 BLAKE2B 4512d2ef96a6dba8c5f226da5947e69beb21a7bef20402fc1ef3cd8a0495bedadaf261b1d47757af10838897923ce0561ac063cb2d6d53c2ebf2be909c335dc1 SHA512 89cc24826c647ebb4a08ceb76159e6d123b7067c7f725989195b073895f1482a04db82e3e52059faf825a6dec7c9b9201859267de06880d4a80d397a7ab209b6
 DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
-EBUILD jaraco-classes-3.2.0.ebuild 713 BLAKE2B 95b97d38418d2e2ddd90f6cbc74e253438a0dffe48c286f81a1f3bc163471e77475b67862f02a421d1c00b5de07ba58e585c14c40102059f69e14ddf93887dc1 SHA512 5e4b282249fa3e6ebfd3dc4917f8eedbaac1541e48734278e34fc0874fc4502e152ca04018f3937da8c89efcaac402f7bba8f55c7593f14869488b1aea30747f
-EBUILD jaraco-classes-3.2.1.ebuild 721 BLAKE2B a5e0892315d5a070a4ee63c217b255d349d2ef6bfdbaa440689793f012dba3a6c277989d6075cf8d28d3f6f2f594316ff74762c321b78a75292e2e6b3e7aa2d4 SHA512 c1f9b5aeab60992e650c285da976b09329d59c9983c17d267fb1c0c71e9571497cf987b87c4df92c2564d1b7514ad3eb835ae9b1f86aae8ec1811d8b0f0e923e
+EBUILD jaraco-classes-3.2.1.ebuild 713 BLAKE2B 95b97d38418d2e2ddd90f6cbc74e253438a0dffe48c286f81a1f3bc163471e77475b67862f02a421d1c00b5de07ba58e585c14c40102059f69e14ddf93887dc1 SHA512 5e4b282249fa3e6ebfd3dc4917f8eedbaac1541e48734278e34fc0874fc4502e152ca04018f3937da8c89efcaac402f7bba8f55c7593f14869488b1aea30747f
 MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
deleted file mode 100644
index 4e4708f23252..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.0.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=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
index 20b9ab27a6cb..4e4708f23252 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 07022a0b54df..e7b9fefe094d 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.functools-3.2.0.tar.gz 16863 BLAKE2B 8085ebb0afee777073cafddc575286e765c5af5871c4bc45974eed1af9650d0edbbedf5233c5f9db080ab348c9c6151a1b22a7c21af6364fd56a3098640b0908 SHA512 aef71a96341a2f65f825a06e28b06b754a5fd52d4b04396f3ab5c264f27f342353d77485d76f081b35a08dd16ac06fd5bef3267cdc315320affa25e433964eef
 DIST jaraco.functools-3.2.1.tar.gz 16888 BLAKE2B 87dbc4a68f508a3c3169496c3f57d9844e90a6523b5526e486bbdcb1de996fb31025100e25929c0527ed27dd57ff67c90020d7cddfd70ead2a78e69ec8f65f8b SHA512 279dbb9307f864e3616f9b91ce5d55068df166a30695c0f81bcfae0bc2a1e0df5fdccd157210df3dd73ad73a6a955c1344ec441f925a651cd13a7f460e7a88e1
-EBUILD jaraco-functools-3.2.0.ebuild 860 BLAKE2B c9472a997fa643d05181c86b8d8a4096f976b13b4573bf225d14acefbbf656d784f0dc6086ca38f7b7565f6e427d077cbb2a4861b1f297d1aa2f68dd970db984 SHA512 fc5d135d0e9c51bef36a11f64a8c234a534a26beae991714556bc31f2fee81e3f8863e1e798c853c22ce37d58ffa748009f933451acd4d2dba1b46c0fbcb2d42
-EBUILD jaraco-functools-3.2.1.ebuild 868 BLAKE2B 769a20554c3fc8e69ea292965f024de9e77ec1d7926dd089a841949bfc40511816297b992ac2a6e1544bab4db27cfbe306c2fd716d6ef6794961e1219dd10532 SHA512 40600c17575227badfd10e2afcb2eb946f5d217643c9a0e70c636d001cc6a9867f6f323e1e0285e1d21184f24b29de768c6679e0c90f8fb38c637fd99da2960c
+EBUILD jaraco-functools-3.2.1.ebuild 860 BLAKE2B c9472a997fa643d05181c86b8d8a4096f976b13b4573bf225d14acefbbf656d784f0dc6086ca38f7b7565f6e427d077cbb2a4861b1f297d1aa2f68dd970db984 SHA512 fc5d135d0e9c51bef36a11f64a8c234a534a26beae991714556bc31f2fee81e3f8863e1e798c853c22ce37d58ffa748009f933451acd4d2dba1b46c0fbcb2d42
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.2.0.ebuild
deleted file mode 100644
index 8f34a5b396a7..000000000000
--- a/dev-python/jaraco-functools/jaraco-functools-3.2.0.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=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.functools"
-SRC_URI="mirror://pypi/${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 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
index 9005f03c9d1a..8f34a5b396a7 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.2.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index ca7109fdda13..cd3e21b71749 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -2,6 +2,8 @@ AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170
 AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
 DIST jupyter_console-6.3.0.tar.gz 35313 BLAKE2B 980eac57de949654bf99d99eb74d8600d73d0699ab394e0ad4c5e937fdc278477442e0e95887c95f631ba1bc2b2469c36cc6e4bca8d5f11f97c4943c2f312c4f SHA512 777d9cf8b842eccea108a1857c421fec1bcdf8c226a6947d7ff4ee5d5da4bdbb50096e9e63638053d8eb200e55c093c753010ffb1460dae5579de16aad4e64a6
+DIST jupyter_console-6.4.0.tar.gz 35765 BLAKE2B 48278110338184dbcae242a059c3ba7e0c642d24eaac828786ff9f3c588747f447727a8da1d366ed305eeb5d003d4fabd9b9eea063e8fd5178774108cbef77da SHA512 e2b301cfd3a56ee4cf33d5cfb297726d0f4478562167ed0f0a9320d389118fa661a85b6a5ef24db60673a76d84545bcdb9741bfdd9f8d13ccdbbc5c5e52d7227
 EBUILD jupyter_console-6.1.0-r2.ebuild 1131 BLAKE2B 26ac084c60f23c58dad3de4ddc87392b0927eef4201b6416bdab90bb194265109e0c70321c10ae75033c0c5f0cb5f98675c6a94b3f5b9e569174de498752680e SHA512 8f87e8be83392605c3467b754d4e1c27380526d471fd890d2b22829644b242361935e20c34cb579383780b67155d0d5ec99d67d437dc70ac950a062fbf2488af
 EBUILD jupyter_console-6.3.0.ebuild 869 BLAKE2B c8b5bc4a91b7c62f96c69ab6a02f375848d3a8599d2e3195c8d61e435888fd02e48fb1f8989b84ae9309b3cd550cb2fe31e3795164d7b0911c5662891517ba25 SHA512 c226e6b28994f958f6463a89ecbf92ac3a09f5eb6c96f0de19bf2d41725c1373825d6148bc2c59ab1800cc2d7d4955be6e0b1c14089cd3cceeea1abbb03e0e59
+EBUILD jupyter_console-6.4.0.ebuild 869 BLAKE2B c8b5bc4a91b7c62f96c69ab6a02f375848d3a8599d2e3195c8d61e435888fd02e48fb1f8989b84ae9309b3cd550cb2fe31e3795164d7b0911c5662891517ba25 SHA512 c226e6b28994f958f6463a89ecbf92ac3a09f5eb6c96f0de19bf2d41725c1373825d6148bc2c59ab1800cc2d7d4955be6e0b1c14089cd3cceeea1abbb03e0e59
 MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
new file mode 100644
index 000000000000..7a54103742fa
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 3984bef87707..993e796a808c 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
 DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
 DIST keyring-22.3.0.tar.gz 48195 BLAKE2B f990c1c5fd87115cfb22a0e1d84712c1299334e5db89049f04718dba9b31dddbc0ec91950bdf529310955341d1250a6a62b1f1b76b0d552cb7cbf09748892b3d SHA512 c71ba8ec7b69661b2929ed5aa7b8baca7b5164a267dbb901adc2b7bc2cef1eb0ec8931f1021d69cfb0e31514ff922dfb03fd784feb12d1dc7229d4e5e759bb5e
 DIST keyring-23.0.0.tar.gz 48218 BLAKE2B a71e86e91b874d2b82477ebcd93687592864095bc20bbda898b934e6f888e2ef666d462fe27ffc5fcbafb909c44b8e816c46d138865c53afcb12dd5d04a7c761 SHA512 4fd83ab0e73bc748b593bdcc2d8df608c7ef4ad9b64b58db611995eb3cb98d1bd5b5a312ab15f7322f33359fe12bd1b02eed1dbaae50455abb9e84e367976c4e
+DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
 EBUILD keyring-22.0.1.ebuild 1082 BLAKE2B 8008a84045abbe9c0f6a8be39f37406db51be0c832878ca48116912875eee6327aa22adb59411048ecf479d1485bf5a942a01c5beced336c682492a63a95bad3 SHA512 dce2c1374f2b235d2fb20c99d327074b8b3b661d31028c48c4262e8e142f9e961915dffd04a0697118efc829dac852c27ebe0fd1aa0fab122b76d28a3d61d9eb
 EBUILD keyring-22.3.0.ebuild 1090 BLAKE2B 54a6e182eddf3b5b7e8498fae18dcdec0e560331a25cae865422db5a07c233726953eeab324d954ce3ca5c644a2fa2beecfb9576ed914fb7c78a0a0526c6ca51 SHA512 70605a3652eb2eb753d71a46a98cbc422ff456c58e57e70b42bcd0358f76eb2d0b7f1ef8cd0dd2abed4af703eebec0d094d7334a4d282c0c037bdc8203d834c7
 EBUILD keyring-23.0.0.ebuild 1044 BLAKE2B 49cc49e8960e9ab998f5931d7f91732de0e9c84cddaf85e5790b860da5a5bca53f593a7a28f985ad45a070286bc91a50bc0acb074b379ae305f55bbd36d0b37f SHA512 dcf85e379d56afffa5ee41c24d8871810dfe8ff5e5088af7a2f77edd5a9a1eab87094ae4809f210e6bb1e49c4ef6765c0a72189053b945aab0043da406451729
+EBUILD keyring-23.0.1.ebuild 1009 BLAKE2B b1d9246131fbfe460257cbc35e13eae8feda1065e975a574424b5d5dd3584af518bb5d4a739b0ba64c6f00f6a4950ae166be0151582764241f52deb6d636d19f SHA512 0d869f11a4be789132dbbce78fc6373ef7b462cf04a4c3180c8d52a2a417d1d62a4fc5688e24024ef59b9c5d4c6b0f8c77538bd7103b511a02f28a288fa3874a
 MISC metadata.xml 610 BLAKE2B ef90c15fdeffa82a8a08a063d43a4045e98c8ce21f6055c3671bbf94c2719c4668e0a87b607b9dd39da073283dfe5b7c3490fcbe023014c0337ea83def27b893 SHA512 98b2619a52bbf177eebdce6f589e2f777992963696a75f0481db849825372890dc631b14da230f7bb3e92aeb5e8c60a0f7931092bb9e273300a5133eeae00112
diff --git a/dev-python/keyring/keyring-23.0.1.ebuild b/dev-python/keyring/keyring-23.0.1.ebuild
new file mode 100644
index 000000000000..acac4dde3515
--- /dev/null
+++ b/dev-python/keyring/keyring-23.0.1.ebuild
@@ -0,0 +1,39 @@
+# 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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest --ignore tests/backends/test_kwallet.py
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 98dbda6352be..3e57dfd779e1 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,8 +1,4 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
-DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa2057d69e681405d9588c63b3a6e4a6daa58b8996541825c73ff4dabc5607874c2d7885586d793a6436e3f680aec2 SHA512 d67e39daf65c92ebb5bf69abb0c5dc3a88460228b5ec5ee762a11fc909369562411297e8ff9f512ee1ef539d8abec765924be581703fb7e99963c6512cb1f0bd
-DIST llfuse-1.4.0.tar.gz 478758 BLAKE2B bec4d6b53936bc79ab4ca8fce7b34d60e39aff6128a186d58caeac68ad135d7d29bbd667cf669e065256e31e257ff4516ff967759d6152672659df0062d03e6d SHA512 8ab92912279a478ba50cf0c151cce3ce1125de27922a97c4da4b3af4ff0714e3a2c5a9e6fd10b87653eb552509491084f018ae3ce4feb7bf952de00a5be3eccc
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
-EBUILD llfuse-1.3.6.ebuild 758 BLAKE2B 86126eee45c991350817dccf250b869be8cd667af9127df243d10d3824c87510af00a44237ff76ad81ba52eca6f15f82a7a4b33266b74252efe66d552f8c349c SHA512 dd8e2e4d8f8b04d886866d74826b494e10e7bd18cc5314617402c662b08d0a246fbd76a456a8f1b79dd15b91f428baf3042774d62cb7b6aa0774c376ecaecfcd
-EBUILD llfuse-1.4.0.ebuild 759 BLAKE2B 718d8661fd2ce2ddac509b974c239d59d12fd411efe9399ed102bc43f900c8be0724e1574ff8479588531e7e9f51beca83f1f881a499eea1622ec693e55e8ba2 SHA512 6fda1422f22b1ef5fc199bd3e20374c5f313e14457442adafa5999ba30f748597e294bf53ccca209e41492f02f36911a7e33d447641d95f9b17fca12a70874a4
-EBUILD llfuse-1.4.1.ebuild 791 BLAKE2B 5adad29dd89ac20599b335f9220719b5ab3b5dace8074fcd0f302b7c776d6d349ccaca24be389e128fe35e635499b1567c1620cddffc076a1979fd08c5dc3beb SHA512 c79f0b9b8f6cfafa8995e0db09637e769b13bbcd95bac8f5485d4286343675d2992adf4e9444656dbb442f4b1ff51b448e6372c1dc0a16ffabb0ffde3331fbb3
+EBUILD llfuse-1.4.1.ebuild 789 BLAKE2B e1578338b39b1319746613c7f2787ee939bfba6b708e64836e2afaca1391d20579555be75bcb04941e3ca5b05aecbeb3a3b194187df829aaca0642fa75326f50 SHA512 f7200f16b180f14aa149dff5702ea05aa9faa9e97d0a3a6b71e52453ff58b345e1eabf45df1681f1cca42b3b2a397307737d329e84607daf547dc371e25dd48a
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.6.ebuild b/dev-python/llfuse/llfuse-1.3.6.ebuild
deleted file mode 100644
index 136a8c48f864..000000000000
--- a/dev-python/llfuse/llfuse-1.3.6.ebuild
+++ /dev/null
@@ -1,36 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://github.com/python-llfuse/python-llfuse/ https://pypi.org/project/llfuse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=sys-fs/fuse-2.8.0:0
-"
-DEPEND="
-	sys-apps/attr
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/llfuse/llfuse-1.4.0.ebuild b/dev-python/llfuse/llfuse-1.4.0.ebuild
deleted file mode 100644
index 9d166fe03062..000000000000
--- a/dev-python/llfuse/llfuse-1.4.0.ebuild
+++ /dev/null
@@ -1,36 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://github.com/python-llfuse/python-llfuse/ https://pypi.org/project/llfuse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=sys-fs/fuse-2.8.0:0
-"
-DEPEND="
-	sys-apps/attr
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/llfuse/llfuse-1.4.1.ebuild b/dev-python/llfuse/llfuse-1.4.1.ebuild
index 64cb88e8e142..498ded6e7596 100644
--- a/dev-python/llfuse/llfuse-1.4.1.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 4c26a4968af2..edc950a05aed 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,5 +1,3 @@
-DIST lmdb-1.1.0.tar.gz 880212 BLAKE2B 5f038c704061bb7915b0b0926c2dc60a5dd4931a70a1bf1041508363e036ae0553e22c52f8c956bebb05a27fad751c3b84c4a2b9fd6158fd8b6bd346e3efe7b4 SHA512 19573626a24fcea17c72641ce4491cf9e0901fa4a463ad5da6244191f28e4d9680d903fc2f87fe4a6b607f2a6a3a6bc644d5c1fc6e568394eb9822face30dfae
 DIST lmdb-1.1.1.tar.gz 880359 BLAKE2B b202154eae151d3748e9e90fcb71a3c8a722923c2583e469ef1a0017a4c3dfdfd62d99db24fb79e7da1fc7c6a4fb695d9db5ed6a67750967788a12fe0ba24761 SHA512 4621c87dd646f8ca37f4cdc40ffa2fe809ca4da21b335856e50e6d0ae07f3828d424cde9cc383e4cdc761cd9311eb504d67678a33de51c1931a006ec86a2fcd0
-EBUILD lmdb-1.1.0.ebuild 802 BLAKE2B 21ef2f957734ea27ea884f7cec57f9f5c71e72e078253f681bd3c053d0e7e8396c8c4516ef4073159005589bed1223aa4a9424ca2290408b38b68e8da7d261cb SHA512 8588a72f7623692821cb940f986c0386b3e00e37fa5b1586d6c402ede78d97d85783b7f129faa15a384a4715c3275714845dfc4f99913df21252808754ed6944
-EBUILD lmdb-1.1.1-r1.ebuild 813 BLAKE2B 25110739fc0b43f43d717754e5455710691be1326844a9f62e48ab276f5a953b473780edf98ec8971c5f0e76b31994cb395b409963f7a014a6859839d10c3a60 SHA512 ad07cf3cdf4eaf5d9d0720d0bb6bb0c6e9ff0671349ffb48f9c91e2be5214176f7e3d0f2b060d0062297f1e75a8f624760479f92ee1a2884bead91405f848d22
+EBUILD lmdb-1.1.1-r1.ebuild 811 BLAKE2B f0e38c082186bfd8a0178e4d7cfadba41373a5d38a5bfffc25db1efd8c0389ca63f95197344c45c92c3144e85cd78a1614eb662b5cb62bb4080bd514fa681ad7 SHA512 bfd35e5e39ce4021687aabd371d618b1174bdc2521ebb1069d0681e75248ead0fe167e78cc6ff194e8c91455fa1c37a222554ca536659dcc9467c8896d893e1f
 MISC metadata.xml 419 BLAKE2B 7bb3bd08439249e8bcb7f64d91a707245dd2c32eefed576a4389019217c304173754628f1fdd82f147e6f7a077e2abcb6062dcbaf76d0547c8d710c8d16d0a64 SHA512 700345b4a50d602e35c983fadf73eee5da01b7d9dc4a647966277aeb7fe1fb26f583c681acf1718060dff14b195df7fa4689bad2451c475d1883b66e223ad29d
diff --git a/dev-python/lmdb/lmdb-1.1.0.ebuild b/dev-python/lmdb/lmdb-1.1.0.ebuild
deleted file mode 100644
index 8152dc7bdfdf..000000000000
--- a/dev-python/lmdb/lmdb-1.1.0.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:="
-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.1.1-r1.ebuild b/dev-python/lmdb/lmdb-1.1.1-r1.ebuild
index 81575f691bb4..587621283a02 100644
--- a/dev-python/lmdb/lmdb-1.1.1-r1.ebuild
+++ b/dev-python/lmdb/lmdb-1.1.1-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:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 8939d054927f..a24439aad6c5 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,6 @@
 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 2757 BLAKE2B da79450566fb16b051b49a62604059489f8b10279bfba42dbf148290bd48dde66c05e9131639e6418c581ac8169417de7baeea148ed6d49b72a80f197af2b8d8 SHA512 d20eef3858fb2bad303023308f0cd06b8f2aafb98782b587169b06912019a03ec05fe71a6d4f847de0a2390cefc7bca58b2da284d968ea74e1b7a64eda851001
+EBUILD lxml-4.6.3.ebuild 2757 BLAKE2B ffbaf919b80e3b511ee775a6e325b9a81f521966fade96817475d1324d0fb3190b7b5e0a9235a61f32821d7b666d64533871d2b977ce0d05a89a2927e3a6de9a SHA512 d29172e924f8340bbf808819d3d034f7afe6d05166bf21c88b463062e5738e656b4cace9c0ebe1b63c978e3f8afebd3ba1b316980e41634cf9bf2765649bab62
 MISC metadata.xml 409 BLAKE2B 95add82278696324ff1c27f90f3bee49ed0b1ec46546751b5c9551991e1bb208139cb9e6594dc013ff14c032611f890da2330471bafa30960f8b61f45a1f0d4a SHA512 f4ab9197ba14428808081c0ff600b4b6d004690914ef6e8d053726a8d4d7dcf8df6ed2da56ce45a2aecc7484e9c5beced927771f1eb46dd7f6f61d5fd91b4f91
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
new file mode 100644
index 000000000000..dd9739f01444
--- /dev/null
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -0,0 +1,101 @@
+# 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 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+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"
+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/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}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+)
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake html
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 13dde5ac9e9d..4271dd613e13 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -2,7 +2,10 @@ AUX matplotlib-3.3.0-test.patch 9618 BLAKE2B f239d5c16be50b601c91e47e9c43c928bee
 AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878919e5d5183eac017928f12da0f9636d62ca42b1a7206e8f2131613bfa5249a835083c461c14c5be95091c37ce94902ea17 SHA512 45aaca6349269b5ab7476cbb82ba1dda6f8fa89100f7a8c7c1c5c037db1213b252daccfc5e905cb09d259f4e28d726c583d5a71f2da2421a787bb3b31fca6e5a
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 AUX matplotlib-3.3.4-test-extra.patch 481 BLAKE2B 1926876a15bd2d8b14c62404dddb0b119abde78baea3cee7dd751d0b0a21249ad1461fbba4d20823d7e754f074cbf48aaf2da317685dded99c792be9e17edb9d SHA512 7a7e0bdbd96a4f1f335eb3ee1840747045b09ba974d2614f234fa4fbc5c3e1e7c5fd154ec68a74640a916fed9e0b3d5ca01d1b22ba4f7bf3ba5f47039e67d00a
+AUX matplotlib-3.4.0-test.patch 10105 BLAKE2B 3a084180ec096a99d0b9a25458fd1b422d23599cb6fcbe0d7367df7e5c308675f92e95d008fb80e96125101f8f67c4b3a437209bc4bc032cb779130043827160 SHA512 f6196ded497e6c931f33a50cd82f4c7a5710dbc2dd1d74e3ba4467cf936176ef5a64fc2a9ff5281a0a114041c9751e352e522869ebb28e0e0bc50c4ebf1a8b5a
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4
+DIST matplotlib-3.4.0.tar.gz 37142983 BLAKE2B 64b23d5b9e93e6b319674cea06d0ad425def952e50e7cb163ae91ae0d4460872bb329144271472b7dc2d0ab0a742c9c93ea735dca60ee4b4aa569cb4350cca0b SHA512 880c1e1027c819a34f5528b96d1b730cdd6541aa23931aef4185406ecec971ec2f4c8ca374eced56e654e016652472f7abcd0aae977dd4f327b8c511983a2a1d
 EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2
+EBUILD matplotlib-3.4.0.ebuild 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.4.0-test.patch
new file mode 100644
index 000000000000..3cedaba4ffc3
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.4.0-test.patch
@@ -0,0 +1,239 @@
+From d44a24b3744b568fc12209ede6be782babb847b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 26 Mar 2021 13:42:49 +0100
+Subject: [PATCH] Increase image comparison limits
+
+Most of the tests require exact match which apparently doesn't always
+happen in non-pristine environments.  Some of them have very big
+differences due to texlive font rendering changes.
+---
+ lib/matplotlib/tests/test_arrow_patches.py                | 6 +++---
+ lib/matplotlib/tests/test_axes.py                         | 4 ++--
+ lib/matplotlib/tests/test_backend_pgf.py                  | 8 +++++---
+ lib/matplotlib/tests/test_figure.py                       | 5 +++--
+ lib/matplotlib/tests/test_legend.py                       | 6 +++---
+ lib/matplotlib/tests/test_units.py                        | 4 ++--
+ lib/matplotlib/tests/test_usetex.py                       | 3 ++-
+ lib/mpl_toolkits/tests/test_axes_grid1.py                 | 2 +-
+ .../tests/test_axisartist_grid_helper_curvelinear.py      | 2 +-
+ lib/mpl_toolkits/tests/test_mplot3d.py                    | 2 +-
+ 10 files changed, 23 insertions(+), 19 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index 3c95535e0..c4fad3486 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=100))
+ def test_fancyarrow_dpi_cor_100dpi():
+     """
+@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
+ 
+ 
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=200))
+ def test_fancyarrow_dpi_cor_200dpi():
+     """
+@@ -115,7 +115,7 @@ def test_fancyarrow_dash():
+ 
+ 
+ @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.005)
++                  tol=0.005)
+ def test_arrow_styles():
+     styles = mpatches.ArrowStyle.get_styles()
+ 
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index ed76af576..772f96177 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -3807,7 +3807,7 @@ def test_hist_labels():
+     assert bars[0].get_label() == '00'
+ 
+ 
+-@image_comparison(['transparent_markers'], remove_text=True)
++@image_comparison(['transparent_markers'], remove_text=True, tol=5)
+ def test_transparent_markers():
+     np.random.seed(0)
+     data = np.random.random(50)
+@@ -4083,7 +4083,7 @@ def test_vertex_markers():
+ 
+ 
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02)
+ def test_eb_line_zorder():
+     x = list(range(10))
+ 
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 75f50ecbf..6973a9681 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -91,7 +91,8 @@ def test_xelatex():
+ @needs_pdflatex
+ @pytest.mark.skipif(not _has_tex_package('ucs'), reason='needs ucs.sty')
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_pdflatex.pdf'], style='default')
++@image_comparison(['pgf_pdflatex.pdf'], style='default',
++                  tol=11.669)
+ def test_pdflatex():
+     if os.environ.get('APPVEYOR'):
+         pytest.xfail("pdflatex test does not work on appveyor due to missing "
+@@ -127,7 +128,7 @@ def test_rcupdate():
+                 'pgf.preamble': ('\\usepackage[utf8x]{inputenc}'
+                                  '\\usepackage[T1]{fontenc}'
+                                  '\\usepackage{sfmath}')}]
+-    tol = [6, 0]
++    tol = [6, 14]
+     for i, rc_set in enumerate(rc_sets):
+         with mpl.rc_context(rc_set):
+             for substring, pkg in [('sfmath', 'sfmath'), ('utf8x', 'ucs')]:
+@@ -153,7 +154,8 @@ def test_pathclip():
+ # test mixed mode rendering
+ @needs_xelatex
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_mixedmode.pdf'], style='default')
++@image_comparison(['pgf_mixedmode.pdf'], style='default',
++                  tol=1.086)
+ def test_mixedmode():
+     mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
+     Y, X = np.ogrid[-1:1:40j, -1:1:40j]
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index 15f084fc1..14fc6b191 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -21,7 +21,7 @@ import pytest
+ 
+ 
+ @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_align_labels():
+     fig = plt.figure(tight_layout=True)
+     gs = gridspec.GridSpec(3, 3)
+@@ -902,7 +902,8 @@ def test_subfigure():
+ 
+ @image_comparison(['test_subfigure_ss.png'], style='mpl20',
+                   savefig_kwarg={'facecolor': 'teal'},
+-                  remove_text=False)
++                  remove_text=False,
++                  tol=0.013)
+ def test_subfigure_ss():
+     # test assigning the subfigure via subplotspec
+     np.random.seed(19680801)
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index cebf26ea0..d7a5c3a88 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -100,7 +100,7 @@ def test_multiple_keys():
+ 
+ 
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rgba():
+     fig, ax = plt.subplots()
+     ax.plot(range(10), lw=5)
+@@ -109,7 +109,7 @@ def test_alpha_rgba():
+ 
+ 
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rcparam():
+     fig, ax = plt.subplots()
+     ax.plot(range(10), lw=5)
+@@ -135,7 +135,7 @@ def test_fancy():
+ 
+ 
+ @image_comparison(['framealpha'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.02)
+ def test_framealpha():
+     x = np.linspace(1, 100, 100)
+     y = x
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index 3f40a99a2..059a9f9a5 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -75,7 +75,7 @@ def quantity_converter():
+ # Tests that the conversion machinery works properly for classes that
+ # work as a facade over numpy arrays (like pint)
+ @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.002 if platform.machine() == 'x86_64' else 0.01)
+ def test_numpy_facade(quantity_converter):
+     # use former defaults to match existing baseline image
+     plt.rcParams['axes.formatter.limits'] = -7, 7
+@@ -102,7 +102,7 @@ def test_numpy_facade(quantity_converter):
+ 
+ # Tests gh-8908
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_plot_masked_units():
+     data = np.linspace(-5, 5)
+     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
+diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
+index 2d79e155e..cc46fe00c 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -14,7 +14,8 @@ if not mpl.checkdep_usetex(True):
+ @image_comparison(
+     baseline_images=['test_usetex'],
+     extensions=['pdf', 'png'],
+-    style="mpl20")
++    style="mpl20",
++    tol=21)
+ def test_usetex():
+     mpl.rcParams['text.usetex'] = True
+     fig, ax = plt.subplots()
+diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
+index 0e1602e81..6a54b0d43 100644
+--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
+@@ -323,7 +323,7 @@ def test_zooming_with_inverted_axes():
+ 
+ 
+ @image_comparison(['anchored_direction_arrows.png'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_anchored_direction_arrows():
+     fig, ax = plt.subplots()
+     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
+diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+index 9a78a2676..09300adac 100644
+--- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
++++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
+@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
+ 
+ 
+ @image_comparison(['custom_transform.png'], style='default',
+-                  tol=0.03 if platform.machine() == 'x86_64' else 0.04)
++                  tol=0.039)
+ def test_custom_transform():
+     class MyTransform(Transform):
+         input_dims = output_dims = 2
+diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
+index f55edaa4a..60687be5b 100644
+--- a/lib/mpl_toolkits/tests/test_mplot3d.py
++++ b/lib/mpl_toolkits/tests/test_mplot3d.py
+@@ -1269,7 +1269,7 @@ def test_errorbar3d():
+ 
+ 
+ @image_comparison(['stem3d.png'], style='mpl20',
+-                  tol=0.0 if platform.machine() == 'x86_64' else 0.003)
++                  tol=0.003)
+ def test_stem3d():
+     fig, axs = plt.subplots(2, 3, figsize=(8, 6),
+                             constrained_layout=True,
+-- 
+2.31.0
+
diff --git a/dev-python/matplotlib/matplotlib-3.4.0.ebuild b/dev-python/matplotlib/matplotlib-3.4.0.ebuild
new file mode 100644
index 000000000000..70fc4ea111bf
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.4.0.ebuild
@@ -0,0 +1,280 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{6,7,8})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.4.0-test.patch
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index f5ccf8e9eaa6..0c1f16fb99fb 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,5 @@
-DIST mkdocs-material-6.1.7.tar.gz 4580050 BLAKE2B 9919a94b008be298dcff569a33c6dacfa783b338cbf1a09afde6f14c85636b9f971f65863d82f9616c527c3521490c945c0d3ad3647adf69ff8e2795a1b43166 SHA512 ddca360760db8a29055bbf41b58d568943965ffe3bcce5b77fbd4af17caaaebba94f41a9dec6d1042c537054ab92eb6da41cc267ef4421d91ed69373417cde99
 DIST mkdocs-material-6.2.5.tar.gz 5373656 BLAKE2B 7e04a4a284c0749264be819a0b42bc93f924c84b40df9f718392912f97b4cc2288dac7d7a721047c0ad24ed4bb73e4a2d00aaedfbcdd9198c59180fcb2eb286a SHA512 3925c03e2f7e71cf25cf386a6f7c6e768c059a61201860dce186f095c84cb311645628fd8732f10e9106bd818e348115c1f22457bba7c128f6bc89e980983bab
-EBUILD mkdocs-material-6.1.7.ebuild 816 BLAKE2B 6ce78beccf0bdb6e185e0ca97ba608c0e66ac08628452a8d422f56bb9ad060d65b28b72ca4494bae0c7793795d3e7832dbb2ed382e412574cda083c3b0514758 SHA512 5262baf73d87bc9c6dcbab632c0dc42177925d9601abc784be9050aad2b73256e6a814fd38a8a2be960e14a93c3fb267975b8f25769ee3afa12840f4cb742c07
+DIST mkdocs-material-7.0.6.tar.gz 6224144 BLAKE2B 87945b12c8f922fac925cae603ab2cf3a30ee6f707c4960826116d0e24e59f24cccb0319f19b245785f7f764326cc54db880aa7517491e9df6f70a4fd38a3f66 SHA512 8c88f57e2daca9e7d1d466b6bf78c67936c98dc1a871156ae9c29266cd6bf31c73b908b220e2a99f4c1cd77edb5a7fd6f5460885e997189bf02bb75d048273ac
 EBUILD mkdocs-material-6.2.5.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
-MISC metadata.xml 1160 BLAKE2B 31d6beecdab5974437ccfd36fce0f55c6f2053d2fe8375ead6e587e81d75a71cce0bb6f6bf7a6d0e4eb32c060400cabe083a319e6218ebcb5055a82aa993bc1c SHA512 052727224f734f9cdd17e5f58cf6e3136398176e20f00161dab9ccac2cb42ee5615ec5d527f38db49872cb5eedf277d4d3ea60f0d565e5d45396312a455c61bf
+EBUILD mkdocs-material-7.0.6.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
+MISC metadata.xml 1189 BLAKE2B 522ce06777fe7b05b923044cef510b6655d6ce10c60b980782d8ea5db1313452abc90011ecca53eae1e4ffbbc26a93cdd1954e9b7098e64a302dffbcd1e04f4d SHA512 ac0162dc093a47ac4ed00fb0afb6fe417ca8203c8a54c87f71bb774b887b44c765bdb3cb9aeac054f3af180c5f69d2acc506aa24dea58531eb5392da4d8b2cda
diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml
index 5fbac730121a..756ca28d6720 100644
--- a/dev-python/mkdocs-material/metadata.xml
+++ b/dev-python/mkdocs-material/metadata.xml
@@ -9,8 +9,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
-What to expect
+    What to expect
 
     Responsive design and fluid layout for all kinds of screens and devices, designed to serve your project documentation in a user-friendly way in 41 languages with optimal readability.
 
diff --git a/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.0.6.ebuild
index cef41ffedf26..1fdd08b1bef0 100644
--- a/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-7.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 10848d445a53..c1461ecc4260 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
+DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e28b0a8ed465c5c2c69700aa0707dfefea33bedbf87c00265ae5ce4bf9e3789a34b4ec195aef85e370b1f01470ba80c384669abf225486a312 SHA512 3db8aa9b22d24d0e374e5ef298685bb35c0a6b6b1916be12c756d540daac6e482d60c0dc7ce9662a8a05a71c1c75be9b8e0c0b8e7a25f495e2d652d91556ee7c
 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
-MISC metadata.xml 1156 BLAKE2B b3947a8cd0a6679baf35b04349cfd7ba91a4b96172364e547ecaad3920409adb27acfdd8971e45b8799964dcf9ec335985aefa26f13d26be9679ec83d3d76d8c SHA512 6cde58694490de57f25010c94271e56fce0910120dcc9d3c57456421b233327b0bccf6d20fe2d427c9d34798446359253828ae924363d06b042e2766ee5e961c
+EBUILD mkdocs_pymdownx_material_extras-1.2.2.ebuild 559 BLAKE2B 5b471c70533666789384e65bb761eecb5432ae96ac3e94e645bc04ee31020935f3a227b2f538fe6371978fae1d8b7bcdb2fceb59a23d68349c1dfabc5745242a SHA512 c75f5dd1e3add04cb58f9b0bbe02e22e9f4d22397780c3757b082ff2add96dc17f9219899f3432ce78a38b46139c66e0482d00fa7ac9373374e17d90a9f6ba71
+MISC metadata.xml 1180 BLAKE2B c20b97eb1ae1a33cb6a9b2525700a012fc2c9fef8df3b9e115785e0485b928b9b571c922c3643a4ac505abfb183d95da86c38d83d4b479e563f6c916eb45adeb SHA512 367af1fbeda710f5822d985361d6513728fbb9c16ea39cc4dd72a072a6eddc70cefe2671d580fe3b9109fc74be42e14a6641502147977470ea5bc0b699107d9c
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
index 3cb9e6d21529..03b532217ad7 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -13,6 +13,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">facelessuser/mkdocs_pymdownx_material_extras</remote-id>
 		<remote-id type="pypi">mkdocs-pymdownx-material-extras</remote-id>
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.2.2.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.2.2.ebuild
new file mode 100644
index 000000000000..e0206b4ac67a
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/moviepy/Manifest b/dev-python/moviepy/Manifest
deleted file mode 100644
index 264401da3721..000000000000
--- a/dev-python/moviepy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST moviepy-1.0.1.tar.gz 25746520 BLAKE2B 5e18841596e967a1531eef5d7cef8f96a636486923a874606c453bfda92d8ca8657afef9eb46c2b4b3bf7ae58d138866d7497cd088509d403dd6722fca8e8ec5 SHA512 3cdccaa13dd31529a17d480fcd01b5f89b421eeb618425e9fa9a114159d65aac979022507c3f9c64921af60e4c9d7970e6a3223d7942c08e67d7e696618e9abb
-EBUILD moviepy-1.0.1-r1.ebuild 877 BLAKE2B d00005237f655d46b3b5c9bb47600eaa78a7f272cd28d6e0320286fedbf690f0074770640f65286368af957ad4d72e73195cb6a2a51a0c85f61253f8c10f5cb0 SHA512 ae1a9f359f9cc4c79f1c5661753fb43d268356824c2f1117a5fee4415fa00e217de5fb4c6807f91d4cf5aae066346f2c9b2413032ea4b5cee4c9775df0933f3a
-MISC metadata.xml 802 BLAKE2B 7c1e5e502686c1260d21894dd920b5b8e1ffa152be993f03a3b14236d9c88d7e4b80b7a12d57412392398f59a983e23010cb031c8c21694321941283cc75753e SHA512 62c65ff78c212f0bf567c9a0768d91bef8f2277a5d59834495ae1fc7c2c3adc3b4599eb76f5dbc5c2631dd5235848cf4126d6c3fdb9dede30933ce0e6726b06a
diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
deleted file mode 100644
index 79f90cc3af2a..000000000000
--- a/dev-python/moviepy/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@chymera.eu</email>
-		<name>Horea Christian</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		MoviePy is a Python module for video editing: cuts, concatenations, 
-		title insertions, video compositing (a.k.a. non-linear editing), 
-		video processing, and creation of custom effects. See the gallery
-		for some examples of use.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">Zulko/moviepy</remote-id>
-		<remote-id type="pypi">moviepy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
deleted file mode 100644
index 30405ee41f95..000000000000
--- a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Video editing with Python"
-HOMEPAGE="https://zulko.github.io/moviepy/"
-SRC_URI="https://github.com/Zulko/moviepy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/imageio[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
deleted file mode 100644
index 2b85928a9e3a..000000000000
--- a/dev-python/mox3/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mox3-0.12.0-RegexTest-python3.6.patch 652 BLAKE2B c7a53ec43accd137c100c6cab6e208a5e88ff784a59b01b2c71316654f9fe7f39273eae7be8a8810548b25636864b32176997a19020c878ba7861b3e86d74c77 SHA512 bdb5b27c151a2b2fc0351575fb7f8413a7667b738624991255882c1908df3677f2d8bbc984f8c4179325450f0a5837a750adeef3afc1738090879b70a2b135b6
-DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
-EBUILD mox3-0.24.0.ebuild 1454 BLAKE2B b2ac60b32f6e46477027247c7aa4a51d9817127156a805df56b0995dda8c5fcf98a605deeac7cbde57264694686254a792886101edcdebe5749daa7dc88c99cb SHA512 bdbcf88a45e71142012ba40558bb1e47ae2a309a3d40d062a4d3e777c59616714760a23c710a41d32883e3ad821b2de0dc833bcf1f83d760b50a14ad20cee407
-MISC metadata.xml 323 BLAKE2B 880203c04d889c65278f42730f465e61463109e5e8e71ffacf21d3ad98eb804d36ff66886349eec536aef71a7741a1df9496f1c8073ce1421aed9863593a9ebd SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3
diff --git a/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch b/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
deleted file mode 100644
index 8c118e6a9ca1..000000000000
--- a/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Zac Medico <zmedico@gentoo.org>
-Subject: [PATCH] RegexTest: python3.6 compatibility
-
-https://bugs.launchpad.net/python-mox3/+bug/1665266
-
---- mox3-0.12.0/mox3/tests/test_mox.py
-+++ mox3-0.12.0/mox3/tests/test_mox.py
-@@ -316,8 +316,8 @@
- 
-     def testReprWithFlags(self):
-         """repr should return the regular expression pattern and flags."""
--        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) ==
--                        "<regular expression 'a\s+b', flags=4>")
-+        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) ==
-+                        r"<regular expression 'a\s+b', flags=8>")
- 
- 
- class IsTest(testtools.TestCase):
diff --git a/dev-python/mox3/metadata.xml b/dev-python/mox3/metadata.xml
deleted file mode 100644
index 54da79d5a32d..000000000000
--- a/dev-python/mox3/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>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">mox3</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
deleted file mode 100644
index 9c2dd627ff8a..000000000000
--- a/dev-python/mox3/mox3-0.24.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock object framework for Python"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.0-RegexTest-python3.6.patch )
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index f172d8206c52..814076448f45 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,11 +1,4 @@
-AUX mypy-0.790-py39-fixes.patch 6631 BLAKE2B 97f2960e231d70c7fcdd3439806ed60c9b81348e920385e7c4c0ed458877bd295199cac75cf2f5a428acefed292af57416423ce7f689667c61d0f822487c1fd1 SHA512 17e353e019064321c62fa3820a7e934a43d03bd179e0a5fc9514d55478d81ab2c851c028703478e5f9dabe2e8d8414335f27ab764bc7fded1afedb794cc09b1e
-DIST mypy-0.790.tar.gz 2082487 BLAKE2B f8efcb701b4b7533306948721968c9a01ab6c6e56ec99fe6c36e35aca50b52f29f518aee2268a628539a372b8024094ef2d4d87da580b4dd667f41133351596e SHA512 be670456bb64cd197bb6a73832b7e0fd6439ae4af128212328a41cd93d9f644a82e79ffb05bf4695e99bd9788244a24916bf765cf30a6f162cf3b471f45c25b8
-DIST mypy-0.800.tar.gz 2119165 BLAKE2B 48ead6c893f7055f4b1c0167f61e07b647a15f3a13688e1a93f11ebfdfe70ec3ccba3678bb5cf0e61af8dacfa64c241e5b79f28af55e8bfc5ce0a81c409deca9 SHA512 e267fa288f9c538e5c1d0a115b353aabbfbbd46a372dbaefbf43abeae1e6b88cc1b3e0bb301881f20e20b4e69eeeff4be22cf330bf58eaad09b4ea152ab02c12
 DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
-DIST mypy-typeshed-5be9c91.tar.gz 583006 BLAKE2B 08ab2b6d479ccc66493524482051e825c65c0a94ea5cac8e56a8ea1dca85eda6104e4ed3188b7d5ce1ea99058019d66a21a7e270e3ad9df694be67ea1e6a7ce9 SHA512 2912bcf66e0f550941eb9c1f34979644857448a4bec478cfc0d662e9a401ade93ccfb2f57b5348504b4d6f0f23e576da609167f1ec3a0861414fc9c7dea80243
-DIST typeshed-8cad322a8ccf4b104cafbac2c798413edaa4f327.tar.gz 600618 BLAKE2B acc4397fba21db1bcc7b3ca0922fb561d19161579062e1ee506cadfbbb1de952e36fab6ce552bdca932757274c882a90a948e9dfc257905d7f2e90de9f22bf55 SHA512 728808a568074310bd700a6fe3d667ced01a36f4a6ed2fa6df9d7a784e3167e2c96f7b91dcca1f99d50e325165f3ddea6bbafeab2469a9105c1cb217f16beded
 DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
-EBUILD mypy-0.790.ebuild 2408 BLAKE2B c07db4bad815ae14842dccdfcd59bf3b3f8dee1bea6de40ad0d20d3c2927988fa34b2f92bd7887d6e6598d507064dd5c980dfc0aa32f47d5ddd3bc6101bfc6e8 SHA512 2b28d201a00b246c904888d7b738a288ecc0c1c0ddbbed26fdd7ebb38c84a64c1b368a42972d642d88950465973c03dbc91d98620160a18daf921a7f07a536e6
-EBUILD mypy-0.800.ebuild 1965 BLAKE2B 43654bacc7196e199f0c84e1006cebb2b344fcd658227296f25f79ed34c43c12ffdb777b7987824da815d45e15dca35159a234c7d005df1a697683eea70e13cd SHA512 013464308be532afd39cb6c31bbd5258e4c4beeb67b569cdf721bd4a3ed2dddd466659e611437710fa7341feb160ba8ee6551cf43fb4070d3f072fd520cdb915
-EBUILD mypy-0.812.ebuild 1796 BLAKE2B 0f0804dcd2b1eeb673af6f9872b1fba813abbaccad65172826c3cc461c4614ff20d65d529aa1c3f7e11f016ea7ad09e28fdae15920c3892e8ec6c265dd02e454 SHA512 6d4e5bcd86459cfdc89b1097016e71e2cfca2ffd00adfe0fbbf9fa5726265b08eb1475a86f04aead3823f2cf8fc8804e0283890418b206d31b57744cf8bb82c9
-MISC metadata.xml 562 BLAKE2B 8d5318efba2b5cfca8db1d17411199e7d744e8ff5ab11899ccb882c13079a8c65e9d434cd64af37e7dd556078d4f0f9a9298d30840128a36e424526160ada4df SHA512 d8194e6ed968d98dacf4a5b86f7fe5ff9f0983fb5204ef43bde42896fb2496a0a36c4e5fd6e8a0e0d963d55065f95861b5e890cceeddd57dbd57d8b9e7c2df5c
+EBUILD mypy-0.812-r1.ebuild 1772 BLAKE2B 15065f178eb5205fc041b3fc49517f42f770ffdaefd688cfa54c7846232bcb2f1292f1a37c4168ca7962578add3b490a739a91f9133e592b7c64fd4c51a93f11 SHA512 608f51989f8ce28ccc3982c6b4206386a9d8fb31f496925a5311f86df871c2dafbcf2fd0b2a353d1b1b87014ce6a532fe9370e9c67320b845c8e5ab88e2c794b
+MISC metadata.xml 586 BLAKE2B a75692d2b46a9bac5362c4a5111de861297ae5829654d14fa7eaeaaad8eee2ab784017e073423a0e4c8dc845f035884de80c72c73921c01d5fec5b05c3a71c2c SHA512 79916a4aa04010ce67ad08386f0b7e03dfdc6fc0a6195b376c4cd1207ccc408b275efbb3338313db467e3b8fef7abaf93445dc92defa8b9043e497216e0f1045
diff --git a/dev-python/mypy/files/mypy-0.790-py39-fixes.patch b/dev-python/mypy/files/mypy-0.790-py39-fixes.patch
deleted file mode 100644
index a7a581ea8969..000000000000
--- a/dev-python/mypy/files/mypy-0.790-py39-fixes.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 13ae58ffe8bedb7da9f4c657297f0d61e681d671 Mon Sep 17 00:00:00 2001
-From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
-Date: Sun, 30 Aug 2020 18:11:57 -0700
-Subject: [PATCH] mypy: get CI green for py39 (#9376)
-
-Due to Python 3.9's new parser, this has a different (and better) error
-message on Python 3.9.
-
-This is effectively a test of typed_ast / ast, so I don't think it
-matters too much. I'm happy to alternatively just get rid of the test
-altogether, or if people feel strongly, come up with a way to run the
-test when run with older Pythons.
-
-Co-authored-by: hauntsaninja <>
----
- .travis.yml                        | 3 ---
- mypy/test/testcheck.py             | 2 ++
- test-data/unit/check-kwargs.test   | 7 -------
- test-data/unit/check-python39.test | 9 +++++++++
- 4 files changed, 11 insertions(+), 10 deletions(-)
- create mode 100644 test-data/unit/check-python39.test
-
-diff --git a/mypy/test/testcheck.py b/mypy/test/testcheck.py
-index 49a85861b6..39a35c7280 100644
---- a/mypy/test/testcheck.py
-+++ b/mypy/test/testcheck.py
-@@ -94,6 +94,8 @@
- # Tests that use Python 3.8-only AST features (like expression-scoped ignores):
- if sys.version_info >= (3, 8):
-     typecheck_files.append('check-python38.test')
-+if sys.version_info >= (3, 9):
-+    typecheck_files.append('check-python39.test')
- 
- # Special tests for platforms with case-insensitive filesystems.
- if sys.platform in ('darwin', 'win32'):
-diff --git a/test-data/unit/check-kwargs.test b/test-data/unit/check-kwargs.test
-index 1dd450caae..a587be3e06 100644
---- a/test-data/unit/check-kwargs.test
-+++ b/test-data/unit/check-kwargs.test
-@@ -53,13 +53,6 @@ f(b=[], a=A())
- class A: pass
- [builtins fixtures/list.pyi]
- 
--[case testGivingSameKeywordArgumentTwice]
--import typing
--def f(a: 'A', b: 'B') -> None: pass
--f(a=A(), b=B(), a=A()) # E: keyword argument repeated
--class A: pass
--class B: pass
--
- [case testGivingArgumentAsPositionalAndKeywordArg]
- import typing
- def f(a: 'A', b: 'B' = None) -> None: pass
-diff --git a/test-data/unit/check-python39.test b/test-data/unit/check-python39.test
-new file mode 100644
-index 0000000000..0e9ec683ae
---- /dev/null
-+++ b/test-data/unit/check-python39.test
-@@ -0,0 +1,9 @@
-+[case testGivingSameKeywordArgumentTwice]
-+# This test was originally in check-kwargs.test
-+# Python 3.9's new parser started producing a different error message here. Since this isn't the
-+# most important test, to deal with this we'll only run this test with Python 3.9 and later.
-+import typing
-+def f(a: 'A', b: 'B') -> None: pass
-+f(a=A(), b=B(), a=A()) # E: "f" gets multiple values for keyword argument "a"
-+class A: pass
-+class B: pass
-From ab1bd98cc8a6415398121a47c687ede6f4cca4fd Mon Sep 17 00:00:00 2001
-From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
-Date: Thu, 8 Oct 2020 11:18:18 -0700
-Subject: [PATCH] py39: fix mypyc complaint (#9552)
-
-I was trying to build wheels for Python 3.9 as part of #9536, but ran
-into this issue. You'll notice a couple hundred lines up msullivan
-points out that mypyc can't handle conditional method definition, so
-that's not an option here.
-
-Co-authored-by: hauntsaninja <>
----
- mypy/fastparse.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/mypy/fastparse.py b/mypy/fastparse.py
-index 2dafbf4e14..0b72214100 100644
---- a/mypy/fastparse.py
-+++ b/mypy/fastparse.py
-@@ -1257,11 +1257,13 @@ def visit_Slice(self, n: ast3.Slice) -> SliceExpr:
- 
-     # ExtSlice(slice* dims)
-     def visit_ExtSlice(self, n: ast3.ExtSlice) -> TupleExpr:
--        return TupleExpr(self.translate_expr_list(n.dims))
-+        # cast for mypyc's benefit on Python 3.9
-+        return TupleExpr(self.translate_expr_list(cast(Any, n.dims)))
- 
-     # Index(expr value)
-     def visit_Index(self, n: Index) -> Node:
--        return self.visit(n.value)
-+        # cast for mypyc's benefit on Python 3.9
-+        return self.visit(cast(Any, n.value))
- 
- 
- class TypeConverter:
-From ffed88fb95fcbfdd1363f0f719bd3e13f8fe20e9 Mon Sep 17 00:00:00 2001
-From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
-Date: Thu, 8 Oct 2020 15:00:42 -0700
-Subject: [PATCH] py39: fix mypyc complaints part 2 (#9562)
-
-Necessary because I previously didn't actually fix mypyc's complaint +
-mypyc has more complaints.
-The sys.version_info aliasing works around us hitting
-https://github.com/python/mypy/blob/08f207ef4a09f56d710d63775771ae921c41d4bc/mypyc/irbuild/expression.py#L44
-
-Co-authored-by: hauntsaninja <>
----
- mypy/fastparse.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/mypy/fastparse.py b/mypy/fastparse.py
-index 0b72214100..3319cd6489 100644
---- a/mypy/fastparse.py
-+++ b/mypy/fastparse.py
-@@ -169,7 +169,9 @@ def parse(source: Union[str, bytes],
-         tree.path = fnam
-         tree.is_stub = is_stub_file
-     except SyntaxError as e:
--        if sys.version_info < (3, 9) and e.filename == "<fstring>":
-+        # alias to please mypyc
-+        is_py38_or_earlier = sys.version_info < (3, 9)
-+        if is_py38_or_earlier and e.filename == "<fstring>":
-             # In Python 3.8 and earlier, syntax errors in f-strings have lineno relative to the
-             # start of the f-string. This would be misleading, as mypy will report the error as the
-             # lineno within the file.
-@@ -1210,9 +1212,11 @@ def visit_Attribute(self, n: Attribute) -> Union[MemberExpr, SuperExpr]:
-     def visit_Subscript(self, n: ast3.Subscript) -> IndexExpr:
-         e = IndexExpr(self.visit(n.value), self.visit(n.slice))
-         self.set_line(e, n)
-+        # alias to please mypyc
-+        is_py38_or_earlier = sys.version_info < (3, 9)
-         if (
-             isinstance(n.slice, ast3.Slice) or
--            (sys.version_info < (3, 9) and isinstance(n.slice, ast3.ExtSlice))
-+            (is_py38_or_earlier and isinstance(n.slice, ast3.ExtSlice))
-         ):
-             # Before Python 3.9, Slice has no line/column in the raw ast. To avoid incompatibility
-             # visit_Slice doesn't set_line, even in Python 3.9 on.
-@@ -1258,12 +1262,12 @@ def visit_Slice(self, n: ast3.Slice) -> SliceExpr:
-     # ExtSlice(slice* dims)
-     def visit_ExtSlice(self, n: ast3.ExtSlice) -> TupleExpr:
-         # cast for mypyc's benefit on Python 3.9
--        return TupleExpr(self.translate_expr_list(cast(Any, n.dims)))
-+        return TupleExpr(self.translate_expr_list(cast(Any, n).dims))
- 
-     # Index(expr value)
-     def visit_Index(self, n: Index) -> Node:
-         # cast for mypyc's benefit on Python 3.9
--        return self.visit(cast(Any, n.value))
-+        return self.visit(cast(Any, n).value)
- 
- 
- class TypeConverter:
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index c7660c80368e..5965190b13e4 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python/mypy</remote-id>
 		<remote-id type="pypi">mypy</remote-id>
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
deleted file mode 100644
index 35743fc52044..000000000000
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ /dev/null
@@ -1,76 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-# One module is missing from the PyPI tarball
-# https://github.com/python/mypy/pull/9587
-# conftest.py is missing at the moment
-# https://github.com/python/mypy/pull/9543
-TYPESHED_COMMIT="5be9c91"
-SRC_URI="
-	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://api.github.com/repos/python/typeshed/tarball/${TYPESHED_COMMIT} -> mypy-typeshed-${TYPESHED_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://github.com/python/mypy/commit/13ae58ffe8bedb7da9f4c657297f0d61e681d671
-	# https://github.com/python/mypy/commit/ab1bd98cc8a6415398121a47c687ede6f4cca4fd
-	# https://github.com/python/mypy/commit/ffed88fb95fcbfdd1363f0f719bd3e13f8fe20e9
-	"${FILESDIR}/${P}-py39-fixes.patch"
-)
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_unpack() {
-	unpack ${A}
-	rmdir "${S}/mypy/typeshed" || die
-	mv "${WORKDIR}/python-typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed"
-}
-
-python_prepare_all() {
-	# https://github.com/python/mypy/commit/2f291f2e312dd3bf2c05c45da0b032b240bfd7ab
-	# Avoid a big patch by deleting the file manually
-	rm test-data/samples/crawl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/mypy/mypy-0.800.ebuild b/dev-python/mypy/mypy-0.800.ebuild
deleted file mode 100644
index 98c055ca766f..000000000000
--- a/dev-python/mypy/mypy-0.800.ebuild
+++ /dev/null
@@ -1,64 +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="Optional static typing for Python"
-HOMEPAGE="http://www.mypy-lang.org/"
-# One module is missing from the PyPI tarball
-# https://github.com/python/mypy/pull/9587
-# conftest.py is missing at the moment
-# https://github.com/python/mypy/pull/9543
-TYPESHED_COMMIT="8cad322a8ccf4b104cafbac2c798413edaa4f327"
-SRC_URI="
-	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/python/typeshed/archive/${TYPESHED_COMMIT}.tar.gz
-		-> typeshed-${TYPESHED_COMMIT}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# stubgen collides with this package: https://bugs.gentoo.org/585594
-RDEPEND="
-	!dev-util/stubgen
-	>=dev-python/psutil-4[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	rmdir "${S}/mypy/typeshed" || die
-	mv "${WORKDIR}/typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed" || die
-}
-
-python_test() {
-	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
-	# fail with high COLUMNS values
-	local -x COLUMNS=80
-	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/mypy/mypy-0.812.ebuild b/dev-python/mypy/mypy-0.812-r1.ebuild
index 857be7420243..e832e45d0282 100644
--- a/dev-python/mypy/mypy-0.812.ebuild
+++ b/dev-python/mypy/mypy-0.812-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
@@ -49,12 +49,13 @@ src_unpack() {
 	default
 	rmdir "${S}/mypy/typeshed" || die
 	mv "${WORKDIR}/typeshed-${TYPESHED_COMMIT}" "${S}/mypy/typeshed" || die
+
+	export MYPY_USE_MYPYC=0
 }
 
 python_test() {
 	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
 	# fail with high COLUMNS values
 	local -x COLUMNS=80
-	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests failed with ${EPYTHON}"
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index b0c826a75e4a..2407dd03ba4b 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,6 +1,4 @@
 AUX netcdf4-python-1.5.5-tests.patch 1309 BLAKE2B 04876bde9d60bfd48633366eb35d20dab843537673c04ff26fd979cb2de4b6cb36296c2f77b89b2227e7d103a2171827330b4dd0febcffa7aaba288b89becdff SHA512 c876c492c0d5004b1f4092ea580b11f2faf902ed5ce7bbbf16f591e76c12966c15c6616a272ee1e8026b0eba614eb2bdd4cdca495c60f7d7957228eedfae3fd1
-DIST netCDF4-1.5.5.tar.gz 793676 BLAKE2B 15783e359ed65062464874de24b3fabf07c5666f54f979cb4abd5429cb1668df9dc5aee6d96fb171f597b670ac87ac15400549659c82754da60dc9b00ab734cd SHA512 da6ead22ca60900468fbefdb5d1e9486555e73cf4d99096227404094e94cd4d0488320fe4eb2b7944e1183c39817d9e593065297f921016811b7dc6eabb918ef
 DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
-EBUILD netcdf4-python-1.5.5.ebuild 1001 BLAKE2B 49a197eb0969a25645131ce17beaa1fe7d44ec0269e1fc6f2e8dc1a9b7210b5a1dc79448357d458106e6c99c2d2aa484d6057f2680bc99e017dada5c7daf6bde SHA512 4c2e4fa1797d6098e55d40d8510ba26de6837df1166a3b3f363f6aae13e0d2efbbc63590d1a07755d0d8277b2710855c3010f1fad4e2f6dcad985c07c5eb83aa
 EBUILD netcdf4-python-1.5.6.ebuild 1165 BLAKE2B 794f9296c48a0df0339aadfa5eeed5f096ff8fcb53afff5d29764fe3d198e32b6e9a3fba168c5962ddea8cc9481dab0066945385494a721c6fb143ebea751889 SHA512 a52abb9570d1ca7eeea14c4df741c9ca9184c19b85443aa3ebbadeb0aa4c9b4ae2fd5d92f23ed99aef361550b674b5be627dfdb25c6f282fe35e1daeca3eb558
 MISC metadata.xml 680 BLAKE2B b380916f10fadde1beadde6b0f97dabdada2a183db75b345dc6bcc8723a24ce5b1d266048e758d02cc53bc0e92339fe359c86741212f9122a984825ebaf45e2c SHA512 5825d714a75190fef8b60360221425c5feed48220920b854f5f2e1a6489b4fa1952b7a798e42c4750b69c83902879ce263fd5b7d109ed9d43a147e6298a329bb
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild
deleted file mode 100644
index 4fb296730154..000000000000
--- a/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild
+++ /dev/null
@@ -1,41 +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 optfeature
-
-MY_PN="netCDF4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python/numpy interface to the netCDF C library"
-HOMEPAGE="https://unidata.github.io/netcdf4-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cftime[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/hdf5
-	sci-libs/netcdf:=[hdf5]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" run_all.py || die
-}
-
-pkg_postinst() {
-	optfeature "HDF4 support" sci-libs/hdf sci-libs/netcdf[hdf]
-	optfeature "MPI parallel IO support" sci-libs/hdf5[mpi] sci-libs/netcdf[mpi]
-	optfeature "OPeNDAP support" net-misc/curl sci-libs/netcdf[dap]
-}
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
deleted file mode 100644
index eb210892d3b6..000000000000
--- a/dev-python/nosexcover/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
-EBUILD nosexcover-1.0.11-r1.ebuild 557 BLAKE2B 77d8f2b449d395965e7421518461f354d99cc326e30a6b3531e287bdfd81d78dbd5893e9de1e447788512f73082d702f7a86eb904818d9100fee95dc1a58c8af SHA512 a74126e2fe223a26d6b181c0394b50f03791dd2af1388b6d2b5dfbac35f388ed76c2377da2a0b55911165ed3b383817dacd9899dfe80b9a47246931f28dd0ae7
-MISC metadata.xml 504 BLAKE2B 7ca30e311b19179293b6cd03955ca501c9c688c103c9fa1059ea1674d4d3e520463f5415d578b738e16895a1af2e89e79c24b4850027d14d0b5005429abd17b8 SHA512 f19274e0354bf19930dcc1253f46b1384d8d5306b793efeede7faa218797b5584df3f343127b46582a04c94d0bbe81c2f79b4e28ca19d27140bf12b01d1d59b9
diff --git a/dev-python/nosexcover/metadata.xml b/dev-python/nosexcover/metadata.xml
deleted file mode 100644
index 9985b6febd2f..000000000000
--- a/dev-python/nosexcover/metadata.xml
+++ /dev/null
@@ -1,17 +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>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">nosexcover</remote-id>
-		<remote-id type="github">cmheisel/nose-xcover</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
deleted file mode 100644
index 69bb1bd133b1..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.11-r1.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="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -v nosexcover/tests.py || die
-}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index c80fc17e92a6..d2fd81050ca9 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.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
+DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
 EBUILD notebook-6.2.0.ebuild 2364 BLAKE2B 4bd09e25ae0b924706f491ed6672a7f685540f3f047258f6ae97c180b64eab2b8b33e9a34bf7178d6d23ed73a7fff76720d383973f6e9b6b8c6b6269576dd13b SHA512 c51b9d74be2e6a40237147814c740f9a8f2f15c084670b956aff57b62a330f0eacb6f625232ffd3984018de807f790a96672cd5bf166c4fc4adb918445f7b0c3
+EBUILD notebook-6.3.0.ebuild 3072 BLAKE2B 4f4705acc219e1a43975e1af1f49f14f744552f497f0003add91c82cf7c92891b51ace78386763f17c5850ceecd349d7cb263b944920fc51b469d961bdd39ed2 SHA512 4e5a2af4eb7dc7095dfafbffeb55a1cc047590ba797e571ebb6d21e0c0a40abf2ebc1ed45e47470efa54a9adfaf832e0ffafaafe5729c04bc2bd0fce5c199c92
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.3.0.ebuild b/dev-python/notebook/notebook-6.3.0.ebuild
new file mode 100644
index 000000000000..9de1aeb1b611
--- /dev/null
+++ b/dev-python/notebook/notebook-6.3.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/os-diskconfig-python-novaclient-ext/Manifest b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
deleted file mode 100644
index a4e71f64851a..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST os_diskconfig_python_novaclient_ext-0.1.3.tar.gz 2543 BLAKE2B 07fb502eaa1fa4340c2adff63e5ecbea17292bf7a7c69171507be83b51e9fe65870b0716cdc857d49fe31d01a6522cd265950a7ccf9487599cc19dd0c808ca55 SHA512 4733c4ef720d0fdfabaa26c4288b933ac7d9e4433b20257cfe206399b71154dc6ee98ab621e67aa4c3446df2ec1929edfb9341538d7d4ab69d71576652a9d591
-EBUILD os-diskconfig-python-novaclient-ext-0.1.3.ebuild 621 BLAKE2B 22a67d7323365e96179a905e9b8066849da1858429f0b24085bfb38132e6c8c232b3e01e73c124b16b37ae8a76a80eb42f9d5ca2e0d65df9f7f631489d22ac22 SHA512 be10d137d2be2d17ad3ab4e22f0cb1290beb13625a1a5fc965a662879168ab51136375ad71ab80cae6285325c351bd54bfee7f1f97de7b03a9022276e3a89f64
-EBUILD os-diskconfig-python-novaclient-ext-9999.ebuild 540 BLAKE2B 3af2534a137a1866ee642eea03f8a63693129849756e01a47e9eb6b79ec9576aca13e661512447392b790337a8b25ecaf9d97145a22f38f3717588b45d17389b SHA512 a47c535ddd203b1f3d15d29512281328996c03ec9c06708b5e697036a792261c907ea49a3b41bc13678a790828a1664fbad4e797b96dc39d0e1fbce5887a4057
-MISC metadata.xml 438 BLAKE2B 39e0d54ba264ffdb0551d2a4fb7e218873cad4f9a25b3453ec51fb5af62222d61019511004a09a3e74553a2fb2f7fdcd95667227b949f19f41757456f701e7fa SHA512 5b893d963b4e63da85ced84f039a31dfd680db8c7d277400762a98734b3caabd7fbe265c36ea383b7a1bb2da91ebeb5841a3a6b44b1ea586d422f545a1595919
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
deleted file mode 100644
index 34927faa5730..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">os_diskconfig_python_novaclient_ext</remote-id>
-		<remote-id type="github">rackerlabs/os_diskconfig_python_novaclient_ext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
deleted file mode 100644
index 36aad96ff3e9..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Disk Config extension for python-novaclient"
-HOMEPAGE="https://github.com/rackerlabs/os_diskconfig_python_novaclient_ext"
-SRC_URI="mirror://pypi/${PN:0:1}/os_diskconfig_python_novaclient_ext/os_diskconfig_python_novaclient_ext-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN//-/_}-${PV}"
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
deleted file mode 100644
index 95c1997f9500..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1 git-r3
-
-EGIT_REPO_URI="https://github.com/rackerlabs/os_diskconfig_python_novaclient_ext.git"
-
-DESCRIPTION="Disk Config extension for python-novaclient"
-HOMEPAGE="https://github.com/rackerlabs/os_diskconfig_python_novaclient_ext"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
deleted file mode 100644
index 0edd7ac74e0c..000000000000
--- a/dev-python/oslo-sphinx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
-EBUILD oslo-sphinx-4.18.0.ebuild 748 BLAKE2B 69e0c7ad8601137b9577905e6a749015c52f5bc987da537522afb3dd925c56f57217da9319d43c7c95a6e77073f55a11556cf19e3d0ed6ba47a78130da96fe4d SHA512 586bca56b7841166655ab1914473ecc780a596137183b0fbb7f66cde8d25aa8c0d35ec87da6201ca9b7c7a4daee559f814f70651e234cd3e8374155e753cfafd
-MISC metadata.xml 475 BLAKE2B f8b58d6ad4b1e89a60ac292069108af907439ce98264dde7ab08c83410521a732709e724a63955701b0a6bc1a981000874a8676139a2e717894757a51ef1ef34 SHA512 d03cd6bb3bee4df0ee1620085e11db50d462ce47b59af2cb21b748a65c884108a185447b7a2b16c60bd67cb59a0858fa4fbd2690c6420f2d20010d9b752af481
diff --git a/dev-python/oslo-sphinx/metadata.xml b/dev-python/oslo-sphinx/metadata.xml
deleted file mode 100644
index aa9a0ad06e6d..000000000000
--- a/dev-python/oslo-sphinx/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">oslosphinx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
deleted file mode 100644
index eefdbeae4673..000000000000
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.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_PN="${PN//-/}"
-
-DESCRIPTION="OpenStack Sphinx Extensions and Theme"
-HOMEPAGE="https://www.openstack.org/"
-S="${WORKDIR}/${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86"
-
-BDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 1fec53c3d69d..70ee203b05ed 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,5 +1,3 @@
-DIST path-15.1.0.tar.gz 48271 BLAKE2B 3f71d7686bae65f0b605d8fb2077395e5f5f36ec6f29c41f18e2380c6f775e5bd5bc8c2d3589fe507ad49c7383f1cab84b59176e1d5952d02cec68037bf3e4b0 SHA512 31c40fc57d6c6c57fece4fec720b344191cc3d395efe9e5f071c98a7392727535150c6952a4f8174b037141d5cb1b026c2fa44da8921a8354ee1627daf8f6977
 DIST path-15.1.2.tar.gz 48280 BLAKE2B 6dd6be743939d4ac1edd5caab18658473d7318eaf255140198db34cfb28c95322ed8ae05284683b18a0146f412ff8a2c14dae60d018740f8bb9cfda861b8ea20 SHA512 76f2a04800154ee8c7b7b9783bf7c63c544da74bb2f92424aeb437448a04dcdec008deab262d3b40d515404e6144bbad44e618d824974654ef10676878415ba4
-EBUILD path-py-15.1.0.ebuild 1012 BLAKE2B a9c00450d98ec9092513b35f25b3cf32ad5faef103a4d47ab235aea731ee515f6342fd9e85df2e5e7d017e5a6e150cbf946c80ff2df2148c1dd4ebe1e5bfcda4 SHA512 eafaaf62ccbac71b774f1b46e20d8f400e801d4acd270763ab0bfdf30da414e22ad46954106222d603a54acf60b6f242c941995658684745d701d240c0ca1724
-EBUILD path-py-15.1.2.ebuild 1021 BLAKE2B 52af4ec6690a5b09a31bb57cffd3ae029cc2e2d004734cccb915f47ab8439f8400b99a5216aea39bc02888d95873cdce7b43499c8cfb421e270eb1734f9ce2f6 SHA512 12bbbd28e178db67a761eaea622179ebd19067d97d03882b369e852e6568d2469b3a2fe871e1fafc15f067b5eb06c0909177222e0518fd9050528726e4946b4f
+EBUILD path-py-15.1.2.ebuild 1012 BLAKE2B a9c00450d98ec9092513b35f25b3cf32ad5faef103a4d47ab235aea731ee515f6342fd9e85df2e5e7d017e5a6e150cbf946c80ff2df2148c1dd4ebe1e5bfcda4 SHA512 eafaaf62ccbac71b774f1b46e20d8f400e801d4acd270763ab0bfdf30da414e22ad46954106222d603a54acf60b6f242c941995658684745d701d240c0ca1724
 MISC metadata.xml 382 BLAKE2B f4e983fc27f8e9a578a8469a0b432adf91f622d9993bcdf9a0f25f2786680eb26a67d53d1c97deebc8bbbf7d62ac5b37b2d5a44b39c81f3862e0ffe2cbe2e577 SHA512 61909559eb0ad81e607bdd7b9b147f3e9c71e53721ddd99b1cc2afbe8e33ca7de2b9849ff3ff7468183c5f82f108b958ae0ce3042998972dac8eab6338040151
diff --git a/dev-python/path-py/path-py-15.1.0.ebuild b/dev-python/path-py/path-py-15.1.0.ebuild
deleted file mode 100644
index 84e71862c2f7..000000000000
--- a/dev-python/path-py/path-py-15.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-MY_P="path-${PV}"
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path/ https://github.com/jaraco/path"
-SRC_URI="mirror://pypi/p/path/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	!<dev-python/pytest-shutil-1.7.0-r1
-	!<dev-python/pytest-virtualenv-1.7.0-r1"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# unreliable, not really meaningful for end users
-		test_path.py::TestPerformance
-	)
-
-	PYTHONPATH=. pytest -vv ${deselect[@]/#/--deselect } || die
-}
diff --git a/dev-python/path-py/path-py-15.1.2.ebuild b/dev-python/path-py/path-py-15.1.2.ebuild
index ec0d713f9c9a..84e71862c2f7 100644
--- a/dev-python/path-py/path-py-15.1.2.ebuild
+++ b/dev-python/path-py/path-py-15.1.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 8c374a83fb61..38461e7799d5 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,5 +1,3 @@
-DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f22480321df920bd15b96239c571c13cdf397ea38ea122f0a73167924a902955a1eb50dc865ba1e4445324358c3e3cef SHA512 452f217055873d3d1acff6b9b5016a3e721bffd4349aaa975aefe3ae1e25ca576f90eab13e7f913ebbfb796ac7b81dd8ed63c8e6d055c2ad7f8fd9d72ca8c21a
 DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
-EBUILD pgspecial-1.11.10.ebuild 636 BLAKE2B 9b93d173d141bad2e04a91026534e9264085e24eefd26f0e43c01c0ca795b57dfe7e93deca8e61bd4d4dd3a0a54873b3c97bbb9c322c8b07d0c92971d36381d9 SHA512 a2e6123f1235fe8af6cbe631d6795b1df9758078396f5d0659afffb6cf83304ba74f752be75143fddc8c10c212ef6703c003fd1d0b7d757749982d71f9c09c32
-EBUILD pgspecial-1.12.1.ebuild 686 BLAKE2B 59bfd0546e6aa127a4511916a7c361f115e2852c9c0706a249289f1dea09ed8db475aaaf4b451bc68d8e900e55dd4f8631339a257dda4a15a3dc8a0e0c76b1fe SHA512 5a52f96408ad5f4454551a89a02a8ff7373a928a11567fc825fd9f74cdd285b0c015c3a97313a99712c0aab9c25771828dc0c69ff80dc61df36f1190bb2110d9
+EBUILD pgspecial-1.12.1.ebuild 684 BLAKE2B bfac4ec92c81b9d0076243bf0a3d8ae1edebdf23a60805a16f163356245e3a0ece13987ae9114fa83ea1b77b2220c73a8a9582c07edbe5d7f3613aa29204140c SHA512 0e785005053597a981e76285f7574bbee0865281e002db70da920bcd6e13c8acc92e6a92e4a30e510c54db9ce9362f071248442bd0643da8d630a8465b46ebab
 MISC metadata.xml 468 BLAKE2B 7fb95be81dcba90a99cd8ac20a7eb3bd93d926ab8da91d328806fd5d6516a8f32c46ba8721a9d490e1243eb2f1954e2ca35d4543bc8df0d2c53f60dc280a8a5a SHA512 7b558945ce12f4be5c135118b3ca4d9e565ddf5ef978c0b84af6687e15f2d26efdcf27f55efc1c85fe7b9a023a506cd219490d2baf9607cf099e921b0709df0d
diff --git a/dev-python/pgspecial/pgspecial-1.11.10.ebuild b/dev-python/pgspecial/pgspecial-1.11.10.ebuild
deleted file mode 100644
index 9825ad44a2f7..000000000000
--- a/dev-python/pgspecial/pgspecial-1.11.10.ebuild
+++ /dev/null
@@ -1,24 +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="Python implementation of PostgreSQL meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-DOCS=( License.txt README.rst changelog.rst  )
diff --git a/dev-python/pgspecial/pgspecial-1.12.1.ebuild b/dev-python/pgspecial/pgspecial-1.12.1.ebuild
index f83f61db75dc..6c6f5cc1a948 100644
--- a/dev-python/pgspecial/pgspecial-1.12.1.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index a2a55700caa4..34d43d8ac21e 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -5,6 +5,8 @@ DIST pikepdf-2.8.0.post1.tar.gz 2370159 BLAKE2B 336f2034f3a0207d1f5522b13ff2d0a0
 DIST pikepdf-2.8.0.post2.tar.gz 2369810 BLAKE2B 67b2f88a0718076d9f28148342832ec646443b6bdf0f9ca3717a9a9caa6518563564f25e4532c3ebc5d05e18b78f2db4a9bab17f0d0cf6cf329dcc41f7c3332f SHA512 adf28106dbf58bf4b29c3930280c6f54c04ac4fc40adb4d9e7fe3a288293b077f2e4b063e4be91e661c835b474ba2b46167ce05d9f5d2c7c13ae180f6b3b76dc
 DIST pikepdf-2.8.0.tar.gz 2369623 BLAKE2B 465fbb682b973631d50b841b292ed8d86b5ff51f8466634c59c22cd86c56ace5594b74c2e36668f5f40f18ac55278978a59b0cbbc3e66d0ac49b6a6d7fe97a00 SHA512 8be9dbb20061352b482e1e4dd81cbede7cc99c294ccf7f5741b46f68244537cba225ce88e113b76e049ad5db70bfb075a8993fca1d24d99e0296e318b5107435
 DIST pikepdf-2.9.0.tar.gz 2371794 BLAKE2B 7a32542d428d67e1eb940d34ba7efc21bb3002cc573e02de383d7beeb795a0680709c0fdecb933fc7b63a09cc1fb616df9fd514d734f13b6c0ad022c6482c64c SHA512 e1c5ee04946f8c43d20ea1ff857ec463cf8ea531d5d579d0855669401b8dc931bc3ac08be20e3231aafbbc5fc8984608cd8f8aece214ebb7068c21e94981b9a1
+DIST pikepdf-2.9.1.tar.gz 2373727 BLAKE2B ae6b15384c4f01f257a00893c30212281c7ed16dc311e5409355a71db4bef20b64aaab29b52e5b951c6842100fb0cd9bb247d90dcf0a17bac85f788a4c0f7a35 SHA512 e2d87f8b3ce1b78e8153ce79bdbc33f10e85364de912a94f0629f52e654db2c7d911a5d344778c8e632a3037d4151dd4f717e4cc73161e004ac62ea3f07a526c
+DIST pikepdf-2.9.2.tar.gz 2375015 BLAKE2B 775a523ec7543bd112a673e352c5835b84f28fc3a1b762447d4366d6195cf423c284ab638286afd1f768a2a475957695252e473b7b4d8d16c48fcab733a138bc SHA512 909f98519f2eb685225ed19e4ed4a7bcf018a5eb21be42833635e76a09d1c89254980f628875eebfc2b937ae8030d11d916503da28888421971540964d8ffd39
 EBUILD pikepdf-2.5.2.ebuild 1482 BLAKE2B ed869023041dfd2868624ad0e1e1c54bb93c2f19575ab2747d9f917911e0f9828b1a26b3e48749f8b14b5415ba9aed3ba168eb1eb6e8ef38f2bfa7d3e78ac596 SHA512 56732bc004bf3aa895df1ab72912e7941084a196a075be91357dc30eb19f87177318b2fd39ef7edb264fa7ec3e6f41598d84b749bb8a09af7efe2bd249c47a7b
 EBUILD pikepdf-2.6.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
 EBUILD pikepdf-2.7.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497646a759d2bcb19b8a615d711945ab634901f5b13595881ec51db32d2d6551b82aae72bf51db4bd8a14adc504e SHA512 83a16a80169e09fc31c993782523c9b0738341e042d24ff3cb3c2c0b17445ec3972906afd492d0b7dfa38441abd15ee83d62d6a247d8499b746bf7ddaa4d4234
@@ -12,4 +14,6 @@ EBUILD pikepdf-2.8.0.ebuild 1483 BLAKE2B f22d7d4699cc989de5b7f3786a38713a9a67497
 EBUILD pikepdf-2.8.0_p1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 EBUILD pikepdf-2.8.0_p2.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 EBUILD pikepdf-2.9.0.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.9.1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.9.2.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.9.1.ebuild b/dev-python/pikepdf/pikepdf-2.9.1.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.9.1.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} )
+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.9.2.ebuild b/dev-python/pikepdf/pikepdf-2.9.2.ebuild
new file mode 100644
index 000000000000..2a76869d388e
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.9.2.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} )
+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/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 5ab6cbcad317..2c5eb37d1aec 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,5 +1,3 @@
-DIST pkgconfig-1.5.1.tar.gz 7000 BLAKE2B 5eec60ed5af17315513f676ba37b201f4ce897089a823a9bac89d281095848504f69fdb02637eefa2872cfc6e4d1150fc18d0185288c3418500a0e201be8fc59 SHA512 2d62ad1a51620d4ccbeedf621b563c42258d69cf3aeb63f2a29399a9e03f111be1728bdb0d9d924f916839cf9a3d7625bbdd1a7b6f2471a221e764180a56fa59
 DIST pkgconfig-1.5.2.tar.gz 6984 BLAKE2B 1d3b724853498505ef9f60de89b9f90e049334f42451202f07f29a0dc5efc21eb13045afebef3d20b0ed0bdedda053eb37ccbda0a8977febb408d3c69a2efb12 SHA512 7f457fd956f2b4e2580433311d166dd5537cafb95c0842a85f69bf84bbbde58861023acb7d221383b4306ec0ce31badc0481b2394b3e737de0db2e194c5e250f
-EBUILD pkgconfig-1.5.1.ebuild 571 BLAKE2B b515916610f90df9752c25cc60bc7b7ca9d5f8a0b70b91a7b9b89e8f8fcb26a32878c18d9b1b07e672c9381158730a84fc8da8915040c5cb4a8d8079995d2129 SHA512 1bf33347b892f21c5955ed57e33c26cc1cead03a75018d36530098a24bae3b902c0af448d4145c412ea05cf83d7f6b516d41f34546603002142b5870de7ad522
-EBUILD pkgconfig-1.5.2.ebuild 575 BLAKE2B 89bb594f4704348bfa5641efe9490197803f29cbfcce68bd43d92edf1003f084f8a0d0ba6df83c75096534400b31db71e66c16e07d9a74009a9ea9fd393ad63a SHA512 455d1f080ff35d9bab3c5d9a468ac35720de18db4526ac5f2e49835803c7acf5832a8dc52d9f07e394b4ec7801d1dd5065a41b630b7bfe23b46648cb5c5226ab
-MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
+EBUILD pkgconfig-1.5.2.ebuild 571 BLAKE2B b28daec31941dd46eb8e7f0b83c6639d56a367d28a3fbc28d21b3beefd269b130d5dd9eeaa74085d25622504935395537534192ae712fcc5d3a639d3b1ed6b1a SHA512 bea1313d95301c58d1a43b73e8a3a229ba6986550a30e4da2016acf149a4e74f15183c3dd08f51d5f6d7b82b2f7a37e0cb9beb2a94f1e88160db49c94b971059
+MISC metadata.xml 404 BLAKE2B 4bc0c1973b01332976f22eac000dcfaf395345073577b6e4237bf80bd7311b5612b33b6fa4a64dbf8723c853a6944d3c936a7dbcc4c3a77d2390620ff33850c1 SHA512 a89d3d1e412813a81ba120acbe38262ae38a25d73cda8dfde458299f2bc8685c67f0e7ca2c4e5fe1ebf4b5fabe05ac491aeb153280bf73294a48ee10afb290b8
diff --git a/dev-python/pkgconfig/metadata.xml b/dev-python/pkgconfig/metadata.xml
index 7c0bf4d1bc90..6ea65f16c61c 100644
--- a/dev-python/pkgconfig/metadata.xml
+++ b/dev-python/pkgconfig/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pkgconfig</remote-id>
     <remote-id type="github">matze/pkgconfig</remote-id>
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
deleted file mode 100644
index a3e537270593..000000000000
--- a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
+++ /dev/null
@@ -1,20 +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} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="virtual/pkgconfig"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
index df5e38603816..2d103c69d11c 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/pkgconfig"
 
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index bf0403bd4e7c..784d21bd02bb 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,5 +1,3 @@
-DIST precis_i18n-1.0.2.tar.gz 65375 BLAKE2B 0ba2a23838306502448c4bc4bba5fec5228e4b819e7223cb5319ca3428cd558b5fdbd389327af7a8e718a5b8369b3d13de0f739456df9bae026acbbaba62e8dc SHA512 bef972f44e068954297429a22452d08c0e3fca983eb38dd22e3f90b3265bba1096343d34f7c9a226b24f92a823fdabf09af8eafba6bfbfdc8ddda8f0f4a28bdf
 DIST precis_i18n-1.0.3.tar.gz 64037 BLAKE2B 99486f8791785ecad7f3a246a0a13f26ec52aa91bc40ac904e92409f2cdbb28a5458c153da593ca8dd626462f0216e8c72447fdc81f8133ed61240717d08cbf7 SHA512 afb987fe4d0fb2732c62585e70361ad5ffc14d1eb9b8e767fe314fa9a3dee8dcd14f2531f5638d3a72fa7ac4fbeed94ed8907976816570257b405468cdb6702a
-EBUILD precis-i18n-1.0.2.ebuild 639 BLAKE2B fe7173d4b338c37cec48f6dff8714e239195b46bcc2b992de2dd67aedea3daaba9be970a5de9340188d79d846bd64034d8706532611247b60052e4ba72a65e22 SHA512 5a9cf566f8fca1ea7e2fb314430b3cb8d5e80f40217287fa4ce328da711ac916f4e0e9b8143804120d77745c73b4c63d18284464b58267b0748c434c77d77586
-EBUILD precis-i18n-1.0.3.ebuild 499 BLAKE2B 1d0e7577a9f8c783f139bbd023ec11f371f10379e730402477f2e5b3d73de116f4142edf74c838084ba53c2076c7cce8c35b25d12b492833e2ce7d21bf405fa1 SHA512 8f525e612af884e5dd0e8903d583da3f9edaa28bdb926428b64403898d240050cd4d1a001ef754a6458d801e897fcfdba19bd6207fdcbb08314b40d9daa88386
+EBUILD precis-i18n-1.0.3.ebuild 497 BLAKE2B c7f0f22c87372b7b3e160858783d769cadcae41c7bff6b95af593e1253f9406413829c69c520adfd6197cfb5cfbdaf31a918e6ff495e8504c3629c5bcdeb47ef SHA512 9b66a48a5552a2770e8b29b21ce3a7024be9779053b84d4b69420118c9c4ed6b232aecb713dd1b1963ebec8dd8375d78b54e7004c0454786825a4ac9f68b7c95
 MISC metadata.xml 918 BLAKE2B d23b58dbec4b4a3ac224ddb0413c70ae2ce1985c4a516ebb87ce9ed960c570f7dfaf7ac535c20b6fca401f49c81a1a3ae6df5df101593bbd65070ab50356edae SHA512 a04fd3004462cb9619f284ca076be314757dccadf916ade53eb5f2989fd5b4eacbea0817391a2380eed7358d096e2a5a253188f441be53086bb0d4c4716d5c6f
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.2.ebuild
deleted file mode 100644
index 40896484ed9b..000000000000
--- a/dev-python/precis-i18n/precis-i18n-1.0.2.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,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Internationalized Usernames and Passwords"
-HOMEPAGE="https://pypi.python.org/pypi/precis-i18n"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	# requires additional files not in tarball
-	rm test/test_derived_props_files.py
-	esetup.py test
-}
diff --git a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
index 61f322b6d231..157bc735dd9a 100644
--- a/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
+++ b/dev-python/precis-i18n/precis-i18n-1.0.3.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 6c6fc9e6fa4c..d4856f3df5ae 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,5 +1,7 @@
 DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
 DIST prompt_toolkit-3.0.17.tar.gz 3033301 BLAKE2B 86ba94f2e0c9e998c53e5e4ed12961c85c667b6d0356d17cfcb1856aef933f88c1c525507e76a833970444a787641c7316bc7496787ffcd61102945ae91b73bb SHA512 ef78b3aaf953f20a035f8a1f58262a8e4c1ae6b88c02c523bc51237bed22f52e229488d0113901bcd94835cc7120ccb4beb75cc9c9d99dde4e8f21df7bfde8a4
+DIST prompt_toolkit-3.0.18.tar.gz 3034754 BLAKE2B 27334b7009fc162af67a1fa14bd30c76efed6a333c5c93f3100a2c9ad3299a1139c3c3cf530e7e048b5700c0dc4ec1087d1aecd5412785b09221ea2d55796008 SHA512 be2dbd72a1e08553c0e50453958b6085a7d743464acd02b303e5002e1174d672d2cadd7a992e71d0445aa2f2be7565411ae4d00c3677c275eca056a20ad9efc8
 EBUILD prompt_toolkit-3.0.16.ebuild 597 BLAKE2B fb5db05ae055ba17a8e0dd2f3db0a1e84053785b28db2a0ccbe37270cc96994a2ee74fe2764d168f079d46f22415125ce4ba6b427cfc21a7546b3b22d865e0c9 SHA512 bb1da9ff1bb8834d1fbc815395c4d0c50d3e551cabe8fc603dd9fb11bec0c466fd8f5fca2b3dd02a8aa8784e1d1b0f27994b9655110130455f873c9b60e101de
 EBUILD prompt_toolkit-3.0.17.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
+EBUILD prompt_toolkit-3.0.18.ebuild 601 BLAKE2B f5cd919989a08fa2deac507ab423247e62ed252cec0bc8fa2133065761690a9e0ea434f4a8581e94b59fc75552a653f0d73a9b7d5e15a14745a70ccc3eb871d2 SHA512 5d219c5ce75be08eae971241cc657f0299b6031d3a4b8cb550d032c488cca9e3910cf1843d5e8fb004a664850fb1f15e15b869d92d3cc0bfc0cc6e777ade503c
 MISC metadata.xml 430 BLAKE2B e3e66ce24a2ac8bbe9d6f6c0bef07dc0bbc3222ca281cf374abb492898428de9f84404b5575b122cdd1dcea44faf395350a14f4fa985d1ba29681ac673560132 SHA512 259a53798ccc14411b01184139e72d633473e2539d7c93911cf71db94bbb01166de3b3abaa76fa32b51e1107cf0ffbbc84644d8c8615ffd3a0e95b95e1f4c5f2
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild
new file mode 100644
index 000000000000..fe628251486f
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index df9e521906e6..6a7c91743775 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -7,5 +7,5 @@ EBUILD protobuf-python-3.12.2-r1.ebuild 1739 BLAKE2B 2096acc41453e7d9ba32ffd103f
 EBUILD protobuf-python-3.12.4-r1.ebuild 1747 BLAKE2B dd29d5b90951e57bc5a64f8ee244566d5de520f8f38458f141ffa8a5e72c25193a0fef1c4d97b915be544a9fc5ac7f9592493e6a178bc0a3935070b5524d79d3 SHA512 e5b89bf945f1043029690eda5f4c517ed79e2c7f4a257ee00f987f6abc16b41d78eabb24bcb6d8d7b19677b9ca635d7dd7f9a0731c9d8015933d1b22b3a2e73b
 EBUILD protobuf-python-3.13.0-r1.ebuild 1821 BLAKE2B 1ad689be6b15a3d334ba98a71187059fc77137c9be4357200919185887a9a111d1d8e2772afc0a552c52f4f3f5b3d01e6de0dc8606b33bf41379eaf54a618529 SHA512 ae7027d8366dd82b52e17ccc7f7ec5b5286ab143f2ce172792bcb32ec3f2792f49d62f91fe8b3b271207d891872d35518c08632eca26e18d4c50fc37e69690d9
 EBUILD protobuf-python-3.14.0.ebuild 1620 BLAKE2B 006e390772c6b76fc91026e991fcd800e03259be617c9c35ab97201d9b34d680ac98f651457b35090d0edbca0026233273600a8155d458d93181542febaf278d SHA512 f48b96e11ba26ba00b42f9bd57a185a93648f0725149dd74d4fc0319b81e6c45458ed8ff0202b91c8991c37ec664e6bf256c567e43f88772705b42fe4a53a29c
-EBUILD protobuf-python-9999.ebuild 1521 BLAKE2B 669efa900f2ec6e211f3b57f8ebc9379d6a33f22284d569a8f6e6e2bf0624afa0a2522b2f1e81a6227475fea270a9b70776d5c5804cb9664570d0246df727f8a SHA512 32f1dec830fb3f88ceea118dbe92b8c1b3b584c0005e29ee9c8e699c84da591436b574c7e5c1eca1a66aeb09ec0c1032834f75102ccbb540633b80845ff21aca
+EBUILD protobuf-python-9999.ebuild 1521 BLAKE2B bd43e151f42891d126f9926fbf959fddd3daa8f397a202c47257466815342a7fff16b381292a318ce6b7a34732d65a5c36df99f348103a7fa5e2d507b3693382 SHA512 1976a2b3b9e7445482da42af47d9cfe469409feeb7b330d6f556733f62d70877ab747592b70af3b24a4b1d2593d86a9ecc541b21d0a7a87fe8a8c2c23b326f37
 MISC metadata.xml 553 BLAKE2B 21140c27d2faef17e40528a3a90790083195432bc84b8af3c7f34c836fdacee20acb517cbb1ba15e7c699faae125fd9bc2f40ec5398eff8f01a882a5a02bac3d SHA512 6dcaac2b38128ac9f13de5f4c38e8e10b3e85f73b7777fc12ac15229bb2c94aae6df4e135540d01ae33658df524bf3a6519270c59f1d4f06355f3d786607a13d
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index c9e25d634284..99a41f3837c5 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2020 Gentoo Authors
+# Copyright 2008-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/25"
+SLOT="0/26"
 KEYWORDS=""
 IUSE=""
 
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 5b7f63eaaf5e..d55a0ef8ac17 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 1079 BLAKE2B 5ac522fae270d505255da6e92fdfb140043084e943db0f966cd61a7414de8c0d5896d4e4780a3b7d0419c069cdb7cdd6f2f9c19767f201013a975c2b918882f3 SHA512 7c1e6f411feeb6a8299dbac6aa26874a92c058f368625d40c9c151854522da175e5313357aac9e1a274680ac0e4433fc3fa8c525c88b26dde72d1078bf7d76c6
+EBUILD pybind11-2.6.2.ebuild 1075 BLAKE2B 03727907697c2f42498344b2c026a15b4f8c551490cadfa7b5d7c8409efc7351e45f6ca6d5a4b434527ea0faffa775646e0eb545d75a933b24e0ea6ef841196a SHA512 c9fe7974ada7fa9b9af38b8fb542c660d2dfddc965488e101a4686be9b8639d09e3658ef919298731983426890347466269c5bae9540eda842e628732e947a12
 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 55f034efb1f1..93aafcc7a3f4 100644
--- a/dev-python/pybind11/pybind11-2.6.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-cpp/eigen:3
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index c7283d80410b..9257bfa1fbbb 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -4,6 +4,6 @@ AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb98313183828
 AUX pycryptodome-3.9.9-system-libtomcrypt.patch 1538 BLAKE2B 7928e5a3c2edee7f58d7b7f5876416d3b397e29cfb63e063f904f7a1deb46300113d165aaeddc57e5e0e0b4b1f0ab548fb9151e1d43f16483491948c2d722d2f SHA512 74b0ec6e521e0d51c3e777a8cb6f374e2e3853e163cbe66e50a16b9eb72b004386cb6296a0f3950ccac9a3fece26221c0363e4b05df4608a6c5e7cf408fce6c8
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
-EBUILD pycryptodome-3.10.1.ebuild 1439 BLAKE2B 42a04f5fe53fb122475905510fd8addec91ee89fb50743d740714c0bd66d5ceb2ff3c739ac125b634d4fd645e3f5dcb03d088e3c793e7e526652b25954ae6822 SHA512 ca5608c0620f56ea9d97d90971f0a2429438bf9be0b8b000546673f6aa053542b920200faa98ed9af11b00cd86ef19c7344b0d4a0d44777a46e29f3bf9f3d188
+EBUILD pycryptodome-3.10.1.ebuild 1433 BLAKE2B e4a5484f0fc13a4013cb6305449094579b5dec2689131b8664d5c8450c717cb229f8d83168c62e6aa7d563b130936ce3e6e365f03dae94344fe4dc8dfc9a4937 SHA512 c6e9bf504176bb74fa557df34d631e2950c3ef2d323f544fd95a54c0748df683e0c24e359e6a57a745f356d60a2343e940de22abfd7482d78156ae6c85a157db
 EBUILD pycryptodome-3.9.9-r1.ebuild 1418 BLAKE2B c5600edbcee40731b005b54b3a87325b7b1f9cc52a0ed1a1c2437f47904e42a2d8054e708737a4b579b520ffa3b51647010cb9d1a48ffaf2a32f744865864b94 SHA512 83d98d4e857553f45082bd28c2d80ad0921910097892c7aa34d8b4536db007684c5714820b7fc7458bf387b949646526aa9528a81b6849e9392999b72857bae0
 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 81175a13b9c5..8d748b40bf9a 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 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"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycurl-requests/Manifest b/dev-python/pycurl-requests/Manifest
new file mode 100644
index 000000000000..d781e10b2917
--- /dev/null
+++ b/dev-python/pycurl-requests/Manifest
@@ -0,0 +1,4 @@
+AUX pycurl-requests-0.2.0-test.patch 1603 BLAKE2B 7f0a8964aaac2e73e5198e8e54f7ef4521c06118002950c58f214f95539f9b1be59a9cbeca7f5a790b05b877cb1d537ff59544ced47954dfebc32c4cd23088fe SHA512 6c9e4d89124ebad203847d1b905572a089faaa1e61bba8ac0105da78a0d906c2c7f602df120009775b3ffd21b522fbc999c521780972fea41c74f65a66cf328b
+DIST pycurl-requests-0.2.0.tar.gz 22962 BLAKE2B 9e28422e910ab88f2f6ace1684cd35a89eccde9eed9d63f48cb2d6f0caa30811016365fbbffc2bdd2dd8b05a3b248142a5822c092c9d40ebaabeed4ef068c659 SHA512 3bf091ff47e376a23f9046dbcc5631199da9434911d4140f5d09e5091b81f05c8cd8094528b7ac7d74f7a4b085a6dfd40bec81c66fde020a0680e2237b7af5b2
+EBUILD pycurl-requests-0.2.0.ebuild 598 BLAKE2B 36b01ae377faa61ab4af1f4251712f2eca435d6c16dcdc26961fbefb05811c64f9c6887bf3e509f49f63aa4211aef25fbc49c7af60765f061f51d27e9ec13c21 SHA512 9d77670c3bc07c50bb812cc9378346fe159b91ec32f3e607ead5b3e061ac82e64319b77c255bd00a84740fca9333d12ba0013eb504ace1aa6fd6b801e19d1620
+MISC metadata.xml 273 BLAKE2B e63a5ac24d72d1f4d149064a48900b9e8fb5613ee7ac52dc1ece604ededdee3083f6e7eaa88501c4f07aa954ad515cbbf22e0b2b187266f613b7276a9e1874b8 SHA512 0140397ca54e88f4d4cfbf84b87fcfad82e3064358c65f164aae2eab3f0787b568b7ea968fef442c6c6cc0a854f60340bbd02ce6e25b702dea0ce9ba58040683
diff --git a/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch b/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch
new file mode 100644
index 000000000000..2bed5e3c93c2
--- /dev/null
+++ b/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch
@@ -0,0 +1,33 @@
+diff --git a/pycurl_requests/tests/test_exceptions.py b/pycurl_requests/tests/test_exceptions.py
+index 2415ba8..6960615 100644
+--- a/pycurl_requests/tests/test_exceptions.py
++++ b/pycurl_requests/tests/test_exceptions.py
+@@ -32,7 +32,7 @@ def test_connecterror_resolve():
+     if IS_PYCURL_REQUESTS:
+         assert isinstance(exception.__cause__, pycurl.error)
+         assert exception.curl_code == pycurl.E_COULDNT_RESOLVE_HOST
+-        assert 'Could not resolve host' in exception.curl_message
++        assert 't resolve host' in exception.curl_message
+ 
+ 
+ def test_toomanyredirects(http_server):
+diff --git a/pycurl_requests/tests/test_requests.py b/pycurl_requests/tests/test_requests.py
+index 7d2c627..850d530 100644
+--- a/pycurl_requests/tests/test_requests.py
++++ b/pycurl_requests/tests/test_requests.py
+@@ -160,6 +160,7 @@ def test_get_timeout_urllib3(http_server, timeout):
+         requests.get(http_server.base_url + '/slow', timeout=timeout)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ @pytest.mark.parametrize('timeout', [0.1, (0.1, None)])
+ def test_get_connect_timeout(http_server, timeout):
+     with pytest.raises(requests.Timeout):
+@@ -168,6 +169,7 @@ def test_get_connect_timeout(http_server, timeout):
+         requests.get(http_server.base_url + '/slow', timeout=timeout)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ @pytest.mark.skipif('urllib3' not in sys.modules, reason='urllib3 not available')
+ @pytest.mark.parametrize('timeout', [Timeout(connect=0.1), Timeout(total=0.1)])
+ def test_get_connect_timeout_urllib3(http_server, timeout):
diff --git a/dev-python/pycurl-requests/metadata.xml b/dev-python/pycurl-requests/metadata.xml
new file mode 100644
index 000000000000..3fd976494203
--- /dev/null
+++ b/dev-python/pycurl-requests/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>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild b/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild
new file mode 100644
index 000000000000..479af0c574d3
--- /dev/null
+++ b/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="Requests-compatible interface for PycURL"
+HOMEPAGE="https://github.com/dcoles/pycurl-requests"
+SRC_URI="https://github.com/dcoles/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/pycurl-requests-0.2.0-test.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 389732f8b97b..5944d6b0c86a 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,5 +1,7 @@
 DIST pydata-sphinx-theme-0.4.3.tar.gz 3279359 BLAKE2B c2a57fc7dd70f8d57a0b56bb45907615658b1dbb705f177fd40e04995754180dd637256618b36b0a6ee59e865558eb013d191f2a5f461365f07cf647427056e9 SHA512 9f4f0b1fab88e92302211957df798a7e1bbae034e9935260f94959bba50bc3384ef818ff0cdcd04c3a4b4d09a5285c3d165e35fa3114d6dbb15452cc6895703f
 DIST pydata-sphinx-theme-0.5.0.tar.gz 2556070 BLAKE2B 10682a631314991b89e05f95ec67b133a87391a00048a06505cb6c38d4106cf7162c9d150866d0099a18512164e59224601fd0e132e4c1de56b47c42ab357f9b SHA512 12731065d463cffadb78b50d31815eadc41ce5214087c7b5d859fe58bb672e318323880a9b915c7d4e5b47e5bf9a8a1b90d14695f2440e4f70d129dbe5d3a40e
+DIST pydata-sphinx-theme-0.5.1.tar.gz 2556119 BLAKE2B cc8ea35cda2829f884699f8200ce1e8fbe9dbcd06fc7b4d3e51d587572d6d66d90bd57d9bab9f1e6fb55688ec6531bb7de72646030e97eca7c34da51f5756fcb SHA512 50996dbe1ea25f751056b837480a5d30662c169c420b27c50aa14c583a2f3601aad34718433ad00a938425142af1e937f1ffe8e341194b60b9c915167f070c43
 EBUILD pydata-sphinx-theme-0.4.3.ebuild 978 BLAKE2B c1195609b74e8a79b596d12ca3546ec6e2a338c4bac68bb5aee54d206a8954038fc4d2b88380703f7db0a516d33eadae8557fced9194b07a9589723536aab1c2 SHA512 8bfd6a630fce8520733d012c22b3496786dc35d3f5a252f5e5b23a05e58b5a971db4feac105ea69682ceeafc2a07f83d0e4dedabc38cfd93a21ba4e43da6b895
 EBUILD pydata-sphinx-theme-0.5.0.ebuild 883 BLAKE2B 14b08df2c133696eef59bcb47ad391802af4deab48a63fe0f119e6fd59b8cd7678ea5b9526a69db83edae0f2dc537695f3f84ad58c2e437eff5f339ae1491d33 SHA512 6a98b8f53cd49c818dd9e704894646d37e28f401170faf45a74379ba97fcbe6b2c79a690b9c2c0c6e36e6a30667a52905557d9d7f60d086ee915ff058ecda1ab
+EBUILD pydata-sphinx-theme-0.5.1.ebuild 870 BLAKE2B f39fce86419275013bef8e89bed44ab58553c1a8744bb483221b604db1dca67fa30866b05e7f519cebed72f60131d2508c654a24d01bdfe5ea59b0d3e29b5bfe SHA512 4622c25a66cab6d2be7c74a4f536176d0f7fe3ee0a4a6457d9b3e406d3fed69caec7404c6028459215dba4333fa223c5b8ab3ad9a8c24c2da2de69d9f9ba8d8b
 MISC metadata.xml 612 BLAKE2B d6f4bb41753cce10173d9cbbd3f6310c7923e41f676dd3f593e9576ff889f3a4056165679f3c774844e9a87236af846232df08783c06247caa04b33255151380 SHA512 46b43f8e79feceb01f66749fbd4f04459a1b1922c967b3a9a43b78f8fb6668a0b8acb8fe1da3fa61f785a2e0408cb2b360fb67875219a84bfbda09c6d58ad52a
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.1.ebuild
new file mode 100644
index 000000000000..777b9deae071
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="https://github.com/pandas-dev/pydata-sphinx-theme"
+SRC_URI="https://github.com/pandas-dev/pydata-sphinx-theme/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# TODO: fix this: Sandbox violation to /usr/local/share
+#distutils_enable_sphinx docs dev-python/commonmark dev-python/recommonmark dev-python/numpydoc dev-python/jupyter-sphinx dev-python/plotly dev-python/xarray
+distutils_enable_tests pytest
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index a8a4ad72f159..8d16f3a3135e 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -2,5 +2,5 @@ AUX pydot-1.4.1-unittest.patch 3496 BLAKE2B d5aa063d1700836c2aa967c0856c4b693f08
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
 DIST pydot-1.4.2.tar.gz 272678 BLAKE2B 966f2c4ef3e26a63cc50ab89b5b6b5b413aabdfeddf994f2d5ba9dedaa1ed3152dd8060186e7380c3e768b783f7bfe1971cd600c18d1b73f7ac63db08ee3ace9 SHA512 caa8051561710129b5164fd1392da941829fd977092a6ec8b00efe7a199d2d60bc7ef13cb0e51615f384550f0fb80190d0f56b83d8d80d1fe372efb5dbbd3632
 EBUILD pydot-1.4.1.ebuild 921 BLAKE2B 9fe83e9bc4769bf75bc0148e04b2e45ca2d5a349fa84aa590505651a3ec85564662e2a15d070fe906df251b7777312d760fa7ac9a61eee2b4be39d3709ebb91d SHA512 eee5e4069681e0a24116d919d77f0c0e1158edd9ad7aec3f5e9a3e24fa4a7f1ffb09e03cebe69b35a0a0ac860813b8577381966c0979f3cc6f06bc5edac7a4f7
-EBUILD pydot-1.4.2.ebuild 870 BLAKE2B 4f5df3506ced7df19443271d67f608ebfa3885e8c19f18efd440d0c3938bd47815691339d29a64fdd19ebc7b906a870f11d8bd53b7d99884d3214f02d6e02fc0 SHA512 55026fab8691d8c647967ab533ffd347039f35d5d0e44cafa4b5a8fe23e0a0a300e704fd5dc78266f9f16f2022f6b994e0562844b4fd4488c9ec9549328cfea7
+EBUILD pydot-1.4.2.ebuild 865 BLAKE2B e476e66b3dc8a7f572d7af6a167f8c83efdff364720b3f026d79c72d3cb37c3f3bacc2953a7dedd9804291e4a8c08e3351ff0d306cf42af996dae7f56d2d47e2 SHA512 bb8d272bcd1d97e2fc3be32cc5b9b39e5560db435127113e0ac6b5014ac147a716ebecf44fcb9ff9651e128cb614d0aca26f9c281b6d238eb94ef836bf29f398
 MISC metadata.xml 371 BLAKE2B 2593c34d4b9be527091b66e955309dbf0212067a131283eb68fdde7d9b46e124eccf9d0b492a777ebae61d65b2ae72ed79f2729b51a2512af05a6b6e42f94588 SHA512 00e92e9c7ecbaf0e53463ba97ea63973786cd9948cdfce8fc3f4fdf5cfa3973b6a6433d5369c1d956085b44675a5abd994b193b66a07c09ec1a5eb2f78aadb1a
diff --git a/dev-python/pydot/pydot-1.4.2.ebuild b/dev-python/pydot/pydot-1.4.2.ebuild
index 5a4226cebe82..8786e3683073 100644
--- a/dev-python/pydot/pydot-1.4.2.ebuild
+++ b/dev-python/pydot/pydot-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index d385519d7cb4..0bd9fc2ae8d5 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,6 +1,8 @@
 AUX pyflakes-2.2.0-fix-tests.patch 3826 BLAKE2B 6f4d213526b2a39642765b3b13665e8a17bcf39804e6787ed2627a77d3b068a8ac1d7951a207c83e1d76812ac77b889d6b4cbf0b1cc30cdd8c59f8ea886ef373 SHA512 47e1c624358edd34b3ddae023275a81ce529594689c3b67ec2c7b5acec84b9c9f426b9f79151a1ec3dc89b39335f11e03cb22db4f4c63399e876f887e3f3ecee
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
 DIST pyflakes-2.3.0.tar.gz 68452 BLAKE2B b108dc79ce916e1d1c05b13a167b11bf5350672f5513d6642c0c9f6b46a46d558acf1cb5035f6d987a10087242f2e1040d271c4270d1f510156883d37a7c658e SHA512 e65e534139b7739e742eaa07e8803387f20bba0332247688c864ef8fab74d5851c68e9705cecae158c8d178ddbb08d54aea7ce77910979be1cc3fea57687fce4
+DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
 EBUILD pyflakes-2.2.0.ebuild 738 BLAKE2B f7588634e0315dd9a578facb16fecc05465de1502329ed933c699259e76dfb47b82e494a3666edfaf41db3ef3a52bba7aaf7b8c1556ac3b24a0a381e88ebc4b0 SHA512 a34ac88d1c188197bab8132d1d4b12bcef21e63518430489454d652d9191fdd981cc484c0b28b84c585f276bc290fa1ea50071d85d866eef2dad1b166573eef5
 EBUILD pyflakes-2.3.0.ebuild 657 BLAKE2B 48eb014a7fac3963c98075cbf6727bf0d725b53ad95bfc618bd15ea0505167f690ae8e2b58dd5e6deb153c78c0c90131ef2a57cb26168e92558fb8aaf689eadf SHA512 72af1ee82da463e11b6e545653c618725326c6d1798cf778848c10348b9663c00904500384f162044263e652ceb066f84eb74f0db008028bea294ee81389b3c5
+EBUILD pyflakes-2.3.1.ebuild 657 BLAKE2B 48eb014a7fac3963c98075cbf6727bf0d725b53ad95bfc618bd15ea0505167f690ae8e2b58dd5e6deb153c78c0c90131ef2a57cb26168e92558fb8aaf689eadf SHA512 72af1ee82da463e11b6e545653c618725326c6d1798cf778848c10348b9663c00904500384f162044263e652ceb066f84eb74f0db008028bea294ee81389b3c5
 MISC metadata.xml 762 BLAKE2B f31d372e281fb92fd01a1bb9e33afcffbb020fed4f82f8c549de08bd4b45619f914ccbad2f60e88f46cab9c3932003d7db353d79548f825a7e9add773b374cfc SHA512 d21377d6a2d76377928b0ca8db8d17673e9f188183141f8b4b980b9da90572ca68bee0e12a71bdb79339fe7dbec8a1e4b4aee344275280e4a61f08ffe9ff6996
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
new file mode 100644
index 000000000000..160f694fe25e
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+# Uses pkg_resources
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 7e51106964d4..a37c3d3f61a3 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
 DIST pyglet-1.5.14.tar.gz 6414252 BLAKE2B 3e30f4dc80fffbf93a3cc7fa744ba224868dea1d9f1998446a2341fd3ed1c058493c486979aedb8415abe5c8a3f53dc634494f849bf6f3ab6f9ceb0e35cfecd9 SHA512 9b34e80e1b28a2ef0504339b67bdc31e568bf3a3352a9a1d78d3cf87ba84e86e23aec6e524abbca26865082ec2f9da8d7633ba83206f9996d87002faa1269044
 DIST pyglet-1.5.15.tar.gz 6429039 BLAKE2B 5835d2c8c0c6e309664bea4a4001d0b68622379ae27555b640ed4441cb4319bf4ffd2b491cf789cba5639b9ca43e047f1e2cf820e540123939dd386a4c88fbf3 SHA512 0ea6f936895b0f17d7272866ecec7721ae1fb353af3654c49bb09eb81729f939df07ba3cdaf8b8bece345a8f144d56a45dc23d82e1887db306fd08c7989c688e
 EBUILD pyglet-1.5.14.ebuild 1291 BLAKE2B b1dbd7878bc4b209f007ae0993a2bc8368a76098d7d9179b221bdf02d296a7d8be9b03862b5b41192d3ddaa923d478ec6dcba3c9f827120680f58da37b189739 SHA512 dea783a7a0b2a20e6998c7d37dc4fdd6ea2b4dd4af6c904801c3e993dd183a28038da89ff06adf1b3303b38fcd8a578ed6effdd8068e1c5c1ef5dc8902defd63
-EBUILD pyglet-1.5.15.ebuild 1292 BLAKE2B de30eb98ef60ee5e09a2a5c9672ec85400221fecafa73172d6859e4f8a2e6d06301cf3ffc3943ae187e12d66cc0320d991f218968b88fde945dfb2b0cffb36d7 SHA512 1db556f81e7f173655ba6d323d10f91a625f17e313ddcd910f9558ef8340861190a1b74fdbad1ee7dd85d8ac4ecf0b9ed069ea8f37f635fa48685a729a23fbe6
+EBUILD pyglet-1.5.15.ebuild 1291 BLAKE2B 5989e0ac261a0880803a9464b743a4cd2d9872e056e01b0da107260ae796fcf3b658c40a6e3c629117a08c810f6c9f902375f5f5ad6fd12e327f5d8b67921707 SHA512 82d64226168243ce4b41e7c6804d73624bca7a7955cce0ab8de6dcaf16af02cceb2db1336b6020e795b6a021d137b78cc1d764aae2038228810078ba1e602817
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.15.ebuild b/dev-python/pyglet/pyglet-1.5.15.ebuild
index 2d99c737d14c..0cd1a3a7a56f 100644
--- a/dev-python/pyglet/pyglet-1.5.15.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.15.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index b05d94ac4464..f218b92ef845 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,7 +1,9 @@
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
 DIST pygobject-3.38.0.tar.xz 553892 BLAKE2B d6add416c3f87ee9d5a56f30dbcaa599682ec5932b204f7c743d50475503ea2705e7943e6a93610d6f1c9d322723d1df6ea0f19c1cf245b2ca7d49395ca36170 SHA512 d63313dea2c143cf8c08a4678f1aa8e5908d503ad29c596eeb9fa1070e1231de57cf934c33031f9c4920b85e391f3b4143b46491ffd16e04e8d48871cb05e5df
+DIST pygobject-3.40.0.tar.xz 555920 BLAKE2B e7b3fa926066ddc6992c3087a582e25207ffb34f5c847be705953d8498f307661822462ceaa6362d120e96556a50882ed78540fce5cd2e97f0a4fd11232fe01c SHA512 c0c617e5678f942db33bdff6e149e438bd7d5f4e0a4e0a112476515d1face1c6e992457f998a5077a08bdacc1bda24711b29a4312bd3ee825b526d54a7ca3db7
 EBUILD pygobject-3.34.0-r1.ebuild 1885 BLAKE2B 5c83846b565f9415fa654e1d4bba401438a7e11122b0eeb9ddb91015598f58b0e37b5f326e21d3c4b5cf79c046129b7d4612c32efdbbd20c0bbd1241bb2c13a8 SHA512 5ee96c08251222a4dc18636fd2b1b45a519848cc469a9ba18df2780f22684a6a8f377cf9ac4e0bb9c65fee1eef005409c8ac1691ab3f1957fb67c051b64bb0cc
 EBUILD pygobject-3.36.1-r1.ebuild 1745 BLAKE2B 34eaf592f7695c65bec024632d4e5e852806a3e26e1769c21abfb9a1db5b0f8649efd505d1a416e5a106155839fd72cf2d012160beb4eae0c40b99b2176d15d0 SHA512 fe8e7cf92ffa159fb173b0bc978822c4f68661588038a48cb111e2e6e7fc7f432c34e9039877c5e28953eb6fa943e0af1f2dbf9bae7aff5d109b0adec9a0b8f5
 EBUILD pygobject-3.38.0.ebuild 1757 BLAKE2B e6e9ca79a742e09486e219cc6f1f4418e4affbcab13d7ef07c68209cc83c8b9140f700fd179cc6ae99e75deede081c7acca89ab1c043db3afced4bf420bdb264 SHA512 e13299fd37f59d38d4579113099186dc8d29045aae384d30ff20ed7cc0359ed20943168e62daf6ea322df772c238839168a401ebf673d376afd05a1f27fcf545
+EBUILD pygobject-3.40.0.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
 MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/pygobject-3.40.0.ebuild b/dev-python/pygobject/pygobject-3.40.0.ebuild
new file mode 100644
index 000000000000..8e08699fd4ce
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.40.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+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"
+IUSE="+cairo examples test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/gobject-introspection-1.56:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/atk[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_feature cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 0e16d43acc75..914150b9b9c7 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,5 +1,3 @@
-DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a0969eea9f0cdd631110c19358ac387a97902cc21ee61c8961ef2ee020689c30f7c86f6448bbb40258d730b3cf79cbe SHA512 94ce684d8c7fdb8ece003c1965a001bd745a38086f382e0185f6750edb3103998165a5e2554f065d6364409e5438272e5c256b7b756b971f61f1dd5cbcf3d503
 DIST pyls-spyder-0.3.2-gh.tar.gz 8781 BLAKE2B ac24e0433c2e5ba43274d6266bc7532e7a1f1b0c3c34b9acfe10e5c7d789937536e81c4b19f96090f32d34c932529c0f4c23b49d2b01e7a0b628f8c2dd6f7611 SHA512 c08910ebaf161ceb712f273f054add1f3a202684b001d8d95650555bd67fa5675b3fef9e3d62d0d1b9da0f5adfeae9ff0fbfee44e4362856550d77582dbc6e95
-EBUILD pyls-spyder-0.3.0.ebuild 593 BLAKE2B 393d2a7cd130260dd81158408652872cf35dd270b02814e696e05e86e2a8cfdab94aeece5d184321583864b25ce61db57c95dc55194bb1f0d798f2bc26144b4f SHA512 e1b485c45aac28f1f31b32c7cf68f6fc762d02c7bb8f87f4420cf57f7119df2b9f6405bbddd4caa87fefc5dbc8935a0ca190c069e57d19a0c46273ffd85fba06
-EBUILD pyls-spyder-0.3.2.ebuild 595 BLAKE2B 184d4ff0d6b9478d2c6ebaf35de2a7cefee5cca5fb4b1ca404d951482ff0b2b7a5826fb56cf2774eeb84913752acdf2e9c14b888565837f3593b2d05cfc952ac SHA512 07875d3126ea57a1b3a43f7f50d91d6b779d66e13eef40c2f7434e87e996be3e6c130db9654430fc1ab31e71ae0bf323ed9799f21946ccb3ef136efb0c084ae1
+EBUILD pyls-spyder-0.3.2.ebuild 593 BLAKE2B 393d2a7cd130260dd81158408652872cf35dd270b02814e696e05e86e2a8cfdab94aeece5d184321583864b25ce61db57c95dc55194bb1f0d798f2bc26144b4f SHA512 e1b485c45aac28f1f31b32c7cf68f6fc762d02c7bb8f87f4420cf57f7119df2b9f6405bbddd4caa87fefc5dbc8935a0ca190c069e57d19a0c46273ffd85fba06
 MISC metadata.xml 584 BLAKE2B 68e80afeb533c195a73554ec8498d9a419260fefb7bb084350d446088bdb3af7f9fd1c06add2cb32ac31f751c06271acbed27e65e656c7cd9314a3bd2b844a84 SHA512 e17357b928f91acb0ca60e4c2797c607d117a307d9bbb9e0de81fbca48231a42c8842872dd962897aedaa233f83dea8454cebec3545b04dfbb816e86fa5ae4ed
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
deleted file mode 100644
index 8557f82629e8..000000000000
--- a/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +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="Spyder extensions for the python language server"
-HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
-	https://pypi.org/project/pyls-spyder/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/mock )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild
index 513608b147d5..8557f82629e8 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.3.2.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/pymongo/Manifest b/dev-python/pymongo/Manifest
index 388aa2114bbd..4c60db2d745a 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -5,5 +5,5 @@ DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517
 EBUILD pymongo-3.11.0-r1.ebuild 2642 BLAKE2B 3ab0a0f617a4aa61880829f1f507673a2d46c730605d7c0e38b3eca4a45f57d5950246caeba0d9c0607d5d7b6c91ed7f27037353b6908a0408f0b7a3404fc69a SHA512 9e792030f1fb032dc79a08c5717faf5798e627437ea639f3808cdb518cdeeab54dacceb229af1bbb8a066f2832a12ed86e35cc74eddcc984fbf448a66f1ccd5f
 EBUILD pymongo-3.11.1.ebuild 2743 BLAKE2B 9a4e53be028428053e1b8d7478c4e3e336488e52c75b667fe3f17176e82a9c8275cb9d278ed921bb54b3ef6ca66d7a3a9beaaa3b4a87805d5f2d7e42ff103691 SHA512 937fd738051a0cceb969ac14f26cc27867c874b0aeaabad7cd9cdececcb2bc960d0592a97ada6f55a50bb92a2ec4cfcefb43583ee46b445b63adf66af151df2a
 EBUILD pymongo-3.11.2.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
-EBUILD pymongo-3.11.3.ebuild 2744 BLAKE2B 4b4692e579117121eeb64be952b6d3dd380c6f8b80989320bcaae72c2e90863bf83b883d9838748c87412c81979796928e7060d73fb2d06be22d7d3dd77947f0 SHA512 743b339d4b26fb924bf5533ad486c334bed47e78f504b06a1bd433355773383dd89f23e3d73e07ff35cf401f6d3aa3aa229aa0f6edabb1a9942b8c466598e9cc
+EBUILD pymongo-3.11.3.ebuild 2743 BLAKE2B 3c91424d5bcf9e550c6e3a12218e3862fabdde50f476677cc3d6baf91973152ca7fc643c7c910b8fcfe69e1d6485de49bac345fec87ec3bc9a761e29be2489f5 SHA512 31ab715885b1f64a87b55380a45304273c2c11e2927a3d91aea765a7ac3240c46f81a368c5bf6783c236d0fd2349c596d8929a2fdd43c7418abb05370e1998e0
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.3.ebuild b/dev-python/pymongo/pymongo-3.11.3.ebuild
index d5e28904376e..ca015712e495 100644
--- a/dev-python/pymongo/pymongo-3.11.3.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.3.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="doc kerberos test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 80f2e7539ca1..851bf94191eb 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-1.0.2.ebuild 3797 BLAKE2B 9c57667606aee1eebba23f07b8ba84f0da467e3eca4cc7729cd4792bcfab5193a96d4fea95f48eca1650ba5c31dc0d9660825e308fe02a804184d69705dcc01a SHA512 be2a0dc58e51598b9f7acdcab0ee0b2d1db473a572e90df9bd772bb4c645bb1717009f35819624fd4e70b671c4e054427bdebc5f97a4443f37486d53b0e05a4f
+EBUILD pymysql-1.0.2.ebuild 4159 BLAKE2B 751d7afc39728fceac6021f3d5e5e4d4e5d08ef77dc949e4b9159e67d1233aa8a21abe07a9b1a0db772b9d5db0a027028599b658d8bcfc57b07a8ff56ac4ecd5 SHA512 d94e7c93f6a5368f07858f201235f680f1ff65c679ec4f6120b2963d63dd8ba475913a63a1649230b244bbc77e0c0b89c283259a9595591b6300236303f84973
 MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index dbbedb942643..c2dda33e27a7 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -41,6 +41,13 @@ src_test() {
 		einfo "USER set to '${USER}'"
 	fi
 
+	local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db"
+	[[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db"
+	[[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!"
+
+	local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld"
+	[[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!"
+
 	local PIDFILE="${T}/mysqld.pid"
 	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
 		einfo "Killing already running mysqld process ..."
@@ -54,16 +61,16 @@ src_test() {
 
 	einfo "Creating mysql test instance ..."
 	mkdir -p "${T}"/mysql || die
-	"${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+	"${mysql_install_db_cmd}" \
 		--no-defaults \
 		--auth-root-authentication-method=normal \
-		--basedir="${BROOT}/usr" \
+		--basedir="${EPREFIX}/usr" \
 		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
 		|| die
 
 	einfo "Starting mysql test instance ..."
 	# TODO: random port
-	mysqld \
+	"${mysqld_cmd}" \
 		--no-defaults \
 		--character-set-server=utf8 \
 		--bind-address=127.0.0.1 \
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index f0bcba4e3c6b..d698090e3ca4 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,6 +1,3 @@
-AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
-DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
-EBUILD pyperclip-1.7.0.ebuild 1224 BLAKE2B 9a9c14f66381071ea284bea31e98aaf7c215b9e5b2e27549246fcd16eb89f649e8a54a2952b458c8e4e3d4c3c0d12eb934fb770f8c63b06b10c7d85165878dcb SHA512 cf10f385fac732e85a8a846305cf00ef95ba652398c13ff0303e4f682743ac3dee55cc860d930887d81dfa9885726540f8ed366d058864a3c4f1881ac75be5bd
-EBUILD pyperclip-1.8.2.ebuild 1180 BLAKE2B b2e30adad634560de79cac5dcebd984d87bdb62315760dbce3469e02a4e91ca64823a70c738a43b2d925bfc25f1678a489ada60b9336a079dfa3e656a377b001 SHA512 860e8d07bdfac263f35a7d132d3f785bb3be36704cb5a910f6a81fa387c884ad0c8dc41307486c443b873f5e232734a5e220785a93c3d4e00e361754b965b76a
+EBUILD pyperclip-1.8.2.ebuild 1175 BLAKE2B de8da8d34c1686662802ceb5602b546098cb733cc0a81b956b934198cb3f73ecf2c6d585bec94988babbcc61dc6b3f6484d09318a302749d1cedbd188a5468f9 SHA512 d5f088860495001aa637880b2943f7caacf54ed10b8a5d2c62da8f77aa06acb585b34714324f0cf2ba6757ffa02f975af13a3026e4d82f50afc61e5228aeb04a
 MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch b/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch
deleted file mode 100644
index 4f1a94955f44..000000000000
--- a/dev-python/pyperclip/files/pyperclip-1.7.0-test-pyqt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From be59ac638e26aff5204a32333f7ebe046003065a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 9 Jun 2020 08:46:46 +0200
-Subject: [PATCH] Make PyQt checks in tests more specific
-
-Test whether the widgets module can be imported rather than 'PyQt?'
-in general.  The latter gives false positives if PyQt is uninstalled
-but there are leftover subpackages such as qscintilla.  In this case,
-Python 3 imports 'PyQt?' as a namespace.
----
- tests/test_pyperclip.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_pyperclip.py b/tests/test_pyperclip.py
-index 7519d94..2942639 100644
---- a/tests/test_pyperclip.py
-+++ b/tests/test_pyperclip.py
-@@ -146,10 +146,10 @@ class TestGtk(_TestClipboard):
- class TestQt(_TestClipboard):
-     if HAS_DISPLAY:
-         try:
--            import PyQt5
-+            import PyQt5.QtWidgets
-         except ImportError:
-             try:
--                import PyQt4
-+                import PyQt4.QtGui
-             except ImportError:
-                 pass
-             else:
--- 
-2.27.0
-
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
deleted file mode 100644
index ed8610f66825..000000000000
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ /dev/null
@@ -1,63 +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 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python."
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
-
-RDEPEND="
-	|| (
-		(
-			x11-misc/xsel
-			sys-apps/which
-		)
-		(
-			x11-misc/xclip
-			sys-apps/which
-		)
-		(
-			kde-plasma/plasma-workspace
-			sys-apps/which
-		)
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP}]
-	)
-"
-# test at least one backend
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-pyqt.patch
-)
-
-src_prepare() {
-	# stupid windows
-	find -type f -exec sed -i -e 's:\r$::' {} + || die
-	# klipper is hard to get working, and once we make it work,
-	# it breaks most of the other backends
-	sed -e 's:_executable_exists("klipper"):False:' \
-		-i tests/test_pyperclip.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/test_pyperclip.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
index 43129c28df83..361a2543afb3 100644
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 1ced1e6781ce..bc50385476eb 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,5 @@
 DIST pyproject2setuppy-10.tar.gz 10221 BLAKE2B d9309cd7fe44a5f2f32311033df14e3e9c6391859a063a3c7afd25df69143dc93b0d8ccd03b908f0bf0badfce394f04f46177a30e7dc94043a5405017d9da711 SHA512 e6f94c29e5bde9c884fd14bba7d28a5313f363fbb7af3d2e5f2d55d718340c14cf26a5b28956eaf6c47a74b6b498b88e9a0fe0a2bd504370dbcb1553765da0f4
+DIST pyproject2setuppy-11.tar.gz 10420 BLAKE2B 64eaf9d9855c767a821c876292613a360d631a21d5e45715dbf63c2f0704135110eb6d7fa0f6eb9ec6eb52dc17c621b89ad709170b099fc71a26c9b754c61566 SHA512 8b4f9e933301c4f724242f47877a0c436434c3d8303a3d3288b09f5814e9f7dbe8d2039e8c040b5e1d5b21d7ac44e58287e9573e9f0fe9827b5db1bef1e4b169
 EBUILD pyproject2setuppy-10.ebuild 735 BLAKE2B 77a962231e7572f8b6fe9290555fe9c234d5d52b6dfd2188ba73f77a9b9bfe6c6328026b4832b955fdc9cfddfa6101b0876844d46ea714355fb97988bf6825fb SHA512 55d7b8d0c4cf4908a153e0ae342ea9d9476f41f9ffa906d41fedaa5e5a5e6859a796393714cc9b82a8258db1071bd66d38af717e64b496be4706d20af48379ad
+EBUILD pyproject2setuppy-11.ebuild 743 BLAKE2B 86c8377ca897f0fa7f7820273a247aa618341b69ea49aee5dcbb67d6f69a12540021a4612bdd4375cd0b1589d64fee7dab53674b7aa0a8f1671af0297f3ac45a SHA512 514f2f3ff189798551124a4855184fbd0b240888cdc123bb6c254ec7da7214d27b4ef397472b68831bd0b00d270a6f0718fc386cc3f8eecc9a29f2ff56caeb7b
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild
new file mode 100644
index 000000000000..30484dfb0418
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-11.ebuild
@@ -0,0 +1,29 @@
+# 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..9} 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/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index 69f071bc09c2..a242f6c20969 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,7 @@
 AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a623400015b1ebe4cac8b797a50478e75c82ac964cb05ca4c67dfa73332528e4f232f612d2f9a9bf439dbaf63765fb1f6d650bd77 SHA512 34600cdbb1e361288393fecfd8740b147ef16dfcd0719f0eed62a93201eb5fd54b09aebb86201effe6a791a6b5be934ece07a07756284ae0b2bbde4aaee137dd
 DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
+DIST pyqtgraph-0.12.0.tar.gz 893557 BLAKE2B a5fab600adad7b71d63602ed075ecdfba96316ffd1205a11c6551c132055c40f81bbac4a51e9abcfdb877365f1e95d1f05d0fdcc7131cf5f0646f641512e70aa SHA512 a30c7cab0a8a1efff697271fdcc27b1aef55a2766a90562191adc4d6e5ed6fb71da73b4b25ea4e16b7eff33876eb47468c27bc8bcdf1a0abaefa2b6c202c8739
+DIST pyqtgraph-test-data-8.tar.gz 306068 BLAKE2B f3aa418dfaf2e74950fa880da4b6dfb4ef5dbd46346b78065d885c1f9fc06fc3de86756af17e27035d4cd47d98cc7ce58c036b493837b568086a4ebceb230c78 SHA512 07ef414f2b57e00589f8c18459e88ab16001c7cc3766164cdfcd69faa26cbc90ed64611fd0c5e3b401dc6a3f1a6e9e4ce6a7d9fa96ebcc4360e03fa9fbb856d2
 EBUILD pyqtgraph-0.11.0_rc0.ebuild 1075 BLAKE2B 03f8186ab7c17281ce435eab83956fa9704cf98463fbf40c8b4fd7ac12b23d9387446b824a869b53b5dc456de53f5c29aaaabaf9259974dd7bfb04b433ee218f SHA512 a8d81391d3237a5e4cf11693e43ff95fc484508253865e3866e14812dffabd682d72e320f68e36203c7e4c849bc7158a2286d6fe780ef32803503639049afbac
+EBUILD pyqtgraph-0.12.0.ebuild 2359 BLAKE2B a72971bea42435e05b1f2d0f8b2d796799e986673fdc8a0e4f7040984770141484414b0c7876f0f313f7db886dab2b606fc0dabade850cf4aad7bbb0624a56f7 SHA512 d5db8d675c909012745377df381ba513876fcda75fd4d3c3a598f103a3b3903abbdc2015b4191cbc91d2599206680288f9c6df6688fde774c4034a474f629109
 MISC metadata.xml 750 BLAKE2B 2382ebf2081e2cc83e363f6716a5af4932dc7fc67b19c06af77fc9557e6e4052a882c79f734c4e96a3d1d49e1c9c7c10d3d1d1872cd1b54f86e943c0cbcdbb0c SHA512 1debda41c5945a1b1a55bb93a8220b17c2078216415195d75e5052571c340ac0e1a43d63f77c6818e69b57ca8cbd2d9a753a749c36dd6bcf803418c10e225301
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild
new file mode 100644
index 000000000000..1ebdf584d19a
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.12.0.ebuild
@@ -0,0 +1,86 @@
+# 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 multiprocessing virtualx
+
+TEST_DATA_TAG=test-data-8
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
+SRC_URI="
+	https://github.com/pyqtgraph/pyqtgraph/archive/${P}.tar.gz
+	test? (
+		https://github.com/pyqtgraph/test-data/archive/${TEST_DATA_TAG}.tar.gz
+			-> ${PN}-${TEST_DATA_TAG}.tar.gz
+	)"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl svg"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/h5py[${PYTHON_USEDEP}]
+		dev-python/PyQt5[svg,testlib,${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir "${HOME}"/.pyqtgraph || die
+		mv "${WORKDIR}/test-data-${TEST_DATA_TAG}" \
+			"${HOME}"/.pyqtgraph/test-data || die
+		cd "${HOME}"/.pyqtgraph/test-data || die
+		# we need to fake a git repo
+		git config --global user.email "you@example.com"
+		git config --global user.name "Your Name"
+		git init -q || die
+		git commit -q --allow-empty -m "dummy commit" || die
+		git tag "${TEST_DATA_TAG}" || die
+		cd - >/dev/null || die
+	fi
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_test() {
+	local deselect=(
+		# apparently fragile
+		--deselect pyqtgraph/tests/test_reload.py::test_reload
+
+		# pyside2 is normally skipped if not installed but these two
+		# fail if it is installed
+		# TODO: this could be due to USE flags, revisit when pyside2
+		# gains py3.9
+		--deselect
+		'examples/test_examples.py::testExamples[ DateAxisItem_QtDesigner.py - PySide2 ]'
+		--deselect
+		'examples/test_examples.py::testExamples[ designerExample.py - PySide2 ]'
+	)
+
+	distutils_install_for_testing
+	virtx epytest "${deselect[@]}" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	use examples && DOCS+=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 483016f0d93e..d087e4d22015 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,5 +1,5 @@
-DIST pyspelling-2.7.0.tar.gz 149425 BLAKE2B f8e600a41ebd4ec290562307306e7fd5c67d384b9186de037b98d50d58016ded19c426caa892497ca44e309fb3db04292b890612afbe25a34f9f6b06985d3740 SHA512 2fcd225a66cb02fff10d5ca652e523a01bd0488a005dafa32ba1151fba9afe73809781501c957d6df00927baa9fb6779872973b32e2d3fe8a09306fdc4191995
 DIST pyspelling-2.7.1.tar.gz 149449 BLAKE2B a5faefac163850d327d64b75776b5f360ad1e1337cb3784c8d0a167e1240e92a202f4ecbe86d768341a7512b36c83981b5fbf4058a2142a5b627f40c0e60c09f SHA512 be0cc9be343e2d5d2c16b2dc9cb6f83fd5f60eba81c709711fef37b880363db8b76e86ec048b57ab270be59803b101696709bd474d4f0267c99f55c906ec7857
-EBUILD pyspelling-2.7.0.ebuild 1339 BLAKE2B 02605cc438f1292b803cf477d9ece6ee8ac5acf66c3fa51b813f3edae8faf57033e13547a08704a9f8a1ecdffced770d40c180770031c1ed16396357ad2f4e07 SHA512 2bfc52570bac76a50854f4ff3a6aafbc9f82894a16c7a1096d8b3e25d07f6dc33806068f815b2c8d982f62b14a62762b56f781f56625dd4aa84401347b8f9325
+DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
 EBUILD pyspelling-2.7.1.ebuild 1339 BLAKE2B 02000bbde0c75d186febae4b45309228c2c9b6430a19db3b0ce7b3d4c613452276ec0b8e2c64bd2f037e2bb1ed450c11e8a8d810d066f0a41e32a089fce7f7b0 SHA512 0eecb02ded18f6ec79f96726f17cde843160a467a6ac7f665cd266cb7bc663e0c08888fc90e17fd8f29f541d3cd403f265f81972bffe409f2718bc885474f26d
-MISC metadata.xml 1912 BLAKE2B c5ba9a8dfe7afc00a3c10b7853074677dd21416fb8823abf61ab9322c0645667ccb9c43aad99f30f755772be7c7eee4b3ef191481f266cf3d4d6b5ea1ea108b2 SHA512 9c8f610ab25749b203f61a37cd69277ffc72a44d3750734374c560b6e053e1cf60176e268c6a794036edb13ac6d19a7ddc19a4e3beb620fdb1a4914564f882b3
+EBUILD pyspelling-2.7.2.ebuild 1341 BLAKE2B 7de879854980c9690de5459caf5e620d06fb691a2077d2621a187964f7d8ac2201a0398f64b0da0dff9e575f857c9549b04273990957318b46657a7d634db7b9 SHA512 e8c7626558166281791fa12e17d2642fb3a3a6b154d31f265ec0084a64921595ecec32f2fe6b90713d69491537e37b69607afeb86c16b9c2bfe62ec272ddb525
+MISC metadata.xml 1936 BLAKE2B 58ee1c24137728ca0561add0b8397c766cbecc04fb97c3588f40b44488e6d95da77fb3fbc567dc34e93bb644b437de99199c72dc6ec3d3f2bf016b59629b3284 SHA512 c6932c7797e69865d65c215ac9209b29f9b9583e9646994532e59e0c2471889f637f71779dbf0839ac57d8e39622a15e2879394f1a6cc68e3f38ef6481375307
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
index b29a76e72b38..a28ed69c911f 100644
--- a/dev-python/pyspelling/metadata.xml
+++ b/dev-python/pyspelling/metadata.xml
@@ -13,6 +13,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">facelessuser/pyspelling</remote-id>
 		<remote-id type="pypi">pyspelling</remote-id>
diff --git a/dev-python/pyspelling/pyspelling-2.7.0.ebuild b/dev-python/pyspelling/pyspelling-2.7.2.ebuild
index 8aea32458614..3d26b00785e9 100644
--- a/dev-python/pyspelling/pyspelling-2.7.0.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.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,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -28,8 +28,8 @@ RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
 
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
new file mode 100644
index 000000000000..20a8e06b5665
--- /dev/null
+++ b/dev-python/pytest-subtests/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-subtests-0.4.0.tar.gz 9673 BLAKE2B 780fbbdc6d4ac88c87002ee14323a0dd1036ab3dadc14b79ef11982459c60635add77e97575521ba0bda61317582e090353b427d945eca7198e294eb3d895240 SHA512 00302f47d1699e053314b6b4eee7c84a04fe0f51f287e338374bbd518c7d245d839ea0f1ccf50d4f35c86138cf6ea36da26e67bf41295205fb38323f2ad89f89
+EBUILD pytest-subtests-0.4.0.ebuild 787 BLAKE2B 3158a666a2bbc34ca6863ba509c919c8a90eba111f75fa975b12180a304a249cc276c21bb0be1a3fd85af4cc1e860fd0f19e013bdc5935231fb4322bc23305eb SHA512 005a6cf11275a608df65a97b5df07cbad55c16799769da09ac1f72c069b74aee760ec90ccb06c62663d8fadb7d7ef0b51225e0aa9d55364c18dc36eb6bcc326f
+MISC metadata.xml 362 BLAKE2B ceee0c128aa3a64a2693c2b2a8277a2a5f985f9ccfb00bde0c56a32a3714fa0112c85e46b93d4815b1d53eee63ac5ce01673f7e97d3485cd973f3ab3052daff9 SHA512 2746d62eaca67e02a0c8e1a65892fc7447e9ea6dc1767e544642a6e57d43b6acdc0ccf3a7271f1cfdc5295b26e3518594432e968e219ca2abba03ea4e59cf5b1
diff --git a/dev-python/pytest-subtests/metadata.xml b/dev-python/pytest-subtests/metadata.xml
new file mode 100644
index 000000000000..04c1351756da
--- /dev/null
+++ b/dev-python/pytest-subtests/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pytest-dev/pytest-subtests</remote-id>
+		<remote-id type="pypi">pytest-subtests</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
new file mode 100644
index 000000000000..9df48e8c3010
--- /dev/null
+++ b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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="unittest subTest() support and subtests fixture"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-subtests/
+	https://pypi.org/project/pytest-subtests/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]"
+# pytest-xdist is used to test compatibility
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 2bb72c700972..ed69679ab6ab 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
 DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
-EBUILD python-bugzilla-3.0.2.ebuild 686 BLAKE2B 298cba7eafa53ab7c06c7e9d191d05c0d92c4b3d2ebe96b35bc0999b0e33de958ea713b0eeaec3346baa0fe4fe3faf2dec186303e53b739f869a8fab38ee7064 SHA512 2596da651678816ff13d00462da2989165134c468d88346f7298c1a6d5bad625c7909c29d007fe12598264f23993e7ec5b5a9b43b60dbefc75dce0adba5052b3
+EBUILD python-bugzilla-3.0.2.ebuild 689 BLAKE2B 572969173b57af7def0d67f4fbe00b9eef581eba900bf25ffced77a08b1db10be6ed04a47866e62ce4431617d38897d9863c3639820d27da30a2a10534965d85 SHA512 5f2b54523f1840d0610469508caee1f21e13875e4ae73c3404366f7a54d777c4c3d5d651170b993777da9214d2fea15042edbb15b118cecfd3c8b7092ba5fbf1
 MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
index 2867c382bac6..d321db90307d 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
 HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 4a461c9d6022..a5a09c9cc7ae 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST python-daemon-2.2.4.tar.gz 80775 BLAKE2B 3f260993a2207e6467db03c456d9f8621d1f3252236b6d49432ff14c1039416db901feb5d405620106d02ae2ea186fd0b10183156f31d17f9f4fa62964fbd333 SHA512 9a7a4e23e126f05e4c1c503f15401cddd758c5f9195c370997060ca1bbfe71cc51d82d3ae16bcf0023c28fa50b0b8d6cd406e515b27725ffa9fec10fde3ed64a
 DIST python-daemon-2.3.0.tar.gz 82831 BLAKE2B 6e7fa082a513827283f46044347dfd445633db0d1781a33aa1bc5b14c340da784310ae6bd07d6cf3673cd05cb14a9d090ab51857d26cca52d09bc8c3b195360f SHA512 30bb70821aae720d09032c8c666524fa9a1a486314ffff73eb161231a1f2b954914295b4ad41f9c8529bc045fb6d0f89256bc59f8979a4f8a6698e9bd4d7441a
-EBUILD python-daemon-2.2.4.ebuild 802 BLAKE2B b2778a40b40c5c93727913d949cc31a1d0e66af86a034823b2a92c51936a314ea6da05c3060beb810cd3984305ba7551c9055d59d18ad64e59f75f69e094826d SHA512 4532d4f8e9b20424c82627924310edf806818959365bfa1d27c166879304b0fccc3dccffdd634caaeef1ea979f1b4e28b69f684324f6f015881e2b3be54cea71
-EBUILD python-daemon-2.3.0.ebuild 706 BLAKE2B d2239a9de8344a6fcdabed305605b0d0b35fa556825a6c0b9701489959e7928fe6a61294cf29bb31fcbf1306a92bf4c5bca0966d09ab3a5ee5c1814a01c7dec8 SHA512 63e9d3af69fd4cbbda430aa9a0fbbd9b7fabc06ac351f83cc334e07834a7dffd584f305d2bc0e4e49156ffb82350c123031507046f59cf7e75b719be10abf310
+EBUILD python-daemon-2.3.0.ebuild 703 BLAKE2B ca5c70ad2974d56f8ef25402c10d3f3d3fb466130ddbdc4a58a83e0258e15495ca9f02dba9c30bcbb0d92e1753a6a46474bd54022fc91972bb3ddad9a2a7c5f0 SHA512 6af9e517c85331cb412ad92db6b54716c64db0590584229ec8448cdc5ad8ce5abb869df1abb544aad9f180640504ca4e46b50f5fbff5bb70d898c8de3cee73bb
 MISC metadata.xml 340 BLAKE2B 8b44be0af694459080c54e9611780e3c5b1802a54702f38d52264bd39a896a094340da2b35e5c37a1dcc694f442b398f36290f2d933c1f2b28a4d18ebf5c5f97 SHA512 3733cf321d280bfb265e32b5ed480898a86361b5fd2220a03a1d4ba7e10f5fdc041155444d43b0c67a4e2f51d28652b3d487e3895b7310dc5b4900bcb93411ea
diff --git a/dev-python/python-daemon/python-daemon-2.2.4.ebuild b/dev-python/python-daemon/python-daemon-2.2.4.ebuild
deleted file mode 100644
index 4aa631e40cc4..000000000000
--- a/dev-python/python-daemon/python-daemon-2.2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/lockfile[${PYTHON_USEDEP}]
-"
-
-BDEPEND="${RDEPEND}
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-	test? (
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/python-daemon/python-daemon-2.3.0.ebuild b/dev-python/python-daemon/python-daemon-2.3.0.ebuild
index 89993f129963..dd172f9cc2ec 100644
--- a/dev-python/python-daemon/python-daemon-2.3.0.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/lockfile[${PYTHON_USEDEP}]
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 2174b59d8ee1..2c348016bf01 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,5 +1,3 @@
-DIST python-magic-0.4.20.gh.tar.gz 863539 BLAKE2B 27f345b138068a44670456209b9f87e9715c475787bcfff396c711cb0f768ee83599b9e6ebbc4c0c73c6867c3653518938b51116d28e3d77a758a6d1b860c7b9 SHA512 3927958a6957177d1a6e8bcbbb3723f489018f9037b619bbf7478ab68ba2ddd52d9a0caf18e6a73671e8e5e1cb8a9efb957756ba9547a7dd66ab6ba293f37826
 DIST python-magic-0.4.22.gh.tar.gz 863567 BLAKE2B 6994869e4cc5ba5ff7ae1a6ac6117f5b1553a11079fb5faaa23b48ee241b2615e2514270f66c55b417b4051d6a5aedd7c289f139c23842979e4af0cdb7a34e3a SHA512 7f16c090a713be4ecc25727f0195bddfadfa9f54507899e35f48bd268ea1d78637ca024ecf02e331a8988a931e430f7346bb5f4b46e58ddc1ff03ec678640e6d
-EBUILD python-magic-0.4.20.ebuild 709 BLAKE2B ecc3dde2600cf2dedadc46c3ac0ca26e5408d150be3d8365ac0b561b43247b44b5fe10cf8a511e07fc773d2094a8c9b4bc3231cbec1c988132b9035fa105ee1d SHA512 f8da0055d19ff8f706b3df8301d4109ad0e7bcbcbde2f40b69b840bab972764d78e9fdd827fc0447265a732d703acc5cb48f20c4713890f74d69079c5abe5571
-EBUILD python-magic-0.4.22.ebuild 715 BLAKE2B 6530656d55d45961173dda8965a352b6470164cedfc438f33b6438d525454c9212dd3a783632251e0e6a48a77aa58214fdc596a529f60aae2dc0d7eb0b0b1b7e SHA512 a930230722089a77f4423c64c0a541c9434c78471d57c7f7962c84f2808c10925ba9c0990ea7b036bb4f6ebd0eaac38e167a680c653108cdc13e597a2e749c3e
+EBUILD python-magic-0.4.22.ebuild 709 BLAKE2B ecc3dde2600cf2dedadc46c3ac0ca26e5408d150be3d8365ac0b561b43247b44b5fe10cf8a511e07fc773d2094a8c9b4bc3231cbec1c988132b9035fa105ee1d SHA512 f8da0055d19ff8f706b3df8301d4109ad0e7bcbcbde2f40b69b840bab972764d78e9fdd827fc0447265a732d703acc5cb48f20c4713890f74d69079c5abe5571
 MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/python-magic-0.4.20.ebuild b/dev-python/python-magic/python-magic-0.4.20.ebuild
deleted file mode 100644
index e16d4c872717..000000000000
--- a/dev-python/python-magic/python-magic-0.4.20.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=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="
-	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/file[-python]"
-BDEPEND="
-	test? ( sys-apps/file )
-"
-
-python_test() {
-	local -x LC_ALL=en_US.UTF-8
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.22.ebuild b/dev-python/python-magic/python-magic-0.4.22.ebuild
index a4807619f588..e16d4c872717 100644
--- a/dev-python/python-magic/python-magic-0.4.22.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 6833a97d65b2..887bb075e46a 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,7 +1,7 @@
-DIST python-socks-1.2.0.gh.tar.gz 31969 BLAKE2B f967d8100513455533132e7bb276a8f15a8486656c04493cb803640951d2cedaa0b9229386322846ff8992cfd13cf04470b017a615f33392880a4285c9ecd041 SHA512 c5db92b22ef1edef3a22b7ce79975e66f379da2bd8e9a629a15dc2995dfaef3d99d93eaf768ef593b6a7571ad580397290274e319707f36a883a9bcad20434b1
 DIST python-socks-1.2.1.gh.tar.gz 32038 BLAKE2B 56f3c885095090f4b3441294977b4af142ace8d2814f5f9b965a68e129baf90a6385dbc7e78463aac2249f97c6d60f03c9ae8b1159e30fcdaaeba00c19831e7b SHA512 8ecc35c51096b1c0312895dcc1169b7f475709f5bdd81572257257cb6bdca00ebcbe9e6b211c66b26ec2dec4dd86051077b7b30279174585428dca0fa7098403
 DIST python-socks-1.2.2.gh.tar.gz 32141 BLAKE2B 51e7c4a2319c4b9680f4568c2dba7f9b64bfb3ec8404dfbb6b30531b9ebeef5cefc95997df7663209909f38583040f3e58c7a9472a75276decef605f5af7c4ba SHA512 27af2da348396e0bd5f6120de7bbb9b89533d3481bb1cbb72668aa28afaa84026fefbd4601b8fd0129d8f5add95b8e00d840d1298eb96b151091f2f64d92dd2f
-EBUILD python-socks-1.2.0.ebuild 839 BLAKE2B 19b849cb60492be44f34c4129cf3b04c290ef8d953985de1c37a19d482b57f4576631877498bc498487be7b825ad4708ff960823094b26a950e774e1d8ace9ce SHA512 17ddef9d8a9ee4b989aa6b891edf4ff2049141577fe1b91fd67eac7091db7c53f6ce00108731c625b36b958c4f68f1e982b8928c06c524b007130ca5e89d33d7
-EBUILD python-socks-1.2.1.ebuild 841 BLAKE2B 89dac8cacdd10aac51f4f1ab086f6f27e5fc3ef2dff96088b5e524eb29bb382689054c76351dcc976ee5440715460ea12af857a3fc21d2abe5b63acc6827d438 SHA512 e23e457a7e29001779a33a2953e2f7f4f9ca9bd172de5a0f307ec0074a7e19f4e260cc0624b3829f2aca19934215c7db1b24953ee79cc569f8029d457801ab40
+DIST python-socks-1.2.3.gh.tar.gz 32180 BLAKE2B 340c0a0ff8bfb113e26bb0eaec61f9d57d3e01b5ea045b22ad8dcb48689213ceaf6fafa5901792a1f7333ee1c729c5c44db30d50fbec98bd8f9716eb4e3b6f2b SHA512 1878d7f835a6c97b2577d226363a1f82c8ee4f0fe12931987f7712be98f985e67dce6eee2af8e901756e9bbdd8c667032d7ca37bfa57123c542f8252612dd605
+EBUILD python-socks-1.2.1.ebuild 839 BLAKE2B 19b849cb60492be44f34c4129cf3b04c290ef8d953985de1c37a19d482b57f4576631877498bc498487be7b825ad4708ff960823094b26a950e774e1d8ace9ce SHA512 17ddef9d8a9ee4b989aa6b891edf4ff2049141577fe1b91fd67eac7091db7c53f6ce00108731c625b36b958c4f68f1e982b8928c06c524b007130ca5e89d33d7
 EBUILD python-socks-1.2.2.ebuild 862 BLAKE2B 65ecbcf01da37563cfef0812693080a42f3d80cdcdc8cfea6b157707dd82dd19fcbabe95198604dbd5ba1a82065fd71bd2bda0c1b3675de7d8eb1170643c809d SHA512 8f42b37497ecd1ab8fbe8a800d5df7a19e63853e411ae357d1470f64463b4be70aed9469413d2032f5ea3c533d51e9529744c54bfc739abe222bd62ad113128d
+EBUILD python-socks-1.2.3.ebuild 862 BLAKE2B 65ecbcf01da37563cfef0812693080a42f3d80cdcdc8cfea6b157707dd82dd19fcbabe95198604dbd5ba1a82065fd71bd2bda0c1b3675de7d8eb1170643c809d SHA512 8f42b37497ecd1ab8fbe8a800d5df7a19e63853e411ae357d1470f64463b4be70aed9469413d2032f5ea3c533d51e9529744c54bfc739abe222bd62ad113128d
 MISC metadata.xml 379 BLAKE2B 837cc3435249b88e94e6b35aeb9ff95ca1e88160f4f2352acfc353fdb0891e361d376f3278207e9bea3eca1742f634ae3dd165d9c48c3ba4a4c60df7137172a4 SHA512 9d81d94484e23f22cbeff22a0d8f19052b01c60713295d9d3aa40ecb250255dda4096588201fd0f30b2954ce81569e66de1ed0f88e6ea9545c0210259fefe3a0
diff --git a/dev-python/python-socks/python-socks-1.2.1.ebuild b/dev-python/python-socks/python-socks-1.2.1.ebuild
index e4a5b571d8c0..a3b6e13f50c0 100644
--- a/dev-python/python-socks/python-socks-1.2.1.ebuild
+++ b/dev-python/python-socks/python-socks-1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # tests rely on connecting to Internet
 RESTRICT="test"
 
diff --git a/dev-python/python-socks/python-socks-1.2.0.ebuild b/dev-python/python-socks/python-socks-1.2.3.ebuild
index a3b6e13f50c0..29375e51cbff 100644
--- a/dev-python/python-socks/python-socks-1.2.0.ebuild
+++ b/dev-python/python-socks/python-socks-1.2.3.ebuild
@@ -16,17 +16,17 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
-# tests rely on connecting to Internet
-RESTRICT="test"
+KEYWORDS="~amd64 ~x86"
 
 # trio, curio are not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
 RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
-#BDEPEND="
-#	test? (
-#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-#		dev-python/yarl[${PYTHON_USEDEP}]
-#	)"
+BDEPEND="
+	test? (
+		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)"
 
-#distutils_enable_tests pytest
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index de56b6b8f490..166547252eeb 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,8 +1,10 @@
 DIST pytools-2021.1.2.tar.gz 62893 BLAKE2B 9aa637f2cfeef93a8353f6df700d8566918aa75560f5b732cae96c2a1e1e327c53f303ddb107dab3f1056264dcd1aa2f75389a2bc3f433f7e44f7595e22df251 SHA512 c976f8dd87ee6fb870020ca14b4ac615e657a4be1ab4c737b4c572a8dc00b3f0c45c335ea0188bbad7b6769ce4123a33922e070e0dfe2bea63506d784c464a2c
 DIST pytools-2021.1.tar.gz 62003 BLAKE2B 2938359365082d9475cfb51586c78d3dce264cf0e8b1cf3fea0c7c688570c6e25c9a558b78977c35331ee89afd23ab7eb44a8702b3908eea160b07747646cc53 SHA512 c365cbb65b756869407f7f053112cb9732aeb138493172f2b90563a4f45e6d993557e54de2165a463931b8e2bd29c3ccd32c059702f21fb59e3dee74c19efd8f
+DIST pytools-2021.2.1.tar.gz 65336 BLAKE2B 2b44d738b84efb2d301f2cd1e346dd4ddde003f78e276025dd225814984565ad7e76682d4fdbc578da86e215296e1fbf354fe9afc75f4f4a59e474de09f440c3 SHA512 3ba0540cb8fc153b915183e424abac32d181173488d0f29b612cbad5d51bdbddc9e19c54432937abb6556c4bb6db09fee46e6a4172a62edb4c9f89dfcf00f8c5
 DIST pytools-2021.2.tar.gz 65140 BLAKE2B 8f419b5776c99b3179b2f4d44a2461ee5e3b55d663e8982f1e34f9fab3cb397ee5a0ee13a2eaf9de1f3330c951b6972cac6d9d0c3994f461ffeca8abf110f11d SHA512 3a91be32c5e1c70a3f2d8accb29888cd7f4b9e304fc68a3d2ca2d9ff674a885836236f6dbf11711555444a8eee63cbe86d85834fc73676420b331f94915a1018
 EBUILD pytools-2021.1.2.ebuild 632 BLAKE2B 435feb6c54a3ec7c848185818fd354e0bcc5338e8aa3671c369baefcacbfc011eb82b3eb9030eb1752e12f1d0fb45f7dc1312021570079644bfa7af2b4034742 SHA512 5829639f5b19f01739dc1b9de25787905237a771ce051c4c98b3a303fc6959354e1b05b06d04739e285dbc7fea3d7b60fd25e8c353e3d37995bf2091190aea2c
 EBUILD pytools-2021.1.ebuild 631 BLAKE2B c6331d7fc2c4ea29ecda248e305e01624dc8dbcba35546ac1a255ccfbf47b395a043aac44a3b7ff8a8e1f26fd0d31d881c2ea54325b82fbaabed36d3b785140d SHA512 1a2b7167f3f9d1959d77d21df99ffcbb22a8f0a0287512fac9b60ef14f264579230a971af8656e3135419694cf61a1f99eb226be0fbef05e25e11c9c6ac1babd
+EBUILD pytools-2021.2.1.ebuild 599 BLAKE2B b5548a84ac73adca30124537d35167f9aeffcca694a81f688ce733ee0c48ce8f148d75cda4c7e00fe6da3e69d77e81c0543fb13554008b5674c4cd92ce29e064 SHA512 e9f2ae3287f2872582dbfdf2ee909293b3bfb5d9ff173d9eac43ba50c14e5cbe9e5ce49094412de386221bbc2c0fd497538f3195652e84489742c70fe0affce7
 EBUILD pytools-2021.2.ebuild 599 BLAKE2B b5548a84ac73adca30124537d35167f9aeffcca694a81f688ce733ee0c48ce8f148d75cda4c7e00fe6da3e69d77e81c0543fb13554008b5674c4cd92ce29e064 SHA512 e9f2ae3287f2872582dbfdf2ee909293b3bfb5d9ff173d9eac43ba50c14e5cbe9e5ce49094412de386221bbc2c0fd497538f3195652e84489742c70fe0affce7
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
 MISC metadata.xml 394 BLAKE2B c92c0da3fd787c1b70b8b6518448050c13a1b68b27a813506d513f54db1b47853d4d2c633b70f5bb1e604935dbdf8e1f4fc3394cadb29ba30ead7a2b718c03f5 SHA512 70139b5703a5bda95cf48fa30cc97702a149a3555da20a2e8143fad5d9174557b3508a251526af797a93811aa3964ed5b0f8e89fc2a6b3da965a72062649ec37
diff --git a/dev-python/pytools/pytools-2021.2.1.ebuild b/dev-python/pytools/pytools-2021.2.1.ebuild
new file mode 100644
index 000000000000..c055f9dd4ed4
--- /dev/null
+++ b/dev-python/pytools/pytools-2021.2.1.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..9} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="https://mathema.tician.de/software/pytools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index bfe7f806cf34..0e168d13ce6b 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,3 @@
-DIST readme_renderer-28.0.tar.gz 27370 BLAKE2B 380e10941fbfdc17193a558b0a90b919b841153aa1ef4f26634202c5d500b57755858354374f785f0dedc5b119365281e50897bc9ec95943c8b08d69976e692d SHA512 2a5a00e404d2cc156e01433232fade64e13d2f95177b72c1d3903554144746317efc637c17c6333c501cd426f77628bf45300e9b219e30e26fa3963da690e06a
 DIST readme_renderer-29.0.tar.gz 27169 BLAKE2B e500e2a426045104a6cb5bf0eb13036811d569223dbe96d5d37298c1f344dfeb8d1c3d5af55feb822ba7616ae072ad913c0f7c69bd6a9767a5a2d1db2eb61a5c SHA512 b5f462c3ee077f5711c18a4c0243b084730a705bf5476355265d18ce4bfd696edd30a28aaa8f3aaf96b531a2cbf32bd9ed143431bfbbf08cd7ac7234a2d57a7c
-EBUILD readme_renderer-28.0.ebuild 832 BLAKE2B d46435d8bd549cf919ad09e16d0822f35ee1d27f5a111fdb341228a170f572fd951a8a5220679eb7567bb738031e5a43e6e7a470cad7ef77bde891b1ad2c664e SHA512 732b850104c678f28358e0b11b6eef47bd88501fe6b7dd39dea34269427dc3f58340ccd57b38250c03173a3d56eaa4e54a33b71c5b578fbcac6c05974f88cc3b
-EBUILD readme_renderer-29.0.ebuild 840 BLAKE2B 4585fc10072a2358153849383a142efe98194c0af501ae02fc4cf93f33da0251c919501039d296494bd7a6379bf7ff1dda8aa477a86ab75296b1285a5eb5a901 SHA512 44bc060592b8747a6211e0f55145c128d2e2f7959cb96bae9630d694dc8ef5894c2987bd3632de3563831f3502eed9af504602f22f3e5c12d0705994fd8fa332
+EBUILD readme_renderer-29.0.ebuild 832 BLAKE2B 1f4e300ff74d0f1c8cd6f5467abfe54de9b1b204d490590c728fd5ee0900e11a05a651c1e995e5eb26421d0a625452a8e0e3a8ddd6e381d4994c3ffbbfae478f SHA512 1ed19da7b5120107926e6615f66f215775df108247853d5375a231eb9678ee46e2e9447b897e71533e988e6b26abbf5d07a589de58eb6173c33669e777f0dace
 MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/readme_renderer-28.0.ebuild b/dev-python/readme_renderer/readme_renderer-28.0.ebuild
deleted file mode 100644
index b6a3422be725..000000000000
--- a/dev-python/readme_renderer/readme_renderer-28.0.ebuild
+++ /dev/null
@@ -1,31 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-29.0.ebuild b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
index a6b665b4994f..8ae71ac9ac6e 100644
--- a/dev-python/readme_renderer/readme_renderer-29.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index ba2bbcfd0714..aa3ea6daa8f7 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,3 +1,3 @@
 DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
-EBUILD redis-py-3.5.3.ebuild 1728 BLAKE2B f2cd854951bb6ec9761084e1ba210992d9680ec98c6b37be911575398463b7a83240e6b93f5506ffc2406395d646522864e29e72cce750ac066f5ad9cb280212 SHA512 2081d57f5b8b13a8c92ffdf16a708f9b2a8e75190ce3ec14009530c2d33af39e413237a897c855ced91cb48d7e3e8e03db58de26c92fe3c64a24fdc5babfc54b
+EBUILD redis-py-3.5.3.ebuild 1735 BLAKE2B 58e800f6a2decfd1632ea33c1b1e393b931825545b735fdf2e739dd20ae3341bc8df49c8ec86292a1caad29d4ae84d7b3f36c54dbd2b4a9dd4a214e0a6841af9 SHA512 4f89f52583d8dac602a2e6acb64e36479e3acb47885298f05d24904304e301c0950637ce2945599b07f173396997567262160b6a7c87f71d2a947d7281bf7bd0
 MISC metadata.xml 536 BLAKE2B e146a8713662d8d635cf9e0927223bb427cbb4f684d7b484d3c005e84a7b961f587b7e31123d27ea8be7ac7ce83890c54a670b6d1062f221bacc496229f798ab SHA512 c651a0f6dfab0e857e04ba15924937a42d74c913cc82a1d8f46a0641f6e4fe85315da1a76cb1bf3a8ba3d4a3ee6649872af221b7c1196100cde107d9454c5dd0
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild
index b23499651afc..6954d82304d8 100644
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ b/dev-python/redis-py/redis-py-3.5.3.ebuild
@@ -13,10 +13,11 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Python client for Redis key-value store"
 HOMEPAGE="https://github.com/andymccurdy/redis-py"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,8 +28,6 @@ DEPEND="
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
-
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
@@ -54,10 +53,11 @@ python_compile() {
 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
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
 	"
 
 	# Spawn Redis itself for testing purposes
@@ -65,7 +65,7 @@ src_test() {
 	# 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
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
 
 	# Run the tests
 	distutils-r1_src_test
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 2f8e215c6569..e6145c578011 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,7 +1,3 @@
-DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
-DIST requests-2.25.0.tar.gz 101897 BLAKE2B 5de8f4f5059915f929ebb71d8209bfefbe95bb381544ed0b6875cc01cb958e6fe8861cd8321143463da5dd872ad4ff8c828008bcd6409b41857c4d2037db3f67 SHA512 dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
-EBUILD requests-2.24.0-r1.ebuild 1498 BLAKE2B 57429043d011ebd58fcb5c620c912a3008197a17da7e9830bb9c3bd7580a5e3f142b459e1cd8d1d46fbceacbe5b622cb710144c772478b82e3f6fa78ffd30b74 SHA512 ab886b292ae1c609f63b39b6b37314732b3abfbde2bedc1a57a12306736f4478d4ee8d200db03d530c22cdb2f99216d2b9558cd3bc2f58e5fabfacc1204cc9d8
-EBUILD requests-2.25.0.ebuild 1518 BLAKE2B c5f94f8071989523cc2657e5191f5090d1ffd97ee957b3ca3ee79b8b6800229a45b3de0961f8799d53aa97f4ea068481e924316376d86d6b33648530c595db66 SHA512 f8a54e0dd84a21ae3ed5d876b24a3f7ad0af95e29349b3e29f8b939d7bce689285aaed3d32a20813ffb3be356c72bb74a60f444eb0dbd30a87806a522528dc06
 EBUILD requests-2.25.1-r1.ebuild 1441 BLAKE2B a0c4d31714ccf1021aad11e01606acbda4dcdccd54263b159742f0db2ccad9685973d0ecfaf9b4024198287ad333fa7e8e7126ae2ba591a68b2876ce8de720cf SHA512 d47fe5f225c685e9071b10a46b1880b822523e86b424fff4cf885a6420c68bd76da351f36f980c07e6120228b6b91439e97992dd496b25150f4549eaa644896f
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.24.0-r1.ebuild b/dev-python/requests/requests-2.24.0-r1.ebuild
deleted file mode 100644
index 4396bfd81596..000000000000
--- a/dev-python/requests/requests-2.24.0-r1.ebuild
+++ /dev/null
@@ -1,56 +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,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
-IUSE="socks5 +ssl"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/chardet-4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-3[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# strip tests that require some kind of network
-	sed -e 's:test_connect_timeout:_&:' \
-		-e 's:test_total_timeout_connect:_&:' \
-		-i tests/test_requests.py || die
-	# probably pyopenssl version dependent
-	sed -e 's:test_https_warnings:_&:' \
-		-i tests/test_requests.py || die
-	# doctests rely on networking
-	sed -e 's:--doctest-modules::' \
-		-i pytest.ini || die
-}
diff --git a/dev-python/requests/requests-2.25.0.ebuild b/dev-python/requests/requests-2.25.0.ebuild
deleted file mode 100644
index 32f9631e5fb7..000000000000
--- a/dev-python/requests/requests-2.25.0.ebuild
+++ /dev/null
@@ -1,56 +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,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="socks5 +ssl"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/chardet-4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-3[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-	ssl? (
-		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# strip tests that require some kind of network
-	sed -e 's:test_connect_timeout:_&:' \
-		-e 's:test_total_timeout_connect:_&:' \
-		-i tests/test_requests.py || die
-	# probably pyopenssl version dependent
-	sed -e 's:test_https_warnings:_&:' \
-		-i tests/test_requests.py || die
-	# doctests rely on networking
-	sed -e 's:--doctest-modules::' \
-		-i pytest.ini || die
-}
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index 576787e1f3fe..de18cfbc5bc1 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,6 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
+DIST rfc3339-validator-0.1.3.tar.gz 7439 BLAKE2B 8991906720f3c7fe08edbc2994693b354338e70bb361e2ceebe168e8f8195a061c2cd716e365a7713c1a21658517e4f2028f9b619513408252a46ef589868c02 SHA512 d89679fb9fabcfa75cf3955744facb235201c0c3ccc4bcfd53b553c5403967226282b68e628d0dd74bb4abe553da6c3734912c63f3a5e16875e57a872c78231d
 EBUILD rfc3339-validator-0.1.2.ebuild 738 BLAKE2B c37e8630e894ff3e3ac1b113ee2ca2830b9cfd8557368bbf517a3324d2860cf63b8b021b268627e0a325b216cb869698a7387a37990f676bb1f9f37769ed5775 SHA512 6c32c7efa29e8f395e6fedba67553910f669c8cbf32482cb461e08fcf9469f0504e7ee039b35218941c6dd781245b5758ac44349620673435a34254e444f56bf
+EBUILD rfc3339-validator-0.1.3.ebuild 660 BLAKE2B be1cd8f389c1e3697846fb8d64d6eaa7be3fa0d0df5312de564f4ef7ee8ef94c83f04e4e022831db5da83df0d88dd2bf74d728726171427cd9f0074efca46f91 SHA512 3c32f37e44aaf6235dc342b01fdfa7396a2b672d712670b572db74f6c56a088eda864bd9a75315487b5c8411361072cbd311d49dff3f7d25f29206275268fc62
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
new file mode 100644
index 000000000000..1b50d3cc8562
--- /dev/null
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.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..9} 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/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index f1e3c619e492..c02330612657 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,6 +1,8 @@
 AUX ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch 647 BLAKE2B af2f03b775539038b557879a7d01d42ca050ad2abcdfd60db07fa48129fdc90219577fe9f0ba1a51b897057ee36e6abe5fabd61b343956bf6edb3584144d6912 SHA512 55ae9245470076938d1bd5322b3dc6042267914eef30b3a64a278f5bd06c0fd60500463c6c0a33f80d09e326f0dc0f87986a56f1d05e2e7b6fd9c20e83949a9d
 DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
+DIST ruamel-yaml-0.17.0.tar.xz 177532 BLAKE2B 8935acef9210f61283a659ffeb1137524b374b26b49e48677a49233f30e4abdd709357dcfe6f0e998405fed9143e0848825418e4af60f3d37f10f957d15f8555 SHA512 a6532c6f02f03211f6afe25c051c192c8b791e71cc32a9f6acaf830f7ed0e80531326ba436902870500bea5509cb36bd89f1b4a9a7c919b8069d6bc0eed2c2b8
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
 EBUILD ruamel-yaml-0.16.12-r1.ebuild 738 BLAKE2B 34ad19df9b4725013b1d300374123a7cef0bffa383f544b80be2afe4c38f53855c8aba777c4addfca0835b7de4ebb303a7ac3b54649c04e58bc3b8db3f682acb SHA512 65535c7f50602cc4d32ac24dee681020782468f29a3882c2312f639d39c740c887fa2075c448e1bcaab1d87c57e3d08926a1e7e09fbd09a4da0163283f866411
 EBUILD ruamel-yaml-0.16.13-r1.ebuild 1239 BLAKE2B cb5c19702d96a6d952ef9a53debb09730a3fa865e0acdfa4b09404661694f6b4bef95d42a92a42cfd17ffd7eb5a33b88520a7dc1246029fc49708720de3c2f22 SHA512 62414542ba33ebcd37d3439e53862df7752feed6bc552c1bdcd169ed34163abe6957a803d2aaaf94b46fc6455e89b42e1cc6e0eac6e2c6b13f01047e4b933f1b
-MISC metadata.xml 769 BLAKE2B 911a62c04917e49aecfdcccb14ff6ba636e6911bc82db8575e5b494d415a2780763d8022e672c0ef65154e90d57deb2ca10cc90d9448bc0fab2014fadf37195d SHA512 c005c5349d9bffd0ff7c4504ef7cc614c57e61a1cab2ba24be816db1fba00e9a305d1beea4303562746b2c02b4a7816a087aacf596b78325f71cb51a53779e15
+EBUILD ruamel-yaml-0.17.0.ebuild 1312 BLAKE2B 994bae83c172932ed7245d2dd25cd9799e24f7caff87df92eed981b2eb50d1f71334005097a9754667825f8f18f7d3ba7750c6f95217bb92c7dbee1e201e903a SHA512 0bab55a3d56193c239d6ac09849d40ddfe21593ec0512c56bfbf9916fc5913dcec33ee32f4e40e31af5e276941315b7e9791deaffe4c2fd2b9c537ab2c579a2a
+MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/metadata.xml b/dev-python/ruamel-yaml/metadata.xml
index 81ff79eb96d2..c258641b22dd 100644
--- a/dev-python/ruamel-yaml/metadata.xml
+++ b/dev-python/ruamel-yaml/metadata.xml
@@ -17,6 +17,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="pypi">ruamel.yaml</remote-id>
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.0.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.0.ebuild
new file mode 100644
index 000000000000..ca4e1f987740
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml/
+	https://sourceforge.net/p/ruamel-yaml/"
+# PyPI tarballs do not include tests
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
+# via test_z_olddata, tell pytest itself to leave the subdir alone.
+python_test() {
+	local deselect=()
+
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		_test/test_deprecation.py::test_collections_deprecation
+	)
+
+	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index d6db9343fdcb..c582e356cb83 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -25,5 +25,5 @@ EBUILD scipy-1.5.2.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d
 EBUILD scipy-1.5.3.ebuild 4382 BLAKE2B 7a33344b2c611098a2f13c970ef554643dcf19707754b20be2473b8dbfe8421e0675e891eb004cf0b34161b8e2220bf051972bd864c7cc2147e12756fd908a0f SHA512 2ca33651401e2d039bc8372d1a83198013e4cc673762d98b852033eb3ff0d077eceae8bbc87e35df0a5f34df3f6dd8e7ea6b535d3c87cb7a01787e89da858ee8
 EBUILD scipy-1.5.4.ebuild 4381 BLAKE2B 8f625610784e22218a3156433bdb41d7ae70d872d7c3675632a5542f4cce0528e941bb9cd94264ddefeafd6eea315cfa1ea86d4675328b78c09f163129cc5927 SHA512 e7611bdd1f91af2d2adf7f55db99550368ac0ddab1aac83a018dd0e38eb257c07af5908c96dbafd82376a36a0eaeaff8448bf94f185fb14a1eaa31ba612feb30
 EBUILD scipy-1.6.0.ebuild 4209 BLAKE2B 1766143fc9b26994c4f2d33f354ef333a4fa6a1906fe4d1511fcadfcb50f34a5a61fb0da72c133c1d62b7d8cc6bfdcdc3d25950febdb2085f3302e5665eeea35 SHA512 489ef19e1eab7d76f22d494d79fcd9103b49d9b8287837f9c823cd4e4760301bfd0cdaf00ce578cd8e61cfb06b96e4746a0b95658cd03d8767d52205fae3140d
-EBUILD scipy-1.6.1.ebuild 4211 BLAKE2B ee63ef5ce1f5bb23dc5b10e6e1a388ee1f5f987807d86732cc3d35ef17dffaedd9950d2b1ddc6dd103efced4fef06c51a2d19e0f458067fbf38a6921173c8727 SHA512 a5541ad450a04be984abf628ae90ea4cc1b6f7383c19aa35e0eb56b3e6423acaf5ea9983ee27877614e1b9296ba5db9a10d54f9b1d91f25fb222db045f7e4d2f
+EBUILD scipy-1.6.1.ebuild 4209 BLAKE2B 1766143fc9b26994c4f2d33f354ef333a4fa6a1906fe4d1511fcadfcb50f34a5a61fb0da72c133c1d62b7d8cc6bfdcdc3d25950febdb2085f3302e5665eeea35 SHA512 489ef19e1eab7d76f22d494d79fcd9103b49d9b8287837f9c823cd4e4760301bfd0cdaf00ce578cd8e61cfb06b96e4746a0b95658cd03d8767d52205fae3140d
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.1.ebuild b/dev-python/scipy/scipy-1.6.1.ebuild
index 65a1f0129c60..a1948aba7496 100644
--- a/dev-python/scipy/scipy-1.6.1.ebuild
+++ b/dev-python/scipy/scipy-1.6.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc sparse test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index aeb0331c6f2b..faa687b26cf2 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,5 @@
-DIST sentry-sdk-0.20.1.tar.gz 210762 BLAKE2B 64ff322667374c914aa00a80ffa5eca2d92ec0965bc6bf7bdc65cf89e75a3cd5f5db32cd7e442caae515348b1f7948209e9810729f4fbc913730337f06444b73 SHA512 cd7871bd3da31340752477058fcf788401910a4e0b4ac38d53beafbedcdfe62b3216d6d2bcf2d1998e8c3e02886da76f6a8aa2809ba1e473421f96257890e75c
 DIST sentry-sdk-0.20.3.tar.gz 212130 BLAKE2B 48084039c493ca2903f56426913ea8f8f0480b759157270fe6ea4dfae72f9478d8566f8a86f6f863c06adb01379e980d5f873372f401a8d3f255f62f8a149b45 SHA512 0392fcf0e718f7d06200fa44fedf1aac46a2f61d11a8252ca339652d5385a377545128c1c4b9e31e1e1a8c8c9a8c57ded569b829312a748d84ad98696a897944
 DIST sentry-sdk-1.0.0.tar.gz 213707 BLAKE2B 9fa3dfac7d82c9e2c81be6f4edafbc27ab19a2a96876885dabe72d2dbd6cf392b80e453c640affb94d84f35b227b12d56927bec88e01a0ebfdcf8a466470a909 SHA512 e91ede3e5e31c2acba7094bd5c6a95280aa8367b1fcd524fc9b100d2a3a253efec1ed3d9c72465f5b2ef5276c834906d622b84e1650b65d2032f4acaf2fd1ab8
-EBUILD sentry-sdk-0.20.1.ebuild 2129 BLAKE2B de023c5d35c37959a0ab94b11f0d5f4b1d45dc362098fa894c20dccb4fb96603ef11b9224778bb557c82a4ac50735f64f8239999c019c730a2c73997c9678cb8 SHA512 9771cc9b03b1b64bc558498382e3565d5144e9de3db487435adcf08d0c940c252307507f91462837d01df5309bfa3e0b85ab2097bb6214f59efb603e10f52f5a
-EBUILD sentry-sdk-0.20.3.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
+EBUILD sentry-sdk-0.20.3.ebuild 2129 BLAKE2B de023c5d35c37959a0ab94b11f0d5f4b1d45dc362098fa894c20dccb4fb96603ef11b9224778bb557c82a4ac50735f64f8239999c019c730a2c73997c9678cb8 SHA512 9771cc9b03b1b64bc558498382e3565d5144e9de3db487435adcf08d0c940c252307507f91462837d01df5309bfa3e0b85ab2097bb6214f59efb603e10f52f5a
 EBUILD sentry-sdk-1.0.0.ebuild 2280 BLAKE2B 1eded6b4d30c3973cbc3c9f1e5811803b5a4a2376f3886ae8bf3331dd8fff3c847bccc787fce03258e1f3200812880d12abb03e3fe1fc6a07ca6654935d35960 SHA512 4fb27231fde3b323312072e2eb6d1ca97165d7b27515f7a349e1b54a4ae92d490fd0971cad2229162f32acf7693c8ac0c62d60c470fe7ee3d3bda2006054af4d
 MISC metadata.xml 509 BLAKE2B 5b68b368764625061ea2eadc0161570e46760904015f6e1e3e97a7a4dacd3604a18b2cbfb665e816981a40f95ec9c4f0c4a0447ecc968cbdf1fd21dcd4149193 SHA512 c42a1f7972313d3369ba392347b0efa700ee9c9b01d3275b3973b8137cf00fca693288a1af57c355b2d87525d9fcb7a320ad571fe8be5531472a8710f9b287d1
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild
deleted file mode 100644
index d3a5fb8d4d3f..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.20.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# tests require Internet access
-		tests/integrations/stdlib/test_httplib.py
-		tests/integrations/requests/test_requests.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# hangs
-		'tests/test_transport.py::test_transport_works[eventlet'
-		# TODO
-		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_client.py::test_databag_breadth_stripping
-		# test_circular_references: apparently fragile
-		'tests/integrations/threading/test_threading.py::test_circular_references'
-	)
-
-	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
-	# Needs to detect sentry-sdk in the installed modules
-	distutils_install_for_testing
-
-	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild
index 7b31e702fe53..d3a5fb8d4d3f 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.20.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 50a0eb6f4a42..027aa1f4f280 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,8 +2,10 @@ DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
 DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
 DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642
+DIST setuptools-54.2.0.tar.gz 2054279 BLAKE2B 2a52e76808fb2bc6df4c59ac7476a9386401180ff6c0d52a5f3d87aedf976a3057cfa0a7ddf2a4497c4c1552d5ebe4810c4bbfa127e1293f950054bddbf7d835 SHA512 b18cd075cf59b8648611eef1874de41199ede6ffe6d7f5047586c6ac8783fe18b9a4f537783e590e7aec127033f612b93925e92f039bd6416a609fcfb262e354
 EBUILD setuptools-53.0.0.ebuild 2125 BLAKE2B 36d22c2a80921dc739c60798293b0c6475f45832ccba934901e1f525109737966dd8e8cec259e123d2168dce2dfaf7acd6e8021ca43762752ab8f3f56911dfbd SHA512 71aee4df07af820f2051bf98ddb7465605b17574b0855a5f56c358048256b8d3b05e886ad163273fe6ec5aee121f7e334af2ed24501667a7f67dc780523e4748
 EBUILD setuptools-53.1.0.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
 EBUILD setuptools-54.1.1.ebuild 2198 BLAKE2B 9398a7ed3e4503cddda05dc4a07c875899fd0343943cf681dc1b374dc31a552aff18bd481de62f3f9b6ef22a629c867c66189ba1757771c071ad2cb755e661c7 SHA512 0dcd13c80cb304998dd9d7ef8d0ce73bc346ed550b4c1606d27b8d93a559c4bec7758dccdc2e54ee5107e61b11dffe875b5d847077c139ecbbc8095bd8c481d7
 EBUILD setuptools-54.1.2.ebuild 2204 BLAKE2B 2bc528a9b34c3ba3138183c7102a959e067360d804749640c6cf26a4cb26c139dbdef5ad3273046098153edc65ef118540e8fd1cd15b1886c81befb4d60a41cf SHA512 1cac63fca82cd8ac8bb3c0f0fa901b709f0a792a00232a9db47e75fe34f47edbc545d80b8f24071b326d23ad535c23cc4a77fb1bf2513bac5b2c668a15b00a54
+EBUILD setuptools-54.2.0.ebuild 2204 BLAKE2B 2bc528a9b34c3ba3138183c7102a959e067360d804749640c6cf26a4cb26c139dbdef5ad3273046098153edc65ef118540e8fd1cd15b1886c81befb4d60a41cf SHA512 1cac63fca82cd8ac8bb3c0f0fa901b709f0a792a00232a9db47e75fe34f47edbc545d80b8f24071b326d23ad535c23cc4a77fb1bf2513bac5b2c668a15b00a54
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-54.2.0.ebuild b/dev-python/setuptools/setuptools-54.2.0.ebuild
new file mode 100644
index 000000000000..533095efb380
--- /dev/null
+++ b/dev-python/setuptools/setuptools-54.2.0.ebuild
@@ -0,0 +1,68 @@
+# 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="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+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/sip/Manifest b/dev-python/sip/Manifest
index 9ce801795adb..b2df2528dfc0 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,5 +2,5 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 DIST sip-4.19.24.tar.gz 1055461 BLAKE2B 6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575 SHA512 c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 EBUILD sip-4.19.24.ebuild 2282 BLAKE2B d58ef24520a95ccb3a4f2113769a9187f2b1ea7172e6e63ae992565c20a413b7d3a8ad91f00c719a8117ed3ef5d4a23e717f21d026cd1a37fea07b95b222920a SHA512 005130da866237d4b391c2b516c1741e9544503adce8e61bea83a654649e3b1e073682eae29022d5e506476daf51b127fcb95279500306a096bc61cdf6910ce3
-EBUILD sip-4.19.25.ebuild 2288 BLAKE2B 0366fb84cf759be9ad8793649147f1a9443156b30bf2ee26b4a34887128c46b83e04af4a1602f8cac9e052ab810e3642326a8d48933477744f4242cd1892657a SHA512 0475e769a3a3868284bd75c66eaafc8d7f00c76715350cf7c25addbd03d5659f47a91b994410d531e0f8d2eafe9067c84da740a6c5812a39182e6771ba425a43
-MISC metadata.xml 642 BLAKE2B 774d24a62fcf22158044669fd9981456a0b7512cc838cf15425239e9163c946adc5b01169d773167e98e4cc09a3c965b9a87b374048e3533b2140d35202e24ce SHA512 f6f3d30b416dfa71a5f3c245695ce958fc43a701a71f80968f06a0d21ec2c6387dcf505d8b3db1049b74ec8fb560e4a25547dad11365b23d78ed4e6f5769042b
+EBUILD sip-4.19.25.ebuild 2276 BLAKE2B 2bccef09bae58cb39f4fcb41f99d704b631b53403a7744daed309cc0f910f07336b169c457127508d0b73f8f8ce6a11bd4b5f1a15cdd508041c92a2992bddc79 SHA512 a56729ff7ddf6d3afb06d4430aa4e4863fe521b91c8eeee3e62ef884a87ffb8c1030b14deeb4ec64e5b638b9bcfcb12230e3b50abf43689a74b043fb46f41001
+MISC metadata.xml 642 BLAKE2B 496a8870b0d30bc0587fb4729dc592eb335a8f7323106f8559a01980e25bd3efcc23ebdebb4a5ae9b1ac2c1397f41b2e48d21daa16b89265531112e5ebd7822f SHA512 d2e0e0b142a3cdb3f7f279c9c16100ba7a720c1d1348282ac4aeaf9541d6a351495a22eeb2e1f60f1dd3ee7998da2624a09b47abcd57093f0e273d797215f8cc
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index 921d0b0925e6..6368b9eb51f5 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -13,6 +13,6 @@
 		<changelog>https://www.riverbankcomputing.com/hg/sip/raw-file/tip/NEWS</changelog>
 		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<remote-id type="pypi">SIP</remote-id>
+		<remote-id type="pypi">sip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sip/sip-4.19.25.ebuild b/dev-python/sip/sip-4.19.25.ebuild
index c4e7e7947b40..1b8bd36af39c 100644
--- a/dev-python/sip/sip-4.19.25.ebuild
+++ b/dev-python/sip/sip-4.19.25.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit python-r1 toolchain-funcs
 
-DESCRIPTION="Python extension module generator for C and C++ libraries"
+DESCRIPTION="Python bindings generator for C/C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
 MY_PN=sip
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 1ce09d16cce9..80d95cb79cd0 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -12,7 +12,7 @@ EBUILD snakeoil-0.8.9.ebuild 856 BLAKE2B 42754983e2c4c21405112dd562722fe1065ebce
 EBUILD snakeoil-0.9.0.ebuild 720 BLAKE2B 92f9f964592a63930e00ac23a7b5d102776ea63ad2af6ba5e47f5ba1f9fc4e18184056bfedaf60eb8c21569830e5152a0e58b061dcd18ba1d57af1ab2a83592f SHA512 59a367b088eaa2b993468c39c5a03a54cc0cdfea6f651c281750ca207b67905c19475c2066871f475884373b69587ddc8b079a129cfef1705a589374f486fc3c
 EBUILD snakeoil-0.9.1.ebuild 717 BLAKE2B fe7fc18a2b270b859857d1a2127d48e42fd36ea9a39d6bb60879df026e4074f96811acae535727b7e030a8bb811ec7084fff1422758e8594394c1e53f4d16b60 SHA512 38d9fdab976098e044bba394cd4b3df90d5385bb9f6022c44075fd2d303d7ecf8978a70559a77e637bd9bf28cd24877f1cba52d656721b8365bce126abc8df95
 EBUILD snakeoil-0.9.2-r1.ebuild 754 BLAKE2B 6e5e5442cd12e899d3f9db272d8cea23adffa5d4116f09210d33cbfa0556bcf20e986cd20f82c14ed072c50538496f42c9a2391b848a21cb614126f5efb74b18 SHA512 460b437e2f5f4bb240edbf28b4acc4ad872add8b96ff9bcc3b8fe4548ffa751ef0f9c487b003ad2cee97804fa1431b3d5259250863118a3a6647ecee08c9fd73
-EBUILD snakeoil-0.9.3.ebuild 760 BLAKE2B e639d1bb661abc02fa5edf43f5aec19ddf15aaba227d787e030bdcdb2e53f3466fd0827cb03979d08917972eaed8fefbdd367b720149ab846d9e4da870506719 SHA512 f3fe9aa38123c2556f7d74c378f0edecc811e781a026658c97ade4f39fc0878f0dba2d25187d6345bf71b0dac6b6700b5cdbdeb791b0e8c20a05fc71243d0b5c
+EBUILD snakeoil-0.9.3.ebuild 755 BLAKE2B d721e65479ecec1750a47d35e682d68452c0582a746ae0989698c22c2b9608c6197c457a0b68db3f1f7f6cb6820a0b09f6b22f53509be99ae809a526fb5f2bd5 SHA512 f16351b364239138db61dbd850ebf74014b3e63fa8c6d0b9f3b6c121a743fb9b54bf3b909a614255b1d11c1d2f5d1a965f86364547ff11178ec8df35c4c36771
 EBUILD snakeoil-0.9.4.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
 EBUILD snakeoil-0.9.5.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
 EBUILD snakeoil-9999.ebuild 780 BLAKE2B f45e83fc2a91d592ea3a2586a1162345e9d3f4520226ab5ca7cffd372868cea009a6c08844bfd5b417e26a41ebe435d027ca82b3de614b7641a2d330ad66f2b3 SHA512 8c3f35c0136e4866d1443c91d7fa43445f83d2cf86dc4272240322e89778495af1074f61d165b74d301c5a9d5775fe8391cc5e9aeda3e9781465425d3dc30261
diff --git a/dev-python/snakeoil/snakeoil-0.9.3.ebuild b/dev-python/snakeoil/snakeoil-0.9.3.ebuild
index 332550f5be15..221b582e9b7d 100644
--- a/dev-python/snakeoil/snakeoil-0.9.3.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.3.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 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 07e1a1c790ac..a50d596bb87a 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
+DIST sphinx-prompt-1.4.0.tar.gz 9072 BLAKE2B c3ee936bb05eb39fcabd85260ef65b66c9a3fbf64d1b1e188ba889a3777d32fd90c6857d88191f5d9521b25ae46bc6ffc1777c18ace7e0aa0d96f266548ae7be SHA512 e79deb7164fe76f5f4a82855030d5eadd1966d87c0785d2a7a743205301ae0809398823e2a3558c3759774b3ee38c974638daf0b58ce565ef5b298f593ffd18d
 EBUILD sphinx-prompt-1.3.0.ebuild 546 BLAKE2B 5aa1462b89470b8d13db9efeb53d55689f035934c54ed25074d04c163bc4ea3f829a56a12502455ab13eb622a24142ea42976dc1494cb90f4024711f50eb7fda SHA512 993c70b9da6ddd023706f8719c66bcff469c9ca811bf2711db9501d9784f8d580b72c0e8255c8d8b730439a13a0e890d7423dabcb83e279b11303dfaf89de4ac
+EBUILD sphinx-prompt-1.4.0.ebuild 553 BLAKE2B 531c5e84d769baaecad3f90c6db72b5ccee61db722962bd2b13b10a6831e9448c595d57242639826b138119516e64a07cbf48bfe9ea99c5160ad2c8b452d33ed SHA512 217d630d4d9b5628edca147fe02cdcd4dc470c42d7aee357e5bfe822d312be43034c38c2e40164749cd0397ade83edd406a5d93de45b135c565e5f7a937b7942
 MISC metadata.xml 415 BLAKE2B 00d16da1c9b70e7dcb3da0bd1e6056944c9c011d99dde0f1e1a5a804ee79b8c9fc5e186f7f9d684401a7c360ec4ef2d367216717c18ea0464da944c0edf54fd9 SHA512 9002d60f91e3621e24a472a8c5bd512ab0b8364a82556b2be8b50d2c332aff3b8ea6f633aacf7d7d09101f2b354621291ffc35ef28103106c08df9558a74dceb
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
new file mode 100644
index 000000000000..777b90f14729
--- /dev/null
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.4.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=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx directive to add unselectable prompt"
+HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
+SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 17a35a581b4e..35d6ce781eb7 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,6 +1,8 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 DIST Sphinx-3.5.1.tar.gz 5905170 BLAKE2B f374a65d66f404b2a7486c58a0e13e228e0de88985fed18cfa74e8219759af6afb1bb05cc10b6a8ed8ad7b413889b7282de7212010fe6d3bd30ce04fe9b59b9a SHA512 31a9253e30d5616c99161455fb61ab3b8298b5364d5eeb5c7b23466182913c99fea4cec14d088b6b64a530cbfb60d691ad093a6f6a0f9060f847f0b73d5e6b3f
 DIST Sphinx-3.5.2.tar.gz 5907358 BLAKE2B 59b2789d7f3cc34622f34c54b5d614be7fa22d9d61cbb6c096ac7efe8f011331f51af12986d505245a30c9583050ae8c012ac736cd8ff5234f528616999dc325 SHA512 97f1589726fe5bdf48b5bc8bfc53267fb4dfa2f21d5d9eefbd9bcc9ff5cc0c7846840b0fe5fcdd133d9735d402189d5b89202de4e462dce99a7653d6f1a86ff9
+DIST Sphinx-3.5.3.tar.gz 5907994 BLAKE2B 3bd5a08dcc860ef419a085a991bb28d16d6a721f253a0ee25333cab5add2257a0557d7b586e89193e9a26e34d39ce5ef9992a9b2c8b8457e8ae7d82a928d32c5 SHA512 4e2cb1c3632ec131cc724f306bbe084691c2178620d1dec130d3bc8be3ee116c14093863ec768242965be9f28c74ed704768b23a62a1510ff00bf1c2edb810df
 EBUILD sphinx-3.5.1.ebuild 4181 BLAKE2B cc76d605fe48b58a6b38c18dbaf9cd8f1947add66f8e799765ceff4a856235f69cecd5b46e24b0398064e853565e7de1bd3de8b7e0ad29a0b67ad130388ce162 SHA512 b926f1581cea0085e5cbbd52c2d6e1bfd4fd96af85a2bbfcf4241f338614d04cb2cb955e5bed7d19a0afea6accaddf2eb62c656026d30d84c82e839caf835c09
 EBUILD sphinx-3.5.2.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
+EBUILD sphinx-3.5.3.ebuild 4090 BLAKE2B 50c4e54a0605fad5b88311b4faa588ab82004648645e70973ff68d04d46717dac0a9ec8db19872985b30c12dcd6ea7515bcb1236229673e4bfde1a27003657bc SHA512 c89837597dfa10a2ba099e0062e194825dfea3818a72e0c627fd634fce62516939978546cca5c197743180b2fae807bc2c5fa9cb20eee9b08bd0714fb8a8fae3
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-3.5.3.ebuild b/dev-python/sphinx/sphinx-3.5.3.ebuild
new file mode 100644
index 000000000000..61ca0020d06e
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.5.3.ebuild
@@ -0,0 +1,124 @@
+# 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-0.12[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_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_py36
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index c134b1a6f00a..042ae0928a8f 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,3 +1,3 @@
-DIST {PN}-v1.0.0.tar.gz 9793 BLAKE2B 07b99851b264dc913e4774217e43692fa72d4f654cb8e3159f919952a25125de99a6118e422b36ae3661024adee2b34f94e45d9a1b801ea80936f23cc65bb861 SHA512 d50eddcf76bd5dd6f35b5891c96c0df2c7646c06603be6c526035ea2ed886b62dd8919749cef9b29ece0584e8a5e24a02d6f5e711dc20c2eadd76c020029292b
-EBUILD sphinx_lv2_theme-1.0.0.ebuild 554 BLAKE2B d6ad7c493292737f33cae07e58a6c4108d2f6585c7dd861c240a21c05c4e3fddac600386194baad342f97583d2112ed003a472f46afa736191237c65e784a0df SHA512 ee4d14ad1fb46ec4f95cbacc549ec9465998a01ae4877de5181e370145be3efdb562513f0a2b5f70ccd7d32e0d4c1fcde3b9e1b3cc2046e10602d72ec33cddc6
+DIST sphinx_lv2_theme-v1.0.0.tar.gz 9795 BLAKE2B 7406d03b53c06a4e814490df65c5dad3bb8299be2808fe89da842c4285ac8798141d7e59713e6bf3b3ea72a7af8650c2b7ead586fdf48004df78350ef789a649 SHA512 e10331f4a979055929b7146b89a4c19b05698e32d0acb2eb3d7734f6e9298d1dbe24dbe5f56697505f9f7488845643011fa1df4ed112b4f016ba21d41a4f91c8
+EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 494 BLAKE2B e8b3f8f60991204d017c8968e8424ca3a413c3a22ed5ab7dffc7ab8c18e3a185e80524983820bd92b279872f935a085613a2a7d4d43abc733b8ee07b6ab2351f SHA512 7144ba9cf28ca2edfc86efba8de36956f1293d67a8386392d385fc58c78c269e59c4e172f15c90384f1f7c5aecbce719a323276486809b719ae0310fe3ac67f3
 MISC metadata.xml 428 BLAKE2B 44682c327177ec1dd09978a294329e8a23e25dbc5b382d802e5cec4a281b4345d147b6348ee6d2008d9e8b9463b35c0c3feff62f3c5d4c6083618fda5a7f8629 SHA512 df698193da79c7d54795ffc35f22c043b7144b62f833d50dc3f1403cc878954fdf294ec2668d2e6750ff4baf0043ab81bef28e927abbfd61bfc252625b8e8e3e
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
index 3a5a72a53681..c2df679f9a37 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
@@ -6,14 +6,12 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
-COMMIT="33313b0dca26a71555d4e90ecb283fad1dafc84f"
-
 DESCRIPTION="Minimal pure-CSS Sphinx theme using the LV2 plugin documentation style"
 HOMEPAGE="https://gitlab.com/lv2/sphinx_lv2_theme"
-SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/{PN}-v${PV}.tar.gz"
+SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
-S="${WORKDIR}/${PN}-v${PV}-${COMMIT}"
+S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 4915b165656a..d1e0d64ae5d2 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -3,8 +3,11 @@ AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d4
 AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f730f4758f03b97688d3ecf5709e8c7b37af82746452520c2f3135722b4e387f3ef9d9219e1d159b8abe937d8165f SHA512 052f249b5f6b2195a472750f42b16721de9e8020481cb57bb5e180267507df6f6b5f1a36b8a45f28b64d098c8a02a4814c1c03f1efdcd1ffedaca77a28ad8705
 DIST spyder-4.2.0.tar.gz 11840358 BLAKE2B 26e4cd9865196fb39fa5b49a17f172b3000fe27c5ab6fb1b31ed56d41f118e4016b6ed97ce8cb1b39c65031fc11413f8e426876d3dc8d5af25f12428d0e0c481 SHA512 c1460e2fe9a37c0e6107657de71205682018d87737b3eac16ec92c32d979bf727a6c8955bd2700872b6e91159d1a1efc57cdea52ffc44604fe34b78094de6e7f
 DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
+DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
+DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
 DIST spyder-docs-7fbdabcbc37fe696e4ad5604cdbf4023dfbe8b6c.tar.gz 58822544 BLAKE2B 9ddd662eb0e3b2845a15bc38a0ab994fcf43824a560cf635a29e16b5eb66407706a412ea50a2f8e5c0212675df3422ece649bd1e50e3ecd1c34ee5727f8a2df9 SHA512 ab30f287733681da0b1d15656a44cd320401330309efbff8f0a89f59a15d5c57532a2eab3e8353d8c3856eac0a393385a852663d6698d0a0d309def21d13933d
 EBUILD spyder-4.2.0.ebuild 8406 BLAKE2B e634bfeccb37da403424636e1c1425ab375bbadcf34da1c9ef3b3a250fc8675a0b213259176025b7565d899bb56af260dfb2e761c07b5ba16112b1b3783afd35 SHA512 c190334f7bf444d8872207de4021422395ebb5accbb4273d17b88c29811fc45c71bd72f1a3a069659825ae3dda645b8f179bfbc7c9613020733ead734619dafe
 EBUILD spyder-4.2.3.ebuild 9616 BLAKE2B f19fe1a411bf3ed4ebebb4faa790933f1310401e97b7d3c0195cb8bd8eedc0dfd7eabeeded4bd94439cc310c9fab82c22f921b6ede55f51161f555f5c1675103 SHA512 676b5feca5dd1eb03e4f8326c027bad7abd21ab52d887d3a396afa49cad7ccf57c3f6e040820e51053f328f0d10486609f79d3e54230111bfd16387b6e4b7a3c
-MISC metadata.xml 1443 BLAKE2B fecb827811cbb6672fd0ee1bce862d8c76282ee07c9ac2874041749f13085ce0257712bbcabc853be4d70568fd9f45c5b7279a7d3f5a3afa85c73fbd5ba89400 SHA512 3b86d1796df6f421f93526e8cd3aa95b104620e2620216fcd2f5f3b517f7601dcff7afb1d16bcd5803db6c77698039f64e46bfbd27e680323304dc0f61f20681
+EBUILD spyder-4.2.5.ebuild 9662 BLAKE2B cb575d2f12b14c208f924162b80dddb54f7f095572d602820a7c8437899ec3cbea4c3b34ebc9f967da6277952187c967eacf60ff9c850b1f8fc20610ba40fd3a SHA512 d2efa521e1ba417469389c81640081fb4e472d40eb95124e75f39c8f98e2ec7b1bbc79260e75e01e7d2d1e9c72251fdfea06d7f7daa3c28af53ad1b6742740ce
+MISC metadata.xml 1468 BLAKE2B fa0cb704afb02b7f48b183b39be4693662a340a2ca56910bc188b5e015b3cb9b42e727b8cc908a39d6d331b0b9b3f5eadb66750f62a55369033292f3ca1dc900 SHA512 60a052889be1543d2f3c451aa72e6bdf51ee6fb55163eea1a796e44d69b59625a368d48da8201a2909392ab5477c1e57d3d8904d978ff28d26609058772e12eb
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index a2a17e0cfeaa..856ece14e5e3 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -13,6 +13,7 @@
     <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,
     for Python,and designed by and for scientists, engineers and data analysts.
diff --git a/dev-python/spyder/spyder-4.2.5.ebuild b/dev-python/spyder/spyder-4.2.5.ebuild
new file mode 100644
index 000000000000..1ae8a57e1166
--- /dev/null
+++ b/dev-python/spyder/spyder-4.2.5.ebuild
@@ -0,0 +1,253 @@
+# 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="78b25754c69a20643258821146e398ad5535c920"
+
+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/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/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
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		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."
+	elog ""
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 496b58737b76..43615f63b64a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -7,12 +7,14 @@ DIST SQLAlchemy-1.3.23.tar.gz 6313652 BLAKE2B e87f67ee7ee70036b94e1708c1a59f58b1
 DIST SQLAlchemy-1.4.0.tar.gz 7440276 BLAKE2B dce64f2a5fe2b67be2a6d79680a774603005773ce93d0a03e6180b9bf7f3105a8b3bca88a2b4a3bcf15305a8271fc45a2bf22d9776ffa49c2d03c586095e7174 SHA512 03d66e96f3a1358b5e68e49ec47c3cfbd6daff86505d4dd7e9f65967f8566f1a55fa4b896dd95109e0c4dbd2684579e12c35bdeb7076d6c06af683b55736cd9e
 DIST SQLAlchemy-1.4.1.tar.gz 7450731 BLAKE2B 9868347a3ccc3519fe31cfca41f318d0b0832aa301c7c91a073fd877f5c29289aa91008feb31096a62a939e70eded88ee21bfc586d09f68ebff4f48ef4e50c8e SHA512 8d2f84aa7edfec65a1f2286210c8728c39f1411da1b0cb6f60cf6345fc692646ae4f2a062b2e4b2f04fe9000678d682c939645f7affbe518821299ae129e8ea8
 DIST SQLAlchemy-1.4.2.tar.gz 7464092 BLAKE2B dd4cf617a66ed4eba54e41ebaead189409e09e434bdfe8e6f71e2fd4bd9ea574acef8feb42290a3fe80f602d2de2160b075633449b0b543e44b44f0fc7c867bc SHA512 b436576d6c72d0ec285b926f5741b6bdba14fa959248be1c4bdcc8b87dfc512653e48fb2d356ab85d0e90a374c48de5311f43f4f3ce6cb64876e1316c6169423
+DIST SQLAlchemy-1.4.3.tar.gz 7479656 BLAKE2B 543ba3f4655e516db82655b1b1814e06fb59e618e3a6d746749763139d9a6ce2cfa2d403cc0d48a80f7455bb4547077036973d5022f8298cfe0c95c5417df648 SHA512 cdb133b2feb480aa9d10f7e38d5c8342ceca327013a9cfea814887cc28eb544f79afc50a08d735195ad0130961429145ef0e641b17584ccb7aec6461cb9e7b15
 EBUILD sqlalchemy-1.3.17.ebuild 1427 BLAKE2B 7a068977d5832b08fccd51075f31608e21c6e234be5443e055dc3f0f20f1016e9c72ed321a3fc09bdd791146a20933d6c9f76b41e25a9ac8ce32488d25faaa51 SHA512 0f00ac700d30e1f8e080fd5ddc07be4173bee454e78a68063c3cc98e9bbe9c2e7d572c41d5cd863e0375c3553a5185144bcd30d4059c3b0d5ed6939a40172b9d
 EBUILD sqlalchemy-1.3.20.ebuild 1881 BLAKE2B 62eccd43feada54889f3829308f3b813bfd9f95da3f99270a8ac8a2600486d029705615f4436bd5494b505743818101f188f4e4315aa1555b8ba6a1e0e25bd6f SHA512 07287e4c7c56ae1f12f928857bbb3298be752a534054386316a79e86c6501212030d258dab1643fef7150b9c4a7e462b0f8e60cadacbda2f81b67a398d42d5b3
 EBUILD sqlalchemy-1.3.21.ebuild 1901 BLAKE2B 6c60421975fba0b2bc5173037bc0e497819fe7918b0e4e0aef8a3a1fb1ef32a2e4352da20ac5eafddfaf7f7b21bf6bd1b864cd09fdedf957bf4a41fc0d1f0dfb SHA512 17282faf6f3a63c36a9d3735eaa896e31058cbcf672671dabcc155fa6246b5b250876790954d0225f2c44e4e8207c575aa7ff5ff2ec1f966c7a7cfb767598f0e
 EBUILD sqlalchemy-1.3.22.ebuild 1893 BLAKE2B 5b6d06e31f3e1181a893a1c49b026f61dd582ce40adc0d3b7812427feac915c4dccdb4deebb9603c0d9d988490a23451ac6348dd930eb0ca81f5cbb197264760 SHA512 1ed46e7c780e210c727984b0c9e598048de06afaabe46cb3166f90a4fe3263c87d263b4b83536d8a8388add67914220b18eaeb152dcabc173dc3bd5c498eb701
 EBUILD sqlalchemy-1.3.23.ebuild 1893 BLAKE2B 5b6d06e31f3e1181a893a1c49b026f61dd582ce40adc0d3b7812427feac915c4dccdb4deebb9603c0d9d988490a23451ac6348dd930eb0ca81f5cbb197264760 SHA512 1ed46e7c780e210c727984b0c9e598048de06afaabe46cb3166f90a4fe3263c87d263b4b83536d8a8388add67914220b18eaeb152dcabc173dc3bd5c498eb701
-EBUILD sqlalchemy-1.4.0.ebuild 1544 BLAKE2B b2408ddb2e8f9a7dda967b386d226947da67fe625eee160b9de4ecf6f6f93f4cd26f661ce1cbd72d9e1de9f2bc98718534a4a5fd54546adfae3fd0d9d8887a70 SHA512 eb89a72a18f18f5608fe9f5d39f31fc5e62dfc3faf05deb2ba423f9411e3ed9883f59e2fc91b242ea59449bad862bd43b7b7db8a6bb34b66160b1e951cf74e10
-EBUILD sqlalchemy-1.4.1.ebuild 1544 BLAKE2B 9da523f66661de3d95aa92d2c01ad2f767bca2d92815f544fbccfe621fac0127caeeb4c8aa22364eaf54458660ae4e0a5a4c4c67ad23658959ab8308ff7f1a33 SHA512 0883f2712d6981a34b438801c942b23dc7aabd491747149eb365b735c4b68cb53d17a60f2b592da70513544c2c63ffc231bc801e9b2c24b20b420746881937b6
-EBUILD sqlalchemy-1.4.2.ebuild 1544 BLAKE2B 9da523f66661de3d95aa92d2c01ad2f767bca2d92815f544fbccfe621fac0127caeeb4c8aa22364eaf54458660ae4e0a5a4c4c67ad23658959ab8308ff7f1a33 SHA512 0883f2712d6981a34b438801c942b23dc7aabd491747149eb365b735c4b68cb53d17a60f2b592da70513544c2c63ffc231bc801e9b2c24b20b420746881937b6
+EBUILD sqlalchemy-1.4.0.ebuild 1706 BLAKE2B 7bd72169726a4b1dc88b0d4738f0a27c581b1cb31c186ac29f57e756ade438b1f53775b63a805cdf31d2573a4d1e5a4a3b189958b87ff797c4f6ebe9f12d5596 SHA512 78634a3c7b379811beb3f5120577e42dde5e188f2c759af3579197e0a2b50d5754533c0f657d8ab743f8e2eb0d1fa6efec3f1305724c2fc54a856859c2b44d9f
+EBUILD sqlalchemy-1.4.1.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
+EBUILD sqlalchemy-1.4.2.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
+EBUILD sqlalchemy-1.4.3-r1.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild
index 2c82efecc27e..ff4b64647937 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.0.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# Disable tests hardcoding function call counts specific to Python versions.
 	epytest --ignore test/aaa_profiling \
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.1.ebuild
index f787e64a4497..358669239962 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.1.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.1.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# Disable tests hardcoding function call counts specific to Python versions.
 	epytest --ignore test/aaa_profiling \
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild
index f787e64a4497..358669239962 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.2.ebuild
@@ -36,6 +36,13 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# Disable tests hardcoding function call counts specific to Python versions.
 	epytest --ignore test/aaa_profiling \
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.3-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..358669239962
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 8c3f607c5a26..517eaccecc7f 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,7 +1,3 @@
-DIST stripe-2.46.0.tar.gz 218080 BLAKE2B 990535efd32b5ddfe166d5b6ad1cdcd966df53fe830a10938355cac10287542284a73f99332878225388a3c28ba431baf96fa4e6e745345c9fa02e64a7e33c0f SHA512 dbfa586cfe7897b32fe95b7230fca5ccb8a12b429982776ee8873878fb6b7284cbb924e8dc6031d59647cc6080115ad541fda02d320c091b6c1bb374679d2213
-DIST stripe-2.55.2.tar.gz 215652 BLAKE2B 28bf455a202df7ff7529f932eda50ed4942e72ccf0453b7ff50bcc63c4f3d2177194d2dd6a95391cc5fe7a55c26abd5ba1225fc830ebd9d23a20ebffe2b82911 SHA512 9e14edf57e394837fdc4457bded274b45c309353488adf81a5fbea67ea4c3321392c5316c9a60dfe975110791672b8e7d1dc7ae14994a320c41b1efb7f75695b
 DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
-EBUILD stripe-2.46.0.ebuild 2027 BLAKE2B 1913565a4739d21feb214e075635a3b22dfaa6377912d9a765cdd701715abd5ae7a9ebf1554418c834d4fb47d58e4da770d4cb370dc910bc092bdefac6a9c70b SHA512 cc4364ae7196abbd62054fa4ad7ba84f6c59884c73b3e755a5c6c783edf396a38f5934aa5034a8347b0cb7963a8b651ee41c3ae1fda3ec96cfcc02d3bf080250
-EBUILD stripe-2.55.2.ebuild 2030 BLAKE2B 3d66cbd7974690b6865e33a527b5fb662b7b9cf1877bac4c80979e16657fde3549f5c299b29f4839b9ebeb27d6305afea9e799e4e0f0197c70c6734f25100422 SHA512 4d9cf8b5569dcb7137ae6069197fb2868915beb01cac9628f2094be22ddde294bc9e050b3c1e3cea55aa1265feb8b0b46f1d569054948056bce860d656632b5c
-EBUILD stripe-2.56.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
+EBUILD stripe-2.56.0.ebuild 1721 BLAKE2B ee8b6842081598319354f549fd165a170c92bfadaa281939daeb9c452bcffb5c97f89e49870d8de17c43354d9b9f7c55e08076f6609db91fe052796c67cda56f SHA512 468480c4b46e546b6e6a3272f1b582fb044fd7de1154ca04ae9654b9691dfb4186b5b8042bc27d6269072dd0b12ebd2bfc234f01daaa7709e3f39e43abc1e514
 MISC metadata.xml 452 BLAKE2B 5be38e3d7907a96732d8e49e636c5e150de12a80f82f8a569969ab0894507398aaa2fd633b767a263db379688360a6805bc68b223f101a817c2dad94546d35c6 SHA512 b289dc8bcabfcffa651ae325a37621c952d86c15f0d1ebcf03ac76e4da577973d57ff211ee3773c95f8ec9c354b391185b825f3f93f03f7c6805eab84b1f5155
diff --git a/dev-python/stripe/stripe-2.46.0.ebuild b/dev-python/stripe/stripe-2.46.0.ebuild
deleted file mode 100644
index db8cfe23a401..000000000000
--- a/dev-python/stripe/stripe-2.46.0.ebuild
+++ /dev/null
@@ -1,69 +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="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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-# See https://github.com/stripe/stripe-python/blob/v2.10.1/tests/conftest.py#L17
-# for minimum required version of stripe-mock
-# Running the tests against dev-util/stripe-mock-0.47.0 resulted in test errors
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/stripe-mock-0.88.0
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-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
-
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
-
-python_test() {
-	STRIPE_MOCK_PORT=${stripe_mock_port} pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stripe/stripe-2.55.2.ebuild b/dev-python/stripe/stripe-2.55.2.ebuild
deleted file mode 100644
index 37fc6e6833d3..000000000000
--- a/dev-python/stripe/stripe-2.55.2.ebuild
+++ /dev/null
@@ -1,69 +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 )
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-# See https://github.com/stripe/stripe-python/blob/v2.10.1/tests/conftest.py#L17
-# for minimum required version of stripe-mock
-# Running the tests against dev-util/stripe-mock-0.47.0 resulted in test errors
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/stripe-mock-0.101.0
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-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
-
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
-
-python_test() {
-	STRIPE_MOCK_PORT=${stripe_mock_port} pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stripe/stripe-2.56.0.ebuild b/dev-python/stripe/stripe-2.56.0.ebuild
index 3895e0af78a6..05c5f43f28a4 100644
--- a/dev-python/stripe/stripe-2.56.0.ebuild
+++ b/dev-python/stripe/stripe-2.56.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 379446e278f7..1a3af9482adf 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,6 +1,4 @@
 AUX tabulate-0.8.6-avoid-pandas-dep.patch 2513 BLAKE2B afbaef53282fa6b775bd3a1a1edeca04cf11f37a86e51ac94641b9037384ca54d808adba9196d057a9007559cd6b7b9ad442e94a8ca1f7f54ac6ef609e72c47d SHA512 7fab4bd5a493c6f6831e88f8e26497b09614f6b04b651c96d5c44639ed03531c14dcee9412970cd2f24e056dc4046a3d3ea708083a14d14ab952921ae7fb7534
-DIST tabulate-0.8.7.tar.gz 40800 BLAKE2B 4e15ef79d152ed6a01fcc88496aed81462e2ac5c5aea1a9977eca955d3c6d743019f8c56a48ef268217cdd7c2780505c4837020ff8cb1bda442304d82e560a5c SHA512 77eb619d3115bbd574ff72b82d55e09f1e2bfe29da0b937b72930b3e65423135722bdc54bed818adf2e25cb49a58f8f85d0ca3b3ed0fcfcfda34a25e54781d0c
 DIST tabulate-0.8.9.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
-EBUILD tabulate-0.8.7.ebuild 897 BLAKE2B 3f89d10ab6860b45237c3c5a9a92b94cd8f7e4043ab262ccdc35adf07a4993cfb7972f4eed0563b341a19331a32e5daa36c85330ed0a800811f8f87c64a752ce SHA512 379373c73f2c21a9714cb30d2b2bda6d176fd3badb5d7a6cf7f4806a309764f89f9bb94aec88df130b39f8dbb7dd94fb393317f521ad645330d2b4b0db65a15a
-EBUILD tabulate-0.8.9.ebuild 849 BLAKE2B 20cf32e01ec95e56ac18085aab88bdbbeccb8e724fe4722019471d0c1f5bfcd4bec26fbb1a33f7602d44df4b1adaa979160414785f3e68391b7651a490fdd932 SHA512 628e0b595b3feb4d825490bb98c2837843280bb7b31ce82ef64eadcc1ea9edeeda319da6f5a562b7572062a18bcfedd12e0874bad0915da5944e04eb5217bb52
+EBUILD tabulate-0.8.9.ebuild 847 BLAKE2B 4455c2854730f5fb217f572fc4198cb6eec537d5111a6f9dfbaaf5a5c67c1abaf58ec65cab1c5e844f8afef625485616f1ed6b999744d0f8f28526c471201b9a SHA512 d5908ff07b31c8e0d427040c4bdef44a3583d5f6e019885cc8d3d52e82cb1e51883fbd5e6b54fcde9cfef2ddac17c5e6e0e74484e81184509a6e5a2ed3daf6e5
 MISC metadata.xml 398 BLAKE2B 3d07c5c3361c606537260a267c25d62b8564c3491a65aa425b418a9a58eb137d23ae7a0902e61b4fda33a5d693e9e1ae7f45d6c1d3eee24b46ad88b817c93868 SHA512 4ddb470a137b30099d06b9577f4dc2d5188185b3ec74393e0b8d3e7a388a20134e91bcc0ff0ddb782c6fbc07b95d72ad43fa5ffabc4a0587d0b94b0faae1dfcf
diff --git a/dev-python/tabulate/tabulate-0.8.7.ebuild b/dev-python/tabulate/tabulate-0.8.7.ebuild
deleted file mode 100644
index 938f6d59f4ff..000000000000
--- a/dev-python/tabulate/tabulate-0.8.7.ebuild
+++ /dev/null
@@ -1,37 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/ https://github.com/astanin/python-tabulate"
-SRC_URI="https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/tabulate-0.8.6-avoid-pandas-dep.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/tabulate/tabulate-0.8.9.ebuild b/dev-python/tabulate/tabulate-0.8.9.ebuild
index c71572c40741..a8028f272d89 100644
--- a/dev-python/tabulate/tabulate-0.8.9.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.9.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/python-${P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]"
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index cecce7f3abab..826a45896259 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,3 +1,3 @@
-DIST textdistance-4.2.0.tar.gz 34519 BLAKE2B 0432705c57cecd66fe8c9cd4c12293220f1aa72e26c17f7a99d0a312d6ac7c2bb769a01dce9fc950a578f50a490616cb76dbafec541cbe1d61dd8f645dd51281 SHA512 8b58d02824d0c94ece9d0322180dd25af7dd0cef708e3f981efa16e262373532de3d68aed7dffd2008cfb04f30495a1792f2f22e9f1d8a802426d464c20d7b07
-EBUILD textdistance-4.2.0.ebuild 767 BLAKE2B 70d3967bcd059de0c3ae0edcdc3b617d8a4c95d2a358abaee526e9e9406b69fce312d167131148fbebb27569a961c2bcd3256f46eb84dd3d992748c8576cd810 SHA512 f33b0a85fedaa54a0269ee3274b90cb6bad8cd3a81a2b7d74aed9d3b5fee3312fe24d802831180bf8a12110bc44fca36075bed6b409c0fe826f70d89aaf3929a
-MISC metadata.xml 538 BLAKE2B fc2dba7f2c46f4f752358ae4eb765f35641f4f91e4d65c92915226b358866d645e4ffbc4760db48ab6f88207b0da7be7850551e5dad6e9a8b216ba89f59e308d SHA512 de6da8111ffc5abe45b404c6f2981396935dca2fd583e0db9c48bd3d294bd76a7cca47e2b1bec6684f0b338fb496ee943f3e0da8f6d0e0bc9396e25e37a770e2
+DIST textdistance-4.2.1.tar.gz 45095 BLAKE2B c0b7fec8adb3a90fc2f3c939a39492887a4989e16d6bd9c548fceb1d5020323d2782dabdb69ae17dc4c3cd795425b3fbdf9bb6041b1ef7df840c2b3a9e2a7e05 SHA512 daff22077800e42ae266edd8614a1300f3f2d080868dbd38e14d035f19853e555485d27ab0392401318e0c4ddc81fbf1b537dd3aa1ba25d7a89e5f0edde8ce46
+EBUILD textdistance-4.2.1.ebuild 1072 BLAKE2B 61cc81dbd396132eff7e85131b605460c42c5a800a039a5b2b9094e8c1c7e3b9c1b2b343eae93c800cc90724fd0a7e36f0bb2bb4a864d412595c206c03327d52 SHA512 eb244b583aabf6ad93c2d105fee8dad0fbb44e4f4548892b9c291127d35d004ef550f93861faade959efa8f76c33ad1b6823ef929c9cc7b658739e864a6ceef3
+MISC metadata.xml 562 BLAKE2B 7b2da3e27c8f8870d80a59189ce1025d26f28002882f9e0df47a549c406ae1b074e83196e382d1f1bff17491052e7d2244ab1ae6e022e7159bbab4c63821ff4f SHA512 f3a6544d16475049f713b68196684ab5ecc5e66380460d5dbe7bc0b2ff16fae9f9bc82c1ac6fd215c2d21efb7d89a5d0509a037637ca0ba18c38519d8e8ab0e7
diff --git a/dev-python/textdistance/metadata.xml b/dev-python/textdistance/metadata.xml
index 7a0bdfbd91d4..5b3c0dc6221c 100644
--- a/dev-python/textdistance/metadata.xml
+++ b/dev-python/textdistance/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">textdistance</remote-id>
 		<remote-id type="github">life4/textdistance</remote-id>
diff --git a/dev-python/textdistance/textdistance-4.2.0.ebuild b/dev-python/textdistance/textdistance-4.2.1.ebuild
index f8bf291a59ec..37b4900e0efa 100644
--- a/dev-python/textdistance/textdistance-4.2.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.2.1.ebuild
@@ -9,15 +9,12 @@ inherit distutils-r1
 
 DESCRIPTION="Compute distance between the two texts"
 HOMEPAGE="https://github.com/life4/textdistance"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/life4/textdistance/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# Too many strange failures
-RESTRICT="test"
-
 BDEPEND="test? (
 	dev-python/abydos[${PYTHON_USEDEP}]
 	dev-python/hypothesis[${PYTHON_USEDEP}]
@@ -28,4 +25,17 @@ BDEPEND="test? (
 	dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
 )"
 
+S="${WORKDIR}/${PN}-v.${PV}"
+
 distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# RuntimeError: cannot import distance.hamming
+	# these optional things are missing at the moment
+	sed -i -e 's:test_compare:_&:' \
+		-e 's:test_qval:_&:' \
+		-e 's:test_list_of_numbers:_&:' \
+		tests/test_external.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index df46a6c20e8f..2356b88a3387 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,9 +1,7 @@
-DIST tqdm-4.56.2.tar.gz 167040 BLAKE2B c1754cb262977688365c6bf17ec6b6ec31704cdb22aaf05261653c4c9609bdbd16863a15f58a7fe0fb2c0983513b091be55dbca48a0a7b1177a4d017d6800ce0 SHA512 8e7ec199c43a3cdb69bdbfaaec33c11ce8b337255eff4ae6af9928c2a2c5adb065698538562020c9f0a29a63671cbbfcf2c4c9ccb25bec0ec1d8ae8df66516c3
 DIST tqdm-4.57.0.tar.gz 167590 BLAKE2B 30852febdcb69d1f0c6a7416ec7611a79896d643e18c658bb19e52196b4998d8ff9ef708c92d09d9804d8c0210b378dc8a3d58ef2b788a65835cd95ddf3406e4 SHA512 5393ffe6cbb5b41a3c51efdd14169936fcae9dd635b7a35d64f44157f2c855914dbd5c8aa933c4830a16867c83a73c0734e0ebee548392d2c73cae4e6aba531f
 DIST tqdm-4.58.0.tar.gz 167844 BLAKE2B 9a28aa91b330714f6f4d178ca793f9bc1ce5988417b38dc5a9af06c36b8949d0f23de846bc1fb87f7dac2a3b09028c4d216659f84a8ce2125de0a7870d8bc4b4 SHA512 a97a7fc1d5a181d326e91bd017cf9737fd2322f375b8efe5e53c8e49c7986edcdea39086f5057a6d2584a16e2a45b5a679055ba08c83d813fff0a61050b71b45
 DIST tqdm-4.59.0.tar.gz 168620 BLAKE2B 0e3467c777d36bcfaa9f004a587bff70f171cfd7ecdca46d3a6f894afa3694873b7c50c860da31b0147f3233bb419e0c74762797d64e79b938bea813f8a38b92 SHA512 be7ffe2f5e28dd2c653fdafd26cdfab6c89f1fd257420f9ab47460230318183b4934370261d7d5939d05f55b907e2d3982cbef078d372d9a4167e1df42c895a8
-EBUILD tqdm-4.56.2.ebuild 1231 BLAKE2B bc9ca1ef772b1b2c5ce796e0c80e1c4e202ec0cbc77fe37246230ba1eeb101c54a65c62a5e784b6390e18f3bfe081b98c57a77e981d3a1732a94dddbb6f081d4 SHA512 5a4eda4aa40484068c823a976a1b65e906f44c8616265683463586a2d202183c8f038a8b04c90e041fc21f358c9402ceac2fd4063155bd91510d0e18ef8912b7
-EBUILD tqdm-4.57.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
+EBUILD tqdm-4.57.0.ebuild 1231 BLAKE2B bc9ca1ef772b1b2c5ce796e0c80e1c4e202ec0cbc77fe37246230ba1eeb101c54a65c62a5e784b6390e18f3bfe081b98c57a77e981d3a1732a94dddbb6f081d4 SHA512 5a4eda4aa40484068c823a976a1b65e906f44c8616265683463586a2d202183c8f038a8b04c90e041fc21f358c9402ceac2fd4063155bd91510d0e18ef8912b7
 EBUILD tqdm-4.58.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 EBUILD tqdm-4.59.0.ebuild 1239 BLAKE2B 4c4da34cec6f736174ac62151c84cebb692e8c9624ad7dd2b2d65fcb7fb3427d033b1e45cb6ae4f8305e85aeb76f281bf1cb171ae5e9ba976c843f656995e26d SHA512 062b481740c2d84e64073feb1e3e202cfd967ab07ac8736251edd9d0407c0f2ab6d9343b851c0215f9bfeac7e9b23f925bf745a37e20a14d0dbcc57f5a8e20d0
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.56.2.ebuild b/dev-python/tqdm/tqdm-4.56.2.ebuild
deleted file mode 100644
index 9f4656c29579..000000000000
--- a/dev-python/tqdm/tqdm-4.56.2.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.57.0.ebuild b/dev-python/tqdm/tqdm-4.57.0.ebuild
index 0bf4e4570b83..9f4656c29579 100644
--- a/dev-python/tqdm/tqdm-4.57.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.57.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 1adf6bacc0b9..0b0f659cc975 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,7 +1,7 @@
 DIST py-tree-sitter-0.19.0.tar.gz 112342 BLAKE2B f64db1bb078bd7b4a9b9e9c93c5eb449b9833870914ae5489dfc9d232c6f43d1779a5e9da47457f3152faae6997062c0a989893255bc66ec4747918342610bac SHA512 c06e921aa1a2fde97612fcbde61f0baa92730d927798076b3b6476bc26a84529d8a3299f4d4092ee85af84824c5d4444bf0800fe3cf1d15c66bcb2bf49a430e8
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
-EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B fa80bbe5d90972f86a7a6bdd66515a0b691548fc2dd673685ca00474360c007321807cdbda71f37993c8c0c26cc6a200c40377f6a5d1dab0b4b3d4f65e2e8f96 SHA512 110d0044b754b2d5b979d31de7901905080927af9bc6794c3c831720895beb4fca7f715bf7d145dab2ec9b4a0b2176cce0e4b5a333c81408c54a7a194b20ff51
+EBUILD tree-sitter-0.19.0.ebuild 567 BLAKE2B 5401e417dd5142919275c7d256df3c95b93a722270b3bb2929b6936f738365c9b312fc3f9d785389b6d7bb721441f6128bedea767d08136c0d35be7301017218 SHA512 b2a65c60df2fcd7d22afbb472993d6d868128a7604fca6aabeba6a3687069bbd77b950e1251e12534706d4a5407133e359e14a74b9782df4ed7daadabbfb5a9e
 EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
 MISC metadata.xml 392 BLAKE2B 5359a33b220d2104d9a0e09ff6ee637c93dbbd3601d1004c194af9cf04ad46f9639f9f91b60576812847c2eb6b8c6988ba5fb3fac73ab30d81a0533b532c4490 SHA512 6047bcd144cd23f16232e5140c817e00af555f4c7b470b3492015e28042536015d64c2e19534a9c62fd4e869cdaca0fdcfcc30abbda034bf423f7ec72e909756
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
index 3abfc8316950..2cc1af03a212 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> py-${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 444a0ffb9997..3a9d97f79121 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -7,11 +7,12 @@ AUX twisted-20.3.0-py38-cgi.patch 8601 BLAKE2B 6eb76eaa1cfe10ba473a334bfd5e5a4c7
 AUX twisted-20.3.0-py38-hmac.patch 3484 BLAKE2B b89587da906517a621ba880eb6eb71cc2f397a7bcf7bcf065f79897626f821d965b2daa0d105af7e48c8c30fb79fb836c02db17058b5ac046ae92f9578899a62 SHA512 a6ed24994bf76a7e602144eed706c61cce531408db050dc2a497fb4131b5594f4d29ebd34c0d780b283460d130dfc88b19ad9cbe5436c0290b9b13eb35c9342b
 AUX twisted-20.3.0-py39-b64.patch 6747 BLAKE2B 1bb6960e5049f43b08e2ba7a56a16616e82f3b18290645b2f14bd15a199d3e1b2767e030a8295fc2d3f4a8a3d1a6e4a5d5d7d55a089da643c593b2a3df174119 SHA512 6f58dcecf07925d15a1373726e03da4083a0266ee6629089b30b0c8ab62bd007579942430989df2d550578067e2c2c542062dd20a38851794f6ef86e85aefb95
 AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e234c36941f0f7ecfdcfa8c14a6a7b5a433b9ff2a40c2ad870e46b3437210202cf0dc58e17c8d29ebf506c499780355cf60bdb SHA512 81f0b597a7b2609bae5f405388bccf759dd6b0295cf05e6ef2aee76d0f3ab4367a474704aab2753d101be2580d097f30d94acc529035bdb3c3ec43dd035fb733
+AUX twisted-21.2.0-incremental-21.patch 2303 BLAKE2B 34bd2eef6b7bc9810466bb5daa97736eb8aba88ed6e9e1bec78a9547d7068a330685eacaaf8b5eb16a33733792a0bff8a78b08f5ff5c6766763e687a98e1295e SHA512 0f2aabc82233dd43a418de38d6b46284e5f7c136e27eaecd423d25908c9a652c7725ea0318bcbee906b2d3cdf8b9cdf44e4ee496ed33aad60f609a3980bbb115
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
 DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-19.10.0.ebuild 5777 BLAKE2B 163fac4a0cdc830f9be404a69c43287f8594f2a71dacee4d4b37a56e5fd140c060b1a3e765e63bcd4b1a4fefff0bb30a1df007b6f7ad0f01adb0b6ad8f1687ee SHA512 124513b07e486caf4655534cfa0fd3c34facce3f16fe42977d41f2fcd7fa032e3dfd0ea85cf461941539ca8e0768e015809f33c798e49582aaef657aa02ce499
 EBUILD twisted-20.3.0.ebuild 5611 BLAKE2B 598bfa6c58c1acae83610bf1472d49ddf65ba75689e7c76eb356af50b1c786b5201dfb696afc7ab0ac0439878e2119de9f359250d2ba373de146ebe9edb5b37e SHA512 bbebee3ed4a72f34d346dbc38141f2a461b61c3d3a8ca99be711d16ee10a8759aaefc9f780daa0ee2dca589b4f273fb47c69b6b694c19a437ea3ef94d3ca2d14
-EBUILD twisted-21.2.0.ebuild 4722 BLAKE2B 4360942c350e618dea84527bcd0a65e699483c30c20eb7194ddaef6dac9cfa6b0ec69d22b7d221c8771ca7fbb30b94f95d60981d831117ed4e4d98076e95f120 SHA512 a33710254d411021cb0a1549e034978ef8d06c80a9c7bb22584d1221ff27d8090654824dbddb58b1a8bbc2975c6dc9f6309c5be0ca63553d52a90dc60375fb8b
+EBUILD twisted-21.2.0.ebuild 4807 BLAKE2B bc13ed6537f00624c573f070bfc400ee7d5390dbe1599f3580da6061d958b54c531455fc40216bc77d09deb5dfb73675582994ffcc5e2a9bfbee41409fb7b7b2 SHA512 9a9b06f7a09b41db831a1598b52f35763498372ad956a667996500430a850eb8f05503d4269e41074501adf43fde716f76b8d793caab8995963858c2e0618efe
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch b/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
new file mode 100644
index 000000000000..c726d32cb89d
--- /dev/null
+++ b/dev-python/twisted/files/twisted-21.2.0-incremental-21.patch
@@ -0,0 +1,65 @@
+From ab934c065177422a7121e44c792c56c32962c4e4 Mon Sep 17 00:00:00 2001
+From: Thomas Grainger <tagrain@gmail.com>
+Date: Tue, 2 Mar 2021 11:27:56 +0000
+Subject: [PATCH] update tests for incremental >= 21.3.0
+
+---
+ pyproject.toml                           | 2 +-
+ setup.cfg                                | 2 +-
+ src/twisted/python/test/test_versions.py | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index a7d531b003d..ca12b3ef7e0 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -2,7 +2,7 @@
+ requires = [
+     "setuptools >= 35.0.2",
+     "wheel >= 0.29.0",
+-    "incremental >= 16.10.1",
++    "incremental >= 21.3.0",
+ ]
+ build-backend = "setuptools.build_meta"
+ 
+diff --git a/setup.cfg b/setup.cfg
+index 17501b91ecf..07094f7ea6b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -28,7 +28,7 @@ python_requires = >=3.6.7
+ install_requires =
+     zope.interface >= 4.4.2
+     constantly >= 15.1
+-    incremental >= 16.10.1
++    incremental >= 21.3.0
+     Automat >= 0.8.0
+     hyperlink >= 17.1.1
+     attrs >= 19.2.0
+diff --git a/src/twisted/python/test/test_versions.py b/src/twisted/python/test/test_versions.py
+index 022010a6eec..6707169b1f8 100644
+--- a/src/twisted/python/test/test_versions.py
++++ b/src/twisted/python/test/test_versions.py
+@@ -126,7 +126,7 @@ def test_strWithPrerelease(self):
+         Calling C{str} on a version with a prerelease includes the prerelease.
+         """
+         self.assertEqual(
+-            str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version 1.0.0rc1]"
++            str(Version("dummy", 1, 0, 0, prerelease=1)), "[dummy, version 1.0.0.rc1]"
+         )
+ 
+     def testShort(self):
+@@ -145,7 +145,7 @@ def test_getVersionStringWithPrerelease(self):
+         """
+         self.assertEqual(
+             getVersionString(Version("whatever", 8, 0, 0, prerelease=1)),
+-            "whatever 8.0.0rc1",
++            "whatever 8.0.0.rc1",
+         )
+ 
+     def test_base(self):
+@@ -158,4 +158,4 @@ def test_baseWithPrerelease(self):
+         """
+         The base version includes 'preX' for versions with prereleases.
+         """
+-        self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(), "1.0.0rc8")
++        self.assertEqual(Version("foo", 1, 0, 0, prerelease=8).base(), "1.0.0.rc8")
diff --git a/dev-python/twisted/twisted-21.2.0.ebuild b/dev-python/twisted/twisted-21.2.0.ebuild
index eba3e3a2dff9..eec2177e7cb2 100644
--- a/dev-python/twisted/twisted-21.2.0.ebuild
+++ b/dev-python/twisted/twisted-21.2.0.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="https://www.twistedmatrix.com/trac/"
 SRC_URI="
 	https://github.com/twisted/twisted/archive/${P}.tar.gz
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
@@ -59,9 +60,10 @@ RDEPEND="
 	!dev-python/twisted-web
 "
 BDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
 		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
 		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
@@ -75,9 +77,9 @@ BDEPEND="
 	)
 "
 
-S=${WORKDIR}/${PN}-${P}
-
 python_prepare_all() {
+	eapply "${FILESDIR}"/${P}-incremental-21.patch
+
 	# upstream test for making releases; not very useful and requires
 	# sphinx (including on py2)
 	rm src/twisted/python/test/test_release.py || die
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index b4aec0ffe28b..c8904058c431 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,5 +1,3 @@
-DIST unittest-or-fail-0.tar.gz 2445 BLAKE2B 42d97fb3bd7e825ecf521ebbb435ca3973f83e107d86848f2c03d6d2321c9b87ec68db159e658bd5eead5321b7085ecec5350947818f55141eb18eb72719e2ad SHA512 8df21f5e235e03f4b5a8ae351420ac667612afddeb52a27bb2d4812bedbea87ba857dedfa37001a72872529b7c1984d15ddda93edfa6f989f0990b72c4b57baf
 DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
-EBUILD unittest-or-fail-0.ebuild 814 BLAKE2B 31c165d9d5db28ab11a3ce7411fd9b2ff78efe736cdfb442f6341bed74fea93362bb3feae09c19107a97c87a7ffe91dbef1a314b7dc2f3b62f35ca10cb8800b9 SHA512 f96d8e77783db57cde54d9f96dc4aae228d84c730b1468af2418aa067a1c8907cb6fb2a63b953c95ef0e0b92cd565db78167aa366d9630522ae67119cb793826
-EBUILD unittest-or-fail-1.ebuild 814 BLAKE2B 31c165d9d5db28ab11a3ce7411fd9b2ff78efe736cdfb442f6341bed74fea93362bb3feae09c19107a97c87a7ffe91dbef1a314b7dc2f3b62f35ca10cb8800b9 SHA512 f96d8e77783db57cde54d9f96dc4aae228d84c730b1468af2418aa067a1c8907cb6fb2a63b953c95ef0e0b92cd565db78167aa366d9630522ae67119cb793826
+EBUILD unittest-or-fail-1.ebuild 805 BLAKE2B a4250c74504179891f7307f80cde80af942ece2da0b9c975edd4a5fe677c4a0eb6e9d9d1a5406a5170390caac4e2348072c531645425237855976beef0c7a4d7 SHA512 8ba5e2dd175d86cff7a24e868d8d9a29e91314ac5a9fbeba7b283f371f9af9c00d815319735dadee0b31f87b0267d7127e52f0c8c2fde8dd8733b08a55270d0d
 MISC metadata.xml 372 BLAKE2B e34273d2456e517c83d2ed1933ccdcce21d22ce96cff97c691d920c144e921b4f49b0018b4d9d5dd72a7fb0f2578dc0ed9d4958915fb386d0db3bb134d592df5 SHA512 da8ea65057ab402c29eab6fe2bb7fcc6f82052cb4fbacaac99c955da80da7286cd837bf0489420f04bf41aac1789a349ea50f624bb105f44021dabb92340d1e3
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-0.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-0.ebuild
deleted file mode 100644
index 707e0b2b5bb7..000000000000
--- a/dev-python/unittest-or-fail/unittest-or-fail-0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 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} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Run unittests or fail if no tests were found"
-HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
-SRC_URI="
-	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~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"
-
-# Warning: do not use distutils_enable_tests to avoid a circular
-# dependency on itself!
-python_test() {
-	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
index 707e0b2b5bb7..41973250d512 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~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"
+KEYWORDS="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"
 
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index bf1309237037..867402a56796 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,7 +1,3 @@
-DIST urllib3-1.25.11.tar.gz 260300 BLAKE2B 06bd2107bad479e36c6474f95567c3ecb119d18b193b358df9e345e4d09392366255b21597b26fbf2374220b921cc2117a1972f88021c3a6ebac3844a319acbe SHA512 58f77edb9ced62cbac7b0baf2651c07f9f413267f103730ee25f08c5d4d0bf52a2ace02f58841bcd55652db677c7a1dc9a756681e7e32d590bc69d8b93e8f173
-DIST urllib3-1.26.3.tar.gz 292598 BLAKE2B 31bcf03debd74a65004484f12c9ad4d71b8c065344f1e377c2f4a695fc0778cf4cb503dbe243133a20d5779ba4bea455213c62aa5dc3815a994acb4e0adf46b6 SHA512 d0dde67880212dc134add3e16e0aa391170963ed26b9a7eb65399235251131ce25488268df7b2f933afc71c9a94e55e08404f9326c0bf5142869dac912d3ee01
 DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
-EBUILD urllib3-1.25.11.ebuild 1879 BLAKE2B c6a79fb4d9b36011fa0c0602e2853c1f8f289e3e87ce04da163d6c4af39654f8fe47e98c380c9e6f66f749118be3cdf237b66f86eab599fc0c0fc695a26ebdce SHA512 ff5c93995e8dc5c6b4a62e3c8035629ee79db816807a81805bc10dc4b30e51e0ee87fb47f51d13755f1097ccc1c76c26a69a0fe7f432fbd5ea3ac312d2783385
-EBUILD urllib3-1.26.3-r1.ebuild 2236 BLAKE2B 1a82ac8ab31b5e3dfd01dac2fc3031b401ba3f1fd64fd796534483970ef9821683de544c1dc7b73c76ef274ceefd447e117ddc8f957ef8f36157863e8ec1334c SHA512 02c8ec9f32621eb34dbcebdd932add480c833a8e261eab52d96c1ed9f3c9df96c4fdc0ddaf4ee62336cc46681560982b69f2121424730284a132538fb134d578
-EBUILD urllib3-1.26.4.ebuild 1930 BLAKE2B 3a84a1ce3c4c409e474c0f7eef48f2e0858ae9034a48355c40f76b15644fbfeb348d58c31d984801fa79d60a5fa72c88427e75cd88fb049411ed6deca2265548 SHA512 2ac8fe4580351db9133005ba5a784a70297dab93b3c2afdcb856bb6fddf06d62e6c455a707e0922494b23cd9cbee21cb48a008ea7a4b955019d937cebe4e2a09
+EBUILD urllib3-1.26.4.ebuild 1921 BLAKE2B a9c6fb6e37beb632684ee49cfcf9e02692cd8077be1e407d7a92a525f5a0e446e72ef869fa958f626afd92de26f349fb913986428d8e1f9a56bf822e9b9273ac SHA512 195a4bcf147d71ae3fb89894ef8ba24a01a9de71d14b8f28298b21e73376ad3491939eaeae824ecf24e4afe01237b39a5d2ed9952dc38e23b48b721a56af6deb
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.25.11.ebuild b/dev-python/urllib3/urllib3-1.25.11.ebuild
deleted file mode 100644
index 772a892ba7d7..000000000000
--- a/dev-python/urllib3/urllib3-1.25.11.ebuild
+++ /dev/null
@@ -1,69 +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,9} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlipy[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlipy[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster \
-	dev-python/mock
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	case ${EPYTHON} in
-		python3*)
-			pytest -vv || die "Tests fail with ${EPYTHON}"
-			;;
-	esac
-}
diff --git a/dev-python/urllib3/urllib3-1.26.3-r1.ebuild b/dev-python/urllib3/urllib3-1.26.3-r1.ebuild
deleted file mode 100644
index 25ba58bf0bf0..000000000000
--- a/dev-python/urllib3/urllib3-1.26.3-r1.ebuild
+++ /dev/null
@@ -1,71 +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="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6,7,8,9})
-	)
-"
-
-python_prepare_all() {
-	# https://github.com/urllib3/urllib3/issues/1756
-	sed -e 's:10.255.255.1:240.0.0.0:' \
-		-i test/__init__.py || die
-	# upstream requires updates to this periodically.  seriously?!
-	sed -e '/RECENT_DATE/s:date(.*):date(2020, 7, 1):' \
-		-i src/urllib3/connection.py || die
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	[[ ${EPYTHON} == python3* ]] || continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild
index 3bcb2bb67bd3..3bef0b34c6fb 100644
--- a/dev-python/urllib3/urllib3-1.26.4.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 0cfb584b4ae6..7f26dc8a21e8 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,11 +2,9 @@ AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b23
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac
 DIST virtualenv-20.4.2.tar.gz 10578406 BLAKE2B e9b50a40407954c411076244c09a57601553c16b750231ee451e1954a91f1c18740804246e3e4ba2ff55da021e976cab80da86a1b9d01e3cd3d494aa95f07129 SHA512 3ae13f0ca2af8be1cd95affdbfe58d43f930cf616a38963252219d4efc2523b1c3e8d922b3ab2200ac4cadc76c1237ddb4828ac15b5122771e96f7401a852d4e
 DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
 EBUILD virtualenv-16.7.10-r1.ebuild 1846 BLAKE2B 59818b64498cb3ef09d0b95b32e24873faa5a0760681362ebfe5bd3fdd6b1cd914ddb1f0604b5b7bf22ed108f0b096ef7e2a738fc9717ee6dc4260a45f46a882 SHA512 e7c0fe99c605ad2dd5c0c83f168ea70dab48973134c8819924f4296ffacefccc017048f237506024b9c8ee4a84580a31ca76370ca8eea9f6c079f0eca773e37b
-EBUILD virtualenv-20.4.0.ebuild 4014 BLAKE2B e1319708866055e80b6810abdbf159dd221b7b381a256602d67a6b0e28e68eabc683132c81d1b2245a89327911b2eda7a95c82979c6219d78fbe9d820a6ba250 SHA512 c80fcb7d31e2eb60d4bd29d859a4b8745b4930d09f9e61e43d94130f39771c3d0f18b87019288142228a0046516a1868f104029e195159f13f67c91a3091d838
-EBUILD virtualenv-20.4.2.ebuild 4028 BLAKE2B 23cefc6f58bcd644d5d742aa2b1be4e192e13a7fcd6e126e5146d180cb73e41efc969f48f21f5b8326e347be1436e3d4ef495826750239382320c58b52863ee5 SHA512 82d8fbec453c3aaab3abbe2c98e696ed2923a079cdcc4bad6ea4754363c2f35185254109a389e868addd6748eca41fbf66d04be6d86101901f7c4ffe19ee1c01
+EBUILD virtualenv-20.4.2.ebuild 4020 BLAKE2B de0e4a0f7d228a6deeb2a737deec7e02ca7bf6b59608424921b42ebe71e9c84e6f0248bfef8818b8b76849154c074a79d3d150fd0d974fa87b0d6cf7483ed41a SHA512 8546d3deb3e6c174db092bb9b661a197ef37c679e5ab84d886e99df9570e8b95336df3e0675fb1888d2a1e3a22227a034272663604b6256032bd3b2e6b7a7a1c
 EBUILD virtualenv-20.4.3.ebuild 3911 BLAKE2B 6e498563282286bad71cf85cf017ccf96fd688e6dd5af4602a373b5fc6dc5a5c72df2a77b1eceff344363cb404f4b700497cc1625c1177f728870b78a5745fe3 SHA512 e325a5a5855c15434b2dfe22c90ec9e794b4baa0b16466049a69ecf70e40e3fcf65e7a25ab5de5a36970dc377d7ba82cb876525d3a843c26b9be48aeb47b908f
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.4.0.ebuild b/dev-python/virtualenv/virtualenv-20.4.0.ebuild
deleted file mode 100644
index 90ed5dd3c943..000000000000
--- a/dev-python/virtualenv/virtualenv-20.4.0.ebuild
+++ /dev/null
@@ -1,99 +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 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/coverage[${PYTHON_USEDEP}]
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-			>=dev-python/pytest-5[${PYTHON_USEDEP}]
-			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local deselect=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-
-	distutils_install_for_testing --via-root
-	pytest -vv ${deselect[@]/#/--deselect } ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.4.2.ebuild b/dev-python/virtualenv/virtualenv-20.4.2.ebuild
index c0da33fc038d..12313fb1c444 100644
--- a/dev-python/virtualenv/virtualenv-20.4.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index b41267e1c570..eb1dafce362c 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,7 +1,5 @@
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
-DIST watchdog-2.0.1.tar.gz 95093 BLAKE2B dd59b3be1ec1a33d3f015710c14f3d2ba6e652a36841e7405a879625d588a3ec4d18c4791e6d8808b0be75079588ced2fbc6ac103645520ab94f085ae8fdf3ad SHA512 25e93505daeb3d0d9947212099af3a975cd8c75a1cf93ea5fee59de50471becad2abdbbec8a44afe94b935599768f78605a48c196c3c3ed6123fedfb4768e3aa
 DIST watchdog-2.0.2.tar.gz 95452 BLAKE2B e3a071cdf1c47698cd54bbaf925c4eb7e2af7398ced73aa332e57472cba2f5ce2ce1b96a31d3f5f3a525cabf81d5de528d95d0c59148150f407abb8ebc64538e SHA512 6134ad22b350b7b2893b564c4f02bd35b1be515fa18dd7f7000b191994b5ba48c5bf573819d2f363de227481a6bb8a0a14973e7c6611de367df2a3f228656ed1
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
-EBUILD watchdog-2.0.1.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
-EBUILD watchdog-2.0.2.ebuild 982 BLAKE2B dd384d99899e834739fa9baceb15b4cb56a22fb2ff531a3e2266b64a3af4f322f045e61ee5f0d64f32c1b4231c3868abae9a8ea658db826d9cb5f2cd5ced3102 SHA512 4f73be04ceda5fe0a70047ee21a56055768e2956c78107ddf1a28e8014f0246e8a43ce8c03540ac3886cb6262bdfeee254720e0aec29c8cdef6d519e2176020e
+EBUILD watchdog-2.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-2.0.1.ebuild b/dev-python/watchdog/watchdog-2.0.1.ebuild
deleted file mode 100644
index 8e5e59165960..000000000000
--- a/dev-python/watchdog/watchdog-2.0.1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-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 ~ppc 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
-	# broken when django is installed
-	sed -i -e 's:test_eventlet_monkey_patching:_&:' \
-		tests/test_skip_repeats_queue.py || die
-	default
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.0.2.ebuild b/dev-python/watchdog/watchdog-2.0.2.ebuild
index 31b479a03ebc..8e5e59165960 100644
--- a/dev-python/watchdog/watchdog-2.0.2.ebuild
+++ b/dev-python/watchdog/watchdog-2.0.2.ebuild
@@ -14,7 +14,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 ~ppc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 1536be4b33d5..b816ff4709df 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,5 +1,3 @@
-DIST WebOb-1.8.6.tar.gz 274606 BLAKE2B 0419e60faaefd4bb822387bf5624f77765c6ad528da791d54204b528b7c827d0cc506cbe260ccbfc7d23ffef73132254dcf133ffb1e0377d75ee5ae83d4deb84 SHA512 b9a3faac114c55f3e9a6eb71a78dd921d928da99a427dea05bc798bc1fe249f0f1cf8c9b9fcb1b73be2737b9132bbfe2250a8652e3a8a1199ac74fa62a59d44c
 DIST WebOb-1.8.7.tar.gz 278544 BLAKE2B 20d8b00f181f2966b918f106080907746dac33b64e75c31749bd774709ed8aa51024258240b89abddacb041073705410845993f93ecfa4b98a7a0fcb8a14e505 SHA512 ff6a1ce796a59d9c078dc908a0d6307a080230a5c806be2278eebcbb78016bed43067e78e3e4a6d72a5f51184c137e8267ac75cbb92b057db008b51a792ff489
-EBUILD webob-1.8.6.ebuild 705 BLAKE2B c0d81ba813f51df4c25c4cdf9fe8abb6227792c962bf3dfc6391e3ec6d7ccbf0372254687bdf42a5558da75bef9a9b35a598589e3147d518ff7ce2057939b2cd SHA512 0c524e306330707378d8fa0bac5e8bc7da4c3da6d1aef3c75d1bd49f36854c8fb61e6ee8c3b59625b7bd7c9c444f1f716cae19299b7688261f57aa2bd1363acc
-EBUILD webob-1.8.7.ebuild 713 BLAKE2B 6473181fa745e8649218aaba1f08249ac28eb5e2e5b6f3e340e96ce3a0ee3d35afcc16bbc4e9cb110633918c0be4fa0bc3b13ca32a790999da61b8d9f4c4f78f SHA512 773e8528efe94aa72ce11a928e8c809718b57e5f261fd2e081d701b8027177b642efde6acf32286d4a3db38a800d83ac3d7d3b96d2dce2a5f155c513fa387244
+EBUILD webob-1.8.7.ebuild 704 BLAKE2B 0e54632bd804f36d83c3df44f629bc4ab6ad5bceef11284079fda257796d0be1393ffdd372973faad5098b87baa3a1c7610cfea3a34b6a99d898d802c1381106 SHA512 00172e3bd9009f045e35ed0bf42b8d4acc9b2ba8a36ab6324efc6be5a16cc44f4b4c9e5986aa486b66c3791e2b0ecb3d3ca54e55928bf5bc663537fe2f1594aa
 MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.6.ebuild b/dev-python/webob/webob-1.8.6.ebuild
deleted file mode 100644
index d12ed4b17e9f..000000000000
--- a/dev-python/webob/webob-1.8.6.ebuild
+++ /dev/null
@@ -1,29 +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,8,9} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-distutils_enable_sphinx docs 'dev-python/alabaster'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9
-	sed -i -e 's:isAlive:is_alive:' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
index fb23458233c3..bb8093403280 100644
--- a/dev-python/webob/webob-1.8.7.ebuild
+++ b/dev-python/webob/webob-1.8.7.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index c9727a19752d..836ba8c5e495 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,3 +1,5 @@
 DIST python-zeroconf-0.28.8.gh.tar.gz 62107 BLAKE2B 94b910be9f95f8b50bfcd5fca102663713234d40a0cf90c5b94b2ab4e85ffd7363747a0fee2f7a72a3bfb74faa1cab703dfb8bfe3cef80a0495efe2c81d0c2af SHA512 ba599fdd44ecdf3da71ee2a155a47e6cf91c8f4fe3efac428f6e99feda052019423a8a3e775d6cc4624697fbfcbe207829a41ad76105082fe62e81eead2f7a34
+DIST python-zeroconf-0.29.0.gh.tar.gz 62466 BLAKE2B 430a9f4d4460d66166a2484862a8dd3af65f3cfad0e25557648abf26ebe88a7ae581934273db270ff30fa4d714b32a822448b22fd7a95e9e382b68ffae9b66b4 SHA512 a084da17cda264b531e7f58975d30ae0b5adb98f33ca78d1e865e1450dc42ad2bca69bc319c268f7977e70e082ae713142a57f97a9f050486c47b50698002590
 EBUILD zeroconf-0.28.8.ebuild 871 BLAKE2B 772550912df25c87816e8b876f67d30202412eea4cdc90e2d78145ae1f56569f86fc4b6d5b90f2994f843b9ed705eab59f9d0797811fbf522fe46ceaaba4eb59 SHA512 5fd62d1e49db89ad884b0484251e20940685ee1af8c26480caecff6fdf9ec10ad03d67fb92caabfcf6e79214de34b1a4709f318d297f0904823d87973f58aca4
+EBUILD zeroconf-0.29.0.ebuild 1021 BLAKE2B b2af14b40649768c7d1b1964cab62a385b24a30d0dbb1b3e7fdb1ce9ffdcfe1993adb78245d107d1b13f166767b20e8450df518617970789b85c6ffac6c48fb5 SHA512 38e27588b7ef5483b128708db7c086e50e854545f4f4f6c9d26df21751401ab45225a2f348fe90231156de6be5476527cf0e5ea6f17521c28f7b1b225d3e2f7a
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.29.0.ebuild b/dev-python/zeroconf/zeroconf-0.29.0.ebuild
new file mode 100644
index 000000000000..fc762bc9256f
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.29.0.ebuild
@@ -0,0 +1,36 @@
+# 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=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		zeroconf/test.py::Framework::test_launch_and_close
+		zeroconf/test.py::Framework::test_launch_and_close_v4_v6
+		zeroconf/test.py::Framework::test_launch_and_close_v6_only
+		zeroconf/test.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect } zeroconf/test.py
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 2d3b9f0d37ea..accac0bf1125 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,4 +1,6 @@
 AUX 5.1.0-drop-coverage.patch 571 BLAKE2B d5f334b7f5ec5df710174f9a3768c2d7400cefec7c3bb7cb0e4a3fced701b812af738d601ced61df57b78212f1ec621c6a53b906be2bbdf0838c31dc8c6f9e29 SHA512 04b30a85357fd7d0e0a4c52913b0260cc437f7cde2344399d400c2fc0e10cc60261eb4a3201954a515dfd030cfa564c9a222424390af8a3e20349270c89272b6
 DIST zope.interface-5.2.0.tar.gz 227058 BLAKE2B d5afcaf56d77431436bc6f2ccf566e835c0908f7037ecd2a93e2b2681c0588b2baeacb0ec50207e59e67f7c4ac3cc76bca657330b48991f22835637985b85ccd SHA512 64688b8a823d63fc78720ee15d59cc54c07a700dc45e46336cb23cd1a0a3eb998284a4d954d3fa08c7f26b35583c0284fb2fcd18f84f3133ce93f7c3ade0a988
+DIST zope.interface-5.3.0.tar.gz 241964 BLAKE2B 4b1ea32f3f08e2d49afa402358760dd575057bc4487ad52686a2aaceee782501c3c1891dda00cbd306abe35e7bfea4cf41a4a340644258cf478a637abd62c103 SHA512 3544c64d64f32e4635031325b38500b8ed5888b03821c5ff2e07c2d88bb50ccb0b6fe24c6a55813bbe05caf2b847be832182e04dcd8e9ff29f1e68c1fda7c680
 EBUILD zope-interface-5.2.0.ebuild 1318 BLAKE2B 6b0d692fbc220dacfaca3d4026a9e033f8296675e35563c1dfc4544e29051ae617ef6efaad19fa66b7ed2c5eedefd60cc86ead2852bc5f6a17001d93234e5ed2 SHA512 e7c9ce576a3878c1f54217cb7d44a9d186aeb684c758e792e7d996e4752eb3ef0d8f88cf10ed81698addb35f2023846f0ffc933a60d7e214b9ac32bfe644b7a5
+EBUILD zope-interface-5.3.0.ebuild 1326 BLAKE2B d2c531d58817fb1e7f869ce6fe27725088f768e90a0ec6193dbd76b405322b8422d124f941ac1ff7bc3e9824b9cd8342115ad85f211beae82dff593280bae791 SHA512 d829c0faf1292ab1754ced10ad3a14b16a51ccdae3e57b3ea475f502f698a3cd027a265184251dd03d14f3ff7214ee4705a6b1fc38e53ec1c25ca907f158de0e
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-5.3.0.ebuild b/dev-python/zope-interface/zope-interface-5.3.0.ebuild
new file mode 100644
index 000000000000..7c0a39bc13a3
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-5.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources namespace
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/namespace-zope[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# remove .pth files since dev-python/namespace-zope handles the ns
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index abf223db65ea..7ceab0dc135b 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -4,6 +4,6 @@ DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153
 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 782 BLAKE2B 77cee07bc39839f2ac0b4f30921f67bf86be7e54290430fa17e395d0f867298e2f28ad7ba2af91e07d98130aababc8400a7a63c1cbf80145a69056ef6380a2e1 SHA512 370197c9bbdaea367cf9a85e437ebc859b171387432747bf6c5f61ec8b9f3d821a5b3fa2de80b5dfdcb1ae1b3b1caa29c10ff833b52431d57f9c43d1e76d9aaf
+EBUILD zstandard-0.15.0.ebuild 781 BLAKE2B 01650a79c56c0cd1893ddfdb7d31200e00a2375d9ca73abc0ef3b7bf1816f08d609f2e5d9ad570b6e0be0ec324f2c1969d14acfc480937fcfe5efbc37f6fb058 SHA512 86f98967863cb26f2f9b3e14fd91f669cf72e057978938d6dde5bf9253df923b9ab2dd677995afcedc2a83d3dac7dd50786ffcc6d1cc7c0db3e791ad61da3c3b
 EBUILD zstandard-0.15.2-r1.ebuild 1177 BLAKE2B e2089e7c8719fb8d24fc6464cd7b44a13e3e87c454d0e75184185e0463ba9db4a50fa54e207e026507f0137d53e84908081acd85e787f6a66013dfa523e04c2a SHA512 b0d3b7d18a845f97c3e754496b86169fee89dbda298d71efd194df438509e0cadedd9f84fcb0811ece8a9193689d9541a172d91f477f947cb49ca9a840e5d19c
 MISC metadata.xml 377 BLAKE2B c14803b618b3badd945f8b01ca90ed6f809d9d2648ccb59554f947fbf5910e613f741f83cc020b70831ebf70b579a0e1ed33d3f5f72b858ff280082938516196 SHA512 fec606ee1d05384ce4433e90433e54925443afae244ced5276787a6f416a96017dbfd03dd9ec15c2526a943ff6348827e13719152478fb2cf609017cf8359a45
diff --git a/dev-python/zstandard/zstandard-0.15.0.ebuild b/dev-python/zstandard/zstandard-0.15.0.ebuild
index a61f946bc5ba..955ca36188e1 100644
--- a/dev-python/zstandard/zstandard-0.15.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.0.ebuild
@@ -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"
 
 RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
commit	8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree	4d26462d027b14926335894749d2e01d982234d0 /dev-python
parent	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)