5 files changed, 30 insertions, 52 deletions
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 718d9bb3a4e2..e187af558200 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1 +1 @@
-DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
+DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
diff --git a/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch b/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
deleted file mode 100644
index cc0c46aee033..000000000000
--- a/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Origin: https://bugs.gentoo.org/719208
-Author: Rafał Mużyło
-
---- a/rpmoffset.c
-+++ b/rpmoffset.c
-@@ -58,11 +58,13 @@ int is_magic_lzma(const char *buf)
- static const unsigned char magic_gzip[]  = { '\037', '\213', '\010' };
- static const unsigned char magic_bzip2[] = { 'B', 'Z', 'h' };
- static const unsigned char magic_xz[]    = { 0xFD, '7', 'z', 'X', 'Z', 0x00 };
-+static const unsigned char magic_zstd[]  = { 0x28, 0xB5, 0x2F, 0xFD };
- static const magic_t magics[] = {
- #define DECLARE_MAGIC_T(t) { .type = #t, .magic = magic_##t, .len = sizeof(magic_##t), },
- 	DECLARE_MAGIC_T(gzip)
- 	DECLARE_MAGIC_T(bzip2)
- 	DECLARE_MAGIC_T(xz)
-+	DECLARE_MAGIC_T(zstd)
- #undef DECLARE_MAGIC_T
- };
- #define MAGIC_SIZE_MIN 3
- 
diff --git a/app-arch/rpm2targz/metadata.xml b/app-arch/rpm2targz/metadata.xml
index 56c124413057..73dda144f9ac 100644
--- a/app-arch/rpm2targz/metadata.xml
+++ b/app-arch/rpm2targz/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
new file mode 100644
index 000000000000..d602205ff2a2
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-alternatives/cpio"
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install
+	einstalldocs
+}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
deleted file mode 100644
index 1eee219709f9..000000000000
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
-HOMEPAGE="http://www.slackware.com/config/packages.php"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/cpio
-	app-arch/zstd"
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0.0.5g-add-zstd-support.patch )
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install # need explicit install line #397835
-	dodoc *.README*
-}