gentoo auto-resync : 11:11:2022 - 09:29:30

39 files changed, 558 insertions, 359 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f59d3b1b69d7..8857b3cde046 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 984fd24c79ac..39d4d4bca0df 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,6 +1,8 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
 DIST aesara-rel-2.8.7.gh.tar.gz 7944368 BLAKE2B 6772a8f88d9480044f0da275925577f85d86ef77a1f500f079478a5843ddd4afe2344e00664c5be06a8098587754d3fe7aeb71b8fbc4f12160263b5b98a56de4 SHA512 5f0646af9d9525ab81365fb1e8a6e3ff783bf8fe710ea6fafa91101903aef592d3db42cff47b0620132431198c5d7d16cad65d5668dccdd6b42a7ee62aa12ac6
 DIST aesara-rel-2.8.8.gh.tar.gz 4350570 BLAKE2B 27bcebacef4a4b7a9d38371f25ddd41c4183fea1ce1824a36298311e66d86dc11ef2e0af10e7e0b0cbb0f007aeb22d65b2f745d645c4e393deb44634c146a101 SHA512 42e0a2f9372b4a9df5351b1459930758589a30b7c59f46d5d97c567de353499d16c47f55713dd374d5ac258f56b3484c370fd4d1ad1437cb01ca2eff6f056e71
+DIST aesara-rel-2.8.9.gh.tar.gz 4351952 BLAKE2B ffdc3d33caba5cf5edd3dd15e62cd295dd23f944ac6d76461e9e43717a4126669391dadfee51c6117911dc4236e8787d3e9ab712a0fcbd1dcb137e64f9f994c4 SHA512 3fb4374899ab71366961a07c750f594505467cdab01b6851b36d1dd924b816117ebe488a6cae548650df393c8447de69e21ce2cf6eafe34e951b98f27c3a4f6c
 EBUILD aesara-2.8.7-r1.ebuild 2921 BLAKE2B d3e76a3c595760fc8dcea714ace28ea76495a96f6ea09081fa7cc81f13667ef2ac1bc66e61aa9fb7ea188ad0b2e347960780e17b23a33b9db46464e36e98fdb3 SHA512 0402a637a519d2da7d66292e582348651d1c20cd2e32e9fe9b2c1093600086897a5b4b3100c0ed9452b71c0128d973afdc058e477067d45d875fa8ed9be64dee
 EBUILD aesara-2.8.8.ebuild 2914 BLAKE2B ddf789d71bc4132a37976153096b8ebbb9cf8e5ee7fa0357a3d7b03cea24826d0cd112f4bf92341873ab95a80813086082b8583ce1e74d15a6fb196cb1261c6d SHA512 4ecbe1c2768affa5c9413eb86fee5e9f7e8ca71d21e3c832e08edc22fa58b10f0feca8888435b6ef4b08076118a4d7fca76fa0ad3d811c69e668aa69cee2a619
+EBUILD aesara-2.8.9.ebuild 2914 BLAKE2B ddf789d71bc4132a37976153096b8ebbb9cf8e5ee7fa0357a3d7b03cea24826d0cd112f4bf92341873ab95a80813086082b8583ce1e74d15a6fb196cb1261c6d SHA512 4ecbe1c2768affa5c9413eb86fee5e9f7e8ca71d21e3c832e08edc22fa58b10f0feca8888435b6ef4b08076118a4d7fca76fa0ad3d811c69e668aa69cee2a619
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.8.9.ebuild b/dev-python/aesara/aesara-2.8.9.ebuild
new file mode 100644
index 000000000000..50d3e3cb6fd9
--- /dev/null
+++ b/dev-python/aesara/aesara-2.8.9.ebuild
@@ -0,0 +1,102 @@
+# 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 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-48.0.0[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not claim "bin" package (sic!)
+	rm bin/__init__.py || die
+	sed -e 's/find:/find_namespace:/' \
+		-e '/exclude =/a\    doc*' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+
+		# dunno
+		tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak
+
+		# TODO
+		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
+		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
+		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package jax or numba
+		tests/link/jax
+		tests/link/numba
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index d94289ff80b8..2366b4ac4cd9 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -61,5 +61,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
 EBUILD bcrypt-4.0.0.ebuild 1700 BLAKE2B 40bb112ef6e82a46b77af5c20b3f51c77206ab9dfcd3476dc09d4d0e7ac26f1f29510ac7d8bba445939600469e5d16d1c90f16d434206d6b7c1d99a40cd840a8 SHA512 2537e89d1f9e8e8380483440c84f32a4d1b057c2bb1767508ab784f6228b4d412666ce56c871f1ba0882b9098f7dbb0e4ff294b211d16d5824ad6963c1af2c3d
-EBUILD bcrypt-4.0.1.ebuild 1706 BLAKE2B c3353d43ea9fcada84c3cd39b3a99d305f82497a83d99981e3ec5c66b5792eb13586904d1b642b265ef195ff449c232ca73fe1eaae91e7198ddb21f1b675a181 SHA512 7874a335c63209d79e29c715d2a59da60350fd3c02d08c68052393def6790ad622fefbd083368d231308cc16209c60e657dd728a7b35ce9c6cdfddf7f28bf6ef
+EBUILD bcrypt-4.0.1.ebuild 1703 BLAKE2B 6182772fa8b98ab0f94b389770b8d8a9363ce841a513409063b7dea495bccfd7193d3f303d7fab7159c904f531ba4b0f3493d4e50916f6ba620b820024c89fd6 SHA512 10c32d90ff4b328d6c1e43d3561814a9f15d5fd3fed4eefde330f139f577b3fd3890aeaefcedb27e44855c49342607f78d5afb8378c6b1f82dee4e58b389acaa
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.0.1.ebuild b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
index 3392d086e3ae..6ba0dd8ae7bf 100644
--- a/dev-python/bcrypt/bcrypt-4.0.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.0.1.ebuild
@@ -74,7 +74,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 LICENSE+=" Unlicense"
-KEYWORDS="~amd64 arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 26648e55ab0b..e2a9693a6d33 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,11 @@ DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
 DIST boto3-1.26.4.gh.tar.gz 553689 BLAKE2B 0da69cfa0b05ab789fc59938562efb49c3c0a46ae0dd5ca84d5e5782f7ed78f4fae45fa38cfea27c2dbb59bff2604b7f09064d2f4f35578500d379ff9f34513e SHA512 2f7058c405145d66b92412f0941ec705c111132e87121cae3f4be9fd6db4cfee3c1bedc3d952badd5ead13e2e1a4e10d4a1a7bf73b7869225a7615d5038a9086
 DIST boto3-1.26.5.gh.tar.gz 555039 BLAKE2B 0f1ca94e7a2c04a760d3452e1e51f883307f82ce9a6cde733a69b0c113d002fd3e757ca7e185b412506af9290c2d70ec78a6987a1b2f7552af95f7eaddd5980e SHA512 862ca971589a5ebe2508a9545eb5de29d3ba0f8d431b334c55770be26d1f03c2b9d250dc5b865faa72d0aaaef3f0fff01274b6c64c7506891d708da9238b7896
+DIST boto3-1.26.7.gh.tar.gz 556096 BLAKE2B 3c3b68970b707639dc0d61d04c0d05b01535a01cd8e164d202e726d9225b3a17559e0589fa40601f1a37443986ed370dc40fc4d198d0ce8da1b9ea2eb1582955 SHA512 9a6faa7942ff87827ab47885bc11d2b7f508434b879dfd1ec456ad39f0df4d9a9b0029c9eddda00dae8aad3b2bd13730d42fc2bf2e06de370d60fd28cd0d4ac7
 EBUILD boto3-1.24.96.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.25.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.7.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.26.7.ebuild b/dev-python/boto3/boto3-1.26.7.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.7.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 09cc63585db7..e69d859c0d8e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,9 +2,11 @@ DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb3
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
 DIST botocore-1.29.4.gh.tar.gz 10587870 BLAKE2B e8007cc2e6aa82bd3223f13c5df0e94dcd6f90cfd86d6137723209191d95b7f1be8df3755eae9190aee44312b9980eb81a5a4ede4d326f4cdf3d4b43febb4486 SHA512 f164b1ab95ea34127d2cdaa6e0ec626e7f8849ac1d112e28384e5e1b105b7e482f386999da52d968023d0f35bff5c6b433b4117f98b85eb060887205fc2f55a4
 DIST botocore-1.29.5.gh.tar.gz 10609519 BLAKE2B 814b9409d59e799f47ae536a35fc3677f7eb78f7d4233f846fa66e4bf68b3724dd2bf3ecec777ddc80baf6e7c8201a7649218553db9ad87d1350a2c53a89771d SHA512 6d3d337d9b8f6b3042856df33b016db943059e57a34b3124ea5aca4fb3b6551d476e9cf08e8b6d36caac6db46703b6785fc03f505aa860f029d45f06f254706e
+DIST botocore-1.29.7.gh.tar.gz 10629818 BLAKE2B 9c74df449411d444d87f43a612741e0a9378214e1382d94e07e557c258808ae2de9d1216e743075b0b63611c1b855ac5c6102733db2320c83213e0b1cbe2888a SHA512 cb7b8ad2661dae376d300ec3d757ec3e9b6702a5064d0aab63af5d81eccb2530a12875568fa9a29d0a83bb7babe165c1d18f10cadeeaf9d57cca9cfceaf2761f
 EBUILD botocore-1.27.96.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.28.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.29.7.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.7.ebuild b/dev-python/botocore/botocore-1.29.7.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.7.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_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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index bed4e76ca8f5..188f611374a6 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,5 +1,3 @@
-DIST contourpy-1.0.5.gh.tar.gz 12153420 BLAKE2B 1b3899831938c114480606f0c2ef2962248721884cd2be727f2bd11d12d322e7652c7b63860f4c5d8bd039a7e838f3f360dd1af017219caa97dfc63d69ef7e19 SHA512 47dc08f02920cb0ffc081f313dd041fa36e2fd0a81530374ae77adc288af13cf2c526fc1f45d06ef1c256c4c8fe243e0b36b54d3fff7d4f8bd6f9f4938d3c805
 DIST contourpy-1.0.6.gh.tar.gz 12154065 BLAKE2B d0a621e10bc465a0ed4a20136e813435bb4d79bdd39b64d60676bb794430f2ce15b247e13e163e8e2f89c69ea6a5880dc8f3c8a49750c15e7bcb554aeefcbac1 SHA512 3b6301b414758d588015b745be723642554459df14277aa2eb2def7b5194e0a2b73b73ce8409bc40cda34095e13984d7a2dbc1f3a1dcf272766df92d1de1b5ef
-EBUILD contourpy-1.0.5.ebuild 1057 BLAKE2B 062f767b633399ea1063b78ae410b91bb0477be467dbabe020ec19128d513af79113c6bcf9d907435697b5d78b2962907f7d439061d55e25343185272f01dc29 SHA512 2f2776062ce857043dbdecfd4ac3590ff3bcab65a8a866a816fabdb69502a8cc739b82b72d3860e9cf137f0269ac7736d04886de4fe5e5526aba3c84bce3db15
 EBUILD contourpy-1.0.6.ebuild 1057 BLAKE2B 062f767b633399ea1063b78ae410b91bb0477be467dbabe020ec19128d513af79113c6bcf9d907435697b5d78b2962907f7d439061d55e25343185272f01dc29 SHA512 2f2776062ce857043dbdecfd4ac3590ff3bcab65a8a866a816fabdb69502a8cc739b82b72d3860e9cf137f0269ac7736d04886de4fe5e5526aba3c84bce3db15
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
deleted file mode 100644
index 972f9f2d56d9..000000000000
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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="Python library for calculating contours in 2D quadrilateral grids"
-HOMEPAGE="
-	https://pypi.org/project/contourpy/
-	https://github.com/contourpy/contourpy/
-"
-SRC_URI="
-	https://github.com/contourpy/contourpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# linters
-		tests/test_codebase.py
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# threaded algorithms are known to be broken
-	# https://github.com/contourpy/contourpy/issues/163
-	epytest -k "not threaded and not threads"
-}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 3839ceaf82dd..19d71591a213 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,7 @@
 DIST filesystem_spec-2022.10.0.gh.tar.gz 338829 BLAKE2B 93d0f878218d750f605d0f6cb7011504d3b5325ec9d80bad3e4d0f2c51e7494c751478958131bb6522ad5c3144a129a508b948a114f3a6c55d43b9a206b46a2b SHA512 ac8d9118df9b69c082e0707990ff29bdd7576534622be8fc1a10e8cc14d1d3a328fc8e022dc9f316af3da4afb4d38fe3fb533222aa89c47d4d49a296c6b9bf6b
+DIST filesystem_spec-2022.11.0.gh.tar.gz 341250 BLAKE2B 690528af9882cc8a23f78d215efbeb4f9c9f6f0a04f6a0a6f75d55a5ed8f84f92f988824921f2b26cc4cc0e7a6406d322affe65c9cd99cba7bbe4a6c01ed3382 SHA512 b52af1da0afbc686d288954ac596d9dae23c393c457fcc5ab6a11c7bd8d6a20fa1f631e1837f1d0054534a9a1231afb0cb6f8f899cf169789146309f03699e75
 DIST filesystem_spec-2022.8.2.gh.tar.gz 338446 BLAKE2B 0f3b78794271b367d8e5d26ff889e7d72df7148baa7ca2e7dca3884cbeff74b41f5ce1a532fa768523f29d230f574e630fb3de43b767ace874f831a4d2a47e1f SHA512 696f726000c413ba78380b5e17e312ecca30b51093ebf8d7c3658fb7b82ace57223d3aac471e3a772d350523142bdf983b547277838cca0b182ecb4e0a4b3924
 EBUILD fsspec-2022.10.0.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
+EBUILD fsspec-2022.11.0.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
 EBUILD fsspec-2022.8.2-r1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.11.0.ebuild b/dev-python/fsspec/fsspec-2022.11.0.ebuild
new file mode 100644
index 000000000000..dba46d7fc2e2
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2022.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="
+	https://github.com/fsspec/filesystem_spec/
+	https://pypi.org/project/fsspec/
+"
+SRC_URI="
+	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+EPYTEST_DESELECT=(
+	fsspec/tests/test_spec.py::test_find
+)
+
+EPYTEST_IGNORE=(
+	# sftp and smb require server started via docker
+	fsspec/implementations/tests/test_dbfs.py
+	fsspec/implementations/tests/test_sftp.py
+	fsspec/implementations/tests/test_smb.py
+	# unhappy about dev-python/fuse-python (?)
+	fsspec/tests/test_fuse.py
+)
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 34fdc6318d01..d07aaf07c269 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -2,6 +2,6 @@ DIST lark-1.1.2.tar.gz 243201 BLAKE2B 0f1b51b0276ad893f29d0afa6c3e18211b0b92832c
 DIST lark-1.1.3.tar.gz 245913 BLAKE2B 4c7b53d123aa7cdffcb16027921fced2f94dc0e5b9b816825f297629a9ff446758d9a700dc0f243f3d4c478fc992bbf5bfb38c51c2be3c8379df06b41044c624 SHA512 5359a29852554049ecee77a4151a2c64c5af72eccf5c2bb07926b0c131caac15cc51777c2df1d2c736e9e2b45d59543aa8a6d16ef2cb92ea7f8564c7ac06edb2
 DIST lark-1.1.4.tar.gz 246520 BLAKE2B 08073f89a3403d5e722b3af4d9226ea4ca890a7ad9978fb69f023f1219bb2d148533a68810188d3af35770cc36d29629a1c57a3fbab4098e9ec3d4e73f68ffe8 SHA512 32498f8c387320dce89ebab66e9eed49dc83b855060a8fb9459e6323d0d783ff7184ac997ff095fead09766c00f28c12ccbcd614effb8344ba49df51f7b5a566
 EBUILD lark-1.1.2.ebuild 1044 BLAKE2B 37651f4ac118748c27f1ba76db1cf0400957dcd8e348023295306f86b88c7e864dfebf80a273a0fbc515c6a536f9fa3d1010172df4682c35a7097254ec75b841 SHA512 e5b8c6d42e4af12bf07d2c6efe3d330f99da1f5cdac46a0ead309707f812489ef43a91cd54d61249e6c13cc21a4fff3352a0ea2987182af60b73f658801462df
-EBUILD lark-1.1.3.ebuild 817 BLAKE2B 0f10270ee2275f9d79a8c0c6840b3f863c303f6ceee894a9a88a7a686220de4fa01d180ca79b920a88db9bba083a34860d4cd6a84100d7ecff21af8b37275409 SHA512 b14a7b548de40cd32d498e71e14361c89cff2a4416dcfcf1ffcee16dada031e6f8ad8149da442a183e43c6a53ee9a61798e875d23fca654925204ad37f0a3d80
+EBUILD lark-1.1.3.ebuild 814 BLAKE2B 0d57513dc5d49136a6bae3673f595476f0fe99b03f8dfcd2783fc4df15aa2de13f2bf2e26660ec8081541fbb761394abfd23c1feb30e822b2538e07d45acfd6d SHA512 b8c8d78ca8ec40e705844311ce8ae895126709e60a9933978ce46902ebc4d46bd96b301e57c626fc1be7a8dc53449ca1dcab3a37cf8f451db0dd56905139880a
 EBUILD lark-1.1.4.ebuild 1005 BLAKE2B c4d432174b37224592542a9572fedef407b10f3ecda1fe23a50e5de62634e52cee2e966335a37799566f5b62a67b43902ae72777910ab015091fa1aff0828733 SHA512 29ae2054e1cb3434313b8a0730e5f147b7b2948ac24ec84b04b93dbd0730c6f3cf6a489cb893ee549b09c23492c9e49bf916608e46a3161d34e4b594a652fdb9
 MISC metadata.xml 364 BLAKE2B 8a1409bfc4f242907355a931f5ca7308c96b424cc06cfbc82f281abbaea32a0aaa5257d04f4fbd6131e9056dc08ec2f5834d80608d68d5e9efd32314d0a5cd47 SHA512 ed2ecc7da195e14e5a8071f3c5d277ead1dbbb811c1b7b1163c53d0b5e01ab299a7547de82782c9211aeb8fb6d97d3cd6bc0c4f258c533e884c4e096e7ff20b1
diff --git a/dev-python/lark/lark-1.1.3.ebuild b/dev-python/lark/lark-1.1.3.ebuild
index f17a2e7e881b..ef9bba1aa9dd 100644
--- a/dev-python/lark/lark-1.1.3.ebuild
+++ b/dev-python/lark/lark-1.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 305435d960ea..5067df8004ae 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,3 @@
-DIST apache-libcloud-3.6.0.tar.bz2 1873596 BLAKE2B 7ca67d0a84d1af9a216882efb35ff48f4a795eacf34132b78429e0158b1093b3eec316541a52673e61edfc5bfcb326052ee874fe59b1e4a65b407bdaccf38774 SHA512 3a4b4ecf35194e70b6cb70f0619238e1c0140891c08438d4b1ef308fffc9dfb973a5c1534b6ee7864797925b7f7be77eb79a2c4d621627d8042da3927b3f2ff4
 DIST apache-libcloud-3.6.1.tar.bz2 1944060 BLAKE2B 61e1481cc8e4e3e017c262d20666ee33a79ccb78bbc0d682dfe6f63df26f21c06897ec98b0df56a27ac6ee92922a08ecb98451c1680c323f042a497379f91090 SHA512 292166aa1eda4b31eb1552c91d9acd54001c363471f1fdd5310e3e25519d7e1f599d9566f55a0c10ece08d544774e1abca3043283b1e7dd93bfadb7e36b02e22
-EBUILD libcloud-3.6.0.ebuild 1527 BLAKE2B b42b5f55fc210428a08b42afcef047c7da46895ca671c7650719ea450d63571d249a8dd0590c2dfad22691673e1dd5da6cbd6ea50786c6e2b2a5fb62eae2aef5 SHA512 4103a7ba8e147797e6f21b5ae6bac1dcbd8a5b4c1d753b378f20aaac58ba039d7fb7017f3c0acee5477d9bb1d21659bfb592000f59681d494c370e6684d0dec2
-EBUILD libcloud-3.6.1.ebuild 1529 BLAKE2B 8194e5b9e86361f23b7e19ed35cf98279fe6787b012a89bee669c86a9ec504ca823c0ef48b7bff54dbfdd6de259108dbf0416acea8ba460d2e18af11de321394 SHA512 87bd8111bfc5679b2e3c71556235604417a09b59fe0f921f6cc2559d2148aae4ea30dc5501b24ac2630fbfe098811c85c0fe42887342704106454ad3e5b0cf34
+EBUILD libcloud-3.6.1.ebuild 1527 BLAKE2B b42b5f55fc210428a08b42afcef047c7da46895ca671c7650719ea450d63571d249a8dd0590c2dfad22691673e1dd5da6cbd6ea50786c6e2b2a5fb62eae2aef5 SHA512 4103a7ba8e147797e6f21b5ae6bac1dcbd8a5b4c1d753b378f20aaac58ba039d7fb7017f3c0acee5477d9bb1d21659bfb592000f59681d494c370e6684d0dec2
 MISC metadata.xml 398 BLAKE2B 5623f486a289eea0196b22b2f88ff377589bbcea13e341efd85d31dee07f8638bc985e6a1c03ac7982da08c879b5b09a46e5679fda8666f93366a8561777da7c SHA512 bc6e38c949ed0513f4e562406fd84031cd80f01a881844202e033fe5225490d42b27855413cd7d2fec216b002c38e1832fa8f841112c68628c906189ebf1e937
diff --git a/dev-python/libcloud/libcloud-3.6.0.ebuild b/dev-python/libcloud/libcloud-3.6.0.ebuild
deleted file mode 100644
index 07010b5ebe29..000000000000
--- a/dev-python/libcloud/libcloud-3.6.0.ebuild
+++ /dev/null
@@ -1,60 +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} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-S="${WORKDIR}/apache-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
-	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
-	libcloud/test/test_connection.py::ConnectionClassTestCase::test_retry_on_all_default_retry_exception_classes
-	# TODO
-	libcloud/test/compute/test_ssh_client.py::ParamikoSSHClientTests::test_key_file_non_pem_format_error
-)
-
-src_prepare() {
-	if use examples; then
-		mkdir examples || die
-		mv example_*.py examples || die
-	fi
-
-	# needed for tests
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	use examples && dodoc -r examples
-	distutils-r1_src_install
-}
diff --git a/dev-python/libcloud/libcloud-3.6.1.ebuild b/dev-python/libcloud/libcloud-3.6.1.ebuild
index 03f2ad22fa9d..07010b5ebe29 100644
--- a/dev-python/libcloud/libcloud-3.6.1.ebuild
+++ b/dev-python/libcloud/libcloud-3.6.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index bec1788c0409..3a7ef4b1c6c5 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,6 +1,6 @@
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 DIST patsy-0.5.3.tar.gz 397680 BLAKE2B 43696f9e95c124cab5bf907723596d8b2b15f0539fbd2b9c2a2fcc76591e935020929ba31fd5378114fe58d22a9931508d89edf21f24b00c916a6e78dc4ee58f SHA512 9a6ea2382287208013e02bab7cba9378311a8e18fe059593aa99090bb6191efa74badff011424a7f6b3c8ec72c1b8650637322b71617f23357bb4b38ac6a79a0
 EBUILD patsy-0.5.2.ebuild 643 BLAKE2B 178669501e3bc257c62e061463dd0e7157da8147b9551a35c1c5fd0779957bcef28525027f4c80c02ba164705b7de1838d7744aafe0facbe081d674cdd26af26 SHA512 5a5d675a8c17e6f1c2687a3e64baa55c6fed6e0d5b686e9be22398b5cbcfffa6da5191f7d689bf86a1f4097d3b32afa2c0ed7a17c2a9a0a5639d1c2ed9c09fd7
-EBUILD patsy-0.5.3-r1.ebuild 665 BLAKE2B a5a56282df9fd8708d095afa1574815687146f8bdd9545544d9508e976a676daf40ce090d3f8a23e3e76e43d1d28e34401826a984ad92823b73426dd5a27fb36 SHA512 060ba5db6d445edc94593eb474961274a9cd7c851253a7e83a7e5b939d7147aa26804d9bbad6fa678886ffb4b9097ebc7a5ccf4f4390ad61b987c3fc8ba4e758
+EBUILD patsy-0.5.3-r1.ebuild 662 BLAKE2B 980b2226158a6afa80b81595372e4828148c313dd8ff2c3c9dd5a2dcb5cfbfa59af71144af1bf7cd72f0e6f102221c9687f93df152ed69bf7b9931bb0fd972dc SHA512 5a855f9531f56272b718ddb0a43ac80d28d4611d122fe904abfb0ff88be18e534f0ccef47724f582192c817c9a9b3dd8c3aa482c0d5f9e0addc3da4ee99e7a42
 EBUILD patsy-0.5.3.ebuild 649 BLAKE2B 5b6a69a576c29112c8421da889e31c04a9c7cee36eb42820761bcf750c6f2d2130a291df1bd25d935820bca0851683fcf040fe1438c77b79020d377c9697da3f SHA512 880aba647c2f8a51e64b624974b745ae30d168762065451ce97a61eefaabefc7414fcd72a9694a6d3e6cbceb528a2648bc69c5bc0aacf8f22e61b05ade6a7d41
 MISC metadata.xml 732 BLAKE2B cf0e18d97605d69bae87a3553b89d551c03b908ec5a41da2ca11490cce6abd9aa6533d9155b7c19e3e12e5996aa8d5c3ea1f4cfb15e6c70916a4e2119fa54399 SHA512 f68d1e8645fee5af27d72062cc36b3700bff6c9f9eb6cb38a3b6c085211fb1b8502257d5d09edbd858e10ff4ef9f6661c577e336c3881e3c88e54d0db889a2b4
diff --git a/dev-python/patsy/patsy-0.5.3-r1.ebuild b/dev-python/patsy/patsy-0.5.3-r1.ebuild
index 3e611de39162..0987fc447fa1 100644
--- a/dev-python/patsy/patsy-0.5.3-r1.ebuild
+++ b/dev-python/patsy/patsy-0.5.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 77033855feb5..ed394d3645a3 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,9 +1,5 @@
-DIST pymdown-extensions-9.5.gh.tar.gz 1004601 BLAKE2B 8950ca104edf476e5557eab1effd9ad4e879f2ef58823e1385b5ee000e704b260b20f758578021d4c03492e675027f079363da49429938221fb1c109c9e1fe2d SHA512 b640947b97be4f7592b86125c7de0f36c34052e77103f7d16818b8fc2794cc28d3b7baef84d99434ca1b2810fbe19bc2fc0d2430b8504425cca71677d9c8753c
-DIST pymdown-extensions-9.6.gh.tar.gz 1011446 BLAKE2B 8e334896738de592d8d852f05f165c70d65b6541915bc4d66472b2e2e08a4921e5ed3e0d5873b03e3bbc31179cd2edb367ca0eb3734f1b437b8eff0dc4f9defb SHA512 b806eac4656b1e541753e9e3f4d29bd49dfdfb24ea67633ea232d40833e4ce438b76c71c013d7bc5c3ebfa790b2e314e6f0f76cc3a76f42d5c2b020c32f8dba7
 DIST pymdown-extensions-9.7.gh.tar.gz 1015024 BLAKE2B 6b2b1a86e693a2e4bca889c66bd97c099976e9e9e56291c35b25d8a99554dbae8e4e7b913b774ed9de6406fcaa8850009e000ee97bc97b1dfd09bbc514f4bd6e SHA512 0e6a28ac991ec02821abc1525de30007ded891d8437a8e4f9eb349e26c18702f9477fac0ca6728d5c3fdb5f0fdea451a3f00db3ea354115f20a69bb0f4a114f2
 DIST pymdown-extensions-9.8.gh.tar.gz 1012711 BLAKE2B 451dba60e42d8ad5e1368ac02c89a99a086d99b24402a2570f1fc51c73416163c200d2056a0667f03f6a7c5611cd3b3b870d8dd9ae934ca1d867c9ed9f3a985b SHA512 f9937625984dee09ba2dfdf9e706bdc382017f906f89c42080db38af63b17c1475cc7ffaf94c967ea116c735419168eb35d9dc272d971fe7d92a5950f67673cd
-EBUILD pymdown-extensions-9.5.ebuild 1244 BLAKE2B 4527630ef9f66cd2c708ee3e32ab8cbc8909575271cd0260dc15442cd168bf7e666124c0e39e841a27034d2481d2306a14a507ad560d96b0b58913832640f138 SHA512 048ec6f01d2d2ec9152dde5badbd50d86624a999777aee58ab53b9ad2fea041b3090404be8ca02c2410275577344e1b905cc87b382f88072bd8a0635c702751f
-EBUILD pymdown-extensions-9.6.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
-EBUILD pymdown-extensions-9.7.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
+EBUILD pymdown-extensions-9.7.ebuild 1625 BLAKE2B 8be05c03d6225736fc63ad37197220a3c0f4a953895ce36c0064997d1deefe32dccb4e56ac6905367a86a019495afbd3a7de0a3c023e6bbb8401b7a04059797b SHA512 0114c035128fd883d42a0e2ba8403e86bbf56c42156063df59647f42d5b0a71b16d6621cc1e6172fff3894de80a222a9d0b19de84b5b973498e242da492cb7a9
 EBUILD pymdown-extensions-9.8.ebuild 1627 BLAKE2B 167a6c0187697bf5ea751fb3cf30d061c5d411ad7e922b35738e16a69459011610eec0ea193ce990ae745e8b967142d69b58eca5d3f043dcc4d2fd69c7f1b1f2 SHA512 2e2a85177a139eac580c6554d9fd2c560a8d18ea92612a7dd824e58692f9924b67f64018ca233401fa92df224dd73b1e19abd6cc03ac4311c8d22b01f52153d0
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild
deleted file mode 100644
index b8b9a0961375..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild
+++ /dev/null
@@ -1,59 +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=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.6.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.6.ebuild
deleted file mode 100644
index c5e7c800284c..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.6.ebuild
+++ /dev/null
@@ -1,72 +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=( python3_{8..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	# We need to do this manually instead of relying on docs_compile
-	# https://bytemeta.vip/repo/facelessuser/pymdown-extensions/issues/1446
-	# https://bugs.gentoo.org/859637
-	if use doc; then
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
index c5e7c800284c..c5ff8b25ca2c 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.7.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index ad0a72c29fed..2f5e4385bf82 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -15,5 +15,5 @@ DIST pypy-exe-7.3.9-2.x86.xpak 10199358 BLAKE2B 502748c1c90db9ee1d626c33ead656d4
 DIST pypy-exe-7.3.9-3.amd64.gpkg.tar 13701120 BLAKE2B 1c0b10906adcbdfb9893a097577193b89ecaf54c8c3ab5f5907cd51b75d6f26ab31afa0369015db007ef25e0aee7669015e870a554940177b9332a79d7b8ff0b SHA512 8cd53261f035ad0d6ad3dc7f13f29d54304ed02a339bbbc565a541b4e3b9ce0ff4734f3877e286e018da2b77468287fb11e499cc5fff4fc73f6a7bc1a602daf6
 DIST pypy-exe-7.3.9-3.x86.gpkg.tar 10147840 BLAKE2B 8cb0c136c95b89178dcab3684e76fd3399ec9af2ff314ac39927bc3431b46a330746331ee142590239f44fcfd943f0d0766d462d91cf47886d7badeec429a786 SHA512 0df2f09c1934b44561c12e514ac84377b3718c2f0e5912c0f36a95100911abb692a659b384c6ea9746e11494dff6f780996725b7783f6d0dc875e8e6652051fc
 EBUILD pypy-exe-bin-7.3.9-r3.ebuild 2119 BLAKE2B 78cdc93d9f5b5f117c796de542653f1e6281c1725c3cd9158f3d67b12c9581f80eabadeb89e557c360eeda3aaa9799b7e7185e165c07543c81a4830d5eeae13e SHA512 89ae7ffc7027caccec44d0050233f450ea4a8f1842faf38d98bae24de41f1ef028e83de654e3e395df36265f5bc16df5b5443c7f144e5468f60244cbd49db67b
-EBUILD pypy-exe-bin-7.3.9-r4.ebuild 1979 BLAKE2B d6d9cde063e07c64739822c0a22c21965125eb9481b9b094c2a3ee2156b49ecc9ff6d628b8b8193e7d573f7bbdb1765632760c528b0168dd7b0013ebd350bc7c SHA512 67ef4bd53fc18b5e34a0e357434bf678cb7a65929e02eb42156a5fa6dc74270432df9b2a025920853529ed3ebd964bd222a52208eab2354ec2fc7e74e33aa7dd
+EBUILD pypy-exe-bin-7.3.9-r4.ebuild 1977 BLAKE2B 91ce17e7e4699fa83a4a004d28c5bd9f3bb0ae314bf868b5079b9794f4ff620462dada6e6749cff352cdaeedbfda3fd9d61a76d1ad85f61eb8928d7130c2d60a SHA512 6540a562f4bc696f2dde67aec97dc2ec5acfb14cae44fdde84190a883d3b8739b3aec40c61d3e82c141fdaa0c085adaafd52eb61e9bba0ad7c53aa18f5e84c27
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild
index f3fec7925db4..1b4b3b17740b 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.9-r4.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 302ce17df3de..c52e4227046a 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,11 +1,3 @@
-DIST pypy3-exe-7.3.9_p3-1.amd64-musl.xpak 12452882 BLAKE2B 73be01098cc4295e63b76fd7f542e9002ff6929220f02d86f99f051c76edabec68e0ed97695fe68d56a082e5bd915d9e68e04ee1dc7e1a3d8120a76ccf5f6e3f SHA512 9c6eb74844ed021dabf11998690e3099d6c37930378c1869726d96451a3847fc2bd60df06a3d7234b2fa182e4294328f292f4c24bdc49a4e5baa7ae3a0704805
-DIST pypy3-exe-7.3.9_p3-1.amd64.xpak 12394274 BLAKE2B 8f7a041839fdd1dd55fd0293660369310aaa1f118e34a730e066899c09ced71fa37d70d59952fb68d932f63e907b903c41c91b5ba4d646637fcfe628a20861b2 SHA512 166722fec0288b8c69645e0c8e630aa4c0b74f8d41817148147556ce6f0491e7251cbc202b62f7a1dec6b1da3e2f2c6313f02952b11220f35be2c1ad6276f89a
-DIST pypy3-exe-7.3.9_p3-1.arm64-musl.xpak 10473390 BLAKE2B 0d791a39850c51ff914885e5bff4a3f44164b77df4771db968b90e144857c8a045df3a61ebe0e386c3aeb3c63b45ccfbb58d5b4811a0a1aeadb75335a6bb586c SHA512 9f3c871d0b624d1f2f65933f85fad9d177046ad96a206e9ef1bd40c5fbac09144f1d87685cac9f31a19b4f1ec25b62477675cce9a99d4fb2cc5eef86578d4655
-DIST pypy3-exe-7.3.9_p3-1.arm64.xpak 10482599 BLAKE2B c48c9a19db30315be223bfc1121bc9a0300c91c511678a1d11bcf3a1601a3d1fd7d7852cc196d22650ec4ab4234d68f7a9046b01bf2f4f1f7104ae2d31797e9e SHA512 3200f7faf3b9c2211d828f6c434775138a1543a75b2ff4403c896f4941682ff40e16242045ec65908540b6537711c459ce7b0fdcdc201bc9768b2521bbe4cedb
-DIST pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak 6663514 BLAKE2B c8778a594f9999be4efe398901c5deab7fa22475faad55d047b995933708d861c0adf435d26c691f63ff49d8bf561081f96b64287846065bbcf8845c476ef909 SHA512 1feda175f90274fc214f9b018dddefdc40234ff398262a55523849c5f48bf543ab12fe86ac56e973900c39169e0d45d1150217a9b3597381f7e087af285f4811
-DIST pypy3-exe-7.3.9_p3-1.ppc64le.xpak 10930518 BLAKE2B fca375a3466ee51c9436587104d5f13cb4642a8efb347124fcc2880c2382bf56921889b2c3aa96f26d22fb734cbd27adcf5f0c8feeff92c2d625df1daaa38ade SHA512 ee33067b964c33701b687ace463cfc11795af37bf3302c8e3e2d1e0610728945d370f88d97d1ba3fd66ac9bbf905930857e78e5bc96c911d3a663c2e9c74a5cc
-DIST pypy3-exe-7.3.9_p3-1.x86-musl.xpak 9246639 BLAKE2B 7475f9a273157b55d1568e5d9f36a045969bb629047a8b8f478e6cd0e27bf2f46b0a141197047bd2779332acb5b36b069ad1bd371030a6a5d75b4dd0aadbb808 SHA512 783260846ec8057479808a7d7aab3c712ee6822293232099cfbe970cb3e8e5e3cf07ec08bb5ecd703c084c6a798dab70de5073146f8698430472196b351d19fb
-DIST pypy3-exe-7.3.9_p3-1.x86.xpak 9210827 BLAKE2B a740ef7e1d4559308c129399cda498b7c0fe8e654e4d36830ded5197a7788168dbc8b4f83908a41869cd51343dd9b371ba53de8e88655b2728b8f6351f502ef2 SHA512 bd2ef07e980bd37b7ecfb052a9304a80ee527c61f8a60344e8e9b1bfcdf1f50038e7b281257194c388e0452aa968f984f5b6bc7d9f7c89bf08279e9a169ed8e6
 DIST pypy3-exe-7.3.9_p3-2.amd64-musl.gpkg.tar 12472320 BLAKE2B dc59db0948774f3776d891dc1afbf457005928db8f3ec949e71538f29929f6dcbdd30af0e4f72ae050bc562864ada7a6f7603d85d92f622ff1830b2c4a009d46 SHA512 3f021c0db1c7c8eab50ee9029530aee41d490f467b626a7b22efabc19a0cc6220039134040b01a670352a977925b6ad31071dc30b5f6795c7128e1d889b0a6ff
 DIST pypy3-exe-7.3.9_p3-2.amd64.gpkg.tar 12451840 BLAKE2B 1c5d0c1698ee4b7051aea5bbd1a7430b2a120d58e65aba70897e00afd5965313bff5b8a4477924a94077660c6f28aac176a09d27f4f8c97a1cdfc80a454e8319 SHA512 e0fe433c026bdd0faca135f3f32e3f7754bc4d2d150deb775171c9de4fa493d3f5842c5c66a02acef7ca0ceb7907231f0070cd50db801d1b417523b438fa77fd
 DIST pypy3-exe-7.3.9_p3-2.arm64-musl.gpkg.tar 10547200 BLAKE2B 300371635148ef2af0746d7c1c4e896cfb4dc55967e1aa82dfa2081acd8e08c07b614b196ee8e34a0fb1f7407ef9cc556c58b8222bffba47780a277a8506cab5 SHA512 1d9e1b1714f16161c0d2dde26cd60d15c052e5c2426ae4a0073fb2dd7d795d75078cd1ac73e5943118ed7e44e4757b73e8737e5c6d12d78583644747dd253863
@@ -14,6 +6,5 @@ DIST pypy3-exe-7.3.9_p3-2.ppc64le-musl.gpkg.tar 6686720 BLAKE2B 5fa9a09765270494
 DIST pypy3-exe-7.3.9_p3-2.ppc64le.gpkg.tar 10946560 BLAKE2B 0b63a9941cfac0d138e8e7781f13a184e03e0dbed45df812177f7a786dc59aee309bc1de5b20b83f6576005380a1a7af752b3de858e0c116eb8c8474b30442de SHA512 df8a4749135f44fe338945df1d867961af39ea8c08f0057c85fdca12f18bb1725c04ee78e3701d7982465ca0092b7640e376a9031bdd5ad50c326e8b86c5bf1b
 DIST pypy3-exe-7.3.9_p3-2.x86-musl.gpkg.tar 9236480 BLAKE2B 6e319fd0377192c147d4cc16fa5488e938e69c6c04180a9aa873cb9cd772e8f9deadc69fc6309df82a80b8cd58eaccf8b97c69442fbd96c656c907e78882348b SHA512 1c3b3a6cadb8f003172a98334abe24c7732d089c00c3b7c5bbcf1ddbaa908e75d74463fe98ee3f4c76d570860c7c98ff935d462595ae6456702eb10649744a5e
 DIST pypy3-exe-7.3.9_p3-2.x86.gpkg.tar 9216000 BLAKE2B 03fcb639ce59260a82a249bf60388a67ace5cab51a3d1d9d8c148d0350b483fbc12f3ecaa9d2582e7a31b84c5eea44068dbe589342376413e21ce315419f98a5 SHA512 a3964b1f364dcc0540d72e1364ccf1ed5cf3e5e053a2cfe69697de15586820646c404e931f0a6c08f49de45474ef007ec696484b515b857c29436d4196ec2e81
-EBUILD pypy3-exe-bin-7.3.9_p3-r3.ebuild 2116 BLAKE2B 02d51678563325cd8a99a6f42f5164198b574e204cc200aec354a4a1af4bcbe2ec2e9f8e23e9d0660da5b7bf497244d61b81fb0246f6163a3aa648d3375f31fe SHA512 6b52470511fe28dc79c8166141cb99a8185c6d8f9c315e2bd43ebfa5c4f29247a82855a92bbe5970bff849003ecec05cb7e8577bdfb2e869bea6a9246a13cfc4
-EBUILD pypy3-exe-bin-7.3.9_p3-r4.ebuild 1980 BLAKE2B b8015895093d86828f7a817685477805f86ec372e912e121ef824af0082b9c302e7fe2cefa125219572d2ffb74cc30a53b3b5503fb7fc81392b3077a215bc1fe SHA512 6bc28509596f15621c5b72f4d79efb03d459dfb321a975069fdd4d663dedfdee3c221bf4358c3819face6c470ddfe2f5fc80e4b62638413d683b5e0f8f7d2751
+EBUILD pypy3-exe-bin-7.3.9_p3-r4.ebuild 1978 BLAKE2B f5ef3c09d4b6d67f560a4321f1bd9378f29282725d0e914edbe3cea38bcdc3aa811dd53ea2818a81744266fd5dc68fc0c6ac90f44eea0a4f35083458f75bf291 SHA512 ab7ac54070cfe77085a02fda09cef2e3953bd41480b29abe2dab696f5c4b64e73f48ad301c1fc76fcbdd1849c4719c9b6a4c5d2622d6ff9d2bf3cdb4383cc56c
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild
deleted file mode 100644
index 36342b29c1b9..000000000000
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils
-
-MY_P=pypy3-exe-${PV}-1
-DESCRIPTION="PyPy3 executable (pre-built version)"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	elibc_glibc? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.amd64.xpak
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.arm64.xpak
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.ppc64le.xpak
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.x86.xpak
-		)
-	)
-	elibc_musl? (
-		amd64? (
-			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.amd64-musl.xpak
-		)
-		arm64? (
-			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.arm64-musl.xpak
-		)
-		ppc64? (
-			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.ppc64le-musl.xpak
-		)
-		x86? (
-			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-				-> ${MY_P}.x86-musl.xpak
-		)
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="3.9-${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# sys-devel/gcc for libgcc_s.so
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/8
-	sys-devel/gcc
-	sys-libs/ncurses:0/6
-	>=sys-libs/zlib-1.1.3:0/1
-	virtual/libintl:0/0
-	elibc_glibc? ( >=sys-libs/glibc-2.35 )
-	!dev-python/pypy3-exe:${SLOT}
-"
-
-PYPY_PV=${PV%_p*}
-QA_PREBUILT="
-	usr/bin/pypy3.9-c-${PYPY_PV}
-"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		die "No binary package available for ${ARCH}/${ELIBC}"
-	fi
-
-	ebegin "Unpacking ${A}"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${A}")
-	eend ${?} || die "Unpacking ${A} failed"
-}
-
-src_install() {
-	insinto /
-	doins -r usr
-	fperms +x "/usr/bin/pypy3.9-c-${PYPY_PV}"
-	pax-mark m "${ED}/usr/bin/pypy3.9-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild
index e9dfc418d6b1..9f0b76a5e72d 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r4.ebuild
@@ -50,7 +50,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="3.9-${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index b84774bdc9da..473002603058 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -2,8 +2,10 @@ DIST stevedore-4.0.0.tar.gz 513561 BLAKE2B 7d82b001546c49d4a9fd7891751b2ed35f6b7
 DIST stevedore-4.0.1.tar.gz 514044 BLAKE2B 843af8c8e393932e3db40e467c3957a839e0416c12bfb23c353075b838489a4b58a0a896ee269beeed108370054f0f93724a020f0f2102ae6e758a771a6aeaf0 SHA512 2c1c95a023c598a228d3786b681db2e803dc0c39884fdc910ab4bba75e7237081bfbe0ce1bbc847aecdda7b5e43bf165f0c03599717153bda37a52d0e35b7bac
 DIST stevedore-4.0.2.tar.gz 514088 BLAKE2B a07d48129fec62838af5ce920ef1eeb0cacb09ca4ee20bb5e44ba24a475957a771c72fdec6893f9b26df54e88387ec2f27b1dceaa8d8f41c291e68b1d9bfd059 SHA512 1cb14220e8bf8520af412670982b180bfbf1be3147cbd0359fc543bb6cb6113e292c87f492eb08756d29f16bdc49a48a03b280a8343bb620c78ae882efe6407b
 DIST stevedore-4.1.0.tar.gz 514078 BLAKE2B 503b79324fcbbf5d9b911eb999ac6e52eb76f0b0704e60c76a02a3843259bff082d9eaebc7e559d800c1011d18c2ef1f3cfb78501fddd38e4246cf2f86109650 SHA512 048360265539b880fe77af5214d4e27661ab0e9972317a7e4fa51e599aa67f525ad5227c921e4c3410c8a39baa80259a42417b8772def0e3b8b58d618a0adbeb
+DIST stevedore-4.1.1.tar.gz 514168 BLAKE2B b3b37bfae408adb1664562b99c9951ac035196babec8424068bcffa8226fed8da54044e6efe5b1b739b1caeb49bdaf1b65eca38ec6b4e200b837714d926e2dfb SHA512 9f75af586e4fff1bebb88351a242b171d6cce795d86cfffd021c47bafd9ced84a78a838a589d8828fa7bb0f183e767fe888b0780aeda9129895182bf4e0ff717
 EBUILD stevedore-4.0.0.ebuild 1363 BLAKE2B 0cb8470e708b39241344715f9b94b748db6d9f2db043c6c547fce4fad8abb8a47cf46f4a298bff41ddeaf9c7ab5b37de45731dc742ea20ab6e30741c1955c37b SHA512 dfd1ab0f730270f83e50293092e6a5be1aafa01273694c40b34d42409fddf919545e1a032b7a36a9b785b00836204ecbcbcfd134783550c80059365806a48d97
 EBUILD stevedore-4.0.1.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 EBUILD stevedore-4.0.2.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 EBUILD stevedore-4.1.0.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
+EBUILD stevedore-4.1.1.ebuild 1212 BLAKE2B 292b1f3bf4622895c5c51f0e6c2e78ef61d010428f6cde20740b6940862a138959a362d747e20fab36bc3f07aa35fb35a9562168cef2cce8f5c5b1f9a251c635 SHA512 dbdf8faf7d0a8ab387174970c6df8568aa34a786f6adae68c2e80256876bb6b312bfd7431d57c13d90a89bc2a83c9c2da4441a4b57bd4f58f2bd8f6722f054cd
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-4.1.1.ebuild b/dev-python/stevedore/stevedore-4.1.1.ebuild
new file mode 100644
index 000000000000..1f1a1237233b
--- /dev/null
+++ b/dev-python/stevedore/stevedore-4.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( 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
+
+	# 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/trimesh/Manifest b/dev-python/trimesh/Manifest
index 10f3c17c2fa8..8f3f2379720b 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,8 +2,10 @@ DIST trimesh-3.15.5.gh.tar.gz 11956403 BLAKE2B 5e36a7fd57689f5151ee710a707bf44ff
 DIST trimesh-3.15.7.gh.tar.gz 11972453 BLAKE2B 0f1c10d096289122bb1cc853f4879718f3e03dd9b4297a25be4db2a232a08b0e8d496ec5cc98b2d4c4214ba296666291fe24b7dcc5d2e430105ba46cb4fb5838 SHA512 c09862de650829e853d7d4f2b53b72ddeac48ad313975dc2919c0bbb11d16d0fe5aa69810d488291b187e827b63caeb03847c143cd6812ae09c2d98d51e42270
 DIST trimesh-3.15.8.gh.tar.gz 11972365 BLAKE2B 2dd76c5f3c6949b79992dc23a4a80f3fc80c63c08ac7f8c6c11d6b1209b7b23f4843fe0da74528fbec0738bf83d2791260183cca710d2fe046c1bb8ef747c82b SHA512 806a8a10ff86a5198f7dc134f07fa3fd3f84d8e1b10f2d1f8dbc4a5783d2d24474d7c32f0427fd740f2af63d544fc4f3e710f1904cca0412390e6913092b1741
 DIST trimesh-3.16.0.gh.tar.gz 11970053 BLAKE2B 3898dd2fd12fd070bc9a3a10e21bd255b75f7758deb38e0d36314524b4e24b7ada6514865c06677a1db39b1723b918e5ec6dcf491bf0c946c3e22495cf7dcd01 SHA512 7b56a5007614eae8a7cef1a69334ef3b21499572b5bfaa414bd29097a431266e1ec4d7dda540dbf502a57f5b0ce9d3fb3763675821714ac25d924e0d15e22c71
+DIST trimesh-3.16.2.gh.tar.gz 11985642 BLAKE2B 453f7daad4d75b114d5747b3251732d0576ff2606c4a93b5a2d0d12943aaefa1dc40d6d3db6e40448ff1ad610425680b75dbeba0d6cabd0fb6814215d00e7848 SHA512 4703e742a385b32bec4871df42aefe4fc8d83cc3e14247f3c92bbbafa03e8fc4e26d96afb26f06319571d18447318fc45f1ffa8ab5385934c34507774ef0cd12
 EBUILD trimesh-3.15.5.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.15.7.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.8.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.16.0.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.16.2.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.16.2.ebuild b/dev-python/trimesh/trimesh-3.16.2.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.16.2.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/wheel/Manifest b/dev-python/wheel/Manifest
index 1beb6f47c581..5d6be8ff096c 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -2,8 +2,10 @@ DIST wheel-0.37.1.gh.tar.gz 68751 BLAKE2B 55919649f82668565d3b5907d14d0758984bb7
 DIST wheel-0.38.0.gh.tar.gz 68696 BLAKE2B 38dbc8ba7cf67d202c6c98b277e590b3b31b46b698f59f988af1710e9fa6e5d2125378029475060cf3142cd9666bb318005619d085ea2e8b501bb10cd9694fe3 SHA512 0ffdf531c03d1f0866632002b163fdf8642b613604e74d1cfa5844e8c327946baf303bc0410fc7ec034f8a79cb4ad59536dfdaaa5cc8fa23a3b7d21faf5e6161
 DIST wheel-0.38.2.gh.tar.gz 69346 BLAKE2B 619da7f17d82837d70cb86bf6481738a4959c70f1be56ad68f87380f4f03efc588ada7af1b6892079833df50e4aa57f7453b811b616b8440e388bad701726572 SHA512 59a55e35f641dc6e97bcd58755ef39dd771f8ed442843321878054db3c54234befde368ae500a93fffde6ea1bbcb0e3981975b2c7574fc5a58693a70430e474b
 DIST wheel-0.38.3.gh.tar.gz 69385 BLAKE2B ff1c9681a361643877b1838d7fb2679f7b542152fa8f6268050bd1d7aefe75854e878036f4051e7e562f24973c4769948975060caa969ed8c13fd5259668da78 SHA512 e7a9b922fad3552b60d86123b002762e6a672253fdad8580c93ccea8c57619d450345c948b5e36857b264b7214860ee7f77650f7a269f455c2aa952116023798
+DIST wheel-0.38.4.gh.tar.gz 69770 BLAKE2B a6077e38c21626169d68a3256fbe6457de3d4fde5d0a582859fe7b9ec5d73c142538f7fbfe762ddd436473c682e7810407a08730f66ec2a7844084d349e0779f SHA512 2ff7c6175201f8145f2c1f9937c6955a1dd22eeedab1e456f65c4edae9186610d9e7702c35773b49026c56c9cc201672025e7d42fcc7f782153c65c28e6b90d0
 EBUILD wheel-0.37.1-r1.ebuild 1580 BLAKE2B 72328d5044bdfb5ba5bf171cba5e783a6bf3bd08adcd01cef117122849fa035f7cbf1220852a639799cc2b1f25ff8487ec3bd3bd714ba4249c0aad2f1e89cf73 SHA512 4e0c40b131019be19d6cd47cef04181745abfeea461fcdc6e698b7724f3cd0159ac877acfe81f715ef95c0dd3d6b475cc24c5377e86070a362aeb9e2aa3dd3d3
 EBUILD wheel-0.38.0.ebuild 1468 BLAKE2B 7246978d927b63a37167e815bfd1d88124b927bb905114d2a3a94894d120253170844c2a911e41a9e93ebbc60b33b3b0614be1d9917cd4b7c8926c420e11f037 SHA512 7c83a56754208a125cb43b312b7a6e0298b875ecb2edf1f64d31032b100fefba8db8d458cc6cd464333430189b9c97bdf367641d4514f5bd77069e6282c16477
 EBUILD wheel-0.38.2.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
 EBUILD wheel-0.38.3.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
+EBUILD wheel-0.38.4.ebuild 1521 BLAKE2B 8a7d51d4045bfa65549b1fe3a60ef464634e3a849e25853756b020b24e1a0ec042415b0fcf9182d8a02dbfcbbfdfcf1e691586b46576d7601be750ac927a1ff6 SHA512 5df9e0320c3a3e526854aeda7ba22fb55cad24ce8cc63261253047af806128652a2492d3dab7f351f529d5659dc6432ab920ac09be7bd6aa66c1e8d83cc92c3c
 MISC metadata.xml 383 BLAKE2B 352e8b44b3c4f7008c6ac73b8d4454602785ea86ad52ba4601b1c598a0da4831ecdf1b36cfbeaaa1635e52a924a3317d6abff9dc1b26d3f77f04c681208265d3 SHA512 a810c2c7bdff95154a907ce2a00ed2ccc63174e0ba7dea21c6faf62624aac12c2f772557f4f26406693b8963d3bfa77b95dc9e4156493ee991d64021ad8f6c44
diff --git a/dev-python/wheel/wheel-0.38.4.ebuild b/dev-python/wheel/wheel-0.38.4.ebuild
new file mode 100644
index 000000000000..24e78cab73d7
--- /dev/null
+++ b/dev-python/wheel/wheel-0.38.4.ebuild
@@ -0,0 +1,66 @@
+# 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=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="
+	https://github.com/pypa/wheel/
+	https://pypi.org/project/wheel/
+"
+SRC_URI="
+	https://github.com/pypa/wheel/archive/${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 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
+	sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	[[ -e pyproject.toml ]] &&
+		die "Upstream added pyproject.toml, 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 = "wheel"
+		description = "A built-package format for Python"
+		dynamic = ["version"]
+
+		[project.scripts]
+		wheel = "wheel.cli:main"
+
+		[project.entry-points."distutils.commands"]
+		bdist_wheel = "wheel.bdist_wheel:bdist_wheel"
+	EOF
+}
diff --git a/dev-python/zope-exceptions/Manifest b/dev-python/zope-exceptions/Manifest
index 01de39a4dc32..d5b1492e5fd3 100644
--- a/dev-python/zope-exceptions/Manifest
+++ b/dev-python/zope-exceptions/Manifest
@@ -1,3 +1,5 @@
 DIST zope.exceptions-4.5.tar.gz 29609 BLAKE2B 63c853105d3a588418f79e877aeedf0b001bbe52eb3e6c82687127a8cc0b8e424143e75c7a77b224ede31c5db0efb1bbc126e851dbc8bef5b856615b0717f6ea SHA512 f3f75b2f9ecfe74d3bb081904750769bf331fb594d266907782b7ce7f9d062c261b2f95a50ce21cf8917c56a25899274dae466a5b59afa5ec66480182df55bd2
+DIST zope.exceptions-4.6.tar.gz 30876 BLAKE2B 9cc9a040269aa2f813018670e3692c9897fbea3a346b37e72fc54e72fb33dbaf0f14c192a76a7c40f57674caee4e17e86aec5f1d60e1c0e6a801d859d9629189 SHA512 d28a4434b27f6611040b290dcece26c1880982853092c89d5a8d74093cb9339a62834d7c3949d5ea28c4d3fc01c6f36180df22031cded6e4c963acfff65c2ec4
 EBUILD zope-exceptions-4.5-r1.ebuild 1000 BLAKE2B f2f963066cf263d5507b60e3236d55547cc99828db939cc1d9f12ffba8c4b1b960a437f060a1907895d25ba516175df748953cc2eafa60bb3cb4aad74bffa64c SHA512 7eb7d181f2a5ea2ce1c88921f0eff08502d026e67f5f889caa75f829e4ed849fdfcd0f38bf52b1e85c8158d96e7372115b1ef724036c5cf6dac0f59382a50427
+EBUILD zope-exceptions-4.6.ebuild 1000 BLAKE2B 35f71caa16ae4bd7e2e83daaa490ec789c166784f2aa8b38a80b7472d19c0981d4b39011567207c4169bbaabcb824c9663c12914599212f95264c49b11a9b7fb SHA512 f435463f58ae2b7c6ffd57abd801f78d290193ca2d4dd04378f45e2eacad0879851bf8e95f9869971f2ad9691edefc5bddace45673bcc3b407621c74e96b919d
 MISC metadata.xml 413 BLAKE2B 3bed6e3e8732f8e04efffe7ea279eaedbfef2fa2d011f1881fdfa814406b0ed5e5a926eeb1a0e66858c1f0524d5c1d1948313c50c53d9fce6cc4596ddea9f87f SHA512 ec4b63a6791605b6c66649026a10d0bc445849b801e9e6350c1bb06b7a244c86aa558830ba39dc1a3d35b3dc2d650d1a52cbe7f84c912f5f7711fe6ec6bf55c4
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
new file mode 100644
index 000000000000..93aaa4ca6baa
--- /dev/null
+++ b/dev-python/zope-exceptions/zope-exceptions-4.6.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+MY_P=${P/-/.}
+DESCRIPTION="General purpose exceptions for Zope packages"
+HOMEPAGE="
+	https://pypi.org/project/zope.exceptions/
+	https://github.com/zopefoundation/zope.exceptions/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	!dev-python/namespace-zope
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 91b054d4f8fa..819bb169900c 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -3,6 +3,6 @@ DIST zope.interface-5.4.0.tar.gz 249329 BLAKE2B 3a35ce6ff2a9984ed865cfb3bc3371e8
 DIST zope.interface-5.5.0.tar.gz 253292 BLAKE2B 2c3e48aeff7124a50b834792774596bd3ed793146be7335a0b3abbaf0e1861d84668421b9098cf4f8986d17f8f148a7b30b929ea73b5d344e5d63d44270b2a99 SHA512 ab74a55a90c17b1aed55f1d6e24365321ebbca5943557be7731af99d7436f18f4d0a4c53c0c26c29c0379ce72ef0c2babccaa9cad5aec843bc533ff19fdbe6d9
 DIST zope.interface-5.5.1.tar.gz 300064 BLAKE2B a40de949efc269e3b942eaa6bd5006afc253487149ef22fd1d070eb15535ad755a34cd3e3ab053652cbd1117aef92fe79e8de683491c8e8eaa41e4da8b9b12bd SHA512 e5d73a78a8d9960cf8f24a7603175b0ebe0f2a3695536cdcecb5f78a6ee118aaa8fdf26c70d08a9d17f70e9b89024c260c732e2f9c9153ab960f3175fc10b9df
 EBUILD zope-interface-5.4.0-r2.ebuild 1272 BLAKE2B e8c6f9ce1a645d2b8e349bfcc98b93b324f6bc3346db0901f85db16159d819e53cce0a4a6b02b28b404cfe99e53ee0a002698da4e2c4cc7ca4a18045aae34a62 SHA512 cba7ae17d9a8cfda3b1479d58b3d0e2e5eaa7f513020f005be58bb1333b2c8fcdf3496de742eba0560201f0421b02a1eaa256ebca128b3321b865bcb3587407b
-EBUILD zope-interface-5.5.0.ebuild 1282 BLAKE2B cb0281d2784f7e35c00d68df496532ec119a3b26b25384daaac15807a780ac384b6cbfc1921edc372272584cff753f619fe7ffc164018da017a60242e0747778 SHA512 fad0897bdd3a245be8da16eb2720d53375e728d3b5025093f16e5ffaabcc7fb56377cf8a65fc0b37d689674fa2bcd979c3f7b519d922feb2742d92c42b1a1e4e
+EBUILD zope-interface-5.5.0.ebuild 1278 BLAKE2B 217c267a7303db03e693efaa659d329967f33e7b6f9ae8966e690e4b0c27ace7013ff334e8756493dae43292d1e0d84a41072d1e2f8ef2ddb0c24baf07ac76a1 SHA512 1220c7988d12b2e771544124ddc692052170551714343b8b12d4800d785457b20a10caa057c7017293e08b63eaefc73cc15e35f2f9b7f74d80ea401b53dcc4a7
 EBUILD zope-interface-5.5.1.ebuild 1285 BLAKE2B 494bd885a8482163486f792389daddf7399f33c341740346cc5a26c6ed641a3e115f709d2103ff1b2de65055cb73202230590f9392d4b3dc92642e0f0dfdd7b7 SHA512 d4c853a2fb8372720ab87925d35885b47112d687e65ca96ec0e10a229414260872f60747ea10aa66ad1684a587266ef6106a9637ca0c81867625bc9f805e2d81
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-5.5.0.ebuild b/dev-python/zope-interface/zope-interface-5.5.0.ebuild
index 9b8cc65cd440..f2d123638e1b 100644
--- a/dev-python/zope-interface/zope-interface-5.5.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.5.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 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"
 
 RDEPEND="
 	!dev-python/namespace-zope