Add patch to fix command line handling, bug 302757. Clean old patches.

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

5 files changed, 75 insertions, 48 deletions

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index cd62f58d0244..a0f681c789e3 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/pbzip2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.80 2010/01/25 19:18:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.81 2010/02/09 20:03:12 spatz Exp $
+
+*pbzip2-1.0.5-r3 (09 Feb 2010)
+
+  09 Feb 2010; Dror Levin <spatz@gentoo.org>
+  -files/pbzip2-1.0.2-uclibc.patch, -files/pbzip2-1.0.3-uclibc.patch,
+  +pbzip2-1.0.5-r3.ebuild, +files/pbzip2-1.0.5-fix-stdout-optparse.patch:
+  Add patch to fix command line handling, bug 302757. Clean old patches.
 
   25 Jan 2010; Raúl Porcel <armin76@gentoo.org> pbzip2-1.0.5-r2.ebuild:
   alpha/arm/ia64/m68k/s390/sh stable wrt #300113
diff --git a/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch b/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch
deleted file mode 100644
index 4fe1f48bdac4..000000000000
--- a/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urp pbzip2-1.0.2/pbzip2.cpp pbzip2-1.0.2-uclibc/pbzip2.cpp
---- pbzip2-1.0.2/pbzip2.cpp	2007-07-27 12:41:47.000000000 -0400
-+++ pbzip2-1.0.2-uclibc/pbzip2.cpp	2008-11-14 22:26:24.000000000 -0500
-@@ -128,7 +128,7 @@
- //#define PBZIP_NO_LOADAVG
- 
- // detect systems that are known not to support load average code
--#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__)
-+#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__) || defined(__UCLIBC__)
- 	#define PBZIP_NO_LOADAVG
- #endif
- 
-@@ -1607,7 +1607,11 @@ void usage(char* progname)
- {
- 	banner();
- 	fprintf(stderr, "\nInvalid command line!  Aborting...\n\n");
-+#if defined(PBZIP_NO_LOADAVG)
-+	fprintf(stderr, "Usage: %s [-1 .. -9] [-b#cdfkp#qrtV] <filename> <filename2> <filenameN>\n", progname);
-+#else
- 	fprintf(stderr, "Usage: %s [-1 .. -9] [-b#cdfklp#qrtV] <filename> <filename2> <filenameN>\n", progname);
-+#endif
- 	fprintf(stderr, " -b#      : where # is the file block size in 100k (default 9 = 900k)\n");
- 	fprintf(stderr, " -c       : output to standard out (stdout)\n");
- 	fprintf(stderr, " -d       : decompress file\n");
diff --git a/app-arch/pbzip2/files/pbzip2-1.0.3-uclibc.patch b/app-arch/pbzip2/files/pbzip2-1.0.3-uclibc.patch
deleted file mode 100644
index 522dc54da1a4..000000000000
--- a/app-arch/pbzip2/files/pbzip2-1.0.3-uclibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- pbzip2-1.0.3/pbzip2.cpp.orig	2008-10-31 16:43:33.000000000 +0100
-+++ pbzip2-1.0.3/pbzip2.cpp	2008-11-17 08:31:25.000000000 +0100
-@@ -136,7 +136,7 @@
- //#define PBZIP_NO_LOADAVG
- 
- // detect systems that are known not to support load average code
--#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__)
-+#if defined (WIN32) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (__BORLANDC__) || defined (__hpux) || defined (__osf__) || defined(__UCLIBC__)
- 	#define PBZIP_NO_LOADAVG
- #endif
- 
-@@ -1917,7 +1917,11 @@
- {
- 	banner();
- 	fprintf(stderr, "\nInvalid command line: %s.  Aborting...\n\n", reason);
-+#ifndef PBZIP_NO_LOADAVG
- 	fprintf(stderr, "Usage: %s [-1 .. -9] [-b#cdfklp#qrtV] <filename> <filename2> <filenameN>\n", progname);
-+#else
-+	fprintf(stderr, "Usage: %s [-1 .. -9] [-b#cdfkp#qrtV] <filename> <filename2> <filenameN>\n", progname);
-+#endif
- 	fprintf(stderr, " -b#      : where # is the file block size in 100k (default 9 = 900k)\n");
- 	fprintf(stderr, " -c       : output to standard out (stdout)\n");
- 	fprintf(stderr, " -d       : decompress file\n");
diff --git a/app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch b/app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch
new file mode 100644
index 000000000000..a8de8f5c4165
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch
@@ -0,0 +1,19 @@
+--- pbzip2-1.0.5-orig/pbzip2.cpp	2009-01-08 23:08:17.000000000 +0200
++++ pbzip2-1.0.5/pbzip2.cpp	2010-01-29 20:09:22.031524677 +0200
+@@ -2254,7 +2254,7 @@
+ 			FileList[FileListCount] = stdinFile;
+ 			FileListCount++;
+ 		}
+-		else if (OutputStdOut == 1)
++		else if ((decompress == 0) || (OutputStdOut == 1))
+ 		{
+ 			#ifndef WIN32
+ 			if (isatty(fileno(stdout)))
+@@ -2269,6 +2269,7 @@
+ 			// expecting data from stdin
+ 			FileList[FileListCount] = stdinFile;
+ 			FileListCount++;
++			OutputStdOut = keep = 1;
+ 		}
+ 		else if ((decompress == 1) && (argc == 2))
+ 		{
diff --git a/app-arch/pbzip2/pbzip2-1.0.5-r3.ebuild b/app-arch/pbzip2/pbzip2-1.0.5-r3.ebuild
new file mode 100644
index 000000000000..02d4b5b34973
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.0.5-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.0.5-r3.ebuild,v 1.1 2010/02/09 20:03:12 spatz Exp $
+
+EAPI=2
+
+inherit multilib eutils
+
+DESCRIPTION="parallel bzip2 (de)compressor using libbz2"
+HOMEPAGE="http://compression.ca/pbzip2/"
+SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
+
+LICENSE="PBZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="static symlink"
+
+DEPEND="app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e 's:^CFLAGS = .*$:#&:g' -e 's:g++:$(CXX):g' -i Makefile || die 'sed failed'
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-fix-stdout-optparse.patch
+}
+
+src_compile() {
+	tc-export CXX
+	if use static ; then
+		cp -f /usr/$(get_libdir)/libbz2.a "${S}"
+		emake pbzip2-static || die "Failed to build"
+	else
+		emake pbzip2 || die "Failed to build"
+	fi
+}
+
+src_install() {
+	dobin pbzip2 || die "Failed to install"
+	dodoc AUTHORS ChangeLog README
+	doman pbzip2.1 || die "Failed to install man page"
+	dosym /usr/bin/pbzip2 /usr/bin/pbunzip2
+
+	if use symlink; then
+		dosym /usr/bin/pbzip2 /usr/bin/bzip2
+		dosym /usr/bin/pbzip2 /usr/bin/bunzip2
+		dosym /usr/bin/pbzip2 /usr/bin/bzcat
+	fi
+}