gentoo resync : 20.03.2022

5 files changed, 2 insertions, 129 deletions

diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 77b4a86eeb7e..afddb6eb8d38 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,9 +1,3 @@
-DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
-DIST setuptools_scm-6.3.2.tar.gz 57207 BLAKE2B 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343 SHA512 9a16552803ef92367ad71007cf322737b5baa58b924083f04c860875bf6cb2e2bb4f43a7f89778b040c2eb55c5d32de479a918056519339820c6d0f1a6a386f0
-DIST setuptools_scm-6.4.0.tar.gz 61142 BLAKE2B 752f6c541b05e5d63c66c20a3458e615fc774a4781f92a02aae37a64d971af536586cec3fabac8d5efebe3cf95c18c3e323ad650b4bd8c96a2b4a7808987bd7e SHA512 1e11de29f73c48b93fe5c81b7d8ed5c75c0647dad39de53f2fdf334e6c731a8baa7744ea3c797d2aa95c4d456fff2c9a937cccf9eaa1af8a4c47e1f136328b54
 DIST setuptools_scm-6.4.1.tar.gz 61255 BLAKE2B 984b60de24e3090bfa7284ef91f40cfb8481cd9008d57012564e6631727dc1e1bb6820265a4fd3576581ce836224599bdd8ddef73446ddc3040e51ddad4b6140 SHA512 b4d16fc9f352d7fccf18853aee2e80c2bd048fe46753fe5c099542253cf30e0d087be6dfec846aed0b8182238494ef333363482dcd75781e285312a9f7547c11
-EBUILD setuptools_scm-6.0.1-r1.ebuild 1127 BLAKE2B 886f94979ac7cf4a2b00b43c84f07678a9e4d9f843594548feea98b14a3409fdf8ef7e3c3475e0766455ac8eba2f14f9d03120010fb26a64ee7f644f6aafa113 SHA512 28b1b9e84181120331a6288893423c36cf00febb5ab439bc3927e5be702d372e89a23ec8dc22e3a78ca547a1fba581c12431dcf3baf5c3d828b0ae565b0b7446
-EBUILD setuptools_scm-6.3.2.ebuild 1112 BLAKE2B 10dfe6ae791d4b743107fa95c3a2b99313a92f1c3048f70fa55b7050b88659913f035cf634f2cf61cb7a0e75c78c5fd04c8da38c7b5818960502c38fd0c042a1 SHA512 3cb125a79041f94afc94f876d3d604e38a6c139290cc246aad7d13450224c2bf9a3bae0be9f02625a16be11a2b0a57cbb6503d7528e9db6b328d31dd637658d0
-EBUILD setuptools_scm-6.4.0.ebuild 1275 BLAKE2B 562afdac8b7ded03ffe4850888d629ada116b3b13a43af2a42b731d70e5aa173ea32d2b0a9cc876d4666c4efbeae93b53c6914f89c26cd1b04b4767a4c1aec30 SHA512 b36400dfe9dd4486828ecb5e64b76ade708268b92bb03a4c73bf553da951c533b44f7aff315ae1877739c14764c37200d03e6c732b798fbb9585982937b55386
-EBUILD setuptools_scm-6.4.1.ebuild 1154 BLAKE2B 078e03f7503520a5f88851d41f16177f60876a36c7738db3997137ef81133cee8ec6ae9afa922c3c6ca31f884a212854f4b385a8fd7f78b2931b170799fe9302 SHA512 435b58d7097ab3be505fdcab7fb1322ce1fbfa9ff766fbdc617e36e7ef9e9c750edf9e643d36e765f53f13ecd6cf9af8658c685594d9e8beb82e897a1dca0a04
+EBUILD setuptools_scm-6.4.1.ebuild 1146 BLAKE2B 02c030f32a27bb50204b2dd3cd3ca25a88c26ac8544bac4fddf740a1973f34a43392a91868d1bd0f891cad6f9678aab022abb8497975cdbd5f1dc94721beb414 SHA512 3b54191ac55e49f0781d1e5ecb1cbf34e3db2a72d111ba2196d09bd3481231c42ef0c08f7a097b01307f8fed7e6f01b9d501712c3a1ef2c3341218ad2bcefd4b
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
deleted file mode 100644
index c333450a2173..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 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_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} 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 ~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/toml[${PYTHON_USEDEP}]"
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial ) )"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# network access
-	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
-	# all fetch specific setuptools versions
-	rm testing/test_setuptools_support.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
deleted file mode 100644
index 122373658933..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 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_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} 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 ~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/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial )
-	)"
-
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.0.ebuild
deleted file mode 100644
index 12fb994eaec5..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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..10} 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 ~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}]
-"
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		>dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		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
-	# known broken; https://github.com/pypa/setuptools_scm/issues/668
-	testing/test_integration.py::test_provides_toml_exta
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
index 6b46444cf800..f910e738e999 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
@@ -17,7 +17,7 @@ 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 ~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}]