gentoo resync : 14.05.2020

5 files changed, 5 insertions, 61 deletions

diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 71e1a41cb2db..4b5bbf48bb78 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1,6 +1,4 @@
-AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 721 BLAKE2B 73c49b98ebfafe71023e2923bd13586537afccbe862adacfb0bb21f46bf77730385a6a4852f3375b5a42e591d21370ffa697ab2a6fbae932fa024d73f80bda4e SHA512 545248bdef77ebf9e161876835a081b65345fab7343e7c0b8cf0693071696a0e048f6db2150904a1a241294c99f841ea9dc43537516d22db5c90ccf39ad094ca
+AUX rpm2targz-9.0.0.5g-add-zstd-support.patch 719 BLAKE2B 0450ee5f7e6010db15f77d474da633fdab17c7b39657971bd64aebf89876a368c7bdbd4572e30a51825ae741efcad6f0845b10aed362c8502101d54485369cd5 SHA512 dd5ea497a2983c45f7c2055b7f47b911f86a5246b90bb1d55d8f75dcb1c9f25f2c20d75e7f19a3df65b62320e8397d465d25f5d5ea234a65230da4922b274079
 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-r2.ebuild 822 BLAKE2B 7fdcae98f54aebd3351c272ac6b10ad55ab90b9d4d1a7219226f737cc5f633951362e52e049eec43cad369967d0ea0402c84183d12a6d9d53b77130691579c9d SHA512 1a456a21e8a704d24a69b43d8f24859515bdf2dea049ab45480f7d8843c56ebc16f667e7f36f2b0356ed031c795c83264ab5b1a9e6a06bffee285956214641bc
-EBUILD rpm2targz-9.0.0.5g.ebuild 751 BLAKE2B fb098300423dd4032b2974ed7617a6191cb8c894c0f22d048514863be29fd03e33fd85e8be1d3c69938a652f45e46229df36802512a8b97e7c03118662196161 SHA512 50bbabff7f3de18e5a2acded55633864b756bb03af807189ab2244ab73e80ca1a42f3eebdee57e5ac17b7a636723ab998f6e82d5eaf1ce511ae946398fdc5ea3
+EBUILD rpm2targz-9.0.0.5g-r2.ebuild 814 BLAKE2B 41d9a5096c65cf66b3d77c52d1830922e4d014bc1dc6e98ad849cd14b033742252ce1da60b927d8b2674f7cc0d383f4c688519895f345b12e975e8e8a219e261 SHA512 f72cc6871ef75b9a1310e58d22d201a7c682843336defd62f36cae1b1796d41e2dbca70fd22507c1893427f01665b8d5070ec32679a9192cd48a1db2750c40db
 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
index 085c61aa4e71..cc0c46aee033 100644
--- 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
@@ -7,7 +7,7 @@ Author: Rafał Mużyło
  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 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)
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild
deleted file mode 100644
index 8408bbd8e307..000000000000
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r1.ebuild
+++ /dev/null
@@ -1,27 +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 ~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"
-DEPEND=""
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install # need explicit install line #397835
-	dodoc *.README*
-}
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
index 6bc46a104cbd..b5ad7ae995d7 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.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=""
 
 DEPEND=""
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install # need explicit install line #397835
+	emake DESTDIR="${ED}" 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
deleted file mode 100644
index aec2946cd818..000000000000
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-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=""
-
-RDEPEND="app-arch/cpio"
-DEPEND="app-arch/xz-utils"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install # need explicit install line #397835
-	dodoc *.README*
-}