gentoo resync : 25.04.2020

4 files changed, 54 insertions, 2 deletions

diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 6ae95e9a8529..71e1a41cb2db 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,4 +1,6 @@
+AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 721 BLAKE2B 73c49b98ebfafe71023e2923bd13586537afccbe862adacfb0bb21f46bf77730385a6a4852f3375b5a42e591d21370ffa697ab2a6fbae932fa024d73f80bda4e SHA512 545248bdef77ebf9e161876835a081b65345fab7343e7c0b8cf0693071696a0e048f6db2150904a1a241294c99f841ea9dc43537516d22db5c90ccf39ad094ca
 DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
 EBUILD rpm2targz-9.0.0.5g-r1.ebuild 743 BLAKE2B 9eaecabf868282a941374ebc9c0a9a15bf8f7fd7f59c52d1a2636138fb6d8254af3f1ca5815023611248fc09efb9621b1b66371556c94fe1b1e2a3586bb90fc5 SHA512 66c04f41e728f7e77317eb1ad0f6ca28afcb3e44df57c0b59f6ac10d96057bb19fa0e8702ae603c05684f00d0a13155b3a581c8320937cad8ef814009872dcfe
-EBUILD rpm2targz-9.0.0.5g.ebuild 750 BLAKE2B f2b6867c0c6cf0019562db31814a518d83d630b21d92458be6b7e0976bafb772b65c5d6cf37f85b95ab856752dafee90f93cbac2f96df1c8b4ebcac0cec45090 SHA512 87d0c659846b4d14838145856a3e23ba97670d553969a006356d00f76a20d898a6196918909aa3a1195da8a62a5eeddc017a2ca88018e169a36f83b10a2fd963
+EBUILD rpm2targz-9.0.0.5g-r2.ebuild 822 BLAKE2B 7fdcae98f54aebd3351c272ac6b10ad55ab90b9d4d1a7219226f737cc5f633951362e52e049eec43cad369967d0ea0402c84183d12a6d9d53b77130691579c9d SHA512 1a456a21e8a704d24a69b43d8f24859515bdf2dea049ab45480f7d8843c56ebc16f667e7f36f2b0356ed031c795c83264ab5b1a9e6a06bffee285956214641bc
+EBUILD rpm2targz-9.0.0.5g.ebuild 751 BLAKE2B fb098300423dd4032b2974ed7617a6191cb8c894c0f22d048514863be29fd03e33fd85e8be1d3c69938a652f45e46229df36802512a8b97e7c03118662196161 SHA512 50bbabff7f3de18e5a2acded55633864b756bb03af807189ab2244ab73e80ca1a42f3eebdee57e5ac17b7a636723ab998f6e82d5eaf1ce511ae946398fdc5ea3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
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
new file mode 100644
index 000000000000..085c61aa4e71
--- /dev/null
+++ b/app-arch/rpm2targz/files/rpm2targz-9.0.0.5g-add-zstd-support.patch
@@ -0,0 +1,20 @@
+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/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
new file mode 100644
index 000000000000..6bc46a104cbd
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
@@ -0,0 +1,30 @@
+# 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 ~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="${D}" install # need explicit install line #397835
+	dodoc *.README*
+}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
index e91ab284149c..aec2946cd818 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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=""
 
 RDEPEND="app-arch/cpio"