Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-03-03 07:00:48 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-03-03 07:00:48 +0000
commit: d92776d66ba7231fd191f2c678b45d0b3316cc65 (patch)
tree: c3738e590c1d0d2be4b8b3f65c59af27abfd4d4f /dev-python
parent: 7f23fad1475b2ea2c45af1ff2b66c80a6b32fcde (diff)
download: baldeagleos-repo-d92776d66ba7231fd191f2c678b45d0b3316cc65.tar.gz
baldeagleos-repo-d92776d66ba7231fd191f2c678b45d0b3316cc65.tar.xz
baldeagleos-repo-d92776d66ba7231fd191f2c678b45d0b3316cc65.zip
180 files changed, 880 insertions, 153 deletions
diff --git a/dev-python/APScheduler/APScheduler-3.10.0.ebuild b/dev-python/APScheduler/APScheduler-3.10.0.ebuild
index f60051c32618..e706e18acc30 100644
--- a/dev-python/APScheduler/APScheduler-3.10.0.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.10.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tzlocal-4[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
 		dev-python/tornado[${PYTHON_USEDEP}]
diff --git a/dev-python/APScheduler/APScheduler-3.9.1-r1.ebuild b/dev-python/APScheduler/APScheduler-3.9.1-r1.ebuild
index fcc808e5b191..b52d66f9beac 100644
--- a/dev-python/APScheduler/APScheduler-3.9.1-r1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.9.1-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tzlocal-4[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		<dev-python/sqlalchemy-2[${PYTHON_USEDEP}]
 		dev-python/tornado[${PYTHON_USEDEP}]
diff --git a/dev-python/APScheduler/APScheduler-3.9.1.ebuild b/dev-python/APScheduler/APScheduler-3.9.1.ebuild
index 0911149ec849..ba8cef966c4f 100644
--- a/dev-python/APScheduler/APScheduler-3.9.1.ebuild
+++ b/dev-python/APScheduler/APScheduler-3.9.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-python/tzlocal-4[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/tornado[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/aesara-2.8.10.ebuild b/dev-python/aesara/aesara-2.8.10.ebuild
index 3cc3bb38aec7..9f088ebf9f90 100644
--- a/dev-python/aesara/aesara-2.8.10.ebuild
+++ b/dev-python/aesara/aesara-2.8.10.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
index 3c5e3eb3d0c1..63cb91815a3e 100644
--- a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
@@ -20,7 +20,7 @@ IUSE=""
 
 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
index a66381447db6..2e7296f0d6fb 100644
--- a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild b/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
index d0bf4e964fdb..bbea175e5664 100644
--- a/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
index ad846223e92f..d0033b47156a 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	app-crypt/argon2:=
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/cffi[${PYTHON_USEDEP}]
 	' 'python*')
diff --git a/dev-python/asteval/asteval-0.9.28.ebuild b/dev-python/asteval/asteval-0.9.28.ebuild
index f09e292486ae..5f2a9e25c650 100644
--- a/dev-python/asteval/asteval-0.9.28.ebuild
+++ b/dev-python/asteval/asteval-0.9.28.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/asteval/asteval-0.9.29.ebuild b/dev-python/asteval/asteval-0.9.29.ebuild
index f09e292486ae..5f2a9e25c650 100644
--- a/dev-python/asteval/asteval-0.9.29.ebuild
+++ b/dev-python/asteval/asteval-0.9.29.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/astroid/astroid-2.13.2.ebuild b/dev-python/astroid/astroid-2.13.2.ebuild
index 1c9b098fdc53..9235594cd270 100644
--- a/dev-python/astroid/astroid-2.13.2.ebuild
+++ b/dev-python/astroid/astroid-2.13.2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	<dev-python/wrapt-2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/astroid-2.13.5.ebuild b/dev-python/astroid/astroid-2.13.5.ebuild
index a9b0a78fcc1f..14fbba06d759 100644
--- a/dev-python/astroid/astroid-2.13.5.ebuild
+++ b/dev-python/astroid/astroid-2.13.5.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	<dev-python/wrapt-2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/astroid-2.14.1.ebuild b/dev-python/astroid/astroid-2.14.1.ebuild
index a9b0a78fcc1f..14fbba06d759 100644
--- a/dev-python/astroid/astroid-2.14.1.ebuild
+++ b/dev-python/astroid/astroid-2.14.1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	<dev-python/wrapt-2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/astroid/astroid-2.14.2.ebuild b/dev-python/astroid/astroid-2.14.2.ebuild
index a9b0a78fcc1f..14fbba06d759 100644
--- a/dev-python/astroid/astroid-2.14.2.ebuild
+++ b/dev-python/astroid/astroid-2.14.2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	<dev-python/wrapt-2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/asttokens/asttokens-2.2.1.ebuild b/dev-python/asttokens/asttokens-2.2.1.ebuild
index afadb798dab2..812d5ccce8e4 100644
--- a/dev-python/asttokens/asttokens-2.2.1.ebuild
+++ b/dev-python/asttokens/asttokens-2.2.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/astroid[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild b/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
index 8cc3c3596180..fe34ec81a1a0 100644
--- a/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
+++ b/dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/automat/automat-20.2.0-r1.ebuild b/dev-python/automat/automat-20.2.0-r1.ebuild
index 40b3cad53467..15f2714a5235 100644
--- a/dev-python/automat/automat-20.2.0-r1.ebuild
+++ b/dev-python/automat/automat-20.2.0-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/dev-python/automat/automat-22.10.0.ebuild b/dev-python/automat/automat-22.10.0.ebuild
index 1a4a7ac7d6cc..d59a7ba279b0 100644
--- a/dev-python/automat/automat-22.10.0.ebuild
+++ b/dev-python/automat/automat-22.10.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/awxkit/awxkit-21.11.0.ebuild b/dev-python/awxkit/awxkit-21.11.0.ebuild
index 4a1ed1fcdd98..bcec6ec6cdd2 100644
--- a/dev-python/awxkit/awxkit-21.11.0.ebuild
+++ b/dev-python/awxkit/awxkit-21.11.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/awxkit/awxkit-21.12.0.ebuild b/dev-python/awxkit/awxkit-21.12.0.ebuild
index 942473450d72..1e4ffb6de732 100644
--- a/dev-python/awxkit/awxkit-21.12.0.ebuild
+++ b/dev-python/awxkit/awxkit-21.12.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 78f40df0f997..5bb2da4e4e06 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71ce
 DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
 DIST boto3-1.26.81.gh.tar.gz 611431 BLAKE2B e3f607e4bbd4ae7002168a697c6c3081b3713acbf7d7c8abdb1016b63f9ac5b16ae44255f707272db6a7b4c657210af0ed1c355889b01434683889b28de9d4e7 SHA512 30faa2d60f5f661e4d56a57c5b9d258ad3de260be2a21723b921f2383e290ca0b3d417a4a970ba3defd8f8196deaade2741117393c664b5fe267deab2e210e06
 DIST boto3-1.26.82.gh.tar.gz 611850 BLAKE2B fbf4581d616c6978482689e42a5cf8dc846ef91c77bd9f94298bed1ec50cdf41bc999ee81a1dd43b697da282f2774133daf6c6789d7d78b78aeb272c42f91f56 SHA512 8dc96da11d6da19610810c850c69070d25629e583f4eda822c218f4ad09295d25d3ae689a321c6a0c5f0c27e34717c44eb708950b4f37fe1d27f1f48205e5870
+DIST boto3-1.26.83.gh.tar.gz 612532 BLAKE2B 2cbb1bdb45fcb594c981df7850bc5d2a50d381a34d995b604edb55787dac8e85e83f9588960b555ddb92672e1564b4287c4fa6998754dcc204942673f3c686d1 SHA512 467c3eeb7f6ad5a863704498109a355cd789b69d43752fc694c78e67a7953c08f42cbe90a442978dfee08ab032f5b562dc84014c0cb02ec607d6f4b299e0246f
diff --git a/dev-python/boto3/boto3-1.26.83.ebuild b/dev-python/boto3/boto3-1.26.83.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.83.ebuild
@@ -0,0 +1,68 @@
+# 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_{10..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 7ab0f57581b8..e45d3fb25f25 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424
 DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
 DIST botocore-1.29.81.gh.tar.gz 11211684 BLAKE2B c89f683ab6fd238f975af4a30eea6191d1a6c2a8cf5ec1ac640a34de801bc289545dc2a98e9a76824afdb650b9d173751b23af3a3f3e9438f8cd1cdeb0fb64e3 SHA512 91b0d34652f68a3f41e768ff35d342c50868fb9e6f9da2b97a64cf08cac03e959395ac499b9fea7cf5997273700b06499f0d870661b9104709fead4a87c0a1ee
 DIST botocore-1.29.82.gh.tar.gz 11213502 BLAKE2B 8038e8a97e7c8795b9f273e6d7a87f42d764c7996ebc9c6ba831720db9104ead2e11b8a30e660b1112ca2e5ce2582f7135b0db79c56bf6c615f9a7e242b9ef8e SHA512 4492b8bed66736f446e3dd76bf0bde56e2402093630f38246941d17e388f62ca2d0e069b08c7a39cd12e719d062c85c0981636b72362118a8d689581e492ad06
+DIST botocore-1.29.83.gh.tar.gz 11216449 BLAKE2B a1eaa0710317c257291045fb1514ffaaff07f5ce8e8c37652e60658020273cb5ff4ec1af15a678b0f0249def13e793ee6ed4e8902ce8af4c6b6a48c2767703a7 SHA512 acaabf7c225fa5ae9b3428bdad3a28ffb41ff5a2b637b52c7a1829de0c50ed2d99118d77abcef9e333ffb25de09c5e37a9b817739512dafa8e75ca370a956cc1
diff --git a/dev-python/botocore/botocore-1.29.83.ebuild b/dev-python/botocore/botocore-1.29.83.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.83.ebuild
@@ -0,0 +1,74 @@
+# 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_{10..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
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
index 8a010e5743d5..6050e3f5db91 100644
--- a/dev-python/cbor2/cbor2-5.4.6.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.6.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/cheroot/cheroot-9.0.0.ebuild b/dev-python/cheroot/cheroot-9.0.0.ebuild
index 0e78b1139463..f4bf972aac9f 100644
--- a/dev-python/cheroot/cheroot-9.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-9.0.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/jaraco-context[${PYTHON_USEDEP}]
 		dev-python/jaraco-text[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/cherrypy-18.8.0.ebuild b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
index 748bd5d8ecc5..21de42924a55 100644
--- a/dev-python/cherrypy/cherrypy-18.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	)
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/routes[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-2.4.2.ebuild b/dev-python/cmd2/cmd2-2.4.2.ebuild
index 2ddc82892e4b..16a6c1c0762f 100644
--- a/dev-python/cmd2/cmd2-2.4.2.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 # failures.  to avoid them, we must ensure that one of the backends
 # preferred to it is available (i.e. xclip or xsel).
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		|| (
diff --git a/dev-python/cmd2/cmd2-2.4.3.ebuild b/dev-python/cmd2/cmd2-2.4.3.ebuild
index cabc36f26e5b..1425ab74a3df 100644
--- a/dev-python/cmd2/cmd2-2.4.3.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.3.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 # failures.  to avoid them, we must ensure that one of the backends
 # preferred to it is available (i.e. xclip or xsel).
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		|| (
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29-r2.ebuild
index 23e24466800d..4330dae82274 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29-r2.ebuild
@@ -39,6 +39,14 @@ PATCHES=(
 	"${DISTDIR}/${P}-replace-getargspec-2.patch"
 )
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# We can relax pyparsing version restriction,
+	# see https://github.com/open-iscsi/configshell-fb/pull/69
+	sed -i '/pyparsing/s:,<3.0::' setup.py || die
+}
+
 python_test() {
 	"${EPYTHON}" examples/myshell || die "Test failed with ${EPYTHON}"
 }
diff --git a/dev-python/cssutils/cssutils-2.6.0.ebuild b/dev-python/cssutils/cssutils-2.6.0.ebuild
index 48299ad92008..f051c5daf6be 100644
--- a/dev-python/cssutils/cssutils-2.6.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.6.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/cssselect[${PYTHON_USEDEP}]
 		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index ceb5003ec1b8..84f06f79d189 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -3,3 +3,4 @@ DIST dask-2023.1.0.gh.tar.gz 8234373 BLAKE2B 39f4d6336604a66ac769732a36c718b983d
 DIST dask-2023.1.1.gh.tar.gz 8497754 BLAKE2B ff9f9f738a557fa0b6a57e0a006fb0c7a29d37c38d4d6ee8656e2e5519a44d7ac6235f106c09c8d28b402bc32909bd065df1cb3d2f9baf8b0ac86bf5ed858969 SHA512 7638a8c8213bec4870bfc1d649bec6ab50354e20df722c3f715b9e438435838253907ead4c13a73d5f1570f63d745059e579274fd0e85c5cdf64411e9d8a761b
 DIST dask-2023.2.0.gh.tar.gz 8499228 BLAKE2B eb8a3345702d8ffd0314963f2d8a358bb28a65be4a3c61efa473514b4eb49baa1a69766a7e71812a13aee72ab6e98298358755c2597a8cafeff12d009fb9f482 SHA512 787f1a9e3c7d27f7fe78c5cd1f6ab0a2c30c36298ec8af4555711cd63018d6d92ed26ef5159cd81b65f1c30c74d24e81c0a2277e00a5cb621b5fd2abff8b3462
 DIST dask-2023.2.1.gh.tar.gz 8514054 BLAKE2B 6f94172cf9f921675fc53cf59e9cbbe211f576374190eecf8e17ad9943bbd1ba15fb002e7cf81f0043b4f2450a0cde7bdb6feb42a08160d0fbaee24d4a2f483a SHA512 1af031fd2992377297daff42c4f706e4e5573cce86a9158ea1fa4f09cf0c8a51ff5fb33d7bc551c16eb0a8e5052e76b32a143b2793027becb4e2367572c46219
+DIST dask-2023.3.0.gh.tar.gz 8514069 BLAKE2B 427b975010e08d23bb55606da726c64a08bf17144d50f0b4641469f30620359052434a9108510c08a7d646fd567cbeafb99afe9162a0becc3417fceecf4604d3 SHA512 1834c98edb1fd92fd022d472ec9d05497e7845d712d0e2faae27b6a408faff3678908d3109db5ae50642348a4fa6832af995f2fb67782c7a71933126699577da
diff --git a/dev-python/dask/dask-2023.3.0.ebuild b/dev-python/dask/dask-2023.3.0.ebuild
new file mode 100644
index 000000000000..718d091d9013
--- /dev/null
+++ b/dev-python/dask/dask-2023.3.0.ebuild
@@ -0,0 +1,70 @@
+# 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_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# more tests relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	dask/array/tests/test_random.py::test_RandomState_only_funcs
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+	# require sqlalchemy<2.0
+	dask/dataframe/io/tests/test_sql.py
+)
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
index 74522008342a..1f8b22d8bbeb 100644
--- a/dev-python/deepmerge/deepmerge-1.1.0.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/defcon/defcon-0.10.2.ebuild b/dev-python/defcon/defcon-0.10.2.ebuild
index 2c6a6e123697..1207019cf487 100644
--- a/dev-python/defcon/defcon-0.10.2.ebuild
+++ b/dev-python/defcon/defcon-0.10.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/fonttools-4.34.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fs[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
index 7e8f631ab967..247540173305 100644
--- a/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc
 SLOT="0"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
index 144d3ab03240..e68cac58f218 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_impl_dep sqlite)
 		net-nds/openldap[-minimal]
diff --git a/dev-python/django-configurations/django-configurations-2.4.ebuild b/dev-python/django-configurations/django-configurations-2.4.ebuild
index 819ae4d89d68..5258e2addbc9 100644
--- a/dev-python/django-configurations/django-configurations-2.4.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/django-3.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/django-cache-url[${PYTHON_USEDEP}]
 		dev-python/dj-database-url[${PYTHON_USEDEP}]
diff --git a/dev-python/doc8/doc8-1.1.1.ebuild b/dev-python/doc8/doc8-1.1.1.ebuild
index 73da0d424d57..72be1d9c09fe 100644
--- a/dev-python/doc8/doc8-1.1.1.ebuild
+++ b/dev-python/doc8/doc8-1.1.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 "
 # setuptools_scm_git_archive is not actually needed here
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/emcee/emcee-3.1.3.ebuild b/dev-python/emcee/emcee-3.1.3.ebuild
index a65dee5b3847..14fbd8ed63aa 100644
--- a/dev-python/emcee/emcee-3.1.3.ebuild
+++ b/dev-python/emcee/emcee-3.1.3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/scipy[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/emcee/emcee-3.1.4.ebuild b/dev-python/emcee/emcee-3.1.4.ebuild
index a65dee5b3847..14fbd8ed63aa 100644
--- a/dev-python/emcee/emcee-3.1.4.ebuild
+++ b/dev-python/emcee/emcee-3.1.4.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/scipy[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/enrich/enrich-1.2.7-r1.ebuild b/dev-python/enrich/enrich-1.2.7-r1.ebuild
index 5612b66ca1d8..43d2b9c0a78b 100644
--- a/dev-python/enrich/enrich-1.2.7-r1.ebuild
+++ b/dev-python/enrich/enrich-1.2.7-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="dev-python/rich[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/execnet/execnet-1.9.0-r1.ebuild b/dev-python/execnet/execnet-1.9.0-r1.ebuild
index b942d179bd91..ef9f7c37008f 100644
--- a/dev-python/execnet/execnet-1.9.0-r1.ebuild
+++ b/dev-python/execnet/execnet-1.9.0-r1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/py[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/executing/executing-1.2.0.ebuild b/dev-python/executing/executing-1.2.0.ebuild
index 3cd500fe4f06..b8e2342dad75 100644
--- a/dev-python/executing/executing-1.2.0.ebuild
+++ b/dev-python/executing/executing-1.2.0.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/asttokens[${PYTHON_USEDEP}]
 		dev-python/littleutils[${PYTHON_USEDEP}]
diff --git a/dev-python/flit_scm/flit_scm-1.7.0.ebuild b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
index ab28c642d2bb..cf6f54773c14 100644
--- a/dev-python/flit_scm/flit_scm-1.7.0.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.4.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		<dev-python/tomli-3[${PYTHON_USEDEP}]
 		>=dev-python/tomli-2[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 99cc16d004ab..3b7ef23b9403 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,2 +1,3 @@
 DIST google-auth-2.16.0.tar.gz 223336 BLAKE2B 9dbd54bdf072dacdf728f6fc34931f153dd409e3e1b92e37ed652a1db39d5380b7e66bd196cb1192f75234b2317518a443f8f515bc9135f553e6c9f1116fc606 SHA512 dbeff00089a410c6702e2bd704968c7392809dc217b3f511b62429a11649e4b0607a41622d2753bed9e511368b1c32086b23df66ec915e07a1dd4f32471e025d
 DIST google-auth-2.16.1.tar.gz 221594 BLAKE2B d220bbd22e560f291566ed533c8f3f8961f611bb65410b2ed56a9d9745f1a269a46df7f9075565958a919266450e1702c808eb4fc12680b74790983f8897713a SHA512 87e648832cd88d789334e59ea05545dd567ff7cf5d65d5dd2c209277716b6a77e92e082e9db91df208f1372a010ef1d6830ff77dbdf77d0fda2b649da39bcdd9
+DIST google-auth-2.16.2.tar.gz 221392 BLAKE2B 858ec2d01b7c8e573ddc310a17d634bd63032f469eb47b0fe5fd3c4bcdb5e3388380fba671958734e1b406ff19c9f8d5b70d8e25587e2e813e1300b27329dab4 SHA512 5686846fbd299e8d331a2132a1f2847febb68f06e460aed987ff12efa3a629c274f6b9dcae53b8b3d9075bb590e5e265eb11b9d6eb3861d4230f91f0bfea84f1
diff --git a/dev-python/google-auth/google-auth-2.16.2.ebuild b/dev-python/google-auth/google-auth-2.16.2.ebuild
new file mode 100644
index 000000000000..5faba10d7363
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.16.2.ebuild
@@ -0,0 +1,58 @@
+# 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_{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[${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/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
index c485ff0c6302..5c6644526687 100644
--- a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
+++ b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	>=dev-python/setuptools_scm-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/humanize/humanize-4.4.0.ebuild b/dev-python/humanize/humanize-4.4.0.ebuild
index 325039c3a390..609bd90ad89a 100644
--- a/dev-python/humanize/humanize-4.4.0.ebuild
+++ b/dev-python/humanize/humanize-4.4.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/humanize/humanize-4.5.0.ebuild b/dev-python/humanize/humanize-4.5.0.ebuild
index 71ed83de105b..ebaf007f885d 100644
--- a/dev-python/humanize/humanize-4.5.0.ebuild
+++ b/dev-python/humanize/humanize-4.5.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
-	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/inflect/inflect-6.0.2.ebuild b/dev-python/inflect/inflect-6.0.2.ebuild
index 22e5e9c7b39a..b95cd005b9f8 100644
--- a/dev-python/inflect/inflect-6.0.2.ebuild
+++ b/dev-python/inflect/inflect-6.0.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/ini2toml/ini2toml-0.11.3.ebuild b/dev-python/ini2toml/ini2toml-0.11.3.ebuild
index d02915a8e626..62e5e6142687 100644
--- a/dev-python/ini2toml/ini2toml-0.11.3.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/configupdater[${PYTHON_USEDEP}]
 		>=dev-python/pyproject-fmt-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/irc/irc-20.1.0.ebuild b/dev-python/irc/irc-20.1.0.ebuild
index 59aa8d2cf3f3..877b18cedc00 100644
--- a/dev-python/irc/irc-20.1.0.ebuild
+++ b/dev-python/irc/irc-20.1.0.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
index d99d43aa6df4..779e3d678ab7 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
index 1c9a7aad50d6..c220ae3d4adb 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/jaraco-text[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
index 7514e4f27823..6dee94ea7d6e 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/path[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
index 3fe567c2d49b..795055825757 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild
index 625fd829076b..61bd5436e9b4 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/tempora[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
index cb1911620efa..f0efd1383a70 100644
--- a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild
index 2f770e66699b..617a63899991 100644
--- a/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
index 7b44ced7f9b9..700e4cf7c61b 100644
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-1.15.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/more-itertools[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jsonpickle/jsonpickle-3.0.1.ebuild b/dev-python/jsonpickle/jsonpickle-3.0.1.ebuild
index 629f07eea7d5..d8c10e2e3669 100644
--- a/dev-python/jsonpickle/jsonpickle-3.0.1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.0.1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/feedparser[${PYTHON_USEDEP}]
 		dev-python/gmpy[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/keyring-23.13.1-r1.ebuild b/dev-python/keyring/keyring-23.13.1-r1.ebuild
index 2bafcc723973..e22d03fe7eb5 100644
--- a/dev-python/keyring/keyring-23.13.1-r1.ebuild
+++ b/dev-python/keyring/keyring-23.13.1-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	' 3.8)
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild
index 35d89cfc1b7f..8cd83fce4f04 100644
--- a/dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild
+++ b/dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	!dev-python/keyrings_alt
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/keyring[${PYTHON_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
index 98cdf2cbdc28..f1d4cf177a0b 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.3[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
index 4e6ae7f64f72..7b6963cec004 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.3[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
index 079816705598..c3a825ee9ab7 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/license-expression/license-expression-30.1.0.ebuild b/dev-python/license-expression/license-expression-30.1.0.ebuild
index 0ca728b46751..6fb92c4b0bb7 100644
--- a/dev-python/license-expression/license-expression-30.1.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.1.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-4[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/lmfit/lmfit-1.1.0.ebuild b/dev-python/lmfit/lmfit-1.1.0.ebuild
index e40a26265985..8afa0f96339a 100644
--- a/dev-python/lmfit/lmfit-1.1.0.ebuild
+++ b/dev-python/lmfit/lmfit-1.1.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/uncertainties-3.1.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/lz4/lz4-4.3.2.ebuild b/dev-python/lz4/lz4-4.3.2.ebuild
index 1180924e787b..a3ed536fa8d6 100644
--- a/dev-python/lz4/lz4-4.3.2.ebuild
+++ b/dev-python/lz4/lz4-4.3.2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/makefun/makefun-1.15.0.ebuild b/dev-python/makefun/makefun-1.15.0.ebuild
index 567467167339..a62fd6951122 100644
--- a/dev-python/makefun/makefun-1.15.0.ebuild
+++ b/dev-python/makefun/makefun-1.15.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/makefun/makefun-1.15.1.ebuild b/dev-python/makefun/makefun-1.15.1.ebuild
index cc3578bd34b6..d954033bae21 100644
--- a/dev-python/makefun/makefun-1.15.1.ebuild
+++ b/dev-python/makefun/makefun-1.15.1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/matplotlib-3.5.3.ebuild b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
index 0f8b64ac1ec3..be5823f6b277 100644
--- a/dev-python/matplotlib/matplotlib-3.5.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.3.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
diff --git a/dev-python/matplotlib/matplotlib-3.6.1.ebuild b/dev-python/matplotlib/matplotlib-3.6.1.ebuild
index 08f44728ba5e..ca5a6ad90c1b 100644
--- a/dev-python/matplotlib/matplotlib-3.6.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/matplotlib/matplotlib-3.6.2.ebuild b/dev-python/matplotlib/matplotlib-3.6.2.ebuild
index af964431da36..43ec46529dd4 100644
--- a/dev-python/matplotlib/matplotlib-3.6.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.2.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/matplotlib/matplotlib-3.6.3.ebuild b/dev-python/matplotlib/matplotlib-3.6.3.ebuild
index 4ec460111dd2..c86293e6b6b3 100644
--- a/dev-python/matplotlib/matplotlib-3.6.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.3.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/matplotlib/matplotlib-3.7.0.ebuild b/dev-python/matplotlib/matplotlib-3.7.0.ebuild
index 4398402b11a2..6d9d853f0fd6 100644
--- a/dev-python/matplotlib/matplotlib-3.7.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.7.0.ebuild
@@ -90,7 +90,7 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
-	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? (
 		>=app-text/dvipng-1.15-r1
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 470ea8f2f7fb..93a6bb4664e4 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,2 +1,3 @@
 DIST mdit-py-plugins-0.3.3.gh.tar.gz 57366 BLAKE2B 60b53c6aa404a22296da122b6528491fa7dc52c4b485dea1b0c26c486cd04bf495948e03c40d54ac9d436431ab1154f51af90c84762f96d87984b74718a736a9 SHA512 a32a4a7004368af924c0876106e10a55a2f361a18db127a45080779bc39fb709ca274febbb4c4d5e872357e99bd8161e6c760783793516011da5f963368fa637
 DIST mdit-py-plugins-0.3.4.gh.tar.gz 59538 BLAKE2B 7046c2b8b5b117612a71c1a4894c7e3e49a161b5375fde13ec61c4a00c2bf5824505cb5639b70a3c58d7c9629e68bf794c950b5a28470392487965cd94f3e9a9 SHA512 e36b0ee0aca95d60c27a577e1c4bde9832d633ca84fb740f16a37dd63ece0a77005f8e3d03360ed0c92de57d3f656a8f76ab76642d8da3e5ac1d65384ee18d84
+DIST mdit-py-plugins-0.3.5.gh.tar.gz 59757 BLAKE2B bad78ec811d238bafd83c9d1bbd6e0bcac3b70cd87f52b215966e836d4c2a35715804fa1c7d3671de81713c4e169ad4bb6d9dcdf741f617544772d06f8e3ae56 SHA512 6cb153d8ccff8fa3f94731606ad5dd1c06954d95519ac77b6de477e04b878f84fb059052906bdea5d798be3de49733a909cb553107255a61cde6dd1c6c72d4d2
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
new file mode 100644
index 000000000000..0005de8b30f4
--- /dev/null
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of plugins for markdown-it-py"
+HOMEPAGE="
+	https://pypi.org/project/mdit-py-plugins/
+	https://github.com/executablebooks/mdit-py-plugins/
+"
+SRC_URI="
+	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/markdown-it-py[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 80c05789b155..899e3d8835fc 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1 +1,2 @@
 DIST mkdocs-git-revision-date-localized-plugin-1.1.0.gh.tar.gz 375907 BLAKE2B d39f1d807616da95962cca6bdc5a4501163d008f0a8fcac5df2e7542bf8401d04362a38383558689f467c9249f2ad6dff636a8ebf4568aa920ea0078f90fb367 SHA512 f5f911cba9b9e3747c5628e4c947a87fa07c798f854b6ed8783b74c732cf29e4afdacb37e074a5d04672d90f96de560ab6b86cd3d826ce46226d73f48c54c27d
+DIST mkdocs-git-revision-date-localized-plugin-1.2.0.gh.tar.gz 378268 BLAKE2B ee4270e60a23b4c040de1b931c1d18f785d95b1947facd66d0b9180452dd30fee518fcdf24840b6523ee4944cf363ebbf9a27c93b09f45cc09daf277d4fd7085 SHA512 627c1b6c955f8c787ac01e9be5827648a8c9bbd1f9449c8a734f47fc83d28e3eba5faad142f69da12291c4ac3f728ae2c090e9b8e0a84b585557977a9fe04241
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
new file mode 100644
index 000000000000..6110b1d25c57
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
@@ -0,0 +1,63 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/regex
+	dev-python/mkdocs-i18n
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-authors-plugin
+	dev-python/mkdocs-git-revision-date-localized-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="
+	https://github.com/timvink/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocs-i18n[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+	doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 6fc1a46de4ea..8b3befdd71e3 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -3,3 +3,4 @@ DIST mkdocs-material-9.0.12.gh.tar.gz 10929135 BLAKE2B 2b8468790c38e40a35b7fd4ff
 DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2cd51cd2c06921beccecb8f76c67f177a72568698056151fb20ee5141df0d6cdeee75192d7a7fc4dc85511501f4d2c8dfe5a3e1c SHA512 cc2abaab0727376ff3b3f3d3099c57f601243520c644dcc48b0c6d671ae543a8b65e8161fa8e4d1199671652a54e14969a7c2470985b0570e63763cf88d63704
 DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
 DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
+DIST mkdocs-material-9.1.0.gh.tar.gz 10868677 BLAKE2B b51fa6e78f087c74a6e2d38d56645492758af0ab2dee16427eb5628c4c3617b3b00b9a2f2ca04c687b98838551873c596b7dffa79cb888ca93f96f05a11f9990 SHA512 1ca7a8250732d737d6e0940243f0d835002736c2eadb5eb0eb1f58fe061d9a277ccd5e99ac3766642c464596d2ce31e445dfa02251b1db0dc1a4adcdbfc90db3
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild
new file mode 100644
index 000000000000..4de43bd469bc
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
index 3915e89a296c..845827859c59 100644
--- a/dev-python/mpmath/mpmath-1.2.1.ebuild
+++ b/dev-python/mpmath/mpmath-1.2.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	gmp? ( dev-python/gmpy[${PYTHON_USEDEP}] )
 	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/myst-parser/Manifest b/dev-python/myst-parser/Manifest
index 1a6c205ba923..7fd007508ff0 100644
--- a/dev-python/myst-parser/Manifest
+++ b/dev-python/myst-parser/Manifest
@@ -1,2 +1,3 @@
 DIST MyST-Parser-0.18.1.gh.tar.gz 769288 BLAKE2B 77f21ae4277ef4ed9020caad86ef3ea92a1efca35f7ab61203fe2125e4fab31a74a740db7a1f1d6ea0a576c24706b0997beea296d782eb5a07ba4e91a0a9e52d SHA512 4bc3a89480f175779da4f093aaa99a1516f76ab4107dcf8747b6614f347e91739f8596693f95529d76aedbb0c84b4efde4262517bc445aa7027d51e05e8b48bc
 DIST MyST-Parser-0.19.0.gh.tar.gz 812180 BLAKE2B 44dd773dfcbd8c01b3089303e81b103ce3eba2432b1891b4fb35b8bbd9c0088b3245e6afe14c6378a262cdd4e7930da16ddc7ab6abb3a06779d4d0bd9e9ebd53 SHA512 3b646b78032914b42ab655d5f653f38fb58e4c51814fca0f987c8207f6fb97db6f3ba6b9951b3ecdf98430800b2a198cc2b26f17162b5b57309bfe74de3f4450
+DIST MyST-Parser-0.19.1.gh.tar.gz 812247 BLAKE2B 24a3502d2b9f81ec066c8fc5055b59448938fda63e74b47810e16cb2ce57b17fab1e219469df6e57fd1343453012855f104806e05e0831166af3506adc8589f5 SHA512 abe57048a9c19cfa08bb11c2ab988ebe462b4a104ffe3fc3b9083e2563da0bda271b5b1e278ac94e1d328bb70f5aeb20e72f81fc428fbb79dd6fb695abfd01cb
diff --git a/dev-python/myst-parser/myst-parser-0.19.1.ebuild b/dev-python/myst-parser/myst-parser-0.19.1.ebuild
new file mode 100644
index 000000000000..f727166a577c
--- /dev/null
+++ b/dev-python/myst-parser/myst-parser-0.19.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=MyST-Parser-${PV}
+DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx"
+HOMEPAGE="
+	https://github.com/executablebooks/MyST-Parser/
+	https://pypi.org/project/myst-parser/
+"
+SRC_URI="
+	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown-it-py[${PYTHON_USEDEP}]
+	>=dev-python/mdit-py-plugins-0.3.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/sphinx-7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pytest-param-files[${PYTHON_USEDEP}]
+		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Unimportant tests needing a new dep linkify
+		tests/test_renderers/test_myst_config.py::test_cmdline
+		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# bad test relying on exact exception messages
+		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
+	)
+
+	epytest
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index d8602650e030..6474a013c2e1 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,2 +1,3 @@
 DIST natsort-8.2.0.tar.gz 145643 BLAKE2B d101ae2fa1cb009892e9712ece87d3825f3fca7970475e46176e5acbc29481ac79d491f1bae0721d85d3e67ecf39e5f54e2a984f0398356f32a5f0ec18a3e98d SHA512 d7e35c48ee36e69812c26b2cd333c57f1ec70c54017c4f51ed06dbb7619afc11cd1d589035faee700e1adf1e6b759b43ee497685fc88518be62c41957e15884e
 DIST natsort-8.3.0.tar.gz 123448 BLAKE2B 7fd480c8bfaceaca7431716e7721acac89d4a5c87a951ecf2754d80062437776eee823d7b94c58e2b9bc6864d9c0f595ee8667c538609c296694a548c126ab58 SHA512 63a65a99c9475e8ae96d722ae4c093cc73034c0dfdd254b24ae02904dd81cc8be36038c8a3fc514080f436d4124847f0f331d06a87c435f0b7b7d1d72313ae0d
+DIST natsort-8.3.1.tar.gz 123736 BLAKE2B 3ad4d8884b463fa792f7930f6d92dda146c96cd929a58a1d418c59f8b3c5fc06329e2cf0341963c820fb8d2fc67b287ce69083a2cba9f20bd8abc06c0fca6a44 SHA512 98ee9bfed9307487b9ae9ced5ce723b6840c6f882d06702f205986430572b767f3ac0930ffdf0663d99256f6feed704394b2b7e11f4b01f4f0241cd8639df622
diff --git a/dev-python/natsort/natsort-8.3.1.ebuild b/dev-python/natsort/natsort-8.3.1.ebuild
new file mode 100644
index 000000000000..9a89bfcc7cb5
--- /dev/null
+++ b/dev-python/natsort/natsort-8.3.1.ebuild
@@ -0,0 +1,32 @@
+# 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} pypy3 )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="
+	https://github.com/SethMMorton/natsort/
+	https://pypi.org/project/natsort/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
+}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 701dc5043af0..a361adf97f70 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1 +1,2 @@
 DIST openapi-core-0.16.5.gh.tar.gz 104046 BLAKE2B 7dcda69b6d548a0df8c7727b184c7f7ec6d645e14ab4b4a256f188c6cc4ae9e351bc06ae03770782d81a11dfb5ebc08c20daabbd2151cfe62f84b05f80a47a16 SHA512 59db6d39a950079739b2df4114f26d85be55dc1f42d1661e8e6c17cf878cd8167f29ba4d3b6f40e06e85bb144c68286cb50adf4403091461798144cac05d5bc0
+DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
diff --git a/dev-python/openapi-core/openapi-core-0.16.6.ebuild b/dev-python/openapi-core/openapi-core-0.16.6.ebuild
new file mode 100644
index 000000000000..b318285ad080
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.16.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+	https://github.com/python-openapi/openapi-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/asgiref[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.21.0[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# falcon is not packaged
+	tests/integration/contrib/falcon
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 532d261dd086..dd09fd482c7c 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1 +1,2 @@
 DIST openstackdocstheme-3.0.1.tar.gz 1256111 BLAKE2B c0a1a68e8e0e423bc704503dc2214d9cb51aa236daf39ba6788ef95240c25c05d1bd8b7ce2cb3d7c7290e574f3c78b276a28afe5a92645dce6f1b3ad54109158 SHA512 3643e5fc7a6e7090e766d8e0c71f6f3dfe32ac2529b3f70a7b0e825765be92dad58a2f399d8993716c9c87f0781a117b602f090abc0f3905e0586a26c87fe449
+DIST openstackdocstheme-3.1.0.tar.gz 1256193 BLAKE2B 53bdd85094a74344154dd4a25f2d29142be12000f5b38c8d723ce800794677972215b6402d35fe9385ede246efd4111d457ccb2d04eb540fcbaea5cf92382c04 SHA512 654859f40779e1d285b08b12c040b016a066a62e0a6eacad3c5a271ee40ba1147650ca1b95ac68a4fe254a296948f3ae30803cd26f9f67f1be944683fe24445b
diff --git a/dev-python/openstackdocstheme/metadata.xml b/dev-python/openstackdocstheme/metadata.xml
index d295b6a5df80..6d3f51f5f429 100644
--- a/dev-python/openstackdocstheme/metadata.xml
+++ b/dev-python/openstackdocstheme/metadata.xml
@@ -12,7 +12,7 @@
 		Theme and extension support for Sphinx documentation that is published to docs.openstack.org and developer.openstack.org.
 	</longdescription>
  <upstream>
-  <doc>https://docs.openstack.org/openstackdocstheme/</doc>
+  <doc>https://docs.openstack.org/openstackdocstheme/latest/</doc>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
new file mode 100644
index 000000000000..b7adeb3f84e8
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# 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/path/path-16.6.0-r1.ebuild b/dev-python/path/path-16.6.0-r1.ebuild
index f22b130b4c53..9abe633a18c4 100644
--- a/dev-python/path/path-16.6.0-r1.ebuild
+++ b/dev-python/path/path-16.6.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/packaging[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/picobox/picobox-2.2.0.ebuild b/dev-python/picobox/picobox-2.2.0.ebuild
index f8defc199884..8383c5186501 100644
--- a/dev-python/picobox/picobox-2.2.0.ebuild
+++ b/dev-python/picobox/picobox-2.2.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/flask[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pikepdf/pikepdf-6.2.6.ebuild b/dev-python/pikepdf/pikepdf-6.2.6.ebuild
index 02effcd775bd..0c08f2ce01d2 100644
--- a/dev-python/pikepdf/pikepdf-6.2.6.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.6.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/pikepdf/pikepdf-6.2.7.ebuild b/dev-python/pikepdf/pikepdf-6.2.7.ebuild
index 1d01e604d9f0..f2fd0dcfb0c3 100644
--- a/dev-python/pikepdf/pikepdf-6.2.7.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.7.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/pikepdf/pikepdf-6.2.8.ebuild b/dev-python/pikepdf/pikepdf-6.2.8.ebuild
index 1d01e604d9f0..f2fd0dcfb0c3 100644
--- a/dev-python/pikepdf/pikepdf-6.2.8.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.8.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/pikepdf/pikepdf-6.2.9.ebuild b/dev-python/pikepdf/pikepdf-6.2.9.ebuild
index 1d01e604d9f0..f2fd0dcfb0c3 100644
--- a/dev-python/pikepdf/pikepdf-6.2.9.ebuild
+++ b/dev-python/pikepdf/pikepdf-6.2.9.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
diff --git a/dev-python/pikepdf/pikepdf-7.0.0.ebuild b/dev-python/pikepdf/pikepdf-7.0.0.ebuild
index 0bf5bf573035..ad9747b1037b 100644
--- a/dev-python/pikepdf/pikepdf-7.0.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.0.0.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/pikepdf-7.1.0.ebuild b/dev-python/pikepdf/pikepdf-7.1.0.ebuild
index 0bf5bf573035..ad9747b1037b 100644
--- a/dev-python/pikepdf/pikepdf-7.1.0.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.1.0.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
diff --git a/dev-python/pikepdf/pikepdf-7.1.1.ebuild b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
index f9a94357690d..158f4464edcd 100644
--- a/dev-python/pikepdf/pikepdf-7.1.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-7.1.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pybind11-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.36[${PYTHON_USEDEP}]
diff --git a/dev-python/pkgcraft/pkgcraft-0.0.3.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.3.ebuild
index 5dc743ca3d03..d4fd63823f77 100644
--- a/dev-python/pkgcraft/pkgcraft-0.0.3.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-0.0.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/cython
-	dev-python/setuptools_scm
+	dev-python/setuptools-scm
 	virtual/pkgconfig
 "
 
diff --git a/dev-python/pkgcraft/pkgcraft-0.0.4.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.4.ebuild
index a9b364218f73..ecc27295afcc 100644
--- a/dev-python/pkgcraft/pkgcraft-0.0.4.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-0.0.4.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/cython
-	dev-python/setuptools_scm
+	dev-python/setuptools-scm
 	virtual/pkgconfig
 "
 
diff --git a/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
index 7b1de554a840..4e72ba58ae7b 100644
--- a/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/cython
-	dev-python/setuptools_scm
+	dev-python/setuptools-scm
 	virtual/pkgconfig
 "
 
diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild
index 3016e20be3d3..8ffd087568b0 100644
--- a/dev-python/pkgcraft/pkgcraft-9999.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-python/cython-3.0.0_beta1
-	dev-python/setuptools_scm
+	dev-python/setuptools-scm
 	virtual/pkgconfig
 "
 
diff --git a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
index 10454f5c6f68..694d50e36a14 100644
--- a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pooch/pooch-1.6.0.ebuild b/dev-python/pooch/pooch-1.6.0.ebuild
index f0a079b516d6..3bdc445e5d9a 100644
--- a/dev-python/pooch/pooch-1.6.0.ebuild
+++ b/dev-python/pooch/pooch-1.6.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild
index 85888366b696..030272d7dd01 100644
--- a/dev-python/pooch/pooch-1.7.0.ebuild
+++ b/dev-python/pooch/pooch-1.7.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
diff --git a/dev-python/portend/portend-3.1.0.ebuild b/dev-python/portend/portend-3.1.0.ebuild
index 8af58726f16d..2fa886f8c767 100644
--- a/dev-python/portend/portend-3.1.0.ebuild
+++ b/dev-python/portend/portend-3.1.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-python/tempora-1.8[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/prettytable/prettytable-3.3.0.ebuild b/dev-python/prettytable/prettytable-3.3.0.ebuild
index 81fcf35b3083..13a47ab415d0 100644
--- a/dev-python/prettytable/prettytable-3.3.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.3.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
diff --git a/dev-python/py/py-1.11.0-r1.ebuild b/dev-python/py/py-1.11.0-r1.ebuild
index 51ed1eb24926..09107c225af5 100644
--- a/dev-python/py/py-1.11.0-r1.ebuild
+++ b/dev-python/py/py-1.11.0-r1.ebuild
@@ -23,6 +23,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 RESTRICT=test
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
index 19da9edfafe2..4e9e0e76bdf6 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
@@ -27,7 +27,7 @@ IUSE=""
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
index ff4d6f67ac7f..4ac48b74dfc6 100644
--- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 "
 # tests/test_pymediainfo.py::MediaInfoURLTest::test_parse_url requires libmediainfo with curl support
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		media-libs/libmediainfo[curl]
 	)
diff --git a/dev-python/pyocr/pyocr-0.8.3.ebuild b/dev-python/pyocr/pyocr-0.8.3.ebuild
index 875bac3c75f0..4d99d5782bc0 100644
--- a/dev-python/pyocr/pyocr-0.8.3.ebuild
+++ b/dev-python/pyocr/pyocr-0.8.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/pyroute2/pyroute2-0.7.3.ebuild b/dev-python/pyroute2/pyroute2-0.7.3.ebuild
index d825acc453c5..0a315165112f 100644
--- a/dev-python/pyroute2/pyroute2-0.7.3.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.7.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/pyroute2/pyroute2-0.7.4.ebuild b/dev-python/pyroute2/pyroute2-0.7.4.ebuild
index f04d5dad6ac8..fee73c5b57f6 100644
--- a/dev-python/pyroute2/pyroute2-0.7.4.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.7.4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
index 61fff23d7c19..f8babf334f2e 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/pytest-asyncio-0.17.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild
index 881bb6b88e40..b0063d51b5e5 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/pytest-5.4.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
index f3b6389e293c..7997e208e16d 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
index e4c9131a6c4d..6a82c6baa804 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-django/pytest-django-4.5.2.ebuild b/dev-python/pytest-django/pytest-django-4.5.2.ebuild
index 4aee5212a722..18e877e3779a 100644
--- a/dev-python/pytest-django/pytest-django-4.5.2.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.5.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-1.11.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/django-configurations[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
index 11c4b7f9b438..4a543f38afc5 100644
--- a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/py[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
index 1e50c3f4ed4b..78651f14d582 100644
--- a/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/py[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild
index aadba96ef8b2..266901381451 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-forked[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.4.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.4.ebuild
index 3c9276b4dfe6..91c54548dd77 100644
--- a/dev-python/pytest-metadata/pytest-metadata-2.0.4.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-2.0.4.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/pytest-7.1.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
index 89e428cf2ffb..64ca118ad653 100644
--- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/pytest-6[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
index ea338c0c756f..21893cbc0464 100644
--- a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
+++ b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/pytest-6.0.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild
index f5bd2e11799d..62a7ec5681d5 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-subtests[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild
index 6a9b6c07ef35..56f4f4fbb795 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
index f93f4baae9d6..9f1a00790c6a 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 # pytest-xdist is used to test compatibility
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
index c996a088120d..54b75b0aa4f5 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 "
 # pytest-xdist is used to test compatibility
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
index a329f39e97ae..42ee65bafd4e 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 # (which e.g. happens when dash is used as /bin/sh)
 # https://github.com/pytest-dev/pytest-testinfra/issues/668
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		app-admin/ansible
 		$(python_gen_cond_dep '
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
index 633ebe782c56..dc838caf1b05 100644
--- a/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/filelock[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild
index 8a04dcc81647..bf8b80a00e63 100644
--- a/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/filelock[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/pytest/pytest-7.2.1.ebuild b/dev-python/pytest/pytest-7.2.1.ebuild
index 7c30e58eb007..25f1b1796c88 100644
--- a/dev-python/pytest/pytest-7.2.1.ebuild
+++ b/dev-python/pytest/pytest-7.2.1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	' 3.8 3.9 3.10)
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep '
diff --git a/dev-python/python-daemon/python-daemon-2.3.2.ebuild b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
index a1ad2acf97cf..dc7ac7930a68 100644
--- a/dev-python/python-daemon/python-daemon-2.3.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/lockfile[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
index 89069dfc61b1..0aab6dfdeb7a 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	sys-libs/timezone-data
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/python-varlink/python-varlink-31.0.0.ebuild b/dev-python/python-varlink/python-varlink-31.0.0.ebuild
index 0dd9f300ef70..d3f5af80ea02 100644
--- a/dev-python/python-varlink/python-varlink-31.0.0.ebuild
+++ b/dev-python/python-varlink/python-varlink-31.0.0.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/python-xlib/python-xlib-0.33.ebuild b/dev-python/python-xlib/python-xlib-0.33.ebuild
index 743c18b55876..6f205d951638 100644
--- a/dev-python/python-xlib/python-xlib-0.33.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.33.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	doc? ( sys-apps/texinfo )
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/quantities/quantities-0.14.0.ebuild b/dev-python/quantities/quantities-0.14.0.ebuild
index e8416a49f0e9..b590d8139096 100644
--- a/dev-python/quantities/quantities-0.14.0.ebuild
+++ b/dev-python/quantities/quantities-0.14.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-python/numpy-1.19[$PYTHON_USEDEP]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/quantities/quantities-0.14.1.ebuild b/dev-python/quantities/quantities-0.14.1.ebuild
index e8416a49f0e9..b590d8139096 100644
--- a/dev-python/quantities/quantities-0.14.1.ebuild
+++ b/dev-python/quantities/quantities-0.14.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-python/numpy-1.19[$PYTHON_USEDEP]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/requests-cache/requests-cache-1.0.0.ebuild b/dev-python/requests-cache/requests-cache-1.0.0.ebuild
index 0633a8905d2f..281ddad129f1 100644
--- a/dev-python/requests-cache/requests-cache-1.0.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.0.0.ebuild
@@ -37,6 +37,7 @@ BDEPEND="
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/rich-10.0[${PYTHON_USEDEP}]
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
 		>=dev-python/ujson-5.4[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/rst-linker/rst-linker-2.3.1.ebuild b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
index a006a20969cc..c0222d291762 100644
--- a/dev-python/rst-linker/rst-linker-2.3.1.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/path[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/rst-linker/rst-linker-2.4.0.ebuild b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
index 9f4f2fb69723..d2cf411b01d7 100644
--- a/dev-python/rst-linker/rst-linker-2.4.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/path[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/serverfiles/serverfiles-0.3.1-r1.ebuild b/dev-python/serverfiles/serverfiles-0.3.1-r1.ebuild
index 98a651333206..4a68b92e216b 100644
--- a/dev-python/serverfiles/serverfiles-0.3.1-r1.ebuild
+++ b/dev-python/serverfiles/serverfiles-0.3.1-r1.ebuild
@@ -16,6 +16,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=dev-python/requests-2.11.1[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools-scm/Manifest
index 1098d86add27..1098d86add27 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools-scm/Manifest
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools-scm/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools-scm/metadata.xml
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.1.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
index 4c4433a7c747..8b166e1328a5 100644
--- a/dev-python/setuptools_scm/setuptools_scm-7.1.0.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
@@ -7,14 +7,13 @@ EAPI=7
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 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"
diff --git a/dev-python/setuptools/setuptools-65.7.0.ebuild b/dev-python/setuptools/setuptools-65.7.0.ebuild
index 12413b0a3b2d..632131085b7b 100644
--- a/dev-python/setuptools/setuptools-65.7.0.ebuild
+++ b/dev-python/setuptools/setuptools-65.7.0.ebuild
@@ -69,7 +69,7 @@ BDEPEND="
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 DOCS=( {CHANGES,README}.rst )
diff --git a/dev-python/setuptools/setuptools-67.2.0-r1.ebuild b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
index 0b21bca66f98..bd8043d1febd 100644
--- a/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
@@ -62,7 +62,7 @@ BDEPEND="
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 DOCS=( {CHANGES,README}.rst )
diff --git a/dev-python/setuptools/setuptools-67.4.0.ebuild b/dev-python/setuptools/setuptools-67.4.0.ebuild
index 5090e054fa84..a1a31638dbe8 100644
--- a/dev-python/setuptools/setuptools-67.4.0.ebuild
+++ b/dev-python/setuptools/setuptools-67.4.0.ebuild
@@ -62,7 +62,7 @@ BDEPEND="
 "
 PDEPEND="
 	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 DOCS=( {CHANGES,README}.rst )
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
index e2c075faed9f..f6c75a8e82b6 100644
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390
 IUSE=""
 
 RDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/dev-python/simpy/simpy-4.0.1-r1.ebuild b/dev-python/simpy/simpy-4.0.1-r1.ebuild
index 50128f7e874f..39170b2a958a 100644
--- a/dev-python/simpy/simpy-4.0.1-r1.ebuild
+++ b/dev-python/simpy/simpy-4.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 # Could not import extension sphinx.builders.epub3 (exception: cannot import
 # name 'StandaloneHTMLBuilder' from partially initialized module
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
index 69801f01d65a..ce923819be21 100644
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
+++ b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 "
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
index d038535d6dfe..2512db91dbce 100644
--- a/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
+++ b/dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~riscv"
 RDEPEND="
 	dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
 	doc? ( dev-python/ansible-pygments[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild
index 789b16a928ab..c8d7186b607a 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild
@@ -18,4 +18,4 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
index 43d74b2910d6..522db98c1cb9 100644
--- a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
+++ b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="test-full? ( test )"
 
 # ansible-molecule is invoked as an executable so no need for PYTHON_USEDEP
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/enrich[${PYTHON_USEDEP}]
 		test-full? ( app-admin/ansible-molecule )
diff --git a/dev-python/tempora/tempora-5.2.1.ebuild b/dev-python/tempora/tempora-5.2.1.ebuild
index 4b6955f2d99e..3bddece30e12 100644
--- a/dev-python/tempora/tempora-5.2.1.ebuild
+++ b/dev-python/tempora/tempora-5.2.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
index 2841f8b461d4..a49323120897 100644
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.1.0.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/tornado[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/tenacity/tenacity-8.2.0.ebuild b/dev-python/tenacity/tenacity-8.2.0.ebuild
index 3b5917e532c9..3c82a5c201f8 100644
--- a/dev-python/tenacity/tenacity-8.2.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.2.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/tornado[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/tenacity/tenacity-8.2.1.ebuild b/dev-python/tenacity/tenacity-8.2.1.ebuild
index 3b5917e532c9..3c82a5c201f8 100644
--- a/dev-python/tenacity/tenacity-8.2.1.ebuild
+++ b/dev-python/tenacity/tenacity-8.2.1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/tornado[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/tenacity/tenacity-8.2.2.ebuild b/dev-python/tenacity/tenacity-8.2.2.ebuild
index 3b5917e532c9..3c82a5c201f8 100644
--- a/dev-python/tenacity/tenacity-8.2.2.ebuild
+++ b/dev-python/tenacity/tenacity-8.2.2.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/tornado[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/tldextract/tldextract-3.4.0.ebuild b/dev-python/tldextract/tldextract-3.4.0.ebuild
index dad0b9378e70..be9953d99993 100644
--- a/dev-python/tldextract/tldextract-3.4.0.ebuild
+++ b/dev-python/tldextract/tldextract-3.4.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/requests-file[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
diff --git a/dev-python/tox/tox-3.28.0.ebuild b/dev-python/tox/tox-3.28.0.ebuild
index 74455d653158..47bba5d0edc2 100644
--- a/dev-python/tox/tox-3.28.0.ebuild
+++ b/dev-python/tox/tox-3.28.0.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	' 3.8 3.9 3.10)
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild
index 1a89addc6bd8..7a2040b497ac 100644
--- a/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild
+++ b/dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="app-crypt/tpm2-tss:=[fapi=]
 DEPEND="${RDEPEND}
 	test? ( app-crypt/swtpm )"
 
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]"
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/tqdm/tqdm-4.64.1.ebuild b/dev-python/tqdm/tqdm-4.64.1.ebuild
index a50d991667e6..9703fd736894 100644
--- a/dev-python/tqdm/tqdm-4.64.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.64.1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc
 IUSE="examples"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 46ebc6bb33f0..6243a31212cc 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST translate-3.8.3.gh.tar.gz 1157587 BLAKE2B 4dc8ca9cb7f0040364ceeb6fae47d9189642e8383fb1c808713aeb82452690ffe5957c63d649994eae486efaa51aee664fa7b0bb199036d869a87d7a0bf21806 SHA512 ad5a814cc03ed0d41aeac60bea72133fcd47470ab254849647d674bc00b71f2afe1c0956891decc6906fafbd07c4e3d5efcf4212c0e449f3fb3fb4fdbee9aab8
 DIST translate-3.8.4.gh.tar.gz 1158012 BLAKE2B 37d26792b9382d318e359db3c7087cbf71a444c4f76c9b3fcec9311820ade1d3f346d7ff4b22983d6a49e0afd47b4277d2c0222e2982d56f52fcf7f655bd349b SHA512 28d452d9da1d1b400e88a30b9f997dd70ab2db5e6ae33a7882203bf6b59abf6bd315bee97c9f01de536dc752fde93429bb65aeb7b6386482193a68a472bd2e9a
+DIST translate-3.8.5.gh.tar.gz 1158381 BLAKE2B efa51a672bac419e0cf847099f68f33882b8a60c339b157f2a3144014e10b5c241a0817fd93755e2327afd9b9dd923f28c4f22c3a950fe95189bfb6592dd4c83 SHA512 687aadbdaeddd33de64224e33fdf2f47f3b368d5f22e8d79f580ab407595bda0fbdbbb45edeeddff4b0d583eb4238de9ecb7514289ff4ae8fb387c3d089374de
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
new file mode 100644
index 000000000000..4fec614ce01a
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
@@ -0,0 +1,98 @@
+# 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} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+	https://github.com/translate/translate/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/phply[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+		# Apparently a change in line wrapping x_x
+		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		translate/storage/test_fluent.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	# translate/storage/test_mo.py needs 'pocompile'
+	distutils_install_for_testing
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+
+	python_optimize
+}
diff --git a/dev-python/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
index f2106aab406e..04489d99aa05 100644
--- a/dev-python/twine/twine-4.0.2.ebuild
+++ b/dev-python/twine/twine-4.0.2.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/build[${PYTHON_USEDEP}]
 		dev-python/jaraco-envs[${PYTHON_USEDEP}]
diff --git a/dev-python/typeguard/typeguard-2.13.3-r1.ebuild b/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
index 922a2e4c1523..0cd1c3a432ec 100644
--- a/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
+++ b/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/ujson/ujson-5.7.0.ebuild b/dev-python/ujson/ujson-5.7.0.ebuild
index 163a318e86c8..8750d1de29e7 100644
--- a/dev-python/ujson/ujson-5.7.0.ebuild
+++ b/dev-python/ujson/ujson-5.7.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytz[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
index 2afef612dccc..580a04609b49 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-python/atomicwrites[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.0.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.0.ebuild
index 19858b89375c..1ec2eda40c42 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.19.0.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.0.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
index 5f552eee140f..f6a9c86ea9ca 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/virtualenv-20.17.1.ebuild b/dev-python/virtualenv/virtualenv-20.17.1.ebuild
index 1a60eddcef94..68adf78af27f 100644
--- a/dev-python/virtualenv/virtualenv-20.17.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.17.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 # coverage is used somehow magically in virtualenv, maybe it actually
 # tests something useful
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-2022.12.0.ebuild b/dev-python/xarray/xarray-2022.12.0.ebuild
index 1834bd4371a6..cc3b9506a5f2 100644
--- a/dev-python/xarray/xarray-2022.12.0.ebuild
+++ b/dev-python/xarray/xarray-2022.12.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 # note: most of the test dependencies are optional
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/bottleneck[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-2023.1.0.ebuild b/dev-python/xarray/xarray-2023.1.0.ebuild
index d57fae5b3b47..d4181f89f116 100644
--- a/dev-python/xarray/xarray-2023.1.0.ebuild
+++ b/dev-python/xarray/xarray-2023.1.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 # note: most of the test dependencies are optional
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/bottleneck[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-2023.2.0.ebuild b/dev-python/xarray/xarray-2023.2.0.ebuild
index d83409ca22d4..56938797b914 100644
--- a/dev-python/xarray/xarray-2023.2.0.ebuild
+++ b/dev-python/xarray/xarray-2023.2.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 "
 # note: most of the test dependencies are optional
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/bottleneck[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild b/dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild
index 101f531080b0..599d8aeb6237 100644
--- a/dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild
+++ b/dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-03-03 07:00:48 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-03-03 07:00:48 +0000
commit	d92776d66ba7231fd191f2c678b45d0b3316cc65 (patch)
tree	c3738e590c1d0d2be4b8b3f65c59af27abfd4d4f /dev-python
parent	7f23fad1475b2ea2c45af1ff2b66c80a6b32fcde (diff)
download	baldeagleos-repo-d92776d66ba7231fd191f2c678b45d0b3316cc65.tar.gz baldeagleos-repo-d92776d66ba7231fd191f2c678b45d0b3316cc65.tar.xz baldeagleos-repo-d92776d66ba7231fd191f2c678b45d0b3316cc65.zip