summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.12.1.ebuild2
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.13.1.ebuild2
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.8.2.ebuild2
-rw-r--r--app-admin/ansible-lint/ansible-lint-6.9.1.ebuild2
-rw-r--r--app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild2
-rw-r--r--app-admin/ansible-molecule/ansible-molecule-4.0.4.ebuild2
-rw-r--r--app-admin/awscli/Manifest1
-rw-r--r--app-admin/awscli/awscli-1.27.83.ebuild80
-rw-r--r--app-backup/borgbackup/borgbackup-1.1.17-r1.ebuild2
-rw-r--r--app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild2
-rw-r--r--app-backup/borgbackup/borgbackup-1.2.2-r1.ebuild2
-rw-r--r--app-backup/borgbackup/borgbackup-1.2.3.ebuild2
-rw-r--r--app-backup/borgbackup/borgbackup-9999.ebuild2
-rw-r--r--app-backup/duplicity/duplicity-0.8.23-r1.ebuild2
-rw-r--r--app-backup/duplicity/duplicity-1.0.0-r1.ebuild2
-rw-r--r--app-backup/duplicity/duplicity-1.0.1-r1.ebuild2
-rw-r--r--app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild2
-rw-r--r--app-backup/rdiff-backup/rdiff-backup-2.2.2.ebuild2
-rw-r--r--app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild2
-rw-r--r--app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild2
-rw-r--r--app-emulation/protontricks/protontricks-1.10.1.ebuild2
-rw-r--r--app-misc/khal/khal-0.10.4-r1.ebuild2
-rw-r--r--app-misc/khal/khal-0.10.5.ebuild4
-rw-r--r--app-misc/khard/khard-0.17.0-r1.ebuild2
-rw-r--r--app-misc/khard/khard-0.17.0-r2.ebuild2
-rw-r--r--app-misc/khard/khard-0.18.0.ebuild2
-rw-r--r--app-misc/liquidctl/liquidctl-1.11.1.ebuild2
-rw-r--r--app-misc/liquidctl/liquidctl-1.12.1.ebuild2
-rw-r--r--dev-libs/libinput/libinput-1.22.1.ebuild2
-rw-r--r--dev-python/APScheduler/APScheduler-3.10.0.ebuild2
-rw-r--r--dev-python/APScheduler/APScheduler-3.9.1-r1.ebuild2
-rw-r--r--dev-python/APScheduler/APScheduler-3.9.1.ebuild2
-rw-r--r--dev-python/aesara/aesara-2.8.10.ebuild2
-rw-r--r--dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild2
-rw-r--r--dev-python/ansible-compat/ansible-compat-2.2.7.ebuild2
-rw-r--r--dev-python/ansible-compat/ansible-compat-3.0.1.ebuild2
-rw-r--r--dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild2
-rw-r--r--dev-python/asteval/asteval-0.9.28.ebuild2
-rw-r--r--dev-python/asteval/asteval-0.9.29.ebuild2
-rw-r--r--dev-python/astroid/astroid-2.13.2.ebuild2
-rw-r--r--dev-python/astroid/astroid-2.13.5.ebuild2
-rw-r--r--dev-python/astroid/astroid-2.14.1.ebuild2
-rw-r--r--dev-python/astroid/astroid-2.14.2.ebuild2
-rw-r--r--dev-python/asttokens/asttokens-2.2.1.ebuild2
-rw-r--r--dev-python/async-timeout/async-timeout-4.0.2-r1.ebuild2
-rw-r--r--dev-python/automat/automat-20.2.0-r1.ebuild2
-rw-r--r--dev-python/automat/automat-22.10.0.ebuild2
-rw-r--r--dev-python/awxkit/awxkit-21.11.0.ebuild2
-rw-r--r--dev-python/awxkit/awxkit-21.12.0.ebuild2
-rw-r--r--dev-python/boto3/Manifest1
-rw-r--r--dev-python/boto3/boto3-1.26.83.ebuild68
-rw-r--r--dev-python/botocore/Manifest1
-rw-r--r--dev-python/botocore/botocore-1.29.83.ebuild74
-rw-r--r--dev-python/cbor2/cbor2-5.4.6.ebuild2
-rw-r--r--dev-python/cheroot/cheroot-9.0.0.ebuild2
-rw-r--r--dev-python/cherrypy/cherrypy-18.8.0.ebuild2
-rw-r--r--dev-python/cmd2/cmd2-2.4.2.ebuild2
-rw-r--r--dev-python/cmd2/cmd2-2.4.3.ebuild2
-rw-r--r--dev-python/cryptography/Manifest2
-rw-r--r--dev-python/cryptography/cryptography-39.0.2.ebuild154
-rw-r--r--dev-python/cssutils/cssutils-2.6.0.ebuild2
-rw-r--r--dev-python/deepmerge/deepmerge-1.1.0.ebuild2
-rw-r--r--dev-python/defcon/defcon-0.10.2.ebuild2
-rw-r--r--dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild2
-rw-r--r--dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild2
-rw-r--r--dev-python/django-configurations/django-configurations-2.4.ebuild2
-rw-r--r--dev-python/doc8/doc8-1.1.1.ebuild2
-rw-r--r--dev-python/emcee/emcee-3.1.3.ebuild2
-rw-r--r--dev-python/emcee/emcee-3.1.4.ebuild2
-rw-r--r--dev-python/enrich/enrich-1.2.7-r1.ebuild2
-rw-r--r--dev-python/execnet/execnet-1.9.0-r1.ebuild2
-rw-r--r--dev-python/executing/executing-1.2.0.ebuild2
-rw-r--r--dev-python/flit_scm/flit_scm-1.7.0.ebuild2
-rw-r--r--dev-python/google-auth/Manifest1
-rw-r--r--dev-python/google-auth/google-auth-2.16.2.ebuild58
-rw-r--r--dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild2
-rw-r--r--dev-python/humanize/humanize-4.4.0.ebuild2
-rw-r--r--dev-python/humanize/humanize-4.5.0.ebuild2
-rw-r--r--dev-python/inflect/inflect-6.0.2.ebuild2
-rw-r--r--dev-python/ini2toml/ini2toml-0.11.3.ebuild2
-rw-r--r--dev-python/irc/irc-20.1.0.ebuild2
-rw-r--r--dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild2
-rw-r--r--dev-python/jaraco-collections/jaraco-collections-3.8.0.ebuild2
-rw-r--r--dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild2
-rw-r--r--dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild2
-rw-r--r--dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild2
-rw-r--r--dev-python/jaraco-path/jaraco-path-3.4.0.ebuild2
-rw-r--r--dev-python/jaraco-path/jaraco-path-3.4.1.ebuild2
-rw-r--r--dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild2
-rw-r--r--dev-python/jsonpickle/jsonpickle-3.0.1.ebuild2
-rw-r--r--dev-python/keyring/keyring-23.13.1-r1.ebuild2
-rw-r--r--dev-python/keyrings-alt/keyrings-alt-4.2.0.ebuild2
-rw-r--r--dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild2
-rw-r--r--dev-python/kiwisolver/kiwisolver-1.4.4.ebuild2
-rw-r--r--dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild2
-rw-r--r--dev-python/license-expression/license-expression-30.1.0.ebuild2
-rw-r--r--dev-python/lmfit/lmfit-1.1.0.ebuild2
-rw-r--r--dev-python/lz4/lz4-4.3.2.ebuild2
-rw-r--r--dev-python/makefun/makefun-1.15.0.ebuild2
-rw-r--r--dev-python/makefun/makefun-1.15.1.ebuild2
-rw-r--r--dev-python/matplotlib/matplotlib-3.5.3.ebuild2
-rw-r--r--dev-python/matplotlib/matplotlib-3.6.1.ebuild2
-rw-r--r--dev-python/matplotlib/matplotlib-3.6.2.ebuild2
-rw-r--r--dev-python/matplotlib/matplotlib-3.6.3.ebuild2
-rw-r--r--dev-python/matplotlib/matplotlib-3.7.0.ebuild2
-rw-r--r--dev-python/mdit-py-plugins/Manifest1
-rw-r--r--dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild34
-rw-r--r--dev-python/mkdocs-git-revision-date-localized-plugin/Manifest1
-rw-r--r--dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild63
-rw-r--r--dev-python/mkdocs-material/Manifest1
-rw-r--r--dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild53
-rw-r--r--dev-python/mpmath/mpmath-1.2.1.ebuild2
-rw-r--r--dev-python/myst-parser/Manifest1
-rw-r--r--dev-python/myst-parser/myst-parser-0.19.1.ebuild60
-rw-r--r--dev-python/natsort/Manifest1
-rw-r--r--dev-python/natsort/natsort-8.3.1.ebuild32
-rw-r--r--dev-python/openapi-core/Manifest1
-rw-r--r--dev-python/openapi-core/metadata.xml2
-rw-r--r--dev-python/openapi-core/openapi-core-0.16.6.ebuild68
-rw-r--r--dev-python/openstackdocstheme/Manifest1
-rw-r--r--dev-python/openstackdocstheme/metadata.xml2
-rw-r--r--dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild29
-rw-r--r--dev-python/path/path-16.6.0-r1.ebuild2
-rw-r--r--dev-python/picobox/picobox-2.2.0.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-6.2.6.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-6.2.7.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-6.2.8.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-6.2.9.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-7.0.0.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-7.1.0.ebuild2
-rw-r--r--dev-python/pikepdf/pikepdf-7.1.1.ebuild2
-rw-r--r--dev-python/pkgcraft/pkgcraft-0.0.3.ebuild2
-rw-r--r--dev-python/pkgcraft/pkgcraft-0.0.4.ebuild2
-rw-r--r--dev-python/pkgcraft/pkgcraft-0.0.5.ebuild2
-rw-r--r--dev-python/pkgcraft/pkgcraft-9999.ebuild2
-rw-r--r--dev-python/pluggy/pluggy-1.0.0-r2.ebuild2
-rw-r--r--dev-python/pooch/pooch-1.6.0.ebuild2
-rw-r--r--dev-python/pooch/pooch-1.7.0.ebuild2
-rw-r--r--dev-python/portend/portend-3.1.0.ebuild2
-rw-r--r--dev-python/prettytable/prettytable-3.3.0.ebuild2
-rw-r--r--dev-python/py/py-1.11.0-r1.ebuild2
-rw-r--r--dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild2
-rw-r--r--dev-python/pymediainfo/pymediainfo-6.0.1.ebuild2
-rw-r--r--dev-python/pyocr/pyocr-0.8.3.ebuild2
-rw-r--r--dev-python/pyroute2/pyroute2-0.7.3.ebuild2
-rw-r--r--dev-python/pyroute2/pyroute2-0.7.4.ebuild2
-rw-r--r--dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild2
-rw-r--r--dev-python/pytest-asyncio/pytest-asyncio-0.20.3.ebuild2
-rw-r--r--dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild2
-rw-r--r--dev-python/pytest-datadir/pytest-datadir-1.4.1.ebuild2
-rw-r--r--dev-python/pytest-django/pytest-django-4.5.2.ebuild2
-rw-r--r--dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild2
-rw-r--r--dev-python/pytest-forked/pytest-forked-1.6.0.ebuild2
-rw-r--r--dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29-r1.ebuild2
-rw-r--r--dev-python/pytest-metadata/pytest-metadata-2.0.4.ebuild2
-rw-r--r--dev-python/pytest-mock/pytest-mock-3.10.0.ebuild2
-rw-r--r--dev-python/pytest-plus/pytest-plus-0.4.0.ebuild2
-rw-r--r--dev-python/pytest-shell-utilities/pytest-shell-utilities-1.7.0.ebuild2
-rw-r--r--dev-python/pytest-skip-markers/pytest-skip-markers-1.4.0.ebuild2
-rw-r--r--dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild2
-rw-r--r--dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild2
-rw-r--r--dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild2
-rw-r--r--dev-python/pytest-xdist/pytest-xdist-3.1.0.ebuild2
-rw-r--r--dev-python/pytest-xdist/pytest-xdist-3.2.0.ebuild2
-rw-r--r--dev-python/pytest/pytest-7.2.1.ebuild2
-rw-r--r--dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild2
-rw-r--r--dev-python/python-varlink/python-varlink-31.0.0.ebuild2
-rw-r--r--dev-python/python-xlib/python-xlib-0.33.ebuild2
-rw-r--r--dev-python/quantities/quantities-0.14.0.ebuild2
-rw-r--r--dev-python/quantities/quantities-0.14.1.ebuild2
-rw-r--r--dev-python/rst-linker/rst-linker-2.3.1.ebuild2
-rw-r--r--dev-python/rst-linker/rst-linker-2.4.0.ebuild2
-rw-r--r--dev-python/serverfiles/serverfiles-0.3.1-r1.ebuild2
-rw-r--r--dev-python/setuptools-scm/Manifest (renamed from dev-python/setuptools_scm/Manifest)0
-rw-r--r--dev-python/setuptools-scm/metadata.xml (renamed from dev-python/setuptools_scm/metadata.xml)0
-rw-r--r--dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild (renamed from dev-python/setuptools_scm/setuptools_scm-7.1.0.ebuild)3
-rw-r--r--dev-python/setuptools/setuptools-65.7.0.ebuild2
-rw-r--r--dev-python/setuptools/setuptools-67.2.0-r1.ebuild2
-rw-r--r--dev-python/setuptools/setuptools-67.4.0.ebuild2
-rw-r--r--dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild2
-rw-r--r--dev-python/simpy/simpy-4.0.1-r1.ebuild2
-rw-r--r--dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild2
-rw-r--r--dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild2
-rw-r--r--dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild2
-rw-r--r--dev-python/tempora/tempora-5.2.1.ebuild2
-rw-r--r--dev-python/tenacity/tenacity-8.1.0.ebuild2
-rw-r--r--dev-python/tenacity/tenacity-8.2.0.ebuild2
-rw-r--r--dev-python/tenacity/tenacity-8.2.1.ebuild2
-rw-r--r--dev-python/tenacity/tenacity-8.2.2.ebuild2
-rw-r--r--dev-python/tldextract/tldextract-3.4.0.ebuild2
-rw-r--r--dev-python/tox/tox-3.28.0.ebuild2
-rw-r--r--dev-python/tpm2-pytss/tpm2-pytss-2.1.0.ebuild2
-rw-r--r--dev-python/tqdm/tqdm-4.64.1.ebuild2
-rw-r--r--dev-python/translate-toolkit/Manifest1
-rw-r--r--dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild98
-rw-r--r--dev-python/twine/twine-4.0.2.ebuild2
-rw-r--r--dev-python/typeguard/typeguard-2.13.3-r1.ebuild2
-rw-r--r--dev-python/ujson/ujson-5.7.0.ebuild2
-rw-r--r--dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild2
-rw-r--r--dev-python/vdirsyncer/vdirsyncer-0.19.0.ebuild2
-rw-r--r--dev-python/vdirsyncer/vdirsyncer-0.19.1.ebuild2
-rw-r--r--dev-python/virtualenv/virtualenv-20.17.1.ebuild2
-rw-r--r--dev-python/xarray/xarray-2022.12.0.ebuild2
-rw-r--r--dev-python/xarray/xarray-2023.1.0.ebuild2
-rw-r--r--dev-python/xarray/xarray-2023.2.0.ebuild2
-rw-r--r--dev-python/xmlsec/xmlsec-1.3.12-r1.ebuild2
-rw-r--r--dev-util/ebuildtester/ebuildtester-0.1.35.ebuild2
-rw-r--r--dev-util/ebuildtester/ebuildtester-0.1.37.ebuild2
-rw-r--r--dev-util/ebuildtester/ebuildtester-41.ebuild2
-rw-r--r--dev-util/ebuildtester/ebuildtester-42.ebuild2
-rw-r--r--dev-util/glslang/glslang-1.3.239.ebuild2
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.3.239.ebuild2
-rw-r--r--dev-util/spirv-tools/spirv-tools-1.3.239.ebuild2
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild2
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild2
-rw-r--r--eclass/distutils-r1.eclass6
-rw-r--r--media-libs/mesa/mesa-22.3.6.ebuild2
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild2
-rw-r--r--media-sound/whipper/whipper-0.10.0.ebuild2
-rw-r--r--media-sound/whipper/whipper-0.9.0.ebuild2
-rw-r--r--profiles/arch/hppa/package.use.stable.mask2
-rw-r--r--profiles/arch/s390/package.use.mask2
-rw-r--r--profiles/package.deprecated6
-rw-r--r--profiles/updates/1Q-20231
-rw-r--r--sci-libs/cartopy/cartopy-0.21.1.ebuild2
-rw-r--r--sys-fs/genfstab/metadata.xml4
-rw-r--r--sys-kernel/genkernel/genkernel-4.3.2.ebuild2
-rw-r--r--x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild2
-rw-r--r--x11-libs/cairo/cairo-1.17.6-r1.ebuild2
-rw-r--r--x11-libs/libX11/libX11-1.8.4.ebuild2
-rw-r--r--x11-libs/libdrm/libdrm-2.4.115.ebuild2
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild2
-rw-r--r--x11-misc/compose-tables/compose-tables-1.8.4.ebuild2
-rw-r--r--x11-misc/util-macros/util-macros-1.20.0.ebuild2
-rw-r--r--x11-terms/guake/guake-3.8.5-r1.ebuild2
-rw-r--r--x11-terms/guake/guake-3.9.0.ebuild2
-rw-r--r--x11-wm/qtile/qtile-0.21.0-r1.ebuild2
-rw-r--r--x11-wm/qtile/qtile-0.22.1-r1.ebuild2
-rw-r--r--x11-wm/qtile/qtile-0.22.1.ebuild2
-rw-r--r--x11-wm/qtile/qtile-9999.ebuild2
241 files changed, 1105 insertions, 218 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-admin/awscli/Manifest b/app-admin/awscli/Manifest
index efb25e2d523f..d4c9d39e86b7 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,3 +3,4 @@ DIST aws-cli-1.27.79.gh.tar.gz 2376690 BLAKE2B 8e55d3607b805ebc5673c682731483f0f
DIST aws-cli-1.27.80.gh.tar.gz 2377306 BLAKE2B 3a0e6c66bb9c373456bb05537f20ad339c0987290557c30dbd2e2a8ea127b0f8bfc7028930db712fcbe7461c7bc87dac123c1847da93b675403822f6c02b1d3f SHA512 b94aab2588e8bc0ad007e0392c6eed0642683246b1803007332563495a69deb5da924eda48944e37b674c714cf2e5a45aeddbbedb5d12d51ad8c9c8e76c18ebc
DIST aws-cli-1.27.81.gh.tar.gz 2377937 BLAKE2B 7323c06cab727066c6541772478a961bc4f7b409b0910e57c79207fad928b7ec82d1b0048983e64d8a8fa3e7ef69d1898cadf2fbd1ea560e05d7a2582e726f88 SHA512 19cff28cd4721df32079795cfab852a11b36f1a2d0335567f0f1dae48eaaf268ae04163dac960a2d543be869f39e8c55e6a0bcee746ccbab29bcf8f37881c305
DIST aws-cli-1.27.82.gh.tar.gz 2378047 BLAKE2B ca55c81431afeed336e01b7cb6840a05856d3e25f8c06a1169907fb3536aa45393f35995d1683bea3685e91d196b67bdeed487ba46e896f774caac0e63cbc9be SHA512 b760dd417a87e1804ef5bb7b4e8ca22ef750c75a63455fac7f17f564f8e591c459bfef225acb56a9a3b3ad1ac94458d4731fb4a56147a2a6fd59ec8113b2df41
+DIST aws-cli-1.27.83.gh.tar.gz 2378425 BLAKE2B 7784274aa3879b59b9ac51a0d687526261c27d4285ca279004e301b156e08bfc07f89b4584521093db0a3a9f42f47c7bca607c686763044f73495623a9e6f366 SHA512 e9748ada13533ab67249806fe09261634cdc2858bcc99b818a7ff5cb1dd2ce8f9c52f344fa7a5f19464d1500e91ff35b3e0a7ce4d2ac2adaecb939c4c9a2a70d
diff --git a/app-admin/awscli/awscli-1.27.83.ebuild b/app-admin/awscli/awscli-1.27.83.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.83.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+ https://github.com/aws/aws-cli/
+ https://pypi.org/project/awscli/
+"
+SRC_URI="
+ https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ !app-admin/awscli-bin
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # TODO
+ tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+ tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+ tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+ )
+
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
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-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild
index f66378b2bda6..efbd82131884 100644
--- a/dev-libs/libinput/libinput-1.22.1.ebuild
+++ b/dev-libs/libinput/libinput-1.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2
LICENSE="MIT"
SLOT="0/10"
if [[ $(ver_cut 3) -lt 900 ]] ; then
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
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/boto3/Manifest b/dev-python/boto3/Manifest
index 78f40df0f997..5bb2da4e4e06 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,3 +3,4 @@ DIST boto3-1.26.79.gh.tar.gz 605312 BLAKE2B c36b86ab289be9c08a1ab43274a4f4db71ce
DIST boto3-1.26.80.gh.tar.gz 606204 BLAKE2B ae80c1ec7e99f48844c4eec39df1f6802df1fbbf2d94f1b7ddc04c7a21cb885823ebadb11cf9e81b51af9aa5f09775c02e52e926b94c49331307873b86702446 SHA512 e4ab89f2afe506d7d1ba9e1615e3a92ba4bf5dc9a85d3a14f034c1b14733d99cebf594bb6dc80914bf444da34d09c045c8933cf3c97e6ccfa9e31901e99d76ee
DIST boto3-1.26.81.gh.tar.gz 611431 BLAKE2B e3f607e4bbd4ae7002168a697c6c3081b3713acbf7d7c8abdb1016b63f9ac5b16ae44255f707272db6a7b4c657210af0ed1c355889b01434683889b28de9d4e7 SHA512 30faa2d60f5f661e4d56a57c5b9d258ad3de260be2a21723b921f2383e290ca0b3d417a4a970ba3defd8f8196deaade2741117393c664b5fe267deab2e210e06
DIST boto3-1.26.82.gh.tar.gz 611850 BLAKE2B fbf4581d616c6978482689e42a5cf8dc846ef91c77bd9f94298bed1ec50cdf41bc999ee81a1dd43b697da282f2774133daf6c6789d7d78b78aeb272c42f91f56 SHA512 8dc96da11d6da19610810c850c69070d25629e583f4eda822c218f4ad09295d25d3ae689a321c6a0c5f0c27e34717c44eb708950b4f37fe1d27f1f48205e5870
+DIST boto3-1.26.83.gh.tar.gz 612532 BLAKE2B 2cbb1bdb45fcb594c981df7850bc5d2a50d381a34d995b604edb55787dac8e85e83f9588960b555ddb92672e1564b4287c4fa6998754dcc204942673f3c686d1 SHA512 467c3eeb7f6ad5a863704498109a355cd789b69d43752fc694c78e67a7953c08f42cbe90a442978dfee08ab032f5b562dc84014c0cb02ec607d6f4b299e0246f
diff --git a/dev-python/boto3/boto3-1.26.83.ebuild b/dev-python/boto3/boto3-1.26.83.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.83.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+ https://github.com/boto/boto3/
+ https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="
+ https://github.com/boto/boto3/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7ab0f57581b8..e45d3fb25f25 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,3 +3,4 @@ DIST botocore-1.29.79.gh.tar.gz 11184048 BLAKE2B 062326a477fb27844ec47af28b77424
DIST botocore-1.29.80.gh.tar.gz 11197756 BLAKE2B 62f70c71f6b5892ff4daaede65389c75a159ebc29da69b2b2f9b59fabcf1818d91b968cbb04f48acce8310f34b96dbb30189c1fdc609e124202a6743d5b3e65a SHA512 27f31ba27448c5ea3214dcd585d60901761f6cd26e384a861aa377842dd3561f293c261a6a3fd91e78cc3ea75f48b9369e77f4a8d1a4b4dd08fbdde9335ee5a8
DIST botocore-1.29.81.gh.tar.gz 11211684 BLAKE2B c89f683ab6fd238f975af4a30eea6191d1a6c2a8cf5ec1ac640a34de801bc289545dc2a98e9a76824afdb650b9d173751b23af3a3f3e9438f8cd1cdeb0fb64e3 SHA512 91b0d34652f68a3f41e768ff35d342c50868fb9e6f9da2b97a64cf08cac03e959395ac499b9fea7cf5997273700b06499f0d870661b9104709fead4a87c0a1ee
DIST botocore-1.29.82.gh.tar.gz 11213502 BLAKE2B 8038e8a97e7c8795b9f273e6d7a87f42d764c7996ebc9c6ba831720db9104ead2e11b8a30e660b1112ca2e5ce2582f7135b0db79c56bf6c615f9a7e242b9ef8e SHA512 4492b8bed66736f446e3dd76bf0bde56e2402093630f38246941d17e388f62ca2d0e069b08c7a39cd12e719d062c85c0981636b72362118a8d689581e492ad06
+DIST botocore-1.29.83.gh.tar.gz 11216449 BLAKE2B a1eaa0710317c257291045fb1514ffaaff07f5ce8e8c37652e60658020273cb5ff4ec1af15a678b0f0249def13e793ee6ed4e8902ce8af4c6b6a48c2767703a7 SHA512 acaabf7c225fa5ae9b3428bdad3a28ffb41ff5a2b637b52c7a1829de0c50ed2d99118d77abcef9e333ffb25de09c5e37a9b817739512dafa8e75ca370a956cc1
diff --git a/dev-python/botocore/botocore-1.29.83.ebuild b/dev-python/botocore/botocore-1.29.83.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.83.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+ https://github.com/boto/botocore/
+ https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="
+ https://github.com/boto/botocore/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ <dev-python/jmespath-2[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+
+ # unbundle deps
+ rm -r botocore/vendored || die
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # rely on bundled six
+ tests/functional/test_six_imports.py::test_no_bare_six_imports
+ tests/functional/test_six_threading.py::test_six_thread_safety
+ # fails on unrelated warnings
+ tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+ tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+ # TODO
+ tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+ )
+
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
index 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/cryptography/Manifest b/dev-python/cryptography/Manifest
index 9c150841933a..e6dfb42dbfef 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -18,8 +18,10 @@ DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7
DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
DIST cryptography-38.0.4.tar.gz 599786 BLAKE2B cd6ef7e671dfdf36a5b9ee253307bf069e4c87d5a3a0110cff70f50c17cbe99997d7c9e78678b26a59e7f781076c53934be1d37c52605953c06913cbe2faa3cc SHA512 2dcf3cb8208a5905b930482ce87ac56b77fda0eb02387492f0d6be9df67dc5967c93ec9a2127f83dbea1a9a3d39f1adc98497b020ad654d4afdeb67d2323afa9
DIST cryptography-39.0.1.tar.gz 603634 BLAKE2B 20247ec0fd933b8541712169feced6247ad6fd708af78b06c4bb633631a2160473a818a3c5e545243f3dea3b254ae63055b05e226eb8e1348413b5a883236ded SHA512 a7df2cc73309b6902a2743273e41c7bec8e0dd0c8160b24edf6554089ca8d160cde7d9007cf45751cb52823c2a6f4a3c437a447292f6e8c06db547d519e98b94
+DIST cryptography-39.0.2.tar.gz 604277 BLAKE2B 3b70b13b85b05709c5aac5fd429c592a1af45022027adb9fc797c938928bdb47169136ab7dac3ec47544ee901a95f0fe5b8c913b4a7fa948b0fd40b9ca90a9a6 SHA512 10184814f262f2d5f505abf4dcb73eb0de59aadca2e228b2bacf6e03eb124efdc9504e752976fcb58f2ee673dc84230180873c28b85cd18e1831ab3c44022c01
DIST cryptography_vectors-38.0.4.tar.gz 35273825 BLAKE2B 8bd39caeaa6c1d90320def07e4855995d15cfcf7a422b7491765efc5e88ddbfcfea5c27ed52a48c1ae10f041d8129ef40720fb7b45b26e576230596fcc23f4e1 SHA512 04972f13ff0217e1d8827381fafeb5071f3009d34378e60805ef1f05fefd850a0904a60caef4fc95ce396de01925a3e42443db174508627ed010ef839e97c644
DIST cryptography_vectors-39.0.1.tar.gz 35275870 BLAKE2B 28e064e0f42ebb7b7af6db65bd506d4047d1087b63199eedaadd346c218b0cd24a16c8b97fc39b3325224026bfd4b2214bb53a5564495acab1297067a52e0649 SHA512 b06585c4ed1fc360165a8801509507a0a546da42cbca80703a173aa55d34f1f9790fc2763c7aef274f479248c57a2e86a56bc098ffb49532cb59132c139eb8af
+DIST cryptography_vectors-39.0.2.tar.gz 35275866 BLAKE2B f2b7d969f53ed571041de77016a679ac1b71baa980ec081c5ebc2cb756c373cab7035152a166b875a74afd450f7622f0e526e1563f4c6b02c16508933dd6bd52 SHA512 aff9842ac92be1815e34de0a61e65c7693667047db40ed67234a2a35eb8d91e6fea3ccf2e820d72ed57cebf03f00ba0a53f22710a0cc9d625f4596d8ee172109
DIST cxx-1.0.85.crate 589916 BLAKE2B 3be165b6d8c5ccaa7e5ec3d456c1bc2aeb95e2dc7890feb1ebeb2d25b2887b1b023afdccda08862a13928a8f379200c46fcaf88ecc111d9dbb3bbc5dde63f88d SHA512 bf9386f58ea007bcc7171af713e944459a6b219ddbe88813f16df5e274ab85418be23dd7bdaee7964108e9a4a1698365de67362d5504c80bee726f1151166f5c
DIST cxx-build-1.0.85.crate 84820 BLAKE2B 6dd01e251776f33cbb11b4ef6a9d77db7c476e6184f942d0a5fca5505c5fc2463bc03edcf8f08597238898b92df1c53ba330e9c3b4e63a106136445fcf202584 SHA512 3ef75dc28bed9c1c9cea5dbd7b396f8e88a5fe288e19d1aa1f96add32830236b2414fe33ed7b06566759298cf0130d6b82d2049ba9bf362c95413ce8481f2bf2
DIST cxxbridge-flags-1.0.85.crate 5635 BLAKE2B 5d365e5a6e2ef5bdde5f223f5ab726e0667aedcecdc2a2f1ec961d9c199c291dfcf94ed4ca6a2ea9056073c8519839cad7d5b49f7c8022bf96b96186f19874a2 SHA512 186a08d40469bfc8fcf801bd766e89e72d160a7b28ce465b3e8a39b4f38d7c17bc373e9bd8f5e50c758be7755ac450d532aa88c7c20d908c3905106bd8cac05c
diff --git a/dev-python/cryptography/cryptography-39.0.2.ebuild b/dev-python/cryptography/cryptography-39.0.2.ebuild
new file mode 100644
index 000000000000..b5f36d2fb324
--- /dev/null
+++ b/dev-python/cryptography/cryptography-39.0.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+ Inflector-0.11.4
+ aliasable-0.1.3
+ android_system_properties-0.1.5
+ asn1-0.13.0
+ asn1_derive-0.13.0
+ autocfg-1.1.0
+ base64-0.13.1
+ bitflags-1.3.2
+ bumpalo-3.10.0
+ cc-1.0.78
+ cfg-if-1.0.0
+ chrono-0.4.23
+ codespan-reporting-0.11.1
+ core-foundation-sys-0.8.3
+ cxx-1.0.85
+ cxx-build-1.0.85
+ cxxbridge-flags-1.0.85
+ cxxbridge-macro-1.0.85
+ iana-time-zone-0.1.53
+ iana-time-zone-haiku-0.1.1
+ indoc-0.3.6
+ indoc-impl-0.3.6
+ instant-0.1.12
+ js-sys-0.3.60
+ libc-0.2.139
+ link-cplusplus-1.0.8
+ lock_api-0.4.9
+ log-0.4.17
+ num-integer-0.1.45
+ num-traits-0.2.15
+ once_cell-1.14.0
+ ouroboros-0.15.5
+ ouroboros_macro-0.15.5
+ parking_lot-0.11.2
+ parking_lot_core-0.8.6
+ paste-0.1.18
+ paste-impl-0.1.18
+ pem-1.1.0
+ proc-macro-error-1.0.4
+ proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.20+deprecated
+ proc-macro2-1.0.49
+ pyo3-0.15.2
+ pyo3-build-config-0.15.2
+ pyo3-macros-0.15.2
+ pyo3-macros-backend-0.15.2
+ quote-1.0.23
+ redox_syscall-0.2.16
+ scopeguard-1.1.0
+ scratch-1.0.3
+ smallvec-1.10.0
+ syn-1.0.107
+ termcolor-1.1.3
+ unicode-ident-1.0.6
+ unicode-width-0.1.10
+ unindent-0.1.11
+ version_check-0.9.4
+ wasm-bindgen-0.2.83
+ wasm-bindgen-backend-0.2.83
+ wasm-bindgen-macro-0.2.83
+ wasm-bindgen-macro-support-0.2.83
+ wasm-bindgen-shared-0.2.83
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing pypi
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+ https://github.com/pyca/cryptography/
+ https://pypi.org/project/cryptography/
+"
+SRC_URI+="
+ $(cargo_crate_uris ${CRATES})
+ test? (
+ $(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)")
+ )
+"
+
+LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2o-r6:0=
+ $(python_gen_cond_dep '
+ >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+ ' 'python*')
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ dev-python/setuptools-rust[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ dev-python/pytest-subtests[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+ cargo_src_unpack
+}
+
+src_prepare() {
+ sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+ default
+
+ # work around availability macros not supported in GCC (yet)
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local darwinok=0
+ if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+ darwinok=1
+ fi
+ sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+ src/_cffi_src/openssl/src/osrandom_engine.c || die
+ fi
+}
+
+python_test() {
+ local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+ local EPYTEST_IGNORE=(
+ tests/bench
+ )
+ epytest -n "$(makeopts_jobs)"
+}
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/google-auth/Manifest b/dev-python/google-auth/Manifest
index 99cc16d004ab..3b7ef23b9403 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,2 +1,3 @@
DIST google-auth-2.16.0.tar.gz 223336 BLAKE2B 9dbd54bdf072dacdf728f6fc34931f153dd409e3e1b92e37ed652a1db39d5380b7e66bd196cb1192f75234b2317518a443f8f515bc9135f553e6c9f1116fc606 SHA512 dbeff00089a410c6702e2bd704968c7392809dc217b3f511b62429a11649e4b0607a41622d2753bed9e511368b1c32086b23df66ec915e07a1dd4f32471e025d
DIST google-auth-2.16.1.tar.gz 221594 BLAKE2B d220bbd22e560f291566ed533c8f3f8961f611bb65410b2ed56a9d9745f1a269a46df7f9075565958a919266450e1702c808eb4fc12680b74790983f8897713a SHA512 87e648832cd88d789334e59ea05545dd567ff7cf5d65d5dd2c209277716b6a77e92e082e9db91df208f1372a010ef1d6830ff77dbdf77d0fda2b649da39bcdd9
+DIST google-auth-2.16.2.tar.gz 221392 BLAKE2B 858ec2d01b7c8e573ddc310a17d634bd63032f469eb47b0fe5fd3c4bcdb5e3388380fba671958734e1b406ff19c9f8d5b70d8e25587e2e813e1300b27329dab4 SHA512 5686846fbd299e8d331a2132a1f2847febb68f06e460aed987ff12efa3a629c274f6b9dcae53b8b3d9075bb590e5e265eb11b9d6eb3861d4230f91f0bfea84f1
diff --git a/dev-python/google-auth/google-auth-2.16.2.ebuild b/dev-python/google-auth/google-auth-2.16.2.ebuild
new file mode 100644
index 000000000000..5faba10d7363
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.16.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+ https://github.com/googleapis/google-auth-library-python/
+ https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ <dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ !dev-python/namespace-google
+"
+BDEPEND="
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/grpcio[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/moto[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ dev-python/pyu2f[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+ # these are compatibility tests with oauth2client
+ # disable them to unblock removal of that package
+ tests/test__oauth2client.py
+)
+
+python_compile() {
+ distutils-r1_python_compile
+ find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
index 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/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 470ea8f2f7fb..93a6bb4664e4 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,2 +1,3 @@
DIST mdit-py-plugins-0.3.3.gh.tar.gz 57366 BLAKE2B 60b53c6aa404a22296da122b6528491fa7dc52c4b485dea1b0c26c486cd04bf495948e03c40d54ac9d436431ab1154f51af90c84762f96d87984b74718a736a9 SHA512 a32a4a7004368af924c0876106e10a55a2f361a18db127a45080779bc39fb709ca274febbb4c4d5e872357e99bd8161e6c760783793516011da5f963368fa637
DIST mdit-py-plugins-0.3.4.gh.tar.gz 59538 BLAKE2B 7046c2b8b5b117612a71c1a4894c7e3e49a161b5375fde13ec61c4a00c2bf5824505cb5639b70a3c58d7c9629e68bf794c950b5a28470392487965cd94f3e9a9 SHA512 e36b0ee0aca95d60c27a577e1c4bde9832d633ca84fb740f16a37dd63ece0a77005f8e3d03360ed0c92de57d3f656a8f76ab76642d8da3e5ac1d65384ee18d84
+DIST mdit-py-plugins-0.3.5.gh.tar.gz 59757 BLAKE2B bad78ec811d238bafd83c9d1bbd6e0bcac3b70cd87f52b215966e836d4c2a35715804fa1c7d3671de81713c4e169ad4bb6d9dcdf741f617544772d06f8e3ae56 SHA512 6cb153d8ccff8fa3f94731606ad5dd1c06954d95519ac77b6de477e04b878f84fb059052906bdea5d798be3de49733a909cb553107255a61cde6dd1c6c72d4d2
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
new file mode 100644
index 000000000000..9dcd74e0c13e
--- /dev/null
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of plugins for markdown-it-py"
+HOMEPAGE="
+ https://pypi.org/project/mdit-py-plugins/
+ https://github.com/executablebooks/mdit-py-plugins/
+"
+SRC_URI="
+ https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ dev-python/markdown-it-py[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-regressions[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 80c05789b155..899e3d8835fc 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1 +1,2 @@
DIST mkdocs-git-revision-date-localized-plugin-1.1.0.gh.tar.gz 375907 BLAKE2B d39f1d807616da95962cca6bdc5a4501163d008f0a8fcac5df2e7542bf8401d04362a38383558689f467c9249f2ad6dff636a8ebf4568aa920ea0078f90fb367 SHA512 f5f911cba9b9e3747c5628e4c947a87fa07c798f854b6ed8783b74c732cf29e4afdacb37e074a5d04672d90f96de560ab6b86cd3d826ce46226d73f48c54c27d
+DIST mkdocs-git-revision-date-localized-plugin-1.2.0.gh.tar.gz 378268 BLAKE2B ee4270e60a23b4c040de1b931c1d18f785d95b1947facd66d0b9180452dd30fee518fcdf24840b6523ee4944cf363ebbf9a27c93b09f45cc09daf277d4fd7085 SHA512 627c1b6c955f8c787ac01e9be5827648a8c9bbd1f9449c8a734f47fc83d28e3eba5faad142f69da12291c4ac3f728ae2c090e9b8e0a84b585557977a9fe04241
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
new file mode 100644
index 000000000000..fe90f4d520d0
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ dev-python/regex
+ dev-python/mkdocs-i18n
+ dev-python/mkdocs-material
+ dev-python/mkdocs-git-authors-plugin
+ dev-python/mkdocs-git-revision-date-localized-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+ https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="
+ https://github.com/timvink/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+ dev-python/GitPython[${PYTHON_USEDEP}]
+ >=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/click[${PYTHON_USEDEP}]
+ dev-python/mkdocs-material[${PYTHON_USEDEP}]
+ dev-python/mkdocs-i18n[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )
+ doc? ( dev-vcs/git )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # mkdocs-git-revision-date-localized-plugin's tests need git repo
+ if use test || use doc; then
+ git init -q || die
+ git config --global user.email "you@example.com" || die
+ git config --global user.name "Your Name" || die
+ git add . || die
+ git commit -qm 'init' || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 6fc1a46de4ea..8b3befdd71e3 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -3,3 +3,4 @@ DIST mkdocs-material-9.0.12.gh.tar.gz 10929135 BLAKE2B 2b8468790c38e40a35b7fd4ff
DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2cd51cd2c06921beccecb8f76c67f177a72568698056151fb20ee5141df0d6cdeee75192d7a7fc4dc85511501f4d2c8dfe5a3e1c SHA512 cc2abaab0727376ff3b3f3d3099c57f601243520c644dcc48b0c6d671ae543a8b65e8161fa8e4d1199671652a54e14969a7c2470985b0570e63763cf88d63704
DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
+DIST mkdocs-material-9.1.0.gh.tar.gz 10868677 BLAKE2B b51fa6e78f087c74a6e2d38d56645492758af0ab2dee16427eb5628c4c3617b3b00b9a2f2ca04c687b98838551873c596b7dffa79cb888ca93f96f05a11f9990 SHA512 1ca7a8250732d737d6e0940243f0d835002736c2eadb5eb0eb1f58fe061d9a277ccd5e99ac3766642c464596d2ce31e445dfa02251b1db0dc1a4adcdbfc90db3
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild
new file mode 100644
index 000000000000..eedc60f73616
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+ dev-python/mkdocs-material-extensions
+ dev-python/mkdocs-minify-plugin
+ dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+ https://github.com/squidfunk/mkdocs-material/
+ https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+ https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+
+RDEPEND="
+ >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+ >=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+ >=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+ >=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+ # simplify pyproject to remove extra deps for metadata
+ "${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+ echo "__version__ = '${PV}'" > gentoo_version.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
index 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/myst-parser/Manifest b/dev-python/myst-parser/Manifest
index 1a6c205ba923..7fd007508ff0 100644
--- a/dev-python/myst-parser/Manifest
+++ b/dev-python/myst-parser/Manifest
@@ -1,2 +1,3 @@
DIST MyST-Parser-0.18.1.gh.tar.gz 769288 BLAKE2B 77f21ae4277ef4ed9020caad86ef3ea92a1efca35f7ab61203fe2125e4fab31a74a740db7a1f1d6ea0a576c24706b0997beea296d782eb5a07ba4e91a0a9e52d SHA512 4bc3a89480f175779da4f093aaa99a1516f76ab4107dcf8747b6614f347e91739f8596693f95529d76aedbb0c84b4efde4262517bc445aa7027d51e05e8b48bc
DIST MyST-Parser-0.19.0.gh.tar.gz 812180 BLAKE2B 44dd773dfcbd8c01b3089303e81b103ce3eba2432b1891b4fb35b8bbd9c0088b3245e6afe14c6378a262cdd4e7930da16ddc7ab6abb3a06779d4d0bd9e9ebd53 SHA512 3b646b78032914b42ab655d5f653f38fb58e4c51814fca0f987c8207f6fb97db6f3ba6b9951b3ecdf98430800b2a198cc2b26f17162b5b57309bfe74de3f4450
+DIST MyST-Parser-0.19.1.gh.tar.gz 812247 BLAKE2B 24a3502d2b9f81ec066c8fc5055b59448938fda63e74b47810e16cb2ce57b17fab1e219469df6e57fd1343453012855f104806e05e0831166af3506adc8589f5 SHA512 abe57048a9c19cfa08bb11c2ab988ebe462b4a104ffe3fc3b9083e2563da0bda271b5b1e278ac94e1d328bb70f5aeb20e72f81fc428fbb79dd6fb695abfd01cb
diff --git a/dev-python/myst-parser/myst-parser-0.19.1.ebuild b/dev-python/myst-parser/myst-parser-0.19.1.ebuild
new file mode 100644
index 000000000000..c578ea90b4a1
--- /dev/null
+++ b/dev-python/myst-parser/myst-parser-0.19.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=MyST-Parser-${PV}
+DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx"
+HOMEPAGE="
+ https://github.com/executablebooks/MyST-Parser/
+ https://pypi.org/project/myst-parser/
+"
+SRC_URI="
+ https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+ <dev-python/docutils-0.20[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markdown-it-py[${PYTHON_USEDEP}]
+ >=dev-python/mdit-py-plugins-0.3.4[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ <dev-python/sphinx-7[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+ dev-python/pytest-regressions[${PYTHON_USEDEP}]
+ dev-python/pytest-param-files[${PYTHON_USEDEP}]
+ dev-python/sphinx-pytest[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # Unimportant tests needing a new dep linkify
+ tests/test_renderers/test_myst_config.py::test_cmdline
+ tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
+ )
+
+ [[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+ # bad test relying on exact exception messages
+ "tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
+ )
+
+ epytest
+}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index d8602650e030..6474a013c2e1 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,2 +1,3 @@
DIST natsort-8.2.0.tar.gz 145643 BLAKE2B d101ae2fa1cb009892e9712ece87d3825f3fca7970475e46176e5acbc29481ac79d491f1bae0721d85d3e67ecf39e5f54e2a984f0398356f32a5f0ec18a3e98d SHA512 d7e35c48ee36e69812c26b2cd333c57f1ec70c54017c4f51ed06dbb7619afc11cd1d589035faee700e1adf1e6b759b43ee497685fc88518be62c41957e15884e
DIST natsort-8.3.0.tar.gz 123448 BLAKE2B 7fd480c8bfaceaca7431716e7721acac89d4a5c87a951ecf2754d80062437776eee823d7b94c58e2b9bc6864d9c0f595ee8667c538609c296694a548c126ab58 SHA512 63a65a99c9475e8ae96d722ae4c093cc73034c0dfdd254b24ae02904dd81cc8be36038c8a3fc514080f436d4124847f0f331d06a87c435f0b7b7d1d72313ae0d
+DIST natsort-8.3.1.tar.gz 123736 BLAKE2B 3ad4d8884b463fa792f7930f6d92dda146c96cd929a58a1d418c59f8b3c5fc06329e2cf0341963c820fb8d2fc67b287ce69083a2cba9f20bd8abc06c0fca6a44 SHA512 98ee9bfed9307487b9ae9ced5ce723b6840c6f882d06702f205986430572b767f3ac0930ffdf0663d99256f6feed704394b2b7e11f4b01f4f0241cd8639df622
diff --git a/dev-python/natsort/natsort-8.3.1.ebuild b/dev-python/natsort/natsort-8.3.1.ebuild
new file mode 100644
index 000000000000..5b947e1cf1a3
--- /dev/null
+++ b/dev-python/natsort/natsort-8.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="
+ https://github.com/SethMMorton/natsort/
+ https://pypi.org/project/natsort/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+ test? (
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature "sorting results that match most file browsers" "dev-python/pyicu"
+}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 701dc5043af0..a361adf97f70 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1 +1,2 @@
DIST openapi-core-0.16.5.gh.tar.gz 104046 BLAKE2B 7dcda69b6d548a0df8c7727b184c7f7ec6d645e14ab4b4a256f188c6cc4ae9e351bc06ae03770782d81a11dfb5ebc08c20daabbd2151cfe62f84b05f80a47a16 SHA512 59db6d39a950079739b2df4114f26d85be55dc1f42d1661e8e6c17cf878cd8167f29ba4d3b6f40e06e85bb144c68286cb50adf4403091461798144cac05d5bc0
+DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
diff --git a/dev-python/openapi-core/metadata.xml b/dev-python/openapi-core/metadata.xml
index 13f408253cd2..b58a890a8a64 100644
--- a/dev-python/openapi-core/metadata.xml
+++ b/dev-python/openapi-core/metadata.xml
@@ -5,7 +5,7 @@
<email>python@gentoo.org</email>
</maintainer>
<upstream>
- <remote-id type="github">p1c2u/openapi-core</remote-id>
+ <remote-id type="github">python-openapi/openapi-core</remote-id>
<remote-id type="pypi">openapi-core</remote-id>
</upstream>
<stabilize-allarches/>
diff --git a/dev-python/openapi-core/openapi-core-0.16.6.ebuild b/dev-python/openapi-core/openapi-core-0.16.6.ebuild
new file mode 100644
index 000000000000..34f3bb300c13
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.16.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+ https://github.com/python-openapi/openapi-core/
+ https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+ https://github.com/python-openapi/openapi-core/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
+ dev-python/isodate[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+ dev-python/more-itertools[${PYTHON_USEDEP}]
+ dev-python/parse[${PYTHON_USEDEP}]
+ <dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+ >=dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
+ <dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+ >=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ test? (
+ dev-python/asgiref[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ >=dev-python/starlette-0.21.0[${PYTHON_USEDEP}]
+ dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+ dev-python/webob[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+ # falcon is not packaged
+ tests/integration/contrib/falcon
+
+ # TODO: these tests fail to collect
+ tests/integration/validation/test_security_override.py
+ tests/integration/validation/test_read_only_write_only.py
+
+ # unhappy about modern django
+ tests/integration/contrib/django/test_django_project.py
+ tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+ sed -i -e '/--cov/d' pyproject.toml || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 532d261dd086..dd09fd482c7c 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1 +1,2 @@
DIST openstackdocstheme-3.0.1.tar.gz 1256111 BLAKE2B c0a1a68e8e0e423bc704503dc2214d9cb51aa236daf39ba6788ef95240c25c05d1bd8b7ce2cb3d7c7290e574f3c78b276a28afe5a92645dce6f1b3ad54109158 SHA512 3643e5fc7a6e7090e766d8e0c71f6f3dfe32ac2529b3f70a7b0e825765be92dad58a2f399d8993716c9c87f0781a117b602f090abc0f3905e0586a26c87fe449
+DIST openstackdocstheme-3.1.0.tar.gz 1256193 BLAKE2B 53bdd85094a74344154dd4a25f2d29142be12000f5b38c8d723ce800794677972215b6402d35fe9385ede246efd4111d457ccb2d04eb540fcbaea5cf92382c04 SHA512 654859f40779e1d285b08b12c040b016a066a62e0a6eacad3c5a271ee40ba1147650ca1b95ac68a4fe254a296948f3ae30803cd26f9f67f1be944683fe24445b
diff --git a/dev-python/openstackdocstheme/metadata.xml b/dev-python/openstackdocstheme/metadata.xml
index d6e2ced15d08..46674f796d5e 100644
--- a/dev-python/openstackdocstheme/metadata.xml
+++ b/dev-python/openstackdocstheme/metadata.xml
@@ -15,6 +15,6 @@
<upstream>
<remote-id type="pypi">openstackdocstheme</remote-id>
<remote-id type="github">openstack/openstackdocstheme</remote-id>
- <doc>https://docs.openstack.org/openstackdocstheme/</doc>
+ <doc>https://docs.openstack.org/openstackdocstheme/latest/</doc>
</upstream>
</pkgmetadata>
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
new file mode 100644
index 000000000000..b0bb11bcdcdb
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="
+ https://docs.openstack.org/openstackdocstheme/latest/
+ https://opendev.org/openstack/openstackdocstheme/
+ https://github.com/openstack/openstackdocstheme/
+ https://pypi.org/project/openstackdocstheme/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+
+BDEPEND="
+ >dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ ${BDEPEND}
+ >=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/path/path-16.6.0-r1.ebuild b/dev-python/path/path-16.6.0-r1.ebuild
index 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
index 1098d86add27..1098d86add27 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools-scm/Manifest
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools-scm/metadata.xml
index c5b76d75363f..c5b76d75363f 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools-scm/metadata.xml
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.1.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
index b4b66d2a3ea1..87fa9e5896d7 100644
--- a/dev-python/setuptools_scm/setuptools_scm-7.1.0.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
@@ -7,14 +7,13 @@ EAPI=7
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1
+inherit distutils-r1 pypi
DESCRIPTION="Manage versions by scm tags via setuptools"
HOMEPAGE="
https://github.com/pypa/setuptools_scm/
https://pypi.org/project/setuptools-scm/
"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/setuptools/setuptools-65.7.0.ebuild b/dev-python/setuptools/setuptools-65.7.0.ebuild
index 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/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 46ebc6bb33f0..6243a31212cc 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,2 +1,3 @@
DIST translate-3.8.3.gh.tar.gz 1157587 BLAKE2B 4dc8ca9cb7f0040364ceeb6fae47d9189642e8383fb1c808713aeb82452690ffe5957c63d649994eae486efaa51aee664fa7b0bb199036d869a87d7a0bf21806 SHA512 ad5a814cc03ed0d41aeac60bea72133fcd47470ab254849647d674bc00b71f2afe1c0956891decc6906fafbd07c4e3d5efcf4212c0e449f3fb3fb4fdbee9aab8
DIST translate-3.8.4.gh.tar.gz 1158012 BLAKE2B 37d26792b9382d318e359db3c7087cbf71a444c4f76c9b3fcec9311820ade1d3f346d7ff4b22983d6a49e0afd47b4277d2c0222e2982d56f52fcf7f655bd349b SHA512 28d452d9da1d1b400e88a30b9f997dd70ab2db5e6ae33a7882203bf6b59abf6bd315bee97c9f01de536dc752fde93429bb65aeb7b6386482193a68a472bd2e9a
+DIST translate-3.8.5.gh.tar.gz 1158381 BLAKE2B efa51a672bac419e0cf847099f68f33882b8a60c339b157f2a3144014e10b5c241a0817fd93755e2327afd9b9dd923f28c4f22c3a950fe95189bfb6592dd4c83 SHA512 687aadbdaeddd33de64224e33fdf2f47f3b368d5f22e8d79f580ab407595bda0fbdbbb45edeeddff4b0d583eb4238de9ecb7514289ff4ae8fb387c3d089374de
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
new file mode 100644
index 000000000000..5628bcd1f693
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+ https://github.com/translate/translate/
+ https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+ https://github.com/translate/translate/archive/${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+ dev-python/cheroot[${PYTHON_USEDEP}]
+ >=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+ >=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ sys-devel/gettext
+ html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+ ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+ ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+ subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+ yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+ test? ( dev-python/phply[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # Fails with network-sandbox (and even with it off but w/ softer fail)
+ 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+ 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+ # Apparently a change in line wrapping x_x
+ translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
+ )
+ local EPYTEST_IGNORE=(
+ # unpackaged fluent.*
+ translate/storage/test_fluent.py
+ )
+
+ if ! use ini; then
+ EPYTEST_IGNORE+=(
+ translate/convert/test_ini2po.py
+ translate/convert/test_po2ini.py
+ )
+ fi
+
+ if ! use subtitles; then
+ EPYTEST_IGNORE+=(
+ translate/storage/test_subtitles.py
+ )
+ fi
+
+ # translate/storage/test_mo.py needs 'pocompile'
+ distutils_install_for_testing
+ epytest
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if ! use html; then
+ rm "${ED}"/usr/bin/{html2po,po2html} || die
+ fi
+ if ! use ical; then
+ rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+ fi
+ if ! use ini; then
+ rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+ fi
+ if ! use subtitles; then
+ rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+ fi
+
+ python_optimize
+}
diff --git a/dev-python/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
index 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/dev-util/glslang/glslang-1.3.239.ebuild b/dev-util/glslang/glslang-1.3.239.ebuild
index c00807a5549c..7d1144a7d0cc 100644
--- a/dev-util/glslang/glslang-1.3.239.ebuild
+++ b/dev-util/glslang/glslang-1.3.239.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
else
SNAPSHOT_COMMIT="sdk-${PV}.0"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
index d01ba8ef9a93..1a6602e6aefc 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.239.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
index 9b7c8253a4ff..bb352fe141be 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.239.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
else
EGIT_COMMIT="sdk-${PV}.0"
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
index fdef9654420b..20df9532e14e 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.3.239.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
index ae7ec142589b..6c2693a2430a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.239.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
+ KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
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-libs/mesa/mesa-22.3.6.ebuild b/media-libs/mesa/mesa-22.3.6.ebuild
index f17c51069563..d2299738fbe3 100644
--- a/media-libs/mesa/mesa-22.3.6.ebuild
+++ b/media-libs/mesa/mesa-22.3.6.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
index 7ce43becf03c..1e27108abe66 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild
index a79a918b7b9b..7539b4c8ab59 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.239.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}
fi
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@sf-mail.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@sf-mail.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/package.deprecated b/profiles/package.deprecated
index 06ccb462c86a..2c0ffdee4b2f 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,12 @@
#--- END OF EXAMPLES ---
+# Michał Górny <mgorny@gentoo.org> (2023-02-03)
+# The same functionality is supported by dev-python/setuptools-scm-7.
+# See: https://github.com/pypa/setuptools_scm/#git-archives
+# https://github.com/Changaco/setuptools_scm_git_archive/#readme
+dev-python/setuptools_scm_git_archive
+
# Michał Górny <mgorny@gentoo.org> (2023-01-30)
# The package is on keep-alive by Debian. Nevertheless, they can't
# keep up with changes in dev-python/setuptools, and they do not accept
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/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml
index 8bc558614eca..c35c75ddbeb0 100644
--- a/sys-fs/genfstab/metadata.xml
+++ b/sys-fs/genfstab/metadata.xml
@@ -9,10 +9,6 @@
<email>cat@catcream.org</email>
<name>Alfred Persson</name>
</maintainer>
- <maintainer type="person" proxied="proxy">
- <email>mattst88@gentoo.org</email>
- <name>Matt Turner</name>
- </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
diff --git a/sys-kernel/genkernel/genkernel-4.3.2.ebuild b/sys-kernel/genkernel/genkernel-4.3.2.ebuild
index 5ad10c8cbd03..a8542e0d9258 100644
--- a/sys-kernel/genkernel/genkernel-4.3.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.2.ebuild
@@ -92,7 +92,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
index 46d98641e9c3..fe9ed5b5457f 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3
DESCRIPTION="query configuration information of DRI drivers"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index b6710b153eba..b73b40350eca 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2"
- 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"
+ 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"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libX11/libX11-1.8.4.ebuild b/x11-libs/libX11/libX11-1.8.4.ebuild
index 013982b7c732..79855574a2d0 100644
--- a/x11-libs/libX11/libX11-1.8.4.ebuild
+++ b/x11-libs/libX11/libX11-1.8.4.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
# Note: please bump this with x11-misc/compose-tables
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libdrm/libdrm-2.4.115.ebuild b/x11-libs/libdrm/libdrm-2.4.115.ebuild
index 063c2646e4a9..2bdacc804c4d 100644
--- a/x11-libs/libdrm/libdrm-2.4.115.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.115.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
index 4479b5f9cb5d..b00b2dc9ceb7 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.5.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
else
SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
PYTHON_COMPAT=( python3_{9..11} )
diff --git a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
index 47f3bd42c5d7..67a7575e28e3 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
S="${WORKDIR}/libX11-${PV}/"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Only needed by configure
DEPEND="
diff --git a/x11-misc/util-macros/util-macros-1.20.0.ebuild b/x11-misc/util-macros/util-macros-1.20.0.ebuild
index 79ed4f1ece82..e888094d17d4 100644
--- a/x11-misc/util-macros/util-macros-1.20.0.ebuild
+++ b/x11-misc/util-macros/util-macros-1.20.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# there is nothing to compile for this package, all its contents are produced by
# configure. the only make job that matters is make install
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]