Add patch to support double dash command-line option (--), bug 335852.

Package-Manager: portage-2.2_rc74/cvs/Linux x86_64

4 files changed, 107 insertions, 2 deletions

diff --git a/app-arch/pigz/ChangeLog b/app-arch/pigz/ChangeLog
index 4cb07e14fed5..dad5c6be86ca 100644
--- a/app-arch/pigz/ChangeLog
+++ b/app-arch/pigz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/pigz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.12 2010/04/13 21:41:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/ChangeLog,v 1.13 2010/09/04 13:23:51 spatz Exp $
+
+*pigz-2.1.6-r1 (04 Sep 2010)
+
+  04 Sep 2010; Dror Levin <spatz@gentoo.org> +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 <hwoarang@gentoo.org> pigz-2.1.6.ebuild:
   Stable on amd64 wrt bug #307837
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index bdb4c95ab49c..625956fc1266 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX pigz-2.1.6-doubledash.patch 1770 RMD160 91d8e669782a87af86d24f3139319e2cfecd53a6 SHA1 09af143dc27bb6f8b5202d28c185b2ea8a3ce2ab SHA256 022c35965ad66257d459cb7c2735d32dab53e5407f99943144db777f03edae41
 DIST pigz-2.1.6.tar.gz 52250 RMD160 715a90eefbb9d2f6dbd94ec7ee196a0ea7b32e7f SHA1 df05bdcc7b08246a3c1e6a2ab2edc7d0a45c0369 SHA256 2ff1ba812407848787fe6719fde4436cb7c490e6d8c6e721f4e4309caa5f3640
+EBUILD pigz-2.1.6-r1.ebuild 992 RMD160 832d00a7e56f86d49ed826a49efca54d7fb27e94 SHA1 9d231942112351144a407e86a2f382b63374c497 SHA256 b8db8e46fb20dea10beb9100cc74a456262658fab46f1f462c99b9e2ded3b8e0
 EBUILD pigz-2.1.6.ebuild 993 RMD160 4421e6ef9997963d150a34dde142c7a054a24213 SHA1 bc23e6e08ca3c8c535c2ebb930295c8c8953b4bf SHA256 fde766dfe10f26f159ac396e3dbb354a1b88bd647f790f0822e6bf745778a71d
-MISC ChangeLog 2177 RMD160 bc6c38b8ead0a64514fb6d59624caf91720cf09c SHA1 894c25117b5bd2beddd01f72f346672c96c070e1 SHA256 aade8457fe503b381ae496fd2de47732ef3f7dab087847d5653f5d1ef58c8ce6
+MISC ChangeLog 2384 RMD160 4b05a93775c25fa974dd95be9341206e495d83c6 SHA1 67d0dcb3a5ff49fc1b288a2ebb654fe5261e6450 SHA256 9d96545e8980caf66338f077f61490fe6217e97050be04c29a1c8a4e71c3ebd5
 MISC metadata.xml 386 RMD160 1b2bceb5f7521d8045a72397c020b04bbc3c514a SHA1 523a38ddc2ab640c10973890075ee12e7719005e SHA256 c4afad64c3a04653e2de92884963c97f961ba79a2bd4c46964d138d49b50f645
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBCgAGBQJMgkhwAAoJEAWF714uGAc6LNIIAIcUCAShPdVDap/MN+GwBamU
+8sUnms68LM9VX5ykrJfk4z1eaXHfZPt0KxrAFbjI+CwOgNcUaWD0JCZuk4fScAzB
+x7JIKv33j7Kg9LpgtXtLpH86DWGDARKpdF0FK1wImKy32ksKe/8tBJDq+LYk6Sp2
+l6iLnWNxtgBl4K0QEJaGOADE42NmsjMdxYJJqJHst7r2BFLLCVQ/AvxlSZ/xJEmz
+bREVMKB0TQ442Fqo60MLuLwaNOyaC/GKLQ/DVRaei6bHkMTTttsWtLa8gziWk7d1
++LsBVWogAOpvSucOXDnKbeP1HsCr67hbulCFodgMg8bKWUOuyt8lrWzKMpeg/Vc=
+=XuQz
+-----END PGP SIGNATURE-----
diff --git a/app-arch/pigz/files/pigz-2.1.6-doubledash.patch b/app-arch/pigz/files/pigz-2.1.6-doubledash.patch
new file mode 100644
index 000000000000..d528a7956b76
--- /dev/null
+++ b/app-arch/pigz/files/pigz-2.1.6-doubledash.patch
@@ -0,0 +1,45 @@
+diff --git a/pigz.c b/pigz.c
+index 97e6faa..29d88c3 100644
+--- a/pigz.c
++++ b/pigz.c
+@@ -2940,6 +2940,9 @@ local int option(char *arg)
+                     arg = longopts[j][1];
+                     break;
+                 }
++            /* double dash to terminate option processing */
++            if (*(arg-1) == '-')
++                return 2;
+             if (j < 0)
+                 bail("invalid option: ", arg - 2);
+         }
+@@ -3061,6 +3064,7 @@ int main(int argc, char **argv)
+     int n;                          /* general index */
+     unsigned long done;             /* number of named files processed */
+     char *opts, *p;                 /* environment default options, marker */
++    int doubledash;	            /* -- to terminate option checking */
+ 
+     /* prepare for interrupts and logging */
+     signal(SIGINT, cut_short);
+@@ -3106,15 +3110,20 @@ int main(int argc, char **argv)
+ 
+     /* process command-line arguments */
+     done = 0;
+-    for (n = 1; n < argc; n++)
+-        if (option(argv[n])) {          /* true if file name, process it */
++    doubledash = 0;
++    for (n = 1; n < argc; n++) {
++        int optionreturn = doubledash ? 1 : option(argv[n]);
++        if (optionreturn == 1) { /* true if file name, process it */
+             if (done == 1 && pipeout && !decode && !list && form > 1) {
+                 fprintf(stderr, "warning: output is concatenated zip files ");
+                 fprintf(stderr, "-- pigz will not be able to extract\n");
+             }
+             process(strcmp(argv[n], "-") ? argv[n] : NULL);
+             done++;
++        } else if (optionreturn == 2) {
++            doubledash++;
+         }
++    }
+     option(NULL);
+ 
+     /* list stdin or compress stdin to stdout if no file names provided */
diff --git a/app-arch/pigz/pigz-2.1.6-r1.ebuild b/app-arch/pigz/pigz-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..a2797c34e0c0
--- /dev/null
+++ b/app-arch/pigz/pigz-2.1.6-r1.ebuild
@@ -0,0 +1,38 @@
+# 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-r1.ebuild,v 1.1 2010/09/04 13:23:51 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
+	epatch "${FILESDIR}/${P}-doubledash.patch"
+	tc-export CC
+}
+
+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
+}