[gentoo-commits] repo/gentoo:master commit in: dev-python/doc8/, dev-python/execnet/, dev-python/cssutils/, dev-python/defcon/, ...

[Michał Górny]

commit:     20a310b95d42e4ccef8eaa539c7654c39394a0cb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 05:33:34 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 05:53:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a310b9

Rename dev-python/{setuptools_scm → setuptools-scm}

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/ansible-lint/ansible-lint-6.12.1.ebuild                   | 2 +-
 app-admin/ansible-lint/ansible-lint-6.13.1.ebuild                   | 2 +-
 app-admin/ansible-lint/ansible-lint-6.8.2.ebuild                    | 2 +-
 app-admin/ansible-lint/ansible-lint-6.9.1.ebuild                    | 2 +-
 app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild            | 2 +-
 app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild            | 2 +-
 app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild                   | 2 +-
 app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild                    | 2 +-
 app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild                    | 2 +-
 app-backup/borgbackup/borgbackup-1.2.3.ebuild                       | 2 +-
 app-backup/borgbackup/borgbackup-9999.ebuild                        | 2 +-
 app-backup/duplicity/duplicity-0.8.23-r1.ebuild                     | 2 +-
 app-backup/duplicity/duplicity-1.0.0-r1.ebuild                      | 2 +-
 app-backup/duplicity/duplicity-1.0.1-r1.ebuild                      | 2 +-
 app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild                | 2 +-
 app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild                   | 2 +-
 app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild                   | 2 +-
 app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild                          | 2 +-
 app-emulation/protontricks/protontricks-1.10.1.ebuild               | 2 +-
 app-misc/khal/khal-0.10.4-r1.ebuild                                 | 2 +-
 app-misc/khal/khal-0.10.5.ebuild                                    | 4 ++--
 app-misc/khard/khard-0.17.0-r1.ebuild                               | 2 +-
 app-misc/khard/khard-0.17.0-r2.ebuild                               | 2 +-
 app-misc/khard/khard-0.18.0.ebuild                                  | 2 +-
 app-misc/liquidctl/liquidctl-1.11.1.ebuild                          | 2 +-
 app-misc/liquidctl/liquidctl-1.12.1.ebuild                          | 2 +-
 dev-python/APScheduler/APScheduler-3.10.0.ebuild                    | 2 +-
 dev-python/APScheduler/APScheduler-3.9.1-r1.ebuild                  | 2 +-
 dev-python/APScheduler/APScheduler-3.9.1.ebuild                     | 2 +-
 dev-python/aesara/aesara-2.8.10.ebuild                              | 2 +-
 dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild                      | 2 +-
 dev-python/ansible-compat/ansible-compat-2.2.7.ebuild               | 2 +-
 dev-python/ansible-compat/ansible-compat-3.0.1.ebuild               | 2 +-
 .../argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild      | 2 +-
 dev-python/asteval/asteval-0.9.28.ebuild                            | 2 +-
 dev-python/asteval/asteval-0.9.29.ebuild                            | 2 +-
 dev-python/astroid/astroid-2.13.2.ebuild                            | 2 +-
 dev-python/astroid/astroid-2.13.5.ebuild                            | 2 +-
 dev-python/astroid/astroid-2.14.1.ebuild                            | 2 +-
 dev-python/astroid/astroid-2.14.2.ebuild                            | 2 +-
 dev-python/asttokens/asttokens-2.2.1.ebuild                         | 2 +-
 dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild              | 2 +-
 dev-python/automat/automat-20.2.0-r1.ebuild                         | 2 +-
 dev-python/automat/automat-22.10.0.ebuild                           | 2 +-
 dev-python/awxkit/awxkit-21.11.0.ebuild                             | 2 +-
 dev-python/awxkit/awxkit-21.12.0.ebuild                             | 2 +-
 dev-python/cbor2/cbor2-5.4.6.ebuild                                 | 2 +-
 dev-python/cheroot/cheroot-9.0.0.ebuild                             | 2 +-
 dev-python/cherrypy/cherrypy-18.8.0.ebuild                          | 2 +-
 dev-python/cmd2/cmd2-2.4.2.ebuild                                   | 2 +-
 dev-python/cmd2/cmd2-2.4.3.ebuild                                   | 2 +-
 dev-python/cssutils/cssutils-2.6.0.ebuild                           | 2 +-
 dev-python/deepmerge/deepmerge-1.1.0.ebuild                         | 2 +-
 dev-python/defcon/defcon-0.10.2.ebuild                              | 2 +-
 dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild                    | 2 +-
 dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild           | 2 +-
 dev-python/django-configurations/django-configurations-2.4.ebuild   | 2 +-
 dev-python/doc8/doc8-1.1.1.ebuild                                   | 2 +-
 dev-python/emcee/emcee-3.1.3.ebuild                                 | 2 +-
 dev-python/emcee/emcee-3.1.4.ebuild                                 | 2 +-
 dev-python/enrich/enrich-1.2.7-r1.ebuild                            | 2 +-
 dev-python/execnet/execnet-1.9.0-r1.ebuild                          | 2 +-
 dev-python/executing/executing-1.2.0.ebuild                         | 2 +-
 dev-python/flit_scm/flit_scm-1.7.0.ebuild                           | 2 +-
 dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild                         | 2 +-
 dev-python/humanize/humanize-4.4.0.ebuild                           | 2 +-
 dev-python/humanize/humanize-4.5.0.ebuild                           | 2 +-
 dev-python/inflect/inflect-6.0.2.ebuild                             | 2 +-
 dev-python/ini2toml/ini2toml-0.11.3.ebuild                          | 2 +-
 dev-python/irc/irc-20.1.0.ebuild                                    | 2 +-
 dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild               | 2 +-
 dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild       | 2 +-
 dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild                     | 2 +-
 dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild           | 2 +-
 dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild               | 2 +-
 dev-python/jaraco-path/jaraco-path-3.4.0.ebuild                     | 2 +-
 dev-python/jaraco-path/jaraco-path-3.4.1.ebuild                     | 2 +-
 dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild              | 2 +-
 dev-python/jsonpickle/jsonpickle-3.0.1.ebuild                       | 2 +-
 dev-python/keyring/keyring-23.13.1-r1.ebuild                        | 2 +-
 dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild                   | 2 +-
 dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild                    | 2 +-
 dev-python/kiwisolver/kiwisolver-1.4.4.ebuild                       | 2 +-
 dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild         | 2 +-
 dev-python/license-expression/license-expression-30.1.0.ebuild      | 2 +-
 dev-python/lmfit/lmfit-1.1.0.ebuild                                 | 2 +-
 dev-python/lz4/lz4-4.3.2.ebuild                                     | 2 +-
 dev-python/makefun/makefun-1.15.0.ebuild                            | 2 +-
 dev-python/makefun/makefun-1.15.1.ebuild                            | 2 +-
 dev-python/matplotlib/matplotlib-3.5.3.ebuild                       | 2 +-
 dev-python/matplotlib/matplotlib-3.6.1.ebuild                       | 2 +-
 dev-python/matplotlib/matplotlib-3.6.2.ebuild                       | 2 +-
 dev-python/matplotlib/matplotlib-3.6.3.ebuild                       | 2 +-
 dev-python/matplotlib/matplotlib-3.7.0.ebuild                       | 2 +-
 dev-python/mpmath/mpmath-1.2.1.ebuild                               | 2 +-
 dev-python/path/path-16.6.0-r1.ebuild                               | 2 +-
 dev-python/picobox/picobox-2.2.0.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-6.2.6.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-6.2.7.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-6.2.8.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-6.2.9.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-7.0.0.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-7.1.0.ebuild                             | 2 +-
 dev-python/pikepdf/pikepdf-7.1.1.ebuild                             | 2 +-
 dev-python/pkgcraft/pkgcraft-0.0.3.ebuild                           | 2 +-
 dev-python/pkgcraft/pkgcraft-0.0.4.ebuild                           | 2 +-
 dev-python/pkgcraft/pkgcraft-0.0.5.ebuild                           | 2 +-
 dev-python/pkgcraft/pkgcraft-9999.ebuild                            | 2 +-
 dev-python/pluggy/pluggy-1.0.0-r2.ebuild                            | 2 +-
 dev-python/pooch/pooch-1.6.0.ebuild                                 | 2 +-
 dev-python/pooch/pooch-1.7.0.ebuild                                 | 2 +-
 dev-python/portend/portend-3.1.0.ebuild                             | 2 +-
 dev-python/prettytable/prettytable-3.3.0.ebuild                     | 2 +-
 dev-python/py/py-1.11.0-r1.ebuild                                   | 2 +-
 dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild                      | 2 +-
 dev-python/pymediainfo/pymediainfo-6.0.1.ebuild                     | 2 +-
 dev-python/pyocr/pyocr-0.8.3.ebuild                                 | 2 +-
 dev-python/pyroute2/pyroute2-0.7.3.ebuild                           | 2 +-
 dev-python/pyroute2/pyroute2-0.7.4.ebuild                           | 2 +-
 dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild               | 2 +-
 dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild              | 2 +-
 .../pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild      | 2 +-
 dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild               | 2 +-
 dev-python/pytest-django/pytest-django-4.5.2.ebuild                 | 2 +-
 dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild              | 2 +-
 dev-python/pytest-forked/pytest-forked-1.6.0.ebuild                 | 2 +-
 .../pytest-helpers-namespace-2021.12.29-r1.ebuild                   | 2 +-
 dev-python/pytest-metadata/pytest-metadata-2.0.4.ebuild             | 2 +-
 dev-python/pytest-mock/pytest-mock-3.10.0.ebuild                    | 2 +-
 dev-python/pytest-plus/pytest-plus-0.4.0.ebuild                     | 2 +-
 .../pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild      | 2 +-
 dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild     | 2 +-
 dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild            | 2 +-
 dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild             | 2 +-
 dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild           | 2 +-
 dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild                   | 2 +-
 dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild                   | 2 +-
 dev-python/pytest/pytest-7.2.1.ebuild                               | 2 +-
 dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild          | 2 +-
 dev-python/python-varlink/python-varlink-31.0.0.ebuild              | 2 +-
 dev-python/python-xlib/python-xlib-0.33.ebuild                      | 2 +-
 dev-python/quantities/quantities-0.14.0.ebuild                      | 2 +-
 dev-python/quantities/quantities-0.14.1.ebuild                      | 2 +-
 dev-python/rst-linker/rst-linker-2.3.1.ebuild                       | 2 +-
 dev-python/rst-linker/rst-linker-2.4.0.ebuild                       | 2 +-
 dev-python/serverfiles/serverfiles-0.3.1-r1.ebuild                  | 2 +-
 dev-python/{setuptools_scm => setuptools-scm}/Manifest              | 0
 dev-python/{setuptools_scm => setuptools-scm}/metadata.xml          | 0
 .../setuptools-scm-7.1.0.ebuild}                                    | 0
 dev-python/setuptools/setuptools-65.7.0.ebuild                      | 2 +-
 dev-python/setuptools/setuptools-67.2.0-r1.ebuild                   | 2 +-
 dev-python/setuptools/setuptools-67.4.0.ebuild                      | 2 +-
 .../setuptools_scm_git_archive-1.4.ebuild                           | 2 +-
 dev-python/simpy/simpy-4.0.1-r1.ebuild                              | 2 +-
 dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild  | 2 +-
 dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild   | 2 +-
 dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild               | 2 +-
 dev-python/tempora/tempora-5.2.1.ebuild                             | 2 +-
 dev-python/tenacity/tenacity-8.1.0.ebuild                           | 2 +-
 dev-python/tenacity/tenacity-8.2.0.ebuild                           | 2 +-
 dev-python/tenacity/tenacity-8.2.1.ebuild                           | 2 +-
 dev-python/tenacity/tenacity-8.2.2.ebuild                           | 2 +-
 dev-python/tldextract/tldextract-3.4.0.ebuild                       | 2 +-
 dev-python/tox/tox-3.28.0.ebuild                                    | 2 +-
 dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild                       | 2 +-
 dev-python/tqdm/tqdm-4.64.1.ebuild                                  | 2 +-
 dev-python/twine/twine-4.0.2.ebuild                                 | 2 +-
 dev-python/typeguard/typeguard-2.13.3-r1.ebuild                     | 2 +-
 dev-python/ujson/ujson-5.7.0.ebuild                                 | 2 +-
 dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild                   | 2 +-
 dev-python/vdirsyncer/vdirsyncer-0.19.0.ebuild                      | 2 +-
 dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild                      | 2 +-
 dev-python/virtualenv/virtualenv-20.17.1.ebuild                     | 2 +-
 dev-python/xarray/xarray-2022.12.0.ebuild                           | 2 +-
 dev-python/xarray/xarray-2023.1.0.ebuild                            | 2 +-
 dev-python/xarray/xarray-2023.2.0.ebuild                            | 2 +-
 dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild                           | 2 +-
 dev-util/ebuildtester/ebuildtester-0.1.35.ebuild                    | 2 +-
 dev-util/ebuildtester/ebuildtester-0.1.37.ebuild                    | 2 +-
 dev-util/ebuildtester/ebuildtester-41.ebuild                        | 2 +-
 dev-util/ebuildtester/ebuildtester-42.ebuild                        | 2 +-
 eclass/distutils-r1.eclass                                          | 6 +++---
 media-sound/whipper/whipper-0.10.0.ebuild                           | 2 +-
 media-sound/whipper/whipper-0.9.0.ebuild                            | 2 +-
 profiles/arch/hppa/package.use.stable.mask                          | 2 +-
 profiles/arch/s390/package.use.mask                                 | 2 +-
 profiles/updates/1Q-2023                                            | 1 +
 sci-libs/cartopy/cartopy-0.21.1.ebuild                              | 2 +-
 x11-terms/guake/guake-3.8.5-r1.ebuild                               | 2 +-
 x11-terms/guake/guake-3.9.0.ebuild                                  | 2 +-
 x11-wm/qtile/qtile-0.21.0-r1.ebuild                                 | 2 +-
 x11-wm/qtile/qtile-0.22.1-r1.ebuild                                 | 2 +-
 x11-wm/qtile/qtile-0.22.1.ebuild                                    | 2 +-
 x11-wm/qtile/qtile-9999.ebuild                                      | 2 +-
 194 files changed, 194 insertions(+), 193 deletions(-)

diff --git a/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild
index 07351ebda5a3..ee2222e75df9 100644
--- a/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.12.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]
 	dev-vcs/git"
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]

diff --git a/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild
index 07351ebda5a3..ee2222e75df9 100644
--- a/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.13.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]
 	dev-vcs/git"
 BDEPEND="
-	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]

diff --git a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
index 64f06f90a631..622d56553866 100644
--- a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]
 	>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]"
 BDEPEND="
-	>=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]

diff --git a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
index 6ca29903739b..5e650d086a23 100644
--- a/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.9.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/wcmatch-8.3.2[${PYTHON_USEDEP}]
 	>=dev-util/yamllint-1.26.3[${PYTHON_USEDEP}]"
 BDEPEND="
-	>=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]

diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
index 0991e0135aa7..b7f03fadc438 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="$(python_gen_cond_dep '
 	selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
 ')"
 BDEPEND="$(python_gen_cond_dep '
-	>=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm_git_archive-1.1[${PYTHON_USEDEP}]
 	doc? (
 		app-admin/ansible-core[${PYTHON_USEDEP}]

diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild
index e04e303184de..15dd9cdede34 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild
@@ -37,7 +37,7 @@ RDEPEND="$(python_gen_cond_dep '
 	selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
 ')"
 BDEPEND="$(python_gen_cond_dep '
-	>=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-scm-3.5.0[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm_git_archive-1.1[${PYTHON_USEDEP}]
 	doc? (
 		app-admin/ansible-core[${PYTHON_USEDEP}]

diff --git a/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
index 0b4fa19b409a..36b587884565 100644
--- a/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}

diff --git a/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild b/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
index 4e307701afa6..9b469cc1f3a6 100644
--- a/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 "
 
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]

diff --git a/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild b/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
index 9a7a0c78c82c..4502f05ba0ae 100644
--- a/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 "
 
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]

diff --git a/app-backup/borgbackup/borgbackup-1.2.3.ebuild b/app-backup/borgbackup/borgbackup-1.2.3.ebuild
index 993a3c345a2c..a685a3ad5142 100644
--- a/app-backup/borgbackup/borgbackup-1.2.3.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 "
 
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]

diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index be1e1d114458..fd3b75c37fb3 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 "
 
 DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]

diff --git a/app-backup/duplicity/duplicity-0.8.23-r1.ebuild b/app-backup/duplicity/duplicity-0.8.23-r1.ebuild
index 323aa87afafb..b2cf8a5caab8 100644
--- a/app-backup/duplicity/duplicity-0.8.23-r1.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.23-r1.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		app-arch/par2cmdline
 		dev-python/mock[${PYTHON_USEDEP}]

diff --git a/app-backup/duplicity/duplicity-1.0.0-r1.ebuild b/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
index eddcc6c02a7a..c0fe15cb23c0 100644
--- a/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		app-arch/par2cmdline
 		dev-python/mock[${PYTHON_USEDEP}]

diff --git a/app-backup/duplicity/duplicity-1.0.1-r1.ebuild b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
index 59350563f536..42303a846ef5 100644
--- a/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
@@ -22,7 +22,7 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		app-arch/par2cmdline
 		dev-python/mock[${PYTHON_USEDEP}]

diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
index fce3de502a2a..fc69bee691f8 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="examples"
 # Tests use a tox environment and separate steps for test env preparation
 RESTRICT="test"
 
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]

diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild
index 2bf98ffa1c78..952d7054d4ab 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 # Tests use a tox environment and separate steps for test env preparation
 RESTRICT="test"
 
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 
 RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]

diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild
index 6ac5847511ba..144527672536 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 # Tests use a tox environment and separate steps for test env preparation
 RESTRICT="test"
 
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
+DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
 RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]

diff --git a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
index 910aee86c21b..a1e2b168d4b7 100644
--- a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
@@ -21,7 +21,7 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 RDEPEND="dev-libs/openssl:0"
 
 # Tests require a local ACME server to be set up.

diff --git a/app-emulation/protontricks/protontricks-1.10.1.ebuild b/app-emulation/protontricks/protontricks-1.10.1.ebuild
index ba7c8ddf8b36..222d67177b2a 100644
--- a/app-emulation/protontricks/protontricks-1.10.1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.10.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="app-emulation/winetricks
 		)
 	)"
 BDEPEND="$(python_gen_cond_dep '
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 ')"
 
 DOCS=( CHANGELOG.md README.md )

diff --git a/app-misc/khal/khal-0.10.4-r1.ebuild b/app-misc/khal/khal-0.10.4-r1.ebuild
index 601f5375271d..dc6aeab6505c 100644
--- a/app-misc/khal/khal-0.10.4-r1.ebuild
+++ b/app-misc/khal/khal-0.10.4-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}]
 	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
 	dev-python/tzlocal[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]"
-BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+BDEPEND=">dev-python/setuptools-scm-1.12.0[${PYTHON_USEDEP}]
 	dev-python/vdirsyncer[${PYTHON_USEDEP}]
 	dev-python/freezegun[${PYTHON_USEDEP}]"
 

diff --git a/app-misc/khal/khal-0.10.5.ebuild b/app-misc/khal/khal-0.10.5.ebuild
index 07c83a85bd60..eea655df5e87 100644
--- a/app-misc/khal/khal-0.10.5.ebuild
+++ b/app-misc/khal/khal-0.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-python/setproctitle[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/vdirsyncer[${PYTHON_USEDEP}]
 	dev-python/freezegun[${PYTHON_USEDEP}]
 "

diff --git a/app-misc/khard/khard-0.17.0-r1.ebuild b/app-misc/khard/khard-0.17.0-r1.ebuild
index 90c182ca4cf9..62b91b497b50 100644
--- a/app-misc/khard/khard-0.17.0-r1.ebuild
+++ b/app-misc/khard/khard-0.17.0-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	)
 "
 

diff --git a/app-misc/khard/khard-0.17.0-r2.ebuild b/app-misc/khard/khard-0.17.0-r2.ebuild
index 6686c89aaceb..d09e0712c95c 100644
--- a/app-misc/khard/khard-0.17.0-r2.ebuild
+++ b/app-misc/khard/khard-0.17.0-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/sphinx

diff --git a/app-misc/khard/khard-0.18.0.ebuild b/app-misc/khard/khard-0.18.0.ebuild
index 9feb94042815..b9af5d4d36ee 100644
--- a/app-misc/khard/khard-0.18.0.ebuild
+++ b/app-misc/khard/khard-0.18.0.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/sphinx-autoapi

diff --git a/app-misc/liquidctl/liquidctl-1.11.1.ebuild b/app-misc/liquidctl/liquidctl-1.11.1.ebuild
index 7efd2e56d181..52966a59984d 100644
--- a/app-misc/liquidctl/liquidctl-1.11.1.ebuild
+++ b/app-misc/liquidctl/liquidctl-1.11.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest

diff --git a/app-misc/liquidctl/liquidctl-1.12.1.ebuild b/app-misc/liquidctl/liquidctl-1.12.1.ebuild
index 446ab3f13df9..129fe11d70df 100644
--- a/app-misc/liquidctl/liquidctl-1.12.1.ebuild
+++ b/app-misc/liquidctl/liquidctl-1.12.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest

diff --git a/dev-python/APScheduler/APScheduler-3.10.0.ebuild b/dev-python/APScheduler/APScheduler-3.10.0.ebuild
index 496012d99a0f..4113dde0f245 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 662165451711..ab5df85cda96 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 558a296a30c9..28b84eb815b9 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 d385e53570f1..ecc99c59864d 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 7a6e24f4bc20..d09eb390dbf0 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 fc5e37fd7347..663147354297 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 3d74a230e35d..f79129b573db 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 3d74a230e35d..f79129b573db 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 77ee527f5716..a878ddf63ff5 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 2ba3e7d4abba..d59ff3f19aee 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 2ba3e7d4abba..d59ff3f19aee 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 2ba3e7d4abba..d59ff3f19aee 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 c0b867440990..e72d38a19163 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 f3d8270e26ee..8fb6042617f2 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 231c2c8a5391..ef3ee70bfe81 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 054fdbfcdaa5..30899b251834 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 f6c6509cb933..66765826e930 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 00ed0215729e..60237928f391 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/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
index e8d8e24d1372..0edfd3a3d7a1 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 ba1f15d7d74d..2be950492859 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 e41cd56ba3ee..f5050a839c11 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 3d5dbb93fa95..c540f3b3cef9 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 aa52347efcf8..2fa54e7a3aef 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/cssutils/cssutils-2.6.0.ebuild b/dev-python/cssutils/cssutils-2.6.0.ebuild
index aa70a9c26987..2b70df067b6d 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/deepmerge/deepmerge-1.1.0.ebuild b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
index 12681155a1eb..3914d29e6fee 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 82e7068a42ba..0536b120306a 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 606ca152eaf7..d04713073f56 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 9dc5687e48b1..6b295cdc596b 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 30e7ec32a19a..aeade233ec81 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 ee3576d95977..5e6d06568858 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 d83883fd702b..13d2d74f73a8 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 d83883fd702b..13d2d74f73a8 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 cb2de2e598ca..70ee1493a1f6 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 198204adb269..2b3d3d04854b 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 dfc8f3445aa9..ce710a680b92 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 248061d66853..d6ea2b8ac92e 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/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
index 2f51c8ca8e20..543354470f9c 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 dc90c714fbb7..3825ae1d63e9 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 79adf26cf1e9..97b2b7326ef4 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 1074ffd7ff50..2542224f9f2a 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 898f058ebca0..017012e33817 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 52b8f9477824..2cb1505e9610 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 bf4cbfe28870..bed571d961e0 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 cd0febe4419f..ee909e6a89b9 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 9124e1136034..906b2c6c433e 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 fc6ded4e5b0c..2334d740191f 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 3698a5361252..dc841c80a805 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 5f941d906ffe..5b1cd39c1cd2 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 dadb7c5aad3a..91a7f161bd34 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 ddf5705eb8b9..fbc3cfbbd4cd 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 80dd9905bbab..8a3b903e6d64 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 31b420a665bd..438c633749d4 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 8ceed76a4f73..d696c36f2971 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 67d18ec3f1e7..69b285bb9c1b 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 5be09beaa63e..2aa34a745b32 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 18cc6210f616..5161a0f1a01c 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 218a3e602333..ab38127d74fd 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 b35675feecfd..2638f31abd84 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 43d6a87e39bf..789ace674d05 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 e7a7c955275f..ed9bd37f0d2d 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 a509714c5540..dd787a610b51 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 a2b7b3157070..868720e51388 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 e5501461c469..9c33e0855603 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 d8abecd0d250..5c8c474ba51d 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 da2cb549942e..03f03abb8ddd 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 ea7b14247731..2f7921dc4a9e 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/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
index 92b2d7344cd3..a06b4fac1b15 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/path/path-16.6.0-r1.ebuild b/dev-python/path/path-16.6.0-r1.ebuild
index fee2ea063dd8..d538d871e335 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 7bbcba69bc04..16cf0b2d9057 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 e4ee7a01eadd..13e3b057bc1f 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 fae6bc7738cb..168cb74a4073 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 fae6bc7738cb..168cb74a4073 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 fae6bc7738cb..168cb74a4073 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 9cf479f7a649..d67430fb7fb4 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 9cf479f7a649..d67430fb7fb4 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 6f3828a75649..68c143cdaf70 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 e07817f0c9cb..37f7352ce4b1 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 8f8b9f9e6daf..7c5153c13bc9 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 2cc8a7f0a32f..6d0af9d99353 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 fada1d980ba5..e89606c45ab4 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 bff5779379c3..5d298c3ae27f 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 893b7048266c..ca200c27f765 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 16a3902f3a69..5b67c32ad973 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 a161439ad7b3..791b61a12640 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 043633454a4a..c46153f90cb0 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 2d39e716c4b2..708b164558cd 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 094f6662512b..97648e2214df 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 bdb197ef483c..1d3b7946d0fb 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 62f8703f9963..ef714a839b36 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 2eb858329ee4..de4e12ca19e5 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 8bd2df0e2531..d39986b863c1 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 45eb348d357d..d795479dd836 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 038abe25b2ce..68d43942cfed 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 46e067fc3b0f..e0163799b944 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 84ebc590b802..85e6158cfd61 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 ed920bafa2e1..b37b4b53dd23 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 4cb41092e569..76c71cda9a6d 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 12859926f5ec..c395bb83ee14 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 883316723abb..983379073746 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 c941c25f9fdb..81653ef30256 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 82a381512d9d..ed32b4e2d0e6 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 a0a51fc25a91..9147023f30d2 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 79998a7b102e..95d4d9ebd5ea 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 8314ef05220f..c3bc7d37a95e 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 e5e3af013755..e370a608f05b 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-dateutil/python-dateutil-2.8.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
index b492091abb28..c04c839172e0 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 602064f238ed..df3fae0071fc 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 c0b37ac0d301..16b98d78ab9e 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 5df00e8a43cb..b6edadfcb852 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 5df00e8a43cb..b6edadfcb852 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/rst-linker/rst-linker-2.3.1.ebuild b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
index dfe8e52fe1df..5726371c6140 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 f351b07d6f3c..b0b4e51bd6f5 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 3b1476909f7f..2135fb572a0a 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
similarity index 100%
rename from dev-python/setuptools_scm/Manifest
rename to dev-python/setuptools-scm/Manifest

diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools-scm/metadata.xml
similarity index 100%
rename from dev-python/setuptools_scm/metadata.xml
rename to 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
similarity index 100%
rename from dev-python/setuptools_scm/setuptools_scm-7.1.0.ebuild
rename to dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild

diff --git a/dev-python/setuptools/setuptools-65.7.0.ebuild b/dev-python/setuptools/setuptools-65.7.0.ebuild
index 924ec384fd0e..d2239800a420 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 1801c2ffb416..c6bb1c53e701 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 f46eb55ab7f3..8851d666e4cb 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 9520b6a3f467..d41534271534 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 3c1f44b5ac33..caed81664638 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 0a4b5cdc589f..e23c9a24240a 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 6f4c7f906d2a..6b2e14dde2ce 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/subprocess-tee/subprocess-tee-0.4.1.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
index 65b20a745bfa..21d5496c2cea 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 5f2ef214879e..b0f775828070 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 9917fe196bb9..0ac51168196c 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 2b2710dd1228..0bba32fca1ec 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 2b2710dd1228..0bba32fca1ec 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 2b2710dd1228..0bba32fca1ec 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 6ff1ff846f77..b9ca1011fdea 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 5df435fb9f9d..69926078d9c9 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 f90a1dc9aa96..6fd418968a9d 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 71515eaefc89..d1a98a77916b 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/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
index fec325a37f8c..c78faa3cc4ab 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 5afe6717bb9d..d40683e5eb2b 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 ecf1d2b6289d..af816af8c59d 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 ff44ae3548a0..1e6f44020971 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 7ce12cfc84a0..18fcf241441e 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 66223c31a60b..6bb8163b01c4 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 1d5059556259..58de01bde78f 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 e8875b4e8cab..156fdf4d20d7 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 0d7b5d4fc06c..ebe1366ae5bd 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 66a3db87991f..54219dc1848c 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 f465d6032766..c22048e946b4 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}]

diff --git a/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
index 4471ee5040c6..46d59b26d96b 100644
--- a/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
+++ b/dev-util/ebuildtester/ebuildtester-0.1.35.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 

diff --git a/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
index c914e1af56c2..2e8f74e55d09 100644
--- a/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
+++ b/dev-util/ebuildtester/ebuildtester-0.1.37.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 

diff --git a/dev-util/ebuildtester/ebuildtester-41.ebuild b/dev-util/ebuildtester/ebuildtester-41.ebuild
index f0c0daa8f7e4..3ed8193c7564 100644
--- a/dev-util/ebuildtester/ebuildtester-41.ebuild
+++ b/dev-util/ebuildtester/ebuildtester-41.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 

diff --git a/dev-util/ebuildtester/ebuildtester-42.ebuild b/dev-util/ebuildtester/ebuildtester-42.ebuild
index f0c0daa8f7e4..3ed8193c7564 100644
--- a/dev-util/ebuildtester/ebuildtester-42.ebuild
+++ b/dev-util/ebuildtester/ebuildtester-42.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 9ef8342486b4..95911f912ca0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -916,7 +916,7 @@ _distutils-r1_print_package_versions() {
 				packages+=(
 					dev-python/flit_core
 					dev-python/flit_scm
-					dev-python/setuptools_scm
+					dev-python/setuptools-scm
 				)
 				;;
 			hatchling)
@@ -930,7 +930,7 @@ _distutils-r1_print_package_versions() {
 				packages+=(
 					dev-python/jupyter_packaging
 					dev-python/setuptools
-					dev-python/setuptools_scm
+					dev-python/setuptools-scm
 					dev-python/wheel
 				)
 				;;
@@ -968,7 +968,7 @@ _distutils-r1_print_package_versions() {
 			setuptools)
 				packages+=(
 					dev-python/setuptools
-					dev-python/setuptools_scm
+					dev-python/setuptools-scm
 					dev-python/wheel
 				)
 				;;

diff --git a/media-sound/whipper/whipper-0.10.0.ebuild b/media-sound/whipper/whipper-0.10.0.ebuild
index a672f4f4c088..7fb919c1f3af 100644
--- a/media-sound/whipper/whipper-0.10.0.ebuild
+++ b/media-sound/whipper/whipper-0.10.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	media-libs/mutagen[${PYTHON_USEDEP}]
 	media-sound/sox[flac]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests unittest

diff --git a/media-sound/whipper/whipper-0.9.0.ebuild b/media-sound/whipper/whipper-0.9.0.ebuild
index b1f497e35b2c..4fdc83982d81 100644
--- a/media-sound/whipper/whipper-0.9.0.ebuild
+++ b/media-sound/whipper/whipper-0.9.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	media-libs/mutagen[${PYTHON_USEDEP}]
 	media-sound/sox[flac]"
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests unittest

diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 192758d2501c..17397f93894d 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -181,7 +181,7 @@ media-libs/libsdl2 fcitx4
 # Rolf Eike Beer <eike@×××××××.de> (2020-06-10)
 # not stable dev-vcs/mercurial because of broken dependencies: bug #727390
 app-portage/layman mercurial
-dev-python/setuptools_scm test
+dev-python/setuptools-scm test
 
 # Rolf Eike Beer <eike@×××××××.de> (2020-04-24)
 # dependencies not stable yet

diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 953f2e3d4516..7a5c89d17bdf 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -123,7 +123,7 @@ dev-python/cssselect doc
 # not really interested in supporting alternative
 # VCS for overlays yet. Layman needs SVN for tests too.
 app-portage/layman darcs mercurial test
-dev-python/setuptools_scm test
+dev-python/setuptools-scm test
 # no lua support for vim
 app-editors/vim lua
 # not keyworded yet

diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023
index 24f294efb74a..52a993b18d12 100644
--- a/profiles/updates/1Q-2023
+++ b/profiles/updates/1Q-2023
@@ -15,3 +15,4 @@ move dev-python/python-zstandard dev-python/zstandard
 move dev-python/prompt_toolkit dev-python/prompt-toolkit
 move sys-apps/uutils sys-apps/uutils-coreutils
 move dev-python/myst_parser dev-python/myst-parser
+move dev-python/setuptools_scm dev-python/setuptools-scm

diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild b/sci-libs/cartopy/cartopy-0.21.1.ebuild
index 40c419a3323b..bad3ea5841c3 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
 		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	test? (

diff --git a/x11-terms/guake/guake-3.8.5-r1.ebuild b/x11-terms/guake/guake-3.8.5-r1.ebuild
index 7b8b769c3b8a..98ddf1ebfcbd 100644
--- a/x11-terms/guake/guake-3.8.5-r1.ebuild
+++ b/x11-terms/guake/guake-3.8.5-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	utempter? ( sys-libs/libutempter )"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
 		test? (
 			dev-python/pyfakefs[${PYTHON_USEDEP}]
 			dev-python/pytest-mock[${PYTHON_USEDEP}]

diff --git a/x11-terms/guake/guake-3.9.0.ebuild b/x11-terms/guake/guake-3.9.0.ebuild
index e94c4013126b..7e562500a24f 100644
--- a/x11-terms/guake/guake-3.9.0.ebuild
+++ b/x11-terms/guake/guake-3.9.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	x11-libs/vte:2.91[introspection]"
 BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
 		test? (
 			dev-python/pyfakefs[${PYTHON_USEDEP}]
 			dev-python/pytest-mock[${PYTHON_USEDEP}]

diff --git a/x11-wm/qtile/qtile-0.21.0-r1.ebuild b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
index 00d5941fc8f5..5e44902284db 100644
--- a/x11-wm/qtile/qtile-0.21.0-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.21.0-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
 	dev-python/dbus-next[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
 	media-sound/pulseaudio

diff --git a/x11-wm/qtile/qtile-0.22.1-r1.ebuild b/x11-wm/qtile/qtile-0.22.1-r1.ebuild
index 558b0bda0dee..bad516d47be3 100644
--- a/x11-wm/qtile/qtile-0.22.1-r1.ebuild
+++ b/x11-wm/qtile/qtile-0.22.1-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	)
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		media-gfx/imagemagick[X]
 		x11-base/xorg-server[xephyr]

diff --git a/x11-wm/qtile/qtile-0.22.1.ebuild b/x11-wm/qtile/qtile-0.22.1.ebuild
index ff1328ef1a08..a51a99123343 100644
--- a/x11-wm/qtile/qtile-0.22.1.ebuild
+++ b/x11-wm/qtile/qtile-0.22.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=dev-python/cairocffi-0.9.0[${PYTHON_USEDEP}]
 	dev-python/dbus-next[${PYTHON_USEDEP}]
 	dev-python/pygobject[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	>=dev-python/xcffib-0.10.1[${PYTHON_USEDEP}]
 	media-sound/pulseaudio

diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index 02efe955cdc0..d995f4b40cbc 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	)
 "
 BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		media-gfx/imagemagick[X]
 		x11-base/xorg-server[xephyr]