diff options
Diffstat (limited to 'app-arch/pigz')
-rw-r--r-- | app-arch/pigz/Manifest | 3 | ||||
-rw-r--r-- | app-arch/pigz/files/2.4-trailing-junk.patch | 27 | ||||
-rw-r--r-- | app-arch/pigz/metadata.xml | 10 | ||||
-rw-r--r-- | app-arch/pigz/pigz-2.4-r1.ebuild | 41 | ||||
-rw-r--r-- | app-arch/pigz/pigz-2.8.ebuild | 41 |
5 files changed, 47 insertions, 75 deletions
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest index cefc6fb77bc8..4fddcc524d11 100644 --- a/app-arch/pigz/Manifest +++ b/app-arch/pigz/Manifest @@ -1 +1,2 @@ -DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba +DIST pigz-2.8.tar.gz 121304 BLAKE2B 9f1ae8b5e0dd9d9b1f17bcdbc41d8a9d50fd9b9ba7c50eb0bc1b738105d05cc396d9ce8e01f58f6b2fa7247a7c7e9926c602a613b1bb3e3a117c8f5c919ce640 SHA512 ae3d9d593e1645d65f9ab77aa828600c9af4bb30d0a073da7ae3dd805e65b87efaf6a0efb980f2d0168e475ae506eba194547d6479956dabb9d88293a9078a7f +DIST pigz-2.8.tar.gz.asc 235 BLAKE2B eb204079597d3e958da3672ba7f92481848bb7824da12b9306ff180add107175bed7bdd435dbc270170769a489c34a033d6ff547e8203cf1d71df6564381b43d SHA512 cb1dbca21d8fed25049693de02abf7489f61407d85f9a52d566c14e0194c6c393aed3edd2fd716d0ecedf7eeead6ae89d0cecc236caacd98740d14bd71e078db 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/metadata.xml b/app-arch/pigz/metadata.xml index 918992722f52..6c4468bab2b9 100644 --- a/app-arch/pigz/metadata.xml +++ b/app-arch/pigz/metadata.xml @@ -1,19 +1,17 @@ <?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="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> </maintainer> <longdescription lang="en"> pigz, which stands for parallel implementation of gzip, is a fully functional replacement for gzip that exploits multiple processors and multiple cores to the hilt when compressing data. </longdescription> - <use> - <flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag> - </use> <upstream> <remote-id type="cpe">cpe:/a:zlib:pigz</remote-id> + <remote-id type="github">madler/pigz</remote-id> </upstream> </pkgmetadata> 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 d579c3e41013..000000000000 --- a/app-arch/pigz/pigz-2.4-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 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.8.ebuild b/app-arch/pigz/pigz-2.8.ebuild new file mode 100644 index 000000000000..3f8b6a274058 --- /dev/null +++ b/app-arch/pigz/pigz-2.8.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc +inherit toolchain-funcs flag-o-matic verify-sig + +DESCRIPTION="A parallel implementation of gzip" +HOMEPAGE="https://www.zlib.net/pigz/" +SRC_URI=" + https://www.zlib.net/pigz/${P}.tar.gz + verify-sig? ( https://www.zlib.net/pigz/${P}-sig.txt -> ${P}.tar.gz.asc ) +" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos" +IUSE="static test" +RESTRICT="!test? ( test )" + +LIB_DEPEND=">=sys-libs/zlib-1.2.3[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( app-arch/ncompress ) +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-madler )" + +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 +} |