git: 5d4139f8bdb6 - main - devel/py-setuptools-scm: update to 8.0.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Feb 2024 07:21:23 UTC
The branch main has been updated by vishwin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5d4139f8bdb67bd6e8328422f9762661bd0d6454
commit 5d4139f8bdb67bd6e8328422f9762661bd0d6454
Author: Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2024-02-29 07:18:32 +0000
Commit: Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2024-02-29 07:18:32 +0000
devel/py-setuptools-scm: update to 8.0.4
Directory and PORTNAME changed to match normalised name in release
tarball; consumers updated to match.
Although setuptools itself is specified as a run dependency in the
Python package metadata, it is currently left out here to prevent
environment pollution until at least PR 270510 is committed.
Additionally, this version of setuptools-scm requires setuptools>=61,
which means this version is only meant for USE_PYTHON=pep517 ports
as all USE_PYTHON=distutils ports will switch to devel/py-setuptools58
also after PR 270510. science/py-emmet-core is switched to
devel/py-setuptools_scm7 accordingly, as it specifies setuptools-scm<8.
devel/py-{flit-scm,hatch-vcs} have ${PY_SETUPTOOLS} added to
RUN_DEPENDS to compensate.
Further details: https://wiki.freebsd.org/Python/setuptools
Reported by: yuri
Co-authored by: matthew
Exp-run by: antoine (earlier iteration)
Approved by: yuri (science/py-emmet-core, previous iteration)
PR: 272134
Differential Revision: https://reviews.freebsd.org/D39288
---
MOVED | 1 +
archivers/py-borgbackup/Makefile | 2 +-
archivers/py-borgbackup11/Makefile | 2 +-
archivers/py-lz4/Makefile | 2 +-
archivers/py-xopen/Makefile | 3 +-
archivers/py-zopfli/Makefile | 2 +-
astro/py-astropy/Makefile | 2 +-
astro/py-metpy/Makefile | 4 +-
astro/py-pyerfa/Makefile | 2 +-
astro/py-sunpy/Makefile | 2 +-
audio/py-soxr/Makefile | 2 +-
benchmarks/py-asv/Makefile | 2 +-
biology/py-cutadapt/Makefile | 2 +-
biology/py-dnaio/Makefile | 2 +-
biology/py-orange3-bioinformatics/Makefile | 2 +-
biology/py-resdk/Makefile | 2 +-
cad/py-edalize/Makefile | 2 +-
cad/py-pyvcd/Makefile | 2 +-
cad/py-vunit-hdl/Makefile | 3 +-
databases/py-aiomysql/Makefile | 2 +-
databases/py-apache-arrow/Makefile | 2 +-
databases/py-fastparquet/Makefile | 2 +-
databases/py-geoalchemy2/Makefile | 2 +-
databases/py-pyarrow/Makefile | 2 +-
databases/py-python-arango/Makefile | 2 +-
databases/py-sqlglot/Makefile | 2 +-
databases/py-tarantool/Makefile | 2 +-
databases/py-tiledb/Makefile | 2 +-
deskutils/dosage/Makefile | 3 +-
deskutils/py-khal/Makefile | 2 +-
deskutils/py-khard/Makefile | 2 +-
deskutils/py-todoman/Makefile | 2 +-
deskutils/py-vdirsyncer/Makefile | 2 +-
devel/Makefile | 2 +-
devel/py-Automat/Makefile | 2 +-
devel/py-PyGithub/Makefile | 2 +-
devel/py-anyio/Makefile | 2 +-
devel/py-anyio3/Makefile | 2 +-
devel/py-apipkg/Makefile | 2 +-
devel/py-apscheduler/Makefile | 2 +-
devel/py-argcomplete/Makefile | 2 +-
devel/py-asciimatics/Makefile | 2 +-
devel/py-asteval/Makefile | 2 +-
devel/py-asttokens/Makefile | 2 +-
devel/py-attrs-strict/Makefile | 2 +-
devel/py-b2sdk/Makefile | 4 +-
devel/py-backports.cached-property/Makefile | 2 +-
.../py-backports.entry-points-selectable/Makefile | 4 +-
devel/py-bidict/Makefile | 2 +-
devel/py-bytecode/Makefile | 2 +-
devel/py-cbor2/Makefile | 2 +-
devel/py-circuits/Makefile | 2 +-
devel/py-cmd2/Makefile | 2 +-
devel/py-configupdater/Makefile | 2 +-
devel/py-cppy/Makefile | 2 +-
devel/py-ctypesgen/Makefile | 2 +-
devel/py-dateutil/Makefile | 2 +-
devel/py-ddsketch/Makefile | 2 +-
devel/py-ddtrace/Makefile | 2 +-
devel/py-decopatch/Makefile | 2 +-
devel/py-deepmerge/Makefile | 2 +-
devel/py-epsilon/Makefile | 4 +-
devel/py-executing/Makefile | 2 +-
devel/py-find-libpython/Makefile | 3 +-
devel/py-flit-scm/Makefile | 8 ++--
devel/py-hatch-vcs/Makefile | 4 +-
devel/py-hunter/Makefile | 2 +-
devel/py-importlib-metadata/Makefile | 2 +-
devel/py-importlib-metadata6/Makefile | 2 +-
devel/py-importlib-resources/Makefile | 2 +-
devel/py-inflect/Makefile | 2 +-
devel/py-iniconfig/Makefile | 2 +-
devel/py-jaraco.classes/Makefile | 2 +-
devel/py-jaraco.collections/Makefile | 2 +-
devel/py-jaraco.context/Makefile | 2 +-
devel/py-jaraco.env/Makefile | 2 +-
devel/py-jaraco.functools/Makefile | 2 +-
devel/py-jaraco.itertools/Makefile | 4 +-
devel/py-jaraco.logging/Makefile | 2 +-
devel/py-jaraco.stream/Makefile | 2 +-
devel/py-jaraco.text/Makefile | 4 +-
devel/py-jaraco.timing/Makefile | 2 +-
devel/py-jaraco.util/Makefile | 2 +-
devel/py-jira/Makefile | 2 +-
devel/py-jsonpickle/Makefile | 2 +-
devel/py-jsonschema3/Makefile | 2 +-
devel/py-lazy-object-proxy/Makefile | 4 +-
devel/py-libcst/Makefile | 2 +-
devel/py-libcst03/Makefile | 2 +-
devel/py-logfury/Makefile | 2 +-
devel/py-makefun/Makefile | 2 +-
devel/py-molecule/Makefile | 3 +-
devel/py-multiset/Makefile | 3 +-
devel/py-opencensus-context/Makefile | 2 +-
devel/py-path/Makefile | 4 +-
devel/py-pint-pandas/Makefile | 2 +-
devel/py-pint/Makefile | 4 +-
devel/py-pip-requirements-parser/Makefile | 2 +-
devel/py-pip-run/Makefile | 2 +-
devel/py-pip-tools/Makefile | 2 +-
devel/py-pip-tools4/Makefile | 2 +-
devel/py-pluggy/Makefile | 2 +-
devel/py-pluggy0/Makefile | 2 +-
devel/py-pnio-dcp/Makefile | 2 +-
devel/py-pooch/Makefile | 4 +-
devel/py-prance/Makefile | 2 +-
devel/py-pure-eval/Makefile | 2 +-
devel/py-py/Makefile | 2 +-
devel/py-pydantic-yaml/Makefile | 2 +-
devel/py-pyee/Makefile | 4 +-
devel/py-pyscaffold/Makefile | 4 +-
devel/py-pytest-aiohttp/Makefile | 2 +-
devel/py-pytest-black-multipy/Makefile | 2 +-
devel/py-pytest-black/Makefile | 2 +-
devel/py-pytest-cases/Makefile | 2 +-
devel/py-pytest-checkdocs/Makefile | 2 +-
devel/py-pytest-console-scripts/Makefile | 2 +-
devel/py-pytest-cpp/Makefile | 2 +-
devel/py-pytest-datadir/Makefile | 2 +-
devel/py-pytest-django/Makefile | 4 +-
devel/py-pytest-drop-dup-tests/Makefile | 2 +-
devel/py-pytest-enabler/Makefile | 2 +-
devel/py-pytest-flask/Makefile | 2 +-
devel/py-pytest-forked/Makefile | 2 +-
devel/py-pytest-helpers-namespace/Makefile | 2 +-
devel/py-pytest-html/Makefile | 2 +-
devel/py-pytest-localserver/Makefile | 2 +-
devel/py-pytest-mock/Makefile | 2 +-
devel/py-pytest-mpl/Makefile | 2 +-
devel/py-pytest-mypy/Makefile | 2 +-
devel/py-pytest-plus/Makefile | 2 +-
devel/py-pytest-qt/Makefile | 2 +-
devel/py-pytest-regressions/Makefile | 2 +-
devel/py-pytest-runner/Makefile | 3 +-
devel/py-pytest-services/Makefile | 2 +-
devel/py-pytest-subtests/Makefile | 2 +-
devel/py-pytest-xdist/Makefile | 2 +-
devel/py-pytest-xprocess/Makefile | 2 +-
devel/py-pytest/Makefile | 2 +-
devel/py-pytest4/Makefile | 2 +-
devel/py-python-dbusmock/Makefile | 2 +-
devel/py-pytoolconfig/Makefile | 2 +-
devel/py-pytweening/Makefile | 2 +-
devel/py-pyusb/Makefile | 2 +-
devel/py-pyvisa-py/Makefile | 4 +-
devel/py-pyvisa/Makefile | 4 +-
devel/py-pyyaml-include/Makefile | 2 +-
devel/py-qstylizer/Makefile | 2 +-
devel/py-rstr/Makefile | 4 +-
devel/py-saneyaml/Makefile | 2 +-
devel/py-scikit-build-core/Makefile | 3 +-
devel/py-scikit-build/Makefile | 3 +-
devel/py-semver/Makefile | 2 +-
.../Makefile | 2 +-
devel/py-setuptools-rust/Makefile | 2 +-
devel/py-setuptools-scm/Makefile | 52 ++++++++++++++++++++++
devel/py-setuptools-scm/distinfo | 3 ++
.../pkg-descr | 0
devel/py-setuptools_git_ls_files/Makefile | 4 +-
devel/py-setuptools_scm/Makefile | 44 ------------------
devel/py-setuptools_scm/distinfo | 3 --
devel/py-setuptools_scm/files/patch-setup.cfg | 19 --------
.../patch-src_setuptools__scm_file__finder__git.py | 22 ---------
.../patch-src_setuptools__scm_file__finder__hg.py | 22 ---------
.../files/patch-testing_test__integration.py | 13 ------
devel/py-setuptools_scm_git_archive/Makefile | 4 +-
devel/py-shtab/Makefile | 2 +-
devel/py-simpy/Makefile | 2 +-
devel/py-sparse/Makefile | 2 +-
devel/py-sqids/Makefile | 2 +-
devel/py-stack-data/Makefile | 2 +-
devel/py-subprocess-tee/Makefile | 2 +-
devel/py-tdworkflow/Makefile | 2 +-
devel/py-tempora/Makefile | 2 +-
devel/py-tenacity/Makefile | 2 +-
devel/py-testinfra/Makefile | 2 +-
devel/py-twine/Makefile | 4 +-
devel/py-txi2p-tahoe/Makefile | 2 +-
devel/py-typeguard/Makefile | 2 +-
devel/py-ujson/Makefile | 2 +-
devel/py-urwid/Makefile | 2 +-
devel/py-validate-pyproject/Makefile | 2 +-
devel/py-xarray-einstats/Makefile | 2 +-
devel/py-xarray/Makefile | 4 +-
devel/py-yg.lockfile/Makefile | 2 +-
devel/py-zarr/Makefile | 2 +-
devel/py-zipp/Makefile | 2 +-
devel/pyside2-tools/Makefile | 2 +-
devel/pyside2/Makefile | 2 +-
devel/shiboken2/Makefile | 2 +-
dns/py-tldextract/Makefile | 2 +-
finance/fava/Makefile | 2 +-
finance/py-exchange-calendars/Makefile | 3 +-
finance/py-pytrends/Makefile | 2 +-
ftp/py-parfive/Makefile | 3 +-
graphics/py-cartopy/Makefile | 2 +-
graphics/py-giddy/Makefile | 2 +-
graphics/py-mapclassify/Makefile | 2 +-
graphics/py-mpl-scatter-density/Makefile | 2 +-
graphics/py-pointpats/Makefile | 2 +-
graphics/py-pyocr/Makefile | 3 +-
graphics/py-python-barcode/Makefile | 2 +-
graphics/py-sorl-thumbnail/Makefile | 2 +-
irc/py-irc/Makefile | 2 +-
mail/py-afew/Makefile | 2 +-
math/py-Diofant/Makefile | 2 +-
math/py-amply/Makefile | 2 +-
math/py-animatplot-ng/Makefile | 2 +-
math/py-cvxopt/Makefile | 2 +-
math/py-hepstats/Makefile | 2 +-
math/py-hmmlearn/Makefile | 2 +-
math/py-jacobi/Makefile | 2 +-
math/py-kiwisolver/Makefile | 2 +-
math/py-linearmodels/Makefile | 2 +-
math/py-lmfit/Makefile | 3 +-
math/py-matplotlib/Makefile | 2 +-
math/py-mip/Makefile | 2 +-
math/py-mpmath/Makefile | 2 +-
math/py-numba-stats/Makefile | 2 +-
math/py-point-annotator/Makefile | 2 +-
math/py-pyclipper/Makefile | 2 +-
math/py-qats/Makefile | 2 +-
math/py-resample/Makefile | 2 +-
math/py-spglm/Makefile | 2 +-
math/py-statsmodels/Makefile | 2 +-
misc/py-crudini/Makefile | 2 +-
misc/py-dictdiffer/Makefile | 2 +-
misc/py-fast-histogram/Makefile | 2 +-
misc/py-fuzzy/Makefile | 2 +-
misc/py-histoprint/Makefile | 2 +-
misc/py-ipyfastscape/Makefile | 2 +-
misc/py-pkbar/Makefile | 2 +-
misc/py-progressbar2/Makefile | 2 +-
misc/py-spdx-tools/Makefile | 2 +-
misc/py-tqdm/Makefile | 2 +-
multimedia/py-pymediainfo/Makefile | 2 +-
net-mgmt/py-pynetbox/Makefile | 2 +-
net/py-portend/Makefile | 2 +-
print/py-fontaine/Makefile | 2 +-
print/py-fontbakery/Makefile | 2 +-
print/py-fontparts/Makefile | 4 +-
print/py-freetype-py/Makefile | 2 +-
print/py-glyphsets/Makefile | 2 +-
print/py-psautohint/Makefile | 2 +-
print/py-ttfautohint-py/Makefile | 2 +-
print/py-ufolib2/Makefile | 2 +-
print/py-uharfbuzz/Makefile | 2 +-
science/py-arch/Makefile | 2 +-
science/py-asdf-standard/Makefile | 2 +-
science/py-asdf-transform-schemas/Makefile | 4 +-
science/py-asdf-unit-schemas/Makefile | 2 +-
science/py-asdf/Makefile | 2 +-
science/py-boutdata/Makefile | 2 +-
science/py-boututils/Makefile | 2 +-
science/py-emmet-core/Makefile | 2 +-
science/py-esda/Makefile | 2 +-
science/py-inequality/Makefile | 2 +-
science/py-kpLib/Makefile | 2 +-
science/py-mp-api/Makefile | 2 +-
science/py-mpcontribs-client/Makefile | 2 +-
science/py-segregation/Makefile | 2 +-
science/py-segyio/Makefile | 2 +-
science/py-spaghetti/Makefile | 2 +-
science/py-spglib/Makefile | 2 +-
science/py-trx-python/Makefile | 4 +-
science/py-xbout/Makefile | 2 +-
security/py-argon2-cffi-bindings/Makefile | 4 +-
security/py-httpx-auth/Makefile | 2 +-
security/py-keyring/Makefile | 2 +-
security/py-keyrings.alt/Makefile | 2 +-
security/py-python-pkcs11/Makefile | 2 +-
security/py-signedjson/Makefile | 2 +-
security/py-xmlsec/Makefile | 2 +-
sysutils/duplicity/Makefile | 2 +-
sysutils/py-ansible-compat/Makefile | 2 +-
sysutils/py-ansible-lint/Makefile | 2 +-
sysutils/py-docker/Makefile | 3 +-
sysutils/py-liquidctl/Makefile | 2 +-
sysutils/py-rdiff-backup/Makefile | 2 +-
textproc/codespell/Makefile | 2 +-
textproc/py-ansi2html/Makefile | 2 +-
textproc/py-enrich/Makefile | 2 +-
textproc/py-ini2toml/Makefile | 4 +-
textproc/py-license-expression/Makefile | 2 +-
textproc/py-markdown-include/Makefile | 2 +-
textproc/py-normality/Makefile | 2 +-
textproc/py-ocrmypdf/Makefile | 2 +-
textproc/py-openstep-plist/Makefile | 2 +-
textproc/py-petl/Makefile | 2 +-
textproc/py-python-lsp-jsonrpc/Makefile | 2 +-
textproc/py-python-lsp-server/Makefile | 3 +-
textproc/py-sphinxcontrib-towncrier/Makefile | 2 +-
textproc/py-sphinxext-opengraph/Makefile | 2 +-
textproc/py-tablib/Makefile | 2 +-
textproc/py-unicodeitplus/Makefile | 2 +-
textproc/py-wavedrom/Makefile | 2 +-
textproc/translate-toolkit/Makefile | 2 +-
textproc/yq/Makefile | 2 +-
www/kanboard/Makefile | 2 +-
www/py-aiohttp-oauthlib/Makefile | 2 +-
www/py-branca/Makefile | 4 +-
www/py-cheroot/Makefile | 2 +-
www/py-cherrypy/Makefile | 2 +-
www/py-cssutils/Makefile | 4 +-
www/py-dj42-django-auditlog/Makefile | 2 +-
www/py-dj42-django-auth-ldap/Makefile | 2 +-
www/py-django-auth-ldap/Makefile | 2 +-
www/py-django-configurations/Makefile | 2 +-
www/py-django-formtools/Makefile | 2 +-
www/py-django-haystack/Makefile | 2 +-
www/py-django-hijack/Makefile | 2 +-
www/py-django-model-utils/Makefile | 2 +-
www/py-django-pipeline/Makefile | 2 +-
www/py-django-simple-history/Makefile | 2 +-
www/py-django-smart-selects/Makefile | 2 +-
www/py-django-voting/Makefile | 2 +-
www/py-django-widget-tweaks/Makefile | 2 +-
www/py-drf-yasg/Makefile | 2 +-
www/py-flask-compress/Makefile | 2 +-
www/py-folium/Makefile | 4 +-
www/py-requests-file/Makefile | 2 +-
www/py-swapper/Makefile | 2 +-
x11-fonts/py-afdko/Makefile | 2 +-
x11-fonts/py-axisregistry/Makefile | 2 +-
x11-fonts/py-booleanOperations/Makefile | 2 +-
x11-fonts/py-cffsubr/Makefile | 2 +-
x11-fonts/py-compreffor/Makefile | 2 +-
x11-fonts/py-cu2qu/Makefile | 2 +-
x11-fonts/py-defcon/Makefile | 2 +-
x11-fonts/py-fontMath/Makefile | 2 +-
x11-fonts/py-fontmake/Makefile | 2 +-
x11-fonts/py-gflanguages/Makefile | 2 +-
x11-fonts/py-gfsubsets/Makefile | 2 +-
x11-fonts/py-glyphsLib/Makefile | 2 +-
x11-fonts/py-opentype-sanitizer/Makefile | 2 +-
x11-fonts/py-ufo2ft/Makefile | 2 +-
x11-fonts/py-ufonormalizer/Makefile | 2 +-
x11-fonts/py-ufoprocessor/Makefile | 2 +-
x11-toolkits/py-python-xlib/Makefile | 2 +-
x11-wm/qtile/Makefile | 2 +-
340 files changed, 435 insertions(+), 483 deletions(-)
diff --git a/MOVED b/MOVED
index 999188f35ba3..d72c18ffd0b6 100644
--- a/MOVED
+++ b/MOVED
@@ -2994,3 +2994,4 @@ audio/play||2024-02-20|Has expired: Upstream vaporized and last release was in 2
graphics/fotoxx|graphics/fotocx|2024-02-21|Project was renamed upstream
databases/xtrabackup8|databases/xtrabackup80|2024-02-22|Rename port to avoid confusion
audio/kid3@qt5|audio/kid3@qt6|2024-02-25|The legacy qt5 flavor has been replaced by the qt6 flavor
+devel/py-setuptools_scm|devel/py-setuptools-scm|2024-02-29|Package name changed
diff --git a/archivers/py-borgbackup/Makefile b/archivers/py-borgbackup/Makefile
index caca499a2b14..3cf44c50affc 100644
--- a/archivers/py-borgbackup/Makefile
+++ b/archivers/py-borgbackup/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# note that borgbackup pins the msgpack version range per patchlevel version!
_BB_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.2<1.0.7_99:devel/py-msgpack@${PY_FLAVOR}
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR} \
${_BB_DEPENDS}
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
libzstd.so:archivers/zstd \
diff --git a/archivers/py-borgbackup11/Makefile b/archivers/py-borgbackup11/Makefile
index be22e31c14ae..533f2913ab8a 100644
--- a/archivers/py-borgbackup11/Makefile
+++ b/archivers/py-borgbackup11/Makefile
@@ -13,7 +13,7 @@ WWW= https://pypi.org/project/borgbackup/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.7:devel/py-setuptools-scm@${PY_FLAVOR}
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
libzstd.so:archivers/zstd \
libxxhash.so:devel/xxhash
diff --git a/archivers/py-lz4/Makefile b/archivers/py-lz4/Makefile
index f5d7a38194ee..9d89e44b02c2 100644
--- a/archivers/py-lz4/Makefile
+++ b/archivers/py-lz4/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= liblz4>=1.7.5:archivers/liblz4 \
${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
LIB_DEPENDS= liblz4.so:archivers/liblz4
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR}
diff --git a/archivers/py-xopen/Makefile b/archivers/py-xopen/Makefile
index 7c0ac142d5c3..7a8525989d54 100644
--- a/archivers/py-xopen/Makefile
+++ b/archivers/py-xopen/Makefile
@@ -12,7 +12,8 @@ WWW= https://pypi.org/project/xopen/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PY_SETUPTOOLS} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zstandard>0:archivers/py-zstandard@${PY_FLAVOR} \
pigz>=0:archivers/pigz
diff --git a/archivers/py-zopfli/Makefile b/archivers/py-zopfli/Makefile
index 281e0ea50053..8ca5694cfcbf 100644
--- a/archivers/py-zopfli/Makefile
+++ b/archivers/py-zopfli/Makefile
@@ -12,7 +12,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
USES= python zip
diff --git a/astro/py-astropy/Makefile b/astro/py-astropy/Makefile
index 99a9c4d85b64..e1fbe2579fba 100644
--- a/astro/py-astropy/Makefile
+++ b/astro/py-astropy/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst
BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}extension-helpers>=0:astro/py-extension-helpers@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pyerfa>=0:astro/py-pyerfa@${PY_FLAVOR}
diff --git a/astro/py-metpy/Makefile b/astro/py-metpy/Makefile
index 8c9a6262ba31..eb6f9a27c22d 100644
--- a/astro/py-metpy/Makefile
+++ b/astro/py-metpy/Makefile
@@ -12,8 +12,8 @@ WWW= https://github.com/Unidata/MetPy
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PY_SETUPTOOLS} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=3.5.0:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0,1:math/py-numpy@${PY_FLAVOR} \
diff --git a/astro/py-pyerfa/Makefile b/astro/py-pyerfa/Makefile
index b1959523591b..4169c028d195 100644
--- a/astro/py-pyerfa/Makefile
+++ b/astro/py-pyerfa/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.17.0,1:math/py-numpy@${PY_FLAVOR}
USES= python
diff --git a/astro/py-sunpy/Makefile b/astro/py-sunpy/Makefile
index eb89a42a799d..447949d68811 100644
--- a/astro/py-sunpy/Makefile
+++ b/astro/py-sunpy/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}extension-helpers>=0:astro/py-extension-helpers@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}astropy>=0:astro/py-astropy@${PY_FLAVOR} \
diff --git a/audio/py-soxr/Makefile b/audio/py-soxr/Makefile
index 557d3a9763e8..234c50319aaf 100644
--- a/audio/py-soxr/Makefile
+++ b/audio/py-soxr/Makefile
@@ -14,7 +14,7 @@ LICENSE_COMB= multi
BROKEN_i386= fails to compile: ...requires target feature 'sse', but would be inlined into function 'h8' that is compiled without support for 'sse'
BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYNUMPY} \
${PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY}
diff --git a/benchmarks/py-asv/Makefile b/benchmarks/py-asv/Makefile
index f4ee256e82b8..c17db49b9750 100644
--- a/benchmarks/py-asv/Makefile
+++ b/benchmarks/py-asv/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst
BUILD_DEPENDS:= ${PY_SETUPTOOLS} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.2:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
${RUN_DEPENDS}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asv-runner>=0.1.0:benchmarks/py-asv-runner@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}json5>0:devel/py-json5@${PY_FLAVOR} \
diff --git a/biology/py-cutadapt/Makefile b/biology/py-cutadapt/Makefile
index f762abfcee0c..7f1c124fe8e7 100644
--- a/biology/py-cutadapt/Makefile
+++ b/biology/py-cutadapt/Makefile
@@ -11,7 +11,7 @@ WWW= https://pypi.org/project/cutadapt/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xopen>=1.6.0:archivers/py-xopen@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dnaio>=1.2.0:biology/py-dnaio@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
diff --git a/biology/py-dnaio/Makefile b/biology/py-dnaio/Makefile
index a4efca610a3f..0e963bb5de69 100644
--- a/biology/py-dnaio/Makefile
+++ b/biology/py-dnaio/Makefile
@@ -11,7 +11,7 @@ WWW= https://pypi.python.org/pypi/dnaio
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
USES= python
diff --git a/biology/py-orange3-bioinformatics/Makefile b/biology/py-orange3-bioinformatics/Makefile
index 813bf75c7573..5464e61f4e68 100644
--- a/biology/py-orange3-bioinformatics/Makefile
+++ b/biology/py-orange3-bioinformatics/Makefile
@@ -13,7 +13,7 @@ WWW= https://github.com/biolab/orange3-bioinformatics
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= orange3>0:misc/orange3 \
${PYTHON_PKGNAMEPREFIX}Genesis-PyAPI>0:biology/py-Genesis-PyAPI@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}point-annotator>=2.0:math/py-point-annotator@${PY_FLAVOR} \
diff --git a/biology/py-resdk/Makefile b/biology/py-resdk/Makefile
index c0664a3f5f70..f04db08f522d 100644
--- a/biology/py-resdk/Makefile
+++ b/biology/py-resdk/Makefile
@@ -12,7 +12,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4.0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= \
${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \
diff --git a/cad/py-edalize/Makefile b/cad/py-edalize/Makefile
index 9b1ea014392c..8d5ab2560b00 100644
--- a/cad/py-edalize/Makefile
+++ b/cad/py-edalize/Makefile
@@ -11,7 +11,7 @@ WWW= https://github.com/olofk/edalize
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=3:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}types-Jinja2>0:devel/py-types-Jinja2@${PY_FLAVOR} \
gmake:devel/gmake \
diff --git a/cad/py-pyvcd/Makefile b/cad/py-pyvcd/Makefile
index e6e765f2a1f1..34618b853c66 100644
--- a/cad/py-pyvcd/Makefile
+++ b/cad/py-pyvcd/Makefile
@@ -12,7 +12,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
USES= python
diff --git a/cad/py-vunit-hdl/Makefile b/cad/py-vunit-hdl/Makefile
index c8d21eeede2a..5cc0468338c2 100644
--- a/cad/py-vunit-hdl/Makefile
+++ b/cad/py-vunit-hdl/Makefile
@@ -12,7 +12,8 @@ WWW= https://vunit.github.io/
LICENSE= MPL20
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PY_SETUPTOOLS} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ghdl:cad/ghdl
TEST_DEPENDS= pylint:devel/pylint@${PY_FLAVOR}
diff --git a/databases/py-aiomysql/Makefile b/databases/py-aiomysql/Makefile
index 1929c0965a4e..c854269cd417 100644
--- a/databases/py-aiomysql/Makefile
+++ b/databases/py-aiomysql/Makefile
@@ -12,7 +12,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.1:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=1.0:databases/py-pymysql@${PY_FLAVOR}
diff --git a/databases/py-apache-arrow/Makefile b/databases/py-apache-arrow/Makefile
index 9e0fa0ee0603..5c820ef3cf89 100644
--- a/databases/py-apache-arrow/Makefile
+++ b/databases/py-apache-arrow/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/../LICENSE.txt
BUILD_DEPENDS= cmake:devel/cmake-core \
${PYNUMPY} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY}
diff --git a/databases/py-fastparquet/Makefile b/databases/py-fastparquet/Makefile
index a5078b949752..762c42569856 100644
--- a/databases/py-fastparquet/Makefile
+++ b/databases/py-fastparquet/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.5.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.5.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
thrift:devel/thrift
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cramjam>=2.3:archivers/py-cramjam@${PY_FLAVOR} \
diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index 295f7ba4bbd7..0863510562e5 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING.rst
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.4:databases/py-sqlalchemy14@${PY_FLAVOR}
diff --git a/databases/py-pyarrow/Makefile b/databases/py-pyarrow/Makefile
index 591e2f497972..2404ba75f1b2 100644
--- a/databases/py-pyarrow/Makefile
+++ b/databases/py-pyarrow/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow \
cmake:devel/cmake-core \
${PYTHON_PKGNAMEPREFIX}numpy>=0.14,1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools>=40.1.0:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
LIB_DEPENDS= libarrow.so:databases/arrow
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6,1:math/py-numpy@${PY_FLAVOR}
diff --git a/databases/py-python-arango/Makefile b/databases/py-python-arango/Makefile
index a5e6eb057f1c..cf975478390f 100644
--- a/databases/py-python-arango/Makefile
+++ b/databases/py-python-arango/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests-toolbelt>0:www/py-requests-toolbelt@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.0:net/py-urllib3@${PY_FLAVOR}
BUILD_DEPENDS= ${PY_DEPENDS} \
diff --git a/databases/py-sqlglot/Makefile b/databases/py-sqlglot/Makefile
index dabec7f58674..0fbf1ba7f1df 100644
--- a/databases/py-sqlglot/Makefile
+++ b/databases/py-sqlglot/Makefile
@@ -11,7 +11,7 @@ WWW= https://github.com/tobymao/sqlglot
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent distutils
diff --git a/databases/py-tarantool/Makefile b/databases/py-tarantool/Makefile
index c3e588998b5d..63947b2683db 100644
--- a/databases/py-tarantool/Makefile
+++ b/databases/py-tarantool/Makefile
@@ -10,7 +10,7 @@ WWW= https://github.com/tarantool/tarantool-python
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.2:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4.2:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR}
diff --git a/databases/py-tiledb/Makefile b/databases/py-tiledb/Makefile
index bf652c8b7e22..b536bdad32f9 100644
--- a/databases/py-tiledb/Makefile
+++ b/databases/py-tiledb/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython>=0<3.0:lang/cython@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy>=1.23.2,1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pybind11210>=0<2.11.0:devel/py-pybind11210@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.5.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.5.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
tiledb>=2.20.0:databases/tiledb
LIB_DEPENDS= libtiledb.so:databases/tiledb
diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index e76dcfe0b0e4..5a69e393b26a 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -11,7 +11,8 @@ WWW= https://dosage.rocks/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PY_SETUPTOOLS} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index cd4a7d87d311..c5ad7e3b88d1 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -11,7 +11,7 @@ WWW= https://lostpackets.de/khal/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>1.12.0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${PY_FLAVOR} \
diff --git a/deskutils/py-khard/Makefile b/deskutils/py-khard/Makefile
index 634c76a586af..f4abc5ebbf18 100644
--- a/deskutils/py-khard/Makefile
+++ b/deskutils/py-khard/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${
${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.21:converters/py-unidecode@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}vobject>=0.9.5:deskutils/py-vobject@${PY_FLAVOR}
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sphinx-autoapi>0:textproc/py-sphinx-autoapi@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sphinx-autodoc-typehints>0:textproc/py-sphinx-autodoc-typehints@${PY_FLAVOR} \
diff --git a/deskutils/py-todoman/Makefile b/deskutils/py-todoman/Makefile
index fee233c1c8e0..b9c305bf900b 100644
--- a/deskutils/py-todoman/Makefile
+++ b/deskutils/py-todoman/Makefile
@@ -11,7 +11,7 @@ WWW= https://github.com/pimutils/todoman/
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENCE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>0:devel/py-atomicwrites@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}click-log>=0.2.1:devel/py-click-log@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}click>=7.1<9.0:devel/py-click@${PY_FLAVOR} \
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index b3a754737d9b..be0187138c91 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -11,7 +11,7 @@ WWW= https://vdirsyncer.readthedocs.org/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.10.1:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.0:www/py-aiohttp@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}aiostream>=0.4.5:www/py-aiostream@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
diff --git a/devel/Makefile b/devel/Makefile
index d317a981db28..23528ab469e2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -5635,11 +5635,11 @@
SUBDIR += py-setuptools-git-versioning
SUBDIR += py-setuptools-pkg
SUBDIR += py-setuptools-rust
+ SUBDIR += py-setuptools-scm
SUBDIR += py-setuptools44
SUBDIR += py-setuptools58
SUBDIR += py-setuptools_git_ls_files
SUBDIR += py-setuptools_hg
- SUBDIR += py-setuptools_scm
SUBDIR += py-setuptools_scm7
SUBDIR += py-setuptools_scm_git_archive
SUBDIR += py-sexpdata
diff --git a/devel/py-Automat/Makefile b/devel/py-Automat/Makefile
index 60eb232edb15..97c02e7e6f94 100644
--- a/devel/py-Automat/Makefile
+++ b/devel/py-Automat/Makefile
@@ -11,7 +11,7 @@ WWW= https://github.com/glyph/Automat
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
diff --git a/devel/py-PyGithub/Makefile b/devel/py-PyGithub/Makefile
index 7d5dcf6c892d..bfd0c2427678 100644
--- a/devel/py-PyGithub/Makefile
+++ b/devel/py-PyGithub/Makefile
@@ -13,7 +13,7 @@ LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
BUILD_DEPENDS= ${PY_SETUPTOOLS} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}deprecated>0:devel/py-deprecated@${PY_FLAVOR} \
diff --git a/devel/py-anyio/Makefile b/devel/py-anyio/Makefile
index 372b8ea82deb..9cbbb9f2c708 100644
--- a/devel/py-anyio/Makefile
+++ b/devel/py-anyio/Makefile
@@ -12,7 +12,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.8:dns/py-idna@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sniffio>=1.1:devel/py-sniffio@${PY_FLAVOR}
diff --git a/devel/py-anyio3/Makefile b/devel/py-anyio3/Makefile
index 2e08970bb08b..97a68cd36c15 100644
--- a/devel/py-anyio3/Makefile
+++ b/devel/py-anyio3/Makefile
@@ -13,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.8:dns/py-idna@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sniffio>=1.1:devel/py-sniffio@${PY_FLAVOR}
diff --git a/devel/py-apipkg/Makefile b/devel/py-apipkg/Makefile
index 5da4edde30ed..bebe15667f7e 100644
--- a/devel/py-apipkg/Makefile
+++ b/devel/py-apipkg/Makefile
@@ -11,7 +11,7 @@ WWW= https://bitbucket.org/hpk42/apipkg
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR}
NO_ARCH= yes
USES= python
diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile
index 815c5d721ccc..2fb9e7299100 100644
--- a/devel/py-apscheduler/Makefile
+++ b/devel/py-apscheduler/Makefile
@@ -12,7 +12,7 @@ WWW= https://pypi.org/project/APScheduler/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tzlocal>=4:devel/py-tzlocal@${PY_FLAVOR}
diff --git a/devel/py-argcomplete/Makefile b/devel/py-argcomplete/Makefile
index 95da076caa52..d09c20c4bd03 100644
--- a/devel/py-argcomplete/Makefile
+++ b/devel/py-argcomplete/Makefile
@@ -13,7 +13,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.rst
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.2:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
TEST_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
diff --git a/devel/py-asciimatics/Makefile b/devel/py-asciimatics/Makefile
index 2c21acb6eb61..880d741f59e5 100644
--- a/devel/py-asciimatics/Makefile
+++ b/devel/py-asciimatics/Makefile
@@ -11,7 +11,7 @@ WWW= https://github.com/peterbrittain/asciimatics
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}
diff --git a/devel/py-asteval/Makefile b/devel/py-asteval/Makefile
index cd6f435d19b2..83d0856b68b0 100644
--- a/devel/py-asteval/Makefile
+++ b/devel/py-asteval/Makefile
@@ -11,7 +11,7 @@ WWW= https://github.com/newville/asteval
LICENSE= MIT
LICENSE_FILES= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
RUN_DEPENDS= ${PYNUMPY}
diff --git a/devel/py-asttokens/Makefile b/devel/py-asttokens/Makefile
index ad1e14f3bda0..3c0270e74cd5 100644
--- a/devel/py-asttokens/Makefile
+++ b/devel/py-asttokens/Makefile
@@ -12,7 +12,7 @@ WWW= https://pypi.org/project/asttokens/ \
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=0:devel/py-astroid@${PY_FLAVOR}
diff --git a/devel/py-attrs-strict/Makefile b/devel/py-attrs-strict/Makefile
index ae5a84c43ad6..e7999cae0510 100644
--- a/devel/py-attrs-strict/Makefile
+++ b/devel/py-attrs-strict/Makefile
@@ -13,7 +13,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=58:devel/py-setuptools@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=22.2:devel/py-attrs@${PY_FLAVOR}
diff --git a/devel/py-b2sdk/Makefile b/devel/py-b2sdk/Makefile
index e20ad5e36518..3a68b942d39b 100644
--- a/devel/py-b2sdk/Makefile
+++ b/devel/py-b2sdk/Makefile
@@ -11,12 +11,12 @@ WWW= https://github.com/Backblaze/b2-sdk-python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR}
RUN_DEPENDS= ${PY_SETUPTOOLS} \
${PYTHON_PKGNAMEPREFIX}logfury>=1.0.1<2.0.0:devel/py-logfury@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}packaging>=21.0:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.9.1<3.0.0:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0<5.0.0:misc/py-tqdm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.7.1:devel/py-typing-extensions@${PY_FLAVOR}
*** 4026 LINES SKIPPED ***