Version bump. Fixes bug 320313.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

6 files changed, 78 insertions, 92 deletions

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 9009f6618837..76e3ee3cbc03 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,14 @@
 # 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.93 2010/10/28 20:39:35 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.94 2011/02/20 22:24:38 spatz Exp $
+
+*pbzip2-1.1.2 (20 Feb 2011)
+
+  20 Feb 2011; Dror Levin <spatz@gentoo.org> -pbzip2-1.0.5-r2.ebuild,
+  -pbzip2-1.0.5-r3.ebuild, -files/pbzip2-1.0.5-fix-stdout-optparse.patch,
+  -files/pbzip2-1.0.5-ldflags.patch, +pbzip2-1.1.2.ebuild,
+  +files/pbzip2-1.1.2-makefile.patch:
+  Version bump. Fixes bug 320313.
 
   28 Oct 2010; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
   Added local 'symlink' use description. Discovered when explored bug
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
deleted file mode 100644
index a8de8f5c4165..000000000000
--- a/app-arch/pbzip2/files/pbzip2-1.0.5-fix-stdout-optparse.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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/files/pbzip2-1.0.5-ldflags.patch b/app-arch/pbzip2/files/pbzip2-1.0.5-ldflags.patch
deleted file mode 100644
index 3042b30ea275..000000000000
--- a/app-arch/pbzip2/files/pbzip2-1.0.5-ldflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- pbzip2-1.0.5/Makefile.orig	2009-03-20 20:52:48.000000000 +0100
-+++ pbzip2-1.0.5/Makefile	2009-03-20 20:54:30.000000000 +0100
-@@ -21,11 +21,11 @@
- 
- # Standard pbzip2 compile
- pbzip2: pbzip2.cpp
--	$(CC) $(CFLAGS) $^ -o pbzip2 -pthread -lpthread -lbz2
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o pbzip2 -pthread -lpthread -lbz2
- 
- # Choose this if you want to compile in a static version of the libbz2 library
- pbzip2-static: pbzip2.cpp libbz2.a
--	$(CC) $(CFLAGS) $^ -o pbzip2 -pthread -lpthread -I. -L. -lbz2
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o pbzip2 -pthread -lpthread -I. -L. -lbz2
- 
- # Install the binary pbzip2 program and man page
- install: pbzip2
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
new file mode 100644
index 000000000000..2457f0197be7
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
@@ -0,0 +1,62 @@
+--- Makefile.orig	2011-02-21 00:17:16.334746748 +0200
++++ Makefile	2011-02-21 00:19:16.504881112 +0200
+@@ -2,8 +2,6 @@
+ SHELL = /bin/sh
+ 
+ # Compiler to use
+-CC = g++
+-CFLAGS = -O2
+ #CFLAGS += -g -Wall
+ #CFLAGS += -ansi
+ #CFLAGS += -pedantic
+@@ -12,7 +10,7 @@
+ # Comment out CFLAGS line below for compatability mode for 32bit file sizes
+ # (less than 2GB) and systems that have compilers that treat int as 64bit
+ # natively (ie: modern AIX)
+-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ # Uncomment CFLAGS line below if you want to compile pbzip2 without load
+ # average support for systems that do not support it
+@@ -22,10 +20,10 @@
+ #CFLAGS += -DPBZIP_DEBUG
+ 
+ # Comment out CFLAGS line below to disable pthread semantics in code
+-CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
++CXXFLAGS += -D_POSIX_PTHREAD_SEMANTICS
+ 
+ # Comment out CFLAGS line below to disable Thread stack size customization
+-CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
++CXXFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION
+ 
+ # Comment out CFLAGS line below to explicity set ignore trailing garbage
+ # default behavior: 0 - disabled; 1 - enabled (ignore garbage by default)
+@@ -34,11 +32,11 @@
+ #CFLAGS += -DIGNORE_TRAILING_GARBAGE=1
+ 
+ # On some compilers -pthreads
+-CFLAGS += -pthread
++CXXFLAGS += -pthread
+ 
+ # External libraries
+-LDFLAGS = -lbz2
+-LDFLAGS += -lpthread
++LIBS = -lbz2
++LIBS += -lpthread
+ 
+ # Where you want pbzip2 installed when you do 'make install'
+ PREFIX = /usr
+@@ -47,11 +45,11 @@
+ 
+ # Standard pbzip2 compile
+ pbzip2: pbzip2.cpp BZ2StreamScanner.cpp
+-	$(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
+ 
+ # Choose this if you want to compile in a static version of the libbz2 library
+ pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp libbz2.a
+-	$(CC) $(CFLAGS) $^ -o pbzip2 -I. -L. $(LDFLAGS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2 -I. -L.
+ 
+ # Install the binary pbzip2 program and man page
+ install: pbzip2
diff --git a/app-arch/pbzip2/pbzip2-1.0.5-r2.ebuild b/app-arch/pbzip2/pbzip2-1.0.5-r2.ebuild
deleted file mode 100644
index f879d132fe52..000000000000
--- a/app-arch/pbzip2/pbzip2-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,47 +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/pbzip2/pbzip2-1.0.5-r2.ebuild,v 1.8 2010/04/06 07:30:44 hwoarang 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
-}
-
-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
-}
diff --git a/app-arch/pbzip2/pbzip2-1.0.5-r3.ebuild b/app-arch/pbzip2/pbzip2-1.1.2.ebuild
index 02d4b5b34973..ec0d236655c6 100644
--- a/app-arch/pbzip2/pbzip2-1.0.5-r3.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.2.ebuild,v 1.1 2011/02/20 22:24:38 spatz Exp $
 
 EAPI=2
 
 inherit multilib eutils
 
-DESCRIPTION="parallel bzip2 (de)compressor using libbz2"
+DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/"
 SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
 
@@ -19,13 +19,11 @@ 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
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	tc-export CXX
 }
 
 src_compile() {
-	tc-export CXX
 	if use static ; then
 		cp -f /usr/$(get_libdir)/libbz2.a "${S}"
 		emake pbzip2-static || die "Failed to build"
@@ -36,7 +34,7 @@ src_compile() {
 
 src_install() {
 	dobin pbzip2 || die "Failed to install"
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS ChangeLog README || die
 	doman pbzip2.1 || die "Failed to install man page"
 	dosym /usr/bin/pbzip2 /usr/bin/pbunzip2