Adding metadata

40 files changed, 19 insertions, 721 deletions

diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index bbf682e2fe37..9952cdf47f84 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,4 +1 @@
-DIST bitarray-2.7.3.tar.gz 123574 BLAKE2B 9a7a1b0025a7853434ae5e1c6e7bc5302668016f3cf8d569376644ced092ab1b3c28eeaabdf9d51d604e98a3f68f8f8d3002a87cc4dbfd897e30e6b162adf4aa SHA512 4ace2bfe78e06723bedbc263c7b2b163bbc5c35bde84f286390cbfffc8c513bbd4a4f5f775e6d0a863ded7b24cb555c7784e7dd067c3b9125abd8d62863ac684
-DIST bitarray-2.7.4.tar.gz 124644 BLAKE2B 7fc11eef67ec1424288952096acc6c629cc8281925a964cfbb384982eab9117b3def7a456dc740f9d5b7ee18dffa6c4747321dffed5f5e7fb674f5edf0324a88 SHA512 dbf92bfeae721319c928e336bc5afb8d146f2ad71fb57934dde489bc3db8db95a15690d8f1ca5c7354e44389043f194226afae5d9539495999ef486576639b6c
-DIST bitarray-2.7.5.tar.gz 124659 BLAKE2B dd52f9f5febcc1e808f2264123b00eb1f1d7e1d2691b7341f3a102bb2c9d9430ad188cde6784061cf996a726b91c6dcc7f55121e914d13c86ac9dd5774931983 SHA512 162a05626011955ce69caf3f1fcf1bca0db6818a6cc9c37d2abe6f481c71c4142903548ff08a10fb4162ba7ced4c5a427249b483493bbc3840ceff24f35a93e4
 DIST bitarray-2.7.6.tar.gz 124627 BLAKE2B 2beafbcd4906a56bad3c6310671ab16db27f03c32eb91c73058b859e1642f24edfed07920da853b08aa8f7c4703e05b57b25a83dddaaa14e0921798fbe2b1faa SHA512 e425664bec8976ac42bb62c3f80bf835efe41bff803afc77c82c267af2d831d55dd9b962f157aebc64a2df6a7d427523ec155a67991c49956e13b205e66e55f1
diff --git a/dev-python/bitarray/bitarray-2.7.3.ebuild b/dev-python/bitarray/bitarray-2.7.3.ebuild
deleted file mode 100644
index 997ee4859f63..000000000000
--- a/dev-python/bitarray/bitarray-2.7.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.4.ebuild b/dev-python/bitarray/bitarray-2.7.4.ebuild
deleted file mode 100644
index 0caa62759874..000000000000
--- a/dev-python/bitarray/bitarray-2.7.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.5.ebuild b/dev-python/bitarray/bitarray-2.7.5.ebuild
deleted file mode 100644
index 0caa62759874..000000000000
--- a/dev-python/bitarray/bitarray-2.7.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 969c904c1ad8..9c7780ad660e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,5 +1,4 @@
 DIST cfn-lint-0.77.10.tar.gz 3488571 BLAKE2B 6b828c760bf93f1d31fe7d24d76cea63c91ed3f73837382898c4f60aea30d667b28065e4004a6fe62bee04141baa1b3baf576f30af4c823f7980d48c97e2602b SHA512 e5ca37620d33d199295d43d81c7390e181281418681fedbaaedca01a1128b8680451fba5ce429875c2242fefad8cfd234bb919fe948bbf9cdc442bb064d84972
-DIST cfn-lint-0.77.5.tar.gz 3513226 BLAKE2B edff62682027d87fc4f0934aba83ca1cbd83773fbf85246eecfe1d1908b8ba0f6df413b2dbc8976770f7eefaec78bde1cd7017ed36ffac849687436364a42f2d SHA512 e80231e8539735d0a114c6de81f9c52714a1886dbeb070b78bba3c9dd2798399bbb6eb41b3917b5c826b4d3d571f2d9996a5eeaebd7a48a9b774135fb0966372
 DIST cfn-lint-0.77.6.tar.gz 3554363 BLAKE2B abd496cdb72e1032c92a6489da12a4ffb4f83bba994067f9e2d333e55a13ea22d07db880dd3acca208f9b8328c17fe98540cec2847dac32ad87b2662aa0047e4 SHA512 b36c781dbd3294d6f2cfe43f617832170e47c9c9502845a551e6a9263e28dc6de99c77abd998699a2fcb6f08535daff615b17072c3ad1fe9c10853890a71989f
 DIST cfn-lint-0.77.7.tar.gz 3554332 BLAKE2B b669b9f97523933eb5549f7b2d67a132aef2236301b24094a0b74e9198d49121d4ec173c99d74b554b77eee2765b4ceb97126f2ccfab121393bc68e34cfb8147 SHA512 124ab4b96963f4971a25535852290ee71b5eed82e85a4101b3aa0469213b1006bfe8ae3d384f1acf236a0fa9915a24999b00f31f0d6ddbedbdaba123bfbb823b
 DIST cfn-lint-0.77.8.tar.gz 3578363 BLAKE2B 33fbc0dd76a025425453bf39da0cd1c9ffc15b057735e2add0a54fe387377824839ab34fb37216db4fe0cc05f60878b4ac828aceecd888d510612d9c44d8473f SHA512 7fc71965d33df29557de996e2ba0e911e681b5d220e69346a26448c1e04f3cd40f7e17b933cde695ad5aa6170d46981834efa19103e50d6690b4d476d13f82ba
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.5.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.5.ebuild
deleted file mode 100644
index 5d31eea0fad0..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.77.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.65.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/configclass/configclass-0.2.0.ebuild b/dev-python/configclass/configclass-0.2.0.ebuild
deleted file mode 100644
index 69ccfb2fa892..000000000000
--- a/dev-python/configclass/configclass-0.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python to class to hold configuration values"
-HOMEPAGE="https://github.com/schettino72/configclass/"
-SRC_URI="https://github.com/schettino72/configclass/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND=">=dev-python/mergedict-0.2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dirty-equals/dirty-equals-0.6.0-r1.ebuild b/dev-python/dirty-equals/dirty-equals-0.6.0-r2.ebuild
index 8754e20578b8..ed6638799964 100644
--- a/dev-python/dirty-equals/dirty-equals-0.6.0-r1.ebuild
+++ b/dev-python/dirty-equals/dirty-equals-0.6.0-r2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	dev-python/pydantic[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/etuples/Manifest b/dev-python/etuples/Manifest
index 4b03898ddc32..8cb7c0064e08 100644
--- a/dev-python/etuples/Manifest
+++ b/dev-python/etuples/Manifest
@@ -1,2 +1 @@
-DIST etuples-0.3.8.gh.tar.gz 45301 BLAKE2B 56fdae84b180b9ab5a81533d4028d8271e443146a4ed456252ca15400a2afb9987c741c5e5155b9ed48eb12bcc6038e081913c49e00b4eaf67a69c52b2a981c5 SHA512 0971baa9c3038ce1bf9974b750f9e642ecaad92c59b12bc69a2beb6cf4b042302580d96d0feae80a280634f56371f681fc1efcf48741a7cd65b35d9a77b66930
 DIST etuples-0.3.9.gh.tar.gz 45310 BLAKE2B e639fd4a1a4d9a1b34b32ab2884bfe933a079d721bb8b16b225d62f63e61e5cd1f1aa0f4113769744dd2ab80e537d73efdc3bcce3d1781089746997c11f3d820 SHA512 d66fac192fe14153b3496e6baa5ee3a0ff2813c26bbf0c3293049a0a50a26f32e14b031877f36e336035bf74853e981b6f75410e1f84b4ebcc84b55331d313e0
diff --git a/dev-python/etuples/etuples-0.3.8.ebuild b/dev-python/etuples/etuples-0.3.8.ebuild
deleted file mode 100644
index 55fd2cc045b4..000000000000
--- a/dev-python/etuples/etuples-0.3.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python S-expression emulation using tuple-like objects"
-HOMEPAGE="
-	https://pypi.org/project/etuples/
-	https://github.com/pythological/etuples/
-"
-SRC_URI="
-	https://github.com/pythological/etuples/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/multipledispatch[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
deleted file mode 100644
index 70bafdf5706e..000000000000
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="Flask-Gravatar"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
-HOMEPAGE="https://github.com/zzzsochi/Flask-Gravatar/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/pytest-runner/d' setup.py || die
-	sed -e 's:--pep8::' \
-		-e 's:--cov=flask_gravatar --cov-report=term-missing::' \
-		-i pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd tests || die
-	epytest
-}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 7873e39b39bf..43647ebc9276 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,4 +1,3 @@
-DIST google-auth-2.18.1.tar.gz 224714 BLAKE2B 2fa63ed18d4dfa4940c93e5f3fb099a6892a16148e5161c3e52980cdee80b7b153a60c005bd3d1d856476f85678b88315d3f4b639f693d292abbf8133dee9397 SHA512 34e53a1c0cf42ab600281d815f259bb252987f163925e357dc2e636c945fd4b74c1f4168bf7d90a6e352fe1d7343767b68bf94fdbb1bc90a92c7067b0e2f2f8f
 DIST google-auth-2.19.1.tar.gz 230290 BLAKE2B c7f76e1bd936d4d76c81e19fbf6bb50dfe700666d8eb234f762253547fd670d1d26a97a7fe4457bdb719712d32e28e3c8f9adc82c475ee6830f5fd2af994bb3a SHA512 8a8106abb1a0966254caa2e568fe9a9c887601b19e5309f4d43e1b07f3e3280ad358cf8999e34719d6f23473b263d128a2d0321f0ff184c4e188b0b5cf88a6ee
 DIST google-auth-2.20.0.tar.gz 229669 BLAKE2B 547cb99cb72a4a5b224fdfff2bf156effe1cce5d7b4316b16530b1a3bbe50ab24dc54520fce3206fb2cea3fde1ca0c35f7bf5920e5128a5ed1bed13883fc75e5 SHA512 e13471f4452bd5c69c2ca9d1ff145431b160805e4ab2d3a70c35cad78c6e3e4f4bc789dfe99f55a0e60e5f335f9983529eabbfb0fc50794b62dfa7eeb70882b1
 DIST google-auth-2.21.0.tar.gz 230720 BLAKE2B a572770d17ce2e8d68c92dad2fda68dc860d232845f5fb2d6beb51d583a8cf5d8820e7ef7921895c60da3d022c1b82b50054bff6c969071a87cc059e759a82ce SHA512 d84eec3da181e02ab293af76261f4cff50afc98d044e3a9e70b023a7b9e4e0ea7c46265de273f2363494d36ab6ec1894acb82e9125f30da6133692d2b86ef8eb
diff --git a/dev-python/google-auth/google-auth-2.18.1.ebuild b/dev-python/google-auth/google-auth-2.18.1.ebuild
deleted file mode 100644
index c991d34207c6..000000000000
--- a/dev-python/google-auth/google-auth-2.18.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		<dev-python/urllib3-2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index f27deb1e8bf6..a048e298bb40 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,3 +1 @@
-DIST ijson-3.2.0.post0.gh.tar.gz 127558 BLAKE2B 38e06039bb177c43e4744f145fed2159e317a0b8da628b85a62215cdfe6693b271c39629811513d2e563b532244950616b9105134916bc577446a0b5e5ce25f7 SHA512 b926253a3d6a070e2ac27c61542d340e4a1498de7642957dbe59e9fd3c53d700ed4e8ee71c83efcb90b2c302d15b0d268c38054c10728bbb436521aa5b42050b
-DIST ijson-3.2.1.gh.tar.gz 127577 BLAKE2B 1b3c8ce6d8b01d0cf4af4d8995bcc33d879321ed5b89c4b6baa84ef10cd311a1e66254113a17229c228c26e2b996a52c4b0629b42dbd830f296fd4903b603468 SHA512 2bd3a978016fbbd3f5aca6644778d19478a561f40729206eaa4f14e30fde4ff3b92c8aa33c928cb9e81c678a5a84fa59ab68e747421d725e77c79a9c987e4536
 DIST ijson-3.2.2.gh.tar.gz 127965 BLAKE2B 2e20f7cc822406fe3e7eec99c3ef394e42d90b0b518226a7b8eb078763cb8317acb4a28934301116c32a2a9cc37403c2950b18232800485b1ea1206dace7ff23 SHA512 5935071bd0d3eecc39b3c30ca5cb2a959e4d455c57e36414d5c97ba71bbcf1a0b53c8b8afed7551a3a4ac4595294105566c9d7501b35832dd7e46a1bb2151287
diff --git a/dev-python/ijson/files/ijson-3.2.0_p0-py312.patch b/dev-python/ijson/files/ijson-3.2.0_p0-py312.patch
deleted file mode 100644
index 52db9704f1f3..000000000000
--- a/dev-python/ijson/files/ijson-3.2.0_p0-py312.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e076d8343f63698355fd52dc2d6983fd1c1a745e Mon Sep 17 00:00:00 2001
-From: Rodrigo Tobar <rtobar@icrar.org>
-Date: Mon, 29 May 2023 12:24:27 +0800
-Subject: [PATCH] Obtain gi_code by attribute lookup
-
-We were previously getting it by intrusively examining the structure,
-which was flaky and indeed broke during the transition to 3.12, where
-the gi_code struct member was re-implemented via get/set methods.
-
-This should address #95.
-
-Signed-off-by: Rodrigo Tobar <rtobar@icrar.org>
----
- ijson/backends/yajl2_c/async_reading_generator.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ijson/backends/yajl2_c/async_reading_generator.c b/ijson/backends/yajl2_c/async_reading_generator.c
-index 25947cb..0e52a7d 100644
---- a/ijson/backends/yajl2_c/async_reading_generator.c
-+++ b/ijson/backends/yajl2_c/async_reading_generator.c
-@@ -77,7 +77,7 @@ static PyObject *maybe_pop_event(async_reading_generator *self)
- static int is_gen_coroutine(PyObject *o)
- {
- 	if (PyGen_CheckExact(o)) {
--		PyCodeObject *code = (PyCodeObject *)((PyGenObject*) o)->gi_code;
-+		PyCodeObject *code = (PyCodeObject *)PyObject_GetAttrString(o, "gi_code");
- 		return code->co_flags & CO_ITERABLE_COROUTINE;
- 	}
- 	return 0;
diff --git a/dev-python/ijson/ijson-3.2.0_p0-r1.ebuild b/dev-python/ijson/ijson-3.2.0_p0-r1.ebuild
deleted file mode 100644
index f0dc390ae964..000000000000
--- a/dev-python/ijson/ijson-3.2.0_p0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P//_p/.post}"
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="
-	https://github.com/ICRAR/ijson/
-	https://pypi.org/project/ijson/
-"
-SRC_URI="
-	https://github.com/ICRAR/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/yajl
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/ICRAR/ijson/commit/e076d8343f63698355fd52dc2d6983fd1c1a745e
-	"${FILESDIR}/${P}-py312.patch"
-)
diff --git a/dev-python/ijson/ijson-3.2.0_p0.ebuild b/dev-python/ijson/ijson-3.2.0_p0.ebuild
deleted file mode 100644
index 55b5a7db081f..000000000000
--- a/dev-python/ijson/ijson-3.2.0_p0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P//_p/.post}"
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="
-	https://github.com/ICRAR/ijson/
-	https://pypi.org/project/ijson/
-"
-SRC_URI="
-	https://github.com/ICRAR/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND="
-	dev-libs/yajl
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ijson/ijson-3.2.1.ebuild b/dev-python/ijson/ijson-3.2.1.ebuild
deleted file mode 100644
index 74abcd8beee2..000000000000
--- a/dev-python/ijson/ijson-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-# _yajl2 extension is known to be broken
-# https://github.com/ICRAR/ijson/issues/98
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${P//_p/.post}"
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="
-	https://github.com/ICRAR/ijson/
-	https://pypi.org/project/ijson/
-"
-SRC_URI="
-	https://github.com/ICRAR/${PN}/archive/v${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/yajl
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf ijson || die
-	epytest
-}
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index 893eca714c97..48595da808ef 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,2 +1 @@
-DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
 DIST python-iniparse-ab623b0e287a9303bdb0c5213c485110e68dac12.tar.gz 33680 BLAKE2B 66ff134b1df28ae9c3e86110e7f8ad8dc0e24ed48f09db0c7554464e8d919aca49a7e43156c4acb8602af134c2f9d6c046d05cf1764f29285d8586329708a65a SHA512 57c43f7e0d28eab0e41bb819f7c06821d77f9bc5f3d0986f85dd4852b2edd468bb7b2737733e2f00faeac2e1211998d2e99b54ec92959eaf6d7d10897b176eaf
diff --git a/dev-python/iniparse/iniparse-0.5-r1.ebuild b/dev-python/iniparse/iniparse-0.5-r1.ebuild
deleted file mode 100644
index e9d70eb72d7c..000000000000
--- a/dev-python/iniparse/iniparse-0.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="
-	https://github.com/candlepin/python-iniparse/
-	https://pypi.org/project/iniparse/
-"
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-python_test() {
-	"${EPYTHON}" runtests.py || die
-}
-
-python_install_all() {
-	rm -rf "${ED}/usr/share/doc/${P}" || die
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/intervaltree/intervaltree-3.1.0.ebuild b/dev-python/intervaltree/intervaltree-3.1.0.ebuild
deleted file mode 100644
index f39d072e4f29..000000000000
--- a/dev-python/intervaltree/intervaltree-3.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
-HOMEPAGE="https://pypi.org/project/intervaltree/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
index 35698e2ca80e..f47c4fca33d7 100644
--- a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cli"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
@@ -28,13 +29,18 @@ RDEPEND="
 "
 # needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
 # bootstrap
-PDEPEND="
+CLI_DEPEND="
 	$(python_gen_cond_dep '
 		dev-python/autocommand[${PYTHON_USEDEP}]
 		dev-python/inflect[${PYTHON_USEDEP}]
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 	' "${CLI_COMPAT[@]}")
 "
+PDEPEND="
+	cli? (
+		${CLI_DEPEND}
+	)
+"
 BDEPEND="
 	test? (
 		${PDEPEND}
@@ -65,7 +71,7 @@ src_configure() {
 python_test() {
 	local EPYTEST_IGNORE=()
 
-	if ! has "${EPYTHON/./_}" "${CLI_COMPAT[@]}"; then
+	if ! use cli || ! has "${EPYTHON/./_}" "${CLI_COMPAT[@]}"; then
 		EPYTEST_IGNORE+=(
 			jaraco/text/show-newlines.py
 			jaraco/text/strip-prefix.py
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index f47e0ddf8e20..c7c7e69fd98a 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -9,6 +9,11 @@
   <changelog>https://github.com/jaraco/jaraco.text/blob/master/CHANGES.rst</changelog>
   <bugs-to>https://github.com/jaraco/jaraco.text/issues</bugs-to>
  </upstream>
+ <use>
+  <flag name="cli">
+			Install dependencies needed for CLI tools (Rust warning!)
+		</flag>
+ </use>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
index 746dfa61d906..fd75afcdd8e7 100644
--- a/dev-python/junit-xml/Manifest
+++ b/dev-python/junit-xml/Manifest
@@ -1,2 +1 @@
-DIST junit-xml-1.9.tar.gz 11111 BLAKE2B e40914263421e7021d6bd697a03ae74b596d915479f24e8227d8b0b0bda51529df58f7aa54b27e981bb1df0aa36d7876f4f30fff8924188143bc4dd6b1d80b17 SHA512 73d5245f4a324485370e91d0d4d9a754133e0f90e5ad9ae7070bbb7aad29bee5fda4103548483358d536834c5fee9c8bd5fef79c4b66f905a2aeb0823ef02d22
 DIST python-junit-xml-19d3cc333d35dfd2d17d75c506336c15e5c6685a.gh.tar.gz 11111 BLAKE2B e40914263421e7021d6bd697a03ae74b596d915479f24e8227d8b0b0bda51529df58f7aa54b27e981bb1df0aa36d7876f4f30fff8924188143bc4dd6b1d80b17 SHA512 73d5245f4a324485370e91d0d4d9a754133e0f90e5ad9ae7070bbb7aad29bee5fda4103548483358d536834c5fee9c8bd5fef79c4b66f905a2aeb0823ef02d22
diff --git a/dev-python/junit-xml/junit-xml-1.9.ebuild b/dev-python/junit-xml/junit-xml-1.9.ebuild
deleted file mode 100644
index 18adaa23d71d..000000000000
--- a/dev-python/junit-xml/junit-xml-1.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Create JUnit XML test result documents"
-HOMEPAGE="
-	https://pypi.org/project/junit-xml/
-	https://github.com/kyrus/python-junit-xml"
-# upstream fails both at uploading to pypi and making tags
-# https://github.com/kyrus/python-junit-xml/issues/69
-# https://github.com/kyrus/python-junit-xml/issues/31
-EGIT_COMMIT="19d3cc333d35dfd2d17d75c506336c15e5c6685a"
-SRC_URI="
-	https://github.com/kyrus/python-junit-xml/archive/${EGIT_COMMIT}.tar.gz
-		-> ${P}.tar.gz"
-S=${WORKDIR}/python-junit-xml-${EGIT_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index cd628c924e62..985483415fed 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,2 @@
-DIST libarchive-c-4.0.gh.tar.gz 47743 BLAKE2B c6246b35a9a389c6cd999b32412436f8134737a4cba1c0bf8a905e3ba6e1653c515956f43a580901dd4278cbc00b783ecfa7a4306f0fc7ca2d2666b3af500cb8 SHA512 787b049a5f06d7370369a6bb2d9ebab6e4e5eda0a4f839906e205a7e19a00f9f7e350d4c42e3434e345063dd0ea44e5b0b4c0524033b05a6d8f15758757c5c36
 DIST python-libarchive-c-4.0.gh.tar.gz 47727 BLAKE2B 87f8cfb0adf080b11df85d065fbcc38bf5682592882b3a8a8077e5cfb590cc10a05b98c98a2be41570aa59d06899b2e47815183e563007b1077717cdaa79a21c SHA512 1544713802789859ffa9a0d8f4e490f720bbd4d589aae8899d0d1fb6780f2cde0db96f3023c1c32eacea07ea325ac180797aebdb0e8e37093af53807f2e5c812
 DIST python-libarchive-c-5.0.gh.tar.gz 48751 BLAKE2B 2ab737c7493c202ba9a1ad57e1066aad12ea984bfa0e63115f59491ea14b3bd1d46d2bb20f033bf5bae64a6badf73b641183f63cc79c9f0e6141792a35521dc4 SHA512 df4758f4b7207fe77ae650aa78c302e9e2a0c7ba81fbeae70af8cb37789a056bc420acd73c1d5baec7b0e93a47fd3e5130db8e43c983f4723366f75a58823f75
diff --git a/dev-python/libarchive-c/libarchive-c-4.0-r1.ebuild b/dev-python/libarchive-c/libarchive-c-4.0-r1.ebuild
index 510338a19555..6463d73dba02 100644
--- a/dev-python/libarchive-c/libarchive-c-4.0-r1.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-4.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="
 	app-arch/libarchive
diff --git a/dev-python/libarchive-c/libarchive-c-4.0.ebuild b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
deleted file mode 100644
index 775569e10655..000000000000
--- a/dev-python/libarchive-c/libarchive-c-4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="A Python interface to libarchive"
-HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
-SRC_URI="
-	https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}"/python-${P}
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
-
-RDEPEND="app-arch/libarchive"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/logical-unification/Manifest b/dev-python/logical-unification/Manifest
index e3ab54e77a40..46ee129a5f44 100644
--- a/dev-python/logical-unification/Manifest
+++ b/dev-python/logical-unification/Manifest
@@ -1,2 +1 @@
-DIST logical-unification-0.4.5.gh.tar.gz 47003 BLAKE2B 9f7e119a69b15b460ce66af137a3f0c3dd3da154173ac196a94d4894aafc67eeaa31d69c5ca8bdd6e264a3f7599f9e301dad103510c77e60ff14cc8af1c86ce8 SHA512 42af33ac7da6013d48d26ab49b84b40146f494963f1eee06256a219e8d0517b04cc3fe86f51cf19729fc64ad765e75a4890b278c2dbbf34eb7e1ef65f3014784
 DIST logical-unification-0.4.6.gh.tar.gz 47171 BLAKE2B 894db9bfc94b1b4ed496376bb45dd6f71db89f57ff73ab4bfacd12e991817751c4213b36d6e19d34b239e1335dcbe7b71ab283d419bab92554dacc539355ae7e SHA512 6caf91823acbaf0341d7d515610bbe351882f1b6fdff064fc900adb56387c6023a49743b0ad5f6f1c6af42e79b53ac1d1540a4ce3c42dca5fd79f0abec9f653c
diff --git a/dev-python/logical-unification/logical-unification-0.4.5.ebuild b/dev-python/logical-unification/logical-unification-0.4.5.ebuild
deleted file mode 100644
index 0e6239daf6ed..000000000000
--- a/dev-python/logical-unification/logical-unification-0.4.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Logical unification in Python"
-HOMEPAGE="
-	https://pypi.org/project/logical-unification/
-	https://github.com/pythological/unification/
-"
-SRC_URI="
-	https://github.com/pythological/unification/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/unification-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	dev-python/multipledispatch[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_benchmarks.py
-)
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 51fd4ed84dd1..091104032153 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,2 +1 @@
-DIST openstackdocstheme-3.1.0.tar.gz 1256193 BLAKE2B 53bdd85094a74344154dd4a25f2d29142be12000f5b38c8d723ce800794677972215b6402d35fe9385ede246efd4111d457ccb2d04eb540fcbaea5cf92382c04 SHA512 654859f40779e1d285b08b12c040b016a066a62e0a6eacad3c5a271ee40ba1147650ca1b95ac68a4fe254a296948f3ae30803cd26f9f67f1be944683fe24445b
 DIST openstackdocstheme-3.1.1.tar.gz 1256245 BLAKE2B e0f1a9b13fe7e28e851eddcbf73a87b28509b9ea3d597a4680b3c8b39d309700f7fde8cf9fe9a63d6ec7210e505d24d541e1592553b8a8c9cd85b38de09a4442 SHA512 b620486617f5ab2e5ce149030a9bd79408a856709603725b2e17400253aaadee732c2ea5954d80c9ab384ac266d85e7e6698f3b525115183b38693718b3f195b
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
deleted file mode 100644
index 79fc48b15094..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="
-	https://docs.openstack.org/openstackdocstheme/latest/
-	https://opendev.org/openstack/openstackdocstheme/
-	https://github.com/openstack/openstackdocstheme/
-	https://pypi.org/project/openstackdocstheme/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index 35038d100e3b..18b580971350 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,2 +1 @@
 DIST paho-mqtt-1.6.1.gh.tar.gz 145673 BLAKE2B fb583a2505892370737edfc9ad06b195c0feda4fd87794f3aa40fb30679b5710e04483e610a6be9c0e0978084f3ca96c0d285cf8cacb2bf67aca605f1d53ed7c SHA512 8a13c1f6f97138728d5cab6f7bcd6474942fdf9dfc18d1fad723d50de81f4e062953b5bef2ebbde27b08e480eed305ecbfeae467d70eb10f07ec0adca11750ec
-DIST paho-mqtt-1.6.1.tar.gz 145673 BLAKE2B fb583a2505892370737edfc9ad06b195c0feda4fd87794f3aa40fb30679b5710e04483e610a6be9c0e0978084f3ca96c0d285cf8cacb2bf67aca605f1d53ed7c SHA512 8a13c1f6f97138728d5cab6f7bcd6474942fdf9dfc18d1fad723d50de81f4e062953b5bef2ebbde27b08e480eed305ecbfeae467d70eb10f07ec0adca11750ec
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.6.1.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.6.1.ebuild
deleted file mode 100644
index fde81f605797..000000000000
--- a/dev-python/paho-mqtt/paho-mqtt-1.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client class with support for MQTT v5.0, v3.1.1, and v3.1"
-HOMEPAGE="https://www.eclipse.org/paho/index.php?page=clients/python https://github.com/eclipse/paho.mqtt.python"
-SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/paho.mqtt.python-${PV}"
-
-LICENSE="EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	) "
-
-distutils_enable_tests pytest
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 5ddef9407894..b99fb088d3f3 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -1,2 +1 @@
-DIST plumbum-1.8.1.tar.gz 316432 BLAKE2B 91288c5f793b9e3e7d1e1d3724f5cc16989d604b1236438fc71283fab5aa59bb34f1742fe2d79b7a9220e09a3622f5145769497765f3f9213dc70960af478fa0 SHA512 80031c07be3b68767556bba8246e964c51b16336d6105ad3d51d62f7c39287af6f928be713171c8c22cdd37145a0e7c3bd65d44f14bf8b1bc62483b648f3acff
 DIST plumbum-1.8.2.tar.gz 317675 BLAKE2B d21a105d9919f70ad480d5de7ce157f2ae6c56cd248a2b70ad037c83a5e4b56bd8bdb3d9587860db383b04dd6528828426b47895c345f8bf7dc4931310be343d SHA512 636d10ea1c727cb24d4692537f3c0005077f86c3d9d2ae244f86ef5dd9621f8b51e0b5efffaa7acf66d6ba5552fddd641d4a1796c7fd760ac0a27d029f685c20
diff --git a/dev-python/plumbum/plumbum-1.8.1.ebuild b/dev-python/plumbum/plumbum-1.8.1.ebuild
deleted file mode 100644
index 6dfd60f48ef6..000000000000
--- a/dev-python/plumbum/plumbum-1.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="A library for shell script-like programs in python"
-HOMEPAGE="
-	https://plumbum.readthedocs.io/en/latest/
-	https://github.com/tomerfiliba/plumbum/
-	https://pypi.org/project/plumbum/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Need sshd running
-	tests/test_remote.py
-	tests/test_utils.py
-	# Windows specific
-	tests/test_putty.py
-	# Needs sudo without password
-	tests/test_sudo.py
-	# Wrong assumptions about env handling
-	tests/test_env.py::TestEnv::test_change_env
-	tests/test_env.py::TestEnv::test_dictlike
-	tests/test_local.py::TestLocalPath::test_iterdir
-)
-
-src_prepare() {
-	sed -e '/addopts/d' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "remote commands via ssh" dev-python/paramiko
-	optfeature "progress bars in jupyter" dev-python/ipywidgets
-	optfeature "colored output in jupyter" dev-python/ipython
-	optfeature "images on the command line" dev-python/pillow
-}
diff --git a/dev-python/pydantic/pydantic-2.0.2.ebuild b/dev-python/pydantic/pydantic-2.0.2.ebuild
index 83cc0a339b0e..e8e4abc29da2 100644
--- a/dev-python/pydantic/pydantic-2.0.2.ebuild
+++ b/dev-python/pydantic/pydantic-2.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
index 055ea9bcaceb..707a7f4647a3 100644
--- a/dev-python/pytest-xvfb/Manifest
+++ b/dev-python/pytest-xvfb/Manifest
@@ -1,2 +1 @@
-DIST pytest-xvfb-2.0.0.tar.gz 6575 BLAKE2B 7ef37f2d4a1a9d7211a248e67d325f0b722a0a046e6e57ae24cac1b68ead6d11988d49810e15fc41d9a05082d9c318f7569a00ac7574e1a8ee00e76c842cf83b SHA512 de5a98290bfe083cadc732c36a1c5af99b0d618853f8da9a1acd0f0f11a170c54025667c0f13bc0f4ac2657b139306e16d0b3faf00bfdde37eb3df7fb14367ae
 DIST pytest-xvfb-3.0.0.tar.gz 8607 BLAKE2B a1256b121a66c0b778a45f695754363ec241699197000f6237473dc2d54c0eeff499722073b00280ca242d695c192ff4fd985931a42bbb52a0f8e2424867b60a SHA512 9aec1681656badf81fbac3a0d621b163810001e155a1cb8fd35e0f8c8d3ee52556e622adc0468d8e7455b15ba0f5103622fae1aa2493a7053ca78f092e582cf1
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
deleted file mode 100644
index 913c675d83bd..000000000000
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="tk"
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin to run Xvfb for tests"
-HOMEPAGE="https://pypi.org/project/pytest-xvfb/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p xvfb --runpytest=subprocess
-}
diff --git a/dev-python/tekore/tekore-5.0.0.ebuild b/dev-python/tekore/tekore-5.0.0.ebuild
index 8a40e7d53694..cd8dff5a6ffa 100644
--- a/dev-python/tekore/tekore-5.0.0.ebuild
+++ b/dev-python/tekore/tekore-5.0.0.ebuild
@@ -47,4 +47,7 @@ distutils_enable_tests pytest
 EPYTEST_DESELECT=(
 	# Internet
 	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
+	# minor mismatch due to pydantic-2
+	# https://github.com/felix-hilden/tekore/issues/293
+	tests/model.py::TestModel::test_enum_in_model
 )