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 <holger.hoffstaette@googlemail.com>, bug 294752.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

5 files changed, 95 insertions, 9 deletions

diff --git a/app-arch/pigz/ChangeLog b/app-arch/pigz/ChangeLog
index 4796ed8f51d4..836182b5c9cf 100644
--- a/app-arch/pigz/ChangeLog
+++ b/app-arch/pigz/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/pigz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.6 2009/11/02 17:58:48 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.7 2009/12/31 16:22:52 spatz Exp $
+
+*pigz-2.1.5-r1 (31 Dec 2009)
+
+  31 Dec 2009; Dror Levin <spatz@gentoo.org> +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 <holger.hoffstaette@googlemail.com>, bug 294752.
 
   02 Nov 2009; Víctor Ostorga <vostorga@gentoo.org> -pigz-2.1.4.ebuild,
   -files/pigz-2.1.4-respect-flags.patch, pigz-2.1.5.ebuild:
diff --git a/app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch b/app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch
new file mode 100644
index 000000000000..d39b7e01f569
--- /dev/null
+++ b/app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch
@@ -0,0 +1,12 @@
+diff -u pigz-2.1.5/pigz.c pigz-2.1.5-fix/pigz.c
+--- pigz-2.1.5/pigz.c	2009-07-20 04:42:00.000000000 +0200
++++ pigz-2.1.5-fix/pigz.c	2009-10-25 15:52:22.000000000 +0100
+@@ -2498,7 +2498,7 @@
+                         in);
+             return;
+         }
+-        if ((st.st_mode & S_IFMT) == S_IFLNK && !force) {
++        if ((st.st_mode & S_IFMT) == S_IFLNK && !force && !pipeout) {
+             if (verbosity > 0)
+                 fprintf(stderr, "%s is a symbolic link -- skipping\n", in);
+             return;
diff --git a/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch b/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch
new file mode 100644
index 000000000000..884854fe1d30
--- /dev/null
+++ b/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch
@@ -0,0 +1,22 @@
+--- ../pigz-2.1.5/pigz.c	2009-07-20 04:42:00.000000000 +0200
++++ pigz.c	2009-11-24 10:50:13.000000000 +0100
+@@ -3075,9 +3075,17 @@
+     if (argc < 2 && isatty(1))
+         help();
+ 
+-    /* decompress if named "unpigz" */
++    /* find program name */
+     p = strrchr(argv[0], '/');
+-    if (strcmp(p == NULL ? argv[0] : p + 1, "unpigz") == 0)
++    if (p == NULL) {
++        p = argv[0];
++    }
++    else {
++        ++p;
++    }    
++
++    /* decompress if named "unpigz" or "gunzip" */
++    if ((strcmp(p, "unpigz") == 0) || (strcmp(p, "gunzip") == 0))
+         decode = 1, headis = 0;
+ 
+     /* process command-line arguments */
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 545097ac8950..77e8131fcfef 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-A parallel implementation of gzip for modern
-multi-processor, multi-core machines.
-</longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>spatz@gentoo.org</email>
+		<name>Dror Levin</name>
+	</maintainer>
+	<longdescription lang="en">
+		A parallel implementation of gzip for modern
+		multi-processor, multi-core machines.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-arch/pigz/pigz-2.1.5-r1.ebuild b/app-arch/pigz/pigz-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..0606feee86ed
--- /dev/null
+++ b/app-arch/pigz/pigz-2.1.5-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.1.5-r1.ebuild,v 1.1 2009/12/31 16:22:52 spatz Exp $
+
+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"
+IUSE="symlink test"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? ( app-arch/ncompress )"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-respect-flags.patch
+	epatch "${FILESDIR}"/${P}-decode-symlinks-to-stdout.patch
+	epatch "${FILESDIR}"/${P}-gunzip-compat.patch
+}
+
+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
+}