gentoo auto-resync : 15:12:2023 - 14:48:25

4 files changed, 2 insertions, 75 deletions

diff --git a/dev-python/hatch-vcs/Manifest b/dev-python/hatch-vcs/Manifest
index bd5c7aed8567..a6c02cad1001 100644
--- a/dev-python/hatch-vcs/Manifest
+++ b/dev-python/hatch-vcs/Manifest
@@ -1,6 +1,3 @@
-AUX hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch 1217 BLAKE2B f0baf6b717b9cf5653b4b9bce4020d1b5d23cd03b382b1c00c75d78841434070cc8d5d27859b359e2ce32fb0d55b6c290e15702c981bb40fbc5f4a37e1b0b3b3 SHA512 b448e70a7058d88a8617fea38959e43257d28ac0c0e6753df229c974304f8c656349186d0cffd8e6693b3224717326f2fcf3e8476c6b70e8054e7c96e7745a1f
-DIST hatch-vcs-0.3.0.gh.tar.gz 10049 BLAKE2B 69f49e205b4e42b46a246cc2403d8e7bbd2b8f83a360f1100ba98ecf7308d445e265749bd1f5fa7cca84104436e2643fd3f95292f2dba3dc48584a0df5136136 SHA512 ce22937aae8130a485ab154378f6c58c1720d66d277349a95ccfb58fd748deb69cd17d34ec3a12f3201f9e348e5d5b1c6b977432e614bb42d0e3065ec5f7f9c6
 DIST hatch-vcs-0.4.0.gh.tar.gz 10822 BLAKE2B 92b1ad1181a6bae815a6d01045836976b8767086f2a7001de9ad97f0d61737895da9a411419e28c5b2d830fca606d7d9c21265210965bc7691670f92aeab1b22 SHA512 bf40cc371c8d8e120fce83e5986fc2bdc2087fa5a4ac4a407d32617e98205ded79dcb29a00c7638ba68dd5ce09f31e84b34176627a6a34dfb7708031f4c4519a
-EBUILD hatch-vcs-0.3.0.ebuild 801 BLAKE2B 23409ee07d904c59a2500ebf2549249afa8cc3af34cfc1df4462da92793450bed04b552e216b08262f249f337fb7361b86cdf3c92b2a7ab79e7f37c74a2a7b62 SHA512 2eab7c8937e39b4b1b267f5ff465bc0f0f9daebe5ecc59a03827719830bc952ff7cdf9fc97b4caf2e55b6d5b1e9ece7192ec8ae471d447628b0b699202be2422
-EBUILD hatch-vcs-0.4.0.ebuild 737 BLAKE2B a313fdca8ac5206287323d68a38a30f1541296d4272822cfac069c462422deb94df47fd1370d3be3f3a3f1a558204723ec6d16bdabb11352b166332e0781a386 SHA512 d6329016201475e330414e2560cf85fe36aefbb8d4968f05a7450662e49a7aebce9972f76adccd91cfd04b1f9b462ebd89c936e6c73581fcf19d71e021e231d5
+EBUILD hatch-vcs-0.4.0.ebuild 729 BLAKE2B 2e3fde4f3358a83fd1a4c76cfffd05b274236f232f25364afc4d1ba22da49f1e76cc272f0b6eb185a395eedec76f136f8c52791df7e5bc65a496cde31c929802 SHA512 f30ccadd50d4220e00c108b145277fb32792b6a3f2e6265778892dd22723d05769eb2702082fb4102b01400be5041a97062a7bda44df60e2d5ec50da935e7e14
 MISC metadata.xml 369 BLAKE2B e834e5959ef7719c9ed9d751a8c5e56792fbd553e7fe0ae484a0f1da9c09e97fe262ccf319a773782207fd6a95b16662425f1b348090545b81a5391e70066ec3 SHA512 27b508fa717ff058f09f527c4ae504e131860229e073888b4b746621e1a877ef0c74f1336bdcc097969f9610f68d5e17ad1188efeb0ec4ff733097c4e86b027a
diff --git a/dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch b/dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch
deleted file mode 100644
index 919036acd720..000000000000
--- a/dev-python/hatch-vcs/files/hatch-vcs-0.3.0-Work-with-setuptools_scm-7.1-fix-25-26.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 47364faf5563df0eaa631ed10383817762c6b547 Mon Sep 17 00:00:00 2001
-From: Ben Beasley <code@musicinmybrain.net>
-Date: Thu, 5 Jan 2023 18:49:54 -0500
-Subject: [PATCH] Work with setuptools_scm 7.1 (fix #25) (#26)
-
-Make test_write less brittle (see also #8, #9) so that it works with
-_version.py files generated by at least setuptools_scm 7.1, 7.0, and
-6.x.
----
- tests/test_build.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_build.py b/tests/test_build.py
-index 2fde601..7c76343 100644
---- a/tests/test_build.py
-+++ b/tests/test_build.py
-@@ -75,8 +75,10 @@ def test_write(new_project_write):
-     assert os.path.isfile(version_file)
- 
-     lines = read_file(version_file).splitlines()
--    assert lines[3].startswith(('version =', '__version__ ='))
--    assert lines[3].endswith("version = '1.2.3'")
-+    version_starts = ('version = ', '__version__ = ')
-+    assert any(line.startswith(version_starts) for line in lines)
-+    version_line = next(line for line in lines if line.startswith(version_starts))
-+    assert version_line.endswith(" = '1.2.3'")
- 
- 
- @pytest.mark.skipif(sys.version_info[0] == 2, reason='Depends on fix in 6.4.0 which is Python 3-only')
--- 
-2.39.1
-
diff --git a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
deleted file mode 100644
index b79b4f409c3b..000000000000
--- a/dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hatch plugin for versioning with your preferred VCS"
-HOMEPAGE="
-	https://pypi.org/project/hatch-vcs/
-	https://github.com/ofek/hatch-vcs/
-"
-SRC_URI="
-	https://github.com/ofek/hatch-vcs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/setuptools-scm-6.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Work-with-setuptools_scm-7.1-fix-25-26.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/hatch-vcs/hatch-vcs-0.4.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.4.0.ebuild
index 4e6ad04a3a5d..08720366cf75 100644
--- a/dev-python/hatch-vcs/hatch-vcs-0.4.0.ebuild
+++ b/dev-python/hatch-vcs/hatch-vcs-0.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/setuptools-scm-6.4.0[${PYTHON_USEDEP}]