pigz: update to latest upstream version
The new version supports USE=static which we want for use outside of the
chroot.
BUG=chromium-os:32519
TEST=`cbuildbot chromiumos-sdk {amd64,arm,x86}-generic-full` worked
TEST=`emerge pigz` produced a static binary
TEST=`emerge-amd64-generic -pv pigz` showed USE=-static
Change-Id: Ic440f498506887331422314d87bb6a0db6c57c20
Reviewed-on: https://gerrit.chromium.org/gerrit/29355
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 687ca6a..60aad97 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1 +1 @@
-DIST pigz-2.1.6.tar.gz 52250 RMD160 715a90eefbb9d2f6dbd94ec7ee196a0ea7b32e7f SHA1 df05bdcc7b08246a3c1e6a2ab2edc7d0a45c0369 SHA256 2ff1ba812407848787fe6719fde4436cb7c490e6d8c6e721f4e4309caa5f3640
+DIST pigz-2.2.5.tar.gz 49717 SHA256 e37498cbf3a475d7ebe2519751188c29564bf8dd27ba68bd3c7fe1ac08792759 SHA512 b399dee20c3484b5425490ee06404f8c6e3335a1c8eda8f625b62025dba99d2ebdd398a6acd7dd9c44cdb5370ccf66e0a6334bb5aace0a5dee30351cfd3abd4c WHIRLPOOL 178efcb07a79fd7667029c837a19291a73c089cac6dc4c2c8dceeef0ff5e836e26bdfc39d04888ed4896c36c4b52b3d96d344dbf73165acc1f320e1abea83077
diff --git a/app-arch/pigz/pigz-2.1.6.ebuild b/app-arch/pigz/pigz-2.1.6.ebuild
deleted file mode 100644
index 30baada..0000000
--- a/app-arch/pigz/pigz-2.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.1.6.ebuild,v 1.1 2010/01/17 23:24:19 spatz Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A parallel implementation of gzip"
-HOMEPAGE="http://www.zlib.net/pigz/"
-SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
-
-LICENSE="PIGZ"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
-IUSE="symlink test"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
- test? ( app-arch/ncompress )"
-
-src_prepare() {
- sed -i -e '/^CFLAGS=/ d' -e '4s/cc/$(CC) $(LDFLAGS)/' "${S}/Makefile" || die
-}
-
-src_compile() {
- tc-export CC
- emake || die "make failed"
-}
-
-src_install() {
- dobin ${PN} || die "Failed to install"
- dosym /usr/bin/${PN} /usr/bin/un${PN} || die
- dodoc README || die
- doman ${PN}.1 || die
-
- if use symlink; then
- dosym /usr/bin/${PN} /usr/bin/gzip || die
- dosym /usr/bin/un${PN} /usr/bin/gunzip || die
- fi
-}
diff --git a/app-arch/pigz/pigz-2.2.5.ebuild b/app-arch/pigz/pigz-2.2.5.ebuild
new file mode 100644
index 0000000..9a98ab8
--- /dev/null
+++ b/app-arch/pigz/pigz-2.2.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.2.5.ebuild,v 1.2 2012/08/06 19:34:16 vapier Exp $
+
+EAPI="4"
+
+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"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~mips ~sparc x86 ~amd64-linux ~sparc64-solaris"
+IUSE="static symlink test"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ test? ( app-arch/ncompress )"
+
+src_prepare() {
+ sed -i -e '1,3d' -e '5s/$(CC)/$(CC) $(LDFLAGS)/' Makefile || die
+ use static && append-ldflags -static
+ tc-export CC
+}
+
+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
+}
