gentoo auto-resync : 13:10:2022 - 01:41:21

6 files changed, 62 insertions, 86 deletions

diff --git a/dev-vcs/git-filter-repo/Manifest b/dev-vcs/git-filter-repo/Manifest
index 5bb51eb32551..a9b7bb806a5e 100644
--- a/dev-vcs/git-filter-repo/Manifest
+++ b/dev-vcs/git-filter-repo/Manifest
@@ -1,7 +1,5 @@
-DIST git-filter-repo-2.33.0.tar.xz 148024 BLAKE2B d23b47575cad60db2c42fe794d6b648ee14b0c126cc832b267030e6c8b4edb0acd6fe7e2666da086b3c79184a7e4362b585dfab8966102552f8317e3027d5d32 SHA512 9a4fc3e95c9b6bd399925bb8554acf93711a015756cc826a9f9ed06e91538addb78b3120876c46af4245892adfca7428d915a33d6d2890d9c0196cef5d4faa0f
 DIST git-filter-repo-2.34.0.tar.xz 149112 BLAKE2B 7b9316fe4ee07ce996e92977947f64f753296b681f7a6ad32610b6478af637f558aa0eb2294a5066b09c8e654f279c2c22358f36ce12d2869f7874f36bbf1df5 SHA512 debd638f22d3543607b3d26dbdca867975ce2fd2ce03d4088e4e1d4e1be1db4655aeb8ef9de5b3930df4006511653e0b517646d1be51ab55807d19f404e14450
 DIST git-filter-repo-2.38.0.tar.xz 153772 BLAKE2B 491269226c5db9fa57bb5e2038e2c8cb3e82577ff1ba8b34920857c2ec4275d4491e8e17f5bd34e63148ae0d6f7bb57ab3d1d36ffecd390579e0fdc773046d71 SHA512 786c27c1952a5e3625c924e71958cfd61d9065d32754a3e957f258767ccb5b147778c5d499eb82c7c1bf36a2f5a50b1cde372ebbc927aeeedbd713e5ab6563d8
-EBUILD git-filter-repo-2.33.0.ebuild 712 BLAKE2B 63b2280eab89b700ac09414d093974135d9f7f29b6eb27eb58ecb9bb11c450d1a7c980e9e8e42c1486c84a5cff145c7193e194de811bd18fbe520d13220dc05a SHA512 08109d66461f634658c2e0037ceef91b36d393d88eee2ca1459cbb8f4c9e468bea1e97993617f017fe4476eed6188d93be58e4e7e9995a6834c496dc90873054
-EBUILD git-filter-repo-2.34.0.ebuild 712 BLAKE2B 63b2280eab89b700ac09414d093974135d9f7f29b6eb27eb58ecb9bb11c450d1a7c980e9e8e42c1486c84a5cff145c7193e194de811bd18fbe520d13220dc05a SHA512 08109d66461f634658c2e0037ceef91b36d393d88eee2ca1459cbb8f4c9e468bea1e97993617f017fe4476eed6188d93be58e4e7e9995a6834c496dc90873054
-EBUILD git-filter-repo-2.38.0.ebuild 719 BLAKE2B 1cdaf1d98667502c5c8e9062991c99d6802da63a9e869811d960e30c3a2e3bfbcae3b16e9be546752008665688d51c32884ffd98b028673c00da81746fd669b8 SHA512 00fdfe189702a356dc1c5b9facfbe2bc19e28f2e2a22e494ea29d50e85808ab7fc4d2bec332abc4fbea665a3918c5ac38c9e4ec7195718217589636b80b91c2c
-MISC metadata.xml 335 BLAKE2B ce4ba8c7ea94f81ae7a41ae00f4360c8336e3d2a347a876a6f540440bb40adb77e7f3ed3fa0a90cd42b4e3350df8d89745aabdb680fed53953a8ea1d79f1bed3 SHA512 8a0b5fc58e207671ba46f687cc034de859e97507ee7d79a397d47f3ce97039a17b87a15da024fb6e6c351ad409e82bc107fcdab1c15eaf0ffecfeeaa513f7581
+EBUILD git-filter-repo-2.34.0-r1.ebuild 699 BLAKE2B 4b673ef2bf6200c0cdb21e1a82ce5cd1d128affda454066ff0a84549733b47f4b61447f9baf41009baf627fbf479572de98c960ab85f6ed038771876845c3193 SHA512 fd5d45fca5915b3f365cea119bc087c841791f2e3c07ce3799525a2491ae29c4ff47fa511d5dcae6168d948bd2654999a1594dbad80cfe55427a9f3c2b049f91
+EBUILD git-filter-repo-2.38.0-r1.ebuild 966 BLAKE2B 3f35b0aeca8de3e57141d97b0646fb5dfd1ddb7e7488cc4cb39db98637e13f377610f43f9b4d40f31933c06c986aa0ed9013232bcae22c44f040eb9681615a2b SHA512 7375e8146925a45f14158f699b6fce409b39ab1aa46e26c19fcbe51c202ec00cb9618592d73d78fb2cfb9d7857733e11053a2ee2f2d28bb65f1f8f8319a383e0
+MISC metadata.xml 412 BLAKE2B 8f13a3d32ba207832ddf15614499392df1b7247c9e58407bc90897c3388de4441060a1e7a8057d694ceb5e76b72b31e4f2e07eb0da3aff0a2d711976be112481 SHA512 9050983df62a5229ed75e844cf955b28ccc5b2547a5e4c22122a8691ae685c4049200f7482a3283e2d919b6cb11343ac9db1bc3f03f4a62ecf9c887857ca5355
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.34.0-r1.ebuild
index dfc0b43cc287..26a92dc53d0a 100644
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.33.0.ebuild
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.34.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
-inherit python-single-r1
+inherit distutils-r1
 
 DESCRIPTION="Quickly rewrite git repository history (filter-branch replacement)"
 HOMEPAGE="https://github.com/newren/git-filter-repo/"
@@ -20,16 +20,17 @@ RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-vcs/git-2.24.0"
 
-src_compile() {
-	:
+S="${S}/release"
+
+src_prepare() {
+	eapply_user
+	cat > PKG-INFO <<EOF
+Metadata-Version: 2.1
+Name: git-filter-repo
+Version: ${PV}
+EOF
 }
 
 src_test() {
 	bash t/run_tests || die
 }
-
-src_install() {
-	python_fix_shebang git-filter-repo
-	dobin git-filter-repo
-	doman Documentation/man1/git-filter-repo.1
-}
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild
deleted file mode 100644
index dfc0b43cc287..000000000000
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.34.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-single-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-vcs/git-2.24.0"
-
-src_compile() {
-	:
-}
-
-src_test() {
-	bash t/run_tests || die
-}
-
-src_install() {
-	python_fix_shebang git-filter-repo
-	dobin git-filter-repo
-	doman Documentation/man1/git-filter-repo.1
-}
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
new file mode 100644
index 000000000000..321bde43f057
--- /dev/null
+++ b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-vcs/git-$(ver_cut 1-2)
+"
+
+S="${S}/release"
+
+python_prepare_all() {
+	cat > PKG-INFO <<-EOF || die
+	Metadata-Version: 2.1
+	Name: git-filter-repo
+	Version: ${PV}
+	EOF
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	bash t/run_tests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# 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
+}
diff --git a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0.ebuild b/dev-vcs/git-filter-repo/git-filter-repo-2.38.0.ebuild
deleted file mode 100644
index f51f33fa7528..000000000000
--- a/dev-vcs/git-filter-repo/git-filter-repo-2.38.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-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
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-vcs/git-2.24.0
-"
-
-src_compile() {
-	:
-}
-
-src_test() {
-	bash t/run_tests || die
-}
-
-src_install() {
-	python_fix_shebang git-filter-repo
-	dobin git-filter-repo
-	doman Documentation/man1/git-filter-repo.1
-}
diff --git a/dev-vcs/git-filter-repo/metadata.xml b/dev-vcs/git-filter-repo/metadata.xml
index e4dab52e37b3..32ef83f7cb36 100644
--- a/dev-vcs/git-filter-repo/metadata.xml
+++ b/dev-vcs/git-filter-repo/metadata.xml
@@ -5,7 +5,9 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">newren/git-filter-repo</remote-id>
+		<remote-id type="pypi">git-filter-repo</remote-id>
 	</upstream>
 </pkgmetadata>