gentoo auto-resync : 30:01:2024 - 11:49:23

4 files changed, 56 insertions, 5 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index fa8c33c62766..06e95f69a379 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index a3df494db51b..44baa6fdf6b2 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -1,3 +1,4 @@
 DIST git-filter-repo-2.38.0.tar.xz 153772 BLAKE2B 491269226c5db9fa57bb5e2038e2c8cb3e82577ff1ba8b34920857c2ec4275d4491e8e17f5bd34e63148ae0d6f7bb57ab3d1d36ffecd390579e0fdc773046d71 SHA512 786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8
-EBUILD git-filter-repo-2.38.0-r1.ebuild 997 BLAKE2B 63c2a34729d26ec03ed2c8f8d768010a739bf769c67a62121c5b1d22a0e9b812168f1cf2322ea33c039fbd5d0ca379ddc3dd22ff25783b89c2df2519e3104ee3 SHA512 08087ea349c81b3c261b8709a4e74629da937f19be62895c370ff7339e67e18e3f030a441c866fdcdd3b5cb25d1030c2ccf1f81a0970a45aba4a2fcfe0835953
+EBUILD git-filter-repo-2.38.0-r1.ebuild 1038 BLAKE2B 253a5596ed09668fe688cb35c4ab15b8511fbb3ed558a467d4a1e3bb9e15c0c1fad28cf6f293168d1ebb79ea6429e7a515cee53fdcafeff497bdd8ddbbd43118 SHA512 06626669ec797cfd902260400add1faf73bfa9a5ac3f78b6d00bbbc1eaab2137f392c2946498e024e20e88d8f70eb30cec4aa3229fb8bb47a10020d6bf13844b
+EBUILD git-filter-repo-2.38.0-r2.ebuild 1343 BLAKE2B af7186865e0eed2292234388a5b2a92453d1b92dbe245ef30eee0a8f7c46be6dc11823f061e725d77e69e03da3eaff9cc6259380b1ffa9146fa04665209d6c5f SHA512 b0d2aa30fd0dcb81bc9dad525c0a87ec858cc1d5d338afb83bf72f00d79af5662ae10c7ead429ef5f1adf2937835fa7ef6dbd6e9b5a7355824d976f8e424869c
 MISC metadata.xml 412 BLAKE2B 8f13a3d32ba207832ddf15614499392df1b7247c9e58407bc90897c3388de4441060a1e7a8057d694ceb5e76b72b31e4f2e07eb0da3aff0a2d711976be112481 SHA512 9050983df62a5229ed75e844cf955b28ccc5b2547a5e4c22122a8691ae685c4049200f7482a3283e2d919b6cb11343ac9db1bc3f03f4a62ecf9c887857ca5355
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
index bf12a2763a11..5519692b3750 100644
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1
 
 DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
 HOMEPAGE="https://github.com/newren/git-filter-repo/"
 SRC_URI="https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
+S="${S}/release"
 
 LICENSE="MIT"
 SLOT="0"
@@ -16,11 +17,11 @@ KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	${PYTHON_DEPS}
 	>=dev-vcs/git-$(ver_cut 1-2)
 "
-
-S="${S}/release"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
 
 python_prepare_all() {
 	cat > PKG-INFO <<-EOF || die
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild
new file mode 100644
index 000000000000..c54f9866d9bd
--- /dev/null
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1
+
+DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
+HOMEPAGE="https://github.com/newren/git-filter-repo/"
+SRC_URI="https://github.com/newren/git-filter-repo/releases/download/v${PV}/${P}.tar.xz"
+S="${S}/release"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-vcs/git-$(ver_cut 1-2)
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+# the git-archive tarball does not have version info; setuptools-scm
+# requires a valid source of version info, this one is for distros
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	cd .. || die
+	bash t/run_tests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# Just like git itself there is a manpage in troff + html formats.
+	# Unlike git itself, we cannot install the html one, because the
+	# `git --html-path` has the ${PV} of git in it. So just install
+	# the troff copy.
+	doman "${WORKDIR}"/${P}/Documentation/man1/git-filter-repo.1
+
+	# Points to dead symlink
+	rm "${ED}"/usr/share/doc/${PF}/README.md || die
+	rmdir "${ED}"/usr/share/doc/${PF} || die
+
+	dodoc "${WORKDIR}"/${P}/README.md
+}