gentoo auto-resync : 02:08:2022 - 21:19:42

63 files changed, 527 insertions, 636 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 69a0516ab059..e5b4322b8682 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 7ed97136339d..d26e207d5d30 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,7 +1,9 @@
 DIST awxkit-21.1.0.gh.tar.gz 16516204 BLAKE2B 2891244e7dcb0aef7b2053713c4479b94528a69f1225a77c46243cb293ebfa2e86d59939bc906223e598c34a322a726c9b3f5fb9aa7859191385f9c15bae57a0 SHA512 2e2ff1ae5a1893e3ba464ff0ab3c5e98b7d0711c3ba1512b8a8f89e55385ab85df9623b23d6a81b2a800b0b184de1ef82fd23a655173fcbcebb1160e9eef973c
 DIST awxkit-21.2.0.gh.tar.gz 16531568 BLAKE2B aa6677408415b2abd6a8d0f3286e2147f0e5ad3d7650feb98dfe018c89431bf9b4fdc8c6c1c76aa9a26fe0d7c8a438cfa209fbe16b7480c7295c60352e30e21e SHA512 d2be8ffacc5b82600ecac5d909450f9eef3d205075c9783849bc50030abcc84ca6cae3682baf20de8e0efb9f651aa03374941d59cf52f9d4cb4b7892d5c0353c
 DIST awxkit-21.3.0.gh.tar.gz 15808522 BLAKE2B 0c8f563601e8140af763ef88d9c69232b1c5b5de726962c210883af78d400286f7a415971311a7543b150d165c10cadbfbbd11d58ea8b9336efe9db7a7d29493 SHA512 05f2996a51aedc059041d72a50c21b3dd161c958ac869e4c9d36b45ae483e2e4c6a743e8ba336acde8108fa43d9eec0131d76a8ef3cf0dbeec1416dc8317c698
+DIST awxkit-21.4.0.gh.tar.gz 16058858 BLAKE2B 215b18809bd1050c6e93a03711fd8cb1b96299c2f335d01e7c40ea54ee9aaefab652f86826914e908ff4a19a02e79a61fc13edd5533c6b619366f76aa7fcfa46 SHA512 fc4513e7adcbf75aa801dfedb1f92a08e1dbe804a0a8b18809ec5ef98dd42bdf08856c486a9781cc6d34a932a86d587a90eac28099016e956c7468078d44d3ba
 EBUILD awxkit-21.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 EBUILD awxkit-21.2.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 EBUILD awxkit-21.3.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
+EBUILD awxkit-21.4.0.ebuild 996 BLAKE2B 7137e273e2cbf2b5c494d94613f4a733844f6e9b71f2756f3d83d05a6678528654cfab2ef4e3b040fc223bc76c4507ce8c812bfd81c37dbacb3c456c129f35ae SHA512 72c18b13604394614e0cc429482448ba03a90737f8a7ffe7e8158fb8156cfc2f037cf40b8fdd4442349008d3c0a87f5cb828bb3bc7521b9d51da1621aa4d15d8
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-21.4.0.ebuild b/dev-python/awxkit/awxkit-21.4.0.ebuild
new file mode 100644
index 000000000000..f68b06f1595c
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 210e516e86f0..011bf0043d23 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.24.31.gh.tar.gz 519387 BLAKE2B 8581d1018f0e1f0802779851edb52fdb6860
 DIST boto3-1.24.36.gh.tar.gz 522156 BLAKE2B b76cb50f01ff85c960a0984f950e72f02ac6e85131fd344142b886a3c745cb8b9073f865527911b88c462912413fce6df4066752ab5eec8ad1561d349ad22437 SHA512 fe00e78cc522248c449f83f869bb7d76793db9aa436259e74d0aa25984a02876191a7df41b1ad7658b06e418f248ad616743698c87a5c9696f77a196a53c561e
 DIST boto3-1.24.41.gh.tar.gz 523844 BLAKE2B 0cff30d6aba5e8eddb8f545737e22a146ef9a3c33df2ad5b4f6d0ef8fd67cb46183eb7fa21e8a961d2597df8d965478bcb0038f5dda117611bcfe15f0de26eac SHA512 ad3a6035352c54f7ba0197357a5a4e001c8fe7548121a9a3931acb69f9c098feb8da1d1699ac98d3ff00626f39082753434f1c992351a82cf269ce2c6a4eab06
 DIST boto3-1.24.42.gh.tar.gz 523969 BLAKE2B f8f802975f05246da85d5c1feafed0fbf612f5f67cb533178e189b1abc4edd9352dad5b0af44543d406dc405e7f18bf9792675e6b328c03c5ab0e5d55647289e SHA512 d0d102851d016cb4ae3db70c84005905495ba64142f79760fa2b477e6d0d6ea1f25062200fa5c42f685b07e5af3ef549562ef247a573c727ac8d341921bf4266
+DIST boto3-1.24.43.gh.tar.gz 524913 BLAKE2B f3a04f7ddd2b9b4cb9ca0c12a1306797d8bd96a459049f5fa0cf504a4d48afd5d83ec72f8c7bd6c5b3255bfe0d7ca0948c44c7a963c20773c4b04564167b6007 SHA512 b69eff403ffa4ebabf724168b664078d4e77f79f259f3bb2fbc7403067d5c0b7ad2fd067b6cd6227ce7289a25b16afd7a4ba219a18c2c616f3a266b2fcbe693d
 EBUILD boto3-1.24.26.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.31.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.36.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.42.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.43.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.43.ebuild b/dev-python/boto3/boto3-1.24.43.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.43.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 22ab5368d00d..10f211ffbd9f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.27.31.tar.gz 9184651 BLAKE2B 01dcd9e94490923f7d0f463d3019007f58c
 DIST botocore-1.27.36.gh.tar.gz 9465835 BLAKE2B c22c341d6e762316f3d8719bd8c1fd52140642739361a7ade326d739005dbd141a6b4e1798287b40bf7ba40cd5e158d36f195893d529f5ba375b06087d2122b9 SHA512 09ef156b3c0457ceef341bf26e3f060d3e91808f1da66d1dbb06ba2826be3c61e047383dc9d8a719bb8e172e91f6475f4613c14d30c57c6a909b51c8ba7334cc
 DIST botocore-1.27.41.gh.tar.gz 9493802 BLAKE2B dff510a658e77fe7185a8d118228cd80d06ea066328d39c56eaa8f01459dd11131ca73dcfe464a5e1403f8aceaa96065d5ea335bb268155c81c9b71299488d45 SHA512 29f419c4338e37bcc7fce38836b1f3b0ed1e552ea94cbe77ea09cd18c3c0b80d3405cd4a3468570c7eb6f1301bfed0d26dcc98feb7a1f62b9e8b1b11c61cdac5
 DIST botocore-1.27.42.gh.tar.gz 9493679 BLAKE2B 324c574bfa30b26428010750d1488a814946a505409afe356d7d7a55c4498d7c67c504638540083276c3ecf734693d21cb9c7650c1b3a05ef4f3638f92fdee21 SHA512 24ac5ddb90bb6b03369cf6ed1bc9364192d4f9a6904dbd285910c2c24efd0fe2fc9fffd55a94b6ad6ca38cb17748e7bc4a8fc54f6318d2ce6d915810d1f10aac
+DIST botocore-1.27.43.gh.tar.gz 9495496 BLAKE2B b445d81c9d56b4440e689559da576b82dc36c0c6cc8009ab97df16e5b012078b66367f4ce2140296b193d6fe729ddfeeae6fb3d561aab9a5018b18b1e62430c4 SHA512 f9314ed1dbca83c33f81f6454ada6566a401a9ce60dd77fbe491e0b8a5feab91161c953cbd6092c086fd9bbd4b2c8c6a0c9711941e1c8e96436d9062523ff656
 EBUILD botocore-1.27.26.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.31.ebuild 1572 BLAKE2B d019098e9bd4f40cfe93307947813ffe3e880e9462b25ff6eaa16caf3ffad2ea5c6db9e482b7b3dc995ca174bde48e90ecd8861a86291c1d454dcf6212bbe7d8 SHA512 db12020b9130b5b940a44ae7fca5a6b0e4c3d84fa2efcff156099d355cab185ea52cb3c4740ebbea25d865d6af8d64ae58ea1e4c6129b1c1026fe8bce6f0580d
 EBUILD botocore-1.27.36.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.42.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.43.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.43.ebuild b/dev-python/botocore/botocore-1.27.43.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.43.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 277ebe98f7f9..594fe51cbf82 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -2,5 +2,5 @@ AUX bottleneck-1.3.4-install-test-data.patch 512 BLAKE2B 850df917f8b10b2c513c083
 DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
 DIST bottleneck-1.3.5.gh.tar.gz 118989 BLAKE2B 5b9338a77cb3f0253348f45e641dca9fce11b50fb632e697272203870dd604730c08f1adc94ebf9c6c21f551e3f06b5492bcb036d6f40eaec8853d08ca298873 SHA512 9a0f224337fd9d5c741a1e469197be26923eaffb143eddfe0969128ddc233c799da6a5f2ba4ef22f6267cf93e7f748c140fbb16f57149ad327c47fe87ffc3346
 EBUILD bottleneck-1.3.4.ebuild 863 BLAKE2B 3dbc46bbfde6c6633b7c76f7ca68ebab0d53def686fba15929b0b56a4b2b01d49b5375149582d5789ec3399093e2e8ff95d8a9ebf27ae8de8c5b043294018012 SHA512 2df59b21d20e23f0e8fe3a5603a54a126903cdb0d247ac0f9d8ca78f095805b8c4ecc0061e80dffe98766a59ac8f09964d3c79fde6158eef3dac984b8860a216
-EBUILD bottleneck-1.3.5.ebuild 766 BLAKE2B cb6679d17d3701a314388684599fe0017382e0c690254636f3d38e3ed07748ac0a1f12b5eb48b247deca2df74fce2c21424c10164185a30a8792292d1d18f1a1 SHA512 b96e714cef0eb07792f12eb10e50b517bb5c22b2e9fce6daaa9235e687bbdf04f89767fe5258f63354cb74808334c0358e9f7d371cc758f661712297e715ba38
+EBUILD bottleneck-1.3.5.ebuild 762 BLAKE2B fb36c7f11e06cd6aa3d2e8f338b1d2905aa379c3b04d1514cf52f3d019f9708dd6ee154a4e9dabd0d1bb53a87003a9e5d25d26d10ac0aa9d8fd5992ea551850b SHA512 4c474449dbe7c498952d7f9330195365bbab6e74f4dc4be448e007af5f2ede4a3e8bb89b01bb2be361923743121d724f6bcbf20eb460a6e5b8e8200cefb5dcaa
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.5.ebuild b/dev-python/bottleneck/bottleneck-1.3.5.ebuild
index 818caeedd3bf..d08fc08ef870 100644
--- a/dev-python/bottleneck/bottleneck-1.3.5.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 6c627c024850..94a06a28fedd 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,6 +2,6 @@ DIST dulwich-0.20.43.tar.gz 423604 BLAKE2B e8f6b3fc22ac2289e6529d862f54d8c407725
 DIST dulwich-0.20.44.tar.gz 425226 BLAKE2B ba120c682b0fd298a9f17eec524ffdd92af9024e30d0b8c52accda3ef8a1d4876b483e8aaa5f12b4beb73a6c1719ed4504c52396cd355244ab688ceab551faaf SHA512 124a3ae89abf5df9e192919f916012be67112195fc7cfd7c30e814a04d93749a3dc396e12f2d8df1456b113a24cdd1b2f3a1f2733864d5cfad22431a987c25fb
 DIST dulwich-0.20.45.tar.gz 424373 BLAKE2B 4eb6731312bd8bb45d35efdc1e640dd2cfb118b633de461c4f9ffa2a9e50258bada2c77b4d4bf2e72bc9947f143f89fd720e4e9411f0f84d67ab208f39f7b4b8 SHA512 5b7217fac88a84591e42db2cd3c812a0aae6482221e1da9474df9b3fd968a80b653353fec804103f36a29f0f96e650267f124575a260dd082a3106de5f13fc7b
 EBUILD dulwich-0.20.43.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
-EBUILD dulwich-0.20.44.ebuild 1648 BLAKE2B 3fd03d65cbc5d76d7a6bb7dc1b65bf1e87c41a75479e891d43555dcfb5739649465c6548152011bf33e058a3da45b645ae1a8a8b527d6ef7154c9a1784d6aa99 SHA512 e89ffbc7baa3c8ee0df81ca231230d97ce837022bdbc001ba157d7074eff5900113c9fb23a0b4f7b7e5a555fd4dd505a39439bbbfc7a1b79241eb5bb0c518d46
+EBUILD dulwich-0.20.44.ebuild 1647 BLAKE2B 7cac66dccd03e74b0b3a19d43e894924abceddb5715781a486507796ae342f180cdceb6b49321e90b626adf8daf34c93210b72a2116b9fc9f39e790b2c965803 SHA512 7a42977e188b70ed8dd47599d16abb00e024a442ec3116731fa044ebdea713e8308af28224efcf3a91b3d6fffb386d13581b269fdd277a8e94f4e1ca6d533a1a
 EBUILD dulwich-0.20.45.ebuild 1648 BLAKE2B 3fd03d65cbc5d76d7a6bb7dc1b65bf1e87c41a75479e891d43555dcfb5739649465c6548152011bf33e058a3da45b645ae1a8a8b527d6ef7154c9a1784d6aa99 SHA512 e89ffbc7baa3c8ee0df81ca231230d97ce837022bdbc001ba157d7074eff5900113c9fb23a0b4f7b7e5a555fd4dd505a39439bbbfc7a1b79241eb5bb0c518d46
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.44.ebuild b/dev-python/dulwich/dulwich-0.20.44.ebuild
index 95effa84bf17..855cd030c07c 100644
--- a/dev-python/dulwich/dulwich-0.20.44.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.44.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index bf0128479b1d..b9d78b79f5b7 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,7 +1,3 @@
-AUX fixtures-4.0.0-py311.patch 5084 BLAKE2B 6cf7ec50b13ed6a76dcfd4f6b4a3c5dfc0062bcc3895811e1c26d156d15045c307f4e3050c086c0bb71b772f16dcd4f135126a6a853d622a5bc24f0c67aa11dc SHA512 99b7e5e3c26f58ce07b308cf4a53e2f90294b3a2fb2748276e882d28fcf4cb6ea5b0406beb6d3a920e775bb982cd6708b2852429b4e7676b9d0e9bd4849c516a
-AUX fixtures-4.0.0-pypy39.patch 2158 BLAKE2B a46f4983224a28c9ec5c8cf40565fb9fb744b00435f68e632a0f95b447eed8fce2776e8f1639fa8b50d92eec3fc5a0550eaf30eaf99f082fbaf49def1475df40 SHA512 d94427b5c8d44295311849d9c93271edf829393a30ab98030e0e0270b6fcbc10467e000f50ba8dd863845e12fb1958405ea1bcc6d0ecdaa56f7ca0e628eb5013
-DIST fixtures-4.0.0.tar.gz 56786 BLAKE2B 7fa8916d3e384a47c967b51ffeebb81c50c4be7432601aa94f220b6ae32ed189f16750cb126c2925995c2e945684c48041014a97902145343527e8856125b61a SHA512 dcd67c3df9efc16f2a21b6d2917a5b7e45ecc09d1ddbd1de98a5b4b717ea7da0fc82e1054f494255b419a792e841145110c77a1772444f4019fc02e9917c5b80
 DIST fixtures-4.0.1.tar.gz 56752 BLAKE2B bddda3976ec453129fa05e53da066344ed8f4db9626ec21dd0159e6720993da0c17e3b51ba37de2ef05cd7649809d674cc6409b16c8e1d242dc424d573010975 SHA512 722436f146768e4db1e3312a0db1edab2a7daa86107825fb2436654eaf74e00f569357531316df506ef3f80cef89ac7185aee1adf0b00a6ee85cbc9811ca8100
-EBUILD fixtures-4.0.0.ebuild 848 BLAKE2B 5937eee87567b573377df40ab2a7e6cda7f68b481a67a9b93153fdd4fb248b74882d37b2c6ee016d0e98c4c70711da49904c4eb98218d562c45c964c08a95083 SHA512 901a2eccb8ee1bd1f9fdbf449a1a9745ebe1efc88252591d2db8c8a523f1f3e1bd96e89a6789b0cdadc41bdae8434a8581a68d94d5a22129f29c35e875fed406
-EBUILD fixtures-4.0.1.ebuild 778 BLAKE2B a4e4f6898e00e9b17b2ae12788a97f686be28acf4d638bc575de58f643f975f3304b8013674b690b29b7ec98b5245eb83d1e7330cb51443de6c34360fdb3d07e SHA512 5134dccf7b4ec0855b25ae10a2662ab53416447cf5977ea67af44836e33970aa9771c19e0004c3055fb452acb74f2f8195692521fc383cd9ed834c602215f8f5
+EBUILD fixtures-4.0.1.ebuild 770 BLAKE2B f33e64792577e83e36cc92ba30894b9ee418b2318a2c4304d29c006136c8180aab2327908adf8998af55f96e163b4a7277dab9f863ac86062b773daf9e2a5df8 SHA512 c891024ddc95e84f26f80fcb65869139215c361e994afb3405e089cd8d641427743ec238306d32ba1f471cdc4b0535fc40ad535109dad241b5d64f00ecab9b55
 MISC metadata.xml 914 BLAKE2B 402ef182133763f0b36e4653622cd9ef0bfa1871b05518aaf01701f1c57665ce358d002dc6e638ebd224225069a5b57877ff393567db7607dd0496a872edb2e5 SHA512 368e2a3587fa361618e5208f4c34a15a223bcdc2597dcbd25f5ba8ca74e67a0de4abb1f690f853ca8059df22eee61bf259e974aa92b1e8050435099d81a7a0db
diff --git a/dev-python/fixtures/files/fixtures-4.0.0-py311.patch b/dev-python/fixtures/files/fixtures-4.0.0-py311.patch
deleted file mode 100644
index 6cda1104afca..000000000000
--- a/dev-python/fixtures/files/fixtures-4.0.0-py311.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 54ef596952d459d605fcb40f13bed6d07ef93f4c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 May 2022 12:15:21 +0200
-Subject: [PATCH 1/2] Update classmethod expectations (again) for Python 3.11
-
-It seems that the classmethod behavior in Python 3.11.0b1 is back
-to the one found in Python 3.8.  Adjust the test expectations again.
-This time around, we expect the "old-new" behavior in CPython 3.9
-and 3.10 only.
----
- fixtures/tests/_fixtures/test_monkeypatch.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
-index 08cd1c8..fa08b24 100644
---- a/fixtures/tests/_fixtures/test_monkeypatch.py
-+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
-@@ -24,7 +24,8 @@ from fixtures import MonkeyPatch, TestWithFixtures
- reference = 23
- 
- NEW_PY39_CLASSMETHOD = (
--    sys.version_info >= (3, 9) and not hasattr(sys, "pypy_version_info"))
-+    sys.version_info[:2] in ((3, 9), (3,10))
-+    and not hasattr(sys, "pypy_version_info"))
- 
- class C(object):
-     def foo(self, arg):
--- 
-2.35.1
-
-From 48d8626168a374c099fa891d7e734548e1e03683 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 21 May 2022 12:25:49 +0200
-Subject: [PATCH 2/2] Support Popen's process_group argument from Python 3.11
-
----
- fixtures/_fixtures/popen.py            |  9 +++++++--
- fixtures/tests/_fixtures/test_popen.py | 14 ++++++++++++++
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/fixtures/_fixtures/popen.py b/fixtures/_fixtures/popen.py
-index ffa9bf4..a099854 100644
---- a/fixtures/_fixtures/popen.py
-+++ b/fixtures/_fixtures/popen.py
-@@ -131,7 +131,8 @@ class FakePopen(Fixture):
-         restore_signals=_unpassed, start_new_session=_unpassed,
-         pass_fds=_unpassed, *, group=_unpassed, extra_groups=_unpassed,
-         user=_unpassed, umask=_unpassed, encoding=_unpassed,
--        errors=_unpassed, text=_unpassed, pipesize=_unpassed):
-+        errors=_unpassed, text=_unpassed, pipesize=_unpassed,
-+        process_group=_unpassed):
-         # Reject arguments introduced by newer versions of Python in older
-         # versions; this makes it harder to accidentally hide compatibility
-         # problems using test doubles.
-@@ -149,6 +150,10 @@ class FakePopen(Fixture):
-             raise TypeError(
-                 "FakePopen.__call__() got an unexpected keyword argument "
-                 "'pipesize'")
-+        if sys.version_info < (3, 11) and process_group is not FakePopen._unpassed:
-+            raise TypeError(
-+                "FakePopen.__call__() got an unexpected keyword argument "
-+                "'process_group'")
- 
-         proc_args = dict(args=args)
-         local = locals()
-@@ -158,7 +163,7 @@ class FakePopen(Fixture):
-             "universal_newlines", "startupinfo", "creationflags",
-             "restore_signals", "start_new_session", "pass_fds", "group",
-             "extra_groups", "user", "umask", "encoding", "errors", "text",
--            "pipesize"]:
-+            "pipesize", "process_group"]:
-             if local[param] is not FakePopen._unpassed:
-                 proc_args[param] = local[param]
-         proc_info = self.get_info(proc_args)
-diff --git a/fixtures/tests/_fixtures/test_popen.py b/fixtures/tests/_fixtures/test_popen.py
-index c7bf1bd..e9ab074 100644
---- a/fixtures/tests/_fixtures/test_popen.py
-+++ b/fixtures/tests/_fixtures/test_popen.py
-@@ -74,6 +74,8 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
-             all_args["umask"] = "umask"
-         if sys.version_info >= (3, 10):
-             all_args["pipesize"] = "pipesize"
-+        if sys.version_info >= (3, 11):
-+            all_args["process_group"] = "process_group"
- 
-         def get_info(proc_args):
-             self.assertEqual(all_args, proc_args)
-@@ -110,6 +112,15 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
-                 r".* got an unexpected keyword argument 'pipesize'"):
-             fixture(args="args", pipesize=1024)
- 
-+    @testtools.skipUnless(
-+        sys.version_info < (3, 11), "only relevant on Python <3.11")
-+    def test_rejects_3_11_args_on_older_versions(self):
-+        fixture = self.useFixture(FakePopen(lambda proc_args: {}))
-+        with testtools.ExpectedException(
-+                TypeError,
-+                r".* got an unexpected keyword argument 'process_group'"):
-+            fixture(args="args", process_group=42)
-+
-     def test_function_signature(self):
-         fake_signature = inspect.getfullargspec(FakePopen.__call__)
-         real_signature = inspect.getfullargspec(subprocess.Popen)
-@@ -130,6 +141,9 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
-         fake_kwargs = set(fake_signature.kwonlyargs)
-         real_kwargs = set(real_signature.kwonlyargs)
- 
-+        if sys.version_info < (3, 11):
-+            fake_kwargs.remove('process_group')
-+
-         if sys.version_info < (3, 10):
-             fake_kwargs.remove('pipesize')
- 
--- 
-2.35.1
-
diff --git a/dev-python/fixtures/files/fixtures-4.0.0-pypy39.patch b/dev-python/fixtures/files/fixtures-4.0.0-pypy39.patch
deleted file mode 100644
index dfe7bade82fa..000000000000
--- a/dev-python/fixtures/files/fixtures-4.0.0-pypy39.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2adba3989fc3d1723eb6534ae0bc1aeaf1513cfa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 28 Apr 2022 12:14:55 +0200
-Subject: [PATCH] Revert to the previous classmethod expectations for PyPy3.9
-
-Commit fe83067 has changed TestMonkeyPatch to account for changes
-in classmethod handling in CPython 3.9.  Unfortunately, this broke
-the tests on PyPy3.9.  Revert to the old expectations when using PyPy.
-
-Fixes #64
----
- fixtures/tests/_fixtures/test_monkeypatch.py | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
-index 746f6dd..08cd1c8 100644
---- a/fixtures/tests/_fixtures/test_monkeypatch.py
-+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
-@@ -23,6 +23,9 @@ from fixtures import MonkeyPatch, TestWithFixtures
- 
- reference = 23
- 
-+NEW_PY39_CLASSMETHOD = (
-+    sys.version_info >= (3, 9) and not hasattr(sys, "pypy_version_info"))
-+
- class C(object):
-     def foo(self, arg):
-         return arg
-@@ -196,7 +199,7 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
-             # with the class
-             #
-             # https://bugs.python.org/issue19072
--            if sys.version_info >= (3, 9):
-+            if NEW_PY39_CLASSMETHOD:
-                 cls, = C.foo_cls()
-                 self.expectThat(cls, Is(D))
-                 cls, = C().foo_cls()
-@@ -238,13 +241,13 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
-             self.expectThat(slf, Is(d))
-             # See note in test_patch_classmethod_with_classmethod on changes in
-             # Python 3.9
--            if sys.version_info >= (3, 9):
-+            if NEW_PY39_CLASSMETHOD:
-                 self.expectThat(cls, Is(None))
-             else:
-                 self.expectThat(cls, Is(C))
-             slf, cls = C().foo_cls()
-             self.expectThat(slf, Is(d))
--            if sys.version_info >= (3, 9):
-+            if NEW_PY39_CLASSMETHOD:
-                 self.expectThat(cls, Is(None))
-             else:
-                 self.expectThat(cls, Is(C))
--- 
-2.35.1
-
diff --git a/dev-python/fixtures/fixtures-4.0.0.ebuild b/dev-python/fixtures/fixtures-4.0.0.ebuild
deleted file mode 100644
index 75916b42f6b4..000000000000
--- a/dev-python/fixtures/fixtures-4.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="
-	https://github.com/testing-cabal/fixtures/
-	https://pypi.org/project/fixtures/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pypy39.patch
-	"${FILESDIR}"/${P}-py311.patch
-)
diff --git a/dev-python/fixtures/fixtures-4.0.1.ebuild b/dev-python/fixtures/fixtures-4.0.1.ebuild
index 5bd679ac1415..9b3bfd2269d4 100644
--- a/dev-python/fixtures/fixtures-4.0.1.ebuild
+++ b/dev-python/fixtures/fixtures-4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 4bbffce40d52..b60c93b38e9a 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,7 +2,9 @@ AUX flake8-4.0.1-upgrade-mccabe.patch 321 BLAKE2B 6febcff41b8064731f3a91bd978551
 DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
 DIST flake8-5.0.1.gh.tar.gz 145559 BLAKE2B 27c49d0e30696be086a68382235611fccf978edbd73fff0b41cd285eb6443bc183f12d54337777d07348951a6e1775793608be567149fecdfcd40cb75e879fcd SHA512 63e91269c9cad7d5807a5b6cc6dfe5fc1db6353fe28bbb6b3459e9a7ee3140db2a40c202d5964acc69546af386d4f0ea5132cbcc60d07f179960249827062440
 DIST flake8-5.0.2.gh.tar.gz 145812 BLAKE2B 64ebbeebf8aa2dc4dca2e14cb09965cfa86f6a5353f5ff78cb0cb2a8e60cd05d041e3d1e1668a1f9c143030bb62ca6d8d17d8b084a2e56175843460cf0bfe78c SHA512 0d1ba9bff706060bd9d5ad0f230c7a4d8a2b70f30907c8a78222d54b0f099f77b7a48e5658251cb862d0894a45e230b058bf50ba324ea1d4ddcdf1336c343cb6
+DIST flake8-5.0.3.gh.tar.gz 145956 BLAKE2B c6a54c67962bad905827600632f08b73c34c42ffe4f4242b9448b222ef0d1339d9e68174bcb17a8b85f357783e847c3171f963f7d21d9d2014af02c4a5e5856d SHA512 db2ce4a2bbbcc97c3a79dbf64e299ef2853470ace99dceae0dd63a5f58603531af2d4afe3f3db76ac483bb5c8884bfbaf15ba4c9e61f6b507634cbff83dcbb47
 EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
 EBUILD flake8-5.0.1.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 EBUILD flake8-5.0.2.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
+EBUILD flake8-5.0.3.ebuild 1245 BLAKE2B 93f0af3655fe3a220a0085451f6212326531253cbb2566bc582757cf44cae1706b723050aa1a6be40459bc82d16ca844aec7d6fdf990722af4a9c0e9b0ec2e9e SHA512 f974db0529efa02f5853742e65a2466c3e0d3d0e396d3911a4f0e450280c91531203f504d5f4980e57d555484a15e05fb1eb44ea9d695aa5b3003be8bdb6e0f4
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/flake8-5.0.3.ebuild b/dev-python/flake8/flake8-5.0.3.ebuild
new file mode 100644
index 000000000000..37823287f388
--- /dev/null
+++ b/dev-python/flake8/flake8-5.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="
+	https://github.com/pycqa/flake8/
+	https://pypi.org/project/flake8/
+"
+SRC_URI="
+	https://github.com/PyCQA/flake8/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.10.0[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fails if additional flake8 plugins are installed
+	tests/integration/test_plugins.py::test_local_plugin_can_add_option
+)
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index bba5c3f71b2e..0276b67f2c2c 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,5 +1,5 @@
 DIST furo-2021.10.9.tar.gz 69755 BLAKE2B d9dec7f2161491c1b9806fe8e1e98bf6d8f405ae17931e86da6edf44121a0bfbfef4db26f35b53cc929e143926bdbfb4f223aa52fdd65912cd49bd423e574a43 SHA512 4100cb08f6f97ffde2527ec5678e94da759323521bf26ba49dfe4c0851aabc59556872b494a7dec26fbf6e4ac2f2dbc4c7d92f7ef47cae7f9d256af38da91f7e
 DIST furo-2022.6.21-py3-none-any.whl 323874 BLAKE2B aac38e9aaa8d4fc6fdb00a7da9df8781b18229146970a005077075b0049b6493f280377ed735e9dd5425fdce0c43f8cad5b149957018d9a084ad83c5e5fcabeb SHA512 096c9fd0a18c8c4263607a77703412fcc5d7334b08bb6c448e5369b93572f2176f7fbe3fc7eb0b8c72f09d00eeca379debfec2f6565305d2f5e1bd0518af1558
 EBUILD furo-2021.10.9.ebuild 690 BLAKE2B 01e614573d0aedb74def04b3762442520f3df7f2ec5dfa1232c65c003614e61ce3a5f2b03f139c4da8234c4fc7b6ef86f62b4041f5b760c2b12259949b79ac3e SHA512 34237d0f5a40b8ae1165ea7b359ef11d261d7f783bbfee4b73e024c986b5bc789df3f90da81d29385466fd23100c835440c18245fb5fad76005fc819930397f6
-EBUILD furo-2022.6.21.ebuild 984 BLAKE2B 88897fc03acadcd6f302a5e2f064746149ab03ea9b54cba35e0b8bbe34bba57cc70fe14e4f224758d838fd24152b5233707673355ba52f085ae304d4abd82ff7 SHA512 8e9545613875833bd6df509af9e2934264d157492ca5920d0b3bee2b7e8e3385b4c6d7f0ffd75e8b4135f15fd39449816ad76eccd596344db3a7001e560603ce
+EBUILD furo-2022.6.21.ebuild 978 BLAKE2B af77d695c4fd174897a3641ac88962e42c58da991377feeb02499391fc72aaff2a34c62c3d58c2918bf5c84edbe046f358b3159644c7a2cbeff173e4b2c1d5d7 SHA512 b91f0de05013d2092f0d4e248b103dc766d5800f01483cebe69a2ad5ee5527a62da9a02c2d234ab8dd0da8fe6f5868adfa02e3de3c89913c4dcc0fa9c6575372
 MISC metadata.xml 412 BLAKE2B 8152eadd336ba3c73fb48a1ff4bbc236e9857dde77e354811a131794f0b750c0871239fbc2fd773979ec306ca3ddf62166f784559d486e6cd6f5d6b5c3902818 SHA512 fc3918b91916a176ce85d9740caacc70aae03b74339a62c0d77ae1e1f1b92a3db055cf1a1bc655a822ed800178971c39f29c2e45178c5e0ad6ae96f05e42a0cf
diff --git a/dev-python/furo/furo-2022.6.21.ebuild b/dev-python/furo/furo-2022.6.21.ebuild
index 154f116846f9..4af63ffb1772 100644
--- a/dev-python/furo/furo-2022.6.21.ebuild
+++ b/dev-python/furo/furo-2022.6.21.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index bb21834c1439..fb45d00bd36d 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-python-1.16.0.tar.gz 93731 BLAKE2B d94881550dbd08281226b9869008ea6c4a10bc544a21a5aa17e48d4862808baa92b4805dc101ea970bf66baca1f5a971912601c4b934fe47614351029ece9f04 SHA512 282d1accb3c387caefe9dce7ab70dccfe2ff830c6ec3cd665326ad79076d7f9e58ab2f3061fa262208731c9d1e09e6c52d13075adf119f8b19d6af50e0374556
 DIST hcloud-python-1.17.0.gh.tar.gz 98069 BLAKE2B b8fb2f1c4a3d139225a19599f956a845789872642bc62ec0434f5393e90f5ef64226b6363eeae0b3312084312aac4ddbe77e6e134b0502783e72568f23a71ee5 SHA512 829972585b5fe61aaaa2ee5294c97e6ad4a913229e8d87cec8e00d61480a780682b4eb75e2b9da5962bdb3dfda15b0a81afa74383be874e381a5f8e1a27d7014
-EBUILD hcloud-python-1.16.0.ebuild 992 BLAKE2B 3dd0917dec46e69ef727bc7624377ee988f2e0c81e55686441c9acb379089c68c4f24c8d672688fcc4f01cf081784e6f9062f3e468e7a867d0df2e06be0fe38b SHA512 1d84e62018caae9fc8f55e1f4af7c4eedc5061d3dd718e64189c5507036621909429e0cd5b08ef11866f3b647b2effd37ac7b887ab80e83822faa3d2ccbcaf7f
-EBUILD hcloud-python-1.17.0.ebuild 1003 BLAKE2B 80a8500a3bd1be5daef964218c6a45d33e5072938409e8556c05e5c9282a962dd3015004bd26c722a15edc65fc036f305fcea7b7662154b16e8ac9ba04040b6d SHA512 23d3ef108deeb2ff8c284d9f69c38ed981996b20c2fcd52d6f1b53f0efdb37f08a586ebb9932a302dfda762cfb994a59324e2dc24d43c4e3a614f33f6304fed3
+EBUILD hcloud-python-1.17.0.ebuild 1002 BLAKE2B bd842b951fb091df46ed8c46b991bf25c3b029ff536f203ff125f49411e232eee8086a884eb236acb9060a68a54437e012fdb9ba0f2c4d83f785b317e4b4a5d1 SHA512 a0e3c143bb97edc7f36200cde2607c4aa93e3925328b1946701cb70712fe5d545516395572b799aa5c89932f30580a72ee70238f93b1dd2d69a06191c56f0250
 MISC metadata.xml 483 BLAKE2B c945a22b776b5bf73deabf93718a1dea3a9b98f7257467e845106f71910347a803f96ef969227d7c10a119f1e35b904bcb7501b9672bf3ce5a2bef112d903e56 SHA512 4a6540a06d57eb3bc8c455d982531427157fbf1a85abf4b909032b0880c9e2847b295b3c9b02378be35e88f74876357503dd04bbe544ff9a9612df2b1c321b1c
diff --git a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
deleted file mode 100644
index d7f1238b07b8..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
-SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	epytest --ignore tests/integration
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild
index 16f234d26482..c429f98a9034 100644
--- a/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.17.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 57169a1b1506..f6cd773bf314 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,5 +1,3 @@
 DIST huawei-lte-api-1.6.1.gh.tar.gz 32963 BLAKE2B f159e1dc4cb759c09a88bb763c6ba5f43043eacf025e7ada871c816e0e72a238f9e7536dbc043f8596bef390ecfc2ee137c1a4c079ca33db6c3a3198147c9f98 SHA512 2a6a330c419af0d2b8eeff9d8b93a11cdf8050db04e609cb1d86a33ab770d7102c8e40652482c2500ce4bf4152b66b98ee1fc77be104db8ab9a9bbeec871ce20
-DIST huawei-lte-api-1.6.tar.gz 32617 BLAKE2B 194d2d983e7bd5bd456d3557b16795cda350ea157545c1ce37aa6d4dd0bace8a8a0c724b9d0ae4315e6f95585598b147a03acb77d84837bf879fa9b83737cafc SHA512 62f70853bba0fbd863e07e2d91309fc15c41508857486d01a02ec30ed513567d0880551744eed5a61517cc33a2f56583df892d22cca45124e95e24605ab23678
 EBUILD huawei-lte-api-1.6.1.ebuild 872 BLAKE2B bfbe5cba45ef654091a5bcb8d3dd672b0b81864d3747a3e5e41a2ff4a2f32b957729c9e8217bd6f55ed3007b43bf7c72dc116474434adba9a1504660bdf64106 SHA512 8fd9fd2c890214f14a9fb9c01f911ba46730996529678fb7136711980821b3d9e7aaee951381484cedb0370fb3bf8306903d59210283e0582bdd61b50e099a8b
-EBUILD huawei-lte-api-1.6.ebuild 869 BLAKE2B e3bab6beffb0e617b96619dd7233a0cd12f91933460d4c54463bff6b3e6c10edb5036d0493874a50e92fe879aa8ddae7da9bbcd229b0dabc7b1a4e67e50a16c3 SHA512 866e4bf8ce773ca9684db71e4591063ac7c23e3c41bc79997724e3b56c6addc4266177615125184012312e407abeb2e9b1403d013dac30e5f23e8b8c7f29d046
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
deleted file mode 100644
index cd6657cd97d2..000000000000
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="API For huawei LAN/WAN LTE Modems"
-HOMEPAGE="
-	https://github.com/Salamek/huawei-lte-api/
-	https://pypi.org/project/huawei-lte-api/
-"
-SRC_URI="
-	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# make cryptodome-friendly
-	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
-	find -name '*.py' -exec \
-		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a771128ea5f7..a67d7eb7c54b 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,12 @@ DIST hypothesis-6.52.2.gh.tar.gz 9321530 BLAKE2B d54b97bf15895b503d14629c61cd99d
 DIST hypothesis-6.52.3.gh.tar.gz 9321591 BLAKE2B 50415d463d2513b023b8a6ac87a2bb6dae433b823fd209ec1137a26184bb5550fb9606e006cffecbff09c523fb244b9f8c119e1c9dc765b925f8aa6b0dc43bed SHA512 f8aae5976cc2bd47e157310434d2717caea5e639daf1d794fa6c45332fe44fc5873904451f1fb0b53d56e64147428c4c87e130b4776fd3b14e2c2b961660231d
 DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae741506f49aa1f2b63f81afe3b71d18e0325a4e337bebde1a1707390d38bdf57e2ce1145985231f68557b36c58886d82774a7d9 SHA512 c51f29d52757d08652f83deda48825ca38c86e0bc67743c2cff9c85f52d726671f07d0249dfdc761b2ba8250d40beacdf5e037e8629f24df5baeddd297f38030
 DIST hypothesis-6.53.0.gh.tar.gz 9323355 BLAKE2B 589cd4803351e72cc1896453e5e548bb6fb5f998032bce91708e02f3c8ff5d288ec76d65eeffde5fa31b6b86fbb3ad81dfe3eebaaac841f197de3a07acfa12bd SHA512 ab4de3764ca3ce8e5e50966ea94fcadd85e7c9f170dbbd17383b5516528e091ebfe3b06846513ee77a1f7a2e827236d323c12cc120cac421ec7aa9f3a2ca5e4a
+DIST hypothesis-6.54.1.gh.tar.gz 9324403 BLAKE2B 897fa4901a5c5c0e32c4197020702dbe5d85a5ada79f52b66fc7f19180a32f4dce54f5300722f500fb560766e1ff76b5df648be6be0f229ece4b3aa0af856fc3 SHA512 ba4a7a3f5daa7437e903604d26a9dd0e4ce77d0a44a2e81fec5620f48a5f6a9080b5e5401fa1f7ee6c66d4e1d51cca095ce7e74999b0439b5a8a0c2d26f64464
 EBUILD hypothesis-6.49.1.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
 EBUILD hypothesis-6.52.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.52.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.53.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.54.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.54.1.ebuild b/dev-python/hypothesis/hypothesis-6.54.1.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.54.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index c3aa91e14715..98bfb70a23f7 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,5 +1,3 @@
-DIST imagesize-1.3.0.tar.gz 1279535 BLAKE2B 926b90ad493b790db41941467dd2dd0385f86064fc1ce9547670a52f925965effc9b8b7f61057158a4452cac2223b65dbfaecc34a19ddaf52067a9057560b56a SHA512 3686e513f03cc16f5237ca206cd1bf131eea968015ee4906f620ab1c8932ed24d19881807225a02fa319d0465da4b01851ec0bd0a47146ef914053185bc0c755
 DIST imagesize-1.4.1.tar.gz 1280026 BLAKE2B 9293f56277e40a1ad74a96b2857e46535fd5bd320ab7dee48432762206f29b4f78e64d8713e19ea26c3f405ab6905ded3b04273d04e781f512e981bfe83e3f8c SHA512 f191d7fe34a01ab21b0f4f6519df8ab2a53c1ca54956f4d825d9cec5bd5f4c569491bdc26cb36fcaad2c453c35e51f69379f091362e206453aaefbda4802daa4
-EBUILD imagesize-1.3.0-r1.ebuild 655 BLAKE2B b9c7efdb5914b9ffaee8e02beee8df951ed967e5fa61dc2e6c0eba5d664a9e71a4e74b08b12b66679ece88572c04c9157e181338c6995101b13cd440a0805fb0 SHA512 a6df1d582c405958e4209d577a62296f85dd90c8c9e3d289c144b59362e82aa4df3d2c4d27548cebf4715a6763e8a161bfde9ccf6fdf889272504ce94785b792
-EBUILD imagesize-1.4.1.ebuild 705 BLAKE2B 4f6f0a9a7f1a8f4bb426d2a4e3dd0dbaba6bb55623d9079ff5cc6afd1bb1d79ecb6829f9a03f2fa5ec00266b170b39503f123db38a06717a0ce3fde105430448 SHA512 e395d3ec79f0bffabd4a859c1f6c6b9fd092e853a815cd7650f36457ccb83859a8992829af5515601f9803272a036f11f9683aa476b85c00550b40367cb9fe67
+EBUILD imagesize-1.4.1.ebuild 697 BLAKE2B 36763edafc38166671f7d32318129837a43fa4feced5c21a6a424a7825cb841b6578b0e8d34841fd41c4dffb8a23e9ee545d288f08cbbfbad81223d5d6072cfe SHA512 bada70115f90f9e82058b37eaab7189d4ed469b82b0e1d16abdcb594f492a5725e3926c451fae583d40a19e7773b311974d9fc801130c2e67813bce4c054473d
 MISC metadata.xml 484 BLAKE2B 9edce43c0b06aab59a3094cbe36b90393bf5d0a0eeba9bcdea7ea7298e7d42c2cbfa19ce8bb544022e01124743d877646709b90329796d77e916283398aef3ac SHA512 85d73b13ce95d9647d1afcdee5979fe2802a04cea213468c7d7714b976e191dd59715a93fa522dcd2646d33fd27a43911146c28dc477d9d34cd56cf42cc3ebb6
diff --git a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild b/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
deleted file mode 100644
index 62cddd30227a..000000000000
--- a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires Internet
-	test/test_get_filelike.py::test_get_filelike
-)
diff --git a/dev-python/imagesize/imagesize-1.4.1.ebuild b/dev-python/imagesize/imagesize-1.4.1.ebuild
index 02d40a1da3d4..9a690f29a7bc 100644
--- a/dev-python/imagesize/imagesize-1.4.1.ebuild
+++ b/dev-python/imagesize/imagesize-1.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index 43bb6e79deec..2c6f9cf11357 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,3 +1,5 @@
 DIST pyjson5-0.9.8.gh.tar.gz 110629 BLAKE2B 7a2acfbf1228e8f143a19775750e6d020376d63b2b036eac75be032b7baed1e6b93ea3ee842b0c200db6f44dc0f16f3c6c2f18cb165b24918334a48f237f2a9f SHA512 e1fb7a7457bdc68c33e2d73ddae8913aeec6f001e25a70234f7233d8d28b8eee8dd023c76e26dec0d0a2051e8e2cd731044dbe7dc15af9ec95f0ce806fabac72
+DIST pyjson5-0.9.9.gh.tar.gz 111214 BLAKE2B ccf329ea148e576655b1fb24124c813d31e117291cdfc53affa02542330b11c136cd28e74418351a30478249c8f4c109be6547d69e423c8c7b5f96f77ef5daac SHA512 cd28c64708738484376a03908ec75b30bee44a8834a1e9dbe81be98a6f46ba75600d6f958c6298998f373125589209907f5e8b63714ed6a83bb7a1d27adbccd5
 EBUILD json5-0.9.8.ebuild 571 BLAKE2B 226bf2601231bb5babc121964ebb5284763f601aa56b2745e4de598c427517a4f957daa457dd6f0d18669a34b00b77dea6c3617fdd6750603bf0b02420b11c42 SHA512 45dbc8e285fce034b1ac5ce65d9809c215100009174de06c253263d1282073f31082055bdf2125e279a1d64bdb32f58d7d72afa28f579ce0cefece89ed63aaab
+EBUILD json5-0.9.9.ebuild 571 BLAKE2B 226bf2601231bb5babc121964ebb5284763f601aa56b2745e4de598c427517a4f957daa457dd6f0d18669a34b00b77dea6c3617fdd6750603bf0b02420b11c42 SHA512 45dbc8e285fce034b1ac5ce65d9809c215100009174de06c253263d1282073f31082055bdf2125e279a1d64bdb32f58d7d72afa28f579ce0cefece89ed63aaab
 MISC metadata.xml 502 BLAKE2B 9dc70229a26364dfb51ae26cff9817bcf82c47391d9fe3b6a4b11b79848f786989c62d6c3cbbed9b476da82dcbbbe9e19bf738d860ed423c3c9731c646314cf8 SHA512 257bb6f3e18053e852d693bef7eaba9e40ef5fb25ef449a275a7fbedd9a4247217bcdd016f0b3a93658ada922882bacd723235b2ab46c81dfd8cb42fe933ac74
diff --git a/dev-python/json5/json5-0.9.9.ebuild b/dev-python/json5/json5-0.9.9.ebuild
new file mode 100644
index 000000000000..0a10cb1d1bee
--- /dev/null
+++ b/dev-python/json5/json5-0.9.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=pyjson5-${PV}
+DESCRIPTION="A Python implementation of the JSON5 data format"
+HOMEPAGE="
+	https://github.com/dpranke/pyjson5/
+	https://pypi.org/project/json5/
+"
+SRC_URI="
+	https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 5905eca1ecd0..2d0743f520b5 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,5 +1,3 @@
-DIST Mako-1.2.0.tar.gz 488603 BLAKE2B 30ef597e2dd500d52d02118e0ec8a40cfeeff00604eb9fec887df4aff794aed7d6a1d78b2defb6f985947f9429d912a083b9941ee30b1e53ef32890d19e94158 SHA512 ad608016d7785a735a28ea18f697be4882da747e3da32e4a7c7be4bf846d37e4d3374d78e62ef85607ae9f3f73ee35dc78b473347e4110c059a504be2c497c6e
 DIST Mako-1.2.1.tar.gz 489560 BLAKE2B c8006d5f7a814a1466ad6643200693f014c4a23f284701a9bea6a27246c196c87e5c4bf8e12ae0525563ce60c93944a58b1fa45afc6caf3362aa1d761148910a SHA512 02393054c9e3857ee412f494b01d702b5f367165d2f57a5ff9df34ba1a042b60c7b6c059ce2c53bcb91e3a4a21179eca884ee051bf5f5f3522c05253088d38a5
-EBUILD mako-1.2.0.ebuild 1593 BLAKE2B e1e87bc2dd0ca3e55f799123a9a6543839ec76a0851ee465573cc5bd2b4c313f685c996b1e27852f13379c84a0c15d33a27cc974a26b0074a7d25c844288d88c SHA512 4a6358eb6f6937b8ae135dae83efd5d7f33a7f768c009886d8ae2aae014a7b1893e79bee38da7327647fa2c415e86377185e86cbd1bed2bc56546625efa682c9
-EBUILD mako-1.2.1.ebuild 1364 BLAKE2B f40831532473734d7b85dd6956310da3cde701682a40b2434b36ff1c7ec0a0b75a23c16e0cb65f6e0f330f7a7cdd4abc6daeb74f0b9433b4c7f6ca21553003dd SHA512 20c1bb241db10c034831b7ca4998b170290135331f1683aadecf44c93e39905f6524d29476f0d3e38f0d622c0636fb90cfc25df3198b779be999d1ec7a1f4f40
+EBUILD mako-1.2.1.ebuild 1356 BLAKE2B 4bd5b04fe7f801097f25592c45d6b6af67cda6c85fdbe766764fe2df5232af603f0949ca81a0edbef769186db9fa81c57f0dc3b92939a88df3d0b254dd4044f7 SHA512 65e911911bf6a94f0d132fcc4dddf49cc5e9a3cf1883e341d8da1d5b5894170f51a606ce7b98c1bec36cbede1d4d58227279b1ab6e04646af0722a9574abc247
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.2.0.ebuild b/dev-python/mako/mako-1.2.0.ebuild
deleted file mode 100644
index 16fca49e82f0..000000000000
--- a/dev-python/mako/mako-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# change in pygments
-		test/test_exceptions.py::ExceptionsTest::test_format_exceptions_pygments
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# py3.11 changed tracebacks
-		test/test_exceptions.py::ExceptionsTest::test_tback_no_trace_from_py_file
-		test/test_exceptions.py::ExceptionsTest::test_tback_trace_from_py_file
-	)
-	local EPYTEST_IGNORE=(
-		# lingua is not packaged in Gentoo and the skip is currently broken
-		# https://github.com/sqlalchemy/mako/pull/357
-		test/ext/test_linguaplugin.py
-	)
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.2.1.ebuild b/dev-python/mako/mako-1.2.1.ebuild
index 113cd08e2976..61bedd65c827 100644
--- a/dev-python/mako/mako-1.2.1.ebuild
+++ b/dev-python/mako/mako-1.2.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 2526441f8712..d7a927f40e81 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,3 @@
-DIST nbclient-0.6.4.gh.tar.gz 78101 BLAKE2B 91a653eb1735fe1a43044f18da773bcb0c4afd485fe7bfd3630c8c6a80776c9ff7e4cb08130c4e3953f03832933c429e68d7383677d8e56c54b485d55b8c5469 SHA512 a953b40b314ce104b28dfb9178a004ca4726d8a5912c84c168bf71527ee224082d3910f11040b172b6e62683493978b9b10161b69cadbca48a5652a4f98b5009
 DIST nbclient-0.6.6.gh.tar.gz 78247 BLAKE2B 06793fe792dcb8606d74e85a7a5c4d8f3ba850f81191bf205706e404e67bfe3d6914dff5790c5d6dca62d7797482518b5d87b06da34f06a5cb44a8a0ff6855e4 SHA512 8ca0333a47920994d8afe7c8943b366d4669e7ad91daab1a36c57480b70e51dfd05c7cd44acd2a2005b8c0a6b41c4fe6be0fc22b75a3efe291e9c35dd334643c
-EBUILD nbclient-0.6.4.ebuild 1144 BLAKE2B 73fc09af64e28fb76e971b9bce6850bf52dff38c0156640c64c1238fb4a1748942327407ac6487b6f8096122a0645ce96aec1e58d6f9862675d7a42fa1d8ae1d SHA512 74335ca36c54eab4e040e4f8146388055a94eb5abc486baa94fc005091a5eaf840129f15e058f1ef8f6db8072a5b896860adf084d20531730d5462b20866a066
-EBUILD nbclient-0.6.6.ebuild 1152 BLAKE2B 19fd773a0fb377cb4c48f94ea21682d850095ec7a72acdc8fa16e6fb8b67f354720d00e3290da2ad274204024415f5ff60a5ebfa996a35392ccabc9752dfa285 SHA512 2ee5cc22265d688fbad357d4a811efc6aa53add711ff9c7f1b7874dd72453f9df28da23a42e046e3b58b890ae70abe6647141686f79f641907615344e17da277
+EBUILD nbclient-0.6.6.ebuild 1144 BLAKE2B 73fc09af64e28fb76e971b9bce6850bf52dff38c0156640c64c1238fb4a1748942327407ac6487b6f8096122a0645ce96aec1e58d6f9862675d7a42fa1d8ae1d SHA512 74335ca36c54eab4e040e4f8146388055a94eb5abc486baa94fc005091a5eaf840129f15e058f1ef8f6db8072a5b896860adf084d20531730d5462b20866a066
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.6.4.ebuild b/dev-python/nbclient/nbclient-0.6.4.ebuild
deleted file mode 100644
index 857a17b52553..000000000000
--- a/dev-python/nbclient/nbclient-0.6.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
-)
diff --git a/dev-python/nbclient/nbclient-0.6.6.ebuild b/dev-python/nbclient/nbclient-0.6.6.ebuild
index cc41ec1e5d49..857a17b52553 100644
--- a/dev-python/nbclient/nbclient-0.6.6.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 3afbb6bde3af..b1e290a492b5 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,5 @@
 DIST openstackdocstheme-2.4.0.tar.gz 1255985 BLAKE2B 6066ef5b4fc50093dd7a55d4e7824be9495f8cc9af5f20e1ee7ee5bacea1deb5d1e1a08e408470ba5923de9ece2658dc187bef9c6d5cb767d4c492543bbdc3c1 SHA512 34bc69fc3455c013ba05e6662ea362f0b9ac4070a9e70b34987846eec84197069622fbddd295251d2a363f08303c5a2e9b998b01207bdf6891ca68aa33682c78
+DIST openstackdocstheme-3.0.0.tar.gz 1256011 BLAKE2B ad00a9e5dc0902d99bd47ffbd7cd2cf7900a45f880744293871a869d03dfa449a91402e3eb50071e35c60d78c7858787fa3ae234f96e19f34cc40a2022069ec5 SHA512 0e4c5ca3f43e701692bb56d4e0823b52c55c49e9b4144d3920830903e178522f414930c0a253be415cd6d08534205f2d8e8fac107513bc32d1f667e8559a8c2f
 EBUILD openstackdocstheme-2.4.0.ebuild 607 BLAKE2B f217aa59ade34b83d2cc05fd93051cb81d8ff8d80befe46f5940d980d698142d696fb0f571c65fa4fdc3e5ff811ebfba1a2174d2f017b2978a623ed2bc712a5c SHA512 dba1ef34eb79e8e7a0fb4cb4cc9d8403eafd1ea45c18724770ceecf0b8d851e9e2cd02d910b20093f1405c34dc9727cae5bf7958719e710f6e6b94c7a783ff69
+EBUILD openstackdocstheme-3.0.0.ebuild 610 BLAKE2B a0be16e8abc0db9738c868bf4df5deecfeaf13ed95589590240b9e2eb11a3128361e183236ec093ec01cef930557e2ae309f6e9dad76dce906ab510b38931546 SHA512 cb1d0b0ce400fee9b4fd4f1f57356b8c7dc7005a29ffe97472b220577b866eb1a467c690cf751975df1183f3bfa2854652f21d69f6c82e086a36a3ae3ec091bb
 MISC metadata.xml 740 BLAKE2B d720f5054a6752889548dcff3665b0a02d8f55b05ad96e2783fb2d460d8ab9f9eda52b589c18df1aef3c0eb383bb5b94ab0182f41c0e04fb831b5bd023f1807d SHA512 8c2c6ba17eebf016e8c8e45b0181505d152cf099ab59f4d2c2b2e6447af7ce949ff1cef198253d4a70f7a4d37b19eb5ad6b2feb53ed3f83c54ba850a94d8f4e6
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild
new file mode 100644
index 000000000000..e49accd0905f
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${BDEPEND}
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index c843c1fb0da3..5f0aa3b0d89c 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -3,5 +3,5 @@ DIST pocketlint-0.23.gh.tar.gz 23854 BLAKE2B 2ff3388b639ba29ae60ccd0013cea9b1f43
 DIST pocketlint-0.24.gh.tar.gz 23875 BLAKE2B b4699d1f0633ed6a3f84b97db972818c00a1d382a48648fd4fe6870f4c54f983fd36366f85a409a99b860f385902a9a05adec63199e35d1264a522a7a3086e31 SHA512 21c4055dd42c244760950b64ec4cd9359fc589014953be6f9296e0265101f098fbe34351e87f92630751fa0055de20281974a04b425f691acc4608cf929d4bf4
 EBUILD pocketlint-0.22.ebuild 487 BLAKE2B ddb58387ad3830f65c4b44cb627e86bbfdd4bf0210bd106071fa70a9e3a5fefc1ee0c4ac91fd6bde07abfce72dff455f1a32501e381460a2d192f4458a7b44cf SHA512 96bf0eb52b41e9696c97fb4161ff526fb9f3acf4fc1f3d83fa13c9f0166eec59e93382d3908257950649058ca522bcb1254984c30291dfcd3789db19b7b0ff97
 EBUILD pocketlint-0.23.ebuild 575 BLAKE2B 96eea8110471e78a93387adaf951758d84415e8488eedfab83f2dc231bb89690806750acecec28e3c3a31e110082bf0a51ffbbba271f83ec02246c7ebbad774b SHA512 a6a2693cfe1124ebf8dc7e6d1ed050076b6d3e0b8af45b2ee57307bad0922b1b551cc4e089942a3b2e5c7b77705866fd46c2f35c8cb5df98bbd0539d41ebd125
-EBUILD pocketlint-0.24.ebuild 658 BLAKE2B 07012aad8df4b7bf7cae37f00fb1161204c79e333ee1a77f2508a52a773b17e35c56e0a208a3e1f7bd21c5644af5dbe49ef97de6fdd3bb9bb87289fc187d5c96 SHA512 36ca02a98184b9dccd9b533cc64b309e37284063716d301a85a268edd2ad181554a2aebd942bace70b74805ed370fef6e8aa5d9921fd21d23b3a3b05be380a48
+EBUILD pocketlint-0.24.ebuild 655 BLAKE2B b241e86fc28b436b69f362a48502c3ab54c10489e736f0a4b0a471fa5082283a5f3e87109d3748502895a36d8fffadaab16a8c3b42befef1ef930a62511ceb29 SHA512 2cb9868f142fefa478373cab272f36ea7ed1f96965812f22a3e1eaee8866a6a52f99fb100152147add30e20d5cc1a38186126b5a393abc89c1a2a5092f8869c0
 MISC metadata.xml 303 BLAKE2B fd0ac0ccb8faa5f3e9b7074f238915f2b7babb9dc3af3b1574dd3f98e2970182d4cc0e579f59388601e43bd8991fa7cbca570c499f48060a25bdf8279a5c0751 SHA512 9f916df92044f8b6c2351e094e0ffdee2cf039e4d2d2d101ecc5a5e10af58dd4bafa19dc6cba47af87aaf73ad22abd64b50803c5e77cb283ae12c1f9e1653f43
diff --git a/dev-python/pocketlint/pocketlint-0.24.ebuild b/dev-python/pocketlint/pocketlint-0.24.ebuild
index c6c11e93d7a8..9972b55ac64f 100644
--- a/dev-python/pocketlint/pocketlint-0.24.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.24.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index a30a5dc226c2..f026ea70012e 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,4 +1,4 @@
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
-EBUILD pycxx-7.1.5-r1.ebuild 920 BLAKE2B 9efc0b254e906f85d1f1efb749e9f2e3b469fe482f4b181ade62374dac30e2308f46949062d3894253ba1143e36ec673f483f0a89e30bf82dd1aa752786afbe3 SHA512 10672ecfb951098d926f76cca8a19f8b11dc7206e6cfa8aa66abb23e64644263f43b7f4db1ed19e6b595d9e88f498998599df7037bf7278b679ebeace8d9f33f
+EBUILD pycxx-7.1.5-r1.ebuild 918 BLAKE2B 2f2032f893514c4db0210d5ec8de8cfe51d09cdcf0d3ee8ce45caf90ca5b74cca554099934b8e843b83bfb430637249afa2c7c244e102ab0a34680beb546bb93 SHA512 098471d8b55e3d6d9a809d740366f98fd74a32768eabf5887e786497e9bdac568058ded37359eebb1fc9efb0ffa3547d230936931426635f998c28b51e86b432
 EBUILD pycxx-7.1.5.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
 MISC metadata.xml 667 BLAKE2B 1d5c679b2fcac7f5f302c35517f3903e0b3e3fdf5b65ec0005e0f1b2137ebc2a2e175031100c1bca997a6b2d7aa20ce3642c5dfcd7245c607d70d57b890694fe SHA512 2dc5bce4a24791956ca064750f7998556796af5afdb8cb24eaacd1e6485e6b92c939f053e410507e3fe3d6c29e320061c897f8ea0972ba04e4ed46f60876663c
diff --git a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
index 20eddf8c6d66..b4fb8ce64f69 100644
--- a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index c20d15482bc7..0694aad06115 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,4 +1,6 @@
 AUX sabyenc-4.0.2-fix-segfault.patch 1133 BLAKE2B af92dbd8413437562dbdc96bdceb2c2422002ec29dd67b206aa249d8c6135325779ee7de3a352caca57473f5224efe9b9847159bbc2def927e7769e4976f1dbb SHA512 97e5b4c99091fc8bc0dcb975afd72a70b5a26d46e4543f55caada492ee5da1909b8bcc344592d228c678b6f4ff4df36d4ddf8fe485d23e170be5ed358f943cc4
 DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
+DIST sabyenc-5.4.2.gh.tar.gz 19774424 BLAKE2B fbb954435236eb1794611a8e5852534b0f7dbd79806e8a9ca1bb57274df7cc89a6a26aa92c89c596e0c2857d4bfbd4e4c34f1d529cb5d2464a669d6d15a3f392 SHA512 a07a57e6b3416e147fcef4f27e52fea4b3a522ebb722b4d223469b63e9d08f42689950d86c544a41bfe81bba934514a43094c13b98aa585167cae69a5aa1f405
 EBUILD sabyenc-4.0.2.ebuild 613 BLAKE2B 9c5a2baea3973fa4b1ae29868a74111f30fe0b658d119b14a0871f0e136f918a64ed843f3b40fe8e9f686a299e2bec1f9ff4486ae51585cec1ca5b9d8e3bd867 SHA512 7daaf7d398a057026a075f2b8ca5fed662541dc00d39094012d8a4719e63876f93e0ea66a4b640408fcab5f6fe85f4f0f60bae032f9db9254939d1a913712b16
+EBUILD sabyenc-5.4.2.ebuild 593 BLAKE2B 4f5a8ebadab093b76d5dcd42f78f326846762b4f3da5f8ee1005af6adf519c2d8353ead45df099770f1aed0ca73021a05984e3246e92da85423852253fbe13bd SHA512 7c753abbc9f84041028a160abfca37532228a1191867b5932e8ede3263988671bbbfba7e76b2526f5fb632333eb57b20db9c7b288e0601deed1183a541d79b00
 MISC metadata.xml 238 BLAKE2B 69a87380f32f24cdbfda57721fd4dd89008a7dff64d60dce645f350f6020c1045143178f0e587345dbcf6730b0143dcf9c8c1484f143586548c39ab0d84340ac SHA512 42c9ac3c3d0fbeb78931eda833c52ac6d6f79d43bb6e25f0a88450f51f8f3e15cb3dd39d1ebbade988b5af3c01c63953af95db5818689ec87c0ed60f25a590e0
diff --git a/dev-python/sabyenc/sabyenc-5.4.2.ebuild b/dev-python/sabyenc/sabyenc-5.4.2.ebuild
new file mode 100644
index 000000000000..74f8328f2a0f
--- /dev/null
+++ b/dev-python/sabyenc/sabyenc-5.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
+HOMEPAGE="https://github.com/sabnzbd/sabyenc"
+SRC_URI="
+	https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md doc/yenc-draft.1.3.txt )
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index fb46374a9023..d78eb14b0e50 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-basic-ng-0.0.1.a11.gh.tar.gz 21539 BLAKE2B 31707bc8f3c6cd0c1af1aeff309543889119d33e5f5ae33194b58f88a0ff6ec424c5b876fef36b64161932ebb69c0f6108801697b49d47e10ad13affcf89e1fa SHA512 e9f9278a360d2c8d25a6679134d2d54b37c9f2e55285592fa910c85b2f8bfd4ab13d117b7078cb67d862703f8054c3d3a3ca68152551d67a26d7c1a8b75952ff
-EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 939 BLAKE2B b74d9d5865dbfac8cde9a42fa94db01b2f8fdc7e325a72eba0a37a427aac9c88099f711e1f78f2222df7d4dc8e10557ce4278ef9c138ec376e63c6e3472ec603 SHA512 e1314d676726118f0f62215a957640558da118ee063f4d078c35ce3f93391ed0029106b7b02b6a9ce276292b3bebe064e75e7da235e893d6d22cbef8468b09c8
+EBUILD sphinx-basic-ng-0.0.1_alpha11.ebuild 933 BLAKE2B fb618fab18c3de25ff8ad87170f69843a543614f734abc198f551a01b9a01f7c4e926734a942f8256aa05f122568ce086c517622d7f32c9235b38cf8144d01b2 SHA512 105ae97a1c303ca4689f83395f5018170b13fb0bed7e482d01f0056f9d5b2cd4502ad62711d87e4098966446e505e61b2f2f79b6318b11d6f896bf35ced79d90
 MISC metadata.xml 362 BLAKE2B a93dc662c8ab618397c8d0504342e8f1bd74226b131ea4ca07771cdeb75eb8947451b4353c0da16760f07f935ebb75adcdef4f189ff39e0cf707d03e8fa319e2 SHA512 fb27130b3fcff9043b3ad33e34c92f638cae46d526dcbe77cfe088abf80e6b89992edb1e0b571a5a2447bc6c8ba31ae84776d153067a33b5d6d14326149e7f46
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
index e6f2a27ae78a..e85f3b2aff87 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-0.0.1_alpha11.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index b2d2b0f595c0..99c2bd6a67c2 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,7 @@
 DIST sphinxcontrib-doxylink-1.12.0.gh.tar.gz 22589 BLAKE2B 322fdd0968147abc480a88247ee724daa8c4da4519ff97280af1d81e9f36d4636aca358f5bb1ba08e5ff0f138cf8446194d1fe819a9d18a227eb463b20ee5738 SHA512 7626fad06613a614b5d6efdea088825732571c7ed45f6f2d69f34e0aede020df0930716cb34ca14260891a29aa152019c7bfae8aad729039642ea1c6bbf7d09e
 DIST sphinxcontrib-doxylink-1.12.1.gh.tar.gz 22622 BLAKE2B 2818dc9e155156e60a23183ac35e72b51f316e5e3a8f08379236a141436bbca4fee2ad534a391495dbe9bbc7c0d9f32526f5646592d16c1610121c36275a4c27 SHA512 164c523d6fb081d2ee70fa249901eb0fa3233d20a2ba73b52c4f7bf5f31c3f088c0420e39ace36c66a65fceccc137d6d62c28f7b7b58f3fbf96a3f2f73372fc8
+DIST sphinxcontrib-doxylink-1.12.2.gh.tar.gz 23556 BLAKE2B 8d71de83ec304bbf2a74f414c46d157367fc950dc52bab7f685fba24520985fb06daf8bf760d49d73d7a2418da346bf6c84a493b24edef4ab53c5c09799f7c2e SHA512 e90594031067eed0eec1c7aad9c7d2ba7d9a4ce2012a905f6631947a7135659483d52a6261b923d3fa21fcde59ae8bf24c168507c8e95296e0539595e9589ed2
 EBUILD sphinxcontrib-doxylink-1.12.0.ebuild 1059 BLAKE2B 798ed1bcffcb23faffb634d7abbb27289989f0923ff76641f6ed15edca7ed2fa3eaf3917bf15592d93ee6d70ef24cef00cf125309635f7285a6bf1948ff88497 SHA512 09b4ca6a2fd0143e7c529540498918afdabbfac99cefa4a7bfe01c3419724249a99b013956bf4137098367d7bf68462bb5e1482c8458e1760a9ccb9636d7a1ce
 EBUILD sphinxcontrib-doxylink-1.12.1.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
+EBUILD sphinxcontrib-doxylink-1.12.2.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
new file mode 100644
index 000000000000..a6360df99206
--- /dev/null
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension to link to external Doxygen API documentation"
+HOMEPAGE="
+	https://pypi.org/project/sphinxcontrib-doxylink/
+	https://pythonhosted.org/sphinxcontrib-doxylink/
+	https://github.com/sphinx-contrib/doxylink/
+"
+SRC_URI="
+	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/doxylink-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-doc/doxygen
+		>=dev-python/testfixtures-6.18.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 714c43859246..ba763b55b8e8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,3 @@
-DIST tox-3.25.0.tar.gz 307073 BLAKE2B 2dda34fc6d6518897bdc587ca6a31b92f2add463c3bcce9df3f4e511d2588dc75265b60809195c2d78a9c1b0d08d79c32811aab1e2c01934faf40019a1882042 SHA512 9c10524c5a67b32a01cb0dd4d25cc01d0641e46ca4e0c03a4c76eb8913f6038075aeb21e647a94d6b8d99c80edb7701b1c62893ebd6a20584121fdf33b9d9010
 DIST tox-3.25.1.gh.tar.gz 307697 BLAKE2B 2c778df22388b101e6e68423636c9753f0e6faac2360184fd6b9022dc3bbb5662840cf24e7907dd4c652f6401723be3be35bcdeb0f290f9839325babf5ec776d SHA512 e0443cb72378fc18c9bc001413261d9bac2d6f89bb0ebff618a3848ffd5b02c80902cefbd90f7b0d0e3119f1df3cd22b46be23077db0ee90c03a9780ba4b248b
-EBUILD tox-3.25.0.ebuild 2184 BLAKE2B 4e0f8e9386fd2cdfa09d0e2f506fde89b2e0aa3fd12f9fd787478eaf8a45c3570e6c5da73b546d18744e5b3231cb8be96dfb29ecb93bdca26257cbe70757f95c SHA512 0529e0b5ce6819e82e2c4733234ab9a459449843e45d3296a3e0836bd795f279aa8bf109a65b7a673f9370b6b312b42247ab6fab886e8e225ea218e89e7849bc
-EBUILD tox-3.25.1.ebuild 1872 BLAKE2B 7876a07bc579ea6f6e0e36ed0ebbd6e71fa04334c99b7d7a0a961176b432d7d16f3620ef2689cedc91a3b97c03f4576c8cf471e47c3d272c5dcd1a11bd21ad2c SHA512 7363bd617c4e9c8f92b935b1fec3ccacafff89602ab5e622271f94c4e94bfae3c49affbbd7699dca057c89593d1baad76e04c0a5e3c76bcd50825394ee8a2e4f
+EBUILD tox-3.25.1.ebuild 1864 BLAKE2B fdcd8ed6dd3f83b1feeee06ddf30f0d5b5888f260b14fb5066d4293c46601e7c0f38389ae6e951fdf846260c78da68217d8a7505ec3bb48d9686678ea54940eb SHA512 17afb27a345739b9905a567f66d5e2188a9b6333c7690b88590fb2006f14998717e88eafefba3ad4eb943fa540e0f843340c2c964f84016b093267544d34c482
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.25.0.ebuild b/dev-python/tox/tox-3.25.0.ebuild
deleted file mode 100644
index 469205b08b07..000000000000
--- a/dev-python/tox/tox-3.25.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# fragile and relies on checking stdout
-		tests/unit/util/test_spinner.py::test_spinner_progress
-
-		# TODO
-		tests/unit/test_z_cmdline.py::TestSession::test_summary_status
-		tests/unit/session/test_provision.py::test_provision_bad_requires
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	epytest --no-network
-}
diff --git a/dev-python/tox/tox-3.25.1.ebuild b/dev-python/tox/tox-3.25.1.ebuild
index 3bbaa66f67b8..cb4f9d1950f3 100644
--- a/dev-python/tox/tox-3.25.1.ebuild
+++ b/dev-python/tox/tox-3.25.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 8c99a663ee97..7cd2ec2b80fc 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST typing-extensions-4.2.0.gh.tar.gz 77169 BLAKE2B 3b7e91d0b410daf749d61213e8dc2bce069c05db7626a6c3a380fe1955ad97871f3c90782a8ba5114b11c42e0775558fd6fb1fd28a7cc0fbf2ec97480ef72298 SHA512 52e67eaeb3159e5effdcf180fc43d9881453c7efc00546335a8f31d5f7ab9859c2f89b29612861015ba490cdfd596720aa577630b424323256930b036b119776
 DIST typing_extensions-4.3.0.gh.tar.gz 47842 BLAKE2B 23a600dcded95a1109da46537bab49a6a478c77334d7c9effe65564bf236371c413a07220df3fa1de1bd0451e90961df908e097e7c7cb6d2534102369ce2590e SHA512 3c4a9073dc89e71b8027d535853d35725163961f7feeaba817e28f93b236bcae805d9b1f6e2be8e9fc3651c283b662935ba0352e5de25ff74df4dc18373e8f7a
-EBUILD typing-extensions-4.2.0.ebuild 800 BLAKE2B 3a6eaef06790c8545f8b3fd14bdf3687cab9eee3c6c58891bf0f560413e223fc2adc4bcb3dae2b3c68f661bf484ef8f8765026edbe3bd65947d85001f661af80 SHA512 3af6e1ca2970b3adafc8029245bc6c2c205c32f31f201158ebee9aa1913f00e791d0106b94f45f5737620936411df6245b7bcd16ed763e8d6ac80421e496bd6e
-EBUILD typing-extensions-4.3.0.ebuild 813 BLAKE2B 206e7767f8d97c7e48e19295860927ff9148e844ec149ed106c0f743666510bdab421fad73419185cbd0a31def3ce853a03dd9a24a3d3d8e5607142498cce156 SHA512 d75acb730e92287ec246f9e8c8ab7accd46d25a6ebf646308da90cc642e4998148daf0e4ebbcd526293d6ed3fffdb22bf9754fa7cfdca8ebf7c8d5a8c6eaa64e
+EBUILD typing-extensions-4.3.0.ebuild 805 BLAKE2B fe189765f34b25ecb1f6ca45096443c0c6279c2dbcf1fa29af2516164881667bb3f9f3cdbb256fb706a4c307a14260633f1d746fec6da27229686dd538b06768 SHA512 5b59105395456f4693e0ed804a59c32013a3c8cb11135f3a9b0acd2798b65288efd2a180fb09c7ec2e9fd62ce48c954f369899522f0d6b0d33eff7ad7d3c94c9
 MISC metadata.xml 409 BLAKE2B f2defedc04bc50fcdccb536be53f5148d2630bc235437d9c2ab32d579585e27c108f87d22cc9b458151e742d2f6c0788ae993fcbefe247295f2a572d8648ffaa SHA512 be8e74d9c73f2e4dfce9728cb06c3bc56ae35120e3388fc232da3f4cff17367775401805f63fecb74397ecc7ae8340d68dfa271cd06ed2fb03def8d155262d02
diff --git a/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
deleted file mode 100644
index a1cf51297725..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=typing-${PV}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing/
-"
-SRC_URI="
-	https://github.com/python/typing/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/typing_extensions
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
-	cd "${S}"/src || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild
index bffecf85e95f..00720a9bd39e 100644
--- a/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.3.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src || die
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 12e422a48a33..f3a5cdd6118c 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,5 +1,3 @@
-DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
 DIST vcrpy-4.2.0.gh.tar.gz 331096 BLAKE2B dccb9310da42c6f75d0d503cb64aa09876447098bff2ad6a1507a0e0907ce05a89d46ccc159e79f310e027fc8f3075b7474274ad39ca4778acbc6d2a8f633004 SHA512 61eeec585fc78be1ae6d4f9047123c9680611e436bb5980fb7c6b885e16b2ef9bd5ce921efff7e87a222b3662c7009dbf0a8df24cdb9849d09deb24957ba4889
-EBUILD vcrpy-4.1.1-r1.ebuild 1798 BLAKE2B 93f6511d7b8f36910b79d61fd68333e2c1b912d099c011e2eaa6b8bb33462b640f7b319ad3e110bf826892507e9413e0c9e364cc92f8ef70829562f47f423750 SHA512 2ac1af65fdd13d862898dde4771f7dc5ac1e3e9c1236e85c6be171c13dc54af9445a59a33cf8bdc6e5a84b290ac568630d3296b8791b1ae14185196232e33049
-EBUILD vcrpy-4.2.0.ebuild 1593 BLAKE2B 359d63051ec8151b5a0e02ae9fa1239741ee86e9aae3f8f1a86983493470f8346b1597a85999837254fde55c652eecc29f6ee38ef467d261db05240022487159 SHA512 a3951db7a796f14771f758f00f7f4e49cb408dffec886a8c9d44bcf9460e6c647646b1b202207b19ea7097b6c86993fe25d83a7f2d1401a3964d4ce4a99c3b0e
+EBUILD vcrpy-4.2.0.ebuild 1585 BLAKE2B 4329d7fa8facfd83c46263e1f0e8993204f36e5be316e9e960b5aaa82542fa72e0a176a5c8614ea5a410b58b916658c08ec779f369f2c63232dc4d484db98003 SHA512 68a34453060fde72b1dc7addf00560ec39b1593bee154a67c708b97011969f8485f9d2e104097b658d46efdee6f293d183dab16cd718ebf40686cb4eb509106d
 MISC metadata.xml 388 BLAKE2B fd31293bd6085e6a93816a1813a8c3a9d046ed3d932fba5b32b454a71e7535606ba92815699b7ca10fc837b07a5335df54d5fae8c860a7ea88c6ea72891d0620 SHA512 0360ac6f113035ffd1991d2a42000f290c9d0a3fa8c4dac9abfde0eecafd23e1ff9929d8ee521f83a924c523992fabc5cb4353079bf7c52dac9f906a31d4da55
diff --git a/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild
deleted file mode 100644
index e1d011d9d398..000000000000
--- a/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="
-	https://github.com/kevin1024/vcrpy/
-	https://pypi.org/project/vcrpy/
-"
-SRC_URI="
-	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
-		-> ${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="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these tests require Internet
-		tests/integration/test_aiohttp.py
-		tests/integration/test_boto.py
-		tests/integration/test_httpx.py
-		tests/integration/test_wild.py::test_flickr_should_respond_with_200
-		tests/integration/test_wild.py::test_amazon_doctype
-		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
-
-		# probably unhappy about ssl module being more strict now
-		'tests/integration/test_httplib2.py::test_effective_url[https]'
-		'tests/integration/test_requests.py::test_effective_url[https]'
-		'tests/integration/test_requests.py::test_redirects[https]'
-		'tests/integration/test_urllib2.py::test_effective_url[https]'
-		'tests/integration/test_urllib3.py::test_redirects[https]'
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest
-}
diff --git a/dev-python/vcrpy/vcrpy-4.2.0.ebuild b/dev-python/vcrpy/vcrpy-4.2.0.ebuild
index 8f48fb71765f..d7b461c16f56 100644
--- a/dev-python/vcrpy/vcrpy-4.2.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 330996afedaa..1e12f2875eb9 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,5 +3,5 @@ AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ff
 AUX wxpython-4.0.7-ultimatelistctrl.patch 4121 BLAKE2B 0fdf74a0131c9d5c49dd867c3867ac212d26f4d877dc4f4e48680d90956c1027bbc776d19edd235d8f1e4b619d616c4ca1ab28b45a3b2dc79aa97a59c48adb2f SHA512 9d766d9724613e269215db81ecaad7d836b65c4d17f8b522bd688881bce1176241965d05539886da42755f0c7be65ef55c4ce340c21fddd512abb6577ece5482
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 EBUILD wxpython-4.0.7-r1.ebuild 2311 BLAKE2B 563169aac0ee52d5270eaaceb298d19aca4c6ba00afd96a7a43a9474f21733aabfc91a4ce64c7d52f0ee57fa26b64b77cf2a8d556f08d2b226db9cd8191b11e8 SHA512 dc2659b721faa6f3c9d36cc05659eb6350efa9e7fd6c633be6c67487cca2cc93ab49bdf7a8f43a994d6873ae82a9c773c4f0d9724240a26e405403488977c8a4
-EBUILD wxpython-4.0.7-r2.ebuild 2370 BLAKE2B 67fcfa85c57f917bba174c34dc9a2572fa1c25f1029c493a4b38e66ec90b917c95df65226b7ec6830cfb046974e999f8488cf8ce5cca3a370ccbac0a877ef8d8 SHA512 1d19e718f80238a9b67cafc4db3c47f5604dcaa71d98f3391a5c6afd39a9c097f6ae7967bd863294cad14c0199dc91ecd992b8ee3e3a15de5a197680ef4c0361
+EBUILD wxpython-4.0.7-r2.ebuild 2368 BLAKE2B 0b0152c56e3273cab07e96d1dcd7f167278d7e67352aff6fdf5522d012aac5ded9bec3e046dbdc2cee34acb6dd9a601fe17c5da82998d6ebde7f1187b50280e0 SHA512 1d93f8c1acac4dc237f457f38f53101a1d267a229ecdefc91497c0eba840c5f569ba9f4c90e8fce820ec17ad837e166335d45cfa8ab35e03a2baeba1d151e676
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
index 2e17a2286297..04ef05084fb8 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index f83c99c28f8d..dbf2bfff8c36 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,3 +1,5 @@
 DIST yarl-1.7.2.gh.tar.gz 108115 BLAKE2B 7bd212b652a77ac29fde4c6565c48c4067f2a24db6bbf735107f3dfa5ee8b6ad2e5a5c3c6206e8dc7692e4cfd5c975d4304dd93280087574bddd73a337417c52 SHA512 bf69c5758f523259757ff84a8737e28931f46311f12f6e141329a5074d34a0cfb45795bf79cb7b78cb676ca7bc38042a2fbd946a5f41bf1d149ada50b88b31ae
+DIST yarl-1.8.1.gh.tar.gz 109912 BLAKE2B c7390b78abb5074dd29e96848a77fdb31f6224e99d2bcfd5a28a8bd08881f5ff82cf55b2f54c97324d005a0fb3823732a9ed6bd3f1d837e4ac2341b89e2adb30 SHA512 267523216832c2bc83d92a42e621ff519d427e20c1ee84ac657e13f696a2df2259c837486f192d87944f5ebb834beea60ace791eb4c9c632fd7e552eb5dadf1b
 EBUILD yarl-1.7.2-r3.ebuild 910 BLAKE2B 68d8fc7b158dd40cb8dd08f9a2b39544b17ade53772f742ddf951d29dfcb55daee99bada90676a797d8ace257092842d72cd3cb3abfab2fe99203cbf6d4b0a88 SHA512 ecf4dcc5136ed7fa3c2a3c937d61466993cfef4e0408086a253340deabe8f46e9cfe56bfc8cdce8560cf12ba84d9904515ec4d783ed85d49ac04daf7ac01ba2e
+EBUILD yarl-1.8.1.ebuild 918 BLAKE2B 72373c54cf93ea0df89c030684cc0975fcc9aa6c508f10e19ef08dd4acd404477bc6cd2cfe02f6b334ddead19683f6416750eb9ecda206093a29b9d39253af4f SHA512 12460e120e522e3abb3355d0331e63ecc9c93a15e82219efde14c2afde343678e418987adc90d9e5a9ebe759ab9aa26d7918f58bf50a630651bf6433d07a9054
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.8.1.ebuild b/dev-python/yarl/yarl-1.8.1.ebuild
new file mode 100644
index 000000000000..7ea5cc25c82f
--- /dev/null
+++ b/dev-python/yarl/yarl-1.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+SRC_URI="
+	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_configure() {
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}