gentoo auto-resync : 12:07:2022 - 13:33:15

22 files changed, 233 insertions, 415 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eb24bfd755bd..19257a800eeb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 605934910eba..71c8c60185dc 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.7.3.gh.tar.gz 7918433 BLAKE2B 5f0eaa5cb241db3fb59bfd5fda0566811cb72e5dc902e15aaa269aa5fea35be1c5c51ef7515a386aa9cb20f769ad793a005e85e9b14d10b8be046788842ee496 SHA512 ffd1a830b69196537c62b21d6307f6d0f0a93f0a23fb0bacbf17934d2e5a454a93d72d33d0e28eec6b49e917770df5fc43134453e0bf1bd8433ee52ce22935be
 DIST aesara-rel-2.7.5.gh.tar.gz 7920343 BLAKE2B 04f7c1cf587799b915a54067a98608cee49de8ab8a50c6d8434aa7ad6bd27b547f9e4a4f71d459d8fca9805f97232a9ba4a1beb5240a8e89dd19f807da2b2957 SHA512 c68dc6e2893d2749d6ec3a74b850979f0766ac65c34bf07af3c0f1a16874e44f5102e1d036a88a7a43f51a44d3fffd65babf67373982362b034a2410124d4aad
+DIST aesara-rel-2.7.6.gh.tar.gz 7917317 BLAKE2B 21f801bebfe207586482b7eddb2fb1a2d812cb7c9bb28f2a7bc96543dabbe7ea7aa16781636d9e52d8abd389c8c148b3ae16696214d2914b702bb9dce114f149 SHA512 719d6ded6a058b739b3f2dcd734ef785b05eb07dec152c523d2ace7c5e9dd05d1550113f10e114b63b72d3a697900763c6f1e753db9c8d01a6c877fc5d3c2732
 EBUILD aesara-2.7.3.ebuild 2614 BLAKE2B e360f5cbaae35848f952a831da22796d20c8ac3764431efc97ea295c4c93d9176be7b3a4e8f6a4e5bd79b5e967d2a4418c56851aa2d7255b76ed5c118369d293 SHA512 67ceaa8380df3d4484b0c168ebe0fe214e6fd3b4c4fcfe7e10f10f3817532ed496111d31a4ea5d7c5ecbe4603c4edbb9e97c2c3e1afc9381697011ced2819d1b
 EBUILD aesara-2.7.5.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
+EBUILD aesara-2.7.6.ebuild 2616 BLAKE2B 827420e734f8ec6771c1ee54124dd50a34dcaffb267509e762bc3d1b38d327385b53d60edd239ec404bf4d1a9ce4e80462e65e79dd5b0bd7a8c35376ed013ae9 SHA512 5d2b17595a3086483f2443e5d3608117d2e10fb5e64d0b33f2c2b26a346868abaa8ea09c08ba8beff734ee1ae1d0a878e064f2f8862b3f5838883d449bb0efa1
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.7.6.ebuild b/dev-python/aesara/aesara-2.7.6.ebuild
new file mode 100644
index 000000000000..5dfa54ec6053
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.6.ebuild
@@ -0,0 +1,92 @@
+# 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-1.23[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${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
+
+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
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+		# ..or jax
+		tests/link/test_jax.py
+	)
+
+	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
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || 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/caldav/Manifest b/dev-python/caldav/Manifest
index c2d8556161d3..85740f46144e 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,3 +1,3 @@
 DIST caldav-0.9.1.gh.tar.gz 105578 BLAKE2B 3581bb0f40daf312b32ff2ef88a31502449e0727f8e6178574c5350fb0312726d62cc9e4be3b9e73b4ee55282a32fcc503da48d49c3e7f0639a96de8197e6f8b SHA512 9171a09aa81bd6ad885aaaa3dac4cb53cb05235b37aa5be72d641b1cd2ee27928213eb95358654e99adfdbf70bea4567977509f972f54b8747162e91c95e1397
-EBUILD caldav-0.9.1.ebuild 882 BLAKE2B 52c73b8fd47c6a1b57f759790e4ef725fe8c2f8429ddd0b822687412392c13ae7a1129594e21686c90976efce6fcd3b7bda67c9e4a151fba68f528a9ef4ec34c SHA512 ca966e58e1342cc4a18c16eb41f98772c7f8abb484cbddbb7b854e92a40aae994d820cc1a63e5a3d644ae7800a92a709a3f1e05c4f931b9626d85e28c8f9a311
+EBUILD caldav-0.9.1.ebuild 971 BLAKE2B cbcd88c1a2609b66e603b542e5258dcbc22bad66c627e2f31e5af7b63ab1b71f80cb40a95aeb5ff6575635be26e79af2bf96d022cec73e5374c85a519baa041f SHA512 eb64361b29d83e13f1ac265103027b1e3a54bec67d8ab5b086036704fbb7e008a3333c6f1fb64a2c5fe40ec268e6dafe50692298d3f59213933d778b4e354c90
 MISC metadata.xml 394 BLAKE2B f0b9c600418cbbc4c935d53b63f4e6c1235500984ed388ceb26c6e02fdb7200eec1464d8c4af17e6afdf3688479f0a0763e6e710f916c1c71dab2ca84df9509f SHA512 4f94039805c6cbfb97a667d555af39bcce7f10db8a7c61f3b8b48a903fcd52d3e30467c91c9ec13195be6dc3c4ccbfa088aeac390d5e1c64e9267527a8b77b6b
diff --git a/dev-python/caldav/caldav-0.9.1.ebuild b/dev-python/caldav/caldav-0.9.1.ebuild
index 37e0a8428e53..a8da6ea96540 100644
--- a/dev-python/caldav/caldav-0.9.1.ebuild
+++ b/dev-python/caldav/caldav-0.9.1.ebuild
@@ -28,8 +28,10 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/vobject[${PYTHON_USEDEP}]
 "
+# For now, really does use nose imports: bug #857738
 BDEPEND="
 	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/icalendar[${PYTHON_USEDEP}]
 		dev-python/tzlocal[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 72192dc5085d..b21cc77b2669 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -2,8 +2,10 @@ DIST jsonschema-4.6.0.tar.gz 269939 BLAKE2B f214f65fbb908029f221789ab3857db9cbc1
 DIST jsonschema-4.6.1.tar.gz 278452 BLAKE2B 0b5c90b790cf7430bfbea4b38f90acec6fc256bf521d9552b463489751da3f889b43021e9d94c3ed4bd7704c462141d73d25273eea1331c85a0d2d04d5c9ad18 SHA512 5c0e2806915ef4545092b0bffe4cc1207d9a6f2a6920c10894d5b7b2a9ed665093b7a9a68114d1a05528869e7d8aed902e7569800db4393fa810c0f6853f713d
 DIST jsonschema-4.6.2.tar.gz 275975 BLAKE2B 7c587e8b5c5eff097390e6254ae633445ffece2bd3e9c003dca730bd332c4d3c236ea10225dc81b95ef9359a9309831290b106a07e80945574dcc2937bcd4983 SHA512 e41d6bda1bd6b12174201a70b5ad5209ab7c445faa6c947408f0fbc255839f3379ffe8b539760d993b435972936e4052300dbc420d4b87051f33180bced7efb2
 DIST jsonschema-4.7.1.tar.gz 278393 BLAKE2B 6840e84fac982c011c8ee7f7112d5dec0575f8491efa00b319e4d7a1d36f306a893a77ce962265505efe2493266fa6da932fe744dbf9906c2a5439d19e291135 SHA512 5fa43906a2d766c8b568f375ace8ff96d131dff634fc3c65ab9c8f4a70e973935f3626e4537ab8a04d374dd0b5e6a311849abed0dde4faabd53a2d48cd6a5ac7
+DIST jsonschema-4.7.2.tar.gz 278495 BLAKE2B 55c25847e210e0bdd3bec672b4b6a4eb1a2e2ec5167c115c34a2d0b2de079a00eaff8d901386b475fc26660887090896e78e3a38c1805f5b767fa1eece740e3b SHA512 c624d7bf317ca20fd8cdd248ec7d7679fde907ab304f1a092fc7a172464f43e41904d3f88df57e1351043b978448f51166a09af3625f00a9ad4d7353033b80af
 EBUILD jsonschema-4.6.0.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
 EBUILD jsonschema-4.6.1.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.6.2.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.7.1.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
+EBUILD jsonschema-4.7.2.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 MISC metadata.xml 703 BLAKE2B 240a82a967bf7e2c200a2359dc691cbfa119fbc415f41c594c981a0da551a779b9d6afd6f8aadc7daab074579d6964455cf8bc8de36f01e986d344d1082095c5 SHA512 88cf98273ec371942846bba05ec8cc38939b1ff1a4f35e16f5764d09e67830e6f86b741ccb11ca487071eef205d193f5d0ca5ab156eb429c89d10c90778594b4
diff --git a/dev-python/jsonschema/jsonschema-4.7.2.ebuild b/dev-python/jsonschema/jsonschema-4.7.2.ebuild
new file mode 100644
index 000000000000..fb6400dc457c
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.7.2.ebuild
@@ -0,0 +1,53 @@
+# 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/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index dbafd8b32894..1307f6f2c87f 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,7 +1,5 @@
 DIST pgspecial-1.13.1.tar.gz 50269 BLAKE2B 0566a7c2d8ee1ea350e27a4283f56c4cb1360f23ac9fe0147358ff68f527907c47650466dd41ae9c68e8a1f8ba658e452a88db360a7066f5562b7f0c578b8b62 SHA512 4b8f0495451db40087327640edc4bf8c29997b4f501dc5af6d093ad880fc337050d651676ae8ff434da3564e773f9e89e6e7d6bf0d6cfb7b70d8b4beea73a347
-DIST pgspecial-2.0.0.gh.tar.gz 50098 BLAKE2B 3e4c2b85c8d0e31bdd6d61fd1dd8e9a54b68fef23017e2a11238018d63fff8ba93ee5f8f5f4679321b1a757b4a504d86d9740bea91c95f0312a31cf0135378fa SHA512 59dfbc83be3f263fdf9fdad425675624f2738357f2b3f29abc37b90df1bdae30bee6145faa65715a7a166a9e8ee66201cc5344e697ce0121ae7c6bf9bb3af012
 DIST pgspecial-2.0.1.gh.tar.gz 50181 BLAKE2B 6f3f9f8feba717c18d3985d80a432eb7d127c65f7436bfc792a44cb5d7aad08e6e3b931cc289a051fbfea43cd5d8d7db44ede6de89683d462d51635c5caf2e04 SHA512 e89e7cd0f7e849fe93b8e8e79e409ee73ba6c22f3d76279415f236184f732d12cdd8b6bb7722b24ec2bd665f3429c0bf4e6905cd24c9739aa78906b12f841f13
 EBUILD pgspecial-1.13.1-r1.ebuild 1167 BLAKE2B 7b805cf0bb8abfa91ebf86060649ac2b6720a3da4a055ce1d8d02abb2e3a621b3a609ee7e85366d2610c26188f8f02ebe53f90f20f2e985c2746bce52d3b928d SHA512 41701fa1031422cb0c307c6c7899f490a3a600e6ac4276dc95a2621c8065befc2f39181277eae954a2be690655a3a9ed32147298692e5c6e9c3949045e9170e8
-EBUILD pgspecial-2.0.0.ebuild 1222 BLAKE2B 24a290eb5ff4ea49f43c4d4fc264ba7d39ae0522ec22966cb352f1ba6822954f3d44292ce5981841e7b9ab673540f8bc34707481ea733eaf92e25a80602d41da SHA512 acbc80b993be5310186288350929a0ca9de7d9df2ee129359ecb00980124000e3b41167ae2d3321de07232a270471892c821c98d2ec01f145faae0890fb51667
 EBUILD pgspecial-2.0.1.ebuild 1220 BLAKE2B ab578363d641968bc8fdb34e37b538b82aad288374b8032b73f33a3d63b501ff34919a99caa06bd0f161a75e5a55545f9b6a9e0f81bc582b67d91da51dcd1c9b SHA512 ef275129752c99d4e4f372385031832645b34486de70167723e81b50fec60bc35e46404d05d08eb7706a3c5a5c91ee08459e6ac06b39f0579075febd82f56abe
 MISC metadata.xml 542 BLAKE2B f7c36257d672854f57623ce68e09e17b8bc734e0a2afa70308ff3c3dfee23274750a8d98034527e14c757546eb78b84f170b9a4d180e02cf491301ae34127c79 SHA512 cb1eac0516db3ff5f32efb6adcf2c39e5479f7bb2a44f3d7c75f4e38e07812db21fd8e8af94e97c613b54606c2660317b5dbb0221c88cc926968404898f19602
diff --git a/dev-python/pgspecial/pgspecial-2.0.0.ebuild b/dev-python/pgspecial/pgspecial-2.0.0.ebuild
deleted file mode 100644
index 80daceb18f18..000000000000
--- a/dev-python/pgspecial/pgspecial-2.0.0.ebuild
+++ /dev/null
@@ -1,55 +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="Python implementation of PostgreSQL meta commands"
-HOMEPAGE="
-	https://github.com/dbcli/pgspecial/
-	https://pypi.org/project/pgspecial/
-"
-SRC_URI="
-	https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-3.0.10:0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-db/postgresql-8.1[server]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( License.txt README.rst changelog.rst  )
-
-src_test() {
-	local db=${T}/pgsql
-
-	initdb --username=postgres -D "${db}" || die
-	# TODO: random port
-	pg_ctl -w -D "${db}" start \
-		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
-	psql -h "${T}" -U postgres -d postgres \
-		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
-	createdb -h "${T}" -U postgres _test_db || die
-
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${db}" stop || die
-}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 8e4a4a7b26cf..30b38d0f36ce 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -3,9 +3,11 @@ DIST setuptools_scm-7.0.1.tar.gz 67921 BLAKE2B 15a4a8953bb9cf8754fe465b53e11483a
 DIST setuptools_scm-7.0.2.tar.gz 68142 BLAKE2B 11bc3db134c3ee90b9262cf663036a6119a559e134b479a42e10c4b54005029c0e192d92e32d14f8d2dee2d09258b9cbebe9b45f07b553507b80ac7f2ecee110 SHA512 c9782a1b5bbfaaab2bbfc223477e92e8ee2fb0b2a393ff912f0c54fb99494d1c014a4e6c103a3f852d335733b02bcaa3b15eed8ec3a5c1ef54c4691fba7cb0de
 DIST setuptools_scm-7.0.3.tar.gz 70341 BLAKE2B dea8fcdb3cafb040dd2bcdc5efeb8bcba1906d35fee83b17646e1df10a4fee642a01df7d115d66e93c1c177c2ddfa0f4260fb9fe9bf54d24955c3c7014611d35 SHA512 511cff1d00601e535ef4abb14189b7a965003b77b630578c6306758946d45e9140f9a0cdf9a02b915d829f92fcc3460a49091ad2971dec783016f952cff1d326
 DIST setuptools_scm-7.0.4.tar.gz 70512 BLAKE2B 07acfccdbeb0c7f6a6773ff93fa10c35aa8cc2451ede42cce269e2278606fed4acd17e8fda8294ac84b596e776a5ba02ae5ef1203dff42738291798e624cd991 SHA512 cdd1f36fab5b0fa9c1f3dc42c57ee732fbc7b39e761b2db3047c9e953ddc28dd6bbc29b44451e77f602c4ea39469af86a7b08d2d6ab1513b938193e000c3c04e
+DIST setuptools_scm-7.0.5.tar.gz 70716 BLAKE2B 242809a32cd23d9d98e3326714d1435220907eacdb3127558987d0d8be95775b7f8ed284707421a9c52e401c1738c11a01782fee2c0635924122307d3308cc0c SHA512 5b3420f0aaa0dd1655afb0fdcedc3738b75dbb9d8205e0ad67555c251d330a0d3620a7297cfdcfabbc7386a8acf43fe73fa7f3b17e2d156495fd8b2ab7d1c985
 EBUILD setuptools_scm-6.4.2.ebuild 1186 BLAKE2B d99353bf7e44158acccf0f8fc1a33a72211c1f8fd735de1cb59cb6eb1927e510b6fd196e11f1a8a122f2529bd6399739fc8ccfb456b2d3868d0dcb1ff93d948b SHA512 903990604ea97b4fd412d041fdf9764dfafdde3c66ce1756d8c9efdc351811bd7bc2062acc65399db6ba3eea5cee7d8bd2e1ac3128bdaa0cc67002f7307dc498
 EBUILD setuptools_scm-7.0.1-r1.ebuild 1322 BLAKE2B 7f8e059beda99fd1f0c030a56f325cefbe2c1399ec0ea6d0a065e848c51aad7f19674f1e5b6ca742f05775d55aa6e20083550407088fe7dda1013fccdb7e1b5d SHA512 966bb2d39c8feafd545d62931e162c5e1f9d74c89fd56d3644d32d64e5104405cac2450ddaed6f686aa7ab7568a60e0abdfd4a177f4bb6ae73cc6e5bb5473623
 EBUILD setuptools_scm-7.0.2.ebuild 1310 BLAKE2B f405a051faaeb080d2f1a30b51da40517100e28e5b96932a6eeeb293cd32e457b73f0c91347a6f57018e283c2ae62764c1dc13a61a04336cba9e9ddb5447c54f SHA512 d38568331d425cd71c2f03377567fd4c0ad6795f03fbcb3c1df370c439a037a00e36ae9a2346f89c9bd126af009b3bae21f0d2444641ee70ee1dc0cbd239532e
 EBUILD setuptools_scm-7.0.3.ebuild 1274 BLAKE2B 68274360555caf901b5712d42bc36ea0a6ccf113e0a9429b6be03c5ac5d06df0307baa56f4e473c5d1d9f7da8b14ecd928fb95ccc0fd2284459cb11f53974fde SHA512 8f5a500a3710a48014f26d1f4db19498fe60558565cc8c348407c634e99b4e3389ee1759c39d90853aca7e9ca1db101aacdef1146ff889626defc3f548d58bad
 EBUILD setuptools_scm-7.0.4.ebuild 1274 BLAKE2B 68274360555caf901b5712d42bc36ea0a6ccf113e0a9429b6be03c5ac5d06df0307baa56f4e473c5d1d9f7da8b14ecd928fb95ccc0fd2284459cb11f53974fde SHA512 8f5a500a3710a48014f26d1f4db19498fe60558565cc8c348407c634e99b4e3389ee1759c39d90853aca7e9ca1db101aacdef1146ff889626defc3f548d58bad
+EBUILD setuptools_scm-7.0.5.ebuild 1358 BLAKE2B 11a2e1cd09de8c48799e8412f7263cd54f6970364dd44ab4a6be0ad9adcd8818d4619b23f6a3c199bd836e7e5685beb0dab21ea2ceb8aa53565a630b3cfebdd2 SHA512 1e5e10b35f77ffe1b24e0478a9502fcfd4a40e894a1820cbd4a175b72fa2a0d33c46f4af52a38d4e177440974f96178e5eed6146815265d0a981ddc746e19b4b
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild
new file mode 100644
index 000000000000..1088c09905a4
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.5.ebuild
@@ -0,0 +1,52 @@
+# 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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
+
+	# missing files, i guess
+	testing/test_git.py::test_git_archhival_from_unfiltered
+)
diff --git a/dev-python/sphinx_lv2_theme/Manifest b/dev-python/sphinx_lv2_theme/Manifest
index b352bfb442d9..c04d995ac518 100644
--- a/dev-python/sphinx_lv2_theme/Manifest
+++ b/dev-python/sphinx_lv2_theme/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx_lv2_theme-v1.0.0.tar.gz 9795 BLAKE2B 7406d03b53c06a4e814490df65c5dad3bb8299be2808fe89da842c4285ac8798141d7e59713e6bf3b3ea72a7af8650c2b7ead586fdf48004df78350ef789a649 SHA512 e10331f4a979055929b7146b89a4c19b05698e32d0acb2eb3d7734f6e9298d1dbe24dbe5f56697505f9f7488845643011fa1df4ed112b4f016ba21d41a4f91c8
+DIST sphinx_lv2_theme-v1.2.0.tar.gz 10724 BLAKE2B f2045ab4ce427ed1d36eea02e6ba9eea426c2fc810ed44a7033296602416629b2b03c73ca8b24b777eaf2434aae69c006ed06d5ac57cc20f4f8268b6bb0f00d7 SHA512 8c6bbdf77acec9c104b000f9c586fcb4ba3c39d64a7895b4445fcde2df401b843794e254b121034af8ffe62be8ed55205c177b9b64369b03c591fcad109f1383
 EBUILD sphinx_lv2_theme-1.0.0-r1.ebuild 506 BLAKE2B 6965d88c634b3ae1de72ad1e3eb85345d9bfe0d1894465da8b0c229b703e2dd27a23d21b5c1054cc09228d43ad5f4cdeb900682a54de5816970a3e4a81009041 SHA512 6e7026f1e2288f71aea8bcbea32153dde7d51af15a1c2cf627e7cbd9ce4fba5f7282b8a10035b9f90ff5220161584849768d762251e40f208feb421248cc7a00
+EBUILD sphinx_lv2_theme-1.2.0.ebuild 594 BLAKE2B a1f90a2b65d79d9c88700fec41582dac0960f6a297fff4762bf242af7445e14d03c52ecce8a921c15ea589288d24afacc03112c577b6cf4abf7699f4477abf6e SHA512 af055276ce392ace1398699d5e8fd1402809e6ef0dda108996a9f5ae41fd811a5c31933745e163b41d229357ffb810c8eb54d8645307201d96a31232671578a3
 MISC metadata.xml 429 BLAKE2B b4e7eb03faabacbb5a7b41f1b0b04ae1580f7a00959b0d0e575577cf0b93f1551773c492826c7635c6cfd18af0e608a23e7fceedb76ef99920c1f09fcd51ee17 SHA512 ac2b159c1a66cf08d5d4990150b0e930b40bfe8ab7f016e3b7d0d479110c0b8c402f33b46175dc31b56e6136a26fc84223e82fe5bdd87cf3de1a6b175254c62a
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.0.ebuild
new file mode 100644
index 000000000000..797aa5604888
--- /dev/null
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.0.ebuild
@@ -0,0 +1,21 @@
+# 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="Minimal pure-CSS Sphinx theme using the LV2 plugin documentation style"
+HOMEPAGE="
+	https://gitlab.com/lv2/sphinx_lv2_theme/
+	https://pypi.org/project/sphinx-lv2-theme/
+"
+SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 9c41c285c14b..ecee8e4e6c02 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,3 @@
-DIST stripe-3.2.0.tar.gz 245873 BLAKE2B c75864cebc4b62c116138bb3b9fcc7b521a7c89c7252bb2ad03520b0904ad701bab27fbe1a0ae500a2782bf737295218180991fe0d5f224038f7bdcfd2596598 SHA512 dbeb846294928fd608d547b8e4aedf188345ce68ce6e9b4c046e86e5a622d96281cf0507db4d1ba5834c68252bda573da7dac725aa1d7cbeb820c65e166f3a1a
-DIST stripe-3.3.0.tar.gz 246317 BLAKE2B f734df83509b6c77f865d52b2ec17ac5ac271661478706787616afde1f85cb356f05c2fff63289b3bb180658abab546d39245563f18f4f7a3e8b72a0e578fb34 SHA512 4f00fd9901a5b4d873c4a9a00483f57f4cd9359f8a440b3d783e7aeed250e33400a7405ca8ea5af29fd1b44bc84c65fa59c8121e4ffb4852584ffd3fc2099910
-DIST stripe-3.4.0.tar.gz 246528 BLAKE2B 81af648356734400c109d674e1f62f45c3b0540b0ed0bd94e407f5072f5bb996270b4edf12bd00e61bb790ee2c12d3d0fa633287a60e27087e64c15aa421650a SHA512 81a391b2fef02028a5680df2240238bd18cc31f522790ee72fd77c861d2f389be3ead9bc1de261ac7bced3061235ffc25b6baadb69a20a2a53ced75aee0119ba
 DIST stripe-3.5.0.tar.gz 247698 BLAKE2B 8c47b3f4af21934d4dddea2d95831d5d4772c0cf42f8a5d3cff90dbd2dfd51a37c34f92b6df30ddcafbb1ccbde766744ec63fe62881acabbf1437a626ec0ef6c SHA512 67e63f95b489e049d81d9b3929342a8cc2bc3638060d9f278752459d32408bfe8d5f09c4c047a1ed0deedce875b0a84873a3b120f6bb5f30c0668eda5129e4ee
-EBUILD stripe-3.2.0.ebuild 1816 BLAKE2B 846a6eea171f1d73863f6516db4721a7144180ca414467a9dd6cc815f6d29e7968158edd5b2bed7d9fb46b6245264f7957c715e1ed97439a2c51a7b7bc2af448 SHA512 cb4da8684e5f88a360274f02b300e52f3e741d2e71eadba00217f5ea61f7e443ee60c9efdc7270abb79558e10e61bc217816b53f30cdaa566dce19e33cb21297
-EBUILD stripe-3.3.0.ebuild 1818 BLAKE2B 07faeb2dbdcec4ff86156c6d77c0f036ce5fa03cd0d554a3b6b9d2038fdb61989aab488e8b79a7c3346b6ef30e308aa064c607ad7dec92f3b52392cc11a8e9d6 SHA512 864157a1a6bd6a34ef80b9f1c731c8e9d0a0b1d6f16134b42bf34cdf70ad80449d3e0197458c831018192d314a239123b4e0ff9243d75093a3310554168876d8
-EBUILD stripe-3.4.0.ebuild 1818 BLAKE2B 2e62e84762c936b0b92e13f72426398be3642e9ffd2f8147abe9cc4d67122a2d0141457483af3874fe1c2beffb44233a62d9bad44e9fb2f9e0a05eb96105820b SHA512 207206c66e98be9137b9a450e1d778ba75c311f7044c91949473cd5479eb64802205ef4580086865039a542eabbae4851cf74ed908436a63514f69f30f263ad1
-EBUILD stripe-3.5.0.ebuild 1818 BLAKE2B 5e440330c0fe0ea5d7e7bb2471e90b7c4f4d81c72fb4932cd69b9b00b0cdbc624ba109e69bb1df66b6694291f99e886346bc8763b0143ab1deddbe36c0ecb2ec SHA512 56c8556a49388714050f20047a8f086c36d3afc4e831aaa4eaf246227777216af4a0d6c474b72674e162bee9b8bd5308d668a9cb63280d1b256a34b8170b5906
+EBUILD stripe-3.5.0.ebuild 1816 BLAKE2B dd5c528e14494869144732d3737c4476da4508ea7547f3bcafa23738d25bf033982ea0c2af17052e6a34c614cda01ec807cb59c0603ed28741f1cfd19716c04f SHA512 a9d6b9a3ab36381b744e7ea7e81b3816ecdafc58c1fe8aa5452ded3aafec785ac9121feb4cb5d08e85c13d8f635fb3952450b361bb7908f200c6e4ff6817bdf1
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-3.2.0.ebuild b/dev-python/stripe/stripe-3.2.0.ebuild
deleted file mode 100644
index 015f0bdf3317..000000000000
--- a/dev-python/stripe/stripe-3.2.0.ebuild
+++ /dev/null
@@ -1,71 +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="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.130.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-3.3.0.ebuild b/dev-python/stripe/stripe-3.3.0.ebuild
deleted file mode 100644
index 1dc081924988..000000000000
--- a/dev-python/stripe/stripe-3.3.0.ebuild
+++ /dev/null
@@ -1,71 +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="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.130.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-3.4.0.ebuild b/dev-python/stripe/stripe-3.4.0.ebuild
deleted file mode 100644
index cce5111d957a..000000000000
--- a/dev-python/stripe/stripe-3.4.0.ebuild
+++ /dev/null
@@ -1,71 +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="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.135.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-3.5.0.ebuild b/dev-python/stripe/stripe-3.5.0.ebuild
index 52c5023ff5ec..ab3da878ee9f 100644
--- a/dev-python/stripe/stripe-3.5.0.ebuild
+++ b/dev-python/stripe/stripe-3.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index b6ab8b8e79eb..c498152519b2 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,7 +1,3 @@
-DIST trimesh-3.12.5.gh.tar.gz 10755276 BLAKE2B ced596c4182b085df8c59bc007977aebb94702edd364ed67ee0114376b235fe020bbeee130853e1e0fbabd1f1d0f6523faaf268ffba1b4c7c30f3f794b64e51b SHA512 d467bd6ceb5b567182ac80ea38374f28b85b9ab983edf98428e09c8f799c206d23e282c03c808227c92e2dcb37f3faabea8d5db74b8ac419265751bcbaa396e1
-DIST trimesh-3.12.6.gh.tar.gz 10755102 BLAKE2B 69336781530f0195c71e65d67ba3362314ad39c3dd349e9b88174136d85b3f72c5e64c93a0ca64572c1595292e2b241bea6552c1e33671fea48bc0aa42f21d13 SHA512 2c6d64ba3307cb50148f345db0f6fbf8f94838ba2171698fad31b2d26205860afa98cc803ccf7264422ca3cad65cb8cddb0f55dfac45f430d012a4579d5c08de
 DIST trimesh-3.12.7.gh.tar.gz 10756892 BLAKE2B af1f40b5de1eb60ec3241d342b3ed99fc7dc5e906c71a7669578e539d7c45ab4b037038423efb324cc462dc34a8ac1d1a8134f6b775f1965f2512acd76a8af14 SHA512 35f8039e46f55a3b2e713249d66a658ef48eb8c4a0a6e196f34933fc28052ad0a73953cc4736377bb7b79606ea08b78b132bb9d709fc50da11b2e96aa0e231e6
-EBUILD trimesh-3.12.5.ebuild 1855 BLAKE2B 411152390f08f88970928e2fc39adb75f0d1ad70020e72e2ed982cef5994ffd047aadf0c688d77f7d7760fc1411cacd13718fe1c0bdb5ebf875537925b2c2bb7 SHA512 b592b16e5b100c2a27edfe891e004562b872ad3fbf225c7e81a5ca9db03fd78438bcb504c7c22ebb8b8ce5f3d747db831c0cecba5fd7ef354d65bd329932be8a
-EBUILD trimesh-3.12.6.ebuild 1856 BLAKE2B b49cc3c0da024f65ed2e8ec5987ac09d6e6ec3cab5ed7249b3b771ffecdf753e2c7f31ad70fa8a2cb63948b79465129927682e44e35d8bb133ed98a1938f29d3 SHA512 40d4c66df4ecfbf27edcf348669ff38d5ac2c7532a777fa148552c94a8f9c2ae631e22b7c782df47b90d74fb8e71ec1626b6882eaddb8ff390f11e309fb215a3
-EBUILD trimesh-3.12.7.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.12.7.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.12.5.ebuild b/dev-python/trimesh/trimesh-3.12.5.ebuild
deleted file mode 100644
index 14d069dd9082..000000000000
--- a/dev-python/trimesh/trimesh-3.12.5.ebuild
+++ /dev/null
@@ -1,65 +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 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[${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/trimesh/trimesh-3.12.6.ebuild b/dev-python/trimesh/trimesh-3.12.6.ebuild
deleted file mode 100644
index 0a7ff2563d4d..000000000000
--- a/dev-python/trimesh/trimesh-3.12.6.ebuild
+++ /dev/null
@@ -1,65 +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 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[${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/trimesh/trimesh-3.12.7.ebuild b/dev-python/trimesh/trimesh-3.12.7.ebuild
index 11e1a73dfac5..40922f106994 100644
--- a/dev-python/trimesh/trimesh-3.12.7.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.7.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]