From 8efd753485274b42588152997cab88bcdfbb5707 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 14 Jan 2022 19:53:13 +0100 Subject: [PATCH] app-arch/pigz: Sync with gentoo It's from gentoo commit 15bbb20d50c88d3c3e3940c0fc35b5fd3e2fa30f. --- .../portage-stable/app-arch/pigz/ChangeLog | 80 -------- .../app-arch/pigz/ChangeLog-2015 | 174 ------------------ .../portage-stable/app-arch/pigz/Manifest | 7 +- .../pigz/files/pigz-2.3.3-ldflags.patch | 34 ---- .../portage-stable/app-arch/pigz/metadata.xml | 15 +- .../{pigz-2.3.3.ebuild => pigz-2.6.ebuild} | 20 +- 6 files changed, 19 insertions(+), 311 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.3.3-ldflags.patch rename sdk_container/src/third_party/portage-stable/app-arch/pigz/{pigz-2.3.3.ebuild => pigz-2.6.ebuild} (60%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog b/sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog deleted file mode 100644 index 42b5b3a191..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog +++ /dev/null @@ -1,80 +0,0 @@ -# ChangeLog for app-arch/pigz -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*pigz-2.3.3 (09 Aug 2015) -*pigz-2.3.1-r1 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch, - +files/pigz-2.3-make.patch, +files/pigz-2.3.3-ldflags.patch, +metadata.xml, - +pigz-2.3.1-r1.ebuild, +pigz-2.3.3.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 14 Dec 2015; Fabian Groffen pigz-2.3.3.ebuild: - marked ~ppc-macos, bug #567104 - - Package-Manager: portage-2.2.20-prefix - - 11 Jan 2016; Tim Harder pigz-2.3.3.ebuild: - stabilize 2.3.3 - - 11 Jan 2016; Tim Harder - -files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch, - -files/pigz-2.3-make.patch, -pigz-2.3.1-r1.ebuild: - remove old - - 14 Jan 2016; Tim Harder metadata.xml: - fix symlink use flag description - - Fixes bug #571810. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog-2015 deleted file mode 100644 index f01338dc53..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/ChangeLog-2015 +++ /dev/null @@ -1,174 +0,0 @@ -# ChangeLog for app-arch/pigz -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.42 2015/05/20 01:55:37 mattst88 Exp $ - - 20 May 2015; Matt Turner pigz-2.3.3.ebuild: - alpha stable. - -*pigz-2.3.3 (27 Jan 2015) - - 27 Jan 2015; Tim Harder +pigz-2.3.3.ebuild, - +files/pigz-2.3.3-ldflags.patch: - Version bump. - - 21 Oct 2014; Tim Harder -pigz-2.2.5.ebuild, - -pigz-2.3.ebuild, -pigz-2.3.1.ebuild: - Remove old. - - 12 Oct 2014; Agostino Sarubbo pigz-2.3.1-r1.ebuild: - Stable for x86, wrt bug #524858 - - 10 Oct 2014; Agostino Sarubbo pigz-2.3.1-r1.ebuild: - Stable for amd64, wrt bug #524858 - -*pigz-2.3.1-r1 (23 Jan 2014) - - 23 Jan 2014; Tim Harder +pigz-2.3.1-r1.ebuild, - +files/0001-Do-not-return-non-zero-exit-code-when-warnings-issue.patch: - Don't return an error exit status when decompressing zero-padded files (bug - #417657). - - 18 Jan 2014; Mike Frysinger pigz-2.3.1.ebuild: - Add arm64 love. - - 03 Jan 2014; Sergey Popov -pigz-2.2.4.ebuild: - Security cleanup, wrt bug #457794 - - 24 Dec 2013; Agostino Sarubbo pigz-2.3.1.ebuild: - Stable for x86, wrt bug #494416 - - 22 Dec 2013; Pacho Ramos pigz-2.3.1.ebuild: - amd64 stable, bug #494416 - -*pigz-2.3.1 (04 Nov 2013) - - 04 Nov 2013; Tim Harder +pigz-2.3.1.ebuild: - Version bump. - - 20 Sep 2013; Jeroen Roovers pigz-2.3.ebuild: - Marked ~hppa too. - - 20 May 2013; Agostino Sarubbo pigz-2.3.ebuild: - Stable for x86, wrt bug #470604 - - 19 May 2013; Markos Chandras pigz-2.3.ebuild: - Stable on amd64 wrt bug #470604 - - 07 Mar 2013; Steev Klimaszewski pigz-2.3.ebuild: - Add ~arm keyword. Tested on Cortex A15, and A9. - -*pigz-2.3 (07 Mar 2013) - - 07 Mar 2013; Tim Harder +pigz-2.3.ebuild, - +files/pigz-2.3-make.patch: - Version bump. - - 07 Oct 2012; Pacho Ramos metadata.xml: - Drop maintainer due retirement, #274113 - - 07 Sep 2012; Johannes Huber pigz-2.2.5.ebuild: - Stable for x86, wrt bug #433888 - - 07 Sep 2012; Agostino Sarubbo pigz-2.2.5.ebuild: - Stable for amd64, wrt bug #433888 - - 06 Aug 2012; Mike Frysinger pigz-2.2.5.ebuild: - Add USE=static support. - - 03 Aug 2012; Tim Harder -pigz-2.1.6.ebuild, - -pigz-2.1.6-r1.ebuild, -files/pigz-2.1.6-doubledash.patch, - -pigz-2.1.7.ebuild: - Remove old. - -*pigz-2.2.5 (03 Aug 2012) - - 03 Aug 2012; Tim Harder +pigz-2.2.5.ebuild, - metadata.xml: - Version bump. Add myself as maintainer. - - 30 Apr 2012; Jeff Horelick pigz-2.2.4.ebuild: - marked x86 per bug 402517 - - 30 Apr 2012; Agostino Sarubbo pigz-2.2.4.ebuild: - Stable for amd64, wrt bug #402517 - -*pigz-2.2.4 (26 Mar 2012) - - 26 Mar 2012; Tim Harder +pigz-2.2.4.ebuild: - Version bump (bug #408655). - -*pigz-2.1.7 (18 Dec 2011) - - 18 Dec 2011; Dror Levin +pigz-2.1.7.ebuild: - Version bump. Should finally fix #312967 and #324635. - - 09 Jun 2011; Matt Turner pigz-2.1.6-r1.ebuild: - Add ~alpha. - - 16 Nov 2010; pigz-2.1.6-r1.ebuild: - Added ~mips keyword. - - 11 Sep 2010; Ulrich Mueller pigz-2.1.6.ebuild, - pigz-2.1.6-r1.ebuild: - Update LICENSE; PIGZ is identical with ZLIB. Bug 336249. - -*pigz-2.1.6-r1 (04 Sep 2010) - - 04 Sep 2010; Dror Levin +pigz-2.1.6-r1.ebuild, - +files/pigz-2.1.6-doubledash.patch: - Add patch to support double dash command-line option (--), bug 335852. - - 13 Apr 2010; Markos Chandras pigz-2.1.6.ebuild: - Stable on amd64 wrt bug #307837 - - 12 Mar 2010; Pawel Hajdan jr pigz-2.1.6.ebuild: - x86 stable wrt bug #307837 - - 05 Mar 2010; Dror Levin -pigz-2.1.5.ebuild, - -pigz-2.1.5-r1.ebuild, -files/pigz-2.1.5-decode-symlinks-to-stdout.patch, - -files/pigz-2.1.5-gunzip-compat.patch, - -files/pigz-2.1.5-respect-flags.patch: - Remove old. - -*pigz-2.1.6 (17 Jan 2010) - - 17 Jan 2010; Dror Levin +pigz-2.1.6.ebuild: - Version bump. - - 01 Jan 2010; Christian Faulhammer pigz-2.1.5-r1.ebuild: - Transfer Prefix keywords - -*pigz-2.1.5-r1 (31 Dec 2009) - - 31 Dec 2009; Dror Levin +pigz-2.1.5-r1.ebuild, - +files/pigz-2.1.5-decode-symlinks-to-stdout.patch, - +files/pigz-2.1.5-gunzip-compat.patch, metadata.xml: - Apply patches to decode symlinks to stdout and decompress when called as - gunzip, add symlink USE flag to replace g{,un}zip. Thanks to Holger - Hoffstätte , bug 294752. - - 02 Nov 2009; Víctor Ostorga -pigz-2.1.4.ebuild, - -files/pigz-2.1.4-respect-flags.patch, pigz-2.1.5.ebuild: - Adding DEPEND on app-arch/ncompress when FEATURES=test , patch thanks to - Raimonds Cicans bug 291504 - -*pigz-2.1.5 (27 Oct 2009) - - 27 Oct 2009; Víctor Ostorga +pigz-2.1.5.ebuild, - +files/pigz-2.1.5-respect-flags.patch: - Version bump to 2.1.5 , bug #284038 - - 25 Oct 2009; Torsten Veller metadata.xml: - Remove drizzt from metadata.xml (#149111) - - 14 Apr 2009; Raúl Porcel pigz-2.1.4.ebuild: - Add ~x86 wrt #264111 - - 04 Apr 2009; Tiago Cunha pigz-2.1.4.ebuild: - keyworded ~arch for sparc - -*pigz-2.1.4 (26 Mar 2009) - - 26 Mar 2009; Timothy Redaelli - +files/pigz-2.1.4-respect-flags.patch, +metadata.xml, +pigz-2.1.4.ebuild: - New ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/pigz/Manifest index 103766cf43..33a88c5327 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/Manifest @@ -1,6 +1 @@ -AUX pigz-2.3.3-ldflags.patch 1392 SHA256 1d42c16c402b402475973fff5aad06b2a5fbf319102c2c8da4f1b41689d2acee SHA512 81a357864f36aef670b0c3c44a77f1c20ca24ef7718b6e73ea551043a3c22161483ab287e8bf794f57af76d0d183924122793b56f116b388caa08251c0f1d480 WHIRLPOOL a9457c1a879cd6173eccf85011aea21690a4a4c68e623b1b98445244f61baa1f896bc16aee3bb8d707714ab6002c0c892479b9f9a8b434e4bfb0869750090044 -DIST pigz-2.3.3.tar.gz 92787 SHA256 4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c SHA512 6fa5ee1c03b4a8dc4b191acaa337b6f30132503ff413300214e1e6b27dd70590b53334be3fa880916f6ea4498beb8cf7c411a5954fdf188475882c44618c663c WHIRLPOOL 1eb3ea11a0bbb0bd837a1ed12a63b3d57d8ae9c127e8407f9b82b1aad8a41820abf1d429c513f4df3f56fdc3c842caab07a5c904207b2244e4215a6654ef5392 -EBUILD pigz-2.3.3.ebuild 966 SHA256 0112bbd341ecb51e127fc059bcd7f3294006736ff984c85a0e61295a3860d6e6 SHA512 e22540a01b2867f9212ac94411af4675ab4f65d7d1fb4287e63d5213ea602b37ef46346cb0126858df3a35c7ba613a77503d0d403a3cad927ff54de19860b6ad WHIRLPOOL 5e7fae1a3a3fce71495ce0a8faef34edfc3ce8835dd2a3fe909b1121bfcc89d124e2c4668e670713632d775b1541e6677bca07e6d208c9f336fd5e62d3d3a0d8 -MISC ChangeLog 2900 SHA256 7a5dff29baaadbc5b73b364191677ecadce2fc0f1b8d3e24672fe0e1cdf7133e SHA512 cd63e2311c1e2248d57b12792cb758e29e9689a333b0f0a9100e6136b0458093dd4bcf7055f12b314b8df5930ee3963356602249488c9fa99d9d103ddc348dc7 WHIRLPOOL 8ec1581a98814e7ca378217270e6700f1fa2e5bf69ea30b85ee0676de4f87d8b08bd3772096e9747476117a90b563aa2c506987f99f365e5658679d42b0c965a -MISC ChangeLog-2015 5805 SHA256 28f1c5ae6ff8cdf225c62b81b48411a365ed35d77db96b8bacb39843aca0f355 SHA512 cea95adb36d42317fd7503a5e936fa0672bffbbaba4b8341458c6bf350e0f1ee1c2c3b97541c1541af60ca7e49977f7d55926cdf25d0d912a7c62010abf7ef95 WHIRLPOOL 5d0b546425fcea28755973593fb41912ff3825143d9feec015075c98fadc922c75b930bc5815694f3a37e074b0b3cfc25936aa5b5b8f556327bed4ba9bcc9ff2 -MISC metadata.xml 499 SHA256 5e2eb8e72e69ee7d4c3d0595829989e9d4c757945a74a5c2aea7bb5118b2373f SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe WHIRLPOOL d6a1a7de2d6d7e66ddf227febe50bde3980ef00b1df8acb71771333c4e253e2b25e8a08740bb211ef894e127bec18d5c28d6704aadd81c03f8a4bce810b0acd5 +DIST pigz-2.6.tar.gz 106840 BLAKE2B 8e1a8ca593896fc947a7d6ffaa71d9be69d347f7cf1ed2f635b8480aa05708f4679a4768cf3a18ac515ea94dd8352dd4158bd3c9d1b6fdebd82ad1b582d04cba SHA512 04d2e44bc7a7eb061c3c48100ce5b8fc79931aeac72340abd768fd2a4499ff1004e2bc009772fc2003a4c599f6e90f3abc8bef5c377d6397f1c8e9f7c49f95e2 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.3.3-ldflags.patch b/sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.3.3-ldflags.patch deleted file mode 100644 index 51c2b81c1f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.3.3-ldflags.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- pigz-2.3.3/Makefile -+++ pigz-2.3.3/Makefile -@@ -1,11 +1,11 @@ - CC=cc - CFLAGS=-O3 -Wall -Wextra --LDFLAGS=-lz -+LIBS=-lm -lz - ZOPFLI=zopfli/src/zopfli/ - # use gcc and gmake on Solaris - - pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o -- $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm -+ $(CC) $(LDFLAGS) -o pigz $^ -lpthread $(LIBS) - ln -f pigz unpigz - - pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h -@@ -35,7 +35,7 @@ - dev: pigz pigzt pigzn - - pigzt: pigzt.o yarnt.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o -- $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm -+ $(CC) $(LDFLAGS) -o pigzt $^ -lpthread $(LIBS) - - pigzt.o: pigz.c yarn.h try.h - $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c -@@ -44,7 +44,7 @@ - $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c - - pigzn: pigzn.o tryn.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o -- $(CC) $(LDFLAGS) -o pigzn $^ -lm -+ $(CC) $(LDFLAGS) -o pigzn $^ $(LIBS) - - pigzn.o: pigz.c try.h - $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/pigz/metadata.xml index 478203e0a5..90b45f869a 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/metadata.xml @@ -1,15 +1,20 @@ - + - radhermit@gentoo.org - Tim Harder + gyakovlev@gentoo.org + Georgy Yakovlev - A parallel implementation of gzip for modern - multi-processor, multi-core machines. + 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. Install symlinks which override app-arch/gzip implementation + + cpe:/a:zlib:pigz + madler/pigz + diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.3.3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.6.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.3.3.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.6.ebuild index 3b2b6e10e4..73d2eb703c 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.3.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.6.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=7 -inherit toolchain-funcs flag-o-matic eutils +inherit toolchain-funcs flag-o-matic DESCRIPTION="A parallel implementation of gzip" -HOMEPAGE="http://www.zlib.net/pigz/" -SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" +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 ~mips ~sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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(+)]} )" @@ -21,13 +21,9 @@ DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) test? ( app-arch/ncompress )" -src_prepare() { - epatch "${FILESDIR}"/${P}-ldflags.patch -} - src_compile() { use static && append-ldflags -static - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() {