gentoo auto-resync : 13:08:2022 - 14:24:01

101 files changed, 825 insertions, 886 deletions

diff --git a/dev-python/Faker/Faker-14.0.0.ebuild b/dev-python/Faker/Faker-14.0.0.ebuild
new file mode 100644
index 000000000000..d8e24e8d32e7
--- /dev/null
+++ b/dev-python/Faker/Faker-14.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 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="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index c267e6c37e18..bc4d2934f527 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,8 +2,10 @@ DIST Faker-13.13.0.tar.gz 1528907 BLAKE2B be4593ba271330822f10590aa8e15c4658cd8a
 DIST Faker-13.14.0.tar.gz 1529502 BLAKE2B 57c5182742f4383bc0590f953dbf8de7075b331da8d9893b84149ce8d3004e545acccf9f113d94eb608b634d9ad42a466d813c5f0311e037d8977fa04eaf36af SHA512 05edbad684a89b0cb4df4965be63b43729047075eed98de9678d98383b28d2ae6d3c645c03ab86d7bc935160c1ab744494d608749213322e318b465c0d47e9c7
 DIST Faker-13.15.0.tar.gz 1531111 BLAKE2B b6e91f7e47f5040894647b53eff92ddc8384fe9edfe19aa4d3706c2d5e54100d171b37609968bba068c89d9c946f92b5966b9e8f502863ab3730d9857a342853 SHA512 6de6de872e19f82a716fdf10f594e3d77b160bde46e7c8d20610621728ee3e555b4090835dba220da96d98db5eaac8c0e4290786441441f220b7458f442b99f3
 DIST Faker-13.15.1.tar.gz 1531442 BLAKE2B 890bcf69ebcb97f8d7441e7b899ed0fec851b5f291a03606e3a3cb6dc8838522fed839b77fd6899122347fa3c8cef14c0a0f6f1039b66331ab2263bc4675d378 SHA512 e405ee0cf1aed0b3c01f60bf10f5e72c6b55977deb9b004875dbb5eb5cd24da1b979cfa9234be30946a640ab21fc1d95393c15e2bf839bef373978959f7eb784
+DIST Faker-14.0.0.tar.gz 1536015 BLAKE2B e3d0f5745203ac441bb4f4a4deb4ebc9045f532b3b0801e8d6904bd0e68bc2fff9edc9a78492051c9d7938121ff74d307764ef5be266d3c0afe4f1212c52968e SHA512 7b0a2558e050cdaddb796bdcec458a3b43eea605f8e8a74e2949870fbc5e0ccf11cf7ae7f1ed01629038a2125d853e26a8543479f1b7f7637e02a1e3af5c577b
 EBUILD Faker-13.13.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-13.14.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-13.15.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 EBUILD Faker-13.15.1.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
+EBUILD Faker-14.0.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d760ee589ada..14bcabf5e05c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index da6df662cfde..3eccd5ea5c1f 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1,3 +1,5 @@
 DIST audioread-2.1.9.tar.gz 377500 BLAKE2B a90d1d7531c265a8c2b7933ac0bfc00fbdf298546620fef3ccae0204fc1eedcc584bf2fdb79b1bbda81b29d03346abc236cd0234684ba3cc70642f837033ab99 SHA512 ad2260b6931cfeebb815d48221366a2a5d8095965ff18e94c5eb0809d9a1b02e650a62ad5e895b7f1e003771fa3babf56f59ce4538aca78b678566fd28327290
+DIST audioread-3.0.0.tar.gz 377038 BLAKE2B fc81bb2459b5cb5e028abb7c6c963c9d731cc90f79108a40b5aafc88ff6e3c09d23d7ac1555566d2360d22015d75ebead6beb72022b1e0e654fe469a75a5ddd9 SHA512 c9f1e5206df998ad9d112dd4b75ae41cde01271485eed27f62feed89c5ca36d4bbce7a888498d3c20d85e8b50de6ef263f795eec164c4bd348d83535b66c38ae
 EBUILD audioread-2.1.9-r1.ebuild 898 BLAKE2B 0fb36459dbaa361a3e3903c4a9f473b16806a91a6a3a5bcb9a61cdfefa4f16a55f869e9828315f91c4ab6b2db2e3abc3de27e5433406bbd1c8c2d0d1428a61cb SHA512 12a78ccd68eeeec1296c05221f5278f10b85b69450f9e717ce706f054256cdd30d767900f78ddff1d7341e8c8323dbd3f0de4894111d2781af8f9dc339ca9d77
-MISC metadata.xml 639 BLAKE2B 13d77444ab3bb26d8fb4c96cd3155e4789a7426fbc5f107598758f299c8d6524730d9f52ec31c99cc2dfb5830f9eaabe7c0632e70a51b6948e1219a87099b39d SHA512 4236cc1a5995a3f38e0067e56d7d3ff35596ff9ca359b9ed06028585a6ca7b20140112b28bb3969fb9b8a4702b09b61ba11b61e168c65ca4fdd4d74cc79e28c0
+EBUILD audioread-3.0.0.ebuild 802 BLAKE2B 15efe555a709a82bf80a73342c69f98e0ba3e1539b2651e0d2e16a4be7787c3c1d7988e6223a9818b7cae63c92046bbdc79fb3bf41ccf3ea9936009a11d6487d SHA512 5e792ff74ed24972f7a87659f57887e4aa4d667bf8458af8e64735276531d191341ad6a254e23c902e57ad4af7d87cefdcf2090617a1da3d11ccdf4e8db4ecc4
+MISC metadata.xml 639 BLAKE2B 2969f89dea774a5eef189f309ba1dcf1ee2ed7f31e6e7c5b1482bec5cd993d4293943ee974b610469a4a9bd92017519af47834c4cdcfcc39b04e76bea0df5ef5 SHA512 e611d2824a8883bb03b528374770e424d2d99988f22a5f30bd7e7e4378a1f3cc6704bd46469eeea1ca1d7a0bfdfb085d8657a5bee034bbc52e275bab716f5de0
diff --git a/dev-python/audioread/audioread-3.0.0.ebuild b/dev-python/audioread/audioread-3.0.0.ebuild
new file mode 100644
index 000000000000..d17c0e0ef106
--- /dev/null
+++ b/dev-python/audioread/audioread-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# 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="Wrapper for audio file decoding using FFmpeg or GStreamer"
+HOMEPAGE="
+	https://github.com/beetbox/audioread/
+	https://pypi.org/project/audioread/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg gstreamer mad"
+
+RDEPEND="
+	ffmpeg? (
+		media-video/ffmpeg
+	)
+	gstreamer? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		media-libs/gstreamer:1.0
+		media-plugins/gst-plugins-meta:1.0
+	)
+	mad? (
+		dev-python/pymad[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pymad[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/audioread/metadata.xml b/dev-python/audioread/metadata.xml
index f3656deb86fe..24815496d8ca 100644
--- a/dev-python/audioread/metadata.xml
+++ b/dev-python/audioread/metadata.xml
@@ -11,7 +11,7 @@
 		* The standard library wave and aifc modules (for WAV and AIFF files).
 	</longdescription>
 	<upstream>
-		<remote-id type="github">sampsyo/audioread</remote-id>
+		<remote-id type="github">beetbox/audioread</remote-id>
 		<remote-id type="pypi">audioread</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/boltons/Manifest b/dev-python/boltons/Manifest
index 6398ef047bf0..ed7283da962e 100644
--- a/dev-python/boltons/Manifest
+++ b/dev-python/boltons/Manifest
@@ -1,5 +1,5 @@
 AUX boltons-21.0.0-python3.10.patch 3393 BLAKE2B 24d9bf2368a0716332e85222fcf8965b9633aa26967e9f9bac6f5ee31fbd8aa71dc2e24bfeeaa6ad766511f8f09a68a1b4288fa66b9ab7ec58f1e01453d5adae SHA512 3db60c0a2cd8680fc58151ad788838b6d795c16b5162326382aba883a7fe86a294cc1d490d40ff40ecd3eecb37e518c85bee0c67910938e8d3623f0dc5f6d6df
 AUX boltons-21.0.0-python3.11-tests.patch 267 BLAKE2B 03af16f7f058094369f97aa4753833cfd43a0f0da7dbb6a423b3e4fb8b4f52692d993f22449232d8653075f1031d07a25d4a3a7f8d71268d62ba8a62562a1b81 SHA512 de99f35ed56c50122b531a9750225d5135d1b429fdb4a8312d04e4c1cb9cfffeaeec08fa718223d3e1952656f40dfb0698f40c855d09e9db63832c5be0ddcc04
 DIST boltons-21.0.0.gh.tar.gz 241010 BLAKE2B e8c7cba3aadc40fbf40b784c8060d7b4f9d89457a4416c8fe9c733c3a35cf292609b2cc4e43e20a1308add6b854c3e00cb55274328a14699b3c704b73c189318 SHA512 5f5d642ab8ce0bc26133f4bd5059071bc86ca8e6619ebac796d522a0e4c39b958176ccc9de9a56e0448b24bdcf569e73f51011d5a9fc875bdef12a363f106018
-EBUILD boltons-21.0.0-r1.ebuild 947 BLAKE2B 5bfcbdb3f381f6ed43f83ee3b6f9556798fb0b36724730f1a2a8d6d747eb03a38ddbb757e4546e3526f62482c3fa185af98c631a4bf9af90acd48b9a0d81cb84 SHA512 2e159cd7a830e900b62acbaaff27a52518fd64f5dc3b9b5161679b22cf99526b89006af67e88f6ad4c1a3d8e257f397dbcc1432ad04422772fca282b7ab8fbdb
+EBUILD boltons-21.0.0-r1.ebuild 954 BLAKE2B e9da5da497895d84c33205225ab95e02c46de9d4ee3f5c0f4e85a22ddd57193748b67488f29e9ef176dd2738644ae00c2251f6e99493cd04c8d011a145d65261 SHA512 407091107ccc5ef76a75d3d78de4df5368927e46e3ee616db0fc65c46c8a341b9cd82d2341b0b5eb9a003465e5a11dcbecea3423ccde36f8e96c3033f84ee263
 MISC metadata.xml 395 BLAKE2B 6ed304f1dced75dfd795b9fe582ec669bf1c8ba5fefeb9e753b11aa20de8fc0966fc9a8a0ed40e460dd23a67ef0e5721a8dae27b3d799a4be629537bb18f54c9 SHA512 fb73041a95df230153dc686e21a88d91bb06367ae8c22a20777c4a0f13202cbaf59396f4ed2630265d331d6461a6da85f57ba62cc432c4d9105b8404753b383b
diff --git a/dev-python/boltons/boltons-21.0.0-r1.ebuild b/dev-python/boltons/boltons-21.0.0-r1.ebuild
index e678486c2262..491a101fbf8c 100644
--- a/dev-python/boltons/boltons-21.0.0-r1.ebuild
+++ b/dev-python/boltons/boltons-21.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mahmoud/boltons/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c50165e2c788..4021c9bf21c5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.24.46.gh.tar.gz 524945 BLAKE2B f26235fb6993a9dd09fca562315c8ec7003f
 DIST boto3-1.24.47.gh.tar.gz 525452 BLAKE2B 2c191fb2de8d03f1529a8b9c7d9cb6c21ea86415108c79dc7c06071bbaa1d94c491ca05348877dc8352094c626c60a6a07e336af4241b7bde1154a4ebeac371d SHA512 dd3807ef9ef28a5c6bff20b801a33ae9c150a6ff57bf4af645d8d6a5de05e8507289b9714190ca1e80400c637cd1761a2c568453d2d7af24e71ace93d3e5355a
 DIST boto3-1.24.49.gh.tar.gz 526085 BLAKE2B 8372c65dbe92fee877a9aaafbbeda6ee6df672e431e40e139ad5cd852cc15d2d6add34de0b8c34bdec8d39947940891b949d1720425e1311dc5e45f724a89bf9 SHA512 baea5b18407052b9391d7e5ad3efd124d1448f7fa7e2f89bfc04bc417e395035aa9d2cfbbaed822328baf7f81dbed81bc3c66dcaa66598a97b53c8c08cf61366
 DIST boto3-1.24.50.gh.tar.gz 526501 BLAKE2B 4ff77e527a990be760296471f6695eac1604926ae7814034c6ab840b6796d881a02a9936639dcd08daeb472fb27b964f7abd961f079f7961a4a624f7987fedb9 SHA512 9a2c3dcc7ea595c8d40872d59dae7459d401a9f930c542925829ceca6fc8b9846acf4cf67710777756b983e2eea85060488d001f3a948ec3d2f7cdbd617c1f72
+DIST boto3-1.24.51.gh.tar.gz 526840 BLAKE2B e796ee5c68260b1b125e658b80b74e2f76e611b4e317abf716a9b42da74ede88a17032d7035585bc92e029a1a8236443faf9aa2c52c541e421ee98fdf78e9769 SHA512 2f05f422dbe347940ce2fef0d2a55b79f26077237b6171a17f77dc5e97af4b9d796748ef854020e06a7f8e895b462eb55a4b1f9f1f02b20a68fb3ee4bbb76bb3
 EBUILD boto3-1.24.36.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.46.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.47.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.49.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.50.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.51.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.51.ebuild b/dev-python/boto3/boto3-1.24.51.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.51.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 8663d56dc749..98d9c56c72fa 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,11 +4,13 @@ DIST botocore-1.27.46.gh.tar.gz 9502831 BLAKE2B 75b4ada461e43573c202efdf12201dad
 DIST botocore-1.27.47.gh.tar.gz 9506174 BLAKE2B 9fe05af1b1cf7df90c61e15c0ad8a701082a15d206830167f8fa2cfef79538b99928442a9e007eb8f92a5d20513eab096a84a97aac6d8bf0a9adcce3cb50cfb2 SHA512 043bba6ed1f5987dff759c67faaa9ecea16cdafc1d48fbcfecaca393530a298cf31d990bbade4db1d149acc49ffb0dcc2d1eab46b77a4e5eb59d3502c1066889
 DIST botocore-1.27.49.gh.tar.gz 9510394 BLAKE2B 01a0f2dd80adadc3bc1acb3c26e3280171d11e0e1bd14535214aab7b01a5f43c7f707b6396a83a77edfc417c2047ca2d11b52550321acd88528c93a02250b079 SHA512 30f9891eed6277cadc3379f23214d08caab917114bceebd3400c64f8271d449609b9f3bc31c01976e705b565d136f8d1fab1f0bd3ee2870880703d6b40244f1f
 DIST botocore-1.27.50.gh.tar.gz 9519905 BLAKE2B 2a44bcc5c66a4306884683f9da022750114568b7ac061c65444d329432e457b38d65db06c25526932f77eb43fe822c221a87cab643c3d3492e15325e1546a8ff SHA512 f7d8445d6510599c2c5459bf1d93761698d5b0f527ac74e5bee20286d2769dc9a1998ae9577a740a9a7cf7611843dd90e193db144f8f788b13c017fd7a641957
+DIST botocore-1.27.51.gh.tar.gz 9525092 BLAKE2B c38085ca15f4dfef1853ef40cc7fe09ab1e19efe8f680e7bf5a1d586c3519ca48c43432ac534fc24c7ff9d4630136cda7782af82b3b7d4a4bab5f726419def7a SHA512 67b2bccfc2fc92edd8397b02b5e5bf896ec09b6b826c9bab6a1dcdc523de78900b0204443a862728384bf0596e2c79f6fc27ba3a95c3556e7e10c6ace941afe1
 EBUILD botocore-1.27.36.ebuild 1610 BLAKE2B 19f47b6c38de4ffc3a0623bc006b257260abb255ab63d084bcea3552b403d504ddfbe7191494aa8dba8d19a445b55c9dc6c977bf5f0877dba72a3ca69cdbff43 SHA512 fcc38a1393610e2eb729cfbf3a9f579ca840a8e712fe2123235cec4aefc68c96b099821282a68de737bef5e2d1f1f4b00e64e1665985f718201909e1b56994bb
 EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.46.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.47.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.49.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.50.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.51.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.51.ebuild b/dev-python/botocore/botocore-1.27.51.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.51.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/cmd2/Manifest b/dev-python/cmd2/Manifest
index a7df13ccbbf1..b7fe939d112c 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,6 +1,3 @@
-AUX cmd2-2.4.1-py311.patch 1303 BLAKE2B 611d6270470b838cbe7551ac1019323217e7f3d68efe9c17d81a09a2124707f63af51ef5ed7adf0b3e8e6548dc7c55f5d1be29258f5e44d1be03d59ba583b482 SHA512 1e7893e4c2c0286dfe29d7688200a1878069cad46ded7d4ba8921944d47a5e3626324a5cb59ba38ecb20d8bfa87ecd5e5105295595982a33f44a3cd4ae1fe887
-DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
 DIST cmd2-2.4.2.tar.gz 677598 BLAKE2B 38b767e70d42125639578a906a6bd0ac737ee1e3be2951b122f91a1a2bfe366ea23db2d7d7350842b667aca7614a3520057f689cb1c253d1c4b11e164c2ee4a1 SHA512 d70d264671db2783526c589199ff74cc70d53a4fbaa1d78636a508dbf8216aefab17f5764bf25b2b86e9c1413e0e61977819fbb0dec59d3209195df522d3fa5f
-EBUILD cmd2-2.4.1.ebuild 1546 BLAKE2B c0cc684936461acf7ea790dac74b03c186674ee6a7650a8826c676487bb82f53a4debcc663ec5152473566a962fc89226239c7e4b762a6448c3e8d98d67e5d02 SHA512 5f7769893acad0d1bc677c5304c1ae14fc7dfcb0132c70762bb61e18aaba5ccb176e6ce0e383ca4e237750635f1ac206943aed82f42a5c1a7ee551938949d3eb
-EBUILD cmd2-2.4.2.ebuild 1506 BLAKE2B 23a67b03214ab67ad0f0f3b442e0ea3819686d557b6af6aadccaf8ca508db20811f5c1fd2061efb60aa4579ca1a212df6247fe72182db7554c1b578f1f162d99 SHA512 5920d3cfbd0c9472d4360b800dc84e8c4b19c558056fbc88ca7a5fec58bdbf9267933cd30b462dbbacaf94601ada12003762ef4c9ff83b33e0eb18ed043456c1
+EBUILD cmd2-2.4.2.ebuild 1501 BLAKE2B 0af67b5f00b54ac36cc557dca49f4574ae327fcd0c714d047677d6fbf619c649984d55f3beee9c0d73d52f13d5c022d8e163d73f751a037613bc73eac8471345 SHA512 5ca4a1205a2d34fb9b932d572f7492b5c1ac884e20d175a1449534c17f9e95bacbd357bf13fb3b4cd373c39c56149e4f3c2d624c333ac011b37325936f78e55d
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
deleted file mode 100644
index d14b273ef06b..000000000000
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ /dev/null
@@ -1,64 +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 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="
-	https://github.com/python-cmd2/cmd2/
-	https://pypi.org/project/cmd2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py311.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/cmd2-2.4.2.ebuild b/dev-python/cmd2/cmd2-2.4.2.ebuild
index 72245e3bb12b..ea9f98775b36 100644
--- a/dev-python/cmd2/cmd2-2.4.2.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.2.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 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
deleted file mode 100644
index c0e9da528a08..000000000000
--- a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c02bb7dce587886fe380704a8c6a6009eb677a74 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 15:41:11 +0200
-Subject: [PATCH] Fixed duplicate subparser name in
- test_add_parser_custom_completer
-
-If I'm not mistaken, the use of the same name for both subparsers was
-not intentional but a typo.  In Python 3.11, this is an error and causes
-the test to fail.
-
-Fixes #1228
----
- tests/test_argparse_completer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py
-index 135d3de4..14c8c1de 100644
---- a/tests/test_argparse_completer.py
-+++ b/tests/test_argparse_completer.py
-@@ -1371,5 +1371,5 @@ def test_add_parser_custom_completer():
-     no_custom_completer_parser = subparsers.add_parser(name="no_custom_completer")
-     assert no_custom_completer_parser.get_ap_completer_type() is None  # type: ignore[attr-defined]
- 
--    custom_completer_parser = subparsers.add_parser(name="no_custom_completer", ap_completer_type=CustomCompleter)
-+    custom_completer_parser = subparsers.add_parser(name="custom_completer", ap_completer_type=CustomCompleter)
-     assert custom_completer_parser.get_ap_completer_type() is CustomCompleter  # type: ignore[attr-defined]
diff --git a/dev-python/configupdater/Manifest b/dev-python/configupdater/Manifest
index ee61288c1ffd..74f86f6c3984 100644
--- a/dev-python/configupdater/Manifest
+++ b/dev-python/configupdater/Manifest
@@ -1,5 +1,5 @@
 DIST configupdater-3.1.1.gh.tar.gz 138777 BLAKE2B 9fef5815bc41903a65c2c53c6b9ff3d00d1f4efe65008c725afda8d12694be4d18810cbfc03b291246789d736f1a2933061f2683bfc62e9e1d72e2e4f159d772 SHA512 1e499f87d0ac3d75f32aafe532d7c83b4b86fbaa204fcdbaf7a3dcb5262d936fe027ee0b21d169ef69a0590edbe965a872390b14be274fbb1c893f2d4695b92c
 DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
-EBUILD configupdater-3.1.1.ebuild 761 BLAKE2B 7a0d6f4cfb2c9aad2f351d04da877508548b69521ecb97aef71136635083a6e8ee60da4240d679bff8b7355baadd23024a77c3196ff041401b2477112804ed8f SHA512 334a247927e0d929414aa05fbb298e5d40698917b2faf55fc5b857528720ff8d1748a93d1cb4be3ba9a75f008bd31024a86866a0e09a7194be9d28ae69bab808
+EBUILD configupdater-3.1.1.ebuild 767 BLAKE2B 016c77d54fe24ad0265715cbd327b470fcae3671ac5d41a7c97a83c5b057bb40281c9b786a0c5d7c6e9fad66ee22e1dcb42be4c6b560b7d313e22edfb1911d8e SHA512 cf5d5bf233e691b046205622aafe414fd3b4756d989a528889b54067617173442c301a1192e141879d9d818a96078efb731a4bbeb097827c0f7e32039d33acd6
 EBUILD configupdater-3.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
 MISC metadata.xml 359 BLAKE2B 59eca20050b8eb4620813ab2bc61abec0d905dba4c38d35806f135cc3f165634cf6f1df124d77e294dbcb3d196b521bbfaa005979e0c63164004d4942afe4717 SHA512 8ce147cc56b7c207125e40d9ce54f692f62f2ecff1944e74d661b2656e5d479e8072e41fbec7451e58976d3453c5dd0e4eff0726ff9f2b502b505926fd2d851f
diff --git a/dev-python/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
index 64cded257ddd..95c97792a5f7 100644
--- a/dev-python/configupdater/configupdater-3.1.1.ebuild
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT PSF-2 PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 22b59ca11e41..e2b46677262f 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -3,5 +3,5 @@ DIST coverage-6.4.2.tar.gz 721847 BLAKE2B d4a36a4a8e6f70654be0b9f6c0a660419d3108
 DIST coverage-6.4.3.tar.gz 722764 BLAKE2B f4d45aa9f0494bfe43e244907bda14e4a99bce7d4cdc4f6610abed3a2600a6f836dccd6c4c795f6bf0f8eeab2ab3df4f0ddc3f9e2d1285d57415f9bc06b47635 SHA512 7ff93dfb58f9d00a9016c86cc4425932c6dfc700954e5174b6a39c23900915f3dc1c5951a60d4ccb2155d82e2c552c07894670440dc17574e0ef5e0ba7bb4a81
 EBUILD coverage-6.4.1.ebuild 1678 BLAKE2B c7e457ab2b0d46e6550793f295ee6294b70f099aa0c6be6a3a3a8505cfd8dc8dce1270b550dd6a73c838d4aaea0c99d20c12c6fdab32bc05e62e45c902df6275 SHA512 a9a31b2d0883fb30bf389104f9d884313bb6906bc71f8093931021f7c9c5e441304ae536a33c2948c5df69a45532dad6ff9c531533ff23511853901d7d8ec224
 EBUILD coverage-6.4.2.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
-EBUILD coverage-6.4.3.ebuild 1686 BLAKE2B 433e48ff442b0b5523eb1bcc841e54baaa77704328ec322fbf2431b3e249022cce2007cca81b5e074024c83b5382eeb934543a38d1be54b1aa4b840a13be64dd SHA512 a339c3326b111097b5812beaf12da90ba021ea9bb2dff68f97754af3ca4e21d28de607445441709180a3d14c847bc8021bfab657f79b310f2d5b7745b564ce2b
+EBUILD coverage-6.4.3.ebuild 1683 BLAKE2B 936e95f70dc0e9ebfa12dc70a16a554e3c194183f706d734241be09bfe93727f906f20aa8222cbc39e359caa35b1cdfe9a4654c1e57d67e11456db65caddb8ef SHA512 46f1f784808ecdfa39d45bdf6a9ea82b47e522114aaa7417b86efd3a058dcb7f7b5dcfdbf06ee38aea405ff73a4b40770e7fd8648068b9fee49c04ad26759db1
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.4.3.ebuild b/dev-python/coverage/coverage-6.4.3.ebuild
index 8a27c2c95f30..4fa67c2e4d1f 100644
--- a/dev-python/coverage/coverage-6.4.3.ebuild
+++ b/dev-python/coverage/coverage-6.4.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 14afb06b4bf8..5e54f363cbac 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,7 +1,3 @@
-DIST cssutils-2.4.2.tar.gz 726519 BLAKE2B c087e06d25aa78cac35e936fe06d37ffc973b022a611a4a294683929b4c553adfbeb475330e8ce4b27b5aea3b9d4c89df6f52d02fef49236a81245505ab80d5b SHA512 0757fa73170c0287ee7be9c931103bb1781c93fba63870bb11e257797af7033e77e5417ed1c7aa219eeaff5c524a84c920ead0e2b8a4599ce499b17a83fdc8f7
-DIST cssutils-2.5.0.tar.gz 723225 BLAKE2B 521bde4f9f0b5d0a8fb74e24d640e55c3a0ed900f98e43c620f6b00bb66a591792709faae38fd778e6925581bd4f32f866d815d42d07e039dceb703d0dce2422 SHA512 49163d341ce169791bc99ba5f466eab2af09e65aaef68157b3c2263fca8214db2d6b586d165364cbed3c27e8f9d188dad020933eb0553ce5493fca3ab2322579
 DIST cssutils-2.5.1.tar.gz 723277 BLAKE2B ca55d980929d48c6eb555c08166870572ac179dadef785ccba3781de7568655374f3fbe44282db7c85f623dbf0c1aaf3360038c7168ba4022ad2f68b48ae5745 SHA512 20a94d5f08f662d67f2c1a0f92ca7fbc46d58dffc8bd4187ab51c8deb6ed29154604abab474ad80c806cc50b1dda9bf8d06edd98d5e8603bdd4917052ba796ce
-EBUILD cssutils-2.4.2.ebuild 969 BLAKE2B b08b823ad8f3ce68d495e6c0e313fe603c58677139a747fafbcecf508c44387f68492429325e9fc2ff05a7eccd360e87b9add3797b6bdbbef48aad0fb12045f0 SHA512 24c6425be5b8ffb6c472b04cb5e62e33f6b9627cc596db2947202aa6fa1af6bc9f6eb4311172f188aad264fc68f3178cbfc33045c2d156d79fc3698623079b87
-EBUILD cssutils-2.5.0.ebuild 970 BLAKE2B d72958758560c299f03ec365dbdaf64f7863a2bae45745335dd93500c5584e2ea8f3f90b2566946a0f9fd1e0f684a7869f72a8c23ff6a966ecafa616f0c2311c SHA512 d9b907701686347c683683487c49dc8c78690cc6527a34e218b3c8ad20dd53250c604a1bb69d9f98aeef4b2a37ca3041e5d537dbf38c7e9361c681dedd356c3d
-EBUILD cssutils-2.5.1.ebuild 970 BLAKE2B d72958758560c299f03ec365dbdaf64f7863a2bae45745335dd93500c5584e2ea8f3f90b2566946a0f9fd1e0f684a7869f72a8c23ff6a966ecafa616f0c2311c SHA512 d9b907701686347c683683487c49dc8c78690cc6527a34e218b3c8ad20dd53250c604a1bb69d9f98aeef4b2a37ca3041e5d537dbf38c7e9361c681dedd356c3d
+EBUILD cssutils-2.5.1.ebuild 965 BLAKE2B 25979cc8cfb761a8e41e690ea0272fab7096bf96066efe3ce6a857671d59d4927226a5455cf7ec09ac9520b0318c974a7d0f2be5212a84baf4386807707c2a59 SHA512 1489e3b75f22e18de3ffe648b30c0c1e0c1e2f56b01c4b29db88887ae0769226a2f499265478bd0c2182deda8677ba36980306970e977292ee51cba95d5ef547
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.4.2.ebuild b/dev-python/cssutils/cssutils-2.4.2.ebuild
deleted file mode 100644
index 398e8a4440b9..000000000000
--- a/dev-python/cssutils/cssutils-2.4.2.ebuild
+++ /dev/null
@@ -1,42 +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="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-	https://pypi.org/project/cssutils/
-	https://github.com/jaraco/cssutils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	encutils/__init__.py::encutils
-	cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
-	examples/website.py::website.logging
-)
diff --git a/dev-python/cssutils/cssutils-2.5.0.ebuild b/dev-python/cssutils/cssutils-2.5.0.ebuild
deleted file mode 100644
index f6f379e16ca5..000000000000
--- a/dev-python/cssutils/cssutils-2.5.0.ebuild
+++ /dev/null
@@ -1,42 +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="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-	https://pypi.org/project/cssutils/
-	https://github.com/jaraco/cssutils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	encutils/__init__.py::encutils
-	cssutils/tests/test_parse.py::TestCSSParser::test_parseUrl
-	examples/website.py::website.logging
-)
diff --git a/dev-python/cssutils/cssutils-2.5.1.ebuild b/dev-python/cssutils/cssutils-2.5.1.ebuild
index f6f379e16ca5..d86e640ce2a0 100644
--- a/dev-python/cssutils/cssutils-2.5.1.ebuild
+++ b/dev-python/cssutils/cssutils-2.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/dirty-equals/Manifest b/dev-python/dirty-equals/Manifest
index d33db6ea556e..c1b3cff6a6be 100644
--- a/dev-python/dirty-equals/Manifest
+++ b/dev-python/dirty-equals/Manifest
@@ -1,3 +1,3 @@
 DIST dirty-equals-0.4.gh.tar.gz 41864 BLAKE2B 0b916d37b323e9f587a977b46415432bc11367a6d0c95ac49e47fe604b3ee16c26eaecbbe74464076834c6186f5f0eecc049b211699a3f515ef7fdadc492537a SHA512 f98fa8c9850f26efc44dc2c5cc0ea6d687c07b49980c3eeaa71eaae78930e418c03bb35cb88aab065905443fa354b9b05d44a588458ed37d140d376b943c9da9
-EBUILD dirty-equals-0.4-r1.ebuild 888 BLAKE2B 71159fbda98b69938194f4e65467c6d3966160e4c5c1b97eb024fa53ec843ab93825ae23c201f4d7bdacf9ba474cfb46eee765d401c798681010484c5acc59c2 SHA512 28542bb7f97023905dd62d03eb320d2a6e04d32da7847795215e145a55374e22f5ed583fe62505177cd8758b44dc96d4b8df91969f978073bb6dc9c57962b76f
+EBUILD dirty-equals-0.4-r1.ebuild 895 BLAKE2B 31f901a3a2947f46dece5934630d4ddf6ba89697f0894040287ddbc6768489802c1b3b0ba268f8a098cc672a0b9e971f7526799973e87681f86c9b6935602a83 SHA512 58450335de4f49eff79a40dca54df4f20f28906b8f0c606b886bc8f3e01ce0ba5e28453faa7dff75b42b20095b1375c84b0251163549caf523a5dc2d3e93b8c3
 MISC metadata.xml 359 BLAKE2B 120f82faf2460b2528927b708a41b2d105248a57af2f3f11966b102237731f9dab87962069728dd78327757c190790f01646c94c228d0e79bf60fbab82e1ca39 SHA512 fb17ee5e8483cd6c5ce840c2f070601c4506b0d62a8c6a80338e8748e57bfb49ee412faf7b95f21c16e5c5730efb9879d8d66fd4fd1c134ca459af3657994f98
diff --git a/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild b/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
index a3764d74a643..4f792abb6046 100644
--- a/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
+++ b/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 7950abe7dbf8..a9fd3c2f4323 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,6 @@
 AUX docutils-0.18.1-py311.patch 4637 BLAKE2B d103e5f4fa6b8c1ab06f2b07c33ee3f707f0c1224d9bfa6f57504c3f30177dcb46cb8ed32dcc03c413937a94212bc64a9963cc0cede766e50b81b1f73531fcef SHA512 7c7c97e150914ddc12948236f84314b3ce49d043a7e5245ae0defbbf1d0845a8e3b06ebd63fb466c92bc970305578243dc97103230d80a810fa3cd54528b70bd
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
-DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
 DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5
 EBUILD docutils-0.17.1-r1.ebuild 1830 BLAKE2B d13ba2e4998192d440e02fa4832ce67862d01b3731db0eb10f0c8df1a1403e5e356487d56599ef56cd154cc24ec37ac5dfaf6d9eec7b9aa429e54d5fc8ba4c3e SHA512 6cc1a8a27d9bcd575f9b9ab92629869583a28ac78592d47257bec360169987aea1a3a9d167f72e0ba6c38cd0868ca109ec8f0da739823b1ae24b923ff19e9215
-EBUILD docutils-0.18.1-r1.ebuild 1819 BLAKE2B 3a9611e2f5d592d762eeae1b72ab8fa364f0c0fef173d8c93a8bc6f5959d43fb4b2cd28d6d29ec8da3a096e3e0b6684d96b442070c97d044637d5a82eb6f7cbd SHA512 b36683561ef5367b0e1937693b14a867408b4d051b6a6680804c8c748da8f6c0369013a4aa5de40797fdf306f72490edc5219dd41fa5f0bbc8920d6d0945ec6b
-EBUILD docutils-0.19.ebuild 1782 BLAKE2B 0c6fa4e01f91e3a3eca01e89c40d1a1ca4d6a28446db1da792d55a7fb80c7e535108ad954a23d111afea303bcfca78dcadf8c9255f706f7ec86c910c0a836043 SHA512 689f6919815df430c9dae5fcf913bdf3fbf1f857a9f62e3d53c58e70594f21cb9cb3c2f174f19a12ce17764f15dae0817dcd2e0113e82757a349af706e1c157d
+EBUILD docutils-0.19.ebuild 1774 BLAKE2B 384b13ccf573fbe733d6fbdbc2fa46f1d9f64702b0049eb3a41d486220a8b9adbef73868e5930ab7bbe3b2949e2ba8b4313522c640d0ffeae28116beff0d2262 SHA512 98a1dddce5cb46dde2e8a2db66e43aa3c944eddea0d7ac4dde846138585e8eba44c5b3abb15c14d7c84679c6efaf63d541b6510744e3dcce93e9e176694901a7
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.18.1-r1.ebuild b/dev-python/docutils/docutils-0.18.1-r1.ebuild
deleted file mode 100644
index d916deb851d3..000000000000
--- a/dev-python/docutils/docutils-0.18.1-r1.ebuild
+++ /dev/null
@@ -1,77 +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="Python Documentation Utilities (reference reStructuredText impl.)"
-HOMEPAGE="
-	https://docutils.sourceforge.io/
-	https://pypi.org/project/docutils/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-py311.patch"
-)
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.19.ebuild b/dev-python/docutils/docutils-0.19.ebuild
index c348d6c56be1..1edcc4987d96 100644
--- a/dev-python/docutils/docutils-0.19.ebuild
+++ b/dev-python/docutils/docutils-0.19.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 35b0d3d0b05f..42fb90d172e1 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,5 +1,3 @@
-DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
 DIST ecdsa-0.18.0.tar.gz 197938 BLAKE2B d4f55591d58a998e69c070983d6cc45720677f83dc6149bd95938c79391df85fe5ce8fe059e961d23b8334d9ac4ef4972bff91a6e9537affc9ddd75c7cbce4f7 SHA512 f26dbeccd8e6ec832405d419b7244ca97b43a2811513493913a4f2f2fd1d2f453068fe0ba7b90b972f42a0d7b9834212fbd4d4559475cffeb1d80075fa954d78
-EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 71ee14deaf7622086379397dd83681ddc8c6cbc86cc0192d9d13ebefeb7e2b130a307375e0a306bb0bf43491216d619c43718358b693caabdda4f2750a70500d SHA512 1cad3382bcba9be8424d0e69dbae70eeb78bb8e52d1e243eca13f725213c7cb768b1c5a470fd6cb6be0d85431d48d0e93fcb97d59f239756e16dedb4160e7670
-EBUILD ecdsa-0.18.0.ebuild 780 BLAKE2B 2c4ae2533edb77634fbb5708a6e056f16c146219e8dc62ad772b1876871815bd5bf1a7bb3ecfb8b7a8910e0c58c2069e7ac54b132c632ab80c6011b9070845e3 SHA512 b9c12539ca50ba0078ac5aea6569cc02b1db522d83c0e3c6ae2dab80782016c56fd8c3ca7a7de3f331c4652f97990bde34d7904b68befc68278a93c54ceba9d3
+EBUILD ecdsa-0.18.0.ebuild 773 BLAKE2B eb8009467ec26709b55a99aba869b4230199391ba7c15748e04b2440886c9fb5a3b5e33ac5e82697d21add78c9ff54ccfee9e339956c8c75632af531242845a5 SHA512 abde7cc9a77e432d2a3fcc646d2072e864281adfede09eaa89383b2f4477e9c903238db20713223390632929ab15e20a0d24e7d569135b0a09c20125d06e2d53
 MISC metadata.xml 408 BLAKE2B c3ccca8cd48352945025d466f06c143e78923085d82bc219087e1015c3e8219ff5f397739420e588a57a47136da6c4adb905d12fad8d06803b2f33688150b1fc SHA512 12f542d7bf34cf1cd3334cb076490ed04b3a484f0aed3896fd02fd049f371a46f11e078253b3f8d4a3165c8893692e4fcc496b61a9aadbaad570e7f194bee22a
diff --git a/dev-python/ecdsa/ecdsa-0.17.0.ebuild b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
deleted file mode 100644
index 27229ea8df64..000000000000
--- a/dev-python/ecdsa/ecdsa-0.17.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/tlsfuzzer/python-ecdsa/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/gmpy[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pluggy[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/ecdsa-0.18.0.ebuild b/dev-python/ecdsa/ecdsa-0.18.0.ebuild
index 3920d4122ee6..61f4594f7c8c 100644
--- a/dev-python/ecdsa/ecdsa-0.18.0.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.18.0.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 19626614c48d..ecf5b111dc60 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,7 +1,9 @@
 DIST elementpath-2.5.3.gh.tar.gz 264387 BLAKE2B a0904e95675570783f2f8bf854490a3f424d6ce0fa85e3c2030483e9c31af4a5eaaf727db6423e17a402f55e7d42b0625a5183b543f886ec8b12426eb0e57a57 SHA512 da561446ac3a059c60480084648ebc1190d0ec1dc495dfa128dc2598d5762ae1067f39be36fc6bca466e6785aae80edf6dc1415a2885bfbb2d54b97ca6611572
 DIST elementpath-3.0.0.gh.tar.gz 271802 BLAKE2B c766ab1654b89b6a1b09ed7273a65aa25bcad0e8f8188c50d2f85d852672ac650b6cee3411839f915b0fe46915bbe6c17269f0218f0de27b51e4bd48b9218c20 SHA512 171d5e19e3efeb0b80cd1dcca7a0604fff2a87a52db4570d2182ff155aaef5074517d1ee89992ea1937746481a10fdd62f317672fa7ad5014e64dc73fc39ffaf
 DIST elementpath-3.0.1.gh.tar.gz 272163 BLAKE2B dc3b46e9c01af57f6456b71062cc38cab1fb73aa3d272907b96a7144c8329a3b6925b804d7929662e083ec7f50889eb488f075a4155bb934939d6750aae29901 SHA512 bac73a3c9051fe556e47e0ac530fe45e7a66fb66c8fe51fc12d36d9f4f87d62ca28662bdafbdae68b867048fcb8a51d312b5294328f4df259d7d4d63ca35af4d
+DIST elementpath-3.0.2.gh.tar.gz 275843 BLAKE2B b5e51971dbbcf68f6199ecf8d3270d2ed06732e3d1abc07d768127bc8a4cef4096fe3e6fe97606bde6d229753a942abd6c0019708f86e8a9931bc902bc8f48ef SHA512 46392cece136bd6e73285333b14a00ebbebcca70c7df42cd04021225207593ef33337fd468c12f089030f2a8adc1251660ebf762aa17f82b2f26ba902d6e89d2
 EBUILD elementpath-2.5.3.ebuild 879 BLAKE2B d492c16c74b8ec9c8742b458ceb1c1a13ef8ebec05ab47c9c52b180ffaab0839f1440157169a3c519f899487f40bc83777e65b3f90e49591548c6d6a1041ec03 SHA512 821006590374a1810988d1b0f3c1f18e5862c1803551ee6cb1167fc1d57d0553a1c946d43186367c889b891ce50236f290c269334b0f974c6a10969b802654ee
 EBUILD elementpath-3.0.0.ebuild 887 BLAKE2B d6fdb266cd3ef53a0d87b7dc2234c0bb0c827705cb1d7616ee1d80aec2baf87c072963de71b365412e73f50d190eb21058bd3f8f58954c3a33b129fc9a9bb743 SHA512 92aedea0fedcc6bb46441ff00e9818d2664a88b614e5c9a3675709f5730f822346a669de9f32b46b77f8d0e9986771fbf039ed882ef0430f5b63b41bf76545b0
 EBUILD elementpath-3.0.1.ebuild 887 BLAKE2B d6fdb266cd3ef53a0d87b7dc2234c0bb0c827705cb1d7616ee1d80aec2baf87c072963de71b365412e73f50d190eb21058bd3f8f58954c3a33b129fc9a9bb743 SHA512 92aedea0fedcc6bb46441ff00e9818d2664a88b614e5c9a3675709f5730f822346a669de9f32b46b77f8d0e9986771fbf039ed882ef0430f5b63b41bf76545b0
+EBUILD elementpath-3.0.2.ebuild 887 BLAKE2B d6fdb266cd3ef53a0d87b7dc2234c0bb0c827705cb1d7616ee1d80aec2baf87c072963de71b365412e73f50d190eb21058bd3f8f58954c3a33b129fc9a9bb743 SHA512 92aedea0fedcc6bb46441ff00e9818d2664a88b614e5c9a3675709f5730f822346a669de9f32b46b77f8d0e9986771fbf039ed882ef0430f5b63b41bf76545b0
 MISC metadata.xml 380 BLAKE2B 00a18a4c9373b73866c8f5159e6c11327baea8ea6ba8027c2477cefaf6bbd2d2838de3cf78b9bc3e8bdffd0444e6c44b45cf6e6aac0f7ac470c7e092ae4e43f9 SHA512 abdc862e0d684023fcd42843a9c558d71e923a09fb0592e5e3c3e7e949e311c36afc34ee3cea5873c1799b093924fe15c240da4a782fdbca11ace66ea0d2717c
diff --git a/dev-python/elementpath/elementpath-3.0.2.ebuild b/dev-python/elementpath/elementpath-3.0.2.ebuild
new file mode 100644
index 000000000000..44481bdc806a
--- /dev/null
+++ b/dev-python/elementpath/elementpath-3.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-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="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="
+	https://github.com/sissaschool/elementpath/
+	https://pypi.org/project/elementpath/
+"
+SRC_URI="
+	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fails for some reason, more fit for upstream testing anyway
+	rm tests/test_typing.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ensurepip-wheels/Manifest b/dev-python/ensurepip-wheels/Manifest
index 9266440f2c22..832e22727109 100644
--- a/dev-python/ensurepip-wheels/Manifest
+++ b/dev-python/ensurepip-wheels/Manifest
@@ -1,6 +1,8 @@
 DIST pip-22.2.2-py3-none-any.whl 2044706 BLAKE2B 254427e593e44d9f1ce48276fd40f214e8ca9d27b6c31b7a6ed5fa4566df6b1f723215c6a1766a534ce18174f2363c383dbff19368d1b89f1519a53bebd34215 SHA512 142d3144c14b692c645613d98bf35dd91193128d5e21b61a8a702548f1247fac662499d6e39b65c0aa9a0444d2d92983fd8c410439796626485a4e1be99a102f
 DIST setuptools-63.4.2-py3-none-any.whl 1230330 BLAKE2B 8190129907edb6a5a3607fc8caae995070d5740c849cd31510efa43271fddd58c5c21cb1d60a4647473b10ba90a6220e06db92413847cbf71e11e43571def2ab SHA512 8b2a56c840220c616a13ec19b424981b9767f4e39b98a3ba0b99904beb63f4d6d6c28ada37a25d482c1838063ccd09d260b12cc7d00aeca78b95cde49928211e
 DIST setuptools-63.4.3-py3-none-any.whl 1230380 BLAKE2B e8959efcfdd53e163a49605f4abada5b3571a6511b5859aa73546ad317255fac03b5a38bfc7945cf10cc589f692a7a44de0a12b3d8107782ff6fcd80d0f521b6 SHA512 0c1df89ed0d6bfb368eb8ef211663de5d5fdefc89bb43e23bd639e18b5362d34b90c4be3212c64cda7308109e626991410204c761b949a0f04ae8fe1f86056a5
+DIST setuptools-64.0.3-py3-none-any.whl 1247789 BLAKE2B 60d7917c7c3d467ba8112ac596fb8558c259b7c1e39cf956694e4b0238bbcc5f2ad64aa3234f94614f9f05dcd67968428f2660ecec1de86b46be1f70d9df82e3 SHA512 081b9c024e469c976978cd60ce2e6c5019ff275035b6807629755fc1560a19892e37fd0ee81ff11b28190e861d732d69e08ea9d928f1910cd4e0db957ae6fcc8
 EBUILD ensurepip-wheels-63.4.2.22.2.2.ebuild 840 BLAKE2B 1243e37a93ffdd939c1aa55cb0926e111e6fd5b6e6011e81b3006734c0f73d35d6f4c1274995a4227cc8868f334eb30b8faab03d69fb2f8b25af0c6f60c80a38 SHA512 564fbb4336c4e46dbd0472801653c53c6af54aa72cf047f72a04ed7379474eefa49975d1e5ee231e3d0832bf22b65ad169acfea125abcc8dbc6ca7e4802a7e30
 EBUILD ensurepip-wheels-63.4.3.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
+EBUILD ensurepip-wheels-64.0.3.22.2.2.ebuild 848 BLAKE2B 2d4062dcde645e944dcc73a9fe8150ded2473bdeb0656832223cc1071b8fbc9b99522eff3eef11778ac9f12e97a85a8c99bdd78a4fd85b7b87b6711439d5e0c4 SHA512 cd12ffe723070c282e9f92ce6c0b125ba0f336e73d063c68f49ad4c91e29dba542ed877dcfe1afd5913c71cfc1f0cc8333d0cb8f7f9ee36050e8f42610a3498d
 MISC metadata.xml 357 BLAKE2B 2275bcbbf65269212f67a4524163fd07ae84c50ec48533b758e600c3d9e8e54db416d5e5a6d0b08f05a82b9c6adcf7df5ccb1ad3c760f79a615136c13235f7ed SHA512 0c30429f2ee7956f92537dcea88ed5e3598575a4b9b64935de0f437791e88ae3c9991c5759e670e7a1cba478a87be7675c4864a707d6a51d9b25540074f14963
diff --git a/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild b/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild
new file mode 100644
index 000000000000..691136b4b5bb
--- /dev/null
+++ b/dev-python/ensurepip-wheels/ensurepip-wheels-64.0.3.22.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SETUPTOOLS_WHL=setuptools-$(ver_cut 1-3)-py3-none-any.whl
+PIP_WHL=pip-$(ver_cut 4-)-py3-none-any.whl
+
+DESCRIPTION="Shared wheels for ensurepip Python module"
+HOMEPAGE="
+	https://pypi.org/project/pip/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	https://files.pythonhosted.org/packages/py3/p/pip/${PIP_WHL}
+	https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+"
+S=${DISTDIR}
+
+# combined license of setuptools and pip (with its bundled deps)
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${PIP_WHL}" "${SETUPTOOLS_WHL}"
+}
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 867cc03c3026..cc5a7417b337 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,9 +1,7 @@
-DIST Flask-2.1.2.tar.gz 631846 BLAKE2B 9024a12dd6fabeffcf5939e2852734b278f25fb99830bb165cf46a09e3fd67d0997558d1b06a0dec3425d9b750be25bde147341c937e874811fe2496224a1f3e SHA512 65ca756d63da05e74863fbfd2ae574d6e75d6fab683dd08ea97b22a9b27be4f9a03ce7be44312a1f2c6a802bdf77ede3899734f3f1546000dd8b9c592571deec
 DIST Flask-2.1.3.tar.gz 630206 BLAKE2B 83c876fe94d2cb1b35677227214664b35b6908270097d3ef0e1150a7259cdce82fb91fa6ba7cc90e819623bb9cc79f8254cc5688c6dd1e1dedaa673f23591bfb SHA512 6289bcaa295265c501fda1292b496911768525acf4155c856e14479a213aec4ca50a45ddd81b30ccd31fd684da1942ec10400f2dc8280ceff6ded9baf55494e5
 DIST Flask-2.2.1.tar.gz 687433 BLAKE2B 9d5fbc6827110882c64102f596b1d272bf5b16fd5540eedf0bad52f4456b54c3ab53e474ec74bb0e7d3cc7cfc26a22d19fd908d0973b94e64b47ee3a66c5a4e6 SHA512 845857cd6441e935a5274f362708c1e84654f757b0412bb57dd1235943d1d0562b081b53e77920ab9891bbe6810a06f7564e828cda472844413f7a1249335d1a
 DIST Flask-2.2.2.tar.gz 677389 BLAKE2B a7385c619dee7c25538a69bc514393c6efa2ee3cbd8394cde28c64a41d7252b4f12896728bf76a4b8bf5247cf19614bd9b8f94d7d82f22a6a8073011286758fc SHA512 d330398829cb0393e07a4dcf495a3939f0e8f7962c0a517fc866d333425dffe1ce8fd26e39a40445259028d46eff4566e97b3f5eba0d6bddf14b9d7bac138945
-EBUILD flask-2.1.2.ebuild 1512 BLAKE2B 4c087e67a6aac823a44f27a9040ba4af1b3e1d083043be671a39bfccfc4369490e746a869aeea137877c229b50a77da4dcc1e56907c2b0fb0c1f3dd6550a8e52 SHA512 dc6b6ecc43fecf840ac2fff079f9b9fc8e9650fa0ad761c1b4b9726935038f4685084a782fae385212be01ae640404ad53e12af5bf9a10fe988200cad86425aa
-EBUILD flask-2.1.3.ebuild 1520 BLAKE2B e9677b4637436038576b85d6b7b022a180b5db935f71ef1abbb3c1cae2e461f9ab18f634265d2c010134bd89f3de84685adb02a78727fb2e60d5d5bb6809a692 SHA512 44d8d8af5978da14bdef4490acf54e54c0cd3ced026a16df571142886ce4a436cbe3f961773db5efd5b23c935427f0cd3b5886dccf4fe3600d74b8bd15145489
+EBUILD flask-2.1.3.ebuild 1512 BLAKE2B 4c087e67a6aac823a44f27a9040ba4af1b3e1d083043be671a39bfccfc4369490e746a869aeea137877c229b50a77da4dcc1e56907c2b0fb0c1f3dd6550a8e52 SHA512 dc6b6ecc43fecf840ac2fff079f9b9fc8e9650fa0ad761c1b4b9726935038f4685084a782fae385212be01ae640404ad53e12af5bf9a10fe988200cad86425aa
 EBUILD flask-2.2.1.ebuild 1520 BLAKE2B a81452c06be28a3670e745a543a4a07c906cc4738693ea7a065a8107798b495e86304bfe7cbaf6cacd3a5f8b71a11b517dd3b783547f017c5f45a6f98c65ae21 SHA512 11d80c89560d6cc9aeb9e57ce30770ab97453df65bfd0cd8e6bffb5f37de638e96a255510c1e5cb4d00419dd004935a4c58117b65aa78222f7881c3815e7e3d2
 EBUILD flask-2.2.2.ebuild 1520 BLAKE2B a81452c06be28a3670e745a543a4a07c906cc4738693ea7a065a8107798b495e86304bfe7cbaf6cacd3a5f8b71a11b517dd3b783547f017c5f45a6f98c65ae21 SHA512 11d80c89560d6cc9aeb9e57ce30770ab97453df65bfd0cd8e6bffb5f37de638e96a255510c1e5cb4d00419dd004935a4c58117b65aa78222f7881c3815e7e3d2
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.1.2.ebuild b/dev-python/flask/flask-2.1.2.ebuild
deleted file mode 100644
index 48df9fe3e438..000000000000
--- a/dev-python/flask/flask-2.1.2.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=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="
-	https://palletsprojects.com/p/flask/
-	https://github.com/pallets/flask/
-	https://pypi.org/project/Flask/
-"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.1.3.ebuild b/dev-python/flask/flask-2.1.3.ebuild
index 1173c5e5bd45..48df9fe3e438 100644
--- a/dev-python/flask/flask-2.1.3.ebuild
+++ b/dev-python/flask/flask-2.1.3.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 512dec05fd3a..cd4ec3ece18e 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,4 +1,6 @@
 AUX freezegun-1.1.0-py310.patch 1056 BLAKE2B f1ffc2ed1d03d014c5d2e7c5ac41f75c62763e325fcb6004ac835336a461df7edbedb55278b2583a4153057a018ab16f4618f85be7e394886e1faf6de97cc7c4 SHA512 cd23ff28e9b05674ae58b7d8086d16be14277ec932628731ef7ae6c6149a0ac2ce32f75f18d6ec6f6dca4770fa9c0d225e02f2b680a6f71f131f9bcbdec6ac8a
 DIST freezegun-1.2.1.tar.gz 29740 BLAKE2B 780b0573602df157b9b195c3fbd76c81c893a4558355bdf26661f8ec1fb4b6a265c0b684f1c812a6a52ca7beed4dd36b1cc0fb675acf3c7e10a8e264ad0a3b6d SHA512 5f8334a66dc33cbffa8f22d41e101d66c99a1ac4b7a0c24ee6da62b58dab2b0b340ade48b8dd0020d4fb4cb6e082071869a2757bbd05eff703f66f167050d4e1
+DIST freezegun-1.2.2.tar.gz 30670 BLAKE2B 88941ccd9694c842e4999da47e1a8fbe9b82c1fa512467de174715e627c213167cf3c7f943b35d039ff118bae9d1bca4b64ceaa5683db818727cd9ad2533a827 SHA512 c6dc3da66a2d3063f819a104b6bc98eb3d4b772b8edb06bde130a6e355d96e1861e650c44eb691be892223150a652a528fda4237bd77b1bdcee1fcfad74f307c
 EBUILD freezegun-1.2.1.ebuild 740 BLAKE2B cd7aa44d8646dc90072b8ce32f729689f1d72fba1413ec787bf4e14378710ce521621ef8fa80092d9971f321f640b9afc4e9041a3062d4b39c848b0ea6f613e5 SHA512 121648f1d3d6a87d78697996700d606706f5d8da7ec87824d948e6204285c538f65b2c02274e876e88cd90be4ca8fc76a5ca205840349ee322b724a06dca69db
+EBUILD freezegun-1.2.2.ebuild 887 BLAKE2B 097fb204ec553d3a7669f154c9e16ecf3a8880219dfe73b0473d34554ca302e882cc533822292e649e15ef13f133ea32f453688b6045cd6f153c7758f02ddc16 SHA512 e5cc72dba5abdcd7ea612117112e0c12dfe6c5a2a282fe39de944a1c31cd4d9826da85a13546df4a9b7032e6db16efd2b8ec05f041a100695f0d32c1377e2df9
 MISC metadata.xml 393 BLAKE2B b2cf7947fff6a03fba00b03503693e0ecb16b4934602ba66225f1d339db131975cea5f503b4b18fac54b38853905d21a1e56b5250674bc6d8cc0fe3e7d37403c SHA512 6bc2d99fc1d7c5c0a259424423f45fdd6bf23ae09c1f42bb5ab777fcefe4b1915cea96b1c767b7e048770b1c5ab9f2b0947fca4438838a4ee20f072f974c0a80
diff --git a/dev-python/freezegun/freezegun-1.2.2.ebuild b/dev-python/freezegun/freezegun-1.2.2.ebuild
new file mode 100644
index 000000000000..553b4713ec6b
--- /dev/null
+++ b/dev-python/freezegun/freezegun-1.2.2.ebuild
@@ -0,0 +1,37 @@
+# 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="Let your Python tests travel through time"
+HOMEPAGE="
+	https://github.com/spulec/freezegun/
+	https://pypi.org/project/freezegun/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/spulec/freezegun/issues/396
+	# https://github.com/spulec/freezegun/pull/397
+	"${FILESDIR}"/${PN}-1.1.0-py310.patch
+)
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index b2242ca936f2..a1c0c06f2dfb 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,7 +1,7 @@
-DIST hatch-hatchling-v1.4.1.gh.tar.gz 229194 BLAKE2B 9d7b11244ce67d64a05f4a737966a8f037031275ae5b2ecde395c172232eb5bbf0f38df4f0048c6732641bafbf524670bc1e6dd9d441cc4297ef74126b56971b SHA512 b8dc8dfdc7e251cad4161f59acc724122f8f7083a1ce170722b7b5c31ccf22488e3871be76ea3fad058be2cce263752099c9b548759e16ba644daaba0eca63ba
 DIST hatch-hatchling-v1.5.0.gh.tar.gz 232265 BLAKE2B 4fd57f7610831a025b9b0dddb89c4fe484d32d0b76a2d0cdafb76730b37c54af42ef27dc1c4d73061d888ce75806bd8f0fc70f5d39a077bd534716cf4e4a4db8 SHA512 9e5498b9da3a1f756e0f3e40daa63e45017588332da4197ac83b8402219bb9501b9c498dd881c5812b2b8903af591e4c6146aaf6dea8cc7b6bc664a85dee74e6
 DIST hatch-hatchling-v1.6.0.gh.tar.gz 233428 BLAKE2B 5ce5a2a94c9021919f50f90a96f37713a739fe08e1d6a5955a3af369d6c37beece1a4c22b1883e689e500f219101fb67a700231b8d0d22432150b34a6cee22bd SHA512 be23b81cca96cb93321938e0ac7455efc2e388e910c1b64a7d611a37681b5bd6aa89c4fe165a7a2f7ce2dd11ea3598aaeaaab80869e689aac0afdce915b8f567
-EBUILD hatchling-1.4.1.ebuild 1980 BLAKE2B 0c537198ec4cead26561b0781f68f6062ba8845cc56e68ba482ebead4618ab86cb5418234524939c1fb69b09a44993fdf2bf222e75f254b0139c66669ca38d59 SHA512 6036e99f5bc40b79197476c7e3201b6b003fa36269d63b36a1f40db9f912dc1467b037a891292d586b36cc0c79a8999ce3bf7f3dc82cecbff0cb7d4d149be316
-EBUILD hatchling-1.5.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
+DIST hatch-hatchling-v1.7.0.gh.tar.gz 249253 BLAKE2B a294b87172b16bda86a90f2d9577bfa7ea9bc21e6644006cb141b762df96bb62e7e828e1c147c6409e6b7278a0bd00cb6ee67d01b203dec110fc272cfae6fd92 SHA512 6a3c807674891ff23ca0b2f00e62900e9e4752888cf6c8647ac20ec6b76a13c23e17a52989d4661d03bed3e33e682a09b877ae6c99bfc707a28ddde754ea9386
+EBUILD hatchling-1.5.0.ebuild 1980 BLAKE2B 0c537198ec4cead26561b0781f68f6062ba8845cc56e68ba482ebead4618ab86cb5418234524939c1fb69b09a44993fdf2bf222e75f254b0139c66669ca38d59 SHA512 6036e99f5bc40b79197476c7e3201b6b003fa36269d63b36a1f40db9f912dc1467b037a891292d586b36cc0c79a8999ce3bf7f3dc82cecbff0cb7d4d149be316
 EBUILD hatchling-1.6.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
+EBUILD hatchling-1.7.0.ebuild 1988 BLAKE2B 7e6587bd516b6bf64cdf96c07a3c58c277755b51ac02ce13c12608bc78d9ce75bc4e49cbcee4fb6144f7bdbe76aaadfb4289b28cf5064328d1ad0d4a2f84e9b7 SHA512 1cd12a200fe2a227d42879f8ace9bf6f2f230aee02559ccb6d03de8bcb8b935d78a593cd41615ef8c8a712d9b170c6a3db15341d3e588a861577b65401be3845
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.5.0.ebuild b/dev-python/hatchling/hatchling-1.5.0.ebuild
index 868dd0172a97..992dbe41ac5d 100644
--- a/dev-python/hatchling/hatchling-1.5.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.5.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/hatchling-1.4.1.ebuild b/dev-python/hatchling/hatchling-1.7.0.ebuild
index 992dbe41ac5d..868dd0172a97 100644
--- a/dev-python/hatchling/hatchling-1.4.1.ebuild
+++ b/dev-python/hatchling/hatchling-1.7.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 425622d4630c..eee81062bc11 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -6,6 +6,7 @@ DIST hypothesis-6.52.4.gh.tar.gz 9323011 BLAKE2B fece23da48d4849252a0fa48ae74150
 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
 DIST hypothesis-6.54.2.gh.tar.gz 9324746 BLAKE2B 25e3effa9667e8b6c57dff0ed00c14cc36385678475a1a1ac9fd30d2e293ea3a49d76ad34e391b33bad7214ce97b5d23aebedcb5d7f74686f3182a72e133416f SHA512 f53d589426b2340f6d747763cc4228f632474bc833e53e2d67fd6545437fc46cf976055dd0f1a55c4cb6377667ce0b0d8bc7dae33454157fbb91af7a5b009b62
+DIST hypothesis-6.54.3.gh.tar.gz 9325211 BLAKE2B e0d6bc21057b50676ef98d1c9721b82c30986670758b2a7bfd1b101cc8d42258bf0d61887867445aafe13b8064c47d64583ab492e21b6fea510ef0c26fe01782 SHA512 288c5ea9c1dd8ee0839c11385f52ba8b8122f408aa11c6d2416460233ef78890e3014e659ef4312da4822da3abe2dd9163f68d2711556800e805ae41280aa132
 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
@@ -14,4 +15,5 @@ EBUILD hypothesis-6.52.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b70
 EBUILD hypothesis-6.53.0.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.54.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.54.3.ebuild b/dev-python/hypothesis/hypothesis-6.54.3.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.54.3.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/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 85489b80310a..dcf3cf74ba0f 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,4 +1,4 @@
 DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
-EBUILD ini2toml-0.11-r1.ebuild 1200 BLAKE2B ee88e634b25bbb1cbdee427ae93d41ea5fa0517fd1f20f8d1aa4fa043b293b3f9c195d278c99402a8d9b1f1fcfec84a17c3b2860fbf5240acad7d00def93eaab SHA512 30059bac5ada37d1a86cb12cec33f48f1fc547a71a85352ac24ac13fa1df4a02c07ad5976ec1bec8c0c354ffa10787669ef268f4890a1d7a2ea8cbed13ad4696
+EBUILD ini2toml-0.11-r1.ebuild 1206 BLAKE2B fa5b60ce996d3c68f216e6d4d264014f7308256222413f3d1ceebfddce27a25dde33625527328248234e278effb8509e4748a3c0cd11f907cef047a75e01fb76 SHA512 5e48a029d6c628b0d58a886e97490f2fa9bad6833587a8e2d0a0d5d08c26604ec08547676a79e0d757bcdc662c34490104e06eec74f92f9ee69d78536414c1f9
 EBUILD ini2toml-0.11.ebuild 1711 BLAKE2B 1837c2f2e3af0b878a7e3c0a58aec8139ad2582048ffa89d5b80720c700bf53f8180db7221678209bb3aa1de89f938416df22822a4a37316281ad549bdc8525b SHA512 2bb9474cbdbe15c9d2c9ec4f59fb2661171b54d27a40722996f22b5c5a2886c0676b2ae4a8a1ffb65cc8e7c56236a9d2a8c8cbb3fb0714ec5c9a0e47b6572127
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
index c48b2f9ad320..79a1eb342c78 100644
--- a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index e9574a60f191..b74efc79400a 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
 DIST jaraco.classes-3.2.2.tar.gz 9266 BLAKE2B fa9bd77cf02e46617e4f5dc414ee081b60f3c3a4b220e75df366c8efb42a2eecccf688e6a43cd39deb1642df06554484fab9d9209d567dd0ffa53b5e94b913cc SHA512 56eaf8420f0319137ecae04c61e5a866909b83d3638343ea45ed3739524c8314bb6aac7ee9b5f899e2a1a5238c2caeaa971ed1cd0dbd28d9ac01ad6716549deb
-EBUILD jaraco-classes-3.2.1-r1.ebuild 783 BLAKE2B 5df93dd0dbd56881feed62aaf777c7e46250954ec6ecfee280cfd8816f48e0d88d7bbfd8c7c5a7b7b1543b4f24e365f9f4abf383e7caebf27cfa2bdd7c460c8a SHA512 4bef970d6ff6b6c75a341ef12eee6a3e6fb1f9a47d26cf2973586f4b32b8550807f06fb857eac9e28d09af244d40992707df8004c95643d9f6bd3f7aafd325dc
-EBUILD jaraco-classes-3.2.2.ebuild 791 BLAKE2B cf03935c196889f35d10f836c26dc932e3d2ecdbd23caa0d4ddb6b0a1252b56bde648154efad878944abe010de7bd4934174323f4cec59a4123135ecfb196d7b SHA512 936e82828c30d72d2783e52b4c3e0ac827952a897d86b96eb306b60984ddb5f1b1eb8b5c928e734e6aae75aafa6fd7d2a918ba0ce7f016353e2714ed9f19223d
+EBUILD jaraco-classes-3.2.2.ebuild 783 BLAKE2B 5df93dd0dbd56881feed62aaf777c7e46250954ec6ecfee280cfd8816f48e0d88d7bbfd8c7c5a7b7b1543b4f24e365f9f4abf383e7caebf27cfa2bdd7c460c8a SHA512 4bef970d6ff6b6c75a341ef12eee6a3e6fb1f9a47d26cf2973586f4b32b8550807f06fb857eac9e28d09af244d40992707df8004c95643d9f6bd3f7aafd325dc
 MISC metadata.xml 578 BLAKE2B bba68eea8ac49fd7afab6d8a05c723c01ecc82b9392a97e26754edbe6400f0351539aad572d125398eaf0b53ed1d25d44e0348a6307a9c8893eacd20bd9f7386 SHA512 3c521b902ac46722c873ca7c696414c7dc66419ce0764de4c30924c92d135956822c3f86d6e17926fcc87e0c0f82f93443fcd2303aab248566cd047ec5202e36
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
deleted file mode 100644
index 6335ace7194b..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,31 +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="Classes used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.classes/
-	https://pypi.org/project/jaraco.classes/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild
index b2df39d160e7..6335ace7194b 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 232331d780da..186632448a02 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,10 +1,8 @@
-DIST jsonschema-4.6.2.tar.gz 275975 BLAKE2B 7c587e8b5c5eff097390e6254ae633445ffece2bd3e9c003dca730bd332c4d3c236ea10225dc81b95ef9359a9309831290b106a07e80945574dcc2937bcd4983 SHA512 e41d6bda1bd6b12174201a70b5ad5209ab7c445faa6c947408f0fbc255839f3379ffe8b539760d993b435972936e4052300dbc420d4b87051f33180bced7efb2
 DIST jsonschema-4.7.2.tar.gz 278495 BLAKE2B 55c25847e210e0bdd3bec672b4b6a4eb1a2e2ec5167c115c34a2d0b2de079a00eaff8d901386b475fc26660887090896e78e3a38c1805f5b767fa1eece740e3b SHA512 c624d7bf317ca20fd8cdd248ec7d7679fde907ab304f1a092fc7a172464f43e41904d3f88df57e1351043b978448f51166a09af3625f00a9ad4d7353033b80af
 DIST jsonschema-4.8.0.tar.gz 279424 BLAKE2B 9e8936bde13841f9edf42ffe214ce8d1aaae8b9be4c3040871f228399a31b4292e8cfbf4bf4261822ca1b88622cb69cdf0d55bd2cc51bf191f6e364e9bfb94f8 SHA512 75a7593eb8b0163ba428f507ed4fd9fa6d51567f284776af96f4d79cb507a69666cc048034bfa3a401f960295779e935562dde4e97cf3f7b3b4571bc28b9dde7
 DIST jsonschema-4.9.0.tar.gz 281100 BLAKE2B 5a1c387fc33735ffd39342f3e62600aea721a51be0995d10aa1726e8e4c3bf93694a7844410c0b245c699880d6642a6903525b3637883f5e662086b53deb0948 SHA512 73fc9958f37802c4558ea6893386810784d2b577c04423b7090fce4cd052e3af078f0b0c46b2b16f96bb49820047f1ec5d96cf6c6cb822fca1d988cf1d70209f
 DIST jsonschema-4.9.1.tar.gz 281177 BLAKE2B 210308d140b39f5a5506a3561b8eaa211fbc9a0eb0576975125fa998bf9a507221b5ab75bd4d0f5bcd6d2e3b70a1a07ef4bcfb1d0b88b29a218b074b7d5649a1 SHA512 d63b927c183077d0fe6978536416523229be0ce3a393e6cbc12fd9229bfa45ba035fd721a7722042d7cb6bcf4c720485d7ff877aae93cd62c9c48b984e802267
-EBUILD jsonschema-4.6.2.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
-EBUILD jsonschema-4.7.2.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
+EBUILD jsonschema-4.7.2.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
 EBUILD jsonschema-4.8.0.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.9.0.ebuild 1504 BLAKE2B aa9b279331f3b6a70a45689ae877831c2fc4adf91faa5322fb67807bd2bb2181f74ce0de649da5e7df813934409b5d9b0ead05af3c4eba4d7f52cf98b295dfd8 SHA512 e13292a358daf85b43d82abe65a0123ac4971dcaaf50f70cde560a62e93d2227ec6064f97088a2c112cacb8ad18a3b636c000b54897e4e1ab3de0ab475362f60
 EBUILD jsonschema-4.9.1.ebuild 1517 BLAKE2B 638e98b819941fb6ad421fe985c93f81ad6d8ebc4e54877caa2fd01cbe750fa6a3e69e4ada2f33191d45a2e643d0d4663642044f14fef9a4336f9092eed89936 SHA512 6deaf29c9731b4a0669e45d85358e46a5c8e7eef4cce2941cf0ebb07076dfb47e32ca37fcdfa5d055e40c799f20f3a53f0f2e1afa21b7d11af0fb72ef708ddd4
diff --git a/dev-python/jsonschema/jsonschema-4.6.2.ebuild b/dev-python/jsonschema/jsonschema-4.6.2.ebuild
deleted file mode 100644
index 43d7b3070a9c..000000000000
--- a/dev-python/jsonschema/jsonschema-4.6.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-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"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# wtf?
-	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
-)
diff --git a/dev-python/jsonschema/jsonschema-4.7.2.ebuild b/dev-python/jsonschema/jsonschema-4.7.2.ebuild
index fb6400dc457c..43d7b3070a9c 100644
--- a/dev-python/jsonschema/jsonschema-4.7.2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.7.2.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 9c68be8c84d8..698a1b0aba50 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,3 +1,5 @@
+DIST pbr-5.10.0.tar.gz 127122 BLAKE2B 45a254629c2d1e73ce500edb5ba05f165dfaa9987bd62500490cdcceed11708878bc82441f218cf2f5a38b50301a2bcd0aabd0a5e5810346586d8d6463162ba9 SHA512 a5f4393407a17f4de5977483f3c7fa651780b9b9069a0a1898a5b511742262dfb06f891cfcb632c5b64ecfd041188095ceb880c6e71c99c81f0eace59e4e1976
 DIST pbr-5.9.0.tar.gz 126893 BLAKE2B 3f1d39c037afa7fe6d45b0b039968243e99717b347d1f1ada25023a64e7e683c0d83d2ce177e0f7c5f4cb65cd2a0eedd594b463d5d72bdc86560d811bd3f0cd3 SHA512 b36cc331664b91899a884bb1bc6980174ba2463db35c591d480d0b5a49dd37781132893e488c6a9238fbd2ec16589652d66b01a8c2701d02ff5c0b04e9c6121b
+EBUILD pbr-5.10.0.ebuild 2186 BLAKE2B f299c5168c606737e78b1fe0e02e2d1f0d11c9358fbaac912287f3ded92215be9435f774f26fcebc4e7d67a9fb18921e6e33911e5cb98ae7274c8da21d2cd31c SHA512 971a7fc3984533436e4512d7cc6e20b47972af7c92339da1d8858d4aa81e80f8ccbf4f10d2a94bf9b91c503b58fb3a43a0b2d3a1b494b6a4ab90442a155675ab
 EBUILD pbr-5.9.0.ebuild 2140 BLAKE2B ef8b041d4ea07de48895918c8e14c114751f75cb2c62478c6447cfa6e5c7a662767a014a4fe614f9d53a4506ef2ca4ebc92421bb820f709764606508d6dd4a2a SHA512 065b9255f3d35bf54f62afb298ddfeb7eb09b0a5815fe6c6f19f43d0f7bf51d20c8c43d42e7e0b3d28d823d65a4a487e7d8fd3b782ce75b5bc3625abba656a17
 MISC metadata.xml 815 BLAKE2B 439ee90d79572a8653f1ae3b8b5bf0883adb34ceac5257458dba7a2505e25ebba1c5080095139f6521d8fbd57c11ea38cf4049710b584069aea0ebaa7760077a SHA512 3d0618ef6656706acd829be80b2e6a0b0763b5f4128dcd360f28818d42cbc8825ecd04f7f47af5929a3a35fd60a3b9f9816cc37ee30af164c2e5b51764c25afe
diff --git a/dev-python/pbr/pbr-5.10.0.ebuild b/dev-python/pbr/pbr-5.10.0.ebuild
new file mode 100644
index 000000000000..f1d5a256fa49
--- /dev/null
+++ b/dev-python/pbr/pbr-5.10.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="
+	https://opendev.org/openstack/pbr/
+	https://github.com/openstack/pbr/
+	https://pypi.org/project/pbr/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+"
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# TODO: investigate
+	sed -e 's:test_console_script_develop:_&:' \
+		-e 's:test_console_script_install:_&:' \
+		-e 's:test_setup_py_keywords:_&:' \
+		-i pbr/tests/test_core.py || die
+	# network
+	rm pbr/tests/test_wsgi.py || die
+	# installs random packages via pip from the Internet
+	sed -e 's:test_requirement_parsing:_&:' \
+		-e 's:test_pep_517_support:_&:' \
+		-i pbr/tests/test_packaging.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Testing on ${EPYTHON} is not supported at the moment"
+		return
+	fi
+
+	eunittest -b
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 689b6cef063e..635ad1cfd19c 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,11 +1,5 @@
-DIST pyfakefs-4.5.6.tar.gz 206310 BLAKE2B c37cb4709a285bfba411cd76da4f158cfe682d210411290ed3e06456ceb5b6de99ecc320da748c8d9b0e230b6384290638d3fd22f0e1388c1965b2b2806d2d30 SHA512 c7a31cc94eaa2b1830d4da355bf4d3de5cbdc8851561ec82fd2de9fe845457f13bcc25aa58a50afb862f396cb0e83c8bf71bb8be51cc3b628ff01b25db62eca6
-DIST pyfakefs-4.6.0.gh.tar.gz 208832 BLAKE2B 60a8c3223fc92e366beb8907ea0c8f242b91ddd422ab0b551d04d7c24ed3d4202b7c42b8971eef0f15fa27b7ed0821637e9341b3feeaf02232948a50898213d6 SHA512 9f507c7b0e28591886cb91c36dad22d6c55d123a447070c2fdc6573d2db1e2bb79cd5c203a9fce762882de680feacaf7e3b57f9bebf6922c643bf61fe44878f2
-DIST pyfakefs-4.6.1.gh.tar.gz 209134 BLAKE2B 81dc53dad9e815eaf3024f157aab36afcfd6547485b92b47e5acf2b03f49eb6ffe0d07da1c4d16b82585870535ba9d44580f190c28856dba6906d07996aba2f7 SHA512 ef2defe59e84e6e85408e7369efc86c1d6f3981456a2628552b63b8fca959ff8536b41fb006bd8b291bef9fb3dba17126c4e211a21f0d11cc29da8f7d5addce2
 DIST pyfakefs-4.6.2.gh.tar.gz 209535 BLAKE2B ffc14a6fbe55958c05cb9d2343d5375f1b72fb3264de2ccd72ee225a8569bb2de1a79cab597eb17f6b5ffeefa1ed224d0997ebd9b416ed357eff75cab24652bd SHA512 60a1c7f2ce969df91e0cabba85aaeb941ae38346c5f83f3fb39c112d49e51f53a837710b16d46096bbf7182b076f13b0aafbe4e7e34fdcfb2c49720958e35cef
 DIST pyfakefs-4.6.3.gh.tar.gz 209890 BLAKE2B 71f84ca02a8a1f9fa5541e0cac1cddd270a8fc66fe5d1f62e8c7bf017f4992e93a6d1bce83847c3833f841e7935d86d6b59b17ee114c82a9d2c36e9c5fe87d02 SHA512 b34091e4311c69ee3eb46cc631c00ec07804c6d5add42887f850275dc0c22d07a893d5dadf2febcbee15c631b476573e63ae52a9ae5780d83a0ef774cff11a5a
-EBUILD pyfakefs-4.5.6.ebuild 1553 BLAKE2B 115f6b5b6ec93d47e45fb46c2a6acfdbddd535e1f2bf5edc5a470dea6814d50076fb9df51c7edd8b996d3c0a07c2e08fc2f69076826419fb9b20cf1d263652ad SHA512 4d540e284764f87545e4b284dcfb666943d173f3ca00228f2dcdab0ab6b046eab29926216e87668e5a0193f6ae4bfa2d6b3c2c00c19f84ef1c13de59445ee3fd
-EBUILD pyfakefs-4.6.0.ebuild 1478 BLAKE2B 22a3f52c585cdd23edd0ce8e6ba22b807436f9f243fe0b048386f9d2d769e1aeb66855b5961dad4869838b8dadbb31d194d5c1ca68d272e84c2b8b1d07aa1525 SHA512 789acb3e32a066104ed9d419d507de224e586d1daff0f1f6c9a47b741c589edf04b36ba17c041ec656f0aa4590e1ac34d5b50bb053ec5b5130447b828ff106c6
-EBUILD pyfakefs-4.6.1.ebuild 739 BLAKE2B 106b475508e75d0cc59630362ac5b424330ff9bbab6521b9b1fd4e47a8a6a828a03a1d65c26d625c9d0e73fa1d00ca94a05f8707fd33439f8235cdded55051c9 SHA512 f64f1538e124fbd96d49c8323dda92f6b21f4f69d67f974f8b6c42a32a89ac567ebf749dda480ef6a35eac8ee950c657a10c74aaca80881d40573612b86eb569
-EBUILD pyfakefs-4.6.2.ebuild 739 BLAKE2B 106b475508e75d0cc59630362ac5b424330ff9bbab6521b9b1fd4e47a8a6a828a03a1d65c26d625c9d0e73fa1d00ca94a05f8707fd33439f8235cdded55051c9 SHA512 f64f1538e124fbd96d49c8323dda92f6b21f4f69d67f974f8b6c42a32a89ac567ebf749dda480ef6a35eac8ee950c657a10c74aaca80881d40573612b86eb569
+EBUILD pyfakefs-4.6.2.ebuild 731 BLAKE2B 0ab11240761da6c015697ee57291a238f1ad87c84066bff7716a9a1f04204875d7440ae0b1b887c23a28fdd21081e69a9adc71c90793ce9bce3d365f43b5995c SHA512 14c671284240177c0ec575a886bf6131d90894ecfe3feef00299a94f20f2804bf89a221e355d93d30b5ac56dda8cc56dfcdab8a89c5453094c9506866e40d93c
 EBUILD pyfakefs-4.6.3.ebuild 739 BLAKE2B 106b475508e75d0cc59630362ac5b424330ff9bbab6521b9b1fd4e47a8a6a828a03a1d65c26d625c9d0e73fa1d00ca94a05f8707fd33439f8235cdded55051c9 SHA512 f64f1538e124fbd96d49c8323dda92f6b21f4f69d67f974f8b6c42a32a89ac567ebf749dda480ef6a35eac8ee950c657a10c74aaca80881d40573612b86eb569
 MISC metadata.xml 395 BLAKE2B 8db2ffc4bcdcf27ed640f08d3f79b1dac72f3609d2113c5e2590c9b127ba0e20bf27f040976a34fd8a08166c455140cbc586da72d22ca67c329717bf5d54798d SHA512 86850a2bdfbc39096105db00d9b249224ab57c1fac71738f0a5df2b83bec7773f4150f7480b18fb066122fe0ed46fbc923a72e837db429b5b322e658bb340010
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
deleted file mode 100644
index 4e1d2e411cce..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
+++ /dev/null
@@ -1,43 +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="a fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/jmcgeheeiv/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# known problem with the test suite
-		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesModuleTest::test_fake_path_does_not_exist3
-		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesModuleTest::test_fake_path_does_not_exist7
-		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesTest::test_fake_path_does_not_exist3
-		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesTest::test_fake_path_does_not_exist7
-		pyfakefs/tests/fake_pathlib_test.py::FakePathlibFileObjectPropertyTest
-		pyfakefs/tests/fake_pathlib_test.py::FakePathlibPathFileOperationTest
-		pyfakefs/tests/fake_pathlib_test.py::FakePathlibUsageInOsFunctionsTest::test_stat
-		pyfakefs/tests/fake_pathlib_test.py::FakePathlibUsageInOsFunctionsTest::test_stat_follow_symlinks
-	)
-
-	epytest
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.6.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.6.0.ebuild
deleted file mode 100644
index 926e0dc49359..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.6.0.ebuild
+++ /dev/null
@@ -1,43 +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="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/jmcgeheeiv/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=()
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		pyfakefs/pytest_tests/pytest_plugin_test.py::test_pause_resume
-		pyfakefs/pytest_tests/pytest_plugin_test.py::test_pause_resume_contextmanager
-		pyfakefs/tests/fake_filesystem_unittest_test.py::PauseResumeTest
-		pyfakefs/tests/fake_filesystem_unittest_test.py::PauseResumePatcherTest
-		pyfakefs/tests/fake_tempfile_test.py::FakeTempfileModuleTest::test_named_temporary_file
-		pyfakefs/tests/fake_tempfile_test.py::FakeTempfileModuleTest::test_named_temporary_file_no_delete
-		pyfakefs/tests/fake_tempfile_test.py::FakeTempfileModuleTest::test_temporary_file
-		pyfakefs/tests/fake_tempfile_test.py::FakeTempfileModuleTest::test_temporay_file_with_dir
-	)
-
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.6.1.ebuild b/dev-python/pyfakefs/pyfakefs-4.6.1.ebuild
deleted file mode 100644
index 54098f2af2c1..000000000000
--- a/dev-python/pyfakefs/pyfakefs-4.6.1.ebuild
+++ /dev/null
@@ -1,30 +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="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/jmcgeheeiv/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild b/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild
index 54098f2af2c1..f062dc1e6d95 100644
--- a/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.6.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 848514c3eace..5735e54436da 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,5 +1,7 @@
 DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
 DIST pyproject-fmt-0.3.4.gh.tar.gz 14400 BLAKE2B 3ab116fe4d4f683eb3700ca2cb855744111b806514ef18f56cbe6628bfdb6935b813e852ff6ff64716959f1580e8817f485ddcdec6c463ecf5c8935912316528 SHA512 0e3adddfbe8afe3b9da85033ceea7c4e37f59bf48722a5897f6e7f2963cd95ba9eef7309c095f4b3fbd927a6486a058289cc3fa5f90c0108a75686b1b81d13e2
+DIST pyproject-fmt-0.3.5.gh.tar.gz 14718 BLAKE2B 6ccf58350fd2c4cd0726a3f66513cf9f4558b9e1cc8b9b1e2ea2b94844b9e6ab925ff5f141cbd32d8ea63b43f84a432034af69150fc1fa8ddcbfeab0a139c2d5 SHA512 c6b668d860f04a944872867574cfbe0946e7a5425cfa5f5b18e9ef0ce1e007197e7eb9915d76ca54e8963e71eb3fa7aee1f8362a63aa7bf89e06ca95681cdae8
 EBUILD pyproject-fmt-0.3.3.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
 EBUILD pyproject-fmt-0.3.4.ebuild 844 BLAKE2B da278d7a61022d03d41f0ba27d184db1a7077d7ba1fc40caf63cebb01484e049e0279e90ae8ff6e5e123501cdb41a2a143330a741bbd699d4cae6393f6f818ae SHA512 9f3904da03ef860c3f907e64e048048d44c10000231607593e256ccc4b706822d343e6b3f03cbaa30dcd316ed3ab6381b464417285e4cfec263e56a718bcd232
+EBUILD pyproject-fmt-0.3.5.ebuild 854 BLAKE2B 3e999cb2a0a95b1726033351524bcc11501e45eb7c313ac34b849c0e441378d01188ea09df918088a11ea7bb9f4fbff343aed5ef0c338bb0d0cbd729fd5e6351 SHA512 7714d1aa1e041e604e747d4b5deb9d0f6fcf128fb55ccc7e40d7ef359e178c395206ee379aeca8a80b4eb4ee55b041cfb55151b9e0e4079f3648a73287b16825
 MISC metadata.xml 356 BLAKE2B 9d15eb809d02ee235382282c3eaaea6ae0f3c0192045829495fae1244f88907673f5e5ec26ee5234f25267add21b34fe416d1d48e54f3a899773160bad1cbc8d SHA512 77a3e6273b92141d5a337ab28b162ee27f3f1970316fe42becf2efbd4cdbc5ed6cb26f1f24201d0605c26dfaac75db467f42b00cc47df0093336bd0629f0a1cd
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.5.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.5.ebuild
new file mode 100644
index 000000000000..142f153fd0ba
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+SRC_URI="
+	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.11.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.8.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index 5ec447932258..7fe2926dbc50 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -2,6 +2,6 @@ DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c015819568
 DIST pyspnego-0.5.3.tar.gz 389939 BLAKE2B 236151d9d9f37137d46b06a99f037922563b4d43931288129492aa7173f166d24c3086297e30a0f05158773101df9868f88efffe00864b1bd5deb0a99a496b61 SHA512 41ca9f785a7dcc99818da351e0a020ffaed72d65cd67b0f19ad4a462a6a1fe739d040acec85052133a19aed06066dae9a9e8f0b469713b331f6ddc52cd3b4c0a
 DIST pyspnego-0.5.4.tar.gz 390427 BLAKE2B dcd9a58b2ecdab8d0ef89c6d321cdc75b8711d613afc7fdc2d3986768397b8c097cd2dd86383da7072f8e85686ea02afbe4c738d603d20590c67f8560df5e790 SHA512 5f49ba1a2f86880ded9f09f81969eecdfefc468c72c770846e3af6520bb186c585bf8d74e8fc16bcba24d9220f88d6f5d9b59af203efe499866d6335d13b96b5
 EBUILD pyspnego-0.5.2.ebuild 922 BLAKE2B 72374a98bd8ad5eaaadb201d5fbaf996eee2050f84bf232e67eb135020f2510aa2332a7e24051ec5846cc1f6047d552dd4373d0c0a87562e4f9cbc3aa333915e SHA512 1320ae5b3d893d70604c4c32152974f59dc31399b8aff9c2e93aa4aa8d90c437c29c1f9a7b368fffde1ef804163df16e7d355241c64c53b3816e6d909dd621d0
-EBUILD pyspnego-0.5.3.ebuild 983 BLAKE2B e92453d0e2c2c856fcf2b956e66c8f5fdc20b1e90947bbc9bf61fe57d4dd70a6518968e58f722abada3845eb531f9f464ab41ada10d441e0cc64f3b9cedc202c SHA512 fd78c905f5ca82dc3ba409cbf223ea3a8725e5d0a7c86d6ec85940fbde0deae1ec6f26c98eaf0c4b0c87eb0cbaeebcf7caa23c0d38097db45bd6e31052b291c4
+EBUILD pyspnego-0.5.3.ebuild 982 BLAKE2B 97ca7c2451d24c9308bccd207cde44b5e4dd37f2f352edc3bd2750637267028c9a14e83fb1eaae5cffac5bb663b750c6c33c28c83276242822fe3c5da5f44d40 SHA512 1a0f86ead69999eded2f5ab08c25da5f082a9adb7d15597bd87b2836a2b4c275e528603da62a10e4b60edf25ed058693ea72597676ed1d4ed785a36a3f87891b
 EBUILD pyspnego-0.5.4.ebuild 925 BLAKE2B 4c3d306b7b88e0bfbdded05c1e8ba82f44a9f1db3a32264b9261f5f8edd9fad45d83c8482f1d5bb32ca00de355e2a9f007ac67a4e93a95c010e9a8fca3858931 SHA512 f55c7a99baff0bdc65aeae861402156ca34b06f076d1ffc5211ff43d3410ad26bab015fe3c1ec51f45f6c1d0e01233142ea394ed6fe9c523f84217b09a46e98f
-MISC metadata.xml 370 BLAKE2B 113adf1bd70a99f41e2b8cd4d5bb69cbd4f6bffa1dba325a8a6e35a1b5ee2800ef1d4b9ceec9be2ad1291fdd054fa81fdb841cdf40b5e969360bf1ee2e456960 SHA512 baa8a1fee20b0cea6308fbfa24fc395cd58e8729eb703692cc2a109e838284ec21559d4c9af3c99fe6d63ac6a8e04e3a3c824cb073302f788f2fa5dcf1dbf00c
+MISC metadata.xml 445 BLAKE2B 2d30af32987aa7118331cb4c199b44069f6a6efc62d73eab62a31b29308848b7f7e56e026327af6c2197ee31c05fbe1885524bba7b6a84cdc0d97cc58c5fb43b SHA512 c7bbe6f161ce61409f6865f998fb4c8bd77c39011f5bbd148379912e31805773a41451163517cb7ebef99a57d6abe8f13dcdc568408ce182c0def6adf35afc9c
diff --git a/dev-python/pyspnego/metadata.xml b/dev-python/pyspnego/metadata.xml
index bd2c30b425b5..4f6197ee1acf 100644
--- a/dev-python/pyspnego/metadata.xml
+++ b/dev-python/pyspnego/metadata.xml
@@ -5,6 +5,8 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<!-- the C extension is built only on Windows -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyspnego</remote-id>
 		<remote-id type="github">jborean93/pyspnego</remote-id>
diff --git a/dev-python/pyspnego/pyspnego-0.5.3.ebuild b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
index 6ce9adf021e2..1a908b0d6732 100644
--- a/dev-python/pyspnego/pyspnego-0.5.3.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 9afde18e4003..b0c668ddc7ed 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-glanceclient-4.0.0.tar.gz 202815 BLAKE2B a1d6dc46ca77c67bd42e6603b36652cc2ad9464b172b0bea778aa87130a6ed68613dda68db1ad5215e6d2ea34b9ecd96bc0ce853b94fc137b80aa7c85763622e SHA512 31ce9ee865ba543674a9ccc0267f1e02308e444bedfe1728ed59c20abe77cd7936b059c5adb0a8f73e5bf999c5ac5a34ac3cafe2e695718535ead786916e2414
 DIST python-glanceclient-4.0.1.tar.gz 202810 BLAKE2B ccc328aac739979d9ef3b3c4b6cccbef0865860827112c73a7d15d257f1735c69bac54d5771a27d6e6dbfaada4825b624d312a17195b081f3b5800b662c3f926 SHA512 23e931741430c0ba9606b5f013c6724285f8d49691c092c11db97434d963bd257639df769cdbc0e18ea2f5a57c13b03c887e8a091fdb40b292ae6a33f28b4e31
-EBUILD python-glanceclient-4.0.0.ebuild 1368 BLAKE2B c214037962e915dd7cc819fe0cb7e909f6339fbd5c0c4cf062784bbc03bfab6315b5b77b4e0d6188934c6bc998208b37387e659e481075f3703610e2db32a760 SHA512 42546dfe8a3785af744be30a4eee98311dde31a0732d5b021be26b3c239465c46c87278936f81d67eb09bd51ce3d415c6819db629f8c6d072fd4b9f30da59dbc
-EBUILD python-glanceclient-4.0.1.ebuild 1371 BLAKE2B 996adf0be8d7a17b7d055ba49ac0637d932941990d355659659ca46205bde78799a23f260388b506251c02e86d7b2a0f3aa01b50f3be95a837a2c864abf3da62 SHA512 fbdf8ff51ec8bce53bdfca4f24215d0d709ef3b9b3618bfb5f89857a8f5abeaae18911cf023fb7c067d0efd220ba46f228ea97b33bb4763c8827f8fd2c2b1faf
+EBUILD python-glanceclient-4.0.1.ebuild 1368 BLAKE2B c214037962e915dd7cc819fe0cb7e909f6339fbd5c0c4cf062784bbc03bfab6315b5b77b4e0d6188934c6bc998208b37387e659e481075f3703610e2db32a760 SHA512 42546dfe8a3785af744be30a4eee98311dde31a0732d5b021be26b3c239465c46c87278936f81d67eb09bd51ce3d415c6819db629f8c6d072fd4b9f30da59dbc
 MISC metadata.xml 663 BLAKE2B 642540f3f4d577797725731f2374b5801ec2d4ad799ee4ccfaa4e29d955bd93a8ade0e6c9ec7712ee27d9f1f93186854472d301016a732020575b8f7bc1c5138 SHA512 fa9b88dce5a10824dd0d6987698587666343c95d8b6c607e466f14883c34fb0ebc846b683ae7d8bb65efe88007e6db0d2b1b41ba389c3b656a24f1839d03d9e2
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
deleted file mode 100644
index ee5d6545a356..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
+++ /dev/null
@@ -1,48 +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..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b glanceclient/tests/unit
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild
index 448af8dee379..ee5d6545a356 100644
--- a/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index c752f3ea1325..7d29628ed7f2 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,6 +1,8 @@
 AUX pytz-2020.5-system-zoneinfo.patch 1294 BLAKE2B 0f6f4cf1c588b90827decb19d82d7adf97f44769b2acd4038d6b818ae27162f576338b61de6775b4aa387b4a1cb434b36d6f14fdf1eaa3c878e2af7e9ce32620 SHA512 aad785a23a3681de7d52c4898eae4d7f33ddff9c136f52111ab0aef076d0a3c72c7b0aa0910e191f3098baa05c09f522e927a94967481a89d1d1bcbe99824e3b
 DIST pytz-2022.1.tar.gz 320473 BLAKE2B 9a745629a9e4547f8c8765353e58baa6d63e3e6b357e9ca88f69928fb9350cebb6bb3371eee419b4b92b29e6253f8c24af8c781f10d72211d78cb699043496fe SHA512 7737aa28626743026b7de932b27bf44d7b209f495d9dd7f90c6448ec271e007f23004fcd04982e2ca6d0a4075206e1dae7b8836319c299b5559c514366d518a6
+DIST pytz-2022.2.1.tar.gz 316105 BLAKE2B 74a3f416c5e15a050cc62594851d80022c81cb611e6c1d1130cfc7e1bc9cb3b833edca9e67203695c50abb7587bf514216f8c0153890658bc8a9f1498e82f867 SHA512 9c78d9f484e2e0e101ca7e10fba8e6c9870255b2c320b3499a0cc9b480adac64b07f2f124048aa957c6bc9311a4ac43060368e1f0d85d8e8c8f7df598e47912b
 DIST pytz-2022.2.tar.gz 322487 BLAKE2B 37aa920a571b751e7fe55140561f9d895273c63c5ec4f0ce32e12a9966c903de590d1bbeb8c3d29eeb6ffa46ecf68584128aefc4349c3fde2af923f275c1c01c SHA512 7a908801585f95dc7e19756b454b38ca991e3c280ab4d946152ff0ecfb5ac89e266b21c5a165797ec64c9aaaaadf729f935d7eebd3f918df3143bd68b23876cf
 EBUILD pytz-2022.1.ebuild 901 BLAKE2B 16d3a45d330bf3661f0831d8ec4dff95a06a14873e23a62f07c2e76beb70ed41b7d2edf93c3950dcb919f39ce9422fc05a379b2b91fe855bc56b3160336a9cb3 SHA512 048c3dfa01e358c8cae65d125be4a1c16c1bb1c82c06432f758dede03140bfbee64bbab08d376749e093cab247813ee87fd3eaac1a5eb25a5f6e62b6d53899fb
+EBUILD pytz-2022.2.1.ebuild 805 BLAKE2B 3c6565965f2e2b40b38e549724861b90b1bc69972fcf9aac3dc9b2fdf93bf8eb0ac3a740a402d0b2a1a9b43aebcf21ed1408b7a82d93bb8aea5add6e66ab44a7 SHA512 1b6b20b532ef5aa0d7bf8cfb60711e78d7e30818ba39f6e922546f5363e414baa60fa0def8ce8557cf57f87f3aadef01e894ad8f71a8302d35d9c5f2f0237dfe
 EBUILD pytz-2022.2.ebuild 805 BLAKE2B 3c6565965f2e2b40b38e549724861b90b1bc69972fcf9aac3dc9b2fdf93bf8eb0ac3a740a402d0b2a1a9b43aebcf21ed1408b7a82d93bb8aea5add6e66ab44a7 SHA512 1b6b20b532ef5aa0d7bf8cfb60711e78d7e30818ba39f6e922546f5363e414baa60fa0def8ce8557cf57f87f3aadef01e894ad8f71a8302d35d9c5f2f0237dfe
 MISC metadata.xml 765 BLAKE2B 437ebaaf2229928930ce99bed100856934d5dc4fcbbd5fda5b164041668404015421800f59c408168c83cdf8d8a5db126dc1f6261ac6a92398bdf0d733ca96d4 SHA512 dec5518cc05dc97ba6897a6d2f55933b2561153d55b60511183e4adf6d308e1a2213fd870b5ce7bae11c157d33ff1bcf0a37d7a2675e92a8b02eca0f660af29c
diff --git a/dev-python/pytz/pytz-2022.2.1.ebuild b/dev-python/pytz/pytz-2022.2.1.ebuild
new file mode 100644
index 000000000000..02775780a89a
--- /dev/null
+++ b/dev-python/pytz/pytz-2022.2.1.ebuild
@@ -0,0 +1,34 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="
+	https://pythonhosted.org/pytz/
+	https://pypi.org/project/pytz/
+"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND="
+	|| (
+		>=sys-libs/timezone-data-2017a
+		sys-libs/glibc[vanilla]
+	)
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 2c90014b2b5a..26b4d65bc94d 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -8,7 +8,7 @@ DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdc
 DIST reportlab-3.6.8.tar.gz 4503191 BLAKE2B 3d61ac2554309a8dfff2107ba6157152b558355fc6ebd7d2337b0f3152ceb9644ae2dc20b6e0f2ed312a579fc5f172e05eeda69e3b6acbbf921b62f27ce50f77 SHA512 7eb2381a8020f751f03008bb8dc1eb07f954a97c0c3d38646602a22ed7f69dd73e11bbd1251a471da141c98492be7f3867cf120e489c58911ae6e9f29c926507
 DIST reportlab-3.6.9.tar.gz 4507750 BLAKE2B 881eeaa36fb3934a75e420822d5b0d0f1718da190741190e58756c952bc3efac304e2c7747d8748713ef3f9449ead40c44d6774d6ca90218db51c16790d9e8cd SHA512 401127eaa3e4c9f303f5c13f96151a563a16efb15d1e9aaf6dab04cb23f275b552cdd8fb9a3a49bca420a8ddf83423c481dacdd11e39220592cf0ad911b70c42
 EBUILD reportlab-3.6.10.ebuild 1245 BLAKE2B 0b7cfb248e32193c06df4a017b018ebb47baf5786b91b12e641f43e7a3461d8a6933e4a7753860d1ef14b564aa6fe1ddec11ed1472bf20c61cf33ada6d3b781c SHA512 cea1cfff67c11de929dbcdf8126c1a078333ea96048bbe191fc84b62d047d08b74a831bac49b636c0ef2d787dae611d86478e113d09981d0b23d562cd3c9c5de
-EBUILD reportlab-3.6.11.ebuild 1247 BLAKE2B 71d4d43d3c6e7c66e2c51e55d43208d38fa693bcfad35a6daacaf36613170cc352a939dddde4f0f2c7ba7b4dd5c8862f3fc36b494d00406b8c2e5689678bb61e SHA512 b1351339cfb13e9fbc7aecd518dd91ae93579c2f1dae768ff7ab5da952ed774ec8f6d7843aa9e1bb9b1755daffd334566ca9397e072cf8cab782f7e071943a86
+EBUILD reportlab-3.6.11.ebuild 1244 BLAKE2B 737a305558c08e45c3d3021c46f3ee97f6961dd2dc3d3d8d1d08ae260c9204c6fd0fc84c590753e64c38df55e546332c339c0d40bd56dd9de0d4cda3967b0fe0 SHA512 ba45964fb6aec16d0aeae6d072dc8bfa70435c30fea6e87f2389e5a1eba38a1750cb2683c88fd431e8ed2a736726485bde9d1332228afe7acef21d5679e9ff13
 EBUILD reportlab-3.6.6.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.7.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.8.ebuild 1294 BLAKE2B 4f05f621cebd0f1bf5c81731b305f6c95223ace2e0f41f5202780b12137f9bfcef709b40d16fd3f3893da4a2bed0daa6826b3968d48f64852cee6deedaf29eef SHA512 38aef3cc5db138fb2356a5752e8b8c50a85964c368c211efc12c6e9b989d43d06bd8d59d05e4a7ed43c0f5711c985973010275d65e35659ead775dfadc0b8d29
diff --git a/dev-python/reportlab/reportlab-3.6.11.ebuild b/dev-python/reportlab/reportlab-3.6.11.ebuild
index 1ffad971fbde..d6c91033314b 100644
--- a/dev-python/reportlab/reportlab-3.6.11.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.11.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"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index b0f3b43b389e..63c35a831125 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,5 +1,3 @@
-DIST rich-12.4.4.gh.tar.gz 14891341 BLAKE2B 7829951edb77b8e78bcbdeb340fa6c96901d634fb59ab16b8866b898973a95bd38de9dd1a8f6c821cd2222447878a5d22773abec329f49753e207b5b358c3532 SHA512 c1d077bb1448fd436fea87697d31b484615f787c9259418d6ebd12da45bf14f25f192198e4522653c5bd4e5ba218da7d72597e20d04dbffce4a3ea8bd82ce27c
 DIST rich-12.5.1.gh.tar.gz 15034345 BLAKE2B 0ff73986d46c70ad6c959bdad2a28e25404bc7f50567f2d559213dfc5341a58b3e3f5e20907275b507f12c107e5d2e947434949ffb7887abad86d4df8cf3ba72 SHA512 41b4328211b825319962056a56df66b86770f62556f84c6c9ad276ae919ec352cda58ecae4535cdca8461913b6be4b8f30d81e0a91cb9a2944a890206215f11f
-EBUILD rich-12.4.4.ebuild 1484 BLAKE2B a51891d479aad08cb6b3077beaaebdc550917d5f65c254f6445b3ebf446a121e6789178e5c34febb707be699c7dface9c70df548b8d24d0e552b19aaaa114c56 SHA512 490be77fc00accfe30d9076464d5c29a61a838fdde564c94ecd9c42b2ad294fc756d75c89c9eba2fb206138f261b5ac8ecb7cdac0d96fc461bfee47b107443eb
-EBUILD rich-12.5.1.ebuild 1492 BLAKE2B 2df3ff04bcb438dd0895f51a2c2de3da823c4a9fcc52cbb52e4d4e0f6de296ca97546f987b8be5551deabbf6227ee3b2061ccc5bd3c03ac6c7f40964021645fb SHA512 240f45da29c490f9ea76097dbbb23cd3a3e4c2e8d1017ddca37e353eaabf9bcd246c1b731a7b9c350224cdc9b9054144a813fa0853e83f430ec8d34de216ed2f
+EBUILD rich-12.5.1.ebuild 1484 BLAKE2B a51891d479aad08cb6b3077beaaebdc550917d5f65c254f6445b3ebf446a121e6789178e5c34febb707be699c7dface9c70df548b8d24d0e552b19aaaa114c56 SHA512 490be77fc00accfe30d9076464d5c29a61a838fdde564c94ecd9c42b2ad294fc756d75c89c9eba2fb206138f261b5ac8ecb7cdac0d96fc461bfee47b107443eb
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.4.4.ebuild b/dev-python/rich/rich-12.4.4.ebuild
deleted file mode 100644
index 7bc3d6877b3d..000000000000
--- a/dev-python/rich/rich-12.4.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# broken with =dev-python/pygments-2.12.0
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# the usual deal: output changes that cause test mismatches
-		tests/test_inspect.py::test_inspect_text
-		tests/test_inspect.py::test_inspect_builtin_function
-		tests/test_inspect.py::test_inspect_integer_with_methods
-		tests/test_log.py::test_log
-		tests/test_pretty.py::test_attrs_broken
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.5.1.ebuild b/dev-python/rich/rich-12.5.1.ebuild
index a049e4167d88..7bc3d6877b3d 100644
--- a/dev-python/rich/rich-12.5.1.ebuild
+++ b/dev-python/rich/rich-12.5.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 72506774cff1..4c6402073368 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,14 +1,14 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-63.1.0.tar.gz 2599380 BLAKE2B 532f484ea0e40a820ac266e878e6210c953a37f32f6ec51032c2570395c71fe7d59b30f8787a1127c7c2ebfcd76985bd3f6f57b558f01a34eced8797cc6d1aa6 SHA512 367b52dfbd5d1a6980d061a47c1948ee8efd9632f694c21e8d518639b8097fbda8f1735641c25d7528bc11beeffc42d6bcba9e0d9b755d5b6fbb74d26bf7cc5c
 DIST setuptools-63.2.0.tar.gz 2605892 BLAKE2B c9475a64fbe22be348277d25582a0c1789544822a891ebfb8e8e79b122631d31bf3535aac1b408a254c1f29ea9ca20bd9b270e4d78ddc539aea4e3c59a6e7f7b SHA512 e55c19bb95415a5f831fd23dfc32cb79fdad71867bc225f2a76caecb3c188fa6a5dac8d13e131a97d1833672a245b28a53a11ceafd67ac19cacd4a247ba7d291
 DIST setuptools-63.3.0.tar.gz 2598685 BLAKE2B 8562824cf6e45f2757cbaf4360c0b7c8e592233875a00e5490de5f2af47ca2d43a6feac5876ca9e866fb840c62dc1b0aa2b2d7c1e5e9baf34741404803b02d31 SHA512 01f3b658862f70e8ce2dd74d9dd82a293216b356f1f3abb3b6b4fa77dd5347156a58959da6e6df349a1c114d58f617890e4bc8c6603f06be0fb3caec9bf21fe2
 DIST setuptools-63.4.1.tar.gz 2598515 BLAKE2B ae75b12d18e35c0d7d48c43eaf8f114dafc739253f672eb3ff2646a8951d0895df95c2d46fd77bb42aeca49a460e652eff41ac109fff24460fbcf02f7400faa1 SHA512 525bba1c07370a633c827629879bd4bf0147aec461ed2d935eaade21635527515eef6bdd1c8809304522cc890929ae0b12a5357e0035807d04cb8fb5a65fbf39
 DIST setuptools-63.4.2.tar.gz 2600520 BLAKE2B e5cedf9f5e58044ec74e45b7232ef64680854ba7be8f2c22e33373c7a8f5fc80578f99c9103eb81bc609fef56021fc7a311b03682842facea019d14387031f89 SHA512 a9cb002f3c9fd3e8ed189f800c45a9ab7bc51640430585226f290c2d6b24655999fbe827ddcc30fdd7f8a6ebd5e87dfc085d2ae1efbf35968213bb7dc77eeaee
 DIST setuptools-63.4.3.tar.gz 2600453 BLAKE2B 927be74bdc11271589134aca26849e61c5ae23d5780a57c96b9c4a9fe5f93e57fa8a80787c8db1c555f32fab1e007a956e91a374ed285db393e26d9486805ef9 SHA512 f19478921ffcf5441ec60a2af17c695456fee064f287e2130c4ff14d471a1124bd37104ad43adc7623ea0cba4ed170ed4aa37c6883aff8fd811ab960e6d12453
-EBUILD setuptools-63.1.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
-EBUILD setuptools-63.2.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
+DIST setuptools-64.0.3.tar.gz 2631478 BLAKE2B ff21a4cf81aed36561ac5a0da7d44c1cbe714bbd39de30041c48134c8e1204ad9edcb74540c392e4f4cf01ea161ae0ca4bdc55319e015748069986f30aa2d337 SHA512 0333322479d40b9d30187bcbb3ceadc5dd5ef8a5dcbcebc75f451b9fea06a5b7ca5d5db44c39278d62e932df7f563578c86fcd2cab9a41000caf15374a5cf182
+EBUILD setuptools-63.2.0.ebuild 4077 BLAKE2B df8d3d5974d76cf4ee9089f73dacf365659432ee527e27b394d53311f3cf7ee69b3e612b5f1e8d634d0c30a8875c14924438a48b3466afdfdccb506ffbe5328a SHA512 d2173d8c251e7f2f4dec2e52887674d5ca31a3ba209b7455e9e9871befb96814852da137b5acb9a86364b0d8c1c0b394a306d8c4995aaa517a9eb950553b33bc
 EBUILD setuptools-63.3.0.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 EBUILD setuptools-63.4.1.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 EBUILD setuptools-63.4.2.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
 EBUILD setuptools-63.4.3.ebuild 4153 BLAKE2B f91982c6f07cc0f4ac55572fc6aa1fe06697502e805f045236fc90bca0aae3e2dd2b9fdecf912290cc978be9dfee705d18c43e05c5da78f9030ae1e6bbefd672 SHA512 d047b71d51c1aa37f517649e96968cc1f741b47d7368c2c18b966737e39d29e427b123dcd96f3a0f8f7f19ca9f3264b79269bae2e87eda700233612fb8bd9a19
+EBUILD setuptools-64.0.3.ebuild 4265 BLAKE2B 90a66c5ece54c235bc5a0a0adc1fe880458bf8629e61f12877bb8fd9fc363f4a1b2e1bedfb9f809229de227dd2ac31b7c42a44b0bc7efa3f11173a58d48d5ee7 SHA512 ad5c82bb94c2c97dd4af5216b1cf1e53bfa9a58445ad5e76dedb346a4bcf5b2e51c2c9eaa03681d4428f8d5b19685b7644c4d9064e7af752d2be13a0b6dc3b67
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-63.2.0.ebuild b/dev-python/setuptools/setuptools-63.2.0.ebuild
index 4133756fb9e7..46976e01afd9 100644
--- a/dev-python/setuptools/setuptools-63.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-63.2.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-63.1.0.ebuild b/dev-python/setuptools/setuptools-64.0.3.ebuild
index 46976e01afd9..b79ed67ff041 100644
--- a/dev-python/setuptools/setuptools-63.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-64.0.3.ebuild
@@ -4,6 +4,8 @@
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
+# please bump dev-python/ensurepip-wheels along with this package!
+
 DISTUTILS_USE_PEP517=standalone
 PYTHON_TESTED=( python3_{8..11} pypy3 )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
@@ -22,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -104,7 +106,9 @@ python_test() {
 		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
 		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
 		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
 		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
 		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
 		setuptools/tests/test_virtualenv.py::test_clean_env_install
 		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 6e28e924d31a..f41b25e3288b 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,5 +1,3 @@
 DIST sphinx-notfound-page-0.8.3.gh.tar.gz 59219 BLAKE2B cdb95906dba4d51aee88b220f094204575f2800737f160c7c028033002d41d2c793a91e1c61101f7c7c960ddf3b4d2ef83fbd285dd73ff5aed6c6c933b1fc1e7 SHA512 8d43ccfd3f83ff25b7a20ee3f5352489092dc641b4a794199c06c0971078a132a42b05c85588508ec38487f2915eedec98c2deac02d6c4576828be2fbc7f13b0
-DIST sphinx-notfound-page-0.8.gh.tar.gz 57650 BLAKE2B e57634ba9a7faf81e6ee8d9b082d96742b580606f2e2fd559842049ba2e80bcb44bb6bd7a9c7eed6038e4c3ddb0416e32fceb4d47a72b8a600443e0020ff33d6 SHA512 eeb5b8da24ecb8f9814540a126f08204ae623705068608c2ee32a4f90303bdaab5f3934bdc36dd06dff047beb0225603f8cfc9b736769836385837047a36a674
-EBUILD sphinx-notfound-page-0.8.3.ebuild 851 BLAKE2B 61b2f12016a962a34246d9f5aff01990eaa63860b15662e4784972eb3a402f28a116ad2172d9c96e9a8df341396764bd8bbb27e1a64a889f103802ec6434073c SHA512 8ae791ee7566315326bd5e4551111eac5b9f868e2d80cc8ee0ac2615b8a4cfacdc13b0cd9c8e7c764f264880cbdb1153604b454dd0b8789c4a18bb11d72fc010
-EBUILD sphinx-notfound-page-0.8.ebuild 684 BLAKE2B 196fc0767066e1dfe51ef8f66665f746901b606bde13a8952bc72c93403d1ecc09cfe68c195fe535b6b5ca859a9d11168e8f8ca2a010df753c546bcf698aa5f0 SHA512 8b06394539060cf62c182575cacf281010c05ddae56cb54cf5ca9eecec64c561bdda1509e1ca39c2d66eb557d0d050a555bd1dea3bb3029f5b9af6bbcd453ac3
+EBUILD sphinx-notfound-page-0.8.3.ebuild 843 BLAKE2B 04240882eb8b94f78d9cd9db19b72730860f5caa87256232e37c2dd9802307385c62b7aa726e5dae37b591c1611f570036a8a26f61b13dd4bd111e981d2dc401 SHA512 b5ce449a31b9e18b71d8212f6b3c434435b73012e878aea7cbda3362ee3d509e8f073d9aed1ad6b8d896cb01f753dbb14df97d7f1eb9ae72d850d8a794b2518a
 MISC metadata.xml 651 BLAKE2B 7b4c1c58782b6a1e6118744d4933d8bfc1391fef578350f9622dddfb911a4319be8fc2cd2a297d5ac84bb97249d520a1cb740ed00d6314cb3cbf1dce5c119dfd SHA512 4b531fde722c6f0f0709405669efe61cfe2fd14e52f627ee67001b81d5268444b226630f55c6dc6a149ea86699379289368826429754abbad6cdaf36f1f4a673
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild
index 4d240a8aa65b..4e3c4d612010 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
deleted file mode 100644
index db1ca25f3051..000000000000
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded"
-HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
-# PyPI tarballs lack tests
-# https://github.com/readthedocs/sphinx-notfound-page/pull/110
-SRC_URI="
-	https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 5b4a9e36e749..f01078369431 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,3 @@
-DIST stevedore-3.5.0.tar.gz 513548 BLAKE2B bb9b1968dbfdbce0764b0c2030e5d555e159e04a88d8fbdb151d3146e7940643c761ff476f7d950c2e83501b9b125e8323a8463d8b4b93b79cc76ddf2f71a362 SHA512 be0f82230d7d4d3cf18dd913e11093ad90744e32a3021d9f88f0be244f56d0e3606af0adef67674c569c41d885837be3f0fc4d58009e036151cc67963a4f2ab3
 DIST stevedore-4.0.0.tar.gz 513561 BLAKE2B 7d82b001546c49d4a9fd7891751b2ed35f6b798bbe5efbadb1017472008cf0e32bd148311d100ac062ca45ee8c823ffc394842f4a9d2296262e2587c021e20b7 SHA512 584421b0fd8f9f45f7f6fa960a98817ae85c2a7938b0ea49c0906b6b88ae8111d3ac3cc8eb61e9e45dea494d976fad8074e51b8550d870bfca82704b7c8900fc
-EBUILD stevedore-3.5.0.ebuild 1363 BLAKE2B 0cb8470e708b39241344715f9b94b748db6d9f2db043c6c547fce4fad8abb8a47cf46f4a298bff41ddeaf9c7ab5b37de45731dc742ea20ab6e30741c1955c37b SHA512 dfd1ab0f730270f83e50293092e6a5be1aafa01273694c40b34d42409fddf919545e1a032b7a36a9b785b00836204ecbcbcfd134783550c80059365806a48d97
-EBUILD stevedore-4.0.0.ebuild 1367 BLAKE2B 60f73859547850b87a45b3e9f3ff6a3483cb68355ebac38a053e2abd12001bb04a9c579b8a56563f1cc3b33c3306e7921a1b4d74cd2263ec47178ac45bba8fe6 SHA512 accbb7b3246c8c39f331624ce86cf326d6635ccdc40a496c0922e88be48f88e8b789ce457dc6fcdf20285df8833b27051b5c534133333921f532168769a96dbe
+EBUILD stevedore-4.0.0.ebuild 1363 BLAKE2B 0cb8470e708b39241344715f9b94b748db6d9f2db043c6c547fce4fad8abb8a47cf46f4a298bff41ddeaf9c7ab5b37de45731dc742ea20ab6e30741c1955c37b SHA512 dfd1ab0f730270f83e50293092e6a5be1aafa01273694c40b34d42409fddf919545e1a032b7a36a9b785b00836204ecbcbcfd134783550c80059365806a48d97
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-3.5.0.ebuild b/dev-python/stevedore/stevedore-3.5.0.ebuild
deleted file mode 100644
index f7b722d6adc9..000000000000
--- a/dev-python/stevedore/stevedore-3.5.0.ebuild
+++ /dev/null
@@ -1,53 +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="Manage dynamic plugins for Python applications"
-HOMEPAGE="
-	https://opendev.org/openstack/stevedore/
-	https://github.com/openstack/stevedore/
-	https://pypi.org/project/stevedore/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-
-	# Known bug in tests
-	# https://bugs.launchpad.net/python-stevedore/+bug/1966040
-	sed -i -e 's:test_extras:_&:' stevedore/tests/test_extension.py || die
-
-	# Also known problem, inside venv
-	sed -i -e 's:test_disable_caching_file:_&:' \
-		stevedore/tests/test_cache.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-4.0.0.ebuild b/dev-python/stevedore/stevedore-4.0.0.ebuild
index 1f6940496911..f7b722d6adc9 100644
--- a/dev-python/stevedore/stevedore-4.0.0.ebuild
+++ b/dev-python/stevedore/stevedore-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index 6f7bf776a729..f1b3ff49601a 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,11 +1,13 @@
 DIST tifffile-2022.5.4.gh.tar.gz 290116 BLAKE2B 4c608ad38ad7ada0e1b41512eae7b4109680cab1f5623ea3cd6c01dfe17b534b518868ee21879ecfa9909f7680a04fbb63967b5c8064062cc325286baaaccb6b SHA512 cc6139872c42e0e2840a9774989b5cba57ef8957e2efa4349e7b224c61ebb8ad34287b9305dddd85b1239d03be4ada73526259b038c19c73513007e5f63d224d
 DIST tifffile-2022.7.28.gh.tar.gz 309010 BLAKE2B 4a52a688ce7f09265592f8bd2bed2eaf9648304908aa1b190c07a22b58f10bb3f71f9ea1f9a612a2592f75f457acc04cc2139ef0cbd75ea40a7e91408075062b SHA512 12647884cb77fc8e414c09aface82def1ad2bb0a11a1f17fa00e6954cf565a906b6a8c9e861d0a476a86ef8ea25da12d1069199109cb84030d312021d722f23e
 DIST tifffile-2022.7.31.gh.tar.gz 309561 BLAKE2B 9a7c2584dbf7741d3c77c7dac3a6a16393dc5630ac97fa2d5110ad7458c04b60dbb618075718856f7ad7846470430c6f978a17dc1706a58441460b28a57d0c78 SHA512 6e935b46cf404cc027e6430e304c3993e74b6ae577817efc68fff525de96b01f13b14cfce9a21c5d25a082bdcb56e4b4e6ab9803959357ec6bd7a26bf0d0503a
+DIST tifffile-2022.8.12.gh.tar.gz 312278 BLAKE2B ac48e3071f94855762f40173ce422fca5a980a88e20f0ea232a4d9ffedf0918c21b452ec168a1fb1481e2cd54fd4ce38a5b971bb7987c098fa1bf0a6aeedbf94 SHA512 35d7e7387bb2c7bcf88e8dac12e13c836a009f9344c9ae0cb0ca80184a42e6018744f09bdaa0d12c436b0561dcd96b97b2e6ca8106c512912b1eae813c5c3902
 DIST tifffile-2022.8.3.gh.tar.gz 310296 BLAKE2B ae503d79105ff5172879cb1b048b061b7ac795efebe8c3fe44792a33fb3fb14d1d6ba5e57cdaf5b8df6623b512efc3a8979474b3327b932087d898226b786b65 SHA512 7040ff4cdcf4de33bd158172086a31072084dd43ebd9b3277394ac7f50044af2447e8871a4f9df7132b068e0bea71ab4beefbbbb0e91dfaf3bdb07337cb7ec0a
 DIST tifffile-2022.8.8.gh.tar.gz 311091 BLAKE2B 96d6729f85183f35f89d984316aa2b05a6e9c7ad48d6936d886b2e73730663f6f704bf521d397b37df95a3bedc24a8285304e8e5e671446ed75226dd3120633a SHA512 6ee37f784bab0bdda9b45b1f58d7d5be4739b306448327401a47774640d64c69b00d1a1c550ae49b2616bbf08e5058e9b4911028aeccda141e623ded302387af
 EBUILD tifffile-2022.5.4.ebuild 1307 BLAKE2B e8d54bd2167e36d459d27d5d661339fac170426c90b0cc061d01a312b93563af890e0e342ebb287557a57eeb6e64e373243e1b04630ca42f80c16c2eb5cc5906 SHA512 9ba9172bf4621a59a8518ddc5caa6e5f0968a79373f2cd487b4510a98ef6b9f78380707bd4afedca2d0202dbbdc49574101e39dad961fdf2fd0d584e2f265e56
 EBUILD tifffile-2022.7.28.ebuild 1307 BLAKE2B e8d54bd2167e36d459d27d5d661339fac170426c90b0cc061d01a312b93563af890e0e342ebb287557a57eeb6e64e373243e1b04630ca42f80c16c2eb5cc5906 SHA512 9ba9172bf4621a59a8518ddc5caa6e5f0968a79373f2cd487b4510a98ef6b9f78380707bd4afedca2d0202dbbdc49574101e39dad961fdf2fd0d584e2f265e56
 EBUILD tifffile-2022.7.31.ebuild 1299 BLAKE2B 4c6855ac820a1edd5d87bd0c92bfd6d7681ee5a0a13bdfe7202414b858af116529a5b7859008412b9c88642e0f98c28b318875266924ad4bdef16fda385d60c3 SHA512 1ba1326803b67f7d339600d44460250c9e2844d1aa08305be51cfe963b0851ce85281801f9e62e3161c0722d98e32b17b1cdee9aaf06014dbfeee5b627b69815
+EBUILD tifffile-2022.8.12.ebuild 1423 BLAKE2B 36d965316db7e707e36c307079526d07ce599af25def338f7f1deb7ce5e01b9e0b13b074ad22b152989da30b2dbc52a05a4dcafc766d8d506975f70dc2f977f8 SHA512 9af34150cfaadc631efb859a60e4f8780db26198e24e751f130dbb04d47dbdbc174498b65ec96403ad8948c5a79e1a5c9edca5f09ab66a0d655bd6887080e82a
 EBUILD tifffile-2022.8.3.ebuild 1299 BLAKE2B 4c6855ac820a1edd5d87bd0c92bfd6d7681ee5a0a13bdfe7202414b858af116529a5b7859008412b9c88642e0f98c28b318875266924ad4bdef16fda385d60c3 SHA512 1ba1326803b67f7d339600d44460250c9e2844d1aa08305be51cfe963b0851ce85281801f9e62e3161c0722d98e32b17b1cdee9aaf06014dbfeee5b627b69815
 EBUILD tifffile-2022.8.8.ebuild 1299 BLAKE2B 4c6855ac820a1edd5d87bd0c92bfd6d7681ee5a0a13bdfe7202414b858af116529a5b7859008412b9c88642e0f98c28b318875266924ad4bdef16fda385d60c3 SHA512 1ba1326803b67f7d339600d44460250c9e2844d1aa08305be51cfe963b0851ce85281801f9e62e3161c0722d98e32b17b1cdee9aaf06014dbfeee5b627b69815
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2022.8.12.ebuild b/dev-python/tifffile/tifffile-2022.8.12.ebuild
new file mode 100644
index 000000000000..dcc5e51d8520
--- /dev/null
+++ b/dev-python/tifffile/tifffile-2022.8.12.ebuild
@@ -0,0 +1,56 @@
+# 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="Read and write TIFF files"
+HOMEPAGE="
+	https://pypi.org/project/tifffile/
+	https://github.com/cgohlke/tifffile/
+	https://www.cgohlke.com/
+"
+SRC_URI="
+	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/dask[${PYTHON_USEDEP}]
+		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_tifffile.py::test_class_omexml
+	tests/test_tifffile.py::test_class_omexml_fail
+	tests/test_tifffile.py::test_class_omexml_modulo
+	tests/test_tifffile.py::test_class_omexml_attributes
+	tests/test_tifffile.py::test_class_omexml_multiimage
+	tests/test_tifffile.py::test_write_ome
+	tests/test_tifffile.py::test_write_ome_manual
+	# requires tons of free space
+	tests/test_tifffile.py::test_write_3gb
+	tests/test_tifffile.py::test_write_bigtiff
+	'tests/test_tifffile.py::test_write_imagej_raw'
+	# TODO
+	tests/test_tifffile.py::test_issue_imagej_hyperstack_arg
+	tests/test_tifffile.py::test_issue_description_overwrite
+)
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 834f33eac24d..3153e74baef6 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,7 +1,9 @@
 DIST tomlkit-0.11.1.tar.gz 186422 BLAKE2B 805cf22577a2eb32f4c0183d517886706c23cb925b66a4620d11c4b7f8c6b4314f83403b01d5139695e70e3cb83125923db9e93d651d9bec598fe5fe6ea08038 SHA512 04e8c05ce6ce41a7040fdd02274bebc7ad363f54da9525af06ce39e842d4e7548395dca90a3d1f60956d29d051108719847bebfe6a9db0842a19f400e75481ac
 DIST tomlkit-0.11.2.tar.gz 187584 BLAKE2B 0b18625ab2a1a1caa916961ebedbe943f87a20695b9412ff8d276a39510f897e8df000c45e3b5324e285ce1bf925cb22370e9eef1008639e14f01ce28599692a SHA512 9f8e5f85ae9f408c10a1c64d1ab649db7b42c1b19eb0162a5edcfe894f0a179a0ba39ac7f478eb7bb14267f610169bea1d4e96cde8b9cf62df91218c989d5a2a
 DIST tomlkit-0.11.3.tar.gz 187825 BLAKE2B e58947100a3ff9c2d8d04072c7a244efe554e31e619216683558f0fd51c3156496633256f0ed1ab6f39efb8cb8e65ca9d2f7dc3fb9e4cdb1ad9cb16ea4ac6e29 SHA512 09582776d7472647dadc387521e380056cf0a0d7ba68f7bfd423046caea2ecb068cc24cafceb54cecdc2754be9b3a4ad0cc40c7a0027e27b866491ade5b911c7
+DIST tomlkit-0.11.4.tar.gz 187608 BLAKE2B f6920eb53c4b5dc13afd5ccd8b9ac5ae867e4b353e6bcc2be4d5e4d8774e2869f93f4c222931b2b3c505371b8812de5ef1797891ce828889a806e665ab32aa84 SHA512 b68b5d2c5f2ad7aa2cbeac308008467f22c0c9975862506bcabbfdf1de677dbaab1c5cead17c68f4bf2977a7077ddcc46ef6383bd8a87e2ac1252641ae463335
 EBUILD tomlkit-0.11.1.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
 EBUILD tomlkit-0.11.2.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
 EBUILD tomlkit-0.11.3.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
+EBUILD tomlkit-0.11.4.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.11.4.ebuild b/dev-python/tomlkit/tomlkit-0.11.4.ebuild
new file mode 100644
index 000000000000..8f575bb2866a
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.11.4.ebuild
@@ -0,0 +1,37 @@
+# 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="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+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"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index d6ba118b7d83..12d8bec15b0b 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,5 +1,3 @@
-DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
 DIST toolz-0.12.0.tar.gz 66264 BLAKE2B a68bd895a4d500baebae02dce389adabbebe3eaa103ed2753ebd42d84dba54d9ef0b1467738b6a2eed14af24e197a12ef6b6c6907bcf4633252256793e1eac5f SHA512 6c1376f978a1ab469a6fcca9a5ccaf8b8f1bdf92e4484ff0bad947d6727f390ed6571426070a81a0e123725269043ded28294e57921bde2bb9ff87b048a5405f
-EBUILD toolz-0.11.2-r1.ebuild 516 BLAKE2B 6edf754fc8464671be8cc7d9a11ad178ce4f96eb6679f026d51de8fe587b27a400dc7bf28d8a0f53b5bfe2f2d6defb1c16461896370a40a1933fa2289d68d09e SHA512 eec8fe965902bd8d44afcf13effbefb005aa9d2c7012663ef42464a98bacfebcf8ae2fb63cc6e2d3b55d15996bb1dacd141b50781e9f3b6456279e313eae08aa
-EBUILD toolz-0.12.0.ebuild 632 BLAKE2B 2f6da5d62f32c1f6392122d431ce062bfd0762f8f5e41410a9c8c2ea82a6eafb8d47a5cc5849857a60364da7f1fc28d37ee988bfc50ad2a83f98f8d3183ed044 SHA512 caeeb14faf76e24bc6f9f7b986639108b6d6ce72cbaec9cd6f6703aa5afd6fc3d2c506e3a62c0f84b8ef5baa3d74c88546d7b50e407f88238969b1b5c113879a
+EBUILD toolz-0.12.0.ebuild 626 BLAKE2B 0102583300c1dc2c00bb7c1e95e1312785f670df4988bdccad74598e2f2af4ea437fbf54580306056b07867dc677faf62d667dd3c15b5761cd328a03a1b42a22 SHA512 126a8fe9cbd62285cde2466d7f2800bc4c416c505118b06fa408598e2af4e8dbca88d7192579a3e64e7508aef1d73b2ba38429d8f6297879192aaa42d4967652
 MISC metadata.xml 333 BLAKE2B eb9425478d9c8d007d609994b4cb8eb6b6a71dc4ba5f6c25252575a9eb43a8415457e4d51051a65bf1d5a4cfd638a1467258849da0314d5ec54ee3c7e4a7b331 SHA512 9e29b105592f2c423ac284af853060343d60f491f9e468a44859ba2fe491db835fb3fe18ffe74b3135b56b015234c37e824ca6953e56db1cb5c811409f730bc5
diff --git a/dev-python/toolz/toolz-0.11.2-r1.ebuild b/dev-python/toolz/toolz-0.11.2-r1.ebuild
deleted file mode 100644
index 1f4e04582f0f..000000000000
--- a/dev-python/toolz/toolz-0.11.2-r1.ebuild
+++ /dev/null
@@ -1,18 +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..10} )
-inherit distutils-r1
-
-DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-0.12.0.ebuild b/dev-python/toolz/toolz-0.12.0.ebuild
index 85ec887510f1..abff2070f4f2 100644
--- a/dev-python/toolz/toolz-0.12.0.ebuild
+++ b/dev-python/toolz/toolz-0.12.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index bf227d026a03..79768d5fe3b1 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -3,9 +3,11 @@ DIST trimesh-3.12.8.gh.tar.gz 10758444 BLAKE2B d26fa059d4015bd8b1185665d00da6194
 DIST trimesh-3.12.9.gh.tar.gz 10757706 BLAKE2B a81e01a665a2a80a6a8f5b8bfcd8eb92f4dacb0a62b63209afccde48bea4dc31e05eeef8abcd40f01844cab1c9b7fe644b322c9761257be3f6abdb1858356c88 SHA512 55f9830b7f9016dc9827f5b852e035fa36ce0dafb69618fee627395c12fe40db58ea400d8c66981a313dd9a3293d538d5a0dec1c107e9bbbe691295b1a1f5fc7
 DIST trimesh-3.13.0.gh.tar.gz 10803906 BLAKE2B aa99ecec3d108ca7a7c96183ff354f930d349e1d35f00b689cba1dfed1990d0f8f9dcf93d83bb55173280d31235766052d99ce06c64bb80ecc0bf17b5ea49da4 SHA512 db816f163faed97281dcf8d251d2d57a1b7cb7d4b90ec39d74426e87ef3b22508968cd8701accc49803c3dc73bc39f1f81554feb339a46a9a67bbff5f916f803
 DIST trimesh-3.13.1.gh.tar.gz 10803494 BLAKE2B 73d1f9c7a7610310155e9dd714cdb7dd27b7319b7fa54f092dad7e380484b5c650c4b9aa74235621599ef182043493e56b8ce90f02483a2ba75238fe84bd0c42 SHA512 eca0c6bb2866b2e52c9c92b238f303a0ecbe9e40b7e2109b9a5e714a3d2791bd4fdfb26f06c8e18b8815661d198018e37877f19b2b009efd022080ef87f9b679
+DIST trimesh-3.13.4.gh.tar.gz 10804452 BLAKE2B 26b2f82d64114b610e97e0e937a821bf1ef6809f702ee1de908a756b7a18e7dceee75b1bdb49b831952b1753f63cc5735201deb5ba709709ab58e43ffd8ed175 SHA512 4f56dd63cfafb59941fcd3d9955de7b5ef2dab1f0d961d91aed37295f4aaa37ad3a427a39fa2366a85ea407bc12bc8b8980b1da563f46480b653422632bab911
 EBUILD trimesh-3.12.7.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.12.8.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.12.9.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.13.0.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.13.1.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.13.4.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.13.4.ebuild b/dev-python/trimesh/trimesh-3.13.4.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.13.4.ebuild
@@ -0,0 +1,65 @@
+# 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 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 43a879de28fb..48ff00867720 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,5 @@
 DIST versioneer-0.22.tar.gz 50847 BLAKE2B 3508ac89e65df7a936168fefc1a557191d9362ba69fc9b79eea495cb340c9e314ba5fbac28041bc502aee3adff555e56b43e4ff7fb0d682e96fc3e2ad6bddbad SHA512 f02d50a47c1990275ebf9e720bdb7f13e5fbfc344b361197ecb7602e5ff02e438e43983b4e1cbfde5aa6fa4328a1ffdac60009d6925cf027e484b0ce12587484
+DIST versioneer-0.23.tar.gz 52097 BLAKE2B 05762e7033e023760c118f060ad869a64e6d2b052e0a3150661364802ecad161169bd756a80284b506bb05ffa64019a6ecd56c215ae2cd1a18648e900f806d18 SHA512 c01f1eb1fca1c4ff55169742fd016796556b2178c21eb9d89b9fd83faf90c0bd3bfb0fe178c6078a776a7d2ccd61443d1c645d5f371b062fe06df970f1d3b323
 EBUILD versioneer-0.22.ebuild 894 BLAKE2B ad692a44028ec1026bf61f8659e56e82cadf86a07397ae090dd10b237ba5e39607b7510b24e7c01fc1a97dac875eac822f75b0c997d95e89ee8ed7bc656f1516 SHA512 6925b7959a352a7dcb509accd930015034d296293aec1cd387e08d68c6a598159b069ee07657716a45fae03c92a663ac49bc25434d5fb5a6acc5adc2d3bcfe61
+EBUILD versioneer-0.23.ebuild 898 BLAKE2B f0ce888c33dd7f50d69cca405262398a92b99bb23e73346c896bf09bbfc1b641378f491c8e4c249eafff1980b79eda44d9dab0ab9ac5ea7cd716be24ae32ae8e SHA512 d1ab5369f92ab923afc4d337f8be14224b8a9e0fe67baab4c1b274f6a3ee5787f97420eef456557dbdb0a96cdb131ccd4d84bc3361d887ece1bcac217147aad5
 MISC metadata.xml 426 BLAKE2B 050a6c51f12ce466d0149041e103227c176f792326f859474c996a38f510544f09a594b6a70036b3cdad78013ff9982316c671e77be6ed2e7f0fa643bf89d320 SHA512 da99aef0b58491715dca230579ecba68bfe357909dd8bd122e790d7f0300e0b1d11cf224ea3a3c76763d593f45013cca6cfe27cc774c6eb90dd6da562a061c38
diff --git a/dev-python/versioneer/versioneer-0.23.ebuild b/dev-python/versioneer/versioneer-0.23.ebuild
new file mode 100644
index 000000000000..bda1bd0987a8
--- /dev/null
+++ b/dev-python/versioneer/versioneer-0.23.ebuild
@@ -0,0 +1,38 @@
+# 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="Easy VCS-based management of project version strings"
+HOMEPAGE="
+	https://pypi.org/project/versioneer/
+	https://github.com/python-versioneer/python-versioneer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="CC0-1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py make_versioneer
+
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	"${EPYTHON}" test/git/test_git.py -v || die
+}
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index ab1d5a606643..4623f5129f99 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -53,5 +53,5 @@ DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09f
 DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
 EBUILD watchfiles-0.15.0-r1.ebuild 2191 BLAKE2B e35bf13c5d94f165a23fb2a5eaf04f46c6963142aacf39714336f3b60fb6162bfbfc3fecfe4cf3cb9aa8f23c731af307916138a2d25cf264cd3905c9e473587f SHA512 2ddd215db029b9706a4bd630b35de55d0bd09c9c2552cf4afa997e9648145cf34df42c8821cb0a3a8c8a7b712d25cb505a8cadf984352f5dc32dcbf553166a71
 EBUILD watchfiles-0.16.0.ebuild 2191 BLAKE2B e35bf13c5d94f165a23fb2a5eaf04f46c6963142aacf39714336f3b60fb6162bfbfc3fecfe4cf3cb9aa8f23c731af307916138a2d25cf264cd3905c9e473587f SHA512 2ddd215db029b9706a4bd630b35de55d0bd09c9c2552cf4afa997e9648145cf34df42c8821cb0a3a8c8a7b712d25cb505a8cadf984352f5dc32dcbf553166a71
-EBUILD watchfiles-0.16.1.ebuild 2191 BLAKE2B e35bf13c5d94f165a23fb2a5eaf04f46c6963142aacf39714336f3b60fb6162bfbfc3fecfe4cf3cb9aa8f23c731af307916138a2d25cf264cd3905c9e473587f SHA512 2ddd215db029b9706a4bd630b35de55d0bd09c9c2552cf4afa997e9648145cf34df42c8821cb0a3a8c8a7b712d25cb505a8cadf984352f5dc32dcbf553166a71
+EBUILD watchfiles-0.16.1.ebuild 2204 BLAKE2B 0ecb8a179de567a409a03b518ce886dc8fd87d05a34fdc6171f5bd8b756899d01a067d7f5cec6aa1bbf74debefda4feb963ced07eb378c2ac2978590bf12b357 SHA512 40c779b25897b0c041d2cfc2ff31de6de03f99be90dd555c97fdc29979364770029a2e2c6260bd075193ef0d9933227588203bb988ea8f41a2d5234088610b70
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.16.1.ebuild b/dev-python/watchfiles/watchfiles-0.16.1.ebuild
index aeab77a1d524..8c9517f72393 100644
--- a/dev-python/watchfiles/watchfiles-0.16.1.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.16.1.ebuild
@@ -77,7 +77,7 @@ LICENSE="MIT"
 LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD"
 LICENSE+=" CC0-1.0 ISC MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 1a3f9f0b7d52..e75c848afc9b 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,3 @@
-DIST zipp-3.8.0.tar.gz 13344 BLAKE2B 0da3ca4ff683ac840759030b6ee5125bb1a1b1b8737f0ff0499f3193d13dc3163c6c1fd29c5f1667f347728c991930e3d9e3a325ffb89b6fecb9f6590887bcaa SHA512 d677f941dc92a784b8bd197ca2e1f6f3a570dc236c9eeddcb6108d6f55ad3d35a82462abeeb4bac6ea434442737aea960d941c2a7d0bd416da9abee153c99bb8
 DIST zipp-3.8.1.tar.gz 14189 BLAKE2B 768d25dab70ee1ddbb3adb829b68515631772e2e25a7617d58bf863c01d1900e22cd4001bf31b9eae3829a63cba77df070132e7932b9b4242bb8be3579a1546d SHA512 05639feb20c7e8d3480ce17a52115a85bb2f0706ee0c1b15589b7556bb914ef30a1a34fa743217694b753bb5e72095c90fab7dfee85f2dbf461347322acb4d2e
-EBUILD zipp-3.8.0.ebuild 1438 BLAKE2B d6857903252a23d0d802fc48c13dc5392feaaebf46f754ef1ce8ab608c3ad999feddce0338bc03aacfe9f19598f22062efb2e43ccaf50cb1e6554f59b37998f3 SHA512 a078ba1974f2339ca3e79f879bfd641f4b09a07fb83dea1a10bd24a63d51d9861d03a2d53d4c516dfb421d9dbecd82edfeccd0f900088dabfe6000e29195d8ad
-EBUILD zipp-3.8.1.ebuild 1446 BLAKE2B 4889596531fa751c83d303568f0e059e96d3fbb21f00e3ffd6ab8feaafcb42e07b27bcd21cf845475e4569168e16dfe542e57b5b7fe7bff231c9b542eb5d06e0 SHA512 b2f00b80ae3c69bab83da79f58de955105745222b919f474d2e252f56ccab2e3d3bb17dac453ba743da7a5f1beba273d272c3e98845d41c813ad039ea39a3a28
+EBUILD zipp-3.8.1.ebuild 1438 BLAKE2B d6857903252a23d0d802fc48c13dc5392feaaebf46f754ef1ce8ab608c3ad999feddce0338bc03aacfe9f19598f22062efb2e43ccaf50cb1e6554f59b37998f3 SHA512 a078ba1974f2339ca3e79f879bfd641f4b09a07fb83dea1a10bd24a63d51d9861d03a2d53d4c516dfb421d9dbecd82edfeccd0f900088dabfe6000e29195d8ad
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.8.0.ebuild b/dev-python/zipp/zipp-3.8.0.ebuild
deleted file mode 100644
index 893e60caacaf..000000000000
--- a/dev-python/zipp/zipp-3.8.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="https://github.com/jaraco/zipp/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# speed tests are flaky by design
-	test_zipp.py::TestPath::test_implied_dirs_performance
-)
-
-src_prepare() {
-	# dep of disabled test
-	sed -i -e '/func_timeout/d' test_zipp.py || die
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.8.1.ebuild b/dev-python/zipp/zipp-3.8.1.ebuild
index a11534941ce4..893e60caacaf 100644
--- a/dev-python/zipp/zipp-3.8.1.ebuild
+++ b/dev-python/zipp/zipp-3.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	test? (