gentoo resync : 24.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-24 14:47:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-24 14:47:38 +0100
commit: b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (patch)
tree: 911928b566777494d08ebe2c16cb64f15af71901 /dev-python
parent: 61f10f985e19dfe20a4d9552902625edd5b6eabb (diff)
311 files changed, 3152 insertions, 2176 deletions
diff --git a/dev-python/Faker/Faker-8.8.2.ebuild b/dev-python/Faker/Faker-8.8.2.ebuild
new file mode 100644
index 000000000000..53094317ba83
--- /dev/null
+++ b/dev-python/Faker/Faker-8.8.2.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_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		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 6a4b450a60c7..a45736183c08 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -3,9 +3,11 @@ DIST Faker-8.6.0.tar.gz 1147647 BLAKE2B 6d3903ec2d75bae963879485572f7781455ff241
 DIST Faker-8.7.0.tar.gz 1147940 BLAKE2B 9f0548472aa3ac092c2cf63da73fc456207da9ff4e405373ff7d2c8e02afff75912e1c3ac03a1d87981d66dfdb7ca611ae9ab2c8638c610032486e09ea37930f SHA512 cd75674aa959854701d2ba47f5f0638be730dbe1e4e6a6f9d551b100a65b8fc53cd9a5b1568a473bcf7c8044d2a3bd4ce7b621c8e7bc0bf002a5eb5afa5a6b96
 DIST Faker-8.8.0.tar.gz 1148063 BLAKE2B e774e208438f7f31331c8c18bee2e7f27c2bb4e8f280bbdbd87e9de6484f5db9b38cfa01932efbbfdc82fc0bd3a8f05a9ade0324578deec750bb576b21f9ba7d SHA512 fc389638be46e109df208e8a6109e2236acfda136ccb7b02df9b4ef793310f63d9317f12b84811290851517afb557a130a4ed370176ef19e76d1e83b06959381
 DIST Faker-8.8.1.tar.gz 1148431 BLAKE2B afb6fe9c3c93e909c26e734558d95186d3dff19efceee3a2bd7bb2158dfac34fc74c959ad163eb8e08f374d47c84bb454ffe45efa30b4b62e9d9e478ac784025 SHA512 46b1d04c40d93b8688421eb3dcfe6f718f61225d6e30846c9d6578c12451a2a1634a36bd084078e992174c9c017865b5acbbbda49d311b67f921ade14a72475f
+DIST Faker-8.8.2.tar.gz 1148529 BLAKE2B 279984479ad4f790dc7acd74b5ccd1cf5f32689b8b1ccf2152d7dfaa6fc7b4699d9827c16f83bb86e298723b6906a5cc40c2fa7f75439b5af5fc78c1af99a3f6 SHA512 4273008bf9ab693a40da2f93ff1fe40e9e7b102a2d5439f09096b6754b82dc26310666da65723b363f628365c97d44dd290e1e7065b7a9d862130baa292325b7
 EBUILD Faker-8.5.1.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.6.0.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.7.0.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.8.0.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 EBUILD Faker-8.8.1.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
+EBUILD Faker-8.8.2.ebuild 721 BLAKE2B 3b750bb0006162a841d700bfdb69f3f73cfda16d476043706dc2126e18eaf044285f1c083fb0f03da88c8ec6a3d9fa46ee4993adf1239f237cc5c43e7feac376 SHA512 95b831595ece05fdf82647aac10a4b59f212589d17dbba04fa432f2a7cbc04e0f05fcffd9be8129bf1799830e39130d556232e1cbdc04a028a483c16bb570c53
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
index dae8fce9e4a9..bae94c0b169b 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -14,10 +14,19 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 "
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# This test needs porting to newer numpy
+	sed -i -e 's/test_resample_factor/_&/' \
+		gridData/tests/test_grid.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 2023b2f0e34c..2f954634c5ab 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,3 +1,3 @@
 DIST GridDataFormats-0.5.0.tar.gz 1982315 BLAKE2B b230fd2843ab6a5826ee425fb3fad9a0d5d75a292aa3b6b150e76fa515b68000efb8e1b4140619c0c489f34ac7e3ce6d979e97526c212caf3e808be07b33afcd SHA512 9cae1fe0f4f27bd966c1563831f8a9257ecbe14a7a6f011753355070449515b9b0ad1f31867c2c199c9703aebd5a3b40a03c1276f3bb6ff51447f7a870fdefe8
-EBUILD GridDataFormats-0.5.0.ebuild 613 BLAKE2B ecd6689ff3f54ff91d1ec5f3afb625c4d4ca634e0e1894783bbbaf527bc22997c83b570e437d050005a9783b5bb5aeb8974f1f6de8f7236ff642967522d3c48d SHA512 360e420f28408a6079ac4a1a8a015c492e2be6ce47c934b3fff22d7467caf5d18e34d2641deb3a9497326ed6e163323e90892637c122288fd311326d7d5fd5b9
+EBUILD GridDataFormats-0.5.0.ebuild 802 BLAKE2B da7d7d3ff639b359bd14787069c167e225a02ffe40e73eb8def5defcca0ee2b169c8943849a43bf57b1b8f719dcede578fb068a83cb29279ceea85b6da144543 SHA512 526ce0f425ca76edb681c804a14cfb44257fa3c0f9a769bbd83beb7bd11fcda18cfa978ca0f907622dc716b34574aadff9882dda3b26494f2191736a4bf640e4
 MISC metadata.xml 506 BLAKE2B 55c662f902e8cb3b70a60da0eb8925e36c762b1fca2987445ec0535c2176c2dbff03fc4eda6f742d94adb40f08d96bbfd24b2d62e2eb148c13a4c9175225f06f SHA512 b5dcea13ad76570e3fd89f7771b42b380fc66954a1a0849240b353382c9eb333df7a48ccee1514b0f32c80e458d6242a9c50c9630aa004f0c000a48400550bb9
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 15621a23aa4b..cbf9a1edf5b1 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index ecd1805e9047..39251018df21 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt-builder-1.10.1.tar.gz 5725429 BLAKE2B e7aaa0a3c1eb8aeea0aa5f2d5d7beda1edc46e90c0a21b608d2dffe205a67170daaa6615253706b5f9856a27d66715692ceffe81b9b45eafd4d608df79741d6f SHA512 2e48c1066bb12c1f50700933b0f489158f29f62a1239b570dc053cb042eca9bd4ee83f66b855b0596cfb6dc2e844434c15563abbb3846bf5960d03441f497b83
-EBUILD PyQt-builder-1.10.1.ebuild 697 BLAKE2B 051cc303748b9ac79b2beade93c91cf3dfccde5c859d1d3f9f92a4c5d7c06bc37b92cf4080fb46d0611fcc6f199b74808797fec220f9a4dacb53e7b161618cfe SHA512 e88d0310d1ab22d1cc47fc0c4d246ed53fa0a92f678c9e34e0254f46eec075f58a9ad51ed032a93fef89473bca2b8cb1f81c7c795b9a47884b8cdb5be4d23ca1
+EBUILD PyQt-builder-1.10.1-r1.ebuild 946 BLAKE2B bc1cf71df7e275343282ac06e499ee38115689322adc45dc207bd857c39f180943aae8ceffeae8c81138bfc6b0edb3c1a3f9c189f4287cfe911762f7bb2d47b8 SHA512 6ea580d1b7b7304e4d948b500a9d4af3f2b35be743e723cac25dbd97883fc94259074561781b69d3e99e305fdbcfe7350f0825eec178b1a2f647371a68197f89
 MISC metadata.xml 665 BLAKE2B 156bcbd9a31940a4074d395521e71452f45fc725c88825e412a73751bb869621ba3ac8fa8a96cd269130468ca28d7fbf04525b6a2caf9b871f426040e6d6c9d1 SHA512 56505229aa14dd577033cd534a837fcc3584cb4d1b482e59d65ee439b49a42cd21e3ae1ca7a02227e6183e265506910e7993d52a8c4ec9e17e44273204aedfc6
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..2ab937144848
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+	# don't install prebuilt Windows DLLs
+	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+	rm -r "${PN/-/_}.egg-info" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
deleted file mode 100644
index c7f4ec9ff355..000000000000
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/ https://www.riverbankcomputing.com/static/Docs/PyQt-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-RDEPEND="dev-python/sip[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 396791c5f1b4..f103231513bb 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121 SHA512 ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD PyQt5-sip-12.9.0.ebuild 626 BLAKE2B 3f15fd0c8b647d833e392582b5497db924d3a2fe79c85f68b1982bf8235d19602b669e42c6462ea3cb0193b212cf7b0fcccbcabfb1a7bba5714165339c9b15c3 SHA512 085f88f72e8dc25911f88032b6e3120806c389515e8b2c151fb1a447a63d72b89b1ea38da41175133986c85bf7f833f492c2859bc3f0b6cbdd7c55bbc9a98ee3
+EBUILD PyQt5-sip-12.9.0.ebuild 626 BLAKE2B 2ab1323935acf4aef2ed8a323ea37d6b1cbabdd6bc51fc4f5cad2463e1fd23d4d52cc7978191d2e7947496b7dc3fc38eb39e08803e5822851c9d079e3073e5bb SHA512 2193afd19e05f57fbeb92d591bd1a8a78391747cea55628e71222d08a9bf17fdc50cc642080c7af8547cc5475a623465baddfd71a5427c1caf3f2772dede6a64
 EBUILD PyQt5-sip-4.19.25.ebuild 2048 BLAKE2B 0ea21df4d969c0f922de85e9aebf89d1037301b7b420a742dae29063391be0bbc264e88a2673e2046dced52def880b84c0b7af546f8bef6c2f85f2aca8cba1f3 SHA512 30cd6bbf428e0749b4fb34f7ec33c95d54d305821db022a30a8cfedea49badd83f7c8bb6b3d616ad2b499ff8c3d82728098ddface1d45be8144a75f67b2d4a4d
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index c7239b0887e3..7b6eacca3cc8 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -17,6 +17,6 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="0/$(ver_cut 1)"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
new file mode 100644
index 000000000000..9306ac7bb915
--- /dev/null
+++ b/dev-python/adblock/Manifest
@@ -0,0 +1,68 @@
+DIST adblock-0.3.10.crate 7678458 BLAKE2B f15dfe6ecaf1146ab0058afae6bcdc179a9c870c0bb00ea0061ac7726a77c89a44ccabb50eb29a77dcd72eeae6533e505ad34e0d9a75cc4bf9fa3d304e16a1a8 SHA512 fea38d9204d2ac7f8a289d3affad18bf814e9054c2955f8e259454913371d30751c6a090a0a09b844bda46083815c8a9a4326c8f9fa210ce71b5f9adef7b338a
+DIST adblock-0.4.4.tar.gz 22207 BLAKE2B 8337b41627af07a83586c174c0ac446dc43d8a3031d7cc758dbd987685218983f355155b812c746f3b736a31fd5ab835ab59c37234bf04dad1ab2d3c48b13b2e SHA512 19d24fe79d798825bbe00efc552d7c7357073791e3b4cb591aa040bb44543a9fba3c872cbd5e77e1d7a07e459e2d3c33605cc0fe47466ba210b18dc0aafef395
+DIST addr-0.11.8.crate 89500 BLAKE2B 365d96ae27f6e62e09c23362d667d7818b62e2c878ee6e4cde59016e19ee31ba320dca289c02aa0d542e0aab3e828c18d5e78c7f2c9b101ff86a8c370f91e5da SHA512 4ed5cfdd88e9a31b64a950824e2ebcbec8ad33612fbc815e9eb5225af38bd8dd4250b506fd089e8d32cd6e6003b60172b2c06e20228b993d0d11856fa4340fb5
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
+DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
+DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990df8e0f17ffdfc865a1662991a80680c484ddef505758578177d358c2e56003003a2cb685f07a41d6a9feb SHA512 4258fdfab59946a4955f053cf0b73f964d5bdf25ac9357ef8f4cb21948299fb749bf0c0e89a9c1e95a8606e74c6b3a3630fb4f6316815d83882a9531e3b78b5a
+DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
+DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
+DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
+DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
+DIST inventory-0.1.10.crate 11572 BLAKE2B 8b5044c9996fd53f726652617ad7f25e3c57e5c54aac12edf0c2b41ec7d4d9388e37d8613a7e39301130d9ce4f3412b48380fa9e04bba8229d5ed2ce383a8879 SHA512 5c5f34ab3ef5b89b27a353ac5c570b9f2970288f10ae3dcaf7356ef48affcba8ae7d17406206c88e319a95f133ae69a33d43b219814b682df34219bd0cfd5eae
+DIST inventory-impl-0.1.10.crate 6228 BLAKE2B 4aa7cddfc306e192ca635e5d32fa9cc61d59824f24bbc67ad6b6996578ca0fecf8e7d04e970720b9261eaef2977dd0773ac1eed35ddffe6c075a6d92007fc276 SHA512 860cb40c77d269b8f8c71db96ee71917a33f8d9b7ed5f24e06e38d0adc5e93dad73ee6688627798cabc7536c42c519788d74ee3bc8abb13b754f7e70be663a32
+DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
+DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
+DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
+DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
+DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
+DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
+DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
+DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
+DIST psl-2.0.18.crate 182781 BLAKE2B 514b0a0b14ed8c342f7424b63fe10d7b0cd6fa0636b2954f898f1c915633b813d509c2e9ceb6dc7e5148787d7497dca6ed877f3b981ada35967b9abca5e3461b SHA512 b3c621f9aa823f3b5b7b4927a834f1b35093797c973d1a6eca1b1d9fa4bcd5b16885687d20f924a4c538f6681ba6c03d2461d47b77849b05fbb69e19e8b46865
+DIST psl-types-2.0.7.crate 3423 BLAKE2B 2e5cf2d7bf395ca990390c3d35cd15596240e6850732657324dfcbb1518502f6cd168bf76138103d861ccd79f2766fd65883980c0958e186e7d0e1e7fff3671b SHA512 ce10e5afff09996c29a8ced4be2e2c30bf549390c578fd9112490485710e1c406d84165394cf4ef2e412923db88dc5c08111b91e72b813fca757e7e43c6adcc3
+DIST pyo3-0.13.2.crate 281372 BLAKE2B 22ffcd9fa239efc205e5efcefb6ffbe99a979209aca357174e461826ae8edc1824da820df04bd8af4d07afd550b6a03fce75bc24e83970e7d2ec8cdc0aa17dca SHA512 3d4198a60e9c3abc619e5cac7198288bde294a789b6f84ec87a411d5eaad93d5d55043e8ec218cb0aa09a7289be7fd5bfa0b74be188e2b67c6c646cc2aec66d3
+DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f10266ede0f2d893e4bf0fa574563933f3540f93eabfa31ff2a73970e1a86d0ec1103ce7c0dc565670ad16bd99d10986 SHA512 3847c60f9e3f7150f46e68164fd35582994597eefcc70542ecf95afc7411785cea5b0eedd978b1c4baf2067ff8f2cdd93778affc82e11dcb264c09ba6ea0d788
+DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
+DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
+DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
+DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST rmp-0.8.10.crate 23541 BLAKE2B f51f12ac191a8cbb4377956bb15d774e464b94fde7abc3f008fd2b6be10ad027ef3a95e854c6461e393b3e1b4c42e43b3a594e9d05283782af8e0893c1d4d629 SHA512 54739648c57e5fd917c60e1f692f5a0e357a95e9b7b1cab08af99f5ac1000b53427a646b6ef019f1e3cbb3861218acf0e8e300133ede4426107045a0abacd87a
+DIST rmp-serde-0.13.7.crate 16676 BLAKE2B d30ee72fa0a1b897c4866ab53e39d673bed1828ca6b09ac9511b8cb34a1092ffcb8b5c34f2e97cbf3ef44b5ccf99a2b68c4e8a202066380fcbe114fc8286df25 SHA512 e2659afd22446e26190008bca8cbf147e09eaeacd0518d81fd26c12e26d9fc06b48844719827cc392a882bb927d62e1d7d946a0426f81eac36cc882d8b0c2d28
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST seahash-3.0.7.crate 28697 BLAKE2B 59d83fd8f83e3c369bc5532e55dd35c93d867fe41e2b0dab6b1aafb46be5c605b1f531127cb766959c9f1b24d138201471e7bc071ea5c14db3d3bdef05e6b1c5 SHA512 03e78c8669c2a20c223772f63df943b173598d8f4714a7bc399c97bd3ec091eda1b5f12dd11f821f45e5178927a4f7621911dc228f5ab5f52f28f9eed12d13c0
+DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
+DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
+DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
+DIST syn-1.0.69.crate 231954 BLAKE2B 1dde7e78cdbf5c5b93d0196e008dd4e92e4367f8e88395d6157b92a58cd9317dbb6e47caf2d570a5a9fb6b4fdd4fdea5e414eb9b04e054ec4e4dde8bb9f36a96 SHA512 6934423e48f8d6b1e403fe5e4bb2e180f472f125f4337b7d9889788c16cf11d79d1673ed06178604279e0b8a04bd80f7efba187cc8fa44c535457eb1b4f51c20
+DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST twoway-0.2.1.crate 30486 BLAKE2B c310409093241ac85e94850483074e54001bef5a091dba08c993e579668fc8e9b42585949fb64dda4269973f31c58e33925c650a5d9f08f944bdce1a9b460c9e SHA512 feb79492b6ff96488da2ef9f10320560b1cfcd0bed5a9f5fdc587e671e94618c81992a824a07f28383a7da25a906f6151efa4b41de38e4afd3b454a790544b2f
+DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5
+DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
+DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
+DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD adblock-0.4.4.ebuild 2226 BLAKE2B 6a2acd3a1a33c0ddee363d982d4b99566e555d6f699c573d52feab38f681f48e04c4065f48638c90c5ce15da629cec77a5c4284e939db25e91416d526f61250a SHA512 c95ef87d201e3cf5649dbac9ee55616bdfa6c3cf41811c9b0a0d75e5e1f58971a05ff97fd494a8778f774521ac1e983cc34119f9af4f41d124eed636a820b4cd
+MISC metadata.xml 247 BLAKE2B 25c731c759786cef3c3ffdb2513becb723ad51c2e3902853311cf3845ab1e9c193672430b2ba6510df55ff43039f593a6f73bc8e057ac6237462b814beb69d37 SHA512 4926bbe8526eca3acea716f8f865c02398b29f7b0481eb07cc9c92f17974a44b038db4489bdd5ea9fc8b73e6e7212bd6dd0948727f8290b5002014291e748de8
diff --git a/dev-python/adblock/adblock-0.4.4.ebuild b/dev-python/adblock/adblock-0.4.4.ebuild
new file mode 100644
index 000000000000..0d8540825fd7
--- /dev/null
+++ b/dev-python/adblock/adblock-0.4.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adblock-0.3.10
+addr-0.11.8
+adler-1.0.2
+aho-corasick-0.7.15
+autocfg-1.0.1
+base64-0.13.0
+bitflags-1.2.1
+byteorder-1.4.3
+cfg-if-1.0.0
+crc32fast-1.2.1
+ctor-0.1.20
+either-1.6.1
+flate2-1.0.20
+form_urlencoded-1.0.1
+ghost-0.1.2
+idna-0.2.2
+indoc-0.3.6
+indoc-impl-0.3.6
+instant-0.1.9
+inventory-0.1.10
+inventory-impl-0.1.10
+itertools-0.9.0
+libc-0.2.93
+lock_api-0.4.3
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.4
+num-traits-0.2.14
+once_cell-1.7.2
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+paste-0.1.18
+paste-impl-0.1.18
+percent-encoding-2.1.0
+proc-macro-hack-0.5.19
+proc-macro2-1.0.26
+psl-2.0.18
+psl-types-2.0.7
+pyo3-0.13.2
+pyo3-macros-0.13.2
+pyo3-macros-backend-0.13.2
+quote-1.0.9
+redox_syscall-0.2.5
+regex-1.4.5
+regex-syntax-0.6.23
+rmp-0.8.10
+rmp-serde-0.13.7
+scopeguard-1.1.0
+seahash-3.0.7
+serde-1.0.125
+serde_derive-1.0.125
+smallvec-1.6.1
+syn-1.0.69
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+twoway-0.2.1
+unchecked-index-0.2.2
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-xid-0.2.1
+unindent-0.1.7
+url-2.2.1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cargo python-r1
+
+DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
+HOMEPAGE="https://github.com/ArniDagur/python-adblock"
+SRC_URI="https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-util/maturin
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+QA_FLAGS_IGNORED="usr/lib.*/libadblock.so"
+QA_SONAME="${QA_FLAGS_IGNORED}"
+
+src_compile() {
+	maturin build $(usex debug "" --release) || die
+	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule adblock
+	dolib.so target/release/libadblock.so
+	dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+	python_foreach_impl epytest
+}
diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
new file mode 100644
index 000000000000..90af0369c665
--- /dev/null
+++ b/dev-python/adblock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/agate-dbf/Manifest b/dev-python/agate-dbf/Manifest
index 376ab3960726..3ff8613bbe1f 100644
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@@ -1,3 +1,6 @@
 DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02af55da2b9d94e9d535f557c4193129dcb8ce3f91d93cbc6e19196705009574e3b9e5073f9934d00636bb4b2abd SHA512 3e99404dfcd521010bc3eb5899871dfc63581e03604f80b0a42d4db48f486137fd48685024decd380d346ac5c2089a0d19dd9229893e8d5337b9bd9d7b4eb3b6
-EBUILD agate-dbf-0.2.2.ebuild 555 BLAKE2B ac80cdb6f1b9970be9e22966f1b314ab0cfd02d77fad96c5be6ab04421c333e016365df4f12d2cc9b5d6ef1e7b4364ea57cd99b080dd1eb842c4f59d9bc006ed SHA512 cb39a873ff3ed0e1363e0b4e0913a00a08747a83ddca117b42439fefc717f51a429402ad75c83c3dad6e0fa63c8cbab233139f75990d7fabeba576cc8ee409cc
+DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
+DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
+DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
+EBUILD agate-dbf-0.2.2.ebuild 1581 BLAKE2B 1334d55687a380582f2898b2014ae51365ddb04fd2d51a54e8e36049fc781430d4a550bf47966c30d72a1a8b88f31463aa12a331c87811be08d8cac838384eb9 SHA512 d408a9f5378260fec7b2ed9ee374e1901fc2e2e0092f09d98ebbac978f092f2eb8bed02e5971c1dccaa14d5a80ee1cea5041a16d8ee70386cb4225085f27bb8d
 MISC metadata.xml 512 BLAKE2B ec17367c2f3f9e56074f83615fd39f5edb146abe932307a4c775456e711d784c0a4636bf6dc8859c62b37cc4132735a728296211c95ebcc3b8f55ae74d10d45a SHA512 e830ccb01745a1d493655184bf1a899bfbd4bccde225fc7fcefe6b3979d28a80adb93783cb0fbb5844de04f31895ecbbc8790e13ea6485f0eb388576f9ff7c33
diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
index 40f14f916124..772d11bd4f56 100644
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
@@ -13,10 +13,45 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=""
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
 
+# Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
-	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
 	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+AGATE_DBF_TEST_FILES=(
+	examples/test.dbf
+	examples/testdbf_converted.csv
+	tests/test_table.py
+)
+SRC_URI+=" test? ( "
+for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
+	SRC_URI+=" https://raw.githubusercontent.com/wireservice/agate-dbf/${PV}/${extra_file} -> ${P}_${extra_file//\//%2F}"
+done
+SRC_URI+=" )"
+
+agate-dbf_src_prepare() {
+	local extra_file
+	if use test; then
+		for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
+			mkdir -p "${extra_file%/*}" || die
+			cp "${DISTDIR}/${P}_${extra_file//\//%2F}" "${extra_file}" || die
+			[[${extra_file} == *.py ]] && { true >> "${extra_file%/*}/__init__.py" || die; }
+		done
+	fi
+}
+
+src_prepare() {
+	agate-dbf_src_prepare
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/agate-excel/Manifest b/dev-python/agate-excel/Manifest
index 2f35e45e30f9..84ef1f0d9ed5 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,3 +1,3 @@
 DIST agate-excel-0.2.3.tar.gz 153880 BLAKE2B f090c8bbb75341623545781cbf116b547ebc16249eb0c6814e9fbd51d2688fd2bd0354d187d2f803bde69e563b57836e3d214e287ae62455c59075020588d235 SHA512 3a50bab182391bdadb2e0a82dc28a3cfa1eebbe67744835ab20581a67f7f08f4edb96eebc9a286ac4a6a302996571563ca9e487ea7defdcf07265e9c42436ddf
-EBUILD agate-excel-0.2.3.ebuild 636 BLAKE2B a89276069166a3695f10338c3479916460faea3d0272d66d21b4943ed219d038bec3e6b8e9a2ba6c2b44ec0c111d3d1e4cbaaec2a1f7e70749b713bfa9940e9e SHA512 d5b19348b871bceff28a17fb27601b168d1400be7072ff30280f9b737b952995bb2ce5d5c59488fc674e52883e208865b6abb55b43f7589c8c48b1ef7e2c4e5b
+EBUILD agate-excel-0.2.3.ebuild 1221 BLAKE2B 3d27b1d2f248306abd7742204e1736ab1f93e3b6235e811dcfae2e37c74809b15f8f19c40e8f625acecfe8998915eaf8d91dc1d9d872539cf4e58af8ba122dcf SHA512 a7e81b85932f0e7b95c5c68f9f2ae513defe74830d9e237bab2c639fb5c9244c74a3be5563ff6f2372d9a697fb560cd2638571890bc3833c94e43d2d9bdcf98b
 MISC metadata.xml 520 BLAKE2B 76548784a8782afa93d38311da98f13f33ac7291f88699dd6c9b2430081803e6a9fbd9d378f060dc641ff6ebc5cea664f60b09d7cc1e58bdb50a2a94bd277843 SHA512 de75458d4d3976f6c54ff41ff14d98b34cee9a2dc3e8830f76362c5c024f8849b8cd27a4999bb9e0cd8adb3e7bf89ace54d5f5eadaeb7975e4145389d635f1ad
diff --git a/dev-python/agate-excel/agate-excel-0.2.3.ebuild b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
index 224da100426a..0774e1cfcadd 100644
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
@@ -15,10 +15,33 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND=""
-RESTRICT="test"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
 
+# Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
-	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/agate-sql/Manifest b/dev-python/agate-sql/Manifest
new file mode 100644
index 000000000000..8b7138cfc420
--- /dev/null
+++ b/dev-python/agate-sql/Manifest
@@ -0,0 +1,3 @@
+DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
+EBUILD agate-sql-0.5.6.ebuild 1477 BLAKE2B f5a946abb127d8ce24ccd77fc573e6440df8b3c0d1317834e0128d9a8057e1b83f0e054aeb16f2e968c869fd2226d7e5bb1ba1a825d7f91df9dfabb01b80a7f0 SHA512 5e10af0fe07be21b99050734f01e562e0ac2b6fa7d7439eb81e883a601774756fdd32ec244ffdeb2a4ad084c361a0cb8689cdf7ff3f567a33ef5a816db1d02d5
+MISC metadata.xml 512 BLAKE2B 0709aed8b06df8981ad0b0c2733a1acde06a0753701b6b35ad9662e5c66871529b968a71d39265d0fd72aec90f09f7166848e1155d240815041bff498d4be06a SHA512 f09f6203a8f90abb3646be9e8d2abb4d8b367a857f384a7c43d43862953c99111e05707eb4890a6a3abcfd33aa8717bc65b180771c0cc97e5ff1ed762978f95f
diff --git a/dev-python/agate-sql/agate-sql-0.5.6.ebuild b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
new file mode 100644
index 000000000000..9dbdd4b64698
--- /dev/null
+++ b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local sed_args=(
+		-e "/crate/d"
+		-e "/nose/d"
+		-e "/geojson/d"
+		-e "/Sphinx/d"
+		-e "/sphinx_rtd_theme/d"
+	)
+
+	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/agate-sql/metadata.xml b/dev-python/agate-sql/metadata.xml
new file mode 100644
index 000000000000..a42278954df3
--- /dev/null
+++ b/dev-python/agate-sql/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/wireservice/agate-sql/issues</bugs-to>
+		<changelog>https://github.com/wireservice/agate-sql/blob/master/CHANGELOG.rst</changelog>
+		<remote-id type="pypi">agate-sql</remote-id>
+		<remote-id type="github">wireservice/agate-sql</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index c16949769555..2749f7ae899b 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,3 +1,3 @@
-DIST agate-1.6.1.tar.gz 137280 BLAKE2B cc022eb05865af0c3f2602d0e5da19a7cbc1516ffbac3900e8cf5c414ff9237151911036170632bfddc4ebe1d40192a3efc0fa73f5ec25a996345919165729ec SHA512 03cbd569a8cff8352ea7fc7469508f5aa5fd6e99381088b53711cc688f8fe9c19c50265852d2e1f9b92852509dbab9630359b72b504a46c9f0aaa37b14027ab9
-EBUILD agate-1.6.1.ebuild 804 BLAKE2B d7be04cb5ba8a9126fe82213506856451bacf602ce697f7e1a26908a042c51203674871665b8a894fe1346dcdb07d112caf21750573c5bb2b1475f56f69d84af SHA512 26fd92dab92931aa291a8009dd6b8c180f6c08b933e1b45a213c032b40c6b975f5e22caa1a6bf37be285b65516e94881bc5bad3f78019d00f16c21eaf17b564b
+DIST agate-1.6.2.tar.gz 191216 BLAKE2B 63e89f6815a36dea956e8a919aeb926291eaf1f4d5eaac7f96dab97c6958dfee4788e18a4c1325a5b8cebf15df27b32e75409ddeab1289c1e8e548088fdc0ea7 SHA512 34d9e45d162bce69d28ad0ec07f5b410b2cdac831e5bd986ca8cb8902fd0ca1ec67663b2f956f42acaf18b8ca0fa169d5236aa4cee7457765e4e86d837e7794e
+EBUILD agate-1.6.2-r1.ebuild 2753 BLAKE2B 4c80f6ab093d11f85d96215ee86d929fc788ad7714e61632886f1806bd8909c677e5e65887919ab6514c88d08f6697fd37c0d657876e000f86a56c9b13db3fc3 SHA512 7b2bffbdf6dba030b97a6213e7d47c43a24e0f02d25b3420b313a5bd73d465a74c532680ffc8ec1a5d4cade29c6de6a299df251c4ca8fc3764c24eb129dc61ec
 MISC metadata.xml 485 BLAKE2B 32cfa1d6bc9582bfe411d79e541837d48019eb8a3bcb956634f3a72f5c41ec30568cab69348e5c7419210b77263a93dd042bb88a1376706888a0e13b2553f456 SHA512 30edf8ea75b16bd491372ca7d72b953fb9d3d27c88b10829b7d90108e952fb3a8489541958621a34d288d9dfb5378063fe6973a15d71700bc1745d20093f7b87
diff --git a/dev-python/agate/agate-1.6.1.ebuild b/dev-python/agate/agate-1.6.1.ebuild
deleted file mode 100644
index de2cbc49e122..000000000000
--- a/dev-python/agate/agate-1.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
-HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/leather-0.3.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/agate/agate-1.6.2-r1.ebuild b/dev-python/agate/agate-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..7a908b2f5484
--- /dev/null
+++ b/dev-python/agate/agate-1.6.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
+LEATHER_VERSION_DEP=">=dev-python/leather-0.3.3-r2"
+TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+# @FUNCTION: pytest-expect-to-deselect
+# @USAGE: readarray -t pytest_args < <(pytest-expect-to-deselect <<<PYTEST_EXPECT_CONTENT)
+# @DESCRIPTION:
+# Read a pytest-expect pytest --xfail-file file from stdin and write
+# equivalent pytest --deselect arguments to stdout for consumption by
+# readarray -t. The generated pytest --deselect arguments are appropriate
+# for use as described here:
+# https://dev.gentoo.org/~mgorny/python-guide/pytest.html#skipping-tests-based-on-paths-names
+pytest-expect-to-deselect() {
+	while read -r; do
+		[[ ${REPLY} =~ ^[u]?\'([^\']*) ]] || continue
+		printf -- '%s\n' --deselect "${BASH_REMATCH[1]}" || return
+	done
+}
+
+python_test() {
+	# test_cast_format_locale fails with "locale.Error: unsupported locale setting"
+	# which appears to be triggered by these locale settings in the unit tests:
+	#
+	#   agate-1.6.2/tests/test_data_types.py:257:    def test_cast_format_locale(self):
+	#   agate-1.6.2/tests/test_data_types.py-258-        date_type = Date(date_format='%d-%b-%Y', locale='de_DE')
+	#   agate-1.6.2/tests/test_data_types.py:381:    def test_cast_format_locale(self):
+	#   agate-1.6.2/tests/test_data_types.py-382-        date_type = DateTime(datetime_format='%Y-%m-%d %I:%M %p', locale='ko_KR')
+
+	local -a pytest_args
+	readarray -t pytest_args < <(pytest-expect-to-deselect <<<"
+pytest-expect file v1
+(3, 8, 10, 'final', 0)
+u'tests/test_data_types.py::TestDate::test_cast_format_locale': FAIL
+u'tests/test_data_types.py::TestDateTime::test_cast_format_locale': FAIL
+")
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 4548d6fa86a3..84a0fd772566 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,5 +1,3 @@
-DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
 DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
-EBUILD aiodns-2.0.0-r1.ebuild 831 BLAKE2B 6b7422cd8ee8dcc3df52174ac4f52e063555532f0ffeff3d80f0a839b7889100d4bd2f03cc9efd8b23148e8d7bb6a5ebc5c8939528e2a88e0171d69e15600381 SHA512 bfcacc10463026e52465f78689049d78699697cdd8f4738109f2a096a62b89313c6fdb3fb7e992603522679f33c738e704813cd99ea69e4c1ba9afc1dc7b8df5
-EBUILD aiodns-3.0.0.ebuild 611 BLAKE2B 25a4eda7ae668df1222686959583a252eb879837de0b59d0d6cb2cd275ffda6ae49c8f21e1c4f693e53d8610984a687b9e59f1cbfab1422a2475484e4e13e472 SHA512 3e11226b09fc6e6008f8e38956b8c774cb57359f5d927e3bd5dbb6f09bf497f761af0632c2b46325fa71d29dff1243f8f1a37a29eaedd665e5670ac5a047d523
+EBUILD aiodns-3.0.0.ebuild 610 BLAKE2B 781e29313aaf735487da828ceb6abf3cebc5593285049d1f278f464451a3f9fe914f1dd467ef8819ea8619499b530ceedd5eabf9a83af4221f05f78acba66d13 SHA512 c1baf4dd27ef0f09542efa459683510b80cbe104b8c269382697aa2caaf914bc5780ccf8f7f840b917d412fd8941e5e98b69afe8f3756628d73a15425e05b4df
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-2.0.0-r1.ebuild b/dev-python/aiodns/aiodns-2.0.0-r1.ebuild
deleted file mode 100644
index a37c4e402e81..000000000000
--- a/dev-python/aiodns/aiodns-2.0.0-r1.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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple DNS resolver for asyncio"
-HOMEPAGE="https://github.com/saghul/aiodns/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	#692720 apply https://github.com/saghul/aiodns/pull/73
-	sed -e 's|typing; python_version<"3.7"|typing; python_version<"3.5"|' -i setup.py || die
-}
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die
-}
diff --git a/dev-python/aiodns/aiodns-3.0.0.ebuild b/dev-python/aiodns/aiodns-3.0.0.ebuild
index efbb87aaa6a7..59ee54a21755 100644
--- a/dev-python/aiodns/aiodns-3.0.0.ebuild
+++ b/dev-python/aiodns/aiodns-3.0.0.ebuild
@@ -12,7 +12,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=""
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 37ba2f1417ed..7d51dda385bc 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,5 +1,8 @@
+AUX anyio-3.2.1-missing-trio.patch 4024 BLAKE2B 7f53d13f07dc1a8fea86c5b9c44a07cd2f2da61159eacbe4043246ada988ab7a57e894b9dbf58185a20f39ada7794268a65ae6868a5f8501bcb363fdf95f776c SHA512 a53ee1bc475f34eb6be535bcde0ed67ed626e6e0576fcfd51ef700370bca3be8bb9c5f89fd69a9de36ce717b05246564f0204e27038f0d48f2ab6039643aeb1c
 DIST anyio-3.1.0.tar.gz 122097 BLAKE2B 4a16a5d231cc5262dd4138f628b9d210180733bda4b9e81ced0c0e0c7f49e1760c8dd22db0a1db3b7a21f3210072f4e1c543e52a7dc716ad3f0415827da48e38 SHA512 120d8e3e24f542c06caedd0a67d16b3fb69c94f5feaebde5262e54f8ffba3f1cf927c82030d65fa2efb3479ee64abd968b6ce67aee767ea33ccef6b0e3fbd358
 DIST anyio-3.2.0.tar.gz 126210 BLAKE2B cedace636a115ad579ca47b345bb2a9bb32e97fa2ef886a9e6bd19219dcc92c393aaaf480df5e6f48c959590c2d6a3e0770f700ab4901c7a8e576b231597abf1 SHA512 f4e718704225d9cbb8e2592246ac393f96e82fb1898bc0ff89b2d7990c4aac7e7c9b339cb57a594c59a9e5730696122c9e647310c26e00ab152879e0a7e85863
+DIST anyio-3.2.1.tar.gz 126277 BLAKE2B 510980c9251081d5188f7654279753051cd9f8221f2090fb99624612e48b6f5fc1f6d9f1808f1c329c350857f14ceaee0d72615857171de33dc35cc7ba35ab23 SHA512 ef78e5531a917e3a5ddc1106f45ba556ca147e52ab29ed6cb25a3bd287148a15a015942dde6b9535d683fbe5910affed27df6ce5c4049251610f689cd151ee89
 EBUILD anyio-3.1.0.ebuild 1413 BLAKE2B 35471e090dad1e7d2a820c2c1d225e211311f673bf8d4a6d1adf5d0221d293fad3813295b17ddac496f603a1e26737b7bd43135361f4c5cfbfd29b48fd479f21 SHA512 dff8ec2ff5c87f0bea1d083fe62685c4580580e17bcedb14b014396a280e2468cd548b44bb492e5b64b09c61c49a4f86f043dcbd7e4a1bddb58b8bfff5b443de
 EBUILD anyio-3.2.0.ebuild 1418 BLAKE2B 398427069cbee61cf7ae0111c76933c8908760619f4fd6c26622bafbe68e58287af7d916418aea7b06c8c96b928aefc5242bbebfece4ce9e03676b11b1d0510c SHA512 eb3abcab9ad4e5e26dc861508f881e3f96895eb120951be2be685c0727b0efa9a240a57caaf530076bcce8b229514fd1c80fc0f41bdf13a433aaf8ffc97c795d
+EBUILD anyio-3.2.1.ebuild 1033 BLAKE2B f080636c88b3790a3eceace45ec5e7074bf703cd76a74eb721a53f31ad594bf616d8b66061b5c20a6117db99709622e5c370caa8e76ce9775876f031eba01543 SHA512 555b14800a4f043d53416ebe9b9dde35865242c9d3321d60926d7f430eea5bbaac5880b309ee87e05e0b32728a6b774bbf9c81bd4fa42067a56ce7978969c69d
 MISC metadata.xml 1320 BLAKE2B 0687bd9663338d0f39ad5b705f3ba3064ad7a399e31e6b6dfba80124b4ce719bbde82fb39f8b19b4a2fd22a040919163a59bfb57a3db143983d60db78d05811e SHA512 306491b404e5929eb19f61e359741b2961b3e600e3e6190e29215ea571db2d270d469c331956246f3336e05f5379d37d35bbea30931a9bbd8fb79a671d7642ce
diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
new file mode 100644
index 000000000000..7727ceecc614
--- /dev/null
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-trio.patch
+)
+
+python_test() {
+	distutils_install_for_testing
+	epytest -Wdefault -m 'not network' -p no:django
+}
diff --git a/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch
new file mode 100644
index 000000000000..492fe40fe70e
--- /dev/null
+++ b/dev-python/anyio/files/anyio-3.2.1-missing-trio.patch
@@ -0,0 +1,125 @@
+From d05f92bddc4b34a8d527f66d5d27513cd91c741a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 24 Jun 2021 09:16:01 +0200
+Subject: [PATCH] Handle missing trio gracefully
+
+Make it possible to use anyio without actually having to install trio.
+This involves modifying get_all_backends() to only return the backends
+that are actually present, and teaching the tests to skip trio if it
+is not importable.
+---
+ src/anyio/_core/_eventloop.py | 13 +++++++++----
+ tests/conftest.py             |  9 ++++++++-
+ tests/test_pytest_plugin.py   |  2 +-
+ tests/test_taskgroups.py      | 10 ++++++++--
+ 4 files changed, 26 insertions(+), 8 deletions(-)
+
+diff --git a/src/anyio/_core/_eventloop.py b/src/anyio/_core/_eventloop.py
+index f2364a3..431a922 100644
+--- a/src/anyio/_core/_eventloop.py
++++ b/src/anyio/_core/_eventloop.py
+@@ -10,8 +10,6 @@ import sniffio
+ # This must be updated when new backends are introduced
+ from ._compat import DeprecatedAwaitableFloat
+ 
+-BACKENDS = 'asyncio', 'trio'
+-
+ T_Retval = TypeVar('T_Retval')
+ threadlocals = threading.local()
+ 
+@@ -106,8 +104,15 @@ def current_time() -> DeprecatedAwaitableFloat:
+ 
+ 
+ def get_all_backends() -> Tuple[str, ...]:
+-    """Return a tuple of the names of all built-in backends."""
+-    return BACKENDS
++    """Return a tuple of the names of all available built-in backends."""
++    backends = ['asyncio']
++    try:
++        import trio
++    except ImportError:
++        pass
++    else:
++        backends.append(trio)
++    return tuple(backends)
+ 
+ 
+ def get_cancelled_exc_class() -> Type[BaseException]:
+diff --git a/tests/conftest.py b/tests/conftest.py
+index f040ac8..5834395 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -8,6 +8,11 @@ import trustme
+ from _pytest.fixtures import SubRequest
+ from trustme import CA
+ 
++try:
++    import trio
++except ImportError:
++    trio = None
++
+ uvloop_marks = []
+ uvloop_policy = None
+ try:
+@@ -30,7 +35,9 @@ pytest_plugins = ['pytester']
+                  id='asyncio'),
+     pytest.param(('asyncio', {'debug': True, 'policy': uvloop_policy}), marks=uvloop_marks,
+                  id='asyncio+uvloop'),
+-    pytest.param('trio')
++    pytest.param('trio',
++                 marks=[pytest.mark.skipif(trio is None,
++                                           reason='trio is not available')])
+ ])
+ def anyio_backend(request: SubRequest) -> Tuple[str, Dict[str, Any]]:
+     return request.param
+diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
+index bb254a5..d55d511 100644
+--- a/tests/test_pytest_plugin.py
++++ b/tests/test_pytest_plugin.py
+@@ -135,7 +135,7 @@ def test_asyncio(testdir: Testdir) -> None:
+     )
+ 
+     result = testdir.runpytest('-v')
+-    result.assert_outcomes(passed=2, failed=1, errors=2)
++    result.assert_outcomes(passed=2, failed=1, errors=len(get_all_backends()))
+ 
+ 
+ def test_autouse_async_fixture(testdir: Testdir) -> None:
+diff --git a/tests/test_taskgroups.py b/tests/test_taskgroups.py
+index 62a2389..47971c0 100644
+--- a/tests/test_taskgroups.py
++++ b/tests/test_taskgroups.py
+@@ -5,7 +5,6 @@ import time
+ from typing import Any, AsyncGenerator, Coroutine, Dict, Generator, NoReturn, Set
+ 
+ import pytest
+-import trio
+ 
+ import anyio
+ from anyio import (
+@@ -13,6 +12,11 @@ from anyio import (
+     fail_after, get_cancelled_exc_class, move_on_after, sleep, wait_all_tasks_blocked)
+ from anyio.abc import TaskGroup, TaskStatus
+ 
++try:
++    import trio
++except ImportError:
++    trio = None
++
+ if sys.version_info < (3, 7):
+     current_task = asyncio.Task.current_task
+ else:
+@@ -53,7 +57,9 @@ async def test_success() -> None:
+ 
+ @pytest.mark.parametrize('module', [
+     pytest.param(asyncio, id='asyncio'),
+-    pytest.param(trio, id='trio')
++    pytest.param(trio, id='trio',
++                 marks=[pytest.mark.skipif(trio is None,
++                                           reason='trio is not available')])
+ ])
+ def test_run_natively(module: Any) -> None:
+     async def testfunc() -> None:
+-- 
+2.32.0
+
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 2e0424c9f79f..78e9b3e64b09 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,7 +1,11 @@
 DIST asteval-0.9.21.tar.gz 54203 BLAKE2B c5232b41cc73184f4a9d21e257d4c517662e7a7e5c6beed0d0a1f46572310263b5370ea455f2d0640410cecd7e3b8a7686a56931fa61c3294a57a2e5ea984336 SHA512 b2930963641486f208c629300f70e41924aa59bd9c64f767ed5a4db0a39e79c02a02fed48eb0e113fb6e3fc594973c9d0afa56d768ac627758a096b1c4fe6030
 DIST asteval-0.9.22.tar.gz 55120 BLAKE2B 5712e72f69e3d48df6a6ac33e3bf87517525efb3907cb954d5a4427b4d41aac5bdfbf71376967633d36574a845c40bbeb391d2ef0a2deef280235c468732e80d SHA512 0c6e0d1273fd9794828e006c56d243e2afbf336314dad9ccc95f40b790851460beb42400defbf4ee09eb7d65532b499a762b4b19c3102bbe6d2553a3a6debb37
 DIST asteval-0.9.23.tar.gz 55239 BLAKE2B 447599078a877784c35b7bdb96f81382139f8a93d72e660658386867b0eb37e04a22ac7ba9d6afbef1a55d35ca38a63fef60e1e1382e9740694b1e94ddcc7e7b SHA512 b2755b4dbefff1e481558f886cc5724d9a6a953b145736afab237e16f7718d48d1f8f98a0b7355c5e871f8ed0862b60bd6a4d99554a5e0fd0875f9cfdfcbce55
+DIST asteval-0.9.24.tar.gz 39523 BLAKE2B c0bfecf7b74e07d32e2117bb68d0480bff4037f7ce9891352d10b29f765e3922d0f60eae66e0091e35d55a32bc6199b5949292477cd2a8b73fd3ea80ff8babaf SHA512 1bedd09aef521cf63d98a55861b983233bca297fbf4a38a1522b68808593447156748698b653a3b82451d953ada2694c3dc1520efc4ff8c6f26607645b539af6
+DIST asteval-0.9.25.tar.gz 39473 BLAKE2B c726cc4499b71534e981eb344f424af897fb397a9b60be9a1635598a354805b77429b14939f653a7c37a1ad16f26673b718e9caf796a8f06b535cc468496c385 SHA512 16601ebd84a1f6fb48c51279c9d3ae513d0b98c0407d0301bddda941b04951eeca041ccf6f6801bad194b9d3f719044efef446cd91444ea07ebab4d8b763c81f
 EBUILD asteval-0.9.21.ebuild 445 BLAKE2B 0294274fa252b94bb4f937680a9de156133c19a5ac725b6f669663500f52542988b00f0d3dfd8dcd7d3af45122b152bd3fa08f87accd4e743bc09b424d2aeac4 SHA512 88ff548a117141fd37aae50fe8588e7fd711de11edba3e03f8f0bb80173b160459204b18211c5513f9be7253fa1177428f6fa66d0357b5f5dc046f844d9373e1
 EBUILD asteval-0.9.22.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
 EBUILD asteval-0.9.23.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
+EBUILD asteval-0.9.24.ebuild 446 BLAKE2B 299b6dd67b19a0463627680bc54f4da21eb84a1066ee5cd60636f28017073536a45cceafce1abe51b973d5e7338e90ae8cf334a5fc8a8f2b19058a8408f4f011 SHA512 e8197b5398de74e102c9a8ec03430d6eda909e8b0d4afd52e92e8b1b576d42d34314de40c70bec618b930d049b4a7a57b5443247edf0dccd460f1607f54f817f
+EBUILD asteval-0.9.25.ebuild 446 BLAKE2B 299b6dd67b19a0463627680bc54f4da21eb84a1066ee5cd60636f28017073536a45cceafce1abe51b973d5e7338e90ae8cf334a5fc8a8f2b19058a8408f4f011 SHA512 e8197b5398de74e102c9a8ec03430d6eda909e8b0d4afd52e92e8b1b576d42d34314de40c70bec618b930d049b4a7a57b5443247edf0dccd460f1607f54f817f
 MISC metadata.xml 387 BLAKE2B f4d9e9dd7e5537c9f87e74daf1af859e1a14e93aad3a7a5c702cc3860288a0200ff822f8b25ad1ab9f8302214407493b125caa0b7baa3ac4af668f0ced764835 SHA512 604adbf69eac36bb9e70109021a3c3c6aae60dc67eede274b10874ebac1b21873cd6ce09bb97a2c0618c101c06e63456752f066de0bfd485c16c1307bdddd429
diff --git a/dev-python/asteval/asteval-0.9.24.ebuild b/dev-python/asteval/asteval-0.9.24.ebuild
new file mode 100644
index 000000000000..e44fd6fbb180
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.24.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/asteval/asteval-0.9.25.ebuild b/dev-python/asteval/asteval-0.9.25.ebuild
new file mode 100644
index 000000000000..e44fd6fbb180
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.25.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 495505950c34..cd8afc396a31 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,7 +1,9 @@
 DIST astroid-2.5.6.tar.gz 345014 BLAKE2B 13916663aef712449a842e50b74ecd2e1b82817e1c128fdf9a4d5779d391deab7f806300cb6597b29920222ff041b13eb985aa395dff024af6fee628a84f883f SHA512 3d10d0f92c4b4c2d7d5e0035f23ae554b512f34ddd55b4c1c4032b328643dfe60cb4aa675a3824423fcd12baea7961847435f1894a47fafa99802f3e17a5605f
 DIST astroid-2.5.7.tar.gz 352082 BLAKE2B ca52339422da3a35cbe34e4b216dbfed3979dce96a8d5fcc508083c0ef9509c491e78dcfea281b79b07fcb7289a9f40aade0da21ca38b6abcf7025b84909a4fd SHA512 17fc185752510396fda9cce842df8ba72473e469b61c037195a9d6ff72af3ec8d3df01bdcf61d6059d4f90c95278928eba3e3380048bf5c6b4fa2a3c9b267176
 DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
+DIST astroid-2.6.0.tar.gz 358265 BLAKE2B 77db092a9f4368f296a710235bd9d022638c97e3439195f01e55b38ff9e7cbfd204906c353a515ee0bc12f75526866d783ad57aa5d5f69e672e9c1603e48f579 SHA512 44e0833e078948eb1ba1e62710890be8cfc675f7ee136578a39e2914b082fcfbcb90b90a002998471fcd19c4092b9a3c5f71e58af32d3839fa799bcb5bf4a4ba
 EBUILD astroid-2.5.6.ebuild 1191 BLAKE2B 375a0f2a91178e9c08211ec1ab11dfff40009bece3be7466a109743db3bc78e9f0d13240e910867ddce46d49f65828632bbc4dc3f696609871b74f3d70b826cb SHA512 b548a364d9d5b94cf31712912319688a893dfe3e2a212f562b8d2f622ea22b85152d5f816996ffb8e31d898aea56f70a3aa6178df5fd4323e864743621c8d57a
 EBUILD astroid-2.5.7.ebuild 1341 BLAKE2B ee60d0e8fee5fef7bb8f53b5792c8862cc568ad6b147cee743e0c65cb12931c7fa2866ca196513b22884928d0cf7da23f86666e34e864723ca1d75e65cba5ee2 SHA512 22af5d34ed87dd6a3b14ecef3b085aac0794dd18fe215e72217d6238f202c3ba03199872a9188328ac5c72498aa1d7b9c3b5d860949ca8ff4d31e333c6480224
 EBUILD astroid-2.5.8.ebuild 1196 BLAKE2B b2e9eafa9b1c3416bf83d6d8c63508f3cf84a2cf13e84e2199a785ae332fe89605300bf23a2510145ee7d7c85b4f9da0f0a9b035efda87053c3ea7dffd26949b SHA512 780fdd87fd134490ee39a19f97f8f62278235279573e1d0405449fc603e96a03e05188abcab045b802c618ae6aeed1b04c3cb842eaba015cc9370a12c7420ce7
+EBUILD astroid-2.6.0.ebuild 1197 BLAKE2B 23ce7c1bd3463e690febb4f93a60928a6b6bd9890c8de45d9cd398c733dcd11c6ca3e352ed21ba9cb3e55dd2d104f7cc83934e60f4158f8fe73edce1c7d927fa SHA512 36e72b086e861af3092c12dead3452be17482081bf68900ccbe43faec43b3f154d922cc67258d49226a55b535bfda08c47a1a443e9c63053da9856e3a7fbe7e5
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.6.0.ebuild b/dev-python/astroid/astroid-2.6.0.ebuild
new file mode 100644
index 000000000000..5d4947f82b01
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 912cbc239134..1ecd7b4ea1b5 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
-EBUILD blockdiag-2.0.1.ebuild 1635 BLAKE2B c5755c3d14988ad0450b7e4ec895a8e6ac50c891cd3ce3ff88ccc1386719a2fb1d453ecffc14968637569dfd3785ca8c8c6a43f5c28d36dde1a3cc8e75aedd7f SHA512 7aae10402180d3554276d28ff2f9ea8b30878a4563c8af6de1fc904acbea2b8a4f6a862d2429fa583a1b6b7496d876df8ed1a46a2f1929c027b3c8148c17192b
+EBUILD blockdiag-2.0.1.ebuild 1635 BLAKE2B 69a62421f120e8741119059f8a63f57aa9bd5f71c1321714c0dde30cb7e201277c879199be2c36bb647eda0ccd6e62af39cb0579f3c50604f262af75a8aae8c4 SHA512 fd57bcc92d8e62831ba485bb0b03db068c090d570d67dc481b189d09f0f2ce62bdbb9a3da3649dab40d6bd5738868c442b06479ce99e410282da899e22176dde
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index 10add2977aef..547414810550 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1 optfeature
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c21e13e8b020..b3963f6a64b4 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -19,6 +19,8 @@ DIST boto3-1.17.94.tar.gz 382448 BLAKE2B 84ea4989b47ff4b1adbcb1118bf1a18996d98d9
 DIST boto3-1.17.95.tar.gz 383063 BLAKE2B 9d715ce7cf51daa806c0ed6044eca32c51dddc9114899e890e9745db51d574fea02515364cbab3fd82b9960dcc658c02bab89564c98ede13487ead75280c01a5 SHA512 63c78ea41bf79af23159aa8a97bf82ecd6c5b5075c1d077777679cc7ca17de4e91eb9abd19c152e5eeee2d5af47739ba0df3dbca6012c3836b577bc52e52eff4
 DIST boto3-1.17.96.tar.gz 383485 BLAKE2B d962177eb5a693aad1900fbe6c44e20853deee74a31f188d1d12a34352d1376a5edcb84e854d8eddb8ce9dfe0aa46d8ec8c5998010a0f3a635d7b4b2ac46a1ea SHA512 c77a682b6895ddaceec21f9ad28eb08bda9eafa102cdb1024270247f9bfe849249c80bc586e18de4c1bd1410dabd165154b6c17655e8d56a16d38e009d695141
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
+DIST boto3-1.17.98.tar.gz 383306 BLAKE2B f9fed22e11d2561a5a665105bdddffce2cea357f588200285ba4758809e6f64ded3ef4ad4eb10a52a1852df86d1098f752f432f5bd90a70669d569866262d638 SHA512 223de2234b235773138ffca02eed8187eaa2b74fa3c0822700bfcebe12da69078ab592ca77158448cb998d47dc63a20c79a3ce9dab2398c41faaf94a329c7cc3
+DIST boto3-1.17.99.tar.gz 384452 BLAKE2B a86fcc79242ce9e55101690f2fc7534d43038621c9d5aa9d9f7f1eebbf9bcb07a035e91d62486163894f8598969ccb99047d54918f874dacfb647116a65b097e SHA512 99f1fc890680162b2ec8bd9da77f4de5ecf23ab1f7cee552f51031f2b21ca930b9d2ab27ad5f61d1b7e4a4433b288374615313e00abe8ae595c10fe36f6a49c3
 EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.78.ebuild 1367 BLAKE2B da22f912dd19d83b7e2a4e22bda42785dba18b67bd6f0b9a5a6d13cc87a1cbec9810e8071a8f7407be4249fae4aa6a27357970f0f9b60f914e9f82b034b862f8 SHA512 568133f9ab499b8ff9e95340ec99b4bb3c9e6f53981d2fe337a3220a189d9bf91dd8f7f03db055e0a02169f36546f5257fa04c1a0fd2918d712c636e02903240
@@ -40,5 +42,7 @@ EBUILD boto3-1.17.94.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d
 EBUILD boto3-1.17.95.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 EBUILD boto3-1.17.96.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 EBUILD boto3-1.17.97.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-1.17.98.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-1.17.99.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.17.98.ebuild b/dev-python/boto3/boto3-1.17.98.ebuild
new file mode 100644
index 000000000000..666cbfa63e3f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.98.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.99.ebuild b/dev-python/boto3/boto3-1.17.99.ebuild
new file mode 100644
index 000000000000..666cbfa63e3f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.99.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index af97397e6a5b..eec10f7c6c94 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,5 +1,4 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-AUX botocore-1.16.7-unlock-deps.patch 598 BLAKE2B 27b0c4d42da15c009c1a9181a757aa2886343a6e486710de5f962fe09ebe3ee9091830aabd17544e2112de2eaf91d63ca881ce050b6b9fa9af86337f3146a791 SHA512 6028bd13aebcbe6afe66018185d22f904c010cfd41f014b43f361c73799592d223af0a23d8fb3086f4bba9a1d106f60afc68e659dcb78d0d2a967442130b3179
 AUX botocore-1.20.64-bpo43882.patch 1106 BLAKE2B e08e112f1afd9a4b80600550550903594901eebf94d44cecdfc38ff2e6007594f796506377096403f3b77a148acf92bcb2373eecb705e3f150cd5ce41c0b3c76 SHA512 1bfebf53c8cf9a2e84b7493365b90e87174cdaf0eb138921877f2f726b5b9acf7d0cb4b4fa4f532f23cfb29bb48150ad01ba582b1a19c3b0702b24f69208e5da
 DIST botocore-1.20.54.tar.gz 7650344 BLAKE2B 2dd0a3f8c7c5665e849cf74b663a88e63416f1dea8ca3ee7dbdf10cf35239d466919f2ae4b3c9a639b9e25a23d982b723b24f32ece43715d40283e96e3bf10f6 SHA512 77cdaf68378836205c94c7dfd8424f9ca44ac822fd418d323df30639157bb38e5534fcfbc5bb6cdd7695bec62e24a1d52b81a0be54b0f69f16d20c5182db004b
 DIST botocore-1.20.74.tar.gz 7729804 BLAKE2B 0693da2be219ee140c5c00a540756d31651d3e4c78976a7f766705123e9fba23e98d73e551b86a6b661530c20abb560b0e36fea8e1c13600303894b3163d2274 SHA512 51bcf78c6804b4a8cddd57eeff96d7ecb65731dfbd87eb665de1356c1daedb4317323b3a0d905e3d459800d800ce6d6ffd8fd1239b26ecf56884bee37159f2b7
@@ -22,6 +21,8 @@ DIST botocore-1.20.94.tar.gz 7830564 BLAKE2B 4c52bb0f782a4560c1c966ede26a5741428
 DIST botocore-1.20.95.tar.gz 7833074 BLAKE2B f7c6f01cf28f609a2a6c2cdcb41240d3d653a12ca28e29011ee2ab909b988b187378989eaa19f73734b3a64ece5041520af9a9e9de801bb1802001b22d56387c SHA512 a3c532e26054f793ac71756ebf69c0f17bf60e4510297abffadf02c17188ae74ea374b534bfd9db8cd179c53287734b797142e7e08536a9e3199e269cb014c28
 DIST botocore-1.20.96.tar.gz 7842597 BLAKE2B 1a30d4d29c1200f51284a30ee1f512debfbf5542836e32e4971b593a041c4e0793e609b11528a1ecf080e2a01dd4b0ab06bfc44905beee202c23fca983238111 SHA512 9a4973b7484fa5586473dbedd402d6b8adfca18a17373752078f35fc24fda7477a37e2c9fee4779e52c3a60b352ab02943ebf49eb77dd607b79e88d25ae9b6c3
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
+DIST botocore-1.20.98.tar.gz 7854150 BLAKE2B 3f63f0057555b33fbb69d4f8720b393dc6f866721df0a90be354ae3485e0053bcf2216f180d4f795cd271a5ea77e7d390ff453c5d2655e60b51623be1fe5df8e SHA512 98d931ad9efbcb899bc3f6e1fd55028fdbc88cebb9d2ffe93db08610b8515de8bd784338b2320136319314783fbb65d251526efbf3df76de80be4561bc97f40b
+DIST botocore-1.20.99.tar.gz 7859805 BLAKE2B 41c8afcf4277dd10589209c18281103a4ec288581c08760da380d883542133aec65813792064d70efdd74d94902e45e0a9164d1882d27cdba01ddd12d438b5ff SHA512 45da79b872e8489e6a366106858cf50d5af52d3f1a2df1b831d47b0f72ea0b777c354215b43e2feb2d31cc3646d1995590152133ed865bfc184ad60629a7f61e
 EBUILD botocore-1.20.54.ebuild 1541 BLAKE2B 2a87a90a023a6f4a203b686d8ebff52dcc013ecd083a103e6b77f9f738c4cd9fbb04d6c8a63311aacb867f46328676c296c0ac0fc7c8923eeea6b310295a9bb2 SHA512 293c8a55e0f1c424026e395c05e901ce2f233a42b1105d7ec03c85a99c7f111a4701553598e009210ac6f7517ca7d9849592b81ca7ec62d99265972a7dd5cd00
 EBUILD botocore-1.20.74.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.78.ebuild 1508 BLAKE2B 63c6bf25a6af7e1f5e39d58577efd2044a915b4c9679b02941600fb89e061b403b9b6f5c47d12180768f8461660f39771a394dd90dfa851bd6b6d9ac895c7eb7 SHA512 83d93e13674e604cb4a0593fd6e189a689fcb5ce23a60756cb6b2bbe6050d4c07421953ea21b697f83cc876a6e77e1505e89344bf1143b8130d8854bcabc644d
@@ -43,5 +44,7 @@ EBUILD botocore-1.20.94.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5fa
 EBUILD botocore-1.20.95.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 EBUILD botocore-1.20.96.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 EBUILD botocore-1.20.97.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.20.98.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.20.99.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.20.98.ebuild b/dev-python/botocore/botocore-1.20.98.ebuild
new file mode 100644
index 000000000000..762144aabf71
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.98.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.99.ebuild b/dev-python/botocore/botocore-1.20.99.ebuild
new file mode 100644
index 000000000000..762144aabf71
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.99.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/files/botocore-1.16.7-unlock-deps.patch b/dev-python/botocore/files/botocore-1.16.7-unlock-deps.patch
deleted file mode 100644
index 1dbb890fbced..000000000000
--- a/dev-python/botocore/files/botocore-1.16.7-unlock-deps.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setup.py b/setup.py
-index edc35789..94545b8d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -24,17 +24,17 @@ def find_version(*file_paths):
- 
- 
- requires = [
--    'jmespath>=0.7.1,<1.0.0',
--    'docutils>=0.10,<0.16',
--    'python-dateutil>=2.1,<3.0.0',
-+    'jmespath',
-+    'docutils',
-+    'python-dateutil',
- ]
- 
- 
- if sys.version_info[:2] == (3, 4):
-     # urllib3 dropped support for python 3.4 in point release 1.25.8
--    requires.append('urllib3>=1.20,<1.25.8')
-+    requires.append('urllib3')
- else:
--    requires.append('urllib3>=1.20,<1.26')
-+    requires.append('urllib3')
- 
- 
- 
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 55f7d581913a..91fdc52bef6c 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,5 +1,3 @@
-DIST cfgv-3.2.0.tar.gz 10268 BLAKE2B 26cd22c1ed7b0de48638d2bb0e30a4ac0c3060d5020d04c29ca5c41c1337531d16a1c7de6e66044e90c3b0dbd5f4b15ba6c3dda2ae73953b8d6be3f74825b813 SHA512 6f1a54b505d298a9806a739edffc79feea41638f766ddc25f0712001e5bceb206153e3a957dcf4909fbe125b6e9bd077aba6317d00e632a06ed24f1dfd06c555
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
-EBUILD cfgv-3.2.0.ebuild 456 BLAKE2B e05dee33306e8a1614973a910f30fc125cc936b1a47d30404cc53575fcebae3a64f0fa99c86cf438398ccbb218bdaba4e7a25b2474b08aa0bf03a8fd66c2ce68 SHA512 336d131a92694089dc237834c88a4f7170c397fa4ed3bfef5feef52356b86946ec4891a2298e5bf6d9296934591e0199333a5aa19f9ac63b80f53f0e74df858a
-EBUILD cfgv-3.3.0.ebuild 463 BLAKE2B 363f336d79a3ddc649bec58c3a6299b6e7ada0651ceff1ea19017e4447c4024be00ec2cb4e52c23136c5b41930ae96e1598bc406717e3831e6535d7ec307ba9c SHA512 49536556f29003bcbd9ca1fae008670af2eac0946f635f8a7f55ac0e915589f0e1bcb4ca37a4beebf32725ee901e7540119bbfd5142eb23e09d0965d80447c61
+EBUILD cfgv-3.3.0.ebuild 462 BLAKE2B 15a7a8b96171059fbceb0b7e6e56676c6ab2c60e70e98c5b970aa8de7a07ed60725af8c1ecf526e95465309bf79eaf0be96aaa39ab2a8529b3683c39b22d49d5 SHA512 32980c489010b461b580e3b72ea9a9b649e3e3798d76ed521400740f9c51e062f8c9de740571d098374da9480cbd6532cd3e5a4805b047b3f71a99dcb36cd460
 MISC metadata.xml 490 BLAKE2B 095a603aa93c514e7d04381159b3ab9442c329dc4270b065bb347671bc00497d7d8094499f45a9b0785f75c6f06a97669f3c1ada39d582065743697726cac1da SHA512 bf284020d3c30c217ffae1d1d114eb3e93d114a6bed44c6dad87abbe11903204cbf300453b7a46d86d2f9575428e8f6c10ea1f7e3c53974704b34f4aa9d3878b
diff --git a/dev-python/cfgv/cfgv-3.2.0.ebuild b/dev-python/cfgv/cfgv-3.2.0.ebuild
deleted file mode 100644
index e03fb393efe9..000000000000
--- a/dev-python/cfgv/cfgv-3.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Validate configuration and produce human-readable error messages"
-HOMEPAGE="https://github.com/asottile/cfgv"
-SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
index 82db9c8d45a7..4c3adc6e854a 100644
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="amd64 ~hppa"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index d6c9e381e0de..de9c915fc8c1 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,14 +1,6 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-lint-0.49.2.tar.gz 7012647 BLAKE2B 1508c7c2c400ea4fdd878961a00d79b6c464de70f6ff5269069c73d4c524317e37e9431fba0a686da16958b7c575d4d3629a83c31c3f89d81a68f5c320355b14 SHA512 7e7b97d727b06649b2a56b67f1251c24df2646c9759821a7525842796a81e834f560fe5a09431220ead9fd68ad0fa9978a65bb1d9bdeab907aba0a76095fd712
 DIST cfn-lint-0.50.0.tar.gz 7061105 BLAKE2B bba39823b729b0a53dcc97341b6408654190bceb86acd7de0e2ee1a4ae34234ca6ddc3a4d374c38115632faa0fbbb51fbf07cf717853dd917a262ef5c1116ac9 SHA512 9dc5c00946a9bb142771a4b63571043056b1f522348f11256d7d3181e750c251cfab805a66df884b496fd7639442da0e72f65c0a43cc2ce2ed35f214031c7b1a
 DIST cfn-lint-0.51.0.tar.gz 7125333 BLAKE2B 5f18c03cba52e8f38eb4998ce3640564b6346cd788bc7ca4eebbeebf709fddb130de3fd0c99f5e1585aa07fb965f97ec05d48154bb6788f961c31301058d9ac7 SHA512 6b0eada5204da1c4efbf1a548b74065008bf55142b666aefbc5c1e9311eaaef96e83fd427157be4d3dec98d2e5377ed7f21266af0662e565fdf2aeb6883bb1e4
-DIST cfn-python-lint-0.48.3.tar.gz 6758651 BLAKE2B a8aeaffb0791789b25c94c630532ced223432f9902cf60664e4b111d162b4379d6307eda5c8f8074f7d2917ff25f44657016894b2140c8ea1dbf3259b24dde38 SHA512 ab1555719edb9b3541bfe60ce2701cca9e2ab9f4627c1b46ab8f4920477531f56f14f393b3575525da81b6aefd087b6c3cac516bdd6eb1db0f31304d7c63e1cb
-DIST cfn-python-lint-0.49.0.tar.gz 6797106 BLAKE2B aa60c3e5eb246c45997af57f934d2710b56c4966babb61f56cc538c49606e3befd130f6a4298b124d38401927ae40127e699fba6a1f69ee177c07c9bf5d880e4 SHA512 4b656cda70de686aa3bb404908eac6ff66cabc0ebb064d5ccbe554a10551e8a5a7a308e3480826ec52b87549a8626f2a9cbbf51bd44613d94344db8dcd4443a7
-DIST cfn-python-lint-0.49.1.tar.gz 6906770 BLAKE2B 3115e610a73f072f56f0ed45ab8c88f7a906115437081d8974a135b3a9fbfcec4f677bdc108fa0ed37814caa6f0cc1e22fa7892d715c658e9ef05c8299f377a6 SHA512 4ceda24495aa43ad84ca7e63aa566521aab339f01308f5754372289a7f595d6805d6b1ac9bf637ba20a05bf17b93f8a06d5d1fd4dca3b8955094f54a62e28313
-EBUILD cfn-python-lint-0.48.3.ebuild 1483 BLAKE2B 2de36bdb65abdf149877d30946aa66f0efb98dbdc5565c92057cf4816927f41c9c25ef1cb90897addfd2abf4a848894d66fe4dbede79a5ba5189b22057cfc212 SHA512 586341992bede7e42382291461e209770a7bc68973e77690d1e04b8e31979851dfc9d01a7e70a45e1b745822c859fba77b762df4a394b50ba9e99b97dea24140
-EBUILD cfn-python-lint-0.49.0.ebuild 1491 BLAKE2B bbb73fd49da8e4b39f1f8c45e74b5d6409bb9dda232507e791c7a71c9685dc115738acbaa3691a911d5cddfa208bd5bafaee9bba32fbf7c84b9d3ce020ec453d SHA512 9a388963a5515ef9eabf73e658cd7211ba39ada1dcf5af2cabad4e12f5c4d131899ffd8ac5af0e1981f15de81b20e8a4907ab4a28faef029a97ac0828e36b35a
-EBUILD cfn-python-lint-0.49.1.ebuild 1459 BLAKE2B 62ab02c3802e40e0d73a24515ec6aa2bd26c8847b92929245749dcd5bde5fb0e9ee2e875c5dd93889b780ab569dc7d966252bdfdf2a46770424624a363dd74ee SHA512 7678d1535878a883d8f82d90a1eb8aebacf0206faaafe227000bc00d6b34a0adada5e309100603c0e51c8bb61396ced987473f28b78c7b65916011179cd33c6b
-EBUILD cfn-python-lint-0.49.2.ebuild 1530 BLAKE2B 5a1525088ade4585c5f63f1f8f9e8d14d7bbb0ba9a94453a068f0a575edc82070ed3949f4dc02cd77a75e4e5559b989d592ea26d0b4341e81fe8f36dcfb2c103 SHA512 6ea6d582eac21fb08199dcb3589d704b7b81c0836d88cf648df6e28616d5348644f3bf74cb780189e99351e833d9c768f9290520380f7fd6f53aec9a1682288e
-EBUILD cfn-python-lint-0.50.0.ebuild 1530 BLAKE2B afdac8393d467e2657124bd501160b5b0fe29d8fe164a7ace6dbb55e2960ced5018b8a0f321ce5d733d4c3cf28b4bc29474ca6abb1e376ce3422d5019e019da8 SHA512 31347e3c18d543b6d3bdda35c4dc2ad0cd464c2ec5e59ed7c44273ee171248f4c94e0d5c34a760f4a74e509e6cf582a35ef39be01a37d80fdfd769f79e1d074e
+EBUILD cfn-python-lint-0.50.0.ebuild 1528 BLAKE2B 41e5dc49f8b17753db6a7b2fad4d84e13d125a640d84628090528889649a85971c871e4b817381dfc27574317b300a0980d20fc263fbe36045ca3d126b031d41 SHA512 d61b521de58bccde229e226dd154c6ec70e09e190a0db95f60adc79c7f5dd48cb195529dcbfd3111cd573402b6085efebeeb1eca156adfa3f0efd7b3b55ccc97
 EBUILD cfn-python-lint-0.51.0.ebuild 1530 BLAKE2B afdac8393d467e2657124bd501160b5b0fe29d8fe164a7ace6dbb55e2960ced5018b8a0f321ce5d733d4c3cf28b4bc29474ca6abb1e376ce3422d5019e019da8 SHA512 31347e3c18d543b6d3bdda35c4dc2ad0cd464c2ec5e59ed7c44273ee171248f4c94e0d5c34a760f4a74e509e6cf582a35ef39be01a37d80fdfd769f79e1d074e
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild
deleted file mode 100644
index a786d5c64967..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.48.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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.49.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.0.ebuild
deleted file mode 100644
index cda4805bfeb0..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.49.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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.35.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.1.ebuild
deleted file mode 100644
index 94cd12f60292..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.49.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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.35.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
deleted file mode 100644
index 8515392b1031..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
+++ /dev/null
@@ -1,57 +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
-
-# TODO: pkgmove to cfn-lint
-MY_P=${P/-python}
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_6)
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install unittest
-
-PATCHES=(
-	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	# requires git checkout
-	sed -e 's:test_update_docs:_&:' \
-		-i test/unit/module/maintenance/test_update_documentation.py || die
-	# requires Internet
-	sed -e 's:test_update_resource_specs_python:_&:' \
-		-i test/unit/module/maintenance/test_update_resource_specs.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
index 2ca06957a777..348163842a48 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.50.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 7a666ebb99f3..e579f7a1993d 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,3 +1,5 @@
 DIST ConfigArgParse-1.4.1.gh.tar.gz 30343 BLAKE2B 8aaed3b0e85b4006c04e7910c6f7ae2c2a07d586ade777eedf078afeea4561a4504614484316afd9d234b2871c0cc45ef47f30254797f9df260373309cf67927 SHA512 304d5981c5685188edb22a63966d25a8943e4c443f2aefc323492f141885f50657e9f9200514df65683f1e13e64173d4def80cdbebcff941c3ee66ff4af0cbd4
+DIST ConfigArgParse-1.5.gh.tar.gz 30375 BLAKE2B 8a3c0091dc4049e9f84eb6209f7a62cafab0c0357d4d17304520b2855d60cdb68e63607068612bc99b07709f1fde4b0a3f11dbf4e45087968eab901d2b20b79f SHA512 82121fa6e8f734898674220b888dd3670368389a5cbd40e87d9188fa55d4378fdf480cc7dc003a4b9eadc1951fa8fc6141e9c0b079321cfe70c64bebacfb8944
 EBUILD configargparse-1.4.1.ebuild 768 BLAKE2B 525ee2e3d597799d085da0c1a24c708fa8c08d79be86abdf337e77c0c128a7f5257ff9d1a1519cccbbfc1ca779e84aeb008759f8df32f49d287505b0c376c3a4 SHA512 b2f2b3d77e1f9694c8864f25b377ca49ac78f660303c48ba6c881c06337b7840aefdc4319343bd136236db70dd661d63fd12d89276e9a6bf6496fa2d16dc9e79
+EBUILD configargparse-1.5.ebuild 733 BLAKE2B 6015c5c5e7b37c906c38ba1011469cbd829846e60c4867ec9aa600c8f1f9681df5067a6ba4ce68c11a9d467895dadd1a67054834336ddfed5ea2bba9d22f46ed SHA512 7d543ad181c7f05e278b03321742cf43f3f82ff2e96f9be359319b3819cba9210625725b772a0c9f5bff37d9b10dee2d41e5e9de9c1e11180d1666ec1483eadd
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.5.ebuild b/dev-python/configargparse/configargparse-1.5.ebuild
new file mode 100644
index 000000000000..43ba113e8698
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+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/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
+
+src_test() {
+	local -x COLUMNS=80
+	distutils-r1_src_test
+}
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 224f6d438dbd..d216f023f237 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -2,5 +2,5 @@ AUX css-parser-1.0.6-fix-py3.10-test.patch 5335 BLAKE2B c99d96c6fde03b0676521f15
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
 DIST css-parser-1.0.6.tar.gz 336932 BLAKE2B 00cfc4597137c0aa6af3cc8a72fa3e59a1d7b83210668c8421c0703a4a38d05d73f691ff00ffac14025f021a10f85c1d3697778794d23f75db381f5e63e24b7d SHA512 4c623541e1145c91458e7e2028f6a0de652ae2189dc99672fc72f098799d6349edb051bafc0901258481fa3422346303d2ef634392889ee83a29814609cdbd43
 EBUILD css-parser-1.0.4-r1.ebuild 524 BLAKE2B 0871f3d91c624396f30c2521f1ebf02b38fdd9cfab111fad7a876203dbb2f653a9a978f895db359638c7c876e54b8cf70ca62b9d3e34bd186473d2d56b307915 SHA512 ebfb09a3e2d1a4ee2ab8c8c89d2748ad2cd6cb0420c66ddd9e52498781dedf04a5fb61e50e61fff4870d526abaf3009a8130a1f8b1844127e73abeba911c3212
-EBUILD css-parser-1.0.6.ebuild 583 BLAKE2B 5bf9a2760eb1908c469e334cd01586cfc504dbaf7ac89411e45027f424fee7792c04a44ccfe81a6881273af05f3b01fe7f1d24b7a1ad0562c3eff08e8a40cb66 SHA512 9ab4e3b112c4d36b59ecb5bc818a1552362e3df6c580d3d5a3ce9e9d7fbdfddc0c8b2ca2fa0487bb63baeb9320d0c2d1f36782b38845fcf8a98419fa8d6f00ca
-MISC metadata.xml 353 BLAKE2B 80a5c57121e677736428a469c564718517f745cf24b00d8493a0035d125038cc9286ff3b2b826e941098ba3d5f1713d32f33e699c78f4387c0b995e566a545e8 SHA512 2916ec27cb3c474df265a5f937d1d6555fd6abb8e97f94301a383afd924edb61eeeee3c9dfc220c4ae3322555077f499f384f4b33ba5416b72c2054382cdcbca
+EBUILD css-parser-1.0.6.ebuild 581 BLAKE2B 110b0ec57e41ede13eef4121da87b9da77b6fd81ca24101ce7604e2d6cd49761a12d596d3a9347a8c659cc4e6f123f6eb26fe0cad45a2c83cfe0554c134665f7 SHA512 d0f585a34ca32d87f4ca166ab06117f876a309e3fb778af57b532722171e4fba1b67031999bfe7fc97226d3964002a7bbe958313a6bc584ca743ae184e370e20
+MISC metadata.xml 377 BLAKE2B 0aac677ad1f865456f3564ff32b40aa3a9be8e580eef11cec3c4bd9022b819accdddca752f6f81621bc42b3d3d9bda39d25cb3a09456825d3a81826fa2ac02c2 SHA512 e7416fa3efc8b064a896f83fc06f415ac7007db9bd5078f9921fb74feecc57d446c995f3e229eeb061a98e7a279ed524050acf41fa534233e3a468d2c1a59588
diff --git a/dev-python/css-parser/css-parser-1.0.6.ebuild b/dev-python/css-parser/css-parser-1.0.6.ebuild
index ccc51564195c..35ac7441e450 100644
--- a/dev-python/css-parser/css-parser-1.0.6.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/css-parser/metadata.xml b/dev-python/css-parser/metadata.xml
index 96600ef2547c..0c04b9aa91c6 100644
--- a/dev-python/css-parser/metadata.xml
+++ b/dev-python/css-parser/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ebook-utils/css-parser</remote-id>
 		<remote-id type="pypi">css-parser</remote-id>
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
new file mode 100644
index 000000000000..d2ff863e20cb
--- /dev/null
+++ b/dev-python/csvkit/Manifest
@@ -0,0 +1,3 @@
+DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
+EBUILD csvkit-1.0.5.ebuild 1297 BLAKE2B e00ecf1a78ab98bef348790fc76426f305f598f17893e36588e6d89e0f948f5c7b48b60e6be08d3918ee531696dee592be679759a8054a341130222ad1b733c2 SHA512 7a817661dc9279c841718449a63e218650358cfc8ea9f3bbe70e6b92f33da3156acfeda79be582660841eaa1182eeacc368815a2293cbe1b5fc23b7846755cb7
+MISC metadata.xml 500 BLAKE2B b73dbe5965b76d39d6e97dd46e7de1c0d583fe0b48de00528169068c6d86123c25000a37115d2f9db48eb687a95eb6742975daad252591d4ff18a8ca65b6f4c4 SHA512 daea7035cb0f2e5a852c457e3bdacb15ed5ed618e21dbfc6a42d25d92b8b7f17f46e597783c5fde45a8e71719e035d78cc94ae2c8d76be3e5f36e3f559856b47
diff --git a/dev-python/csvkit/csvkit-1.0.5.ebuild b/dev-python/csvkit/csvkit-1.0.5.ebuild
new file mode 100644
index 000000000000..1430aee3a914
--- /dev/null
+++ b/dev-python/csvkit/csvkit-1.0.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A suite of utilities for converting to and working with CSV."
+HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/csvkit/metadata.xml b/dev-python/csvkit/metadata.xml
new file mode 100644
index 000000000000..e13598b0ff4a
--- /dev/null
+++ b/dev-python/csvkit/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/wireservice/csvkit/issues</bugs-to>
+		<changelog>https://github.com/wireservice/csvkit/blob/master/CHANGELOG.rst</changelog>
+		<remote-id type="pypi">csvkit</remote-id>
+		<remote-id type="github">wireservice/csvkit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index e7458655f35e..831e0b68cd70 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,9 @@
 DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
 DIST dask-2021.6.0.tar.gz 3717136 BLAKE2B bc524dc4e885588ea92c0b24b6abe917b6a3989f7faa21d4dffa490f2952f4f7e90ce55e28ed97b34e44bf2c41a753fe80f092559999fa42e450b289c4b89933 SHA512 a4a1e86c286e0796f7ed79dd10c5c0f80e40bb246a7c25d45aed5e73a2d6c1da8743bf6b61ca784a8412403aa6e62007c937bbbdd8ffccf7170443454ff5601d
 DIST dask-2021.6.1.tar.gz 3725331 BLAKE2B 7b466507b968dafd2c6f3a3db70c3f557ed877bd489067ff5243794c44a9e77f9b72b4a000eb0865d2096845b3c6005739214bed1215ae053d9d1c313c6bb52c SHA512 c3c032ae8d67994cb924e23787a571ad75ac88ee682542aa486dd76b38ba25c809593e9bb11a716589eeea437aaf8b69a4ecdf676c417fe566d92a2b1a8678b6
+DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
 EBUILD dask-2021.5.0.ebuild 1128 BLAKE2B d11dd7ef54b5c61e5fb7f855f4654e5c81caac4dae773d88b3ec8e62f93464df5888fbefff87ad935ac8e2cee2acb2a5e2b3a910ae668b30bf6ef90d72265af8 SHA512 409347854836aff9cfe1047dfd36a5175094966205acc6216dfa2f6e1b0016df25d0822fc3ec6390808d30b90b69a6457e36df4d59dd31c694b2be2c5e4b4b35
 EBUILD dask-2021.6.0.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
 EBUILD dask-2021.6.1.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
+EBUILD dask-2021.6.2.ebuild 1130 BLAKE2B 0d9ab336ce9f03adb187c530e6af756648f079374998e6d7e38b04eb249ea3540488615717f22a9d6233c849f8a041016026763358c4533c1f4edda0e72b5cb0 SHA512 d11925208e98855335ba8b036728db1f42a57c4b263e124f77d20bd934ac8088f6ef06ce704cfa72a02dcc108aac3d73e474f7fa7d23e3236911ca090fb64b8b
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.6.2.ebuild b/dev-python/dask/dask-2021.6.2.ebuild
new file mode 100644
index 000000000000..d3f5be8aad05
--- /dev/null
+++ b/dev-python/dask/dask-2021.6.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dbfread/Manifest b/dev-python/dbfread/Manifest
index bf347a1a94d9..11f1e26b71ca 100644
--- a/dev-python/dbfread/Manifest
+++ b/dev-python/dbfread/Manifest
@@ -1,3 +1,4 @@
+DIST dbfread-2.0.7-src.tar.gz 33045 BLAKE2B 96798f00aba4c30e7e83b468f368ca6730a7e095c9fec5bf5515ac6a152022adbf5339cd9e68e85f4eccac211ed4e307b9abf22249ef6420d722fa213210d7d7 SHA512 cf591fa5800e5471025175a4bbbb54cb26dc2a83bf328776e4386860370d9421edd9edd62cb9e3d463794d526c561a0f4744bb67b5e376edd471dc95100bc2c7
 DIST dbfread-2.0.7.tar.gz 33212 BLAKE2B 03c9a0d93b13c7573b5bcec6c5af1ac43bd00ead2b3e83638f45344b2344062e86d764b095e699afdaea2405176ee15122c975a2f72b25bd167f5faaaf33043b SHA512 86c3a29e351b985984be67401a6dfe3e39cd92451a122788ade83d65313dde37a3706ce36c4365bd36ba1df62ee057b625f1e0f077aa4a248c7456258189f548
-EBUILD dbfread-2.0.7.ebuild 428 BLAKE2B 96d522cdaf2d408830b51706aac73caff5c06c5f14ff8a79434043c2330dcbe561de0706f23ab033d35488c835ac83b0dac1dd2d6916466a124138abeafcd9d5 SHA512 75d114591ce70d3a61e3f0197d7cfc9b495ef99f4076adb0db0b88ed146e7f73e7dffe0db6c2a9f06fc67ee2a1c090177d9fa786fdeb1606839bf86203ec50f8
+EBUILD dbfread-2.0.7.ebuild 953 BLAKE2B 446fb5e4bdd8f4f054bb2fe7e733c2e08fc2278818ead0cfc70e0f4a3cf2498238147f8b21ab86e031e7c87bd7791d3860a4eecb96a4057edcd808049307a1a9 SHA512 b908f68ea9d96f234958ef73053967c75ff89928a83b75ce6a2577c3f6b99a77f6444679beac6f41dc22f5d2a2f1f9d1823253bebc8798886d4b0e5440b2cedb
 MISC metadata.xml 475 BLAKE2B 834e270558a82002735ab817b6e6e83aecb475baae25f1fe8085544938bcfced988311d2e100a3b3784b732f3d468aaecd5818405780b2f081eca29ad40586d9 SHA512 f51775fbf3d7cc1e5c3038a5e485cea8b14eb26116d51bf88aa6e1d0c0fa1545a127c40a97cf569e5e3e5b812392e50e8ba69b69b3ea38af628717a8e9af13ec
diff --git a/dev-python/dbfread/dbfread-2.0.7.ebuild b/dev-python/dbfread/dbfread-2.0.7.ebuild
index f9a2f5858661..a2df96057106 100644
--- a/dev-python/dbfread/dbfread-2.0.7.ebuild
+++ b/dev-python/dbfread/dbfread-2.0.7.ebuild
@@ -9,9 +9,32 @@ inherit distutils-r1
 
 DESCRIPTION="Read DBF Files with Python"
 HOMEPAGE="https://github.com/olemb/dbfread https://pypi.org/project/dbfread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://github.com/olemb/dbfread/archive/refs/tags/${PV}.tar.gz ->  ${P}-src.tar.gz )"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND=""
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|\[pytest\]|[tool:pytest]|' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		dbfread/test_read_and_length.py::test_len
+		dbfread/test_read_and_length.py::test_list
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 09de15f1c894..01e6bfaa60ec 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,7 +1,5 @@
 DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
-DIST decorator-5.0.7.tar.gz 34292 BLAKE2B 93f69256e21fd9867faf8c80c6a62834e5206aeb552efb757badeb0f0ec0085699a520542feac2bfa1a0165c0a40f86ecf70e5717c10801bed28d1acd7397216 SHA512 78ae542b2f20d3d1714cf13120b14db308d73b866591c8ae42d69103a11e8d05a553438619bb68730310857587746e9d211ec4cf4b3fb5fbbcef030183b65294
 DIST decorator-5.0.9.tar.gz 34544 BLAKE2B c7dfafd9d7354d075a154ba9bd3aa2bed52454e3412ce22ed2cd47f4c1ec94f601c754bd270c1a2d9447a087ce114579d3b2b2340721dfd4aaac1e2d1f801b93 SHA512 8b46370bbc9cff5208823af60f31779b0ee02e03c796223ddfeb473f7c36bf7ee7da48c5712eea89ca8a96ef32695ff31c4902a76284caf543cf4937a0bd7aa5
 EBUILD decorator-4.4.2-r1.ebuild 585 BLAKE2B 5fa35e14878d8acf47afb8e7b78db7b861c66d66637a1b91f86c50bcdfc596b031d75adc0682053323b62a7094fd3ce2baaf71a8e2bc5b2abaed4b725e4a75c7 SHA512 2ef83b5d4d127453ace335df139b19f71b7f3222a6eda49c8caf00c253e870202e7f36f9d4f36f0668e543f8febb5cacd2ab9be54e605b246fdcbe7ff2d8105b
-EBUILD decorator-5.0.7.ebuild 644 BLAKE2B 2be4120a8fd47474e10112dc9f4afc6192399e4865f8332ba506d42ddb68a88b13351539305795c139404705ebcdf02bfbe0f8da5eeb44331904a3b2f3fa0074 SHA512 6198f6cdfd58b4b08f10e38b27365ad003a9bde53bbc469f674738853d695ae2a4195f6f4e1e583ccc6d71fe3b26cbb4d0b0c5a386df9cc0914c6a14cad858bc
-EBUILD decorator-5.0.9.ebuild 652 BLAKE2B b0fbac55eff383f492130bc2a1cf2561bf442c1c47be5a49ff4eb6ffe4a830d0e8dac33a53189993da2e4d999c0117394072163652df19e3382fe6faf0a72aea SHA512 15b7aa0db0a75bbe826bbef1358e3e51dc4a12e871a74658dcc5948408885c6c4c32f645ed7e8fb79e2fac919e4db8b1dfaa0fbcf27b27c71245f24bfd5132ac
+EBUILD decorator-5.0.9.ebuild 644 BLAKE2B 2be4120a8fd47474e10112dc9f4afc6192399e4865f8332ba506d42ddb68a88b13351539305795c139404705ebcdf02bfbe0f8da5eeb44331904a3b2f3fa0074 SHA512 6198f6cdfd58b4b08f10e38b27365ad003a9bde53bbc469f674738853d695ae2a4195f6f4e1e583ccc6d71fe3b26cbb4d0b0c5a386df9cc0914c6a14cad858bc
 MISC metadata.xml 755 BLAKE2B adb49470c4efa969898e39f60002800c948f985933ae6f3ee773f03b1a5cfc4f4addca2f4cbd486ddb3f37222c69090a88c2befed4769d33df96fab014bf5715 SHA512 e8a2802a144fab6e73d358c30fe2fe9ce394a4497c82670ccbe23f2ee156111b848444814114d17ffda2bbab26e3a126f8fe58ff6c2a9d63738d7733f4463582
diff --git a/dev-python/decorator/decorator-5.0.7.ebuild b/dev-python/decorator/decorator-5.0.7.ebuild
deleted file mode 100644
index 535b01d398cb..000000000000
--- a/dev-python/decorator/decorator-5.0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/decorator/decorator-5.0.9.ebuild b/dev-python/decorator/decorator-5.0.9.ebuild
index 8047ed24268d..535b01d398cb 100644
--- a/dev-python/decorator/decorator-5.0.9.ebuild
+++ b/dev-python/decorator/decorator-5.0.9.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DOCS=( CHANGES.md )
 
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index e2dd7ce2ab00..fbfc8f2fd079 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
-EBUILD dj-database-url-0.5.0.ebuild 553 BLAKE2B cde348508d342fc9814012dd925bb224b17b4fedf086b61494f8bae8b182c4f24ba54ce18c23128d78b56c20fdef63284d77d727a0a98c3d68acbccc540036db SHA512 da2f2cc84df11989933d2c16d03b0ad043f1007501ee38924e8215f76e80131aec147b1d5225fef8197e35b12bd574985e5f520fe557957b3b0f4b27066072f0
+EBUILD dj-database-url-0.5.0.ebuild 560 BLAKE2B 29114e02ca82946b9e65b5bde8e7e55ac35c85275c5c9d8a577233e564006feac5d2f3201899ac43da29b6ec6597417f671e0df644fe59de205b73d24b438367 SHA512 52fee255dda8cf8f262e12b6ff00c7aa52637a2fa43f2bf322addb392ade69dc9b7108bc549b54524bfc8b91e82c3d6f266359084ff894351cf124a218cf3c86
 MISC metadata.xml 406 BLAKE2B 9e373049eda15ee3ac87de1a93c2c6ace80868cd42166bb9d8a895b0d558e84160de131c2e9db969dbfcaf0f8400176919800cb5b0b07202533022d707af1f0c SHA512 0003de2818ac2fb9acdbe55fb3c40d46f1a32fab1e9b4e03c7b9426a7f841d31abb323bb863282ff1b10503d751cb31c67d4ffb693bc56b8f262edbfc382777b
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 49bfe7e9acf5..70b6e3e3cfc9 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index 6a15e1208bb0..0640f35a2c9f 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-email-url-1.0.2.tar.gz 7213 BLAKE2B b538fe96a1bcf0ab2fddb4f09f6bfafefd07a9a8d61fbdeaa3be3e21bd90d87488c852200a100c544023ee0a8b57dcc8d75cf6aeaad6489da106e911ce8e683e SHA512 446c2e9847f135981f32bb2116d8abd3fbb80765dd1301821992a97acbbbae8d74d1109fbf7bdc3ee469b9d40c4ac08f39befee36a06926a1d049291a5c0c837
-EBUILD dj-email-url-1.0.2.ebuild 610 BLAKE2B 6fc06cd7b7290a2b96c468ce6ba34ca3ae45b2862d81d6338bc2c48953ffe0801655bf443b7896adb6cd33c3379d337469a6d995bad431c5f057aa3e31e5add2 SHA512 1aab44802a5460e272a484f33c8efdcb4cca5382f14a283a69093f80310eb278c8a9e35d76fe1125666558d66fb6b3e80e25536f0f5f699e29d69349aabbffac
+EBUILD dj-email-url-1.0.2.ebuild 617 BLAKE2B 40befe102f929f39ec42e0c04a42b1e4b33608601519fd735e93efaf0500c39bc5df584b09a99e992df18875d5e45e1a5c33907657833e9b04e417b8806fb3b8 SHA512 21d0dfa737175a1448d40c8a1558e7c6eccb0d789672a0753f33be073737e0b7587a05152c1559263d76de36a70942d38272d8e4befce15215c94fbd8e2a8de2
 MISC metadata.xml 407 BLAKE2B 724ee962580eb5c4ff6b2b8d82d7cc50a6d6778b73a06f1cad1f7dd2f64289de5b72dc9713aae488dcf23c57ee575d5080765f2d8bfe41b9f845fa81919eb628 SHA512 fe1d3809c17706d0801daf8c073ed5f70eb56c525a9ea978d1b449720a2cdf43086adbc61c4585123d6712b40242dd145513d9fab15e35889b1b4caa62ea9c33
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
index fb6f2bd00eb4..09351696320a 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index df66de40928d..6809f9eca2d9 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1.ebuild 450 BLAKE2B aa63e6df29130e99ef3249ebc864188d63613a878b4245e4436db826ee97446345cddac1019bed09c0e61cc2abe085c087776f6336b1989381528cf7df1c2920 SHA512 f9a53b1532f66f082ffa9178016338adfc0654c51c1fcb82cffecec9b1ad6696c54f037d9baafa3526704072ceed129998a09218e7619cd2a4d87abf7f3e91bb
+EBUILD dj-search-url-0.1.ebuild 457 BLAKE2B 0b5f98c72675e9d48a1eea482c2bb62d0cd301c52011091c7aa9225ee2243f588dca1d3f008a11615ffcc8b21b2970a5c0bb35f4db9a3ff65935b912001a704a SHA512 81c50b11f4cb161aa95135f96f5435527eff418c75f35946b2e961e92170e70471022363cb9c63d7f4d75841d2b0689432872db01cef88ada6b83a7b784b4e44
 MISC metadata.xml 355 BLAKE2B 31e54d6f53ffffda0e1b261309311c03e4e3ab8e500c06bef6fb8629800fd32f779b4c6c1e69b868e557b47fd4b697db86bac49fc42b173a77d0b4765a8f997b SHA512 be285d36a522b446fa95c6ef5a976566922a9e2f0c9fd71b2ebaf2e0b8a4ff91c148e749e698f36fe618c57267cb01f2e5a56b950cf4a99cb9ee23b1b8807045
diff --git a/dev-python/dj-search-url/dj-search-url-0.1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
index 84fb6ff792e3..217ae91b7bb8 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 05894566163a..70898b99c03b 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,3 +1,3 @@
 DIST django-cache-url-3.2.3.tar.gz 8198 BLAKE2B 19c91cdb519fea9c80e4d5e89ec9d340fb9193ec3891f6fbb42ba07cac26aba2bc69c00c65797f0f70c1a4590ff7be2037eebf3bf4589270e68afe289f74945c SHA512 d5b3653de755a668c33d28d66d38d938fef84d3acbfd726463c85a45c49a4d13bf880723226be2946ef7ea784e10623e164e448263893f779effc3eaf75c959f
-EBUILD django-cache-url-3.2.3.ebuild 717 BLAKE2B ec8626ed0c90ce599f9767e81880b2a77353f40472f1186573fa650e4132f80946828a0fa0dc1a7b751b1527744b1d238ecf78cf1b9845b4b6797e409cb24580 SHA512 2ff542e22d0c974913d6795ea33fb5487c9794e11e18efb9234cca4103b399391bb2cba1b202cd88d21c623cc4e42896eefd148c5bd226ac03e77a23e5a774e7
+EBUILD django-cache-url-3.2.3.ebuild 724 BLAKE2B 6d14067dbf728a7e4fd3134bf7948cce156e603b49f12a47a28dc02c33c2cca4e42a7331615632816cd0f0b18e599128142ccff96346d596725aead832ebb67d SHA512 60959169a7d4f0a2c9921afb551d0d348f2089e04262779a81ad9a5fab055871cbf3a851b13719884c883af4b677e203ef5003ef7e7708e0d0ad8e456942cc47
 MISC metadata.xml 413 BLAKE2B 7a014841105ea407191ef0fad8df2365a13101fcccf9324a3dfa3a55f67be9d5f9c3c33b766660cb1cfef9d14358634e304da3e62eb97b02652ff331b4643dba SHA512 89fe4d187320cc50d60a1d4821fd88d57e42efc6ffe4ccdbeb6b62c1d2d6e3b642997b1bf7bed054f0ec1fab0e774af7c2ca422a87dbf37b3d210d03073beea6
diff --git a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
index 9981da82483c..1909cfc9a087 100644
--- a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
 
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index 3f5e8b55077d..e1d8b3cde0f3 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,3 +1,3 @@
 DIST django-configurations-2.2.gh.tar.gz 41909 BLAKE2B 4107e37a694d4c9670f855886d870c7aea30e9b95788a6c09f6fb3c913d3ffc4d17ed250264ce9ff0408856787b4768cda67eecf26c135ccb338ffda7530fd41 SHA512 9c53811016c20ae4dedbb9e1951b45440b656fad2fb9544e94bbbabb65a5883846ee063647f107ac57c08e54db71206b89903ee1d02cbfc0c8d3dafe7520e5a2
-EBUILD django-configurations-2.2.ebuild 1437 BLAKE2B fa8cfc7632726c68df93abed9c404e05c6aba783db9fdf503eb244b67da0465183b4599c747cb63ab22743dc878a67ccea7cd408da24257f847272aa04ee3c4c SHA512 bb8451737e9a89e848539c52f87c1d00fa675b5189f09d1c515092de22ae0184d359c20344445cf747d3d9b4d4c9f032f7047c9f436eca1d1549ef7b17195b34
+EBUILD django-configurations-2.2.ebuild 1444 BLAKE2B 482266473b056da21d6b80f40dacd5857b9e517abe1123a9df9836a4ba2d18b97f19bb2ef6f96c3c602b987d3fab995f9c1c3b02192e1bbcafcbd99db2a96b21 SHA512 260a8cf9fa98be3a1b4d580449261c8a0b7779852edd124fd9451a8bcf5824bd6176757d5a6b2cb7d9b76e11e7f3ab581fa609b690d6bbde2b7f7d9432f6b8f1
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/django-configurations/django-configurations-2.2.ebuild b/dev-python/django-configurations/django-configurations-2.2.ebuild
index c7129a7f7547..4dd4211e9136 100644
--- a/dev-python/django-configurations/django-configurations-2.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index c3457eada3b0..85d4bef32140 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -9,5 +9,5 @@ DIST Django-3.2.4.checksum.txt 2549 BLAKE2B d7f9e0fb88d9913c611ab3e5c0c276e135d2
 DIST Django-3.2.4.tar.gz 9824343 BLAKE2B 25123c228171953e057fe6ba75afadc49c49567e167045c292606e914538f58f9628e48485f611afaacd7e173f36c720391c06662f8dcd796e966f7557f60216 SHA512 5891f77c884cb4bc74f4c9759e2e7be463fc0c661b8dd4d889be0ec46919e59b81f5ce1585c28075b15f03355e66d4b8e7b09001f0c2bea15f8c8aac77d1ea16
 EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
 EBUILD django-3.1.12.ebuild 2772 BLAKE2B acad8972236a8f97952aa470f5cbe676f388e57302fce5fa9b6112ea77e9371e3bae3ef71034290a3f8d7ee814786b3c3228c4fcfd3cb71f739de69582745158 SHA512 1f062305576242f513303b6f3b2e9ba14a50c60200142429bb2a55ca6566233c4ab4bd5e19597cc52d5e9bf53a02d89f90ee0c72100aeeb5cc35314bef6c5890
-EBUILD django-3.2.4.ebuild 2986 BLAKE2B 4a9aadf48261a39c8d4edc24b5fda7d6317c1f0391e34c67c14054e93f77530c8ccd481d465e08015fe03adaa6d230f93177390d357de94e0b9d3aeb9c2210be SHA512 d801e4069fbf1f7a3b55ea456fe50f97c5980132e75e9d83023e7423983d65cf9f923abfcf1e0d498f0682fec5315c219012fcb179aa5deb177e8541c75983a3
+EBUILD django-3.2.4.ebuild 2993 BLAKE2B 5e5a148dd83c40c8b86bbbec80e574a7fa465ac42d5b6c69e5bae60cda7a808acfea48846fd564999479cd042c3c2e80d32fdcef31ca0ebc6da3a7856a3b7b37 SHA512 04bd0a8108af7b99c1607dc78cc2f893e165ed7a2488bf713cda582e35a4418009d924a7d318bb52dc4e3d4989e315c4ecb0b423d156cf394552e20c2e431604
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.2.4.ebuild b/dev-python/django/django-3.2.4.ebuild
index 6c6a565edfbb..96f67052a297 100644
--- a/dev-python/django/django-3.2.4.ebuild
+++ b/dev-python/django/django-3.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 optfeature verify-sig
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 86159ed1c310..9aa6f023e0c6 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,5 @@
+AUX docopt-0.6.2-pytest_node_from_parent.patch 958 BLAKE2B 0fc4437f92f9410a47823a28b1b26057bfbc1687923ee56b0c69b4d921128b7b868fd793098b8399349906a4353aed9e2801ced0d458cf121af31b209df118e3 SHA512 74a384b1e62128df781c5c24bfa6a0f01de63610fadb51349f8f094375b84ab090209d86cde1a65116c735bb90eca61cabcef60e608297bb6976da2f5b510529
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
 EBUILD docopt-0.6.2-r3.ebuild 738 BLAKE2B ad1a7cde723e3fced02c848ceeef7477df6cb77a0bd7d6f8a0fe19eb50e2958cde618af92cca1b3c1e8aaa7d6140d88bd46a689f37341d0e373fcec95948f4d6 SHA512 3585b03373dfe0c5d2450223f95127f3a38566c05401e119e2d746a41f1d820ac582d2b217d7b144f27ee333274b5eecdcefcce710366e4e9aba8b75a28bfd99
+EBUILD docopt-0.6.2-r4.ebuild 623 BLAKE2B 5f8aa521a9add2f00166361f2925d36414a98c925e8bf9a039eafe0e408d3f2743da9be5c4422d3638329ddcfccbb52e5c152bcf0ab3d36f5da5a5c2527b0efe SHA512 18b856082f33d157c24e5d6e3f47f6bfbd31e62622401637b65995ce6fcc61a0e46ddf0e7ac4ce104477aec7f3b3d299fbdea3970a7713b5fbdb4500462c4978
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r4.ebuild b/dev-python/docopt/docopt-0.6.2-r4.ebuild
new file mode 100644
index 000000000000..eda052636089
--- /dev/null
+++ b/dev-python/docopt/docopt-0.6.2-r4.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=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic argument parser, that will make you smile"
+HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
+SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/docopt/files/docopt-0.6.2-pytest_node_from_parent.patch b/dev-python/docopt/files/docopt-0.6.2-pytest_node_from_parent.patch
new file mode 100644
index 000000000000..bf6ef1f80346
--- /dev/null
+++ b/dev-python/docopt/files/docopt-0.6.2-pytest_node_from_parent.patch
@@ -0,0 +1,26 @@
+--- a/conftest.py
++++ b/conftest.py
+@@ -11,7 +11,10 @@
+ 
+ def pytest_collect_file(path, parent):
+     if path.ext == ".docopt" and path.basename.startswith("test"):
+-        return DocoptTestFile(path, parent)
++        if hasattr(DocoptTestFile, "from_parent"):
++            return DocoptTestFile.from_parent(parent, fspath=path)
++        else:
++            return DocoptTestFile(path, parent)
+ 
+ 
+ def parse_test(raw):
+@@ -41,7 +44,10 @@
+         for name, doc, cases in parse_test(raw):
+             name = self.fspath.purebasename
+             for case in cases:
+-                yield DocoptTestItem("%s(%d)" % (name, index), self, doc, case)
++                if hasattr(DocoptTestItem, "from_parent"):
++                    yield DocoptTestItem.from_parent(self, name="%s(%d)" % (name, index), doc=doc, case=case)
++                else:
++                    yield DocoptTestItem("%s(%d)" % (name, index), self, doc, case)
+                 index += 1
+ 
+ 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index ae0432c25102..e7b5c68738c2 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,3 @@
-DIST dogpile.cache-1.1.2.tar.gz 370404 BLAKE2B 6895ffe057ef614ef6bcc4ba58a4bb2fe69b8e57943cff38dfc472bd3dec5ad4e34fc65d9fa0830a2396f6a789aedd6cd1e1e06dff911a3197ca4b64fdca1c36 SHA512 e68c2b358e6822d2db90422b92f1e9c9b997c89087ca69c8fc9511be1e06cdfeb14eef759085fdbca4dfc668dabf3901cddeb6a6c2f327d28c8968975908c160
 DIST dogpile.cache-1.1.3.tar.gz 387490 BLAKE2B 580be4f524196fb56e651d793045bf2e3419d3c98e65be0ba2cfaaed97f9c9cc08efe67191f77b273e97ffe907e8f5e050a7a36d2d8287522a21e7c4290d1354 SHA512 fd735b0bb9b7eb3bb559c030c15ac547aeb3f4718c64d7edb0f26f0f8a71b9b067434e984460c40cfbca57696d2b9579266f0c9d48bad4cb3c5bbc07030a4fb4
-EBUILD dogpile-cache-1.1.2.ebuild 726 BLAKE2B 13edcf5770f3c705b46b37869aef9d33f9126922f67edd4dac7953ca371823946e16bc5880afc7fa6c9f059c9999fa1423c959d3d3d519082a2b65d4908a556f SHA512 47ac46f3dae3369271b9ce249bc8f335d78308bf62786f5af4685d3450351aaedf5b9e2e595fdaa66c58609f184a23c9f9f611f0d1b905ad068089bfecd900a4
-EBUILD dogpile-cache-1.1.3.ebuild 729 BLAKE2B a0264e668c9f0eed0936a6dee7315c279b5e8db30174c543f6d2f2c901e064764f8379aceea23b13e04b17047e8d6841eccab592a7b9dd8dc19a60cb900c30f3 SHA512 034efa04ca66955a1db056a9ae2db5b876392c995deb45f5cdcac5e8ec6dd7e413cb6364a4dd56a7483833a863a34c6c4a6cff62a900d42cdfbeff3754d85ad5
+EBUILD dogpile-cache-1.1.3.ebuild 726 BLAKE2B 13edcf5770f3c705b46b37869aef9d33f9126922f67edd4dac7953ca371823946e16bc5880afc7fa6c9f059c9999fa1423c959d3d3d519082a2b65d4908a556f SHA512 47ac46f3dae3369271b9ce249bc8f335d78308bf62786f5af4685d3450351aaedf5b9e2e595fdaa66c58609f184a23c9f9f611f0d1b905ad068089bfecd900a4
 MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.2.ebuild
deleted file mode 100644
index b7a9ca06d183..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.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..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
index 4174912da531..b7a9ca06d183 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ewmh/Manifest b/dev-python/ewmh/Manifest
new file mode 100644
index 000000000000..80e3bcc2e9f7
--- /dev/null
+++ b/dev-python/ewmh/Manifest
@@ -0,0 +1,3 @@
+DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b
+EBUILD ewmh-0.1.6.ebuild 484 BLAKE2B 216e97beabc45f445c60cf87811473cf197c13db63e040054ced258b0df9f8b8b37b47be501009eb44d2446626ae4e210cbe550146c1e8262b91ea6e55e936c7 SHA512 811fa4028c6d8d9be03c1b3f3fe66573d0ddb059746f2b30e3fe2bfb2babe1be8dde36f3fa716a7bdde4adb67f33e393599043a1aba05b807c9a1a223583db9e
+MISC metadata.xml 471 BLAKE2B c8f09a0ac2212bac2fc9b49057f8207ff0193c097c09853edeabd2cfc5388d3b0c9b584bf3696817a29b038974724178be52a994a783ac88ab956bb97c65437c SHA512 2435b9f91a8911c6cae39a485e07b8418456d51712737c2ebe89c30085594bca821be8eef2be99db60a29cb2486b6ee5313369b81c43e2ab351d2919176f18a4
diff --git a/dev-python/ewmh/ewmh-0.1.6.ebuild b/dev-python/ewmh/ewmh-0.1.6.ebuild
new file mode 100644
index 000000000000..41e1c834122e
--- /dev/null
+++ b/dev-python/ewmh/ewmh-0.1.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of Extended Window Manager Hints, based on Xlib"
+HOMEPAGE="https://github.com/parkouss/pyewmh https://pypi.python.org/pypi/ewmh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/python-xlib[${PYTHON_USEDEP}]"
diff --git a/dev-python/ewmh/metadata.xml b/dev-python/ewmh/metadata.xml
new file mode 100644
index 000000000000..0045e1c15bc8
--- /dev/null
+++ b/dev-python/ewmh/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<longdescription>
+		An implementation of EWMH (Extended Window Manager Hints) for python 2 and 3, based on Xlib.
+		It allows EWMH-compliant window managers (most modern WMs) to be queried and controlled.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 713cc3cf6756..3bde73435870 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -5,10 +5,14 @@ DIST feedparser-6.0.3.tar.gz 251556 BLAKE2B e0aec37a3bf70be26791c6717dd015e128a8
 DIST feedparser-6.0.4.tar.gz 251880 BLAKE2B 22a94bce43b4ff8ad9aa95d07c71568d7d6e1d8732ce84880f1565d48673706a3eea1c9bbf2dbe42e6384a737170c409cddccfcbfb46f92140d9262b16573071 SHA512 33b6e2cda5a6fe5bc1b51f26ec256e86e81c7cab050027592cc47173389554a7ebf9ed82454690dad534256bac5f907ca0f32871b2741d1d5318ff94e8e66558
 DIST feedparser-6.0.5.tar.gz 252003 BLAKE2B 91f1a5cd8f1d7124ebfc4c6ce31be81d2251a3769a2ec491325236ecc6506d73658fa7f4825a82e41d4c190017a66a41b6a93f19b37f0062d2abcca76d6791bf SHA512 6b91c8cd84ac7de9a632ae23c3bcd543ecc4dbbeeefac370c62af0fc83057a108b26a84e2199ae900300a09e89a117c475776276231d7cd27d20a10b16814958
 DIST feedparser-6.0.6.tar.gz 252114 BLAKE2B 47a22799c76832d8c21959a43514f4e81b427a1d54d4cfd6e95bcb3cd23a8b50611f640107d9078b3bf8f4d3b254b8c8863fafe56b6a53d02cffb6d7cd7c1a3f SHA512 e94b0f8e1be2b70db897297fb456df3d5e86a1e952fd4278f9370fc94e3a13930ddbeb866a525b9344e9cd2e4d768a7bda7b1368354e68d16eff133319a8bca9
+DIST feedparser-6.0.7.tar.gz 252432 BLAKE2B 7eba914b073a241d79c73a1a3a0308d035fae9eaa26a3eb54714272d534b5c965db97676e32ce59bf748dfb3ccbf31d1044b75006b87df0e0b6fc2f7a6f5fc6d SHA512 ae0f871dac2f7096e265f6931fe275ecc22eae091a6855fb5d1b78c9a5de9a16cff05742ddf05277068d6b4e4908b2350bb8784855be4c136c9b37835c19efa2
+DIST feedparser-6.0.8.tar.gz 252496 BLAKE2B 1a17ef6aa41e0782743d5d331ba26e2d1518475534adcd62457bc6fab00b93e24a3a3b03f4acf8358d321464b985c9d09383dc0373680577c10b742c5e1366fd SHA512 9de702dbebe28b379fd164afed8c408f46301f3ebf91d9f862f12de98a1bcee9f6d38a27c0b8a64e87bc0a20d0ad992ed78b190406649f775e2e8c9ca62b4d8c
 EBUILD feedparser-5.2.1-r1.ebuild 1133 BLAKE2B de711d5a8a89583536f614de0a692c4f65bd0592bfc8ebc0556913c5104ef46c781a32fc8fd58efbebafaf44874279d180668242b4f2c74344bb137b566ebfaa SHA512 56e5dc52b253e94c5effcdbaa00915d5e0d993e39490e98f05e2eabfac93c32d48d815314acbb1255f80f408508f75dac68d173f56a73a78a1c70cb19ad19972
 EBUILD feedparser-6.0.2.ebuild 894 BLAKE2B aed5a4f23419c7435f4899907ea0c79b3541a2e369fe2177296b41e22a01093aa278b28ad290242bb7163866aa8370f6e2730c7243ae9c7bbcd3abb8f78da349 SHA512 86a5f6b27f93c71c9a9101ae438d8f1df293d12faaac8278c3fc9e09a9e847d2cdd4976777a6958d0d038b932a50d473d4878b434d29343082b899d5f00eba69
 EBUILD feedparser-6.0.3.ebuild 901 BLAKE2B 9f40f785edee14d6058ea0c54cb9a349c6583a46ae30b3644a2071fdb8860e96d4186de3d10ed5e2892bcd7ff1e4bfe9f3f6f39cc0c0e29256d449e8cf46abb5 SHA512 6f3821988a7555a2359fb608bae5752b2b5f7659affa839bc7141b9499e2f8f828a61202f799b85c99f4ef2b97bd422a97388e28fb907ac7ebbe2bc58c46b89f
 EBUILD feedparser-6.0.4.ebuild 901 BLAKE2B 9f40f785edee14d6058ea0c54cb9a349c6583a46ae30b3644a2071fdb8860e96d4186de3d10ed5e2892bcd7ff1e4bfe9f3f6f39cc0c0e29256d449e8cf46abb5 SHA512 6f3821988a7555a2359fb608bae5752b2b5f7659affa839bc7141b9499e2f8f828a61202f799b85c99f4ef2b97bd422a97388e28fb907ac7ebbe2bc58c46b89f
 EBUILD feedparser-6.0.5.ebuild 901 BLAKE2B 9f40f785edee14d6058ea0c54cb9a349c6583a46ae30b3644a2071fdb8860e96d4186de3d10ed5e2892bcd7ff1e4bfe9f3f6f39cc0c0e29256d449e8cf46abb5 SHA512 6f3821988a7555a2359fb608bae5752b2b5f7659affa839bc7141b9499e2f8f828a61202f799b85c99f4ef2b97bd422a97388e28fb907ac7ebbe2bc58c46b89f
 EBUILD feedparser-6.0.6.ebuild 901 BLAKE2B c3a78001c8760f350b47ba7f8732e9b7a128ed7cf119c323c68149b126f88e0a34b9a43d61ce83d29565848754bed35295f9f70eb20ce43255350b566ab85a4c SHA512 732fa3d4d17ea6ae0d0bf0c9d00dac50ce71a418fd6c79ca7da61db537bae9beef5ec17e69d90768e4ad40d9e83e5d5e7090bbfef655375cb92061a8e565f6d2
+EBUILD feedparser-6.0.7.ebuild 901 BLAKE2B c3a78001c8760f350b47ba7f8732e9b7a128ed7cf119c323c68149b126f88e0a34b9a43d61ce83d29565848754bed35295f9f70eb20ce43255350b566ab85a4c SHA512 732fa3d4d17ea6ae0d0bf0c9d00dac50ce71a418fd6c79ca7da61db537bae9beef5ec17e69d90768e4ad40d9e83e5d5e7090bbfef655375cb92061a8e565f6d2
+EBUILD feedparser-6.0.8.ebuild 901 BLAKE2B c3a78001c8760f350b47ba7f8732e9b7a128ed7cf119c323c68149b126f88e0a34b9a43d61ce83d29565848754bed35295f9f70eb20ce43255350b566ab85a4c SHA512 732fa3d4d17ea6ae0d0bf0c9d00dac50ce71a418fd6c79ca7da61db537bae9beef5ec17e69d90768e4ad40d9e83e5d5e7090bbfef655375cb92061a8e565f6d2
 MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-6.0.7.ebuild b/dev-python/feedparser/feedparser-6.0.7.ebuild
new file mode 100644
index 000000000000..20498a98346b
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser
+	https://pypi.org/project/feedparser/"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/feedparser/feedparser-6.0.8.ebuild b/dev-python/feedparser/feedparser-6.0.8.ebuild
new file mode 100644
index 000000000000..20498a98346b
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser
+	https://pypi.org/project/feedparser/"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py || die
+}
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 24f5a0ea3c90..abee9c3954a0 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 875 BLAKE2B bab920c6588259f454a99e816b5a8614be604d6fd1cc18502048abe474e2c09b6e1c4efdf5dd098e40f889574907b62917e75d4907f12d6bf8834744dfab5207 SHA512 1c5d63ad8471ddacdc42102dff0bc5731e03e540dc658dd195e7121d6f3bd662282b19e0e3f01e9c76be18fd122439d912af75155197ea2198227dd5f5f99033
+EBUILD fields-5.0.0-r2.ebuild 813 BLAKE2B e991c9d835eb2a2a16083cc12164fe6830e5eaae66fe950d48073af4437c59e0289d0e091a7e250f19ee83fd200d46a80e4eb8712b7829359d34504258a6dfc8 SHA512 184474698f1482220c243426f01c9f28e73b29d8117b1c8dcf6fbbbb0c188d9eef144b6f82e8944cccdb6bcf7d102a8225630cb26be96dbf49a5784d377ad8cc
 MISC metadata.xml 394 BLAKE2B c44d383b7a260304d050e1f46642c0adb5ebcd1a3ffa8317d29758c4fdfdd2afd1e9e0d78ece54aa45235cde09af87d8aafa86b20193dbfa495e51c796f3c914 SHA512 9158a335ac27faa4ee14da7063e859c71f4f80a09ac512c3804ce0e830ed8fe1241cc8a6f05561728499a9ccb08631252a0eead97232d25af240b9b6b54d4a92
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
index 15946a9d788c..6beb01064bcc 100644
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ b/dev-python/fields/fields-5.0.0-r2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Container class boilerplate killer"
@@ -28,9 +26,11 @@ python_prepare_all() {
 	sed -r \
 		-e "/--benchmark-disable/d" \
 		-e 's|\[pytest\]|\[tool:pytest\]|' \
-		-e '/^[[:space:]]*--doctest-modules[[:space:]]*$/ d' \
 		-i setup.cfg || die
 
-	rm -rf tests/test_perf.py || die
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	epytest --ignore tests/test_perf.py tests
+}
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index 33af11dfa902..1fab85c0b2d9 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,6 +1,3 @@
-AUX flask-restful-0.3.8-werkzeug.patch 1517 BLAKE2B fa895690ca771f1b4431c62baec0577554fca082418c2421eb8012be2e234699eab54f2690d237dbd490f536eae5fe0fdfd8fedad16fc60bd92351f66c93a7a4 SHA512 96db20a0850f37ebb90fad0964448783c3af8b9b8128709fc52d509f9b1edad72455330a09f81b4b766eea7b88f3b79fb01e112f1684be7776a8b3a78ab90a19
-DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
 DIST flask-restful-0.3.9.gh.tar.gz 118195 BLAKE2B a4f18c3faf06a7c9b628657aafbab4b9492793d9a61ab60a3e4d8112e0fb5e120cff2f2dae87915e44915838572ae0ca1737025ad5f906c2a953afc4b1f49c6f SHA512 34bea8ed6e9de3ad1c2ca63e7af67ed2a175f84c433b08ff643f91d88feda0e3c1c3967deb2fe5ad308b05f373b10c08245edf65ed97a7c5a3683aa900e9edf2
-EBUILD flask-restful-0.3.8.ebuild 1006 BLAKE2B 952156256c65bfe2b4962d0df8df914e27026a92ab1a178a760a9738e59885e1fadc531883ec29f36ff88a552f7053345b0997a9fe8073c69ae0b6b4c9eb46e0 SHA512 bcbad3a388eab456d78f6ff3ea985a8c1009cf07db5ea9376c49b751a943dbac248ac4a6f151b8a5838d5ca282e7a9012475d3b3951a55bdd8c05a08e53519dc
-EBUILD flask-restful-0.3.9.ebuild 952 BLAKE2B bf8b1f6c96677f443e2bd5499d3505ff55bc7d2d503702b866b18cbf3ea844dcc09e7f1b018052eebcce1b88f09bb076c2a5353fff2ada018a6ebe8486dcbff1 SHA512 a49e0792b560799e6a719d63403095c5ed82563a4ea1316382cbf3f6a61dc3be7398c5b57ca04b5c09a743ab4c7b82712000532d6ac4be3965abc55472dccdb2
+EBUILD flask-restful-0.3.9.ebuild 950 BLAKE2B f010b4547f34823e4c71135dea52185a39b720dda2178d025de5dc387a459aef1b1f59906c52bdd6f000c8afc176ef4a45530ec1bb033fb8cabb8b5a198afb2f SHA512 0967efc60209aaf8af1b9bff043cdae34a8b63ae24bda3650a16ab935f2e0d32093d494d428d9aa5653bd3b6962b5bc9a2155e7864c6f6c16d7b48bb556f78ea
 MISC metadata.xml 407 BLAKE2B 32075e72b358faf256d1f2b0a650eb7b1d966dcb4376a4394933545b0b96d77d633bdcd8cdc6db044c825fdc237b9b4674d38d3d90027f9cb758325121dcba6d SHA512 2b7f74ec3648a92e7740b22a8ee5f367d61553d37fbc854a90cf2774a383e1fdc3382217c7811d21f8a0a98dd363ebefd873a8a8286cbb8e0f781382584ddda5
diff --git a/dev-python/flask-restful/files/flask-restful-0.3.8-werkzeug.patch b/dev-python/flask-restful/files/flask-restful-0.3.8-werkzeug.patch
deleted file mode 100644
index 32b0b7b2b460..000000000000
--- a/dev-python/flask-restful/files/flask-restful-0.3.8-werkzeug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 73376a488907af3042b52678ac4c23f8a8911e5b Mon Sep 17 00:00:00 2001
-From: Anthony Sottile <asottile@umich.edu>
-Date: Fri, 7 Feb 2020 11:06:15 -0800
-Subject: [PATCH] Fix testsuite for werkzeug 1.x (#862)
-
----
- tests/test_api.py      | 4 +++-
- tests/test_reqparse.py | 4 ++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test_api.py b/tests/test_api.py
-index f7f8e661..6795d362 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -445,7 +445,9 @@ def test_handle_non_api_error(self):
- 
-         resp = app.get("/foo")
-         self.assertEquals(resp.status_code, 404)
--        self.assertEquals('text/html', resp.headers['Content-Type'])
-+        # in newer versions of werkzeug this is `text/html; charset=utf8`
-+        content_type, _, _ = resp.headers['Content-Type'].partition(';')
-+        self.assertEquals('text/html', content_type)
- 
-     def test_non_api_error_404_catchall(self):
-         app = Flask(__name__)
-diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py
-index 2f1fbedf..9776f17c 100644
---- a/tests/test_reqparse.py
-+++ b/tests/test_reqparse.py
-@@ -2,9 +2,9 @@
- import unittest
- from mock import Mock, patch
- from flask import Flask
--from werkzeug import exceptions, MultiDict
-+from werkzeug import exceptions
- from werkzeug.wrappers import Request
--from werkzeug.datastructures import FileStorage
-+from werkzeug.datastructures import FileStorage, MultiDict
- from flask_restful.reqparse import Argument, RequestParser, Namespace
- import six
- import decimal
diff --git a/dev-python/flask-restful/flask-restful-0.3.8.ebuild b/dev-python/flask-restful/flask-restful-0.3.8.ebuild
deleted file mode 100644
index eea5a35b47ce..000000000000
--- a/dev-python/flask-restful/flask-restful-0.3.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple framework for creating REST APIs"
-HOMEPAGE="
-	https://flask-restful.readthedocs.io/en/latest/
-	https://github.com/flask-restful/flask-restful/"
-SRC_URI="https://github.com/flask-restful/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/flask-restful-0.3.8-werkzeug.patch
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
-
-python_install_all() {
-	use examples && dodoc -r examples
-	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-restful/flask-restful-0.3.9.ebuild b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
index 858cb0ca86fc..ced9457b8003 100644
--- a/dev-python/flask-restful/flask-restful-0.3.9.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 9ed7b985895f..47ee67a5a8d3 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,6 @@
 DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
 DIST fonttools-4.24.4.tar.gz 2556059 BLAKE2B c415ae5214b6df7171a5f8a7ea179b1a4adbc6646598d773f0d3d6a8cd777e8fd3c74c14f00e6c4735a73e712e3fd42ddfc96f3f101d34b122fb9c471d4d94a3 SHA512 aa4ee8f0a7f9cb6d8a84497e6f33f891491cd06cc477a785715f8fde8e5b33cf781ef8b848bfab8cf9a97fc15c018d493c6baf0fb8fd314b8a348c36ff627f41
 EBUILD fonttools-4.23.1.ebuild 1275 BLAKE2B c141c4c40de9f3eec1679e8b574ec266962a6749c1a16fdf6fa8ebc7e8cb6cf705f7c0907a55793efa1f31d8f9bc65a9708a865ddd8897a5956c7161be354ace SHA512 4204c3df209a287f41da115fc6f04ae40938dfcc50721636c9273f69821c29e63ea9ebd33a2a7dfd0b97f067f519376f4f0707fbea10de8e87dce12527ebe5e2
+EBUILD fonttools-4.24.4-r1.ebuild 1303 BLAKE2B e27de8a4b573c7aac56b6b6e64ef2e68ddfd3e4bcd8ec7cdf10fed6d18261c2c1916a15d1fc40b85288a3b4513ee4abe687c2be796cd34db09aa68b88f06dedb SHA512 1dc4ae9e85b5dce901a56f82b9579c2995852833ce86d7186c013632f214781d1a44574249fa7d5fd477f0fabca745af33ace8e9b19592998854ed9eb2a89ead
 EBUILD fonttools-4.24.4.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
-MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
+MISC metadata.xml 371 BLAKE2B 68c245e8fa48ff65af06976274a7352964e39e13147683e266688f953d82d67e0548dacfe675bbd2e6807945c2e367bf08de4d18f75d53f44b28ecdcc8e7f188 SHA512 489bf8cc57a5bd577fa8949ae0ea9ec8be9a77bd6853e549c830f60ba6a152bc7dd25b2f3426974ea6448120113808ff627f9179e5e1e70105003057008aa86c
diff --git a/dev-python/fonttools/fonttools-4.24.4-r1.ebuild b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
new file mode 100644
index 000000000000..e40813acd252
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.24.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 303f1de441d2..2cf256f7f2f0 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -5,7 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">fonttools/fonttools</remote-id>
 		<remote-id type="pypi">fonttools</remote-id>
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index f17252c798bc..f4a8c4ed9e97 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,6 @@
+AUX fsspec-2021.06.1-ujson.patch 1304 BLAKE2B 9a7a7580b7df2967c4d61b7334cb4561cc4a1ce056b9dab3d16bca132545edf6651291c6b69742421208c679b336017b0e92d7584ec24bf32eb26335a451b917 SHA512 5574a57ba32b678a35967c9560831feb993b5462ff986e2b4c9a3a93dfa497ceee206bed88a72cc41456dc255cf8aab4240f6c3fd624822cbe594c6839758324
 DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
+DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
 EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
+EBUILD fsspec-2021.06.1.ebuild 1241 BLAKE2B 0a79be9a0a6e0b512c24e86753380d98b38d81c31aec99dd08e42abac5aeab4f95abbeaff38c0ae89507e7a677117d01aa36535cd2730f066120a8a3f3733a07 SHA512 9319a05c1b9dc4be33a51fd3ba43b91bcb21bf46048e06df630086ff3e4a413fc83f48b255c2081070606ac56d7e88928803b4dbbd4feb081d218cdb687ec5da
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch b/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch
new file mode 100644
index 000000000000..0c76d8ac71df
--- /dev/null
+++ b/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch
@@ -0,0 +1,32 @@
+From 270423008d401d9f03a31f08c53a7b13fa193573 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 23 Jun 2021 09:23:31 +0200
+Subject: [PATCH] Fix test_unmodel to accept ujson encoding without whitespace
+
+The ujson encoding for test_unmodel data is b'"Conventions":"UGRID-0.9.0"'
+(without a space after ':') that breaks the test for me.  Update
+the test to make the whitespace optional.
+
+That said, I have tried multiple ujson versions, going back to <3,
+and was not able to reproduce the output with space.
+---
+ fsspec/implementations/tests/test_reference.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fsspec/implementations/tests/test_reference.py b/fsspec/implementations/tests/test_reference.py
+index a1a8fdc..15a32d5 100644
+--- a/fsspec/implementations/tests/test_reference.py
++++ b/fsspec/implementations/tests/test_reference.py
+@@ -104,7 +104,8 @@ jdata = """{
+ 
+ def test_unmodel():
+     refs = _unmodel_hdf5(json.loads(jdata))
+-    assert b'"Conventions": "UGRID-0.9.0"' in refs[".zattrs"]
++    # apparently the output may or may not contain a space after ':'
++    assert b'"Conventions":"UGRID-0.9.0"' in refs[".zattrs"].replace(b' ', b'')
+     assert refs["adcirc_mesh/0"] == ("https://url", 8928, 8932)
+ 
+ 
+-- 
+2.32.0
+
diff --git a/dev-python/fsspec/fsspec-2021.06.1.ebuild b/dev-python/fsspec/fsspec-2021.06.1.ebuild
new file mode 100644
index 000000000000..38f77d30991b
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.06.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ujson.patch
+)
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	epytest \
+		--deselect fsspec/tests/test_spec.py::test_find \
+		--ignore fsspec/implementations/tests/test_dbfs.py \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py
+}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index b58b2e6813ed..787dab94a9c8 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-core-1.26.3.tar.gz 133409 BLAKE2B ca3c63769f87cc79483d5ac52646cb044fa21e4f702a945994aeffad71b5be6bd1105e7aa3ec489c943d8adb1148f1c5eb868d64d71f0bcc4a6084ff470acf05 SHA512 8a7753ee30f6f3bb78265b083d8fb80a48021ab32c849ddadaf969263e5a63bfaeb3010b584440d5c5f1c4e0dcd4e8fcd4df16321ccb03d3c0932e19502bbe4c
-DIST google-api-core-1.27.0.tar.gz 134035 BLAKE2B be074208ac51b6e33466a2304e5780894d6a420ccf7ea36e5b98b6d9f920cd6f0cc9f94dababb154731ebe4a36d8b863897f5c654e00068a0f12753ceecb6e8c SHA512 5e8ca58c7f1dc9aa3e612ea635feb84a115c0f21bde2a3152cd54be5b041841ab1c0d2c725660794e15d42e63a4b6955a5318d3dec20bbbb3e7d683c630a5f5e
 DIST google-api-core-1.28.0.tar.gz 133640 BLAKE2B 8134e39cc3ff2fbb850d5e774d08589e3e64b83ca5d5209279f5d1b7fc2eb350a523bbe2890fba6d907689149df3872a7e0a11991b1ecc62fc64a4753dce38e4 SHA512 3702d27613e621394209047451729c1308beb88c917033b4340e3fa96bf4a5ec36ad2594c98ed14439c578f69a202d95a96d30472438a30417484cff6e06fe7d
-DIST google-api-core-1.29.0.tar.gz 134251 BLAKE2B 46455f34ad18bd57b21afe70b237466a51d5dbaca8f46f31491d00fcc7e6339fcf48e150418ef71100a628245cc5333984e6377e27eec00b9b55e0c1a3de86e2 SHA512 b8a7b19ba737172e04c0a322af7c60299b72002b17a099fbaa9445c4965b94fd6f3087380fa4262f4440113af4304d5235cd062f22c27cd997e62b276ea67471
 DIST google-api-core-1.30.0.tar.gz 134595 BLAKE2B 104f52bafb68fd91904c02cbd6d3dd2e32c160a528f58e9af3612fc4f7a9934c522f79895b50982b46ee77947af7eb52557bf304b6f2624b97b5082905511829 SHA512 cc14f9c67bac99290665e2b85a97eacf43cdd2a0e4668ecbc7dd8e7131a7e4e908aca2be6d65797d0838081a02768354703762a1a80fa0b666efb81448b27899
-EBUILD google-api-core-1.26.3.ebuild 1260 BLAKE2B 41e5da2c64d6ae327135c47f9b14ea57e226d765aa948b2acedb8a895f0d603cf39cc79340401072538dd54326865d5d2f6ef9c0cf9db21ece6c9c8d34fa42ee SHA512 fa476f9c48b5d7c0aebdde04e1044535544d2ca1b518e158011ef82474defdcb377bb6cc38f0be11c1b28cbb2a5717bb357e8006bc98a0c0b88dfed84ad1c8fb
-EBUILD google-api-core-1.27.0.ebuild 1262 BLAKE2B 80d50ffd74520f2ecd050586bedb1067db37be45bc7879ca0abecb09d2e027f4a1c70e0bfc38750ace23ba4acd28235e09464c966a95239511b04454a97d8f51 SHA512 1840aa564a0b56f8d887e6446ce68f57f109e63029fe6dfa50bf1ad0df174656ab4f9bbce50498e3c1f937d855c20d9f4aa0df039e709ed8ee04b32c3dbde11a
-EBUILD google-api-core-1.28.0.ebuild 1262 BLAKE2B 8e04c7d42723eb278fbc64d756445bff4a21778218034b866e4f98adff762b36ac4a3f72e315bb9f876abd56219ff919a56b555df69a9fd9be9494fe03609fc8 SHA512 04e0a2dd047625d8376375d324dbfaadcf489deeae355cb743592520e903e7b4be754eec0e07a50dad736d24f68684423929aa01b2b590b793090d95420721d8
-EBUILD google-api-core-1.29.0.ebuild 1262 BLAKE2B 8e04c7d42723eb278fbc64d756445bff4a21778218034b866e4f98adff762b36ac4a3f72e315bb9f876abd56219ff919a56b555df69a9fd9be9494fe03609fc8 SHA512 04e0a2dd047625d8376375d324dbfaadcf489deeae355cb743592520e903e7b4be754eec0e07a50dad736d24f68684423929aa01b2b590b793090d95420721d8
-EBUILD google-api-core-1.30.0.ebuild 1262 BLAKE2B 78ee7d9bef9262bb76d8021f51de7803d3ef6b532631f12bd6538a1419a31b198f6cc7deccc2a2bf64d4dfe7567d5db88ecea5ca6294bf61364ae765d05ec87e SHA512 1da6ff8798df3ecc10ab68912f7bc80a9fa51d143d177b7954e75ae522196b9207bc82e7a4db7d9f9a1eaeacc4f1dd98446a0a6dacbb9a3b682ee8b996bb3966
+EBUILD google-api-core-1.28.0.ebuild 1260 BLAKE2B a3b0db659b2af9d38c7abab74c044645a03643f634443a6ff5739b0a58d47def40d86d721215afa7090b092325842dc335f83d8609e1da0cf6059dd355ccdfc7 SHA512 48a322282012623f07f845e3f2e6c626261f354ab4044fd99ce4936de559b8a830fb2b470547267f3dbbfd8c9fe8a68b9821918e08c5e7d199f748d8c5557c06
+EBUILD google-api-core-1.30.0.ebuild 1298 BLAKE2B 12d850962f1f5546eacbf64a502314d224c463cb119d6effaf5a5e6dad9591cc5b1ac5e0c5e50d85bcdb54aee71824ff78340f880c3488c456d6af849923ce30 SHA512 71e9bd2ab53bcbd9bfb0086fe2db395056b37c506f1d8e143c60a3092995ae672c2e87d521eb6d7dbefbd89cea61deffb939b4a5f1ec0066483746be92800e46
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.26.3.ebuild b/dev-python/google-api-core/google-api-core-1.26.3.ebuild
deleted file mode 100644
index 89f540e71921..000000000000
--- a/dev-python/google-api-core/google-api-core-1.26.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.27.0.ebuild b/dev-python/google-api-core/google-api-core-1.27.0.ebuild
deleted file mode 100644
index af52a0d1189f..000000000000
--- a/dev-python/google-api-core/google-api-core-1.27.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.28.0.ebuild b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
index de335d4f57b5..f12208fdc974 100644
--- a/dev-python/google-api-core/google-api-core-1.28.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-core/google-api-core-1.29.0.ebuild b/dev-python/google-api-core/google-api-core-1.29.0.ebuild
deleted file mode 100644
index de335d4f57b5..000000000000
--- a/dev-python/google-api-core/google-api-core-1.29.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core
-	https://googleapis.dev/python/google-api-core/latest"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-api-core/google-api-core-1.30.0.ebuild b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
index 1b0c182a7a3c..183edfac0b1a 100644
--- a/dev-python/google-api-core/google-api-core-1.30.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.30.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/rsa[${PYTHON_USEDEP}]
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index dee3badfa1e1..6fc4a40264d0 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,7 +1,9 @@
+DIST google-api-python-client-2.10.0.tar.gz 25252980 BLAKE2B 25932dec798518217eb724b3514de6f45e57543703396516f3d1a4599f40cb258893d2b2c7e706ef341a6217459a08ebfdf61e2d16949bf8831aed2f79fa80c0 SHA512 acc6ff1a6cad0d568e3af2c7fa4ac5fc3f908adcda1bc846aebc473cdf9f63b873fdf3182c44c3afe50a1f26a645be21b7b33335e67afb09210c001ba22365ad
 DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
 DIST google-api-python-client-2.7.0.tar.gz 25488451 BLAKE2B a8a761944fed3970ae0cf53b2cb926a6670ac37323c39085a5f7fb4f354451292fca4bbb2c34a72d086dfa961b74a72f66319f6bbc2505ef70f5c94aff3f7a0e SHA512 531e919cc9d0cffc49b31d881a6ee3adb2d9cc166813b5884c300e9a3b63b28c9c269a0d1efe47961fa61f79ec5adb8a12e2208b644fd62ed4baa66c56d219ba
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
 DIST google-api-python-client-2.9.0.tar.gz 25538249 BLAKE2B f0aba9aa7c6d9be51ddef29454de93efa3ee747717940f975ec04fc6ecc70560b89488b39a323f2ebb82076d88316dc6f87e35210777600714cf833d20611f57 SHA512 1cd3d9f208251acd3bb1eb372210903f80587995bf54b7addbc7675c7c8c3a1c776fa52052c15f88d112f54c333970c4845854924ff57dfbd91c0c17bd63aec4
+EBUILD google-api-python-client-2.10.0.ebuild 1516 BLAKE2B 17cf8f8c3924291ae7d1910e221bf44a8f2d8f7b181291c3399d88f9ba65aeee12b18e11a3f6425bd86372231f3ef5811c3dfd7e0a825357cdba7a7efa24ad28 SHA512 fb0700c4d7d0919ce2c7e4ec27c0f673a74ecf3ec5017a0df398f0c78b639a31ed2e25d01b2af8fe5dfc1e72b4cb67c6e6fada17921e31007ee0563843db1d77
 EBUILD google-api-python-client-2.4.0.ebuild 1514 BLAKE2B 576cae9faed55f9bc0d1ff3d428525f696b509c0517b27e464a7670701a1b3e7929cc217ea4b92134dcb11771f74dbddc78ebb759e1e75be4c9b5ea28590eaa6 SHA512 8c2c8dea75772e9d6ca556bc3c4550904b139fadb02065c91eacf90a666d65c6e8ba45abeab967071a76b732ee6c639a5d076c4f1cbc67d5232742172bd999f1
 EBUILD google-api-python-client-2.7.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
 EBUILD google-api-python-client-2.8.0.ebuild 1516 BLAKE2B 17cf8f8c3924291ae7d1910e221bf44a8f2d8f7b181291c3399d88f9ba65aeee12b18e11a3f6425bd86372231f3ef5811c3dfd7e0a825357cdba7a7efa24ad28 SHA512 fb0700c4d7d0919ce2c7e4ec27c0f673a74ecf3ec5017a0df398f0c78b639a31ed2e25d01b2af8fe5dfc1e72b4cb67c6e6fada17921e31007ee0563843db1d77
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
new file mode 100644
index 000000000000..5f95424b6c1d
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index f026b87f1d1f..605d0085624c 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -2,8 +2,10 @@ DIST google-auth-1.30.0.tar.gz 169598 BLAKE2B 4b0a0e66255abc11c697ca2c3d77ea0b7c
 DIST google-auth-1.30.1.tar.gz 169244 BLAKE2B e496239807ab9ca64e1b5dc39726fa22b56d55f14883c983673064b8ea33f80dee013654d4808fead0d06e8b6ddc53554d094f42aede6e06224dc3a3c04e88d1 SHA512 7e35f5be9be160ddef4b579c2e5bc966f1d64f8f0bb75220e22fd3edb9c6f6140bdcf68055fdb13dd370e3d543206900cc9403237eb328d69418a384a4d0fe26
 DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.31.0.tar.gz 170970 BLAKE2B ee6c9e72657d0902e53c0c56ef5eb802815979f272e9ee8e038dbb05af64eabcf3d6b005f2eedaa0d2b2c4da815bdbd89e1246fc37f9b7e7760252a040ae2a27 SHA512 c594ef070983a1b0d5dccbc42ecd8020866911463b672d52b6f32b22dbcd4fccdc038d1a56f6af556553f086b161f37eba93dee3bfb8726329249c3d73efdd9f
+DIST google-auth-1.32.0.tar.gz 171423 BLAKE2B 8888a9193b356f2d0d846a36c436cfc1cc60a973a162983c583bb1d5eacb183381424bebbaad7c4c7a9b777c8d5a3b61c490ad0cece4b9d6e0bd1e03fb71f49f SHA512 0f11de110828eca0514b032e422d72ab3979c99ed20bba3d79583cc33707a6cbfcb69b50f27f1702e803620c852eb6fe4bfc431d2e9db6774d26ca6f783042ba
 EBUILD google-auth-1.30.0.ebuild 1444 BLAKE2B 39bc2a6c2325506e7d4907520d245526d3b2210b8309c8096695ae9d79e34eaa4f2e46cfde7038eda95a853dfa54362c05d7da961755d31d45aa9710fe7c477b SHA512 6065a0445d2ee742f245809246a8f0eb5676a60d6f3a013dc5b135586cbedb8965858a596f7f6ea40f3f4d29b18315abb36f8ec4dc473e10a69d37aca163ebf3
 EBUILD google-auth-1.30.1.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
 EBUILD google-auth-1.30.2.ebuild 1446 BLAKE2B 1bfb7c4d482d7972a91bde26108ea9a80f50d9cdad0888163c93c8f4f9e252ec0dae49d8e78b9cdf4228b9ba1272e3f412bdf74295aed47fcdf9fb7cadad36b2 SHA512 1a7284190245737e55d86208a5bb4c1c1c5d2ba8b85b32c6f44dee0002a389f079fcf67e56d9e275e4a711cc2aac9aa00e601fe7ef7ca4b7ea7b2ab486dba0ed
 EBUILD google-auth-1.31.0.ebuild 1446 BLAKE2B 1bfb7c4d482d7972a91bde26108ea9a80f50d9cdad0888163c93c8f4f9e252ec0dae49d8e78b9cdf4228b9ba1272e3f412bdf74295aed47fcdf9fb7cadad36b2 SHA512 1a7284190245737e55d86208a5bb4c1c1c5d2ba8b85b32c6f44dee0002a389f079fcf67e56d9e275e4a711cc2aac9aa00e601fe7ef7ca4b7ea7b2ab486dba0ed
+EBUILD google-auth-1.32.0.ebuild 1446 BLAKE2B 1bfb7c4d482d7972a91bde26108ea9a80f50d9cdad0888163c93c8f4f9e252ec0dae49d8e78b9cdf4228b9ba1272e3f412bdf74295aed47fcdf9fb7cadad36b2 SHA512 1a7284190245737e55d86208a5bb4c1c1c5d2ba8b85b32c6f44dee0002a389f079fcf67e56d9e275e4a711cc2aac9aa00e601fe7ef7ca4b7ea7b2ab486dba0ed
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.32.0.ebuild b/dev-python/google-auth/google-auth-1.32.0.ebuild
new file mode 100644
index 000000000000..02c43c1586f4
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.32.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_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index fd22f9150ccb..0b3fe8740162 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,5 +1,5 @@
 DIST grpcio-testing-1.37.1.tar.gz 16930 BLAKE2B 17f30c1c8266ab1fdb363aaafa80a51711be61a76048ff47b09954f0d5ab570d87a1fcff9b3531245c2dc7066e8f71034662ef524aee898af81d922646d3482b SHA512 bb32067abd145dc2b45b29fe2f01ea9cd4c2a9fe76b94f4c5392c26557118aba2e3032b2566809575311e2773a0afd408a3ae656e31deb93e978fb35ad64c98a
-DIST grpcio-testing-1.38.0.tar.gz 16637 BLAKE2B e5d63653baa3ddd7c85b04a8979a748703037aacd1daa25e3e066a14efbcf6e9a36352cb4fd14422490246e72f7d3bff2e445f659eaf890db31cec0ddfdf7445 SHA512 5bcd2204475329bfe7ea194380152bddd440d82cb31a3a2510bf253cd4c165c06e02b607f19e93d5860eec18e08ef39bd6ac105c6dc016bb2d083c1dd74fbee4
+DIST grpcio-testing-1.38.1.tar.gz 16862 BLAKE2B fad99b35851e36b4e80e8d5d1ec91fd5f22e21a37596b3240aa81128fc77b73c95ce83f0d0423a047c85b9dba428e94f9a2c1681971776c1a141c756026b7ce1 SHA512 2814247be309498ef9605d630afd4bdf1843b21e89a7d6742b27107499ac73ca60c2bbcbe9b76d2be765505025e887af9a2b2159b324f10e3d85960759aba23c
 EBUILD grpcio-testing-1.37.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
-EBUILD grpcio-testing-1.38.0.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
+EBUILD grpcio-testing-1.38.1.ebuild 488 BLAKE2B 45db0abd81ac53c87b9027752e4cdb4424150c73dec0643845f3d25b9c1df38a17ffdf6627a50bdb923fa5526639b5a6990ef581f1ad7a21f84e4645117f3055 SHA512 0f8b1157d24f192268f40cf9915ba68b67cf3ad103cd9fb9aa47a598c2b18328eae89a80622a216ad7b5948f668c79fe3e626a2604d52a47af091335084e73fc
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.38.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.38.1.ebuild
index cc55c6572526..cc55c6572526 100644
--- a/dev-python/grpcio-testing/grpcio-testing-1.38.0.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.38.1.ebuild
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 950b1d77ab66..cbdfdf53c296 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,5 +1,5 @@
 DIST grpcio-tools-1.37.1.tar.gz 2120381 BLAKE2B a0a0249166c4f2b0167ea3608f962d0cafae8d7ca7d9085649dc3ef70fb32a93240739c311dbdb59e29c5f1e3319f76f28bc97eebedd37c06b298099750d6730 SHA512 7fa77a822fd242c94547e93aaa7120648a25ddfc0af16a0c1b721e6e2df1fb02a4e29c260e0cd3b35f1b25fa74dcfd42065d0dc34e71fa489e7abbdf2e4ddb4a
-DIST grpcio-tools-1.38.0.tar.gz 2128330 BLAKE2B e2d191289dd7cb1edf85ed3d63dc2c469ed03f75145fdbf8dc0c300427c629dbf27a9c4393bf37ac29545dc5b959dff20a7ac6cef679f34aa6b395c556e9c01d SHA512 0aa5827d2f6e575874b9d1222f889a8d07e54c64d4a2e9fb76610cc5ca731789cf5e9eec2dd42462eda386d96ea519040e162e0ad8883c1fe9683289311cd8eb
+DIST grpcio-tools-1.38.1.tar.gz 2128280 BLAKE2B bd8f8a371e89c096ce0e7f458e88c7d00ee6d75f18c008e8e0daef37559afea1792cf874829e1a8bda315ae49cd6e453406a75705672032811b059c2189b6aee SHA512 7498443a42da8077b91972ccf78bc64d9906a4344d8f4ce17ae8e45f32c952baf0c84d20771f572e7c883a26022be32f6e0a46f1d0e79dc651f90193987892e5
 EBUILD grpcio-tools-1.37.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
-EBUILD grpcio-tools-1.38.0.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
+EBUILD grpcio-tools-1.38.1.ebuild 791 BLAKE2B 1b18f4effbf93d49249588454031738deb460def725f26f9b215f55eb2a85a5bd64ccca97fa32cc4d009868d7e00e0df2b0587770777c94a2311f1c9befa0f53 SHA512 598a4e01c134da0d32b601ebbe1c75cbca2a9048c298513605b3ab53f2fdcb6f819a2c624df84433153b88634f9f90781cf18dc0200798593e41c0783b0f069b
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.38.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.38.1.ebuild
index 3cd4ae36bed9..3cd4ae36bed9 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.38.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.38.1.ebuild
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 629e374a0e90..58b487ba2573 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,7 +1,7 @@
 AUX 1.37.1-cc-flag-test-fix.patch 1053 BLAKE2B c2f6b0a506fc2d074e656db3081447b3a0521a2ed2bd14a19104b962e0ad45b0068116384403eaf199d2bb8027b4a260dfaa7ed274974ad0bb6ca56b9ad19e8b SHA512 72dc39d549a008d137db29aa446ab7fc0add575103e941a969bed0124ce3b285f27edc31ca06db71b2dd3232c77c280755de3d3ef257792ead0516122f0a9b3f
 AUX 1.37.1-cxx-no-gnu99.patch 1366 BLAKE2B f8dc0d4cbcf5868d74c168dc1103a4b89d3a330470c67f835572697ab9d03ac1d9d89f3268186181fe395877d2f7842cdc7cef8bcceffb719553cd8206ddf5a5 SHA512 c93a54f30e87a51ec161639e6e89d59367c0b9afdf404004050b7e950f640acb5eeba05473e2e7893bd222487a9369bdf65b739fb3919317bece5f140599edfd
 DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
-DIST grpcio-1.38.0.tar.gz 21391828 BLAKE2B efbbf42ad4e67a2c39369c47f345b2a823427341f3e535737d28ff4061941bc649bca179cab84ff5457bab2ccef49146fd2cf7daeb0cae7303e47f192f250feb SHA512 7def460f1a96df65b99fae8aa149428286002aecd14242f62885622fda1568f2d44fc69c3bea28cd1568e3eaa46f03b0fbfda2a9cee23e1e5dfb44ac99ffe597
+DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
 EBUILD grpcio-1.37.1-r1.ebuild 1298 BLAKE2B ef7cf673b021ded68d29c46f506d76cee781bd62ff03aabb8dbd03488c810032ea1369418bbd2800439642eebd2e327e5a7cf2153631aaef64497ca4a7bce4ac SHA512 28bddf5c20d4902166dc68c944f26699cfb85045bc3a7ee700486d2c1d6b55543d0383ee48ce188232529b3364048bafcee65f49ce313de767e2b496839ebafb
-EBUILD grpcio-1.38.0-r1.ebuild 1258 BLAKE2B 3af6763da350a7ed0c4739c12bc7cd092dab65303b0d6aa55b64d8c3bc3b209c80e8bb2b202d486081dde610a1ef63e8a8b3fbb1ed80f6af0b22587b7bc34fb8 SHA512 b1d112b7f3022fff157c71bb5ec3f7a0f81dab7f63bc1b7911c69e27c40970ae259b6351108761df05fa76cd33a27890656456506fc0e707d7626bf6a14c5f55
+EBUILD grpcio-1.38.1.ebuild 1258 BLAKE2B 3af6763da350a7ed0c4739c12bc7cd092dab65303b0d6aa55b64d8c3bc3b209c80e8bb2b202d486081dde610a1ef63e8a8b3fbb1ed80f6af0b22587b7bc34fb8 SHA512 b1d112b7f3022fff157c71bb5ec3f7a0f81dab7f63bc1b7911c69e27c40970ae259b6351108761df05fa76cd33a27890656456506fc0e707d7626bf6a14c5f55
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.38.0-r1.ebuild b/dev-python/grpcio/grpcio-1.38.1.ebuild
index d32f26672e4d..d32f26672e4d 100644
--- a/dev-python/grpcio/grpcio-1.38.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.1.ebuild
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index e7965b6144f8..bcd3063e94f2 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,3 +1,5 @@
 DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4
+DIST gst-python-1.18.4.tar.xz 158252 BLAKE2B 2fd60d2d451ae572cee2f7e9158e9c06e82cdd56c4fc70d2731aa0a46a21e495321ec02c97ecd9a946278ce9b7290a290b9f2bc13184582c1f8ff19e874d0e3a SHA512 6b9df9e4faaeb030f0596c9e52262c0f82b8854faf821497a840a762913dccb005321c60565754ef571e34976fcda481a41aefbbd486c2932377a95121433bf5
 EBUILD gst-python-1.16.3.ebuild 1556 BLAKE2B 5a5f9dc90cdbc2262f226b00ee166afd8b8df17c64714694ddc73c87c96a06e537dac794a627d94a1f8874ec5adab74be1dc790e494a48b97f41c9e3134f5240 SHA512 d9663bb501c02dc98be963bb6ba6f4dc514154460084de9cb9d079da1af11daebe2b54f575461707024ed2627d6ea44f5897fb981c2463c3c8e07356fcfbd371
+EBUILD gst-python-1.18.4.ebuild 1630 BLAKE2B 3ef067bd8726ccdde935fd02b5b0608f708a58ab7a40f1d2e416e643da06b7c40992dfd32a43fd518086933e3b427339a3b1f4fd79b0a13cb197a87ff0ad6c5c SHA512 06ed5d9fa116793874b1e73706d21514dc74026b0cc7a592b481f3f941809423ab25dae596607cab8fd38afc918ffe9de1906ad6b9a1bf1f894f3cfe3446ea26
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/dev-python/gst-python/gst-python-1.18.4.ebuild b/dev-python/gst-python/gst-python-1.18.4.ebuild
new file mode 100644
index 000000000000..14626ea03c5e
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.18.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+
+inherit meson python-r1 xdg-utils
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=media-libs/gstreamer-${PV}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Avoid building & testing plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
+	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
+	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
+	sed -e '/subdir.*plugin/d' -i meson.build || die
+	sed -e '/test_plugin.py/d' -i testsuite/meson.build || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			-Dpython="${EPYTHON}"
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index a436e6b701ff..3bff7c675aae 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -2,6 +2,8 @@ AUX h5py-2.10.0-tests.patch 1090 BLAKE2B 2c915f28055d6368a5bd43b281d61879e91ae45
 AUX h5py-3.2.1-i686-types.patch 1944 BLAKE2B 55b00cdf84a369fb1bce79fa5acbc82d719f49804d7db47d9fa6f0f17f7fefdf6db7fe653a6d765aaa67eceec5acc010184890294f29a655ab4707664e5798ad SHA512 e100888fcf2f3de1b8a331b20776899100a9d5b8ae65d21a451ac2501af5c63abc78114c620025186e805b64f3828b3be80473ddec6d256d2e6aef9e0f9e1878
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
 DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284
+DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae
 EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1
 EBUILD h5py-3.2.1.ebuild 1651 BLAKE2B 996256072ab2696da939d080cc23b947981e978759ce82b487177bd103316d84a2682833fb8976d3ad6db73f87ad7dda2b500ffddf218bcaeee8e50983fe876b SHA512 3cbaa44da1679595ec0865103f445ee4cda16e6bc2b8a8560d8ce715e1c4e1cc37a2d9a6bb8c6c9cefecbab3c58bf8872f49298197dcdfab5409305f1519eacc
+EBUILD h5py-3.3.0.ebuild 1418 BLAKE2B 34b01b972fe5e9ef31bdbad6397094b36fbf394f90fbfc7519f4904afaaa5230240c5a97d977d051b99cdfbddec16be051a08ffc9e9ca0de9037a68aa6b23623 SHA512 f3ea76b04ab5e972f1b49dbd79c788ddcce0c813ade07c5a94951afd44741c22e83a5395fdc85260d18caacb9e6f6de63f26be89599c8084831f3776b7702b63
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
new file mode 100644
index 000000000000..c446eb58c665
--- /dev/null
+++ b/dev-python/h5py/h5py-3.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="https://www.h5py.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
+
+#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
+DEPEND="sci-libs/hdf5:=[hl(+)]"
+RDEPEND="${DEPEND}
+	dev-python/numpy[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+		dev-python/cached-property[${PYTHON_USEDEP}]
+	)"
+#	mpi? ( virtual/mpi )
+#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+#pkg_setup() {
+#	use mpi && export CC=mpicc
+#}
+
+python_prepare_all() {
+	# avoid pytest-mpi dep, we do not use mpi anyway
+	sed -i -e 's:pytest-mpi::' pytest.ini || die
+	distutils-r1_python_prepare_all
+
+	export H5PY_SETUP_REQUIRES=0
+}
+
+python_test() {
+	cd "${BUILD_DIR}/lib" || die
+	epytest -m "not mpi"
+	rm -rf .hypothesis .pytest_cache || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 366cbcbb58a2..325e63be6204 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,13 +1,5 @@
-DIST importlib_metadata-3.10.1.tar.gz 39980 BLAKE2B 9e7ba25618c9a530d122e43d6d56cc0386aad87accef111574b24aa53aaea51e08c422275acf4650eae2102a92de30d066a66c72c02b3a3b432ce9bd9453dacc SHA512 e028fb6abba0c7775943c346db0e733b5ba879583184c99f8413ded6314162e5dce03e10661b16392825038096fac8f6fbbea47ceac9565c60227129f3a3a48d
-DIST importlib_metadata-4.0.0.tar.gz 41881 BLAKE2B cd0330e2a5959f651ef6ceee722762c3cbb034a534dab6c24523ca76d25dde4cb2c6bb06cef7e787db9a9cd83ca08a71bfd7b849db57ef4a95e461e6d887b14e SHA512 bbdf7b3f1e714c5a02babe0f9ff5eb366942e21b626d1d61839ee04040d0ed529cd299afd446639795b34665be20e6438d8e9970292b282946a8b6495682f726
-DIST importlib_metadata-4.3.0.tar.gz 38461 BLAKE2B 5c8387aa618b6561910adf48a701b28556574abe0a4aacc6ae8fbecb258cd0308f637a95402a07c2452ba92daca39034a5fdaac03608e5112534c379e66aa4b9 SHA512 44e3da5207ae6900059758ab26636798fafa9d186d045096e382660083909305887e28c63c2147c940f0af5870d1781f69968c9cc992e50811b5f9b055048459
 DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
-DIST importlib_metadata-4.4.0.tar.gz 39577 BLAKE2B 1c1536b72385380176febfe012b5e47bc4d1b1382e048dd6383b5097f8047404a9a726438100e6f812f397f425e4d0d92ff296530e1f81cf16d3f26a57f47e48 SHA512 d227caaa1130d5023a87e5fa32aa1cd473ff0ae09cd82969be86f4301402cacee068dfc5d744bff82a18abb86848780013b6e6b2ebfa8a568ee027c270b90efd
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
-EBUILD importlib_metadata-3.10.1.ebuild 1273 BLAKE2B ec33cf32a3fc2a92666c0e9aac0d3d72968b7e31d7c8e4f5f6e90462b8b07efc2754f20c011a11065f726a6197b642d08eb4c6c70240a64eff67aac23b51b3a5 SHA512 eb3e8fc070b6a7f797ed1a92fd34bd7263046ed44603a436a882daf38d0da3a4eab4c981ca6c0fd6d4c4a3a0d6ba5822698f82b7e3dce90ae8b37e0017f27cb2
-EBUILD importlib_metadata-4.0.0.ebuild 1281 BLAKE2B eaf8b2c298ee8510f9182e88d2f01bcc33461c7c4fd18f5a26f06a692c6684618aeb3747bea8f330d0a6e2926b1b86ef0eede8d7aa73022c0e6372ffbb13492c SHA512 77544555aa575bd4accb1a6bf073e916e80b094a77af906bdccfe05d11e5ccc31fdb0c6ee218470317708c2d3b1a45d71a1e9d7893acf486eff1510a9809f404
-EBUILD importlib_metadata-4.3.0.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
-EBUILD importlib_metadata-4.3.1.ebuild 1287 BLAKE2B 3a7b9aff0062f119db352f8fa65554ade6381408ca4b410225891aeef6f3f33c05d12874c07382b5a0c435f796fddeb13177e4692cb1873e0be3983a17f776b5 SHA512 99968649ba3bce2725e4a3ca158d6a41e819b03a8f1e66438cd66397f75d4d0f65429bfd2bedd2be59baba5d499e6b5cb54b3140133bdfb45808d0cce2193f51
-EBUILD importlib_metadata-4.4.0.ebuild 1288 BLAKE2B f71a42f95886edacb0964fd1f2849b043547d10d99343a78ba7d783818e66d04cda5401c573eaa31449690a2d8b4bc187d0148a646d9900f370d312572b022ac SHA512 9ffb08aa8baceb5d48dfe4fb2be1b6c1f34f6e8fe3f9f4e827fd548555cabe1ba76348d00db28f1b4cf7211b64132f0f321d033f04766f8c9073a75f73508956
+EBUILD importlib_metadata-4.3.1.ebuild 1279 BLAKE2B 9ccebd49fbb6f0af8c93beb89040b67f844b1311d089bfcda67790f900424df84830fd7a09d9066cdd8c84abfd5269082217fc7ada354fa757893c3a563d99c6 SHA512 594b68ffee5b91fcbf1577288f0b35e70e7567a93d3a99ba7f6be60b102ea3ce66d0c1c059597b2699d2b66748cc8f5de7e63cc54bac8dbb25f21ed6a545dddc
 EBUILD importlib_metadata-4.5.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
deleted file mode 100644
index 98ce41c1e073..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
deleted file mode 100644
index ee6431b44f73..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
deleted file mode 100644
index 49bcd216dd9f..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
index 49bcd216dd9f..d9c8a5523fcf 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.3.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.3.1.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 ~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"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild
deleted file mode 100644
index 4b6f4cf9742b..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' pypy3 python3_{7,8})
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 167f9e1efbf1..3dec5952dbdb 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,5 @@
 DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
+DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
 EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
+EBUILD isort-5.9.1.ebuild 1326 BLAKE2B ab2ac289c96e4adac0fe28667a2126860fa3b70a73324ecfa81fe5b1cff3c2f03f3effacf0d243b3a9bd72d277ba9c4dc79fbe0630f41ed29b80264d54f1394b SHA512 3e6ef128dad16b901c002720b01906ce7a3b95607a609e089c9019b589999a781017ae6808cd78b51d16133046b404cda5c3614e9cc35cfa27370d69f3f505e0
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.9.1.ebuild b/dev-python/isort/isort-5.9.1.ebuild
new file mode 100644
index 000000000000..a551d25dd85e
--- /dev/null
+++ b/dev-python/isort/isort-5.9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="
+	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+RDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/natsort[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle toml
+	sed -i -e 's:from ._vendored ::' isort/settings.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing
+	# Install necessary plugins
+	local p
+	for p in example*/; do
+		pushd "${p}" >/dev/null || die
+		distutils_install_for_testing
+		popd >/dev/null || die
+	done
+
+	local deselect=(
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+	)
+	epytest tests/unit ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index c14f39ee42f2..e2efc3977ad3 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,3 +1,5 @@
 DIST Js2Py-0.70_p20210218.tar.gz 1969615 BLAKE2B 4702b2e771bfd2a5158a3539c33932335816c74f9dbd132679036aa2b7e53796764dd852e92d72a35ecc31efa34b849776c45d8c81e80f85f59308edf0996f00 SHA512 757c895bc0ba933020336a70473ec4455cb93c17040a39f17d645782011ea72273291448f3448ffd34658b48ada45b77facf3d326133f1c0d63e2e26e2cd7f30
-EBUILD js2py-0.70_p20210218.ebuild 1175 BLAKE2B 12b2cc6236aeb301315489f210ca340e00b614cbe98ddd27acf9a2b0e2a6462218031949e4ada6191b3614f4ab85414023c29ed6745dc72e61f65c8a6fddbc0c SHA512 50bd42efd887f3bd774519f30479635da71ded79726e912a5bc1b5181e9418d1edeffc48168b34f52cfc8e441582e063ccabff31f840b735d9351dd556fa045c
+DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
+EBUILD js2py-0.70_p20210218.ebuild 1174 BLAKE2B 0c29b1ffa0f9807e5ec7b14779aa7b728e6cbb6d7209a38027324c0cc138e6be53dccc0d72c9e1c2404e5ac033a014b62eadb7e0822f46217b1f5076281d91f9 SHA512 c6edd54f7bf75c81610fd20b749535f9a67801ac68f76e411a88c0a48f63acb91e6c694d2f8d8b71b91dc3dd4fd51bd7fd85646d685d22baef9a270ed5394d43
+EBUILD js2py-0.71.ebuild 1103 BLAKE2B 4e3fa6cc638c26c311cc541ef6b1330b5e634533441317991ee97b98d57848fa0a7ae3d99b3e5f6a558a235ee147569e6314f5fe52b4832f04ed6b986ba40b8a SHA512 a27977a7008b2666d94985e6252b9183a7dd12a4f02d6d845511f8e27958cc44ece6eee616dca13b5b2f6ac0e7b3ef1d96a682134ecab7b2835de0eea131b7db
 MISC metadata.xml 572 BLAKE2B e7e7fe7278ecadeedc310b4adbb1cc21c7c6a5e6cb522c31695196561e30f7bbfa0fc1e29315f931d3068ef6ede674e153e81207a7e5002d9adbe68c88e2e904 SHA512 c914912aac18c8984d4eb8ceed3d27a175fe89def2ba9bf778c3e3d8c729ad030125ea8f1096487b4c35cb9c1aa1f28a3d7a168b2c8992f6d58fb477bb9ca51c
diff --git a/dev-python/js2py/js2py-0.70_p20210218.ebuild b/dev-python/js2py/js2py-0.70_p20210218.ebuild
index c4128377646a..444e9561e4d7 100644
--- a/dev-python/js2py/js2py-0.70_p20210218.ebuild
+++ b/dev-python/js2py/js2py-0.70_p20210218.ebuild
@@ -8,7 +8,7 @@ MY_COMMIT="ea16b519a0f72e17416859a57890b8388fce6e39"
 MY_PN="Js2Py"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/js2py/js2py-0.71.ebuild b/dev-python/js2py/js2py-0.71.ebuild
new file mode 100644
index 000000000000..5f2222fe1893
--- /dev/null
+++ b/dev-python/js2py/js2py-0.71.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="5f665f60083a9796ec33861240ce31d6d2b844b6"
+
+MY_PN="Js2Py"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
+HOMEPAGE="
+	http://piter.io/projects/js2py/
+	https://github.com/PiotrDabkowski/Js2Py/
+	https://pypi.org/project/Js2Py/
+"
+SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_COMMIT}"
+
+python_test() {
+	pushd ./tests >/dev/null || die
+
+	# Tests require "node_failed.txt" file where the logs are kept
+	if [[ -f ./node_failed.txt ]]; then
+		rm ./node_failed.txt || die
+	fi
+
+	touch ./node_failed.txt || die
+	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
+
+	popd >/dev/null || die
+}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index de0bb7d1dbe7..bb4f7a4cb4e7 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,3 +1,4 @@
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
-EBUILD keystoneauth-4.2.1.ebuild 868 BLAKE2B 1296c78c6c94ccf4d4e08f6bc35669ac801ff91794ca16fa4289d69b5f15c2dbe3f567597f7bde928d5171ed365f0c87e8effa30e77af1a7ace31013c2e6a975 SHA512 578c3754d921b53fa5a4614b9974f00f5011798a18dae5858b28a262ffedf052061e09965bb9ec107ae2ba8e6be0fd3a5f42f489039c131aafe005ab03564cfa
-MISC metadata.xml 416 BLAKE2B bcc14a9c5f130a064c4eeef77b770df6e9e1e10c26643f46a3f7d771d692a698f619dbbe5b5a0c74eb7836da5040009d0e7814271c8dac7bc2a1c121a98b1269 SHA512 03d53f525bcab409931b02962538a8d49b28e31040a98fce7f37de73bd89f1c59853e22280bcec2a98f4fe9d48eeb51432543f62adb66dd29920a7f0a7e3b3f2
+EBUILD keystoneauth-4.2.1-r1.ebuild 1703 BLAKE2B c68b88cf3781bde9ea0d8b6c7ee2590478a15810f7ae9094a9011f243a1762561105d3301d8c9249c6341087fcd9539223ccb6ae261e145cae6ec851a2f9f78d SHA512 04e63cc94bb1fc2ce499ba1c8b3ff2fad7610ce9700f8fa544c932edf675c951ffc61417129be4fa16719a13479fe5ee0ae064414b1bc1fcba8bef1ba6ae12b6
+EBUILD keystoneauth-4.2.1.ebuild 830 BLAKE2B 502144036bfd08295513a411ab874b6b6509ff44ffea105dcf8480403527dfa37b15600b5933d0c55e151bda675dc5899ef8b7c8ef551687b729d9edb606bd48 SHA512 a395a3dc0f20357373e98c9b3f28e0fbf9fd4d3107f2d502f66701a81bda93123b0757d305c3d837692854ffa842cc686b3d068bcb0a9e2b6670093c3c36fc8d
+MISC metadata.xml 517 BLAKE2B 89f053e99c44426b0681055c4ff962db6579b45cbd69b30d1ce3451daa7f7d358d60dd8fb0b76c47382e420941d4dc01e7c841d96b30166b12cc79d8ad45b1b4 SHA512 237f3c06e5ba66fd6b583c21e3cbc67866fb25eaa701c5eb1eac1b15d89dd9082255a15fd02a28bd2610e47ea3b6975013b7a18ad9ad8f3ec8fd6b0da9dc6bd2
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..905b712644b5
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
index 359f7c6b0ab6..e16f73ab9d63 100644
--- a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
diff --git a/dev-python/keystoneauth/metadata.xml b/dev-python/keystoneauth/metadata.xml
index 3f6772bf4141..09ca70dc5af2 100644
--- a/dev-python/keystoneauth/metadata.xml
+++ b/dev-python/keystoneauth/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/keystoneauth</remote-id>
diff --git a/dev-python/leather/Manifest b/dev-python/leather/Manifest
index 3a24f3e4b504..d927473c3ea9 100644
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@@ -1,3 +1,3 @@
-DIST leather-0.3.3.tar.gz 18391 BLAKE2B 0a81343251fcdea85873fea023e1d709a385b268c2900642764c1a0ae6abfa84d9dece0ef67ae152b716c93c1bdaf9671f8c5df8cf5605694af48e8f3552437a SHA512 3387353d4da129fa3601799efe8742aea08f94579caab7a5a05175ff7ad50a815fc7ca4aee5d1c390027bda3a9bf1ecd1ed5167575386a7a58f56625f5165350
-EBUILD leather-0.3.3.ebuild 481 BLAKE2B d62b2027f83da349d6d03e46b1f7e0e75f7b235559b02924157d9f9ad9785abb4ac1bbc89ab26f404a79c5947aa866dcb94857c8af2e9f6a9bc6febecfded409 SHA512 fd13d98cb43968aa2583770010ce86ae5c2938cb434cf6da27c9d033bc3b452650f91120828ef939ea2b1907842ea5549b3902c4a6b3de50047d5e22f982bf96
+DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
+EBUILD leather-0.3.3-r2.ebuild 1208 BLAKE2B eb9fa86edff5d7fe5ccc36e5176a385348ea16e95ac9ae42bb6e9632a18052d9d82f0d983f76baaacc804336cbb49baf5b84755f8119f44623a67f0a470e03de SHA512 6ba0a36855f4dc039bfa90be8279e55bf1ac57ae27e8b8c129e953cfd2986ef18b697a6c7231c5aef94362b8509bae2413e1f48097564124b089c78a96ebe856
 MISC metadata.xml 493 BLAKE2B f8962c3c95f53a3b1f019a9f0b175700e2954f53cd79e8422a23bb7bd49bc93f402e1dc23a02466bda8a112e1e78e6a843379077e88937dd89efc47d433dd6f7 SHA512 62620c4b79244ca31054b496eff69208bf94aad7df682ed14436a254fb0f604442cd3242a29ab1e828ad902b8ee9348d7830c73a00985017d2a03acde4a757c5
diff --git a/dev-python/leather/leather-0.3.3-r2.ebuild b/dev-python/leather/leather-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..c792bf43f78a
--- /dev/null
+++ b/dev-python/leather/leather-0.3.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python charting for 80% of humans."
+HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
+SRC_URI="https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
+TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+RDEPEND="
+	${TEST_AGAINST_RDEPEND}
+	>=dev-python/cssselect-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local requirements_files sed_args
+
+	sed_args=(
+		-e '/coverage/d'
+		-e '/lxml/d' # lxml is required only when leather is used as a test dependency
+		-e '/nose/d'
+		-e '/tox/d'
+		-e '/Sphinx/d'
+		-e '/sphinx_rtd_theme/d'
+		-e '/unittest2/d'
+	)
+
+	requirements_files+=(requirements*.txt)
+	sed "${sed_args[@]}" -i "${requirements_files[@]}" || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/leather/leather-0.3.3.ebuild b/dev-python/leather/leather-0.3.3.ebuild
deleted file mode 100644
index 64dd2f6e2824..000000000000
--- a/dev-python/leather/leather-0.3.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python charting for 80% of humans."
-HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index fd91f371a521..4a62eb607d65 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,5 +1,8 @@
+AUX libtmux-0.10.0-more-specific-ids.patch 1092 BLAKE2B 9d29753d4da4af3c5d1f80eb91fd92aefe1a8148da699ec5c940facd5ce3cd5234e215974b8ea57ae4b633ca49db13d64e06f220a2f41af9264832940060388d SHA512 7728fdd0c45cde994c91341c6dd47e1998a29013be876d28e3c926eb538eb0d3fa62046dd0ef16d596c92f5ddf492d4d3f13d9b1a2e989a3c03cd3732940c367
+DIST libtmux-v0.10.1.tar.gz 220592 BLAKE2B 56028bca4e6a8df788d9fc9a112731fbf17f3617410d0632ac9d3f000ca130d2f4b21c377611e1ef95bcf493fa14f885cbcd7aa986d9c1b89d2b972fb4173f78 SHA512 67ed162546a3dc5aa51e91ac03f015532d67847b0400766b442691a39a1a751c59a6b37811f6422ed713fca6a071767a8e13694b2722489d2e56cda711010228
 DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
 DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
+EBUILD libtmux-0.10.1.ebuild 1044 BLAKE2B d5c843fd54c13414341ee5ba14292fe08d692d63ddbb47ad2133ae0b0e9231b9a21b3264d1ca3038fefef0efcd4369891ebf2915ce723674f274d0e94153ca04 SHA512 644142825686b6591af631ab33673badb2bf7a31719d296b0ba1d10b1556e8d97449db52ccea7ace1d4968a9191af75ac85f966fb4b5b1e6eaa0b02fa275bd29
 EBUILD libtmux-0.8.5.ebuild 897 BLAKE2B c85a8896ceef6b29baa93f6a406b6256b635b76c0a3123ed5782a6f2224a2a238a35bc90284fa6bffdf8e80fc92317c60ab4e6cb2ecfbabd6beeac2f1fdcd20e SHA512 296c8a852ef822604240edabb47f029867817f86d6d4f5f0b6046f8edbf9ba9788354864ee921046621681b5942ee371372d1fbd1cd5632ef52459d68035db4f
 EBUILD libtmux-0.9.0.ebuild 977 BLAKE2B cb7b24f0ece2c8d5f7814db0767d54e1fab90789c92a3fa34a020260cef26bf31aaaf51d20480edb188b2d187df2cfdff953b58b81326ce2ebc6173d73379878 SHA512 3767d7932a928e80b6088e58f52e7f14e6810e0b76943b28f65eeac018377d3b9c93c17cb9454f5c3297253a8e79f494a90f37a71d02dac4c28988b3ee3a4c3c
 MISC metadata.xml 343 BLAKE2B 66c3f5a64242dfaf69b7828e9e90de5eb93bd1d95a008cd41b748fe768280678f7be3d9e930690be44fa7f639de589074f056ec4d39bb882fdfff9dbc76f3558 SHA512 897920796a56516a2cd2455e689b364cf92080b65a3f7c0f8b40b56e2f4c1c693a29cd6eca755ff51e3b1b57a8be1136a5648f1ed8857933d6e7e20628eece5e
diff --git a/dev-python/libtmux/files/libtmux-0.10.0-more-specific-ids.patch b/dev-python/libtmux/files/libtmux-0.10.0-more-specific-ids.patch
new file mode 100644
index 000000000000..ca5817bda5f4
--- /dev/null
+++ b/dev-python/libtmux/files/libtmux-0.10.0-more-specific-ids.patch
@@ -0,0 +1,26 @@
+diff --git a/libtmux/session.py b/libtmux/session.py
+index cd6af00..e4c02e2 100644
+--- a/libtmux/session.py
++++ b/libtmux/session.py
+@@ -263,7 +263,7 @@ class Session(TmuxMappingObject, TmuxRelationalObject, EnvironmentMixin):
+             if isinstance(target_window, int):
+                 target = '-t%s:%d' % (self.name, target_window)
+             else:
+-                target = '-t%s' % target_window
++                target = '-t%s:%s' % (self.name, target_window)
+ 
+         proc = self.cmd('kill-window', target)
+ 
+diff --git a/libtmux/window.py b/libtmux/window.py
+index e62e8df..f452575 100644
+--- a/libtmux/window.py
++++ b/libtmux/window.py
+@@ -366,7 +366,7 @@ class Window(TmuxMappingObject, TmuxRelationalObject):
+         if target_pane in ['-l', '-U', '-D', '-L', '-R']:
+             proc = self.cmd('select-pane', '-t%s' % self.id, target_pane)
+         else:
+-            proc = self.cmd('select-pane', '-t%s' % target_pane)
++            proc = self.cmd('select-pane', '-t%%%s' % target_pane)
+ 
+         if proc.stderr:
+             raise exc.LibTmuxException(proc.stderr)
diff --git a/dev-python/libtmux/libtmux-0.10.1.ebuild b/dev-python/libtmux/libtmux-0.10.1.ebuild
new file mode 100644
index 000000000000..4f183304d9d1
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.10.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=app-misc/tmux-3.0a"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_{7..9})
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/libtmux-0.10.0-more-specific-ids.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 3e57dfd779e1..cfbd2265d868 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,4 +1,4 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
-EBUILD llfuse-1.4.1.ebuild 789 BLAKE2B e1578338b39b1319746613c7f2787ee939bfba6b708e64836e2afaca1391d20579555be75bcb04941e3ca5b05aecbeb3a3b194187df829aaca0642fa75326f50 SHA512 f7200f16b180f14aa149dff5702ea05aa9faa9e97d0a3a6b71e52453ff58b345e1eabf45df1681f1cca42b3b2a397307737d329e84607daf547dc371e25dd48a
+EBUILD llfuse-1.4.1.ebuild 796 BLAKE2B ab72bf58f469bceadcf53bfe1632e89087784a229b9b223f09980cffab48030c2c08ab2b3515aeebbff4d6646ee70fd5e9a6c41fe6883ecace88d27647aa1707 SHA512 6c72b914d282a9ab4aca510bac58628ba1a1ea763b64a7e0e341556575355b3f91c2ea9d50f60f3fcb03b6730be026dd07bef015730c02ec2bf2704dbfdb25a1
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.4.1.ebuild b/dev-python/llfuse/llfuse-1.4.1.ebuild
index 498ded6e7596..0b4527b67c59 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 ~riscv x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 0120a355b7ea..59e715dc1944 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST more-itertools-8.7.0.tar.gz 92857 BLAKE2B 65966fa2939fb6908c25a658e96162238056403e2b67d41d027c11cf04c01a09f954ea1a75363e0f615ea3e5fa5b9cfa4289ef18942c68122f10588f37f797ab SHA512 0e80dd5e08ffbd1878f414e1e8d036046ecfaf74c638a79d277d72e8357892b73735cc18d8a022c53916acc3733ebde4cb8030c5cecc354d6469933d91c66c13
 DIST more-itertools-8.8.0.tar.gz 93660 BLAKE2B 7d26b847c856064b6edfbda661b9e9288ba2069604e687d90713040ec469abab9853f3bff1b4e25b9ded764822a9ba58eccd5be5e9a13094ab4fc0871626289b SHA512 c6efec614a10a2fc72a4bbb7c62ac586e5dd28e04582768e0b3749cbd8307df0b4a609637d427d9c4940874e2aed1432094c09ac249e16a20dc6a09723172f06
-EBUILD more-itertools-8.7.0.ebuild 623 BLAKE2B 2a75e8dcded237195bb6a71f406124e02fa5bb9d28f038b76d4e88a00fb44a800a7013b4381f507efb93ba05eaba3a82875e5ff3828fcf4249964dc5edfc85b3 SHA512 95d8e90cdbf631c94ee3b091dc165ac31c7594b9d8b820af8c96536f705be4a38ca84c086b7c4a73ce79583982754eb90c7f796c8d32eedf9705ea2cc00898ea
-EBUILD more-itertools-8.8.0.ebuild 631 BLAKE2B 92f155b60235091f5883360b490cc47945c34a0fe25dbd7409a344cb309ab9c52eea0fddbfa0ec140b37176fbd853d4785bcd6f2e120f625c99640756c383ac4 SHA512 79dc28acceef5541f9b114abaf00a8ba3ced9c71fb9b3c7418c0161102c0a21ff777f49375a3ef0339b2f020af3167b949a2427858ec9ac36cb3fab9bc4ccf4b
+EBUILD more-itertools-8.8.0.ebuild 623 BLAKE2B 2a75e8dcded237195bb6a71f406124e02fa5bb9d28f038b76d4e88a00fb44a800a7013b4381f507efb93ba05eaba3a82875e5ff3828fcf4249964dc5edfc85b3 SHA512 95d8e90cdbf631c94ee3b091dc165ac31c7594b9d8b820af8c96536f705be4a38ca84c086b7c4a73ce79583982754eb90c7f796c8d32eedf9705ea2cc00898ea
 MISC metadata.xml 487 BLAKE2B 32273e3af64b6c58907948a20fa547f733fb0c1a1bc8d8cf580657d4ed19f6eaff7f9b6e8f930887d5af7052682bad3ef1131a0c10ba2474791f01b450b86e65 SHA512 5ce5d78097a243fe8ad553783a5de64c1df82ef77f0eefc9c55452bddebe472622ef6c95d28be9247739ad86cf68a1854ac66c5725555728a46a080ff26a6c8e
diff --git a/dev-python/more-itertools/more-itertools-8.7.0.ebuild b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
deleted file mode 100644
index d430192b622f..000000000000
--- a/dev-python/more-itertools/more-itertools-8.7.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.8.0.ebuild b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
index c62cd2e85d81..d430192b622f 100644
--- a/dev-python/more-itertools/more-itertools-8.8.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index d2c043a34c01..e7433298eca3 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,7 +1,9 @@
 DIST mypy-0.812.tar.gz 2122474 BLAKE2B 3bfbfe3010798d49bcf00aa1d926ffa8a54be50fb2e88f4ffc3cde3edba80a9b74853de17126394dc1806c07b740b5f8e7775f2fe4b2312e0a85134b446a690b SHA512 ee89f56a7a01214540f9b727f153a075a097b161b7f654d926d1080ae540ec68303629a4fe691fcb53d37c3eb08924bf01d22cdf1c3761b414a3bc40af3363e6
 DIST mypy-0.902.tar.gz 2549241 BLAKE2B ba8bce0434b08c379907f96f22c030048ff8c45f426eb4a6b6951059974bd3f35b5e6bc759b9b6ff0237d43811d01181e58ea2cf919fda3e2649c37825d86134 SHA512 b896d5a614982d60dbeffadf56a5faff3d809c4d2af299fc658a67c09c3f36cab961d8516d38ea682227d9a06613a3aff7bb041ba1346354b81ec1187316d258
+DIST mypy-0.910.tar.gz 2551057 BLAKE2B a3c6939c8f0e2ea19a3a3f91031330df2fb25a93cc3f9239535f15c17eedcca5716cc75c5412a1d345d8572d396c3d7128e38989fd694833cb6aec8366ac4afe SHA512 49060c13da8bf17385b6b1db6efa9ac5771f2bac92d26760c4087cf128de22846b8a062f38e83ecff524e7893f8c9cd0647a2ef89e10387138544436a2840459
 DIST typeshed-add4d92f050fb11d3901c6f0ee579a122d4a7a98.tar.gz 600241 BLAKE2B 2bf91ba7bfa2ed3e2369d70ab76ce152e00f321e79f36ef7c264d477e350579eaade222e8347b4105fb93b847d944ce0aa182466ce636649098a2df69c09ee5d SHA512 8497ee9719e162f84556407296d383e0b7e695cf6cd60bbf7f34c1d7aada3926fd5516ce7ea3863e11b3bcb87f12617733082f020718610e467877872f0b4487
 EBUILD mypy-0.812-r1.ebuild 1772 BLAKE2B 15065f178eb5205fc041b3fc49517f42f770ffdaefd688cfa54c7846232bcb2f1292f1a37c4168ca7962578add3b490a739a91f9133e592b7c64fd4c51a93f11 SHA512 608f51989f8ce28ccc3982c6b4206386a9d8fb31f496925a5311f86df871c2dafbcf2fd0b2a353d1b1b87014ce6a532fe9370e9c67320b845c8e5ab88e2c794b
 EBUILD mypy-0.812-r2.ebuild 1776 BLAKE2B fac9d47619894b63eaa5af03c7b59d8eecd431dff1dfdf851083098fb54ca32624c77d3dac019ef942099969da8680b4d832241eae2346ade8cabb7ee8b0b1cf SHA512 4058512f892c97959f5ab2d09c98cfd0f1dd5d5b13b605164126c4e0769b97281b9a8a0b1cca297c61be1884034449062952670a664a78a7c7c3fe8beff88156
 EBUILD mypy-0.902.ebuild 1545 BLAKE2B 04cc8108aa1efe1b760d96d64175e543c9762b826fe10425e3573905a13db0a7d2997d74490c69755252e23ad8fccf5391e3e9d18d8ad5146c639bdffdb59cb2 SHA512 62055af8581aeb6d6eb1a46bee126ce6bdb3fa605583d2d3a644f37ac65fb77005d1fd4fc1bcd47391a094c37d50c2bb1a93a3b93fae767bc4bec236eb3cbec4
-MISC metadata.xml 617 BLAKE2B 73f976671466dec8bac8d48582af842bc89261eca6d21410b5d9667a322a231bbfcc6d1bc87ef71fbf32977b5694b2f1f20b5ca6dde3887a045fcf282b274b3b SHA512 3d1b1927b0eae9256340623426b4cb00195d286841fcb7d632987182e985e56c1727d1d30120faed96188714bafd43c9efe211aad444e57c96b33c87457f6526
+EBUILD mypy-0.910.ebuild 1637 BLAKE2B 9419341df308c2f926d7f9c7156ecc5e0bd00e2ac7bfc6810716ee8771df54cae3aef1c3ebab5a8eb6bd2904e7a0318e1602992149107aac4cdc2135b7c78b38 SHA512 f5b38cbf678445f9c676a192905235e380039015c254222d0d9f594861375440ee18ed5fb1d9ae974b41fc0612175855cbea05a8e50a91fffb1d33e8adafee64
+MISC metadata.xml 514 BLAKE2B 12e8ffaeeac0b2501560c015aed0707a75162182b00e899221c9600b78a2969dd6e24a7cb5580aaec810885cf1787882628b2fe550121dabd3737e4cb61d09e6 SHA512 83496ca98f9207accab51a98e3e52c0e68a5b290c6b4f518544e53ecf38cee8153372212db198b97c8a1c07d922cfd00dfcfa41c3d49a9d69eb4bc146633f454
diff --git a/dev-python/mypy/metadata.xml b/dev-python/mypy/metadata.xml
index 72325d992e7c..e79f22ed14f7 100644
--- a/dev-python/mypy/metadata.xml
+++ b/dev-python/mypy/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/mypy/mypy-0.910.ebuild b/dev-python/mypy/mypy-0.910.ebuild
new file mode 100644
index 000000000000..c881eaa2395f
--- /dev/null
+++ b/dev-python/mypy/mypy-0.910.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+TYPESHED_COMMIT="add4d92f050fb11d3901c6f0ee579a122d4a7a98"
+SRC_URI="
+	https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.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
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	local deselect=(
+		# TODO
+		mypy/test/teststubtest.py
+	)
+
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 48e7edff858c..b846669e0afd 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,5 @@
 DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
+DIST netCDF4-1.5.7.tar.gz 763928 BLAKE2B e8e1c689747aa2697beeadf1c5164f1530fe76e0fb0d7affb94b506d1632c5242a406cdee72a2a683b75beda649f516ca06f5fd8fcddf5c567327d2420443721 SHA512 dfcc900e4d72f7b0c5c6a7fdaaab221735977306e86856e6d712e8a3c36ff22bd6210cbfb9819b9a26fde647c00aed5fcffe430459f9f2d5208a2cf8865ca853
 EBUILD netcdf4-python-1.5.6.ebuild 1166 BLAKE2B 8d88751857f010e920634200007832ac1ba2e56aed4a4c5ad8f894462cf15d7ef55bab46c790570c960ec2f6fdb1c093db8e238cd2b6c89a89ed813e366683a5 SHA512 0341524cace5849b6f5a1c1d93e0531fa233965a6cbadaa53ddbb6ca4bf8b4f40748a316b4d71f2a37ecd32fd9bd4c2c7fc0ac69cc5b27f0d189ee80893cd1d4
+EBUILD netcdf4-python-1.5.7.ebuild 1133 BLAKE2B f7c9011a87e4baf59fec3aba447fb5b8cc58cf60402fd8e5885e3259f160e773a4e3bdb9ea75ea2bd912c25dd5d6abf41e8bd2376f0d50b69b1481e93be1973c SHA512 8241c0e5fab38c4ab767fef8ce9381085fd7b28a091b1eda9e19cb5ff1f9248ac0ec66bbb3433e2e3bc2585c15f17f08c1d570394295487d728cef1ed0a9de2e
 MISC metadata.xml 680 BLAKE2B b380916f10fadde1beadde6b0f97dabdada2a183db75b345dc6bcc8723a24ce5b1d266048e758d02cc53bc0e92339fe359c86741212f9122a984825ebaf45e2c SHA512 5825d714a75190fef8b60360221425c5feed48220920b854f5f2e1a6489b4fa1952b7a798e42c4750b69c83902879ce263fd5b7d109ed9d43a147e6298a329bb
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.7.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.7.ebuild
new file mode 100644
index 000000000000..85f4164e0e41
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+RDEPEND="${DEPEND}
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		sci-libs/hdf5
+		sci-libs/netcdf[hdf5,tools]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	local -x NO_NET=1
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
+	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
+	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index a7f57f608bb0..b591ea9a75ed 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46-r1.ebuild 555 BLAKE2B 39cee172ff408e0d19b020e3f68b235945a1ee9c01a9360b337dc4cb75bb5e679daa60e39a13d565852a25686e4b9f13e0072c78379cc340d32a0e3b0ebf2d3f SHA512 91e4efea049849e2e31a47ef743f1b72f1fa992e3f14f0a259df8140fde85c04d13d67f76a860d5e3f357fd4ddeb14b94db1e4df1b3b240681cb4902f31a9e63
+EBUILD olefile-0.46-r1.ebuild 562 BLAKE2B 0d13da504eb6ecc48817051ff6150de88556db8a74cc8c6cb48cf5a5d9a4b927ec32e25d92491a45b90360807fddf2db934c2007093c247f9a8b62922a8a34da SHA512 21c883b38a1aee0548c086a60accad4773dbb7af69576e4cfb9cd0134ee7701fd2c14d63978733c31c3c6e267df11966163dc7ea3337a311eb3ab5e6b6834cbe
 MISC metadata.xml 379 BLAKE2B 1b76ae228143f7e6fa4e532f8b6fcadc19e36b40abca620267edd0e7f626ba27a865bbcc92c5f1889301841f190e8b58484524db667d196ca4ac4be92bcdace2 SHA512 3da4b083834b368bf4f4f0f2bef54fab1306e199f38e3f763f98d26662cf9cae01acbb15db07e39d2a97aa5c556efb4241043da5bdac998c905a4538c33088a8
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index a4c54fc05f88..5318544ccad9 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 419c8d26fe55..6bfc9f76edef 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,4 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
+EBUILD openstacksdk-0.50.0-r1.ebuild 2634 BLAKE2B 01ef2ee64a330d3df3420eeb77da654ee7ef05287a52f058791046d83b30624e13b1b8794c61bcae0796a93e9d6a46b378d9eb2ab1d0a3771b7e4935a0d76cc0 SHA512 23f0729ffb3c37e73054f28b46f4b4df4f6eaf6703a282f653c28537db689bcdc072cab4706d986128aaf5fe166fbf0f2f5492e78cc73a284ae4c9e2105072d1
 EBUILD openstacksdk-0.50.0.ebuild 1326 BLAKE2B 07fece6346948f5271f30aac64518ff3f123db35da212a9f0e5c37ec96416c8f56c1d6ef14c767b5c226b0608aaebd7a9528531a8da38ac20dce104da1a0ad6b SHA512 dcecca99c2329242e4ec4b4acb296e0d36bf78142a797b1f4d0b7c640862e33aedbc784f385d770b3ee707c2596f59be006c80ac08f9c863a9e1f65b10621243
-MISC metadata.xml 422 BLAKE2B 57e22147ab28f2b4be494dc46b385575826275561dec468e72c4a1ccb753961cc57b5dff26fcd392c302fdcaabe7cbbe1418fd32bb1064a5c48c5d56a3a2a6b5 SHA512 f66f341a5c0ad49bc89dcb8e167c2c6caaa95f7b52f6729300969196ebba9eb48616bead34031dd1633224161117200529a3e0a2bfee7ad9e25bf5375529bccb
+MISC metadata.xml 523 BLAKE2B ebaf30ed0d1a7740cf6ab3d1c4166d425c52bc729aaf44984905e658dc6821756c6d652dc3ace972e0ecff1a3331147c8d016ef828f99c5fe3c1c559cec92b23 SHA512 82035e25a5b7090fa89cf36e623a972de79884ddbfdcbc3d425e989230a9e0a458048cc352f353ff9fa4c7520cd5c4d6da472862dd919c706839661499a4540b
diff --git a/dev-python/openstacksdk/metadata.xml b/dev-python/openstacksdk/metadata.xml
index b52cfc9e9d77..be77e5f49793 100644
--- a/dev-python/openstacksdk/metadata.xml
+++ b/dev-python/openstacksdk/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openstack/python-openstacksdk</remote-id>
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
new file mode 100644
index 000000000000..6b4f1fbec8c2
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonpatch-1.16[${PYTHON_USEDEP}]
+	!~dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	distutils_install_for_testing
+	cd "${TEST_DIR}"/lib || die
+
+	# broken with the current version of dogpile.cache?
+	rm openstack/tests/unit/cloud/test_caching.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 2205bccdcabc..43edd81f4189 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,4 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0.ebuild 553 BLAKE2B ecdefb32a34bbd7158dc935268f172c83087cdf7a204dc56c87a249dc61b4c23f6198260bd19d25fb4dbc002ffaaf6066495216792c109a627d7c3407048486a SHA512 3220123395c2171d6172ecfa2b0142c4cd4eee86cbf830cf5b9ea44de83e79a91b7189844ac18fe3527bcd30d46e44333e893ab3fd1d7570ad07df3869742094
+EBUILD os-service-types-1.7.0-r1.ebuild 808 BLAKE2B 915dbb9688a0970b25123cc403983283545179875b6a42c4f7a4930736f64255761375339bf921a502ad2ce502133011b26116f00dd16e8fdc05b16d0b8d5c31 SHA512 5c7b2701455cfb23052f4b3061f8579ea12d21edc50c53331ecd94f84cd8df8609ddae919eac7a4c4674bcc2eeaa58f241f17b0ead655e15f248400f57a8a1f2
+EBUILD os-service-types-1.7.0.ebuild 554 BLAKE2B 6d8761c0f618ddffcfb28fb9b633c6b6006a6ed2bb48d561591a3a5767ab79b3f04c928060ac752f5ca04bc49497e84ddcd04238a197e64a1a807af953b910fa SHA512 4c009b9347bf50bc363a8a5e22dd79671c34219312d67a5e08bddd97454bb3773aeaa3f7c5e861eced64114f03e2de25c7d040decfbb2fda3fff9e4c64871c62
 MISC metadata.xml 478 BLAKE2B b2adbb00563c579932cd362f5ff0e4c17c9d510f9210769de52d989ae734b5f4b75613a357ae850bd201dfa5408144b75e3e2a05cdf22cdd0f3e87b5e47b9b1a SHA512 edf558fd97f5eafb164af966a3dc79f7e5bba8f89e925a6cba1c3245b9b053361485fb3937c89c9fee2abb1f55582f65db6cdea97d2c8cb236f2cff62fa9ae64
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..6d477d30afda
--- /dev/null
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to handle official service types for OpenStack and it's aliases."
+HOMEPAGE="https://github.com/openstack/os-service-types"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+RDEPEND="${CDEPEND}"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index 20dd0740f39c..a33a43bcfdea 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 666fe7d05ea9..40e5f1ba4288 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,4 @@
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
+EBUILD oslo-config-8.3.3-r1.ebuild 1344 BLAKE2B 4ba165d1dcc6f6899e82c5fc4bb6e98e2f302ac4071b58e269a9d560341f7315eecb193a0028f82738f07f79744184785eab81e1f9d95066b0c8cc80bf5d7d6d SHA512 2298cc3567c45c1d50e01b2aa6e660c385b6c5992ca67226642112ea5e05aff637424e1ad48f0393645ccd1f2a41d7f3b99a299c3e6056ef07f661f7dfeba77b
 EBUILD oslo-config-8.3.3.ebuild 985 BLAKE2B e6e7ad1fe165466578d09ce9e9d22e9b30cbfa5fc6add48e0b54ad82b650adabe7668e0458e9899dc9b0692894d1f931d23e31c74d1e9f3cf8ae60ce7b558d36 SHA512 19810a86aa2fc185c184c05326999f1db38b1da94f2db79aecd8f2ef8608dfd7cfce355910885c583d33b3964ae0403c592c046daf188ae10df72bdcb231c060
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
new file mode 100644
index 000000000000..d1ceaf4b0701
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-8.3.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Configuration API"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x COLUMNS=80
+	eunittest -b
+}
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index ca322ccf67ce..40379119d044 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.context-3.1.1.tar.gz 29335 BLAKE2B 2179e5c273b5e387806fc4a8b1ac2f0641f4cc9f2345cb00e6ef9c2e7c8b69709c0c14dd11254d026283b2be7e032044b6f753a13f062915db9f000ae1873f1a SHA512 a9d16475bac5aa96d086019632f417fa5b496f615b814527e547a43362f1e36ed47c47266032e72194f88716237ccff7a24bf941d66bf36afe09b846a810583b
-EBUILD oslo-context-3.1.1.ebuild 684 BLAKE2B 132f64f38e6f6b1767671bd255f1b0455128d1cc351039a7f67e3b17fdaeefcbffe883b2177a81b5fc81aab3939ac3f5ed84c5d16623205f05e930e5fe76bc7b SHA512 fc81df4a2ef1a2261d38318cf67d1700b33d8173cc18f1a3833d0f1e310bdfd190173565df152627f96bb390018acd0039e8b1ba0e63a4f5ef0d04714befc0b8
+EBUILD oslo-context-3.1.1.ebuild 794 BLAKE2B e7a682a9e237bd136987b0e871b874dbe0d77b6a8c9e5c421284ec6b303afc131e33aa6394b5a18e104e825d5e411a6396cd61c43c2ee5431a9b48fbbe0af7e5 SHA512 39c0aa6b54a31eeabc58277c0c416164dd204c4afcedb3c0cbeea8548bf137ba551b25eb0ed8fac9b4e5a58ad0c69ff68f88899561fbb5f245717198a46f4b18
 MISC metadata.xml 725 BLAKE2B fb817231aed63e38c9e093cdbfe155521da1c3b7fb3b1d8ea6b7d2b0b1fd4fe8afd647819e1a216f3a591ef8c1f67af78bdfaf0ea75e83cd72617a4dfd679ca9 SHA512 b399412459dbff332edd84c87867cd95bb8cf5dd3b91b15b79f4eecbd577076c4b83fa251f4410a9cf9fa5608287048442786d6f90a0a7d5a3ead11b0a9a4548
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
index 958d79d40512..2fccec703764 100644
--- a/dev-python/oslo-context/oslo-context-3.1.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Helpers to maintain useful information about a request context"
@@ -18,6 +17,12 @@ KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 4736d2bb10bd..85bd29c4acc1 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,3 @@
-DIST oslo-i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
-EBUILD oslo-i18n-5.0.1.ebuild 626 BLAKE2B cad76aa12b12d4c7d8bc1ff3aa3b4a211638a88968811e998cabec466d1e42689f58849622479a8f060957bea23b6a045a9251caad4db6a8a51f580714617faf SHA512 36e8c89876800fed68842bd62799f7196d440c38bcb7a7e1b4c22ab6f684b5de6160a41dd05149c5bd7f934d9dfa216fc43acd29a0dc6faff8cf689b62b2d344
-MISC metadata.xml 504 BLAKE2B 646830c9f625ec395265019b730dad69b5359ec85c56bdbd84b98149f05ab04381cd44f8952bcbe1a939dc0b09c7ee492043d4b0d2ece0b0b04bfc7124f6e675 SHA512 305c7352a138341af2ad61c72928e6b3a0b1f6c86d8aab8aa5636a7404161dce1500a482cdbc4c7c08ff7cbc7f1a518302195f9edd95ae65ba2657f1ff75b169
+DIST oslo.i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
+EBUILD oslo-i18n-5.0.1-r1.ebuild 750 BLAKE2B cea3aecfa9357b3ae1886be8aada131674733084c89242e7537dbe64d04bc42714e91c7331aaa94f387e68e6a8f1d91dc498a9cfc89ed7eb9d6f00087e041f85 SHA512 926fc45ddd8fba80942f87cd3e60e1c53d391ce15f22ab66ba2edf49faee1146bef21a3a89844a67d7e0ce95ffd7c2c52543c637f67af2cca84d6f6b370deb1e
+MISC metadata.xml 605 BLAKE2B 7393a374b976ee7fa9416ba5f431ab99a8e760580bc9aae7fff4249085c4341c3dbf8cc2e86270061ab5abb36be34811317735f75afe344c7f5f3bf54dcacad4 SHA512 31d7ab85bb31cad7907712039a5032b42bdb69ee50a402d6c368b3501e9a768e77097021477fb9dbbf24a43823e6b78249e40bee097b366c6c83e5b151117be6
diff --git a/dev-python/oslo-i18n/metadata.xml b/dev-python/oslo-i18n/metadata.xml
index 622ac75e5084..0e46ed659e40 100644
--- a/dev-python/oslo-i18n/metadata.xml
+++ b/dev-python/oslo-i18n/metadata.xml
@@ -9,6 +9,10 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.i18n</remote-id>
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.0.1-r1.ebuild
index 940d62e22546..29cb1ee5c79f 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.0.1-r1.ebuild
@@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1 vcs-snapshot
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
 
 MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Oslo i18n library"
 HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,8 +20,16 @@ KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index ee9087653ad5..4d261f6c67da 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,4 @@
 DIST oslo.log-4.4.0.tar.gz 86108 BLAKE2B b710d110759612dc7c1516a0df7b0ffe5af1ee83f99ff776212e72a52a4249657b4857a8fa99aa06047093ac554b6374ba529bafee75d4589beb538baca5b190 SHA512 6501963e90d40d2e722f338ec7c78fa36f6b5b255d36fc5df7d6160d1f35397ff112b88053603f6b57d9d93539bdb665e3c1b6894f3898988fd8d06b5a356120
-EBUILD oslo-log-4.4.0.ebuild 1040 BLAKE2B f8517155ac90f2aeb7906c04f9d1df6c3210f4c00671f8a5404d30048a0a400693d5d9a8e881af9ba45af60d3394a11d440e9afe42a5c836217b334c86ed6331 SHA512 2996f9a423643aec7207429664ebb55254970fe924e4bebbc7181b0ad5c4cf4be344dfda2438b61c24fca12d115f1aeb8c99a82e9ba21c405096ed34cb7e108b
+EBUILD oslo-log-4.4.0-r1.ebuild 1233 BLAKE2B e15e8a35e677f0d69237eb4d7588abdf2d2c730c96d749416630bbc4a78fbf0295fd35636afede1a0028f4cd9f839ecc5b4ae5ff271fbb549b26779d3331b583 SHA512 2e714a380f5ba00c6bf5bc85cd2a0f4c66c903c571171066c8d77549430c9277ca1484960b378119c6939f404d56d67470d6bfded872936ebef2626cf4d2cd1c
+EBUILD oslo-log-4.4.0.ebuild 1227 BLAKE2B 0f41dbeff54622723afb2e8798a5e58452938d6ac063c2d17b616b637b70cdf2cb85fc5420492aec06ffe640c1f0c334989faa6122549e2c54ab8a29894ee2df SHA512 96b7b44e7a5cf92618d488d63f9bece74dba7cb32953447cace8ec56265b7322c6779cd32a1891ce44507a0b81f49c1ad644832379f879bc9dea761cf49458ac
 MISC metadata.xml 907 BLAKE2B d91afdb5f720175be1bf2f8064d509ee94bc78fda6a428059e62a6e14753a567d6e696912d841a2ac9c68acb07f076212e6ae50aec0da23079f536952311fe5d SHA512 802e195e3bd2b4ae730be1766033dea2d8df58e664c506ed1ffd4c7c426a5a740ca31bcc0557d8b5acf660a1f751c106de17825dfbb71229e84d299647a509b7
diff --git a/dev-python/oslo-log/oslo-log-4.4.0-r1.ebuild b/dev-python/oslo-log/oslo-log-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..5c2292eec5fd
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-4.4.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
index 3c61e7131633..1f5b37183c68 100644
--- a/dev-python/oslo-log/oslo-log-4.4.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=( python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
@@ -25,4 +24,15 @@ RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
 	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
+BDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 113e3363179a..e69732388b76 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
-DIST oslo-serialization-4.0.2.tar.gz 33029 BLAKE2B 8e0d4b71b87f38bc22994d423d7bfe7e7d4d66c6279ec1a8cd33fdb064d56c6aea7de41795c7bdacec3c970eb46a49a3204ade20d8128f44eb94b95d0239ba13 SHA512 30d5a6d0f91c8a4bebeb0389e7d8d6b306efef420dc1dd2141ac27fd43be7526443294082cfbc1a4eb9b0b88dbff5be3b854aa8493595f3d0145e8a938e00131
-EBUILD oslo-serialization-4.0.2.ebuild 898 BLAKE2B 749aa4d837ec14c7bad5f58fa71f41cd86a0d8d2247cae8e50cdd23dd1b767b92ed65b9e35b6f383e852dac49fadfc77c8e98565c6377018e444a65a45aedf57 SHA512 28922ed5ef9bbd0bcc438ffe813ff5a84695980089b9ca6ee131c7d2bab519897f18afbfbf018b4f7c0f23b1f68d7a7c071106a8e3c2c140dda1f93e0bb7bc35
-MISC metadata.xml 513 BLAKE2B 019650e2c80bf2578f18cafd2479e411976d0e52b3dfcdc6f072e90c2349dd700de96fbfffd6a54729b5d2114f2b10e45760c43a1efbe93f2d903551aa4bbd6a SHA512 701020897031a3a452366bc192ffcfc79bb94c1af69487fd8d2f4c92e7469191d89d9be53994291053835ca06c00b613ad8dc09988938972d2620755cbf67ac3
+DIST oslo.serialization-4.0.2.tar.gz 33029 BLAKE2B 8e0d4b71b87f38bc22994d423d7bfe7e7d4d66c6279ec1a8cd33fdb064d56c6aea7de41795c7bdacec3c970eb46a49a3204ade20d8128f44eb94b95d0239ba13 SHA512 30d5a6d0f91c8a4bebeb0389e7d8d6b306efef420dc1dd2141ac27fd43be7526443294082cfbc1a4eb9b0b88dbff5be3b854aa8493595f3d0145e8a938e00131
+EBUILD oslo-serialization-4.0.2.ebuild 1046 BLAKE2B 69ebe0dada99a26c93528f8b961b81ef5c0f4d98dfdbdaddb0bf992927cde0b8666dddc5a30fd1ba97dff6e8d5c190d59a32d6dcbd5c52c825077bd8515d7f2a SHA512 23966b9d2f73a501849abb04bfe9cc675dc963701b0489b5ec124d209dc4f0e926af9dd2dff095e9591b639db3f4c1517d51ccd45e45bfd7efa8ef7fc504746b
+MISC metadata.xml 614 BLAKE2B 4f877c91edd2ac4eeaf22e1ce58afdbe75b7d13def7e4f731dd8c45f4d342e5fe6cb69f9f21719349060452e73514f6a51ef99daa6079bf35b9f0935790a445f SHA512 26e8b89ac654389024b983083e45eb3b495f5d5d99e5aa8047a169657b6cf2dc7ccfe3cb502e20ef153b6c8cfce78e353ab15653b34bba9bdc86ee1ceaa8ff44
diff --git a/dev-python/oslo-serialization/metadata.xml b/dev-python/oslo-serialization/metadata.xml
index ab620efc50d4..c063d307b71e 100644
--- a/dev-python/oslo-serialization/metadata.xml
+++ b/dev-python/oslo-serialization/metadata.xml
@@ -9,6 +9,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.serialization</remote-id>
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
index 953286222872..6c3dedea3314 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
@@ -2,16 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
 
 DESCRIPTION="Oslo Serialization library"
 HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
@@ -21,13 +20,22 @@ IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
 
 python_prepare_all() {
 	# allow useage of renamed msgpack
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 18b7b560fb4e..32e71c0599fc 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,3 @@
-DIST oslo-utils-4.6.0.tar.gz 94148 BLAKE2B 2de92b22b849522a43e81f0fa9bb5e92d2c380c07eca81cd916c536e10ec55869d5933a3a9dcc65b682ac793534094e6b0aaa74b7ac9c74724231dccc0dbae3b SHA512 fe91522c9860a7637af8b8521c297d6467f2af643f026abc97b72fd3032789219d2b3fdc9a6d8beecb0e55e4e7c319e800be295abf9639b52e32da81dae0c9a7
-EBUILD oslo-utils-4.6.0.ebuild 1036 BLAKE2B 4ca629456cfee6adc2d5b94618549d311e46352a3c775465fc15693ad4fe23c5db26ae3a077251f00fdb5eef04bf777b12ed6a45d06a51c8fdf8cc1edde0bcde SHA512 f224c0e35122a5e8443d6e5ddf80c14b093e2ecb0bfbe527a36d3844484b74b605a081219f194cc1cfc014279da5505bf9bd7c349f4150ad20fb0ebaef0c3bc0
-MISC metadata.xml 505 BLAKE2B 2be3ef3a19dd451b4744efcec650e0764602364ada8bc2e6d266f7ef7c540fc2ad856d014438b4e61a8468677dcc10a395b50ac2393b09bf463324af830533d9 SHA512 9f902ca86002de14fb0d0099c834586ae2159819fd0a0fd198a13eb9a7e0505d8b7b31b4c0aa7d6b4c454ff96f9177c2f4d873f8237c543979d5eb2b6822e97f
+DIST oslo.utils-4.6.0.tar.gz 94148 BLAKE2B 2de92b22b849522a43e81f0fa9bb5e92d2c380c07eca81cd916c536e10ec55869d5933a3a9dcc65b682ac793534094e6b0aaa74b7ac9c74724231dccc0dbae3b SHA512 fe91522c9860a7637af8b8521c297d6467f2af643f026abc97b72fd3032789219d2b3fdc9a6d8beecb0e55e4e7c319e800be295abf9639b52e32da81dae0c9a7
+EBUILD oslo-utils-4.6.0-r1.ebuild 1317 BLAKE2B b5b53468b31aa05d9e98c9daada1205541d7ea8cccc7c7bf6354de73c668059b73ff97a02acce87ab4f43a7c062571e4a1f4fedb03f2e83551b25ca02546da39 SHA512 c614c59bf5a5b3a9f62b47c1a4732b95f43faa06a5457da56276c46ad9286214fcc3baeca3871dbe8a6c7ffea306803d342b9d9fe683321d84e22b2393b86685
+MISC metadata.xml 606 BLAKE2B 4628f8a52a690bf8435cbeb4b3a8c6ec4c73b73f420c85e1c9daa2fc26606448a5f358beb2212f9940c98bc4bb6f6868f097b8598fb0d017c16bb7260d2bf161 SHA512 032e3b464eb6c39c87118657c9c2f1c9ba42c79becf126b118dd8dc3aa01e978456d4b3d36f73420a7bf4336e38f6a0125a856dca74a1613448faed3d9391730
diff --git a/dev-python/oslo-utils/metadata.xml b/dev-python/oslo-utils/metadata.xml
index a94aab1f931e..5ba04c088a13 100644
--- a/dev-python/oslo-utils/metadata.xml
+++ b/dev-python/oslo-utils/metadata.xml
@@ -9,6 +9,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">oslo.utils</remote-id>
diff --git a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0-r1.ebuild
index d9dc808f52bd..5b435db98558 100644
--- a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0-r1.ebuild
@@ -2,16 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
 
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
-
 DESCRIPTION="Oslo Utility library"
 HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
@@ -20,7 +18,6 @@ KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
@@ -33,3 +30,16 @@ RDEPEND="
 	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	${CDEPEND}
+	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 5813a9d9cb97..f7e985df7eed 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,5 +1,7 @@
 DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 DIST pandas-1.2.4.tar.gz 5469105 BLAKE2B 7f39e3ca67f5997c0668b0c2e9792869963adcd0347a3983188a992794ad58ccba82105b4dc3315cc17d79104f7fea7a273c218967eb51b1ea1514e87aeebb66 SHA512 79e7a38b8edad52b70eb81ba821141b928c782009d59c50076e7d1e7c015078d333c0c80bda7ba720f4ccb221a0ba93a02885fe6a573567ee37ffae14ee9b2c3
+DIST pandas-1.2.5.tar.gz 5470907 BLAKE2B 2c5e0cb0849aa23ee8640528a3e29a579cc051543731e44c9be41fb989c85f1b2b18bc028e97c9b200f9894e4c3ac8af6a2100586e41f6d8a165a4c4679fd649 SHA512 c8bc2ca7ff8ca1a4877ccda67aaf49c103525d0f511636f93e1db3720d9a1717aacde0a5e3f107f8f620b59f0269d9e5c9515fbef46da4e87fca678d7acda990
 EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
 EBUILD pandas-1.2.4.ebuild 6153 BLAKE2B 3fb940dffdc0c19cddd05f31d7f065a5c5c873fde0e888b7a6a356b759dbfa2ae4729697c9240ac71b39957b9367bbeb70731ebaeddb46c778dba8e7eacbcb17 SHA512 44f78998f669a2df55b2b31c762c2e28c4e6064b3dd63f465e16a09a4843487e684142244348ee3f17a973ca98eb6645a73450444aa9a1fb984ef174f6a7e0c6
+EBUILD pandas-1.2.5.ebuild 6179 BLAKE2B 1830c307da0c8a1566ab2a47d7c93f2b591e4ad0f31274f133dbc374f12c6a206b7d8d94974c2063a44018f8197c78790f108988e353b84366e7e5b661a59e65 SHA512 00a11c97733b1ff262efd76f599ffcac0b46119508f5a444e386ba3c4d9f0cb36bb9d55afc397a6a3fabe7fb3a52ebedfed153e8f0ee59cd0355704c6e3afc33
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.2.5.ebuild b/dev-python/pandas/pandas-1.2.5.ebuild
new file mode 100644
index 000000000000..a55755019ca6
--- /dev/null
+++ b/dev-python/pandas/pandas-1.2.5.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 flag-o-matic multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	dev-python/statsmodels[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
+	dev-python/xlwt[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+python_test() {
+	local deselect=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# weird issue, doesn't seem very important
+		'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
+
+		# old psycopg2 API
+		pandas/tests/tools/test_to_datetime.py::TestToDatetime::test_to_datetime_tz_psycopg2
+	)
+
+	local -x LC_ALL=C.UTF-8
+	pushd "${BUILD_DIR}"/lib > /dev/null || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	PYTHONPATH=. virtx epytest pandas --skip-slow --skip-network \
+		${deselect[@]/#/--deselect } -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	find . '(' -name .pytest_cache -o -name .hypothesis ')' \
+		-exec rm -r {} + || die
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pdoc3/Manifest b/dev-python/pdoc3/Manifest
new file mode 100644
index 000000000000..b87dcdd1212f
--- /dev/null
+++ b/dev-python/pdoc3/Manifest
@@ -0,0 +1,3 @@
+DIST pdoc3-0.9.2.tar.gz 84803 BLAKE2B 5ff52a630722b9504d1de83bb236aaaafde95417ac163b79b3585156484a12b71a16de55d00ab7377b9e44eec7902384f1f648a514b8e7392da6f5e79f6f229f SHA512 653231a124239ec189dc5aa4dec59245c6d20e4ff6ca9cb7fa468410b712b766288f4c59f8c0d0b8c1a4190ce84603455ec0ad7c7b1e0dc4f28cd279bb69685f
+EBUILD pdoc3-0.9.2.ebuild 706 BLAKE2B 9586d00e4e29f506cb2839c38a63d54ea6ee9ae344ed4e8dcc2f56662aaaba74a4909bf53b02a4a33c8a80d30d541f0b56ea57a49d483b3308dad5affccab4f1 SHA512 f23fe27b116b3a240b489ec93539b626b644665a97d9671829788b3db9a5de4a6d78bfa0ff6d58a0c4b396b7f9fa224edcaecd6a6d35c66a987d84c99aa4241f
+MISC metadata.xml 364 BLAKE2B cca448f43322773eea00643205c8f133e64f06aef11b5d4e79aef3a735b8b35a9c200de7a75c9499267a2bd486df4dbf5c6bbd4ef3c886b11ad0818197ad6746 SHA512 f4a610d122cacbc0cb384198c50b5a8bb346234875def7aac78eba88731b6116fb9a97c0e58df30e63dfc4bd2e871187c1da747c9b4330c7b5af15cab654bfee
diff --git a/dev-python/pdoc3/metadata.xml b/dev-python/pdoc3/metadata.xml
new file mode 100644
index 000000000000..ccd39aa52d3b
--- /dev/null
+++ b/dev-python/pdoc3/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pdoc3</remote-id>
+		<remote-id type="github">pdoc3/pdoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pdoc3/pdoc3-0.9.2.ebuild b/dev-python/pdoc3/pdoc3-0.9.2.ebuild
new file mode 100644
index 000000000000..1e67b6da6769
--- /dev/null
+++ b/dev-python/pdoc3/pdoc3-0.9.2.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..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Auto-generate API documentation for Python projects"
+HOMEPAGE="https://pdoc3.github.io/pdoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e "/setuptools_git/d" \
+		-e "/setuptools_scm/d" \
+		setup.py || die
+}
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 1c03862f584d..332f4c18c0d2 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,5 +1,3 @@
-DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
 DIST pgspecial-1.13.0.tar.gz 49204 BLAKE2B 7269fc94fc0672db1880ba4b76c8926b6a3c995aac3fca77add7ae6756fcc3295d8d32fcede37cd3fa2d82c82aebfc26d91ed50b4294c5206f04d4c72742b45b SHA512 de2560106fbad14f2095ace468c8490cb325aedb772f649f20a0b5fe65f19afeed33f219d3a6eca683a63b418741a9906a01f7c4bdd8734868517faeba791026
-EBUILD pgspecial-1.12.1.ebuild 684 BLAKE2B bfac4ec92c81b9d0076243bf0a3d8ae1edebdf23a60805a16f163356245e3a0ece13987ae9114fa83ea1b77b2220c73a8a9582c07edbe5d7f3613aa29204140c SHA512 0e785005053597a981e76285f7574bbee0865281e002db70da920bcd6e13c8acc92e6a92e4a30e510c54db9ce9362f071248442bd0643da8d630a8465b46ebab
-EBUILD pgspecial-1.13.0.ebuild 1132 BLAKE2B 99754671fd2446c9d6c38c10c3beb8424b571bb9a35e07d4e5ff3cb4bd155039322f87add02900ff007cd4802a8e86385b9596e4469a19a1df6d74465b650ff6 SHA512 56eae566d6033b6247011d437840c1c2094b765310773e2d57cf3d5b6d0e676d8f0c520024c319226b0cdb9403b845f52936ebc9780ed72272886aad98953ec2
+EBUILD pgspecial-1.13.0.ebuild 1130 BLAKE2B 35f50cc7ab0847fa12ada8bbc81ef3963b30a87160a65909d056bd5a0c512b624124b050286c66af22faee4d451278f91bdba9bf815710bebd8de47824662c77 SHA512 799072a2f06afe329faf208c224255a63956d3caf220a0e2c3f537575ebeaac28c3baf5c7b7a93e9515252201000685fbcf166c50e7588249f75eefb56ddcb5b
 MISC metadata.xml 468 BLAKE2B 7fb95be81dcba90a99cd8ac20a7eb3bd93d926ab8da91d328806fd5d6516a8f32c46ba8721a9d490e1243eb2f1954e2ca35d4543bc8df0d2c53f60dc280a8a5a SHA512 7b558945ce12f4be5c135118b3ca4d9e565ddf5ef978c0b84af6687e15f2d26efdcf27f55efc1c85fe7b9a023a506cd219490d2baf9607cf099e921b0709df0d
diff --git a/dev-python/pgspecial/pgspecial-1.12.1.ebuild b/dev-python/pgspecial/pgspecial-1.12.1.ebuild
deleted file mode 100644
index 6c6f5cc1a948..000000000000
--- a/dev-python/pgspecial/pgspecial-1.12.1.ebuild
+++ /dev/null
@@ -1,25 +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 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/configobj-5.0.6[${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.13.0.ebuild b/dev-python/pgspecial/pgspecial-1.13.0.ebuild
index a3365765f2b9..310237e74a19 100644
--- a/dev-python/pgspecial/pgspecial-1.13.0.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.13.0.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 d651b479a3a0..dac04afc3e18 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,5 @@
-DIST pikepdf-2.12.0.tar.gz 2300821 BLAKE2B 17f2a316d7139471f1bc1106b52895246ecf4503a0c52cb7ed0b8fd408c9bdc8f4e4539f7381b184be50747edc12ee4ab1d58587c9db1fd4c3384d83a56a3ea0 SHA512 7484da6b6aeb8dc93c7b9eacbf5f5096bf738c2b75e4d3d63b189494acddba3da8c707fe25526ef2fa0be15be03729b347ef971f1ae61e38fe6c55ee72272359
-DIST pikepdf-2.12.1.tar.gz 2301208 BLAKE2B b3fa60c97a58dc312e00c0e129d1f55fd390d83b221dfd90acad5f5954e0c564492fe39718248f87980e42ecd590dfd98bfb21133c8ab0664666391e8e030902 SHA512 13bb7132282c024fa5118970deb6347c954a94545602fa21efe99ea2f837693b810dc6706d1681c28588d5ef41a867c70f75c7ab85b01267fbcf55ba89d39b94
 DIST pikepdf-2.12.2.tar.gz 2301822 BLAKE2B e600ab0809c44ba3749440ae6820761e28cc2d509ebb8824a5b2fde709db341366ee2b8f8160e65d876c2fff0aa7da54eddb1fe2b9fd524b0c25adf79779e21c SHA512 6bde2a538cdaf55460083c54a6d55ddab3ec4ba127dfc77d3f79da8492ff50ffb76281312395973f8448c360ae53b0c9a0d090258f43bfdfdf420336c99fb423
-EBUILD pikepdf-2.12.0.ebuild 1538 BLAKE2B b56471c516e7c203ca3b712d9ebffcee5c322bce8ca2eb6a31baa5238f7999bd4445dfe0149dabb6e6b259878b2afdbecf46e0bd60c95da63be2f8d5a251e8a6 SHA512 f1e661917c48506ccf19eb50c3ff7ff9c2ebfc2ab6e731a8ac9c81dc22b92c253bafc037d69d8a8e9372712699a3004734278a0fd78c709502ff2066bebddbd0
-EBUILD pikepdf-2.12.1.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
-EBUILD pikepdf-2.12.2.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
+DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde902295ccb3215d1441c5838acb2744aedb1696fb1fc57d55752bee66387bdd968695a6b3dfad5614c352d57366ae SHA512 a57188f420f93fbb00aa4df9857df0c64aade057639b1e1c126cca2da8b57d7be34117eae34038b5e873a8d65c5332f3f3f2f1812e7e748647ee657b8eebf78a
+EBUILD pikepdf-2.12.2.ebuild 1539 BLAKE2B 512ea496ba803b837f7ba7b9f717d3c7a4ae73c964d75048b5a6acb45b84a164a9dbb6479bfebdf4af82228ea9c3f70796678fe225822c053f36fb14c29ff17f SHA512 cc27ecd60eb8f31510ede37812de3d7fc041b9eb949cf4fcb3aa30cc486622d246b95129ee61d4cf6f8161ca06af501c5bf1b3b20530b712eea94cb191c3b08e
+EBUILD pikepdf-2.13.0.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.12.0.ebuild b/dev-python/pikepdf/pikepdf-2.12.0.ebuild
deleted file mode 100644
index 65a4241e0eb6..000000000000
--- a/dev-python/pikepdf/pikepdf-2.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python library to work with pdf files based on qpdf"
-HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="app-text/qpdf:0="
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
-		>=dev-python/psutil-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)"
-
-#distutils_enable_sphinx docs \
-#	dev-python/ipython \
-#	dev-python/matplotlib \
-#	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/wheel/d' setup.py || die
-	sed -i -e '/-n auto/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pikepdf/pikepdf-2.12.2.ebuild b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
index e8d4a2650905..9be38c49c018 100644
--- a/dev-python/pikepdf/pikepdf-2.12.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.12.2.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-text/qpdf:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pikepdf/pikepdf-2.12.1.ebuild b/dev-python/pikepdf/pikepdf-2.13.0.ebuild
index e8d4a2650905..e8d4a2650905 100644
--- a/dev-python/pikepdf/pikepdf-2.12.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.13.0.ebuild
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index e7165ed45911..ed5624ec2022 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,3 +1,3 @@
 DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722738e1036bfbb533f420881ea638016ac56e9e66ec74a93c6dafc6e4f8807ec3d504400bb675488da00c9c3cb1c SHA512 40e97a54689ca04349d17b69b0e95bb3ef4fde0b60c6c55a2ec76034a5c2a9ebee0b310f68de1636db08786d9b2ad444bf10ac3b42a31404847cc165aa8392ac
-EBUILD pillow-8.2.0.ebuild 2616 BLAKE2B 993e448ab2b6657f27d55dfa2a5ae8f94b9c9dfa895a866278217b6d5abf687e6e835d3e96aa249862a4eed980c2073c14c63cd68e36cf5f95e91ecb61b19c00 SHA512 4945e83af471f257dc5944ebc6237a56e25a8a208eeec3b8a0ca13624e6007263846c6fa3f78d4bc623e7f1834ed9a9700e99c720b683bfb79971c8ce945e9b3
+EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.2.0.ebuild b/dev-python/pillow/pillow-8.2.0.ebuild
index 26c8aec44163..342070bb9e6a 100644
--- a/dev-python/pillow/pillow-8.2.0.ebuild
+++ b/dev-python/pillow/pillow-8.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 7b5abfce2fbe..71cdf9980977 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,12 +1,9 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf
 AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e63e98d0613c3cbec6b633699b2a1688652e00d6f31ec82eb399c7c87e0e80e8f8ff48dc0dbe38f84a7c6f74124e76950 SHA512 46074b0705048de5c7e0be2c6a3fb88f15553dbf44bf92d6e0f23fd18510f4d6a2689277299d748bfc3f44a6ba7eb9a32a5554052b391fe69714ce6ffc217ae9
-DIST pip-21.1.1.tar.gz 8771867 BLAKE2B 1cb920ab52510e816a7c3b8b6d1b47576a27cf1b208ab8fefa102ff36c09eb4e99b34f213a043550a9e6fb37bb8b6306f9e939371661ff7f23ba03f21b4a643b SHA512 05157ed586597f16948afdad43d98cc095803d2d22b1427ac1028ca2a73a26d65e597446808194343ed36f9eb7cb910ac89e73a6a9a90ee868ec822fdbe641c5
 DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.1.1.ebuild 3754 BLAKE2B 979669f7889a5d82a403fd6cf0178b63fb8b43a5f19fc371639a890f59ec0c86d5bbe42bb482633a528377208e85bc55c4c6d7e21c35d7cec9238586f44960a8 SHA512 668fdd1bda3539eb16880ddbd328eb9f99bba874418ea27a354eae0cdf7bf4b949b7c828ad833209b8fe8e371fb3355b5424abdc5e35e29bd9509df3374ea223
-EBUILD pip-21.1.2-r1.ebuild 4405 BLAKE2B 5c61b37de4c8be7f2bffaf54d6168f79d65ae088d9c9fc1f8f0a0f60b11fafbdee889037bbe47354b74a5d14d449870ffc8e2666695903dd159d7d7047427321 SHA512 424fdab07a6e752b2d577928399fd5fb150f214b9689a41bec6422c005638d4948d0ecf4d40ccf19e10893f08c3775a5d2f756c001f3b5d0317c87bf777af082
-EBUILD pip-21.1.2.ebuild 3994 BLAKE2B 16a6bf8f16ed81043c5eed3c87e3509ee9519a722e20c22d14656da3ff2a73fc2d7afca29bb2865535bf64cd80117cb53b3c72bb828a740707d90b6fc5a3e588 SHA512 d47c5f2d4b7a0b191b00aca13b5db55b893d3507420e220b69f8b01c06495eed6237587268a469b1dd9fb777fa0139296d0093bf518467fda5320712fb5da236
+EBUILD pip-21.1.2-r1.ebuild 4397 BLAKE2B d428deb02df63f482f4951bde9d121217177fa7d4e7372ba78f328e4bf6acd32d54ec9fd9128a81856d093ec1a56c99ea390e6ff5d05f4ad82331babf1fcb301 SHA512 45b0da89df88d7801ed0700ed52d69e1782997e55aa30968e7985a786d8c6077b4e61fab4db96425749be338049f03b437dcc979dc8b3be507298087d9b1bb82
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.1.1.ebuild b/dev-python/pip/pip-21.1.1.ebuild
deleted file mode 100644
index 461915435ffe..000000000000
--- a/dev-python/pip/pip-21.1.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-	)
-
-	distutils_install_for_testing --via-root
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.1.2-r1.ebuild
index 6dddd21d4f6a..b1ccca2fad05 100644
--- a/dev-python/pip/pip-21.1.2-r1.ebuild
+++ b/dev-python/pip/pip-21.1.2-r1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.1.2.ebuild b/dev-python/pip/pip-21.1.2.ebuild
deleted file mode 100644
index 7ca3bf655d51..000000000000
--- a/dev-python/pip/pip-21.1.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	# virtualenv-16 doesn't support python3_10 yet is still required by pip test suite
-	if [[ ${EPYTHON} == "python3.10" ]]; then
-		ewarn "Skipping tests on ${EPYTHON} due to missing dependencies"
-		return 0
-	fi
-
-	local deselect=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-	)
-
-	distutils_install_for_testing --via-root
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest ${deselect[@]/#/--deselect } -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 198c11c2f543..0fbc52423beb 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-2.1.2.tar.gz 11554 BLAKE2B bf4716f32b8d5e6cd8d5f8eef1156c09545fe22e48134fa0f98c47172141f0365f1995c2dad94c4e3a6f5a151883f92048bcd943fa07faeb7eff9c60f18555df SHA512 56a76d8467312de34413994e663eb63378ff179720b883037735eae9d8f23a5cc0ea32d4a9a2f9041af417b5ada07b7948fd481e3d5b2cb43db3c19183f6b263
-EBUILD process-tests-2.1.2.ebuild 648 BLAKE2B 87ccddd5e816726f6577aadbf6cf52b4673c2dfad8955a989a47f4d4cc411f2739bf03ad76ad541991dac3eb2f69c46d77056218884044770f25d095eac2dfa5 SHA512 1bd58417013f1d5a881a3045a0d17055d2ba8702209653ed3647550118193177b6436883fbf587c6fbcb5bc84d713e3847f01935c7ab020c29a62eaf2abf6a82
+EBUILD process-tests-2.1.2.ebuild 649 BLAKE2B 72968740433bc0f10b15c55b0ad37178499f278e393a929d856562334a678d3c3fed044f81c5607831810da9e87889133e29c75ccb5a5b8109952fdf6b2899d0 SHA512 9738862a40120b13a2c69352d6c07883e684988ee724ba4525750812e8ca40b71e0941bf72afc84cc143263779c5544d687b0349e3c3064049fb13c09a95d50c
 MISC metadata.xml 408 BLAKE2B 9b3db07555d5a2939176e7a6628c57510dd02652862027662b225d36c1315d53d3fdcaee98e35cb3b2ea57b759d71a5a63856aab57edd20f9a1cc698c56d9350 SHA512 94e3ab549a93bd8fbb5383300110603d4618da0024bd4b227370e4ffa3af791c632d8fd143ca5599c40fec8c46fe92d85c54968070260f59894ec04afcd776b9
diff --git a/dev-python/process-tests/process-tests-2.1.2.ebuild b/dev-python/process-tests/process-tests-2.1.2.ebuild
index 4e4cc28e2b28..92c17194aa17 100644
--- a/dev-python/process-tests/process-tests-2.1.2.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 5e29dd7e2fbe..c29fcc2448de 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,6 +1,4 @@
 AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
-DIST pydocstyle-6.0.0.tar.gz 72143 BLAKE2B 1036a5eab38a38bda0f98371f7e4094248cf5057a9afd8743a478f153a5f06feab6b3e7d6be031615b5e88c388786f59a0619f774f492e40a722f39973051d5b SHA512 609a10307aa24513f476ef639771fc095fe7a65ffd8d530fad02886369c62969c69a5134fd0ec79a1e07d1b6cb8f920c3478db546c26aefb0e45771777c02a0b
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
-EBUILD pydocstyle-6.0.0.ebuild 868 BLAKE2B 652cd5342fb55b0075a106cba51a852d9a599cf95d77853dcfbfef9c1fa4866837ef20331aef50e7ab0637920228714eb8234a1c73e1dc91f9f357dc732b01b8 SHA512 726537ef77a1915afc04686b64ab990d43248a8f9bca7b449b69e5c0d8a3cd348fdacd51df5bd187e464b0ecbd3b74934bfb3fb720f367731e85b3dcd83de858
-EBUILD pydocstyle-6.1.1.ebuild 809 BLAKE2B 7692250ee2f93ead51e8d5c17ea60ab0311096bcc9a13cddb14015da78611aa920c9a9295ec70a89454dbe08d29d5153c391070d953e91df4f26885863d4ba23 SHA512 0e38618c3bc74e8a461a51df18dd783a48362180629b0d859359e2ae37c05b09004f35f3e839f4c6bf410ae8faef03c1640a9db60120825fff8bd16d0a38505a
+EBUILD pydocstyle-6.1.1.ebuild 802 BLAKE2B f14bef39da122fb745dffc55444f699900a2bde9c5a177f7276ae1f0141486b287d485b1c2a178ad02e16b3b27b9afde0fae5e0f089a1418d6ce099a1f7cfd06 SHA512 83cda62c28713de26fad2585c86bf652dcd9debfe9b995948a647f04010b0d2a575f73e053cf0fd77a9a0f661720a7f22d661e7b6b19e84ad8c375f5cbd93e76
 MISC metadata.xml 664 BLAKE2B b93a0c28241c15026f0db4098aa48339fa0841e13b38315448dec94d2a7c0b0bf8fbb055bbbed689db92102e5b0379e5765d33f364e8f4b68832c0758ccf769b SHA512 a04b694b6bece73b9abdff12e13f09c691de413e4f8712187fe288f72daa3a8f7629ecd97bf690004c9313cb8d74de2a0109f4684696abb26df116f2a7784b69
diff --git a/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
deleted file mode 100644
index e434a8ff0cf6..000000000000
--- a/dev-python/pydocstyle/pydocstyle-6.0.0.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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
-SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-# Requires network to lookup github issues
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
-
-src_prepare() {
-	# no, seriously, you don't need to install it yourself
-	sed -i -e '/pip/d' src/tests/test_integration.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
index f97c88a48af6..6d90f86cec48 100644
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index edae5d972add..6b3e89ff3bda 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -3,5 +3,5 @@ AUX pyflakes-2.3.1-fix-py3.10-tests.patch 3166 BLAKE2B 9950380f37f84e6c6356a62cb
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
 DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
 EBUILD pyflakes-2.2.0.ebuild 739 BLAKE2B a13889d951d54c49dca0df763c347390c69c1bc6e7471d8ad9b1a1c932340096874c2ec09cca6ec9ca23472d2bbbac90924a6be8ad06bb7b7f4b731d7d712bd8 SHA512 dab20e9ed9a1ba53a50c72466d5093a3a214dce230348910a91b91473b7bcd8370355a47d438612129a798d087b1ce55b7c21c881d06e740e461848ff8991271
-EBUILD pyflakes-2.3.1.ebuild 652 BLAKE2B 5559cf42e339c60e9547bb081157b039752715163d9fe5ad17a5a220b3585f4e414a5b2c214da100f4e814fac494cc2ed07dff434715de02aaa8601f4903c1c5 SHA512 6e62acd4390f88e0c40cb7a838c42c8fa7462a2b2787defe9008103742dfbd94b887d2e32f737635567b6fb04bb4760c545d3db176574e30047ce8e40c5795d6
+EBUILD pyflakes-2.3.1.ebuild 659 BLAKE2B 71b0d7bb42de99f65526e54a6df3522830cc917dfc4e474414b9ab1df0604f8e0ba355d6a6d8922275064ebe848725a390300b87be12663e93b91ec4256bb527 SHA512 bef1fdd9d2cf92b20a1647478c6d4f0a74b4aa8d142d51248192b82f8a73ab270be59f61247cd746a8027befe68ee29f563caeaca16b4055f94a9796f4a52d69
 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
index cdd15998d162..22e7eb0818dc 100644
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Passive checker for Python programs"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 118a40e09f55..dcbdbb852642 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
-DIST pyglet-1.5.16.tar.gz 6446875 BLAKE2B bdc40303b096a91924eb1b9c541cea199792ebf36d857f0466df4c5dff4ec2945dbc6e6c4933a293ae5bd5033dbcf49af913f3b0915082f33ea98a7d5f66fde6 SHA512 5cd1c604245c45f4b9d56c6a6290d301f8a925a4988d847df978b0f4431afb46046592f25d73b54cdf99402022a616afb3eb9c579d5ac29160408a74769f7a43
 DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
-EBUILD pyglet-1.5.16.ebuild 1249 BLAKE2B 29ce40ef1be1efb2440908367b279b0ac865b5e10a416bb43f8fffd4bb89622ca4e43279e50731662fd7ff4803cf220866bf45c133b1a94fda54f34606b6d91d SHA512 e851e9fe37b43f1e656e454377643500cddf4473fa52d91345d754d858d4a2b51c3e1e8f5d3b10d441568f9c2183bb5a23d074f24cdc6812b8a7eec248a683eb
-EBUILD pyglet-1.5.17.ebuild 1251 BLAKE2B 879fdd7998a37e788ad481356dcd77d4a7b7737bc6ca7a7f23aefed2311e93e0ed08998ea12a3d71f67afcc48d5ceb87ca68cfb3b5274482fa29bc24512e5425 SHA512 4e4dbc2b2e5d7bdb901197b015750e8f0c815307fc46777330bc3cb871a86de1113d2a223bfb5242cf0e1b9f53081db8c8269cd89265ee1cc4067b8e49362488
+DIST pyglet-1.5.18.tar.gz 6440818 BLAKE2B cb7832000e0df96cd794f8eff9ba41aac8571542fbc45d1607df3935a7ed53ba8fd46b6bba40f6d5d53adfb2024aad1930cba1889b5d40d342457f7dc06db5d1 SHA512 d6ceddecccb36a90bef38c4a1608e866bb90ebb72eaaff693a2eb34678c7a50c99213a69042c569c22d54cc04a4b11d37ea8da47425958505261ebcf99bd28ce
+EBUILD pyglet-1.5.17.ebuild 1249 BLAKE2B 29ce40ef1be1efb2440908367b279b0ac865b5e10a416bb43f8fffd4bb89622ca4e43279e50731662fd7ff4803cf220866bf45c133b1a94fda54f34606b6d91d SHA512 e851e9fe37b43f1e656e454377643500cddf4473fa52d91345d754d858d4a2b51c3e1e8f5d3b10d441568f9c2183bb5a23d074f24cdc6812b8a7eec248a683eb
+EBUILD pyglet-1.5.18.ebuild 1251 BLAKE2B 175f305393e1a2783fe20026b0db49f299356eeee833b91103f7c788e7df7378d06012fe7147e6873995138704e2890b7a847a89105534912fd71de975f6ac1a SHA512 33709cade0cf49e502f0a638582c626a26acb4260eae857254472260510fa65fb1defe0e80e12ff0c43850b1e6cddea9345c13c4921417a1f2c3b72644a77b0e
 MISC metadata.xml 1036 BLAKE2B ad16f5e991753cf8e6291b5cbf19f791684617eb8394528c0b751d57c9091ebb73112f9a4439f9b78eb2d648d0980bdfbfdeaf0c6671bf5d0521bb87f19011a0 SHA512 efe3d7ff5ae120e037b0521c45b67833f4cb57802596793704fee556b36e2a6f6797bd948254fb1ad50122a2927bea7bb5bf6b715caeb09648e7d4facaa6734b
diff --git a/dev-python/pyglet/pyglet-1.5.17.ebuild b/dev-python/pyglet/pyglet-1.5.17.ebuild
index 7893369764fd..9ec70e8d0e48 100644
--- a/dev-python/pyglet/pyglet-1.5.17.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.17.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/pyglet/pyglet-1.5.16.ebuild b/dev-python/pyglet/pyglet-1.5.18.ebuild
index 9ec70e8d0e48..c2c0bfc5865d 100644
--- a/dev-python/pyglet/pyglet-1.5.16.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 virtualx xdg-utils
 
@@ -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/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 02fa4479f901..ed9c2211a5ca 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,6 +1,11 @@
 AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
+AUX pyilmbase-2.5.7-0001-disable-py2-for-boost.patch 578 BLAKE2B c9aff2ec269ea894e046bb265c6a69418c128f0d9dd54afc924138b6060d55b1ff1da6e8a9fc512b3097b8ff8acce0c03012748cdf10263945ce6f42dcec3424 SHA512 969c3d5bd676a471739feca443a938584a78b8903b71d75f51abdcd87e48a5ecaaab3132258905bad063165e9a4861ea9e6ce0d6b21844462e2adbbaea37fcff
+AUX pyilmbase-2.5.7-0002-install-imathnumpy.so.patch 643 BLAKE2B c46db3334236826e6f36343cefba88813427d1f18f12eae4692ebc33d765d44c600846840129ee2f2d79e9c1fa8b0c4489dbe292bab38be952009cb8b7e92222 SHA512 193142fe50a69568bad5c7034d5d6cf45c1a36cd517f1c71875a651fb7629263c53769050a9e5e7ddec699a9bd08f84d32d1dc3a8c29c5b3576c2741deaf2986
+AUX pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch 1214 BLAKE2B 45b03a70c2a24889bf1614d5a86aeaff1edf41f508b9622497603cff81fa7f04bc29037763568dfc569bd26c079ca75e3b6ebcec9cebe9e184fe650a9007f013 SHA512 6df211523617ff9e9561c9de7c853b11082a5633a4fda63fc59c2d03d251881aa8dfb9cf6bf0bba67b8c9d584a8d3512509bc2c0f5c3af2a79a70948552f6918
 DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
+DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
 EBUILD pyilmbase-2.5.5.ebuild 1528 BLAKE2B 53c15d9d6f57246d04bc1ce5e846973fcbdaef51af9f2fd1610c2a4e8a993b01459650d4c732c3f83b585ae654c2d41ffc33e1412cc048047ac5e887dae14ac3 SHA512 9f956a1b3e8224ab95e6e364b8b8f80eb4b68a52f4c3b5b9dea85cff7320a9f9dcb66170ce45dea5ae1bf48dadbd1592430fdbc8b2b9a897aa1c328adf286698
 EBUILD pyilmbase-2.5.6.ebuild 1530 BLAKE2B 2d3dd8edc3b264abb8980320c2e785b3e2ffda1eaf1342ef226bc8a43856780fd557ea8729361594df31a624641ca2a9a12cdd75d74a9d8e50f5b04a5b4992d8 SHA512 8ef19f6c05652f73d734cdf6d04dbedb90a0e6e202a118b4e867ee35fc7d01f994c2abb3a6c3555b7cd25da11a6f0a17b4fad6f6c13a6c578c9cd7e03435ade2
+EBUILD pyilmbase-2.5.7.ebuild 1399 BLAKE2B 028e5b02ab8a852efef62057d9388a9406fab6aa1fb410bd9ca309567e2ce2cacee4332ae8a44ea29d9270d0260bd3db39f2fb4c4508ff08cf1148f7a5307664 SHA512 9d4fbf02c76f4268b08c84bdaf4c5e744aa2dbac57f937074f8e3d1893a40bc31d7dba97b958506efd5b3468bc4c560bbdfe7b16dcb357597bfb5b601d118911
 MISC metadata.xml 690 BLAKE2B 857ad16bdb3ab2ac35ca5d8e41a5e2302aa7e130c0dac5125135ba92569959b91278cfb3da987e4647aba4dab3898d7de9c6e340e20551379592a1c90d236882 SHA512 357ac1026fdacfdac7ced27c40fcf936a14dac7a044e8b168de7ac126811df67fb9e9ba01f8ee0fcf40ef86906abf37880fba6a782f27f832ca889de04ea4e58
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
new file mode 100644
index 000000000000..73281e5ad6d0
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
@@ -0,0 +1,25 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 22 Jun 2021 11:08:15 +0200
+Subject: [PATCH] disable py2 for boost
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 291b96e..68b280d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,8 +142,6 @@ endif()
+ 
+ find_package(Boost OPTIONAL_COMPONENTS
+   python
+-  python2
+-  ${PYILMBASE_BOOST_PY2_COMPONENT}
+   python3
+   ${PYILMBASE_BOOST_PY3_COMPONENT})
+ set(_pyilmbase_have_perver_boost)
+-- 
+2.32.0
+
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
new file mode 100644
index 000000000000..1aa4152dbbe5
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
@@ -0,0 +1,22 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 22 Jun 2021 11:46:30 +0200
+Subject: [PATCH 1/2] install imathnumpy.so
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ PyImathNumpy/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/PyImathNumpy/CMakeLists.txt b/PyImathNumpy/CMakeLists.txt
+index 7a70f06..2822127 100644
+--- a/PyImathNumpy/CMakeLists.txt
++++ b/PyImathNumpy/CMakeLists.txt
+@@ -49,4 +49,5 @@ if(TARGET Python3::Python AND
+     LIBRARY_OUTPUT_NAME "imathnumpy"
+     DEBUG_POSTFIX ""
+   )
++  install(TARGETS imathnumpy_python3 DESTINATION ${PyIlmBase_Python3_SITEARCH_REL})
+ endif()
+-- 
+2.32.0
+
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
new file mode 100644
index 000000000000..a28757cbf1dc
--- /dev/null
+++ b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
@@ -0,0 +1,30 @@
+From 7469db402e2affb094585c374518765c69af703d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 22 Jun 2021 11:47:01 +0200
+Subject: [PATCH 2/2] fix pkgconfig file
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ config/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index a4139bc..45dcca4 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
+   # use a helper function to avoid variable pollution, but pretty simple
+   function(pyilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+-    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(exec_prefix "\${prefix}")
++    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
++    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
+     string(REPLACE ".in" "" pcout ${pcinfile})
+-- 
+2.32.0
+
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
new file mode 100644
index 000000000000..53ab50f12750
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/openexr-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
+	"${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
+	"${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		# starting with boost-1.76.0 we ship the cmake config files
+		-DBoost_NO_BOOST_CMAKE=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
diff --git a/dev-python/pyjsparser/Manifest b/dev-python/pyjsparser/Manifest
index 59968bcecb0a..b7eeaa656cd7 100644
--- a/dev-python/pyjsparser/Manifest
+++ b/dev-python/pyjsparser/Manifest
@@ -1,3 +1,3 @@
 DIST pyjsparser-2.7.1_p20190421.tar.gz 210147 BLAKE2B 1286167a8ff9a0ee08019af2c1ba36a0dd1c22004a4e1ea3764f0a2a06e87b649435f332b9a9dea461ceade32340f7388489c972dafc9e558f973d7bbea4ac42 SHA512 2e4b3ee1cd863099da262eaf4df5ec4f364ce54e7c7535558f36d3449e21c9f851460078e1a7057ef8c82e2ed9c82f54944cd92782fe3f8cd05411edca191a40
-EBUILD pyjsparser-2.7.1_p20190421.ebuild 744 BLAKE2B 34cdfb147af916180e0ed06aa43fe7eb6e5d9b877b107f747edf763ae43b3bfe3959cfc85e01cc69c15a697f9156b8292f1ea2fd42bf4d9b3e1a9c2ffde4dc7a SHA512 71b4fb433125d1da59d9c2ed931144358a09a6c637034eaecaf590ad57432f8edfc1c0c918241649299e161dcfd97bea1ed9a51d54ea0ddef383a1cfb96ea1ac
+EBUILD pyjsparser-2.7.1_p20190421.ebuild 743 BLAKE2B d7286845b6a0476d78236181662da34b930b0b61cecab58e0a1a998a4d96cf611f8a44f23b03c505086715c1cc2e959941eccf877c7fdf50f78cd191b7a5f2eb SHA512 4f8f315c46ec5d132737adbb90932103343ed5071cd8a6d2071648888ae28e146359ecc49c585944c42a1898a26cb2b6737ae949424badf419c4a61e6d2a0223
 MISC metadata.xml 582 BLAKE2B 5abbbf08ca42bed861709c7e8df70074112efb8d5270cd628fa26902f9083a242ad9ab63a6aa1f74824a2eab29738c46a3fb0684182fbfe5d692ff35d0c86570 SHA512 ca17ca99b83926f956af099be27eb359f4b2b9be425e68e95abaab8163667fa744b12734f6b8e5f72a7e3e1f9c3d684e4b1c23e3b954495575ecc934f2528c3e
diff --git a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
index d0d1cdfd469d..e72231051001 100644
--- a/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
+++ b/dev-python/pyjsparser/pyjsparser-2.7.1_p20190421.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_COMMIT="5465d037b30e334cb0997f2315ec1e451b8ad4c1"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 611491b85995..a6dc55d262dc 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,4 +1,4 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
-EBUILD pykwalify-1.8.0.ebuild 789 BLAKE2B 1c768b14e1c1d17521a9722604248ed5275f237b224c72be5093768e2eab25d64f7656c555bc2280ec48cfd6749f2986f064a516c9c8867482cd3e5717e4ea51 SHA512 7ef13af82aabbc8c603d42d6d679fb698058074ebb643b779adcfa3e781eefb3d6e6bb10e1da2df5b0fbf42f18fddfcd467e121bd319f0513e490dcd241316a2
+EBUILD pykwalify-1.8.0.ebuild 796 BLAKE2B 15f304600f4e599d748b24b85f609978495bc5dd7b0ca7fe06a1b831fac7d287eba8361ea91f58e3cc4e95b2f7d716bea0e422935d4503bb9bb7b3c762318933 SHA512 6316d7565e9aa4093cb7eea0cfddb3b322298c064a26ac5b370128d38ebb044fcf8f330a0dab929acb4e3c9466ca238c3d3c5adf95e8f7505e7b569b3695281c
 MISC metadata.xml 393 BLAKE2B 16007b48a409e741604ff8a1ccf4a23a2ef7c2cabe43213b833c7d3d88bddfae2e7f506c11df480ee3e746c80ed69766a15931977d64c0adb6cae49c20316f3a SHA512 0044cc9f44d2bac090b214e323de8e1e81fd0e22e94f939e4821f5786a33c400b1f7c94593587c458fd533dc321a64226bac5a220bcd116e41e300a897bd725c
diff --git a/dev-python/pykwalify/pykwalify-1.8.0.ebuild b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
index db0d16f28cf0..b7c0eb7967ca 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index b5e9bcfb3d17..c11d6ce96e30 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -3,7 +3,9 @@ AUX pysimdjson-4.0.0-unbundle.patch 2582 BLAKE2B 2005c989186247775a8929b81fe5cf4
 DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
 DIST pysimdjson-3.2.0.tar.gz 3357720 BLAKE2B 596738da76d008563e31c6231d348fefb8f37dd4dee2490339a6233ba0a39ab24dc3facf1d02a4621f1d6e01dfb4af8673651d79095919ee7f4532a25dd1c63f SHA512 4c72d71ead5675c2d9b1551b5dacadee013fbaa74f93b2345920f0bac8eb65d79dd84ee817d07fea0bdf477c1c97ca4746048fbdd06a4bfa516e063d89724226
 DIST pysimdjson-4.0.0.tar.gz 3738787 BLAKE2B 744d6bc53511e03e8e716d6c65771432c7bf8f7876bbf8c78d09459a8b170d3d396f9cc8996894f67110f4b7389526d454dffd687b1fda22df7f76f027af44db SHA512 8b3040ce44bb5042b70a14d9f67c312a375d1a12ba7a66466935a48ad0f8def9c21e200c8c93aa755110a674e95920fa7d0567c4f584be5392b70719994a2213
+DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
 EBUILD pysimdjson-3.1.1-r1.ebuild 512 BLAKE2B ab3793c04071be9c51237465b83fbabbf1593666f00931d1e80379541aea51da4b39b7f5bba340594ae3326c07fc95ebcdeb5bc62e29edd2995b63436fd7ba1d SHA512 93a8e90cdd78ceb402252604e8191047d653ea8409c90c017d11ce55fb16aab6453bf5a9dbbe17abb69f5a63d54cc78a7c058d710457346131744b7ce0ce0a95
 EBUILD pysimdjson-3.2.0.ebuild 516 BLAKE2B 0da10517c85e0eb5ce240c67b34252b84b5cbcf563fa960f2e8ba211218b4caf65412873f6a905284f58a490edf7944a8d8e39d3f8c681f11fb46895b64d9b68 SHA512 5f93df21da251b9eff510c518976e7de6f543b0bb20f481cf51c309e77aad56fe813220dec6f15b6d834b2b096810ece317caee9fe77aabea5d5a714d85778e6
 EBUILD pysimdjson-4.0.0-r1.ebuild 926 BLAKE2B e5f293ed566d8950148e2875f81de146cf56ca2b541d96071f86b6478398788041ff44358fe6dffc7da751c0bfbf56f9e9a071ba7961b1df3f0eed309c52442e SHA512 3e89557d79dbc476a5e737bbf1f8010b3d2c2a4bfc5a5eb45c27194d20e4db9fd26e2cf4c98a536b6c7d0f808d1f1ced5955811b953ea77565868be83e9fa38a
+EBUILD pysimdjson-4.0.2.ebuild 876 BLAKE2B 3550d2f007405e291529f831ee7302cde9d81256ab19b6f9df45edb6f98547246888a3c899abea294e6332dd7d1df3bee8045d5793e746a0d229d8df593f6665 SHA512 f0b347a610eac7b6e21c1fd8b33798441694d69169df39c206d410c387c985b47d87552ca3dbd15c79baa2476aae34f2bc7194f5f53e46a77370557af913d152
 MISC metadata.xml 423 BLAKE2B 06f368507ce8309c6d7b2e2695fdfea636bb503444683450c76f8bc6f8ad7da8b7a0fdcf8ca478445dba7148bc2faad9a5c9f66026777be2c408c3765bf22267 SHA512 b24e60e618e2b4c74ec4a755e99faa0966156ceb188ae5c97feedbfc1d7c19fda73913632b977fe9a5f2ee4261c55b1c0df3488fe7303fe3b9e581cf57979f2b
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
new file mode 100644
index 000000000000..936ee8de2d36
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="https://github.com/TkTech/pysimdjson"
+SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/simdjson:=
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
+)
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark::' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# bundled lib :-(
+	rm simdjson/simdjson.{cpp,h} || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+	export BUILD_WITH_SYSTEM_LIB=1
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 99c36407f386..93426a6a6ca6 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-cov-2.12.1.tar.gz 60395 BLAKE2B 42e817c63c9d787de9bfaf804217a1e020d5a38e564df0ce2d43d6b4f0631aee43ccae329f44c6d7ac9a5662776463456d72138fd20c65cf8d0accfe118e1e2b SHA512 4c234178febeba1ce93ec0804c3efe181d5d88db9ac02effe14e62eb3b0f7ca1f8757fb4f360551e0d3e35a3b6207892afea85611a49db6c71a2dbaacabc5375
-EBUILD pytest-cov-2.12.1.ebuild 1284 BLAKE2B 8731348431e4955bfe1a0e871ca6f394b67da16c585dcd7ad613bad1e4552ff05544b92e7a49a39075addcf84d0315b90e5d4715049459418aed241c46cb9910 SHA512 d3e2d1b577365d61e174a3f6e69114afe3b1ca083b6bf9aef4743da99d5ae02035db3ffc2b93d9f6858ff61b978fc766b140974b993afadc270bc8042a2a5b11
+EBUILD pytest-cov-2.12.1.ebuild 1285 BLAKE2B 701357e55609bea2f32098d4290deed25bfc33633e76d14b09f902ddf9556afaaf7567494960c08cc64491a66a0f2cc78323d59417d537567951f51a6d7b9f93 SHA512 3d4fa3e5d3820f9c36cd6eaf4a8e3d147315827c95277a4d6b1614b2c9081b6915093aacd0b5a42bfc0efd04586959178803f76585a6ce965ad6ac8a2fe8a2f5
 MISC metadata.xml 411 BLAKE2B 5ecf37fefd3ba802d31a3f7e10a58fb7391d213164cca73117a5723b174b66e29574ef694960af9346df13667e6c203c309e8372086ddd481eca1eda7f843926 SHA512 ffb291dfaa0724a05a65152d6e1d1fcffed59bf260e07e216fb8e097fef0c3aeec320fd75a7c45ffefdd39c1c0e6a50e196a4cea99654fc3e5d768fd3a81dd99
diff --git a/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
index ca0b0aa4ce53..4781883433f7 100644
--- a/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index c530168d4ae9..45d922ce6d82 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,7 +1,5 @@
-DIST pytest-django-4.2.0.gh.tar.gz 68370 BLAKE2B 94165a01ecd2734a4e02267ecfe8b531df33ca9237cfcd1ebad41f68289fb89590bed0027137d6dddefc4cbbd5c0f8445703e01a516d3992c2307ebe53d6572b SHA512 2dcaa80f3ebb67984d3849cea5de296388990ca65a607f995b89bd67e2d8964f944100bccb42a32bb75c7009849619e50421c2dce077037ce0440233dbdc13f1
 DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
 DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
-EBUILD pytest-django-4.2.0.ebuild 818 BLAKE2B b27be5e4ef794426900ad4997bfeee3437f326baf706945efcec9679f1969435a96aa5c5ad58051ded1834bdcd4e20dc3e000643f20bc06c6a2ea7a935b0d089 SHA512 103a3ede84e5f4110a89abd25bbd0ed4b7d5d860399e912e7b1673e046b58a35c1ff21e4ee9e3a4647e1d4f5a01f7c75a0278f46033d1a5cdb34441e7e9051cb
-EBUILD pytest-django-4.3.0.ebuild 822 BLAKE2B e9e861b673e839e5262cf9665322d9fe5cf86b67447f725e6ea2ae4c023cde24e59236b0ed4b7bffc25c15b35770bba5c8aca4812e61f9ac0db91990e89a91af SHA512 78f4fa922dc9bc5865adc46b8bfb64ee4b4b584273b8bbbbd3ba5eaffe826c547646b38948de725f28397cd6f97039629e574038f1453c774979a2a1275a3dc5
-EBUILD pytest-django-4.4.0.ebuild 1276 BLAKE2B 312402c763ebb4901fa3007429616a98d74f69efbdd12472453daa6d08f33b6845bd87ee44493929ecf38d3c7cf2396fac1f10316f904568fa341944e56807f2 SHA512 f152dd9f9deffb39c4f15c0471ee8003c1ad6ce12dadb0b5473a11b09c798859d4254b9fc76f66b4f52dd5948d33f20589651c148b2df3d6b04ff7cd2d495743
+EBUILD pytest-django-4.3.0.ebuild 818 BLAKE2B b27be5e4ef794426900ad4997bfeee3437f326baf706945efcec9679f1969435a96aa5c5ad58051ded1834bdcd4e20dc3e000643f20bc06c6a2ea7a935b0d089 SHA512 103a3ede84e5f4110a89abd25bbd0ed4b7d5d860399e912e7b1673e046b58a35c1ff21e4ee9e3a4647e1d4f5a01f7c75a0278f46033d1a5cdb34441e7e9051cb
+EBUILD pytest-django-4.4.0.ebuild 1283 BLAKE2B 541f6c141e1d928dbd62b85bffd4366862712913bcbb25b0f87b79413c1e4f7a65139f14fff125d77bea91b0b3b50f486ae5e0bc1265d905789c3bab403cf408 SHA512 1b59126b4dd169d2ac64a0cba46e767f3c36d0702629319b19c5d7ebd68c6bec861c2bc342536cf99d9cc9fc1dbfcc50f4553b62e1c382f03e4faf4cb0b2951f
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-4.2.0.ebuild b/dev-python/pytest-django/pytest-django-4.2.0.ebuild
deleted file mode 100644
index f5c36d290b8a..000000000000
--- a/dev-python/pytest-django/pytest-django-4.2.0.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..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="
-	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.io/
-	https://github.com/pytest-dev/pytest-django/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-django/pytest-django-4.3.0.ebuild b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
index ac4f7fbd41ae..f5c36d290b8a 100644
--- a/dev-python/pytest-django/pytest-django-4.3.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-django/pytest-django-4.4.0.ebuild b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
index 3888abd6acf2..f37ed5ce4ec9 100644
--- a/dev-python/pytest-django/pytest-django-4.4.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index dfce014349b4..210893eb2487 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,9 +1,7 @@
 AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0e0886eeee5eb4bf447544a0f712e8906edc5ea62f60555917b97c143a4804fe76e5244090907abf51bf69f98c2893552115af64fd2 SHA512 ab68967a2f30acc2aaed1c8eadeee84283b469b3465c5e79d9c37ee14236ea0e2fe827ba83efa92d5d33c369298e548cea72f80109949426aa38121ba7edb45f
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
-DIST pytest-qt-4.0.0.tar.gz 113333 BLAKE2B 69c2c8c823b55c44150c7beb0754e90866c7659912dbc0d99ee29904b0a20eadf26939709a5d120d0b95e23bcb99310415932e87934ae84571c55e3ffd07c284 SHA512 cfdde2e82b42979313d96f9a14bdafea0d4d5d5b64b4785ac73b74e36bfb892ab7b5ec6eb1c4e540ec00ccec6739e8bd9a3ffb610f204f6cfe97061f57a3971a
-DIST pytest-qt-4.0.1.tar.gz 113473 BLAKE2B b77438ea2e6f71566daa50628d481671bc5ece0cffe2c67d689e780274884d70d94d70305c92775e5d9bba7fe09431ce7116aa5823234675237149726178ba43 SHA512 4f6d9057d5c6ebf439d0f69a341b3d7a4297e3eea251f85c82cf5ecc7aca1419b7a2ab0e846852661a0a2236af6225518b3ae691bb014fb56dbc1d39106db4cc
+DIST pytest-qt-4.0.2.tar.gz 113466 BLAKE2B 73ba6571958f3f4cd76c3e891eaa014d464b94a7965afac6cee5b43bafdc63d4d640f84c7bfa1666146ab5139f79c760bd9f5a2a44f788b6384df200ac48ad0d SHA512 7f59c499e1395460c2ff20a969cec16ca104f742c648faa0d7eb1528c04d8ee52c04c52798478bc01c5467bee33d3389b141424491ba5442f9df4e82f0dff173
 EBUILD pytest-qt-3.3.0.ebuild 1661 BLAKE2B 8af76902d54c81283ed1627278746fd874a0bf91eede889ec3de5a0be397e8b9cc5633abd67466e6bc9508bd56c84da0b5c069d3dc9bf339dc11b7cecb51ee37 SHA512 f39627d2dd504df4601390d1a310302d3e132db8d27a8e1d801560c921a87754691798bdbe60cc7b9337417cef993229f2c7673f9c91da8f9ffd4eac8aa9540f
-EBUILD pytest-qt-4.0.0.ebuild 1615 BLAKE2B c30a0cfbed765d18c8b840a4776c8a328896bcb7266048cb8c4967f34c6085d12a0a0e5272e34e15fc4d7a7d98d7961054001125689f424ed95251bdb071b5a4 SHA512 b9e282f1e0645fca53f8346787d6e5775b8cf624eb7aab896631084b78af6bd5c303f12211841859d9ebf5ba646ec1b49563d076de65dcd68b6ff5a4bbdee22d
-EBUILD pytest-qt-4.0.1.ebuild 1615 BLAKE2B 0bf2eb72bf57c352a1b503d5177316aed02ee6c33c28a3bce4bfb8a2b61db3575245bf5bd2adddcb7ea7cf2d712d85c9563e5f634f09413fcf6344ef8163e4d7 SHA512 12c60cb9b6621b155b84ed1d28fb5646fccf45d0aa95f6330f2f3dc5bef5851ec0843f3dec989f3cc0b9f5fc9dd76354e01983c557ff840a2604f7fc1631a9e4
+EBUILD pytest-qt-4.0.2.ebuild 1615 BLAKE2B e3be1b939455910f79f6077eed1057a3974b8ab28da64a5c3909dc977e5bee17589fb8a00882df7fdb566b0684800afa36c243bfd237f777d3279739ba9aee0b SHA512 af3e1665de75692a2d2671d42d3472580730a86348039a56f7f2901c862cfb5cf1779e58cea34b01ecc333028734c179a0062230d0c44a4fcf7eb59b923778c5
 MISC metadata.xml 414 BLAKE2B 841b7a751e41917fe4f3c672a196d41ce020832ce8794c2b5bc52f24061a3742a605550e7429791e940f4d44fbb035e026a1d665bca323a7c84e5b9c2d1615f7 SHA512 50fe7cca60f607561b5f5b9436d75365ffba1704745c761f6043db274f07e1a0065e6a7c107f3d4fcaf7b51837a872525a0f509bd9f55b96852ad9c2da41072f
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.0.ebuild
deleted file mode 100644
index a86288ff3b73..000000000000
--- a/dev-python/pytest-qt/pytest-qt-4.0.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=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="pytest plugin for PyQt5 and PySide2 applications"
-HOMEPAGE="
-	https://pypi.org/project/pytest-qt/
-	https://github.com/pytest-dev/pytest-qt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
-			' python3_{7..9} )
-	)
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# This show window test does not work inside the emerge env, as we cannot show windows.
-	# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
-	sed -i -e 's:test_wait_window:_&:' tests/test_basics.py || die
-
-	# This is not going to work since we want to test both implementations
-	# and therefore pull in both and explicitly set PYTEST_QT_API
-	sed -i -e 's:test_qt_api_ini_config_with_envvar:_&:' \
-		-e 's:test_qt_api_ini_config:_&:' \
-		tests/test_basics.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTEST_QT_API="pyqt5" epytest
-	if [[ "${EPYTHON}" == "python3.10" ]]; then
-		return
-	else
-		PYTEST_QT_API="pyside2" epytest
-	fi
-}
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.1.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
index 01570364aa94..900afcbe9854 100644
--- a/dev-python/pytest-qt/pytest-qt-4.0.1.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 virtualx
 
-DESCRIPTION="pytest plugin for PyQt5 and PySide2 applications"
+DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
 HOMEPAGE="
 	https://pypi.org/project/pytest-qt/
 	https://github.com/pytest-dev/pytest-qt/"
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index a96b0b6bddec..ee61615d3ac7 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,5 +1,3 @@
-DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
 DIST python-xlib-0.30.tar.bz2 211256 BLAKE2B 979a004f6ff6ac933baa41623b346c8d1fa9944bc771308e3dd527de7ae6aebb8df0c5d269f21e7aca590ad7d3981d0deeb592981b0672c54b30ce286e650236 SHA512 52ee01cce73f024d6fdc995cff38ba9ff2838888aced12186a754c1760228f89209c1d6fc9d4fe0e371a4a43743f8fdfdef6ea32ea3feda5a85055897aaf887d
-EBUILD python-xlib-0.29.ebuild 877 BLAKE2B 909e99cded605fc8e658e27e288f280428c84b1c781672393718e9be562af77713b6e2be9063f52825d56c554aec189516f154a1d9065477b796d1d5301c325f SHA512 b6b2a326932958a285c6fe81b7f8f835f2cbfc8cc5bbbd35dfed397e2bf3280555a49492b55b0d5a4010631eb957a119dccd4b4375017ef8bcdbffd1d6c57cae
-EBUILD python-xlib-0.30.ebuild 881 BLAKE2B 7324df0e26113b33a710a7caca1f70bb8fbbd7f4eab942d723ac484b0d2fd597a304a7885dd7fdc5548ab5dde3decb2fcb907042f11613afcc8c8a0aad4233e7 SHA512 d6214c6c919b65728b0675eafb0b2b98fa12b3685e57df129128a526aa8e34eefd58c1c235029701649b1c3d0635b1836279e595c154610a1a9a3e6e28cf3877
+EBUILD python-xlib-0.30.ebuild 878 BLAKE2B bf9f436dbce6e62d25663a2be2dc2a9f7401979189dc2ff113dfef60ecec4e5a9d34e73fe25345c4226a736d4c07bcd855c7e2b30e9679c060c4b6cb10f6b0ac SHA512 9d0a514942b6e7bd4ec02233b63eadaf0da516560eadca6e2cab52d02a50e18b66c538e675746b293adb6fff4aa423fba44093c69118c3a94cfc9e547b6b8474
 MISC metadata.xml 433 BLAKE2B 7ed1d8e54df6935b05b4ef997ed50a0df4e5178b8bf2a48f8d67a4ac6a4323ee8646c4fa93ecc6fa70aefa14d0b5039ff99183c3710b7ce689e5b73b8a5affb5 SHA512 29095e67eed7821c4e447579662019fad67c456f6ef6cd5a00f51db7e6c4be297cd48ee7b4c2ada10e59a5d829dc33fe503e7d5daa924493d050ce4a256411db
diff --git a/dev-python/python-xlib/python-xlib-0.29.ebuild b/dev-python/python-xlib/python-xlib-0.29.ebuild
deleted file mode 100644
index 9d95ed51ab69..000000000000
--- a/dev-python/python-xlib/python-xlib-0.29.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} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A fully functional X client library for Python, written in Python"
-HOMEPAGE="https://github.com/python-xlib/python-xlib"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? ( sys-apps/texinfo )
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C doc/info
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install_all() {
-	use doc && doinfo doc/info/*.info
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-xlib/python-xlib-0.30.ebuild b/dev-python/python-xlib/python-xlib-0.30.ebuild
index d5a5b6ae79a3..371221e4dd70 100644
--- a/dev-python/python-xlib/python-xlib-0.30.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
new file mode 100644
index 000000000000..5bfad814a2f4
--- /dev/null
+++ b/dev-python/pythran/Manifest
@@ -0,0 +1,3 @@
+DIST pythran-0.9.11.gh.tar.gz 3570395 BLAKE2B deada9a608ed3d883308389d5a6ddfee2f0f74ecc74f1fd87bcee75eecabcab2acd576425b8e92d6fc6b212377f1c7295e766db32082339c98670a964a49ea10 SHA512 c8939b918216803ad8e2a133b16f0d8ea939e4d87d07ddb1a3d131afb0ddb76962c489270431808fbf129e76b5f9dbdc2b625097f37df2eefdb9834d319d028a
+EBUILD pythran-0.9.11.ebuild 1183 BLAKE2B 7c810169aff4d52fe1d23dcbb0dcf75a61f342ae4b2e7f47b01c8ae966389638cb38700bf06fa3e1285d8664706dbb6c6bbcef528a0e76652bb0bf5b8d5b0dd7 SHA512 53c038ee10e4411ade77b3917554f46a38354cd4855e854df6842654f4ba3d6c3ab616d4898ba164bfea2c9b38939ea2aee8b7adc6ecca25625534bdea7fde6b
+MISC metadata.xml 353 BLAKE2B 3584e4357ca55b22b1bf1c707b22df13999c358ce3968fd968c2cb94db6014e325b6782b8bb2b6e97a7a6c584081fa974ddf01ea88103b51cbd0bd2b49300bb4 SHA512 13435a1f1b2de15e825165e9d71ad3f12f29f32fe55694b7e504b76a5b6738bf4ff7b2626b0c956a1edb66d744b3589dac320eca4af0db5e6c55f3ddf537550f
diff --git a/dev-python/pythran/metadata.xml b/dev-python/pythran/metadata.xml
new file mode 100644
index 000000000000..852515482ce4
--- /dev/null
+++ b/dev-python/pythran/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">serge-sans-paille/pythran</remote-id>
+		<remote-id type="pypi">pythran</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pythran/pythran-0.9.11.ebuild b/dev-python/pythran/pythran-0.9.11.ebuild
new file mode 100644
index 000000000000..e9f0d52d41d0
--- /dev/null
+++ b/dev-python/pythran/pythran-0.9.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/beniget-0.3*[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	=dev-python/gast-0.4*[${PYTHON_USEDEP}]
+	>=dev-python/networkx-2[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
diff --git a/dev-python/pytimeparse/Manifest b/dev-python/pytimeparse/Manifest
index e283df672927..3a0481a1508b 100644
--- a/dev-python/pytimeparse/Manifest
+++ b/dev-python/pytimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST pytimeparse-1.1.8.tar.gz 9403 BLAKE2B 671a96f0f7d517e6cd137b8ec7bda17976993a683ece5e06f857cb07063cd4d7fdd08a98f838dbf35251a8403b68f7dc538e5450db3abe644e8c7c4f6c76b645 SHA512 9eb4530d779b940d66412920eefa4f4d3c43719aa3e4104da4f337c05421bcbb6ad4cb2d6459ddfac770fc9f19960a9d8ce578e67f2513499a7bee8efe9541ec
-EBUILD pytimeparse-1.1.8.ebuild 459 BLAKE2B bcad594fb743071bfef5014bb597086af7071d7c9132342fa832a872b133353305b8d7f66d540453591cde7545aee56c47e52f702e3e39fca6e9f1c961fe3a80 SHA512 f364c2355817b436b60ef24bf8d4178add4621bdc35348b19d0c75c9c3576e4d2d0d9c30c53dd3461c1f553b65c2721a9d4349548ecd5e220be341873ff97713
+EBUILD pytimeparse-1.1.8.ebuild 647 BLAKE2B ad040498f0f0570ce88c20874abc1e5b355567c3fd58f0565658b1563cc83c9a892f2eee423dea04d9fca51c600665cbdf7f53e4c67607da5ae6e781b401673b SHA512 38dc6af641fc7c1d2d50bc8bfd144bee211dcaa35f66be5585af41f52f7466a7e7c3a1081539cfdba5faffe607ecb2d0d856824812654292ae1ec689ab642551
 MISC metadata.xml 500 BLAKE2B 7ea01342915d921baddc08f004c5974955bfb044a8aba601b53cf13ad8c8707aa07bff7b9cd4b5e66de8a65ff244402ca91ef88e45429035c5d190c2e488ae84 SHA512 28a1c7aba951445e096f528221d38286a5d2a97b309e13ef9d7d755c282fad6794af1ad85ecbc13beb1e546e6395b76c579aa72b1669d7af08394ff2b9cb1866
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
index b49692b4aa69..0de0dcc5dc84 100644
--- a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
@@ -13,3 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+
+python_test() {
+	local unittest_args=(
+		--verbose
+		--locals
+		pytimeparse.tests.testtimeparse
+	)
+
+	"${PYTHON}" -m unittest "${unittest_args[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 46527cf63c9e..b325d7d4f4a6 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,5 @@
 DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
+DIST QtAwesome-1.0.3.tar.gz 878811 BLAKE2B f4392caf940ffecabf4848e892226a0871686d34a2190e35c4b11a0803a006ca0a9bfb09b3de03f7baba6777eec40ede30e35aa702bc83d9eacfd45cdde207aa SHA512 90ff132034ccc21c358b341e21aa848c34dac1c10e41720f57870f6c73fa21d1da944e4ca2ce2ded034c9edd85679181f0bd7a6a949f46a582a4402a620f2849
 EBUILD qtawesome-1.0.2.ebuild 950 BLAKE2B ec5b9d25ccbcc59e6f7d330db40436fb1cb7dec2954d14bf53f5474f366b669c41779e3a01ca85ffe6662ca847891b1a0c5b03580eb890cc9c1dba2bf3b946c4 SHA512 926942a9d8e9f847ef25316e301c7b10ef3ad9ee4a7ddf40ad724e5da06879d3cd522b098641649dcf3d4c904e2e335f740fb2c815c694b48bd8c93c28ac98e7
+EBUILD qtawesome-1.0.3.ebuild 950 BLAKE2B a30c0a38c03e4cbe90d040a9352122fba16acf388fe0a15933b41c6ef79ee842e1ad527cdea2239d12d66777d762dd92926dcdc98f7e2ec1510013c14395c654 SHA512 ad58451f33991961015104fa7f5ac582964198765767f4e1d9171086c6f071860ecc7d7ced1f82eb0b6cbef9c82a5e623306883a06abd36be542229899ed855e
 MISC metadata.xml 809 BLAKE2B a2466e110ef2e6cb3a9c668bc9d41cc1a37396ec49e8f90c75e5bb22b87c09e27f393941ac0c6d72dc73e7cfb793032815f16fc84228e7107d1a626a2f629608 SHA512 26439f8cd592cf1764e62d146f467942d1b1d4cc35b096f2a2cef43099c8d1dd41d22713ad476f34c9945444a7ac5449e1391aad815da753f9ca8f46ff340889
diff --git a/dev-python/qtawesome/qtawesome-1.0.3.ebuild b/dev-python/qtawesome/qtawesome-1.0.3.ebuild
new file mode 100644
index 000000000000..bac4a1950b96
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.0.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-fonts/fontawesome
+	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
+"
+
+DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
+	# the tests with pyqt5
+	PYTEST_QT_API="pyqt5" epytest
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 92f7bed5be18..18414beb5fb8 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,4 +1,3 @@
-AUX requests-cache-0.6.0-test-install.patch 705 BLAKE2B b472ac6cbc27ed813e39a45ecb407a88d7942816290afd0b527f6926c1f50ae1edc2d919805fd6d84fd8ccae8a5c581909be5a97e806dedca3c38641cc32d5c0 SHA512 6faa08a94500559d3cf4f4eea3bb963215973587766426e2b8f0494398da9731421e3452478d0c1f5042f2abf91918030af042ee673b9c2c300daa2ca0c3822d
 DIST requests-cache-0.6.3.gh.tar.gz 50303 BLAKE2B e8507a19f3883c050e1d819bf9ce8ebf720a5c6517e4004ecf745f5a197a8feac9cbca18ffa99001be0baffbad41d2ebfba5b63d90b55eda1d754d279242bbc6 SHA512 1fa801f60623dce0a5cd834272a74acf80b6ae52a602ae81fbd7e3653467800d9a58fb8220e30d53ef1b896aa01f2017f93dcbc2dacfd685ee9ae286f47077f5
 DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 EBUILD requests-cache-0.6.3.ebuild 1141 BLAKE2B 40673e1032da1b5e785d6984b657a0e019ecd4e21851f5e8c36b28aaa66510a90c42b25cfdfdcdae6258837a6691d85278b1b7d2a3a3403da8bfa8981d0a455e SHA512 8df533649ab6ce4a5d137f542236d9a0804bb305b8e3b050ccb0e5f9591c51e4b49a6ad7e4b404a39164eecb7f6081715cd584b2e11b76f075fe6a605bb563f0
diff --git a/dev-python/requests-cache/files/requests-cache-0.6.0-test-install.patch b/dev-python/requests-cache/files/requests-cache-0.6.0-test-install.patch
deleted file mode 100644
index 3862716c3016..000000000000
--- a/dev-python/requests-cache/files/requests-cache-0.6.0-test-install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 430424bf43ad1f5979adbb2eabdbb23726465fde Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 10 Apr 2021 10:56:39 +0200
-Subject: [PATCH] Do not install "tests" package
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 5ca5b80..58d8e89 100644
---- a/setup.py
-+++ b/setup.py
-@@ -40,7 +40,7 @@ extras_require['dev'] = list(chain.from_iterable(extras_require.values()))
- 
- setup(
-     name='requests-cache',
--    packages=find_packages(),
-+    packages=find_packages(exclude=['tests*']),
-     version=__version__,
-     author='Roman Haritonov',
-     author_email='reclosedev@gmail.com',
--- 
-2.31.1
-
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index a22c9a0e730b..c42fd9768719 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 566 BLAKE2B 435c95ae7b591197c75860bee6b94298c8b41fa88bd651717fe85aa222ba8e5df2679836400aa4c7d4fb4a22b22abcb573b3c161df0bfb7617995f4525373934 SHA512 590fe35a72a12fe39fb99b5a0ac6978db4eb99e17816b35e65fe317ad6ef97716b92390db47937d0443cf78a28b44691cafb353252ed0911a364f3247c897db0
+EBUILD requestsexceptions-1.4.0.ebuild 559 BLAKE2B f00080cc17d20d735893d2ef0e8273cd77ab302a2f3e133308ab92c72e63036c46fb91af5b6f031c55b864a7b51a3e10c5a138037cc4916361b89da0e20c8eb5 SHA512 9fd9d58474cf2b3b863113ce0b3e520e35b86d21b273f17492ab27673799ca56ee983ec54e7b7e1157d7f681e725c4c85e79703a725f97a26281ac44ce91913c
 MISC metadata.xml 846 BLAKE2B 05ed6dab6649f4130e09d5f42d9e8fa16a3890265b536ed540a70aeea96a279246fc1118ad68bc3723e9ab8b50be3dabaa39861a3f80ec8b0a8a409206df5e08 SHA512 0cdb7c612dd10cbe0b2e75e0dfceffe934a826cbcd0b727b3e0c1249c54183be4cae6123215bd7b7965851738e3adbe7e0f9c403b3672bf3df53e943e0376f48
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 07c57c035753..4190db1fe6dd 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 110e95078fc5..b04e34fda816 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-std-pathlib-0.8.0.tar.xz 19068 BLAKE2B e1709bf5af17a843a7f5aec8009c4ec337cd1a4a526315e8834924909613eb5cc50c2ae1a1acc74c97a876fa347767dce627f2dba1fb874032f0989f7ee6599e SHA512 eecbb43e3867d8ccb166a0d528b3d7cfc04ed6f2df5e2048ccec4d7fd36117ac4a3984d4143025f6b7fd51867de879fe02e5dcbc4b275fd40cab1609bcf69536
-EBUILD ruamel-std-pathlib-0.8.0.ebuild 827 BLAKE2B e64f274cce4c4a9df522fbd78d66a06668fd130aaf4d3414739e96f842f358886f97519a99420ee873c76d069966e24b54e35bd4845bf066bfde4bf28d8a4edc SHA512 1935700f250967700e7901a21c42c88cf537f118f85397b1eb670805d6c48fbf3d20c0e31f7aa3c13961b6b72745b61260a145bc379ecf006c90b50522902b8e
+EBUILD ruamel-std-pathlib-0.8.0.ebuild 834 BLAKE2B 8b3946828fd31a9c348419957799201daa50ea231dc992f95cf493e54b265a3e220deeefe73cf6e632c4a8668642084a05120c60401e4de52ba5656f638cf350 SHA512 02e60efaf48c4c183e6f669f8d1ade848db61d874202f3cf3898fda8fa3c0710d61dcd93563f42057926708e6e8983c3f5c5f1fdb139a2a298293da1e834ebac
 MISC metadata.xml 783 BLAKE2B e18626bc4707b35464676b50433d5a3f7f187d3b37d6e73d943c7cdb92d8279d0c330c33e13f68a7de05c3b55fe0f2ba11414a2200b00b3a571f66852e223644 SHA512 7406b28da3ad6239d8eeb1b879472f1bf6af343642cc901a1e0023f94e361eef32130d54203128ec0a0ed3bd7b807e516b9e41b47fa52057e090cb29599cf9df
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
index b33f71ae894c..c670bb788c85 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="dev-python/namespace-ruamel[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 3456b64a6cfa..83b6a994f779 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,4 +1,4 @@
 AUX ruamel-yaml-clib-0.2.2-python3_10.patch 1223 BLAKE2B 6d221d4ef7aab6d8f9a367fd877abe459243159d5e199fa287fa3a526d8888512ac16611cb377f50ba53fd8811a1d7193a0216ac37bb5bbcc16145e979f7b9a5 SHA512 0817dd4c459067b4545276e8cfd9e8e1ecd73bac5d9b3fd822501c80a41ecc766f0440a7b518b7554ee6cab82586920b19dc1c340f8136a0e8cf5724d5e53846
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
-EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 705 BLAKE2B f1ad1bda8a5a2a42d42070f98c0f873023ebd1d9d89e238341babc68596023b474bb602d9ccfd869c41b9885a19388a39dbccb5cd291f7b5c3e4640c482ffaf7 SHA512 df15b7e45bb98e4d97e69284be5b88c6771d9912d7c259bcbb22c0f8c13ba4e1913742b3187f68cfa18e893bb17ff0831ef9ee3cb400680505a0fceeee702692
+EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index b8f59cea35b8..db898fe1072c 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PATCHES=(
 	 "${FILESDIR}"/${PN}-0.2.2-python3_10.patch
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 4a007a183c7b..25bfbd2573dd 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -10,5 +10,5 @@ EBUILD ruamel-yaml-0.17.4.ebuild 1306 BLAKE2B c63cd6753e7d39171aceca54e4f10b8a93
 EBUILD ruamel-yaml-0.17.5.ebuild 1313 BLAKE2B d82f64eae5cc376514fb980eb46712b80c65930d3c1ecf633d73765470a9670cdc4a706dee4781b32f01166ddacb0e8f7f7b728bd81a96f38c8e005fe9a9600f SHA512 b64cc65d822351eb3792acb4b30627845b08ce3e00f43d89283d3246bf48edc838c704674c16b2dc27f30109c745fd16d934ea1233438917b32952f89cc50b06
 EBUILD ruamel-yaml-0.17.7.ebuild 1313 BLAKE2B d82f64eae5cc376514fb980eb46712b80c65930d3c1ecf633d73765470a9670cdc4a706dee4781b32f01166ddacb0e8f7f7b728bd81a96f38c8e005fe9a9600f SHA512 b64cc65d822351eb3792acb4b30627845b08ce3e00f43d89283d3246bf48edc838c704674c16b2dc27f30109c745fd16d934ea1233438917b32952f89cc50b06
 EBUILD ruamel-yaml-0.17.8.ebuild 1313 BLAKE2B 4b379f262a11ed6b2f7e5590ec73e09b6979f4ade58e1f0d84a2e75e75c81440915f60bf4805b7fc2a426486eb81a66b7d3e5e5e1f4aa63436e7d3dec08c1089 SHA512 c29aacd2394ded6d6b063328cede12ed116ea57d00397667d8daa9f93bb8db195d31e76bfb7a82c1324ee7d6fda9c7f5eb72878bc0ad174f1b423fd1086031c0
-EBUILD ruamel-yaml-0.17.9.ebuild 1313 BLAKE2B 4b379f262a11ed6b2f7e5590ec73e09b6979f4ade58e1f0d84a2e75e75c81440915f60bf4805b7fc2a426486eb81a66b7d3e5e5e1f4aa63436e7d3dec08c1089 SHA512 c29aacd2394ded6d6b063328cede12ed116ea57d00397667d8daa9f93bb8db195d31e76bfb7a82c1324ee7d6fda9c7f5eb72878bc0ad174f1b423fd1086031c0
+EBUILD ruamel-yaml-0.17.9.ebuild 1320 BLAKE2B 5a4c4f01e172a4a54a025b64fbe6229ef3e96dbfe97b627da9cc37c22668481f05ac68d37eab8b81539fecda88588d63cf9b49e1b2c1cad2e83ca008e5489bc0 SHA512 5db02addeffbac54190032c5c2d66ef4791dd404b3e7990e0a38d58512671581e606c3493347a0c1ffa241fc5133899dd8f0b129acbdb3b8493e49413aea7a81
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
index f1cb20246e0f..9cf177b48a8b 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ae6a3c4220e2..db43ba14e9f8 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -4,6 +4,6 @@ DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882
 DIST sip-6.1.1.tar.gz 1441692 BLAKE2B 89a350be3e8c87cb76ec4222f0ab753213f324bc4573bee82bc4d014e8984d9d47a6f384793f618d090620a9efa2cfb906070a7d99312a29cac715ec98d97f15 SHA512 94e413c3af4dcac9cbd1eef368f4e88c0b3bfe1ad8b97f4a6ec39af1a448fdf1d79f3c845cf8c9b0ed78b04f2a18d176d750a39d13a47f9122e575d034ed88b4
 EBUILD sip-4.19.25-r1.ebuild 2274 BLAKE2B 6c6b9eda1e03e05a1e92da561a4ab208ebf80b9b546c8bfa0e1a68830d8e6889a1fcd5dfef10c2d184aa8dae55c14b46f1bf281bf5ba87ce80f256f12be6174b SHA512 8fa6edfef0535f920e2fbdc08db3c705d27abdbef4442f72ff7ce796de967190cd7aff0bbc710f3bbf9c481aa984ea44afa7fd6a4131405266dc07200277f3a7
 EBUILD sip-4.19.25.ebuild 2266 BLAKE2B 0c407d5662f9b4a52c6609f26f2af147c9f545408d85f4b0ff3607858057f5c8d8e2fdf9b43638037289b1dc7378c77667894b046a37e62d2268e7af635b5ef9 SHA512 ed0d96b98948b38564c61e95d25546306891652fcc2cacfb47fa9d6e535595a4146a82458943cbbc5ed02f58283ebc9ef338c39bd806e3e79114a3e34633bf51
-EBUILD sip-5.5.0-r2.ebuild 866 BLAKE2B 308d448276991b3e1453c2d3778bf14032b68c20d5e33f790a59f5a7438af4ee55f4a6abc1095cf6881f228b9ca6ad9fb0e719cb107c385d37623275afc8a902 SHA512 6ac95eb688c009cd805d475268f8871742bbe2826e697c2ea436f49dbdc817416411c645f8310c92addf5d65de39dc8b2c7943abaefda3cf2ac50d737f6d2d69
-EBUILD sip-6.1.1.ebuild 866 BLAKE2B 308d448276991b3e1453c2d3778bf14032b68c20d5e33f790a59f5a7438af4ee55f4a6abc1095cf6881f228b9ca6ad9fb0e719cb107c385d37623275afc8a902 SHA512 6ac95eb688c009cd805d475268f8871742bbe2826e697c2ea436f49dbdc817416411c645f8310c92addf5d65de39dc8b2c7943abaefda3cf2ac50d737f6d2d69
+EBUILD sip-5.5.0-r2.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
+EBUILD sip-6.1.1.ebuild 866 BLAKE2B 7a712bf5925feeb8758b32a5fe4871172163d2c423a22d4eeed2802901b9a1a3a6ae5e4a46092f5132cb695a2ea10d8c759be08866689794d9460b53313c71ca SHA512 9f3b813efcb8c02d2e9998b1f547bf6238b59e6e9342b5d441a1eebe1ac36b7ac1988ce876081da7ddc432cc8a6a4819f96257e5188a519a2296733d094f4659
 MISC metadata.xml 638 BLAKE2B fc7e45529b0822365db27d281febae466f128ddf88223eea8fd2dedc2c4107e0a91a2784bdac69e7ecda930a76e25c5ad80cf3c6d8ef326737cc47e12a571ec3 SHA512 a603d5a00a8315fcf19b860a45660c76c3f4b47199983d2a0ac73ef1d1617afc7c56f67e2ff1c60bfe3fe644aad57ddf47e55ea2fc400fd9851c3a010fcb4cee
diff --git a/dev-python/sip/sip-5.5.0-r2.ebuild b/dev-python/sip/sip-5.5.0-r2.ebuild
index 4441c9dae792..a541809c48fe 100644
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild
@@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild
index 4441c9dae792..a541809c48fe 100644
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.1.1.ebuild
@@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}
 
-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 9c188c8b50ac..9eac73703042 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -3,4 +3,4 @@ DIST slixmpp-1.7.1.tar.gz 931753 BLAKE2B 3de14be36353bc5f5f2cfbe002c44c5e843a7b3
 EBUILD slixmpp-1.7.0.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-1.7.1.ebuild 792 BLAKE2B ac9f76de34858e5238a44ffcc16cbd3fd8f454ca916e2b2ceb997dbb35a3a54e1294f450458c95be02e9afb9b724973e7d2bb02660d87988a7b54cc556848ade SHA512 842725dc0d12d4fb4c05918dc6bc6e58fb50e3301328064eca0089c0f4302a3f3178b47a75ed3eebc77355dcfb84971137ec4ce97d200a69fab806bd60fcefed
 EBUILD slixmpp-9999.ebuild 793 BLAKE2B 63bf913e348b5b649dc53de6ad7a249f1424a54bdeef0efe8c8a50f84e59cf6283b93a92ae3cbdb737e01bae159dd9a6289f2538007a92944c8cbadd0735a05f SHA512 893d9ffb7e5ad08e27bf0b889c5688f1b1154f6912e1eea2f40086c84bdffd30a3c7443a93eeb636ca2b42fc9e9418ee73fe67b7116db2b5ef2d94ef50c2fb26
-MISC metadata.xml 422 BLAKE2B db362b9a364d657718bf47cb72e77a4b63cc20e1db7586ed594522b2c0d4469532514fc8134006f8d641d1b995c7a6eb0ab6295dfa91a44ab25a1d14eef47044 SHA512 812173f68fc551369c4b504098d3b95b826ed382d03a6b21791b9c5cc93d61c4332bdded97c013f71d9ea6d26362e0572d108d1790d10b193dd415e595a4d47e
+MISC metadata.xml 529 BLAKE2B 233dc2ff554368323e79fc11d7763b69d10e08a013789e19ad95c0ff2e7a392edbbde47f1811d69bf5b930824db4e399cb99d11dc90da2cf97c2347911c1f60f SHA512 8a6bf6d00fc0de5f3e12be9049ca25de2d866e5ef4352d9e1075676d9c6b66ecdee832b947a192b60832878be976666f131fab01627339a4f4406aa740ae4b25
diff --git a/dev-python/slixmpp/metadata.xml b/dev-python/slixmpp/metadata.xml
index b0ebc663f799..5ad3404bdb87 100644
--- a/dev-python/slixmpp/metadata.xml
+++ b/dev-python/slixmpp/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 331299b5a51e..1d446808ec76 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,5 +1,3 @@
-DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
 DIST python-sortedcontainers-2.4.0.gh.tar.gz 9229380 BLAKE2B ca9348ab7d467b2a81126217451262bb0547901b953edc3bba7c87c67b415eef5c3d454a08d227ebc8b213c1cc7db6262e864511fe67beefe865014ae5fc5977 SHA512 f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770
-EBUILD sortedcontainers-2.3.0.ebuild 796 BLAKE2B 8fd3c6fff84e969a0caf6f526202806fef308cb2e52337a87dda69ed1d0d4a84e68ee51351969771ed08cd8b2e64aeba801b135bb5a078be24339d030c53c9cf SHA512 ab94b91691dc89a6631addc5f0c9a8f7bc3d331cee3e12da9fc146904bcb7d03d4a8995772f2a56bb047a6017e1a664eaa4f3cb571a54cbd11489fe0e01b4a46
-EBUILD sortedcontainers-2.4.0.ebuild 804 BLAKE2B 5282e650692d94284a04fe38025036a665c40061832b7eaee9d20e123ccdb7517d955eacba21dc984b6ef1019905c1381e1d3b9ebb9ae710084e6db95bd67a18 SHA512 cdb0e8b51ecedaf94c31eab75bc2bdfd1dd76fbed9b2a62e1ec326d10342e28d833c23556a63f8fa6d530ff50bb5c18af9e027cc1ac4dd55d4911031f57fe3a8
+EBUILD sortedcontainers-2.4.0.ebuild 796 BLAKE2B 8fd3c6fff84e969a0caf6f526202806fef308cb2e52337a87dda69ed1d0d4a84e68ee51351969771ed08cd8b2e64aeba801b135bb5a078be24339d030c53c9cf SHA512 ab94b91691dc89a6631addc5f0c9a8f7bc3d331cee3e12da9fc146904bcb7d03d4a8995772f2a56bb047a6017e1a664eaa4f3cb571a54cbd11489fe0e01b4a46
 MISC metadata.xml 417 BLAKE2B 8f56ae7ddac9a7fab6b99e9f03cf53829a7a7543be90ce3b508af2d2cc912ddc4a41f80fe9e8d395f8e0f92cf08ec4d99023cc70a3cf089e9519ee958659243b SHA512 0b286e9c409d08a4448b377f46e0d8abed4c23910a09a770cdf9c2b2797318831570b79c082fc3b9e9e15bed338b5f283e6004e63771f2e52da2be6749554c99
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
deleted file mode 100644
index 8f7ca5dd0de0..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.3.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..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	epytest --ignore docs/conf.py
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
index af2cd3f803bd..8f7ca5dd0de0 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 2b6467393eb4..ef2745de7d44 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-notfound-page-0.5.tar.gz 47806 BLAKE2B 4715bed7509970f9198a0c666a568ca403157ad0704d0e1d17d222e6e8dc7adefab3922a4b79e056d20034463d5f034cba8c7b65248569a46866a964abec7e70 SHA512 a48cf4bcc755687c9e02482727ab2c28abe314118cef775e6b5625e2db67e4040745740c3c9fd88206bf050f1621ef20ffb0262ec614c11497ef030f9fb675a3
 DIST sphinx-notfound-page-0.7.1.gh.tar.gz 50670 BLAKE2B b438413585fce3623451015d873242de3e6d7c466aa06b0b6398d7e337d2a0d3c2041973b1f1c8491b1f382d8e87a2da00b6a97e3a857b60cb345e715d2aa27b SHA512 f2894b19f8ccee22ac7f6e3a34f8270923e8cc4b2182d490e6ec46477460555de9b67b0075f74cc089b0b9e7474c6db9373d107d272d161d98a3c5609edfa7a0
-EBUILD sphinx-notfound-page-0.5.ebuild 641 BLAKE2B c90920e67c3e5e20fb39bb7fcdaa5947c2cbcb17d9060f8566916cff0ed50c47965f439055b9db95505c4365288231380c96b60071d467d18f5068c35cab4ba7 SHA512 7fed433c99187579b3466f3c36efde46d175f47d9e662d89b8642716bffb8dd89285092e48a8f864163421b75a2403d55f54aa63e378f48c1d3b0ba61445e75e
-EBUILD sphinx-notfound-page-0.7.1.ebuild 650 BLAKE2B aec73a088ebd0d2c525407c27de7cca16dfacf9b184289f62a0adf8c020355743a8d45869c9746746966c2f83475ca052541859b8797425b2130c4370ffc8af7 SHA512 5020bd05900230b6c93625da65ff202bfe0bc1ce9c009cc2d33c14920c632bd4f7eb84bf23083cf9c10383bab81c140e6bdfbea3010e957b60d622ad88be1c78
-MISC metadata.xml 626 BLAKE2B a9cc30ad83ffd4e697b10525cd5d5d555ed6293ff54044a67eeb871f29d9683c5330c4c49c378c990e126db241fbca487d00510960e8154f74b1fcd50325dfe7 SHA512 3c92f220c2a0d3668c1c0d968f43cc5986494130952aec2d014900576f39fccb67953c1f8fe90e70d0591ee618e2b3b312828c436f3acf6ed75425d4f4694048
+EBUILD sphinx-notfound-page-0.7.1.ebuild 647 BLAKE2B 5acd23e28ce43f82f5fe65e3dca93af63c5cf822506a9e029c3be4a64a93e266e78eb069509dbfc190d1f538b210cbc95ffbbe2a5653e212f813f36260948e46 SHA512 70f27120595c88aa2fb5df0834f94f5b4d38930190a4bff3f87cef34b490c5dd819f5e2b2c9c437c3248d2ef5d4c96170353d59ee9207d5e3fe01c0b86d24a0e
+MISC metadata.xml 650 BLAKE2B 97a73cc606f9d06a75ba52ce57700410ad3f47df180163feec6cb875b6e67d14c4e7ec2e075977820cf39382d22939b2b1f2d9d721f79e7e3b8e52492ce02ecf SHA512 b2bf98f537f3439c67e8c26473ae55072c81e4ccd11c4d9d682e89a3e8a6127a193862681855ec9b2ef178da837d8be7cd0fec885da89643a339b6fd09afe5b5
diff --git a/dev-python/sphinx-notfound-page/metadata.xml b/dev-python/sphinx-notfound-page/metadata.xml
index f7ae32667577..f07ab9335e8f 100644
--- a/dev-python/sphinx-notfound-page/metadata.xml
+++ b/dev-python/sphinx-notfound-page/metadata.xml
@@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinx-notfound-page</remote-id>
 		<remote-id type="github">readthedocs/sphinx-notfound-page</remote-id>
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
deleted file mode 100644
index 3387b66e0041..000000000000
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2019-2020 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
-
-DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded."
-HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
-# PyPI tarballs lack tests
-# https://github.com/readthedocs/sphinx-notfound-page/pull/110
-SRC_URI="https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
index 200e4e029d1b..8073b447a33a 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 83d61e56b2c6..8a83eec8c753 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 830 BLAKE2B 9296c056734d9f5f9c7ae5f5ce38fc44e6ce5fc0af764d9112122dee4f181641590715b03e43919766214944966b1bcd0333d37f59c034be203979559cda2cd2 SHA512 ab4c53d65d514bb0ad8413a535eee007c1463643c805d6775524c6d1941a6cca39608f9c678b2ede394a2e986fc25ac1dd62725c1560d76e84ed038993a21fdb
+EBUILD sphinx-testing-1.0.1-r1.ebuild 554 BLAKE2B aea6aa3e3f6822762f97ad633a1ddeaf5080c24b7c9a60f6e0fb5029a98d224e19792a35e79836a88f754a5618f55cef92cd3d269ca28275aae89f7b8d9f0f76 SHA512 0f4ac215f4c00340becb71078f08c62137b420687e28ad5074eff1d93593aa88c759600dadf6ee2f715e9e2daf2b4f624870cecf387e825221fc83b64e092470
 MISC metadata.xml 382 BLAKE2B bc907f0063c080ab70373e0d2e67fa2ff2f16e2c93982da1769a92bc4f67a9288e9c4f683bba89aa9cab479dd793e4ef294a726b6532fc8031f5d397e2b8c1ef SHA512 8e617b870299fbfc28e7cb6e67ea8e772e97a4886d6de808614c72b423bf557ce46005b64e37a705333edd8064f873575ae6687719a1270b1fb78f0d654e087c
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index dfd06d45edcb..e951c6617be7 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,20 +13,9 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# NB: while tests don't stricly use nose, they rely on some side
-	# effects of using it
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests nose
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index f6174267aef7..99833a32f2a6 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1072 BLAKE2B 0b35ec89ea4523e113c6cfeb4bf50c9bf251c350135d6958e19a5774fc4bb3dfe6aa5bbde25543e2e9aa9e6d9bdecae53254862afd4210eb2d79dff47b7414fa SHA512 7403557d4e95f24639bea1d676a243291ffb62c3a117144906eaad191ca57017057ea10d8dc95526c06a6cd3b5b1867cffb73f26082d8603248a76e5c50dc6c5
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1072 BLAKE2B 6b492fbe83e2636aa3fdf854dcd50c4d0614678356a447d0b299b05a88652cdab6f06c75c3a452a88287b83647405af1fa26214341359b7f3232140d9a4a35e8 SHA512 169e1cb3602c5184f13041e0c975391b4072b8f55a3f7e9854735ad243144c1c3d66304fe20785ecee0b6c5f5dd777071ff9666f1b4c9155392bf4ebb8257460
 MISC metadata.xml 477 BLAKE2B 81fd6ecb1babff7205258eea29e7937a0007ad0ab1d275a0baf4c2b2b0d2bd40143e47ed8dcbed54381283368019443fe67d7c4d210bcaa3713a72269f18aca1 SHA512 48c35224a7fc9e72de6fb738686be0e81d76469a756efadd80455bcaea3feba0aa71dd9be4ecca43c6843cf9160ca42a6eacd2a15081c4c8a637d4384677db92
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index bcb93877400e..38232e161d5d 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 0fb52d9e92bf..d8a3bd85267c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -3,9 +3,9 @@ AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f73
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.0.1-doc-theme-renamed.patch 346 BLAKE2B d0f894f5f736a32e78aaaac6c9c8f051dfdf5f12b09038c047be8885d05ca149830fbebc0bcc2764bbb24033817874be0e1b2609e2a6cae591254bb139488954 SHA512 0a2e0eaee4386ab85881ff67669a4820c26a17993c85b33a6df3576a07aba1c331eef5853db1ef8a760e95c315036411f6f13880510efda20933ee3cc0600741
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
-DIST spyder-5.0.4.tar.gz 20606964 BLAKE2B 20042d3d9b10da32aafe4036332608faa4bee458f36fb9359237cf2fd0651db68d8c7fb2a1bf653a350dcbd92fde856a4d37b4a8f85a37dffc6f8f31c750cbb3 SHA512 221c7b545d932a5c70f3f179b188f6ad9c2b1c632771f6766cba32115d1df56135708adbe2417c2236dc4b4fe847a734eaf1fb2920cad5b5e94969c308792d93
+DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
+DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-DIST spyder-docs-b317961de7600fc906d862238f344b3a315d28b1.tar.gz 80326831 BLAKE2B 0e9bb5d52c3cc1615f74f31a2c87be9fca5431bd19975594e147b5f9f3082f16f0cdfc476402533a0950bd928fda55de6c3850ed3a2780f1439fe88e349bf0f2 SHA512 8a1fe8e88c029402743c15b720e2e889fdbb73999a1035e81e5b3f998992515e041e14d8e361e23e7ec8a02cf30706349d12e9e0b37df9d1d7554b926831af78
 EBUILD spyder-4.2.5-r1.ebuild 10176 BLAKE2B a80d3e881f43d2300d4607fff4151118d747402de298f8e3c3dd5b7aecd5987c850e60cf4c1ef5346eab40163e4117abad0a3056744c0aca777f0b5fa6f7a6fc SHA512 cf8b9310b1e7af89b78257389f6b7934c51a5f5585fa69931f2b81536f1e4089844b9a24c606d9119a66c99ca3648a3f160bedf21ce3b98714b3af7474a1d2e4
-EBUILD spyder-5.0.4-r1.ebuild 7876 BLAKE2B a3ed56a8f3807025bd117d76f121527884ee321bb8d1e3d70547d763ec87d7664c9466cb9ce1e6585bd47a81ff6e05b31eaf4c49109ba98b1f9cdf2013da2d1a SHA512 f9c16571995ebf8c03cff217c3206cd56fcfa56d3402e217bffad10afa78f298a9a4c12f8241ac1397aab942498a2b27826a84eae4a3fd739221b896a70589d8
+EBUILD spyder-5.0.5.ebuild 7876 BLAKE2B 9005dce5299217245eeca798b03aa61b0c64025bf7ecf94e6b9658eab463e4758fd58f92a70795249ce61e1697381183de728494ef15107bfdfae73ea0ebcff8 SHA512 856c5fbff97300dfba3c4522aa9ac959e42a84e861181659e73513b2feeb1f61540ca4a3c8f265e36380ada7641983b48e3726da61085f26a1b7b123cd1516b2
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-5.0.4-r1.ebuild b/dev-python/spyder/spyder-5.0.5.ebuild
index 3343093b7dfa..eb12c15ca98a 100644
--- a/dev-python/spyder/spyder-5.0.4-r1.ebuild
+++ b/dev-python/spyder/spyder-5.0.5.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="b317961de7600fc906d862238f344b3a315d28b1"
+DOCS_PV="6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index ed366afc5769..744362c46a48 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,20 +1,10 @@
 AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
 DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e3338320973287afa4a37477ec28d47e7422a19c3a60e6290a6da7b23512c0d818a26400958d02097def778c917f098bb3db SHA512 4f5f0a23e80e1cebe541f8748a7e794e8964d986252803b3289a7cea732ad22557e00221775332e2766b6ff16ad5d9069223f441f8880ca6d0c47011f15fee5b
-DIST SQLAlchemy-1.4.11.tar.gz 7551299 BLAKE2B 65f560223f1f1656ec90a2b46b5447e92908cb7a8124f1a16f59ae04e5c22b9c4b7a30cbc0d1c8ebf31d31f544619223bdff0546fcfe6124195c4430bc8167c5 SHA512 28d5da109d754183e7f1887c652c47cd7162afec285a44ed6bc51566dc40d43cdb8cd1794f93f31b2e085488025f04243613d500936c220aaab3aedb75fb6dcd
-DIST SQLAlchemy-1.4.12.tar.gz 7583069 BLAKE2B a3097c53ba1c8e979c3eab712e51da39214710e174a90cdabd5f5588fcb01d2d45436e8019a1026780474e2fde7663495cffa411c58b255e847aa584a38ca26a SHA512 5863e4982c260d39e79db3a8fffd7ca6710b7f6ab0f73f9ddb09860e27d679fe2c92e0eaab9fe6914b38be4390c0eb685adef6624b06874fb43d96027b545659
-DIST SQLAlchemy-1.4.13.tar.gz 7589942 BLAKE2B 08e9fb6112aa71738f27dc4ce86ebe2274dd2513f39ded7211a5617ecd677f37fe31de754a24ecd519b227b141287ad86d0d0337f3d278d4c4ca5b67e2a1a79d SHA512 fb81c71922a768221f6675686fb2696b5e6d1f2e72231611e9afd20b7659193247eef4191841799fb1fe6a51304629efb6d3fba5dc298fdf70f248010bce8bb3
-DIST SQLAlchemy-1.4.14.tar.gz 7599698 BLAKE2B 500a6257829244e1181b8ef5cb39fb87b62ae2d7ca054fedb580b7431b32d15c8f68600b881eb67eb97a73301660ab96793ab12094ae901782ce4eebdc8929db SHA512 2f33ab034467344ffb19aa3934148faaa4a57e4ffa5f97008d814d54149da4e15cfca14d138b9fb656227e25932ca95cf7321209c31c2706405d3916dc2fb9c0
 DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
-DIST SQLAlchemy-1.4.16.tar.gz 7629704 BLAKE2B 46626cb38e3ec2c5b5c203a03da1a613cb5b66f2906edc54c03843b87ce8f12fbacb6fcd8b2b36584c53516de24b8c1bae041489a376472e4d2e6e2a301b707b SHA512 035c740b49356b1226ed79f188d022904d93190e5391edd350e44e63301333efcfc6c47477ce5119fdbebd49aa3e21b2764d3e4dcc6be5948428f1d8cf11c84c
-DIST SQLAlchemy-1.4.17.tar.gz 7630929 BLAKE2B 88b75c930caf674aa6d927336573f0e40fc89ae72735c11479eaa15de56754807b5412409d383857104a3027fcae346e747cc605525fe88c0a0f9d4ff39fcc7a SHA512 ff99a3a9c440fcdc10f6f43905672f72929fff430b3d9583b8e81693ff9d54ad5d9607b8041787074072cdf1ba03b31db9255cca1c50c8a43f275a0905e9f0bd
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
+DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
-EBUILD sqlalchemy-1.4.11.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
-EBUILD sqlalchemy-1.4.12.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
-EBUILD sqlalchemy-1.4.13.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
-EBUILD sqlalchemy-1.4.14.ebuild 1706 BLAKE2B 3ad9ae1f0d510f399be8389ee612d0f51fbd07f238c65a9dfd5892990a2d2bd1d69dec24afe97731a13c708d7b94ebe34177632d377a370219895a56c4849f27 SHA512 b95d12614823cb5235899bb1656b9e6714997d72fc7f2593f567fe129078176284c797ae203748b05a64fe72d56fbafa6fc25e86ff03dbd46722d1a1f597ef63
 EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
-EBUILD sqlalchemy-1.4.16.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
-EBUILD sqlalchemy-1.4.17.ebuild 1707 BLAKE2B a7684ddfa6247ec6733778e577dc5a2f9abae0153eaf70ea26c5fe1ffa85d5bfe95a7395274d5559070284835f4870a51f21c965774656c618e3e55a39874867 SHA512 0e3c08001ef7ebf8877f680d64a80475f0e12ea0bca76f74905a167737a1af9505593b725db06c425f2af0e97d47d1a41c436ecb8c5fd805ce4ae552e9e76d78
 EBUILD sqlalchemy-1.4.18.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.19.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild
deleted file mode 100644
index 358669239962..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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/sqlalchemy/sqlalchemy-1.4.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild
deleted file mode 100644
index 358669239962..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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/sqlalchemy/sqlalchemy-1.4.13.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild
deleted file mode 100644
index 358669239962..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 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/sqlalchemy/sqlalchemy-1.4.16.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.16.ebuild
deleted file mode 100644
index 45569f2d9688..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.16.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' 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/sqlalchemy/sqlalchemy-1.4.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild
deleted file mode 100644
index 45569f2d9688..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.17.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' 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/sqlalchemy/sqlalchemy-1.4.14.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
index 358669239962..144d57d9ca1b 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.14.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 multiprocessing optfeature
@@ -24,7 +24,7 @@ IUSE="examples +sqlite test"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7 pypy3)
+	' pypy3)
 "
 # Use pytest-xdist to speed up tests
 BDEPEND="
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index 9cb7f22c9b16..f0a170d3c053 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,5 @@
 DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
 DIST sqlparse-0.4.1.tar.gz 67228 BLAKE2B 677b592af263e94e1f6d36242f4bf75d28d0466636c0c578b83f472acf05c357b6899150ce01b594db89f2844c1b85220429857583c79e6dbba34a75bdf54e47 SHA512 49f02a63ef490c2e900cea6a0882891cd1381e0f398c4e38688444300b0f0e961c91c4f1a2355704bba7f170083594bd9e26c2a6cac934da9d87ab291accd27c
 EBUILD sqlparse-0.3.1.ebuild 699 BLAKE2B 68ca835f8840eda5422680e1c5a4436366e102cfec35d70476d8baffc78e666c7951d9d63b7e7eaf705f3d1f634086c09a7aae71b9e3b3a66f61b8c755db7868 SHA512 550c3bd39e99904d8b5a987c574f42abda35b114f4b5fedc542e0c33129c9f48914d6d8bf6d527f587b343eb6f8ee402e35232edf29a0593d9531662bf6b3053
-EBUILD sqlparse-0.4.1.ebuild 604 BLAKE2B ff2a7e2ee90c6ba03b91a174eb16eee47dd9ec4d11a43d861b0164c7ed790953e090f7faea977e4a3222af1b65a19739ea3675dc655e5a066725b3423fd1fdcf SHA512 d90f3f6d6cff20295f5276fa6324f28dc1969311db669007a3a31ada8f04c09e4b2047c1e76c05102cbe4d41808434276f6ec811ccf1bafae91317007cfd035b
+EBUILD sqlparse-0.4.1.ebuild 611 BLAKE2B 4a01f2fdf7e486454d8e754a4e4b292c207dad5b3757eb18507aee45b73b0edcfdf3895b04bc386b4ca9e51e84d4ef3b6a5216def65ecc0eb45bd1e108d89a8a SHA512 01828d2af5c481aa8b56e552271a3e020e7dafb9171f3691bdf5fb7c4c69c7b5d8c75a22e34877ae8ab3a40852d62e307794c13f0d525817fbfa309d4bdd655d
 MISC metadata.xml 409 BLAKE2B 921a0fd5ada063fa95826470a68de1f0407366089fe2b6d61d654c7e21c108dd5bb4a72020717d92c97534aaa3379846ed12ca769a89ad9e1a015caf158584c8 SHA512 34bf82a21222f379e0a6b20a537ed32a9ce8cfbd3904e675b778c424e3f1a038ce2337a91e18e0a0d59b0fdc4dcd771cd5eaee992cf44e2f8826e2d0d83c663f
diff --git a/dev-python/sqlparse/sqlparse-0.4.1.ebuild b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
index 542f1c037b35..232c9468b43c 100644
--- a/dev-python/sqlparse/sqlparse-0.4.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PN="${PN##python-}"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
 distutils_enable_sphinx docs/source
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 315409d68e09..7a2181df1dfb 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,3 @@
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.3.0.ebuild 504 BLAKE2B eea03f6b6f7066684351c303b2a0e48ae1d0fb3da33bf3bb16c26b6a9bcc94eea4b963664604e9642d755f887c098573b4dbfd30dcb090220acfd0ab0e228f38 SHA512 c04aa3af961134f69d864d23070ab377b38111f38ea55566d127d6176159eae86b76ecd53fc3890f7204db627095ee268bb51bf95386fd76d88577e6dc898bb3
+EBUILD statsd-3.3.0.ebuild 506 BLAKE2B 740aa3846640388ed6e7c03d70c3cbc74132725f13c3422963982a5a9223c9efb3f79667cc4ea765b8dd4ba526bc4b0e2475c8704cbec6f74c3507f386bf4b11 SHA512 a208c07dd64707ac0f935ced4051a41e0ee9446344cb91a2cfb46d83392f6a75501786c451e2e6f85ea9f6f66029faf531d57f6c0a5dd3d887fc8242a735a704
 MISC metadata.xml 498 BLAKE2B 5b04a0ca7dbdadb6dcabca0314db852b0bd1bc5a9034af6d0ce278be50e6ae64f089f3735cf58b34446e03c7a3ece7af7d9526ef61c7d730b3a95b5670239dbe SHA512 6c083a1ff7255ab9f40c56358411f9bbcdffc52df95b928f518927e632fc4d892aaba03340b3fe9e0c7b7913d375f2d3fb3ddb2485f5f7a42c2dde23397c77cf
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index 765b443d8dfb..034ab97433eb 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index a8c945598a99..206bba650069 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -4,4 +4,4 @@ DIST stripe-2.58.0.tar.gz 216926 BLAKE2B 398b16ddab4050373ba5d7da3c8404b85b88d50
 EBUILD stripe-2.56.0.ebuild 1720 BLAKE2B a9d99433b7d151404034b4f8f8e54f4fe48bf54235a337bc2d682ee6b4f622f2765ac8caecf82c42fc185fcb16f428de12670bd8af6de839658c8a52a3158a3c SHA512 90bad27eaa41834eab73abfd0d2d8093335854df0758d7d01a52f97d1dbd03195b0ae430f60f5efa7427ce161b31a2ea10c6fcae0c521b8e735b584671219aa7
 EBUILD stripe-2.57.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
 EBUILD stripe-2.58.0.ebuild 1723 BLAKE2B 2b333392240a5fd20f5c7165fd2755a607677d2ae53d86c3ece65b7cdb81c1f65b9f1d0ff9ac2d8602ed50f290ce55f68ff9c0c38fbd8a861c3923583224865f SHA512 bf9e36a0c4957439ec88432125db54eb237e9f06195a3f252d3e5c846e8ddd4647471de433777f2e664124d5ae8661c04aac47871299f54623d45b60698cbfa1
-MISC metadata.xml 347 BLAKE2B 864b8bb1a2e79187e4ad90b1377591685a989619a955f7c85eccb80d918b6a03977ecaac744abae18408b97fabf8a205035e941f967a94d6ddbd550de05484f2 SHA512 9f18753a3d3a452f3d0423af1f10fbf476a5a9ae4a70ce4131eb9beab30fc5475dcf18437532a4ad386d780411ac5a00156a1d818348ae7f4eba2fbad5d191cd
+MISC metadata.xml 371 BLAKE2B 46520a75a660c8f40fe56dca2ac8536e4c680cee8039dc9f2858916c4f669a70220376f6c5a9d6a6cdd1b62bd626110b1c93f9c1383520b56b3c0c98d310734c SHA512 e2bfe317401810b10903c05ddc9ab3d5eae2873440bcc1ab3363ac7c1916baf3b06a0c4c3b6bc521fd4e3f2a3376e540c93a76c4d9b5e8c308d5af2c7a9525f7
diff --git a/dev-python/stripe/metadata.xml b/dev-python/stripe/metadata.xml
index a265b8b0bdb5..84efa24619d8 100644
--- a/dev-python/stripe/metadata.xml
+++ b/dev-python/stripe/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">stripe</remote-id>
 		<remote-id type="github">stripe/stripe-python</remote-id>
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 1f400c94b083..0e0e80bd7419 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,5 @@
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
+DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
 EBUILD sure-1.4.11.ebuild 699 BLAKE2B 4c8e3f7982411657f043bf1810fe2e13899431fba7cab279df57dac6847dd860bd02d720354e17a4556034d914431480d7aa40baf71286c1c758728886f90466 SHA512 a45402b06d588b7769e58bb3eb7992ca3a02cb06faee4c19b38ea7af89d6cbd37be1fbb42feb7b0cde1826b54f8a5f1b57239c62d00a8c5b3e1da59a1ca2ad9d
+EBUILD sure-2.0.0.ebuild 696 BLAKE2B 8c1fa41e781352f2768e7fb6227df92cfe33ab37095eca25fcb5be74b089a7640715b53815de21d79d8da3c007b0f5e07070b7d6f4e9c04d1b1b653f4449e93a SHA512 437c153aadb341fc02ff565a80e469da57ed774ef2c7aab5b4847d4b1d6e015d4d40caa5ebe6d8784615e67f66de2f2dedf26ec976d78ea75546d7b675281023
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
new file mode 100644
index 000000000000..03bb0dfc4e10
--- /dev/null
+++ b/dev-python/sure/sure-2.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
+HOMEPAGE="https://github.com/gabrielfalcao/sure"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# remove unnecessary dep
+	sed -i -e '/rednose/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 9d460ba620b9..33056f2d4be1 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
-EBUILD sybil-2.0.1.ebuild 422 BLAKE2B 6ccbc35567ebb977dba661dc7c0110711e5239a0bbb421b578c2edb24e8ea4005e1ba7c1f36d2c7a0e607fc16adb6c94988ca119da4b929d644f5b291c971fa8 SHA512 4a3c4705321eb0a91084bc2686500c5acbda315a89533e165e572173a746bbd509bfd7f5c8ac79a2f504f4323c28feb9b5f4331dba7bb7d1d6001f9f6aba3a19
+EBUILD sybil-2.0.1.ebuild 429 BLAKE2B 9ed8efdaec0c3cf9f19ef1e47c68094d5f0b38546765d2fd38edef5f9c073a249ea3203acf2d7595b6d73ccc1216f3ff9cc8dcf32deccbc9c3d5f5d2f6579996 SHA512 f079cd49b756e34ae15a2f79d2e4c9b35ea0a28c4f5bebf7a6f463cd99b29f8bce16a2d89127ff67acaf584baa16e5eed52a4c79bdcc2ed2ce038dfd2a34904e
 MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
index c160c4715741..0e19bc2316fd 100644
--- a/dev-python/sybil/sybil-2.0.1.ebuild
+++ b/dev-python/sybil/sybil-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Automated testing for the examples in your documentation"
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index e538e683d2ae..8b971ead33e4 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,3 @@
 DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
-EBUILD tblib-1.7.0.ebuild 560 BLAKE2B 10fc569175fb9de7ad0e043e831b7c90e2c1acaaaeb3777f7fe1aeb324d4d4dab4cbf225a6c5b32c4eb47c5442c0f9659e3c990a528b98ac5911d7630f955521 SHA512 2325b9cea110d82e01f090bb2e2603409f6ecc02db482cf0b0d9067c35ba4283b4e592e818e4e1262e575f90eb1835bc9b7253e55bbdd61d99061c1182f2a9c7
+EBUILD tblib-1.7.0.ebuild 567 BLAKE2B c68612a4dbed8a4e643ec6de7a15a601958115b509ab655f1c807bd37ba5957714b7699d113d9a37efcb7c50523a05384593e5669205a4764ae12b3068b25b29 SHA512 10437a883c71293eca6dbbc347b4ebf2db0b1fe32c99f4c2b585d70d93e0865db7d232c1eb78b25cac281afe8f1a06e115443222a756bff5e4509548b6ca759b
 MISC metadata.xml 405 BLAKE2B a9cb9a48ed88b8e80a16761949fcf8973512ec76687eeec4285f65bcfa1b60a92159aead88f4fe9facb2cc2e20bc3e0577c68f862e3bdc296b428918bde3db00 SHA512 b4616a156c1c52141dbfa07452a2f8a22828d8c2a2be6d857079a6246cfe4c773f379c3932d5156f7ce6e9606e8443971089223af87f6d725c7aaa2027a4b994
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
index 59f514e30200..498016505478 100644
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 8d1dcf59bce7..829cee26b602 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,5 @@
 DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.10.1.tar.gz 13911 BLAKE2B e939bab2a23b75d803ba2260548a48a0f1c9925f6a2fe69ff7b549255539898e35f76e94526f8f470126d4d50466f8a85a14bbd3c38d2999d4e90ec4be3e0222 SHA512 fb6a6e27cec8e644565ecab3a7c43fd288c6ff9e18e68dda6d306532fa5e39274574f3dabdbf629cf00096256fef9a0419c98a3d9b7b038e04dd6ca1af16af46
-DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9
-EBUILD terminado-0.10.0.ebuild 804 BLAKE2B 74252536fd56836f9f06542699823650be4aa4adf5e33d5b1c628093aaea266545afb04baa3e81c546be3500206574248f0d24d0d50952e18418fee1912befad SHA512 fdc5cee2f293f4d8837fa31a9feab80233620dba458db1d6e078a0c5600fc9206e84d2b5d719421c633caf82ff2a424e521d77e3451df146fd1bbef4187a3103
+EBUILD terminado-0.10.0.ebuild 802 BLAKE2B a2c30c51e7dfd3b8307742708d85a87619da630bfbaa3fe81075d1eed96a9e4a41222e26046e21d417be164bca8390ab517b7d394f787f616d8582b1b06d6d9e SHA512 1205e475152844790ed927f7302486c15d4532f8e1e3d7c24cb7eeb969eb719361d6bfe1909d77aa00f3ad969a7295ced9f7d70cacb55feb9e8e0ca7b1385d28
 EBUILD terminado-0.10.1.ebuild 811 BLAKE2B 1107a705e5b0b85509ee821741d336585b42fb8243a98dc3c91afd6c6e16ec03ff028776bb23d102a949f7d068c24e9e0e9b145306801f54f65519c76bffd2a8 SHA512 ca2e46800d1e7243a34680a7258093cf25c8c63ae9bfcfc1f8bf9713aa727406ca1665a2fe0c49a122b3ce7929a7f762b21002e96c074ee700eaa969648119de
-EBUILD terminado-0.9.4.ebuild 801 BLAKE2B 0151f449932bf36a7e0da4faba3bbba4ab785c03e899994f55eee66526470deb3b288a251af7b35101e20471fd192ba57e203fa071dbe346b336c68876fce2b3 SHA512 7e2cbdc88d7b0ff8197a8967787991ab0322b89441836e3bfcfc86639e167f417aa498c77361053c03d2fc2d290bb4d89652c9afe7e1938705af36043360276a
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.10.0.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
index 17dea5b1553d..07d6bc81835c 100644
--- a/dev-python/terminado/terminado-0.10.0.ebuild
+++ b/dev-python/terminado/terminado-0.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/ptyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/terminado/terminado-0.9.4.ebuild b/dev-python/terminado/terminado-0.9.4.ebuild
deleted file mode 100644
index b1c77ab64f38..000000000000
--- a/dev-python/terminado/terminado-0.9.4.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
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ptyprocess[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index fc6c0ffdb61c..e6b3d5662c90 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,3 +1,3 @@
 DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
-EBUILD testfixtures-6.17.1.ebuild 1099 BLAKE2B e2b3db56847d5dd550a529457c5ef474d64401191c9e176bd6e1a315d49c3eeb5153713adda820b082421f5f475af426606e47d363d48efacf3e17746eb6cfe2 SHA512 0c636a6a0f83501552b98dc987a3ac3fada8cff20dd8241fdf518d7db248e4a544a00b0eb7b34fa74dd42de8b54ad1752822c6d056248455fcba4234994e8bdd
+EBUILD testfixtures-6.17.1.ebuild 1106 BLAKE2B 2576814009e806ebbe03dfb62b966456fc060146ecafba73010d002a520132184f4056a36754af34dccd9a11464f1d5ec6473970d2cffcf49a115a7616d8de44 SHA512 102be0baf5c3b52fa8a7190fa747e823faeb0ed1e55683d2f99976d384d3bca82dce142340d6cade3d3bceb33c2130cb4ed2f17656edf1265e8c2242f7820b15
 MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.17.1.ebuild b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
index 056ba7d05a0d..8a70c8bceac5 100644
--- a/dev-python/testfixtures/testfixtures-6.17.1.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.17.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 2e80a7a80aa8..fc911fee9e34 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,5 +1,3 @@
-DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
-EBUILD testpath-0.4.4-r1.ebuild 722 BLAKE2B 502726ac5906bed17a14903d206235d0d0b3ed9f39ffaa8eba88433cd19f67b2682d97200358f2819948f9066895b4a25628f4bb547fd925c7b16612ea8f3ebc SHA512 bb11c35555a6694564774daf6ea6bf0bc772e4e646b2bca1068c3a6615a8b4d3faeffb127825c4b006245a3295c0138254e09494979cc39e3fcdae1722c87e0b
-EBUILD testpath-0.5.0.ebuild 673 BLAKE2B d19c0048df4591e2ac3f7717e778ecc794331e312d7d59354c43dd0042f2da5e969d7657a71d98bd48cf849e5744ee0c713fa6e9432c31731318257efe4fd040 SHA512 2959dea12e0b1b49df1dc85ef0bdfa96cfb65ef018855cc9dd122d1536eef49004ce5daeaab2e44d2083d77344e5e6867be2192ad0baeeac255c9cb2440f13e2
+EBUILD testpath-0.5.0.ebuild 665 BLAKE2B 167695d48377e36823850357bee8712995e334541bb9074544d1c3b3b082ceaea14adf31da9657439b690c80a8d885ba7b7c6ee0c060eacff5d3cf2cb5c9dfb1 SHA512 e3dc3adbf05407ea509945571090fa23577399df19d98a951138b2ac519148b1cdac1b3dbf0f2bbe1475c2ed3f903b98b9a7d0b387522ad127d642453cae5f79
 MISC metadata.xml 764 BLAKE2B 66ca0cbf31a2ae4f9e59e232c029f530b9b6fb5d6d53c9a3a4fd69293a987f3a46c6530e20a9c4cca4056a91b546062b9aa2135d537de276255ae6188633257d SHA512 7787d485d68e575b8a0e01dd20bffaa317c8168a1dfb38cab9c6bdbe80778131e9ac1bb8dee91bcf6ee91de5ec466027f7b1fdcd65d5fbd81dc8433804e3f3d1
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
deleted file mode 100644
index 635ef54bece1..000000000000
--- a/dev-python/testpath/testpath-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
-
-DEPEND="
-	test? (
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
index dcda183aff88..d18ddaae5f73 100644
--- a/dev-python/testpath/testpath-0.5.0.ebuild
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 BDEPEND=">=dev-python/pyproject2setuppy-15"
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index c1f1e5f36aac..42ba36c60bd7 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,3 @@
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
-EBUILD tox-3.23.1.ebuild 2136 BLAKE2B b5a0246552b7f0108257cb1865bb6c2d4587fa85164ded460ed5ee1cbfd5711cb8348b81d4a4a8cbd8d245943b0104b9eff7450f0fda0674c8965b57bbf323d5 SHA512 db77717103550ce445639f9c68452554b701a8880ba5680bb8c9d0417fc294cac00fc919c3f56107be1d43c42795d3f30d0bedf9380f3aab5173d7781b8cf89c
+EBUILD tox-3.23.1.ebuild 2143 BLAKE2B fa09dc3153a5270f787129456d0b5e392867aefe171e6419d0653e8d695ae21594f1dbe4e035e58b4b82b5b7307b001c2642bd07c7e87e35edf0ae7745e3ca5b SHA512 7fa17af47c1f9290fbfcce71dd3907ed4d11a636699acd3c2c0fb7b346ea96525616f26c15ad18cdda158469f9c20f0214f4cf921b1a2a7a2f9b6aebd61a017d
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.23.1.ebuild b/dev-python/tox/tox-3.23.1.ebuild
index dee644df11ac..6ad381444be1 100644
--- a/dev-python/tox/tox-3.23.1.ebuild
+++ b/dev-python/tox/tox-3.23.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 60de562ade24..7c37ec132f9f 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,6 @@
+AUX traitlets-5.0.5-python3_10.patch 1221 BLAKE2B a3f8617f09ae6a5def19d319d2e4886f95f3935a3165d9b88395273235b510ccf0853520634abfb05385167f8c4fdbcadf258b9b3fbdf4847eefe7b6932453af SHA512 6885806a75d8c64bd4a88d665c09291b13871a2009b381569782240d0c9a10552e4f988c92775b3f83b1977c13094afd96c14b9f88a1744b11792dba688bb028
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
 EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B e54fc9f3aadf2e16e61f0cab8639bee2202492eda146f39a76c8575a0b4a7656aab292c50d0f728697fa146c1db60c9baa0baa57902a05557213dd7cc1f516aa SHA512 7cd01dff3e9e707475a77f6018f71d1a20010820b46e9aa1e27c80bfb9d3bbd5bfe6fa3dbc1cb3049571722404281882ad135dd1202af4e85c1ca1e93fbd652f
-EBUILD traitlets-5.0.5.ebuild 594 BLAKE2B 07afaae29264eaa710e19a10ff44d3af2da5dc90bc7a5cc84774fbc4a6b9561a3e8d82eae8505c35616a184dbaaf0f11ed602aa52c1d06601f574ee9f3183344 SHA512 93ad1fec965f747c30efb4f3cbac10500924b61a4b3e48e427500ae16ea59816856623cce8715282d58faa576d47a618c7407cde567c23c129b5fbdeee5a18bd
+EBUILD traitlets-5.0.5.ebuild 672 BLAKE2B 720d551bb8ad27d2b55df71d590e4dd310517b159d7995f18fb47655e47126427d8377a7621940a5d89e62561abdf95eb767032a59031a91624049e7825ca07c SHA512 365486105e057e9f667824a6a533c236d4ceeb78d2afba30e94b4a5d0fbb50c1617a5d728c98cb1ece4e551698642a294141187d04c5dd0a77839cd0fe55c014
 MISC metadata.xml 736 BLAKE2B 4b61d7d9106717f7233fb7e4ad676efe0d543a0585ec99165d2253d75128e99be4336fcf8a473f0bb161d41d479b458b4470efb1ec2dfa6820d4a82939f8723f SHA512 5261fe54741b898efc3290f3b939fefd03a6686b2be0d43e8a9eb0bd5e506e7df4ef04bfcd6079f69e83e4c88aa6d035e572a9d6a577f1f4e8b56e01c49b0b89
diff --git a/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
new file mode 100644
index 000000000000..53ade693a3ad
--- /dev/null
+++ b/dev-python/traitlets/files/traitlets-5.0.5-python3_10.patch
@@ -0,0 +1,33 @@
+From dbb604946745ed90c6e9f6ed17f2bde253042d52 Mon Sep 17 00:00:00 2001
+From: Olga <olgamatoula@gmail.com>
+Date: Fri, 7 May 2021 17:27:09 +0100
+Subject: [PATCH] Fix string assertion for python3.10
+
+---
+ traitlets/tests/test_traitlets_enum.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/traitlets/tests/test_traitlets_enum.py b/traitlets/tests/test_traitlets_enum.py
+index 769e830b..a87dd705 100644
+--- a/traitlets/tests/test_traitlets_enum.py
++++ b/traitlets/tests/test_traitlets_enum.py
+@@ -5,6 +5,7 @@
+ 
+ import unittest
+ import enum
++import sys
+ from traitlets import HasTraits, TraitError, Enum, UseEnum, CaselessStrEnum, FuzzyEnum
+ 
+ 
+@@ -87,7 +88,10 @@ def test_assign_scoped_enum_value_name(self):
+             example = self.Example()
+             example.color = value
+             self.assertIsInstance(example.color, Color)
+-            self.assertEqual(str(example.color), value)
++            if sys.version_info < (3, 10):
++                self.assertEqual(str(example.color), value)
++            else:
++                self.assertEqual(repr(example.color), value)
+ 
+     def test_assign_bad_enum_value_name__raises_error(self):
+         # -- CONVERT: string => Enum value (item)
diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
index 75a741049c58..d1bd74f7d5f2 100644
--- a/dev-python/traitlets/traitlets-5.0.5.ebuild
+++ b/dev-python/traitlets/traitlets-5.0.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
@@ -17,7 +18,11 @@ KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	"
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3_10.patch"
+)
 
 distutils_enable_sphinx docs/source \
 	dev-python/ipython_genutils \
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index d4808b3135e1..3808b8e13539 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,7 +1,3 @@
-AUX vdf-3.2-mock_from_stdlib.patch 144 BLAKE2B 8a32644d40f90620c050b64cd80aec42d564e0b5f032b0972d2c4219b0b21630b861163bfa716e9d826451b7050cfbae74c2930417f4b0fbbedb9beb1cdfd246 SHA512 aa9226aae713472d10eabdc113e37ae80989c7b4e0b03922a4ce49d5f228ce012c05ee29353caf5a930f5b948b138b5f9ff1fe100f39f839d5638e25f0a51dd6
-AUX vdf-3.3-collections_abc.patch 297 BLAKE2B 0dec9027cfe3a39d06807604a896a8ebccf9acc244eb53e8fac3fc4b01b0c6f2e99f495edc01593b35cdfce1ef3080135eab62a72bc276a6b6a6e2065c3d6310 SHA512 3bdd6ebc8a282edbc79908e6e308982d6afbc93a42c9edf9672ca330bf1f63d3ff89634c736b7af2ec64801f66c4bfcebe777b98359a7b5f5c694723b53ca634
-DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
 DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c
-EBUILD vdf-3.3.ebuild 579 BLAKE2B d585b8267baee46f72d63e898c4b5541d23041fd99ad668112d476bc6c95553f5729b6a3cc3f49986efd174f42fa70938a7301e0fbae62bf47cc34fde7879169 SHA512 101c87d0699365d26d91de7f85de10aee59e905f7360035526480422dea07353b6da75e5fde76b62837a9c8a1709fadf34d6c2016cf1fa4d5599ae0b80f42758
-EBUILD vdf-3.4.ebuild 472 BLAKE2B 856f9ddbfd031a21bdb597bd23aae9c787df8ab0f2436a21b866021cf7834ba25e6c242a9f237a173d20c0f33a4be1bfa6e9569b2a94d6c572fc2b1b268b9e78 SHA512 e75982715bb6567b58c2ac9989236789ab971352b2cb840bba81096efbdd29d3a5fefb52c1070cc2f37889c833e9f55696b72b26bffe9c2ea4eb49db7a486f99
+EBUILD vdf-3.4.ebuild 471 BLAKE2B 94ae3cb1b3f124112eb2903964b0fdce98acfb353d86a0be51e8f7e0ec74e9acab1de7862daf38427e8275e70d75275a0f63df20166de9c271b28c49ba01d399 SHA512 d0ef5d9d92d3eeb36d860d5bfc80ccbe2a2fae8d5617cf7cbded15d73f79e302ab0640731527d8af214ec8a16ac0439fdab5a6ade657fbeab574d567b4fc7cf9
 MISC metadata.xml 491 BLAKE2B ae8b7f22935105a1a3e989ea0e27430a7e789b71f42416ce24f13334fd9de3b60e45d07d8fb157374517b01a3a5d751dfd2dc7847f39022740170f47570c0617 SHA512 86b89ec8e8956298106ae6d5aafff2b896df9ad9bf6dd397215972eec60a71462470f0fce423e8ee88c2c90070015dfb5a2581836d7e8db26f97de543350350e
diff --git a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch b/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
deleted file mode 100644
index 511e5dd1ddc3..000000000000
--- a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/test_vdf.py
-+++ b/tests/test_vdf.py
-@@ -1,5 +1,5 @@
- import unittest
--import mock
-+import unittest.mock as mock
- import sys
- 
- try:
diff --git a/dev-python/vdf/files/vdf-3.3-collections_abc.patch b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
deleted file mode 100644
index 22c647601688..000000000000
--- a/dev-python/vdf/files/vdf-3.3-collections_abc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vdf/vdict.py
-+++ b/vdf/vdict.py
-@@ -5,7 +5,7 @@
-     _iter_values = 'values'
-     _range = range
-     _string_type = str
--    import collections as _c
-+    import collections.abc as _c
-     class _kView(_c.KeysView):
-         def __iter__(self):
-             return self._mapping.iterkeys()
diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
deleted file mode 100644
index d4f3fdcce980..000000000000
--- a/dev-python/vdf/vdf-3.3.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..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
-	"${FILESDIR}"/${PN}-3.3-collections_abc.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.4.ebuild b/dev-python/vdf/vdf-3.4.ebuild
index c8883f862819..98c07a5e8ca3 100644
--- a/dev-python/vdf/vdf-3.4.ebuild
+++ b/dev-python/vdf/vdf-3.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 distutils_enable_tests pytest
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 5bf225dd716e..5e6aa7667aa4 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,7 +1,5 @@
-DIST websocket-client-0.59.0.tar.gz 57897 BLAKE2B 9f15c563491bd105a1987281cc20c0ab80ed1625036eeaa674fd28334b8226b5f9660b150743649f6bc7717d4306cbb1778222f9caeeff29507ab364572ce2b5 SHA512 c7f4a0336093de86fd00828049a836477a3c859cc4bddebd9e7d31eb746dab4de8fa11205a5fb182e5df3590964aa73f279310575dfabc4abc32157e80df42b1
 DIST websocket-client-1.0.1.tar.gz 58561 BLAKE2B 852693b08cec5d8345ee0cd38d87a93abfd5ac52a72a0715705ae4a7d5f810288d9409e920424a317867e7292568a9a67b4fde8b892e9ff3fa011cf31c016f35 SHA512 349ecf0f80859e146e6039a29b50f8bb9a377ad65655c49b354702a7895ebed4f8849d979f04b1632c7926e3dfb707ae5791a75b3e9c66d35ad1445040d651b3
 DIST websocket-client-1.1.0.tar.gz 58890 BLAKE2B b7557f0847ee4ec31279d98661f2370f32eff35de5ea6207abe4afa6ef7314258da275d823487773722ac717888ca629284ef92870b5880fb385f7fb677506d6 SHA512 6f4b963455bdb6a0e0defff92a6b898ee4bdf605c18fef7e25e18e2c72a2ae360d760c2069a0ed330e5dc0f3347f16a9129c405d5c98cd2d56014f8636e7d5b5
-EBUILD websocket-client-0.59.0.ebuild 866 BLAKE2B 6a9c6c76c1cdbc28fd48e2d8aa4a0cfdf9512fb3a28402b3f2801d3d55548cffb68fbd1bc5bd24c0a1c46dee479f05033d920d475952ec7b6e3e45dca77d35fe SHA512 5953b0b84e30a4027a1df4060ccd4c6337ffe8acaed0cfc04c3263a78c261e93d29ea8cf0ba637b2446edced40aa70dc187492be20ce0314d3941e27ad88e950
-EBUILD websocket-client-1.0.1.ebuild 764 BLAKE2B 89ed43844172266435fa74b16ab4dea7ce26ce48d1712611cb9f5d14058fa5ac7ecbab8b9dcebca13714ecd9635f875f4d6935d760f33288a989eda590b11c2d SHA512 b5a50cf6905e0abaa0fbb2de460f58fd1bc125c3239202ff33c4073aaf0d6f20c5eb10581f84e02aeb85c8db6ecb737242596167cf2433c4ddcc594a47b2fdc6
+EBUILD websocket-client-1.0.1.ebuild 761 BLAKE2B 3c42e21cf50d7bf6edaf5e5799b98f86c4f5be718eaba47b7343439dee6c8e3b1e0b112c1d696dc9f6e4d5f7ebf37b8726019fd93d2cfd22986a4645b2edd5b3 SHA512 d9a9009813c17e358f4ba56182358c9a5af790a60d6e55f069d09560cc8b012284e807d2e3d6be7f156ca3887a5cf0892802ab0529ae13d1f7e2539820eba453
 EBUILD websocket-client-1.1.0.ebuild 764 BLAKE2B 47c0a056ee6c554fdff113986e69f5129964674bfa898a2bfd4204a7eee0fdffa1ece38151770c8b41978fb9c6eafe7ad526c2030692f08d5cca72d293e70a84 SHA512 9aa15924970489bdaee10bb79e84f17607fe5a91fb11b872925c82d6daa5af44ad8fc1b8a31c6067e14284a5f7af8cbe903fbcf692dd567ced48f521983599fb
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-0.59.0.ebuild b/dev-python/websocket-client/websocket-client-0.59.0.ebuild
deleted file mode 100644
index 2b3d19ca2df6..000000000000
--- a/dev-python/websocket-client/websocket-client-0.59.0.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=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="https://github.com/websocket-client/websocket-client"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	sed -i -e '1i#!/usr/bin/env python' bin/wsdump.py || die
-	# Internet
-	sed -i -e 's:testConnect:_&:' websocket/tests/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.0.1.ebuild b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
index dfdf4b220036..8dd24d35ef7a 100644
--- a/dev-python/websocket-client/websocket-client-1.0.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index e8e3de7ef9cb..90a7d91f392d 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -3,5 +3,5 @@ DIST xarray-0.18.1.tar.gz 2849935 BLAKE2B f4d510a049e67431737ba7f6a66fdd83061e6e
 DIST xarray-0.18.2.tar.gz 2850065 BLAKE2B 16d8f5e10a7c9cb4247a3bc8f496f249d66235673e79d0707077e20b54a7d94a7b754fb00f44b876fa21273521f9e2e7d52183798ca33b8e62b30fbc57621c5a SHA512 3cfd6a3b77c48a73eb72e6c39db33aba266925df7ce9b8270231dd14032a717094073a2c3686b09fcff25313b548a452f9ed902211e254254389d15f025d8d0d
 EBUILD xarray-0.17.0.ebuild 1090 BLAKE2B 95aa23f92a87a18dfbb8eafb225bb00ad0d8803d153bf6dbc7c14d2098bd396f2a423642c7f0dd55b0ae3a4a0f9d0c91c4e07470e2c35b9a6d7860cf3e437a43 SHA512 7b1774d9f94f1510d3e470e4a887a8bdb9986a4a4825d42737adb45492b5701f678da43ad8f4466d52ee28a1847f7470653fe042185be7bdb950319512f36fb9
 EBUILD xarray-0.18.1.ebuild 1092 BLAKE2B eeaa65c52f8cb7d9c8abce710e7402fc3647484cf288189dd3561c5f6e7e865a2b01c75525943dc18696877b7c164205b091d08d8e2e24f77b037b024d322f72 SHA512 6d4fc469c4878ebc65a4b1681e402f0e6363b524b1fdd59fdf36a449e22f5c8c54d0847d38a1d557f0f79a23b532b2bef68c7ae5a799a598162c774dff9086e9
-EBUILD xarray-0.18.2.ebuild 1092 BLAKE2B eeaa65c52f8cb7d9c8abce710e7402fc3647484cf288189dd3561c5f6e7e865a2b01c75525943dc18696877b7c164205b091d08d8e2e24f77b037b024d322f72 SHA512 6d4fc469c4878ebc65a4b1681e402f0e6363b524b1fdd59fdf36a449e22f5c8c54d0847d38a1d557f0f79a23b532b2bef68c7ae5a799a598162c774dff9086e9
+EBUILD xarray-0.18.2.ebuild 1091 BLAKE2B e9df67d9c68b9d7c1fc835395dd9d5ceb70425a175f2fce50dea22f549630dbf97b0e5892129eb1827b460a5dffbe15bc31913cab26af2e7536c1de391d01cad SHA512 3d19125fa782108e5ea610bdd36976a69904f041d6c05033d3262c40cf06b665030c03afcd3146871ca9e64f23e359034bbd9679ae45db60a39a24f29c730dd2
 MISC metadata.xml 508 BLAKE2B 173d15b73f7a3566c657ebf266b60c4c5b8b92e120fe5eac24bc7fc56faaf9378812386506914372aa9b65e49decd11e1f0e55b33ae41b1c51cda2a20f1bd23c SHA512 988742c143bbcd35de2bd649c72eb8db09f3310014b9a93033e383e1c8c6e799492616216b8389f272e46aa2afe925279550094049b9df2850f1fa78b6071966
diff --git a/dev-python/xarray/xarray-0.18.2.ebuild b/dev-python/xarray/xarray-0.18.2.ebuild
index f797bf1c514c..bedc8b3da110 100644
--- a/dev-python/xarray/xarray-0.18.2.ebuild
+++ b/dev-python/xarray/xarray-0.18.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 0f514f10e5b0..84f22d774d38 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,3 +1,3 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
-EBUILD zope-component-4.4.1.ebuild 949 BLAKE2B 9c72f2bb8cfef4c7c6265fc81afbf600c8c31b9c721bdedfd503a8109b50f92677b7d1f629ead387f3a78b3ce4965e434a9d0d78db11b7d6fb246cf3a9dfb987 SHA512 3a781ac4442e5fa5d6cf521ce44eea510c21de6f0cadd3c9357d06ec23f1c228017ad0daa237d6de608d2b4a4060bae6cb45c7c9007557f30089ea0dc1146505
+EBUILD zope-component-4.4.1.ebuild 956 BLAKE2B 8747d2b1d4e0df422860cae483e7e9e2c80ec9e3c0ee6c840470e6b8c0ee011e549f199c4efe1d3fac60e3b687bb13e05a43eef35f5a24cc5bc080c89dd1acce SHA512 44ace04193f20160d689fdfc11cce2d988857d4eef9813313bb28ce4a537d5ae36b52eeabf4fbd0481f9d1d78a21b1260b073803c02952ae4bdb99652dc62b5c
 MISC metadata.xml 410 BLAKE2B 13b354ff6b4e8021277d42f4f7adf5710fba20cc1f2859c19f7bf19793109d5dc5d93aa033a6d83932b775dbed017b1646ab650eb4a76e87738471329b727e8a SHA512 4135d10ca2332108fd3cb15a826dbe7c8fddafba2215a2905cfeeb5bc8b64e91dbd82b7273e1056b2a2ca6358fb01a7a18fb37b572cd927428f4be1af5963037
diff --git a/dev-python/zope-component/zope-component-4.4.1.ebuild b/dev-python/zope-component/zope-component-4.4.1.ebuild
index c13ead1de3b6..52336316c690 100644
--- a/dev-python/zope-component/zope-component-4.4.1.ebuild
+++ b/dev-python/zope-component/zope-component-4.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=(python3_{7..10})
+PYTHON_COMPAT=(python3_{8..10})
 
 inherit distutils-r1
 MY_PN=zope.component
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]
 	dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index dfb584dae902..a4dc7418ebfc 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,5 +1,3 @@
-DIST zstd-1.4.9.1.tar.gz 516353 BLAKE2B ec318c1b6e3d44a8959dae61c2ba3f2210c0cb9daf88519b07b1df8801b8345a2b9c18fddab497a478a1c6e03118f42f9526019a624f86f347691b7daea17bb0 SHA512 53816d252611ce3a1aa0dfa7b568ce8ffba07dd8ca6009ab3406680e674f5040633718cc65e1d5a0cfea1e1f5dd746a8f3e91b313b2be39b0ed4c6f9d887b24e
 DIST zstd-1.5.0.2.tar.gz 528892 BLAKE2B 9aaa0beba1a6703d881daf5c5e10d93a8c67923d07773bce5eda3eba652f50c4cb4aa18d2ea9bea304a8742a7e8501568679837aa8bb1e71fe6eff5a5d08d193 SHA512 a7a6033e743c5bc0fa5256dfd256c2a9417c200cda5d5c02c6c7a5d5553d188637e21908658a4a948e565b16bb03f85f57c74d51c63a3ae7eb160f8b3bdbd3c3
-EBUILD zstd-1.4.9.1.ebuild 502 BLAKE2B 30f02ccaab6b6d25e4e7c76d1394a95cfcda584857ef9d79dbb57417ab6b5bf645f175870bbafd76e9caac94b07688d145ec5277a10f2b1605b274d78d770d1b SHA512 38c91b5e5d7eaf53152a55e993c85fe35d482f2f39c2dbdff2c5362049743e7d1aa9a7847271f6a818110ed7b2845d4687dbde45dd83b4a2e784f80d73a9cff1
-EBUILD zstd-1.5.0.2.ebuild 694 BLAKE2B ac78d2f66b1acccd3bd89aeb036109ad8f74a8783351a9524c984dad4e93b34cf71dce4bf09c065dab98c4387f329050a7d124b10fa28eb2924dd058fc849ec5 SHA512 1e6b4dd35296bb7ae030c45bcf9eb96b6481eaad8e39ea538341f7de3233010d2405bd7b0c75f5bb4e5a22b7d3d792ad9f7ef6084ea653eb1a0aef63c8c982f0
+EBUILD zstd-1.5.0.2.ebuild 692 BLAKE2B 76cf0e2908c9a1e84b51cb4bfb4c524125a38e592a0a7e19e0a9b6b4cc1e0e16c571405f0372df7981482b6bbd8c527e20d44616007906aa973a72539f0dcfd9 SHA512 03531ea6ed58b35005542005f341090cc007fec2193127a5c402e70e90c1735ddb80b325e968cb9e50054634ba8b72d85f9d587899e3af57fb2863506554bc45
 MISC metadata.xml 471 BLAKE2B f0cd6f693de2e397210dad0fe868504d4c294e927a00298a647610cf7eb187572c0075db9bfe75de62e3ed6f94d044d17289de9fa88e9638fbb53fcc3050e662 SHA512 dec7b96d32fa16496415df81c5242ab338f4b09371c3206b315792b75bec1c1e823919de9290ef198e117fa7433ea90d6e6c2a2c3a5ffcd7bf1c1638d4f72194
diff --git a/dev-python/zstd/zstd-1.4.9.1.ebuild b/dev-python/zstd/zstd-1.4.9.1.ebuild
deleted file mode 100644
index 9b33537a65be..000000000000
--- a/dev-python/zstd/zstd-1.4.9.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	app-arch/zstd:=
-	!dev-python/zstandard[${PYTHON_USEDEP}]
-"
-DEPEND=${RDEPEND}
diff --git a/dev-python/zstd/zstd-1.5.0.2.ebuild b/dev-python/zstd/zstd-1.5.0.2.ebuild
index 04aba4d235e8..2c4437f2c8df 100644
--- a/dev-python/zstd/zstd-1.5.0.2.ebuild
+++ b/dev-python/zstd/zstd-1.5.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	app-arch/zstd:=
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-24 14:47:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-24 14:47:38 +0100
commit	b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (patch)
tree	911928b566777494d08ebe2c16cb64f15af71901 /dev-python
parent	61f10f985e19dfe20a4d9552902625edd5b6eabb (diff)