gentoo resync : 29.12.2022

4 files changed, 73 insertions, 11 deletions

diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 06a047fc5d9e..bd9cc6d81430 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,7 @@
-DIST setuptools_scm-6.4.1.tar.gz 61255 BLAKE2B 984b60de24e3090bfa7284ef91f40cfb8481cd9008d57012564e6631727dc1e1bb6820265a4fd3576581ce836224599bdd8ddef73446ddc3040e51ddad4b6140 SHA512 b4d16fc9f352d7fccf18853aee2e80c2bd048fe46753fe5c099542253cf30e0d087be6dfec846aed0b8182238494ef333363482dcd75781e285312a9f7547c11
 DIST setuptools_scm-6.4.2.tar.gz 61305 BLAKE2B e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 SHA512 224dfe543e8658e7d8b7272d18eb657fac1774a206d079d65bb6e22bfa68b35e618a31b3671418d095f8b7b492339ea18491a1711be3a87eeecf50c6703a4096
-EBUILD setuptools_scm-6.4.1.ebuild 1146 BLAKE2B 02c030f32a27bb50204b2dd3cd3ca25a88c26ac8544bac4fddf740a1973f34a43392a91868d1bd0f891cad6f9678aab022abb8497975cdbd5f1dc94721beb414 SHA512 3b54191ac55e49f0781d1e5ecb1cbf34e3db2a72d111ba2196d09bd3481231c42ef0c08f7a097b01307f8fed7e6f01b9d501712c3a1ef2c3341218ad2bcefd4b
-EBUILD setuptools_scm-6.4.2.ebuild 1194 BLAKE2B edabf7e70fd37c7dc7413b04378caaf6af09ac361d20847634a4238dde12dd313ffc1bee09c027f5adba6a338b48f24649a12b82623cded292a06cb9c085a7b0 SHA512 354d31f089a7c6e407fef5a15b70d0705c9e235e74b60de58d55658680513e21edfbe7d39883adeacdb7e1aa615b4e5b214502e8e80c64e8851b0f622a9f3cda
+DIST setuptools_scm-7.0.1.tar.gz 67921 BLAKE2B 15a4a8953bb9cf8754fe465b53e11483ade33b09c5b407f096ecbdaed80081fa554e0c6da1accdbc629163019bf91968f4edae40166dc4598b25e0a51c5881d1 SHA512 49d296ca4af3175c47a385d9d935fe32371d39c31ff4e6d704ea6fc8dd512e7ed6b0136677e7768836c0ec2ae558c47f156adc5975ace30a396fa81644e61acb
+DIST setuptools_scm-7.0.2.tar.gz 68142 BLAKE2B 11bc3db134c3ee90b9262cf663036a6119a559e134b479a42e10c4b54005029c0e192d92e32d14f8d2dee2d09258b9cbebe9b45f07b553507b80ac7f2ecee110 SHA512 c9782a1b5bbfaaab2bbfc223477e92e8ee2fb0b2a393ff912f0c54fb99494d1c014a4e6c103a3f852d335733b02bcaa3b15eed8ec3a5c1ef54c4691fba7cb0de
+EBUILD setuptools_scm-6.4.2.ebuild 1186 BLAKE2B d99353bf7e44158acccf0f8fc1a33a72211c1f8fd735de1cb59cb6eb1927e510b6fd196e11f1a8a122f2529bd6399739fc8ccfb456b2d3868d0dcb1ff93d948b SHA512 903990604ea97b4fd412d041fdf9764dfafdde3c66ce1756d8c9efdc351811bd7bc2062acc65399db6ba3eea5cee7d8bd2e1ac3128bdaa0cc67002f7307dc498
+EBUILD setuptools_scm-7.0.1-r1.ebuild 1322 BLAKE2B 7f8e059beda99fd1f0c030a56f325cefbe2c1399ec0ea6d0a065e848c51aad7f19674f1e5b6ca742f05775d55aa6e20083550407088fe7dda1013fccdb7e1b5d SHA512 966bb2d39c8feafd545d62931e162c5e1f9d74c89fd56d3644d32d64e5104405cac2450ddaed6f686aa7ab7568a60e0abdfd4a177f4bb6ae73cc6e5bb5473623
+EBUILD setuptools_scm-7.0.2.ebuild 1310 BLAKE2B f405a051faaeb080d2f1a30b51da40517100e28e5b96932a6eeeb293cd32e457b73f0c91347a6f57018e283c2ae62764c1dc13a61a04336cba9e9ddb5447c54f SHA512 d38568331d425cd71c2f03377567fd4c0ad6795f03fbcb3c1df370c439a037a00e36ae9a2346f89c9bd126af009b3bae21f0d2444641ee70ee1dc0cbd239532e
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
index eedb7ab930d5..c5176551b20b 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..91c722d47031
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+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"
+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"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
+)
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
index f910e738e999..a7e35478d252 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
@@ -5,32 +5,35 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Manage versions by scm tags via setuptools"
 HOMEPAGE="
 	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/"
+	https://pypi.org/project/setuptools-scm/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	!!<dev-python/setuptools_scm-2
 	test? (
-		>dev-python/virtualenv-20[${PYTHON_USEDEP}]
 		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial )
-	)"
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
 
 distutils_enable_tests pytest
 
@@ -38,4 +41,10 @@ EPYTEST_DESELECT=(
 	# fetching from the Internet
 	testing/test_regressions.py::test_pip_download
 	testing/test_setuptools_support.py
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
 )