gentoo resync : 17.07.2021

5 files changed, 2 insertions, 114 deletions

diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index da96124396a3..9aba7c4285d9 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,8 +1,3 @@
-AUX 2.4-trailing-junk.patch 916 BLAKE2B 1487b9fc75bafe50cd00aac14e867f073c8d8db22067a645ed67aec9ebf46c1599d174679a56a23806d546b3a43739f6f5137dc9dd3f7e62b8b0aaaf61e0dd99 SHA512 8159a6b8c5c7086269dbaa06f73262fb53125edbb360ad22526d47364e8006735e72650d869f81335620177a78eb828aa87198905ec0e7ac41dea731261b10dc
-DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
-DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a
 DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2
-EBUILD pigz-2.4-r1.ebuild 1012 BLAKE2B e1c0774598db74d40076ae564be85a4162e8b8bf30021af753f5898796fd3af76669e7cf3ed1f150700e9018bd9f689b572bb011c10ee9b1e5d005f0c5b9a6d4 SHA512 2a31104d83f09e9dbfde55b198abb677c43e00d5f0ce22a5c00acfabe9953c3afb486e153e60000ccf7ba7eadd54886b75ee92afba0d3053faa31fa8a273d1de
-EBUILD pigz-2.5.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
-EBUILD pigz-2.6.ebuild 966 BLAKE2B 92b57b79d8a6a4e48a43063ae241b3191399732b7beeea86cce1498e5aead468826468b942b218083bd99521d9c9db29eb35a44efd06adc5ca03f6040303fbb1 SHA512 7231d728746338e81679c0cad7538d1274a3590e579a98694ef5f0be973877b81ae4569b5114f4c0bcd6aa5e66607de3dedf360e4a6d5dc7777263a9b27ef74d
+EBUILD pigz-2.6.ebuild 959 BLAKE2B 0f3b28b07d4af30775e5c1d1e061a5cffe8e1b2d9f01dd31e9f4ad9b606e6fdbb7ccd2c55dd9397557ee0285ebbc34bc7ac8e64467613013568513b330b0f3da SHA512 b16444c8e914dd220e19c6cd931c5e2ab21cec731d173b1b33245d2456f2fe5f05cf9254850c23e56a3cf5a87626a3e7c065feaa5d04a0412e66db5eecc8b170
 MISC metadata.xml 739 BLAKE2B 66bac4d792d20a9edc0a4b52f55c4f02e5e9ff79b9c67365af252b928dd68b63f71a6cc75c31f824c5c0f63917f6c4c11de2cc2e82d78b7ce4518f9ac1868223 SHA512 26106d41b334587ca0aabd620d481ce6c8729fc279ddb97a529286910936a8a25d42a2f09b8ee48b9ac9343cd3384a6f7d6ccaaf39ab111214e88aff5203e90e
diff --git a/app-arch/pigz/files/2.4-trailing-junk.patch b/app-arch/pigz/files/2.4-trailing-junk.patch
deleted file mode 100644
index eb5585b7d362..000000000000
--- a/app-arch/pigz/files/2.4-trailing-junk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Fri, 10 Jul 2020 19:46:10 -0700
-Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
-
-backport of
-https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
----
- pigz.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pigz.c b/pigz.c
-index bbbfd2c..f2e79d7 100644
---- a/pigz.c
-+++ b/pigz.c
-@@ -3368,7 +3368,7 @@ local void infchk(void) {
-         cat();
-     else if (was > 1 && get_header(0) != -5)
-         complain("warning: %s: entries after the first were ignored", g.inf);
--    else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
-+    else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
-         complain("warning: %s: trailing junk was ignored", g.inf);
- }
- 
--- 
-2.27.0
-
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
deleted file mode 100644
index f23df83523ad..000000000000
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-PATCHES=( "${FILESDIR}/${PV}-trailing-junk.patch" )
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.5.ebuild b/app-arch/pigz/pigz-2.5.ebuild
deleted file mode 100644
index 3e1f3a17235d..000000000000
--- a/app-arch/pigz/pigz-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="https://www.zlib.net/pigz/"
-SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
-IUSE="static symlink test"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-arch/ncompress )"
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	dosym ${PN} /usr/bin/un${PN}
-	dodoc README
-	doman ${PN}.1
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/gzip
-		dosym un${PN} /usr/bin/gunzip
-	fi
-}
diff --git a/app-arch/pigz/pigz-2.6.ebuild b/app-arch/pigz/pigz-2.6.ebuild
index 3e1f3a17235d..f57fbf711a4b 100644
--- a/app-arch/pigz/pigz-2.6.ebuild
+++ b/app-arch/pigz/pigz-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"