[gentoo-commits] repo/gentoo:master commit in: app-arch/pigz/, app-arch/pigz/files/

[Georgy Yakovlev]

commit:     b7837ed3853bbb446c0d10b851b0c9c70ebac988
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 01:10:39 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 01:10:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7837ed3

app-arch/pigz: drop 2.4-r1, 2.5

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-arch/pigz/Manifest                      |  2 --
 app-arch/pigz/files/2.4-trailing-junk.patch | 27 -------------------
 app-arch/pigz/pigz-2.4-r1.ebuild            | 41 -----------------------------
 app-arch/pigz/pigz-2.5.ebuild               | 39 ---------------------------
 4 files changed, 109 deletions(-)

diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 084fee7e73b..33a88c53276 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1 @@
-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

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 eb5585b7d36..00000000000
--- 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@g.o>
-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 f23df83523a..00000000000
--- 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 3e1f3a17235..00000000000
--- 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
-}