Version bump (bug #246810 comment #4).

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 74 insertions, 2 deletions

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 50c29febb6ef..66435e2919cf 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/pbzip2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.51 2008/11/17 07:23:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.52 2008/11/17 07:43:54 jer Exp $
+
+*pbzip2-1.0.3 (17 Nov 2008)
+
+  17 Nov 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/pbzip2-1.0.3-uclibc.patch, +pbzip2-1.0.3.ebuild:
+  Version bump (bug #246810 comment #4).
 
   17 Nov 2008; Jeroen Roovers <jer@gentoo.org>
   +files/pbzip2-1.0.2-uclibc.patch, pbzip2-1.0.2-r1.ebuild:
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 3c771f155f27..0c62a15c2882 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,8 +1,11 @@
 AUX pbzip2-1.0.2-uclibc.patch 1256 RMD160 2a3ebf358adb891425c93d070afd03300bc2fba6 SHA1 eafced5179f2498ecee2f8b1215aaeae9e1e5f91 SHA256 b5311d5af7fdd8c1991fa9c20fd92461da7fc1e94a2d0c5a46d1e5d1e96f9669
+AUX pbzip2-1.0.3-uclibc.patch 1169 RMD160 a7d86eb666dcf40e2a748f31a6e3f31e37cb601c SHA1 671bee3d6c84692df5c04ba7360eb57fa283623d SHA256 193c398ee1d9be4cfe21d4220061765b75460eb9172a9b660902cdc653ac1629
 DIST pbzip2-1.0.1.tar.gz 21547 RMD160 e4c0c51c0e566a8434812dddff1db0c85188c72c SHA1 c6e3c9db0ad04de77e98fef4029e9d65cd26ffd7 SHA256 4f478feba99d51602476792897da94fe3b27392c8161eafa116ac4b60ec3c71f
 DIST pbzip2-1.0.2.tar.gz 22777 RMD160 c8ea882ae9d2739250ae3bea514c14537995ed37 SHA1 8ae0ebcd08761332ade6baa4b1172a3f97f71169 SHA256 41c654b493bfd045f3a625ca9f3fb66e327ad0a4395e515c2bd6c3070b83c0e4
+DIST pbzip2-1.0.3.tar.gz 25545 RMD160 111bb62f777664e6681b47a6f4c969d5cd487369 SHA1 9220b12d94aa1221340d1bd499a2be6546f9fa98 SHA256 cd87bf1b57c1774ee0f8037195e2c57351c1c7cc2a7a100df379185f805d9ce5
 EBUILD pbzip2-1.0.1.ebuild 920 RMD160 7d0dc67490455e0cae8d1e77e49874c8aeff0940 SHA1 e49f426dbc970957dc5a98c411b918c756967330 SHA256 1385b1decfd2efe91bb9117f90b48843bf65ed7c5f73cf751c85d9bd872d8738
 EBUILD pbzip2-1.0.2-r1.ebuild 1077 RMD160 a27ca7a518e3af57ea13fc9efdb366bd1f6243eb SHA1 fb71dfcad7ccd5a24ecea151b7391bcb612eaeaa SHA256 f1938329de6662ba9ebb89e97299181492a54737b003d55689e087244a40ccce
 EBUILD pbzip2-1.0.2.ebuild 919 RMD160 0a4b086a19ad079a37f5fb15a1cb1bb9144b24e7 SHA1 f31875328514af8462e69288a6f350d53ee747f6 SHA256 a5d912fb4a2c629896abf047c500f158af341f926a1b89f629b43d2d2e3d5673
-MISC ChangeLog 6478 RMD160 dac55a0376bad4f7b52a9e1f8117be0389ba8d68 SHA1 df96f5dc1b73518637d812447e9929e0385242aa SHA256 b7bdad9c81924c491796c26f5bd937679003d911daaec37e8d0c43bb541c761f
+EBUILD pbzip2-1.0.3.ebuild 1089 RMD160 594ba49a88e391d7957b7fea3e1a00a606fb3faf SHA1 697cdf8d44d6e47d52a92da6ef2c37040c725bc9 SHA256 e5ccf7e55f315b1c56a74bb7c743aa0a636d4afad4d0720558ef5f96068896a4
+MISC ChangeLog 6654 RMD160 f8365567ddf7083e13044e9b3ec35ba4856c7e81 SHA1 fdd1388ab07951d37c29e8f0c55818fe34441dec SHA256 3ef5e3d3163640d628f27c3a1e8e7d77ecc0a9c96d0a68e1ab5f5f7e8267f884
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
diff --git a/app-arch/pbzip2/files/pbzip2-1.0.3-uclibc.patch b/app-arch/pbzip2/files/pbzip2-1.0.3-uclibc.patch
new file mode 100644
index 000000000000..522dc54da1a4
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.0.3-uclibc.patch
@@ -0,0 +1,23 @@
+--- 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/pbzip2-1.0.3.ebuild b/app-arch/pbzip2/pbzip2-1.0.3.ebuild
new file mode 100644
index 000000000000..3a9938c8026e
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.0.3.ebuild,v 1.1 2008/11/17 07:43:54 jer Exp $
+
+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"
+IUSE="static"
+
+DEPEND="app-arch/bzip2"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	sed -e 's:^CFLAGS = .*$:#&:g' -e 's:g++:$(CXX):g' -i ${P}/Makefile || die
+	epatch "${FILESDIR}"/${P}-uclibc.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
+}