Patch for uclibc support (no getloadavg, bug #246810). Let make pick up CFLAGS from environment. Use canonical CXX.

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

4 files changed, 38 insertions, 16 deletions

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 31e33539d40e..e479ecef3e32 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.49 2008/08/02 21:23:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.50 2008/11/17 07:21:43 jer Exp $
+
+  17 Nov 2008; Jeroen Roovers <jer@gentoo.org>
+  +files/pbzip2-1.0.2-uclibc.patch, pbzip2-1.0.2-r1.ebuild:
+  Patch for uclibc support (no getloadavg, bug #246810). Let make pick up
+  CFLAGS from environment. Use canonical CXX.
 
   02 Aug 2008; Markus Rothe <corsair@gentoo.org> pbzip2-1.0.2-r1.ebuild:
   Stable on ppc64; bug #229881
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 0e89d8bfa1d1..bfaf89462365 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX pbzip2-1.0.2-uclibc.patch 1256 RMD160 2a3ebf358adb891425c93d070afd03300bc2fba6 SHA1 eafced5179f2498ecee2f8b1215aaeae9e1e5f91 SHA256 b5311d5af7fdd8c1991fa9c20fd92461da7fc1e94a2d0c5a46d1e5d1e96f9669
 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
 EBUILD pbzip2-1.0.1.ebuild 920 RMD160 7d0dc67490455e0cae8d1e77e49874c8aeff0940 SHA1 e49f426dbc970957dc5a98c411b918c756967330 SHA256 1385b1decfd2efe91bb9117f90b48843bf65ed7c5f73cf751c85d9bd872d8738
-EBUILD pbzip2-1.0.2-r1.ebuild 998 RMD160 1b24a586a0a007c23a937c94464db7bfd77c7867 SHA1 f61a014f952122b047745b9d5c854fba206f42e6 SHA256 1e92e97ce9236d4839bcfe456d1ce21c0896bf78bfe8aa7d15fcb52df4e9042f
+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 6229 RMD160 2b6dd9ea884c5b4c387fb65a0da3b1dc73e82e05 SHA1 461db85e2cb36180bf445d604903bb98310a049a SHA256 52e01b98cfc48efc4dc0920c29a04e899a6279b0ab77d326457f0d45ba751fa4
+MISC ChangeLog 6453 RMD160 2cfa4299868d6cf2256691b3b69762e11f806429 SHA1 3e281a0cff598351d5899d9683a8489d47e1199b SHA256 b04e24ead4f98033e61911af38443a743986f78dcce54eda3f74f7fd60fdd96a
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjgM4kACgkQ67wieSYcaxcYPgCgiUh/nBCAkCTuavqcjdfjUBUW
-Ld4An0T6ow5dBJHDxnppEVRahdZoPaBC
-=QTfM
------END PGP SIGNATURE-----
diff --git a/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch b/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch
new file mode 100644
index 000000000000..4fe1f48bdac4
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.0.2-uclibc.patch
@@ -0,0 +1,24 @@
+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/pbzip2-1.0.2-r1.ebuild b/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild
index 0f63f39a7181..144f9f810381 100644
--- a/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.2-r1.ebuild,v 1.8 2008/09/29 01:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.0.2-r1.ebuild,v 1.9 2008/11/17 07:21:43 jer Exp $
 
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/"
@@ -18,10 +18,12 @@ RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	sed -i -e 's:-O3:${CFLAGS}:g' ${P}/Makefile || die
+	sed -e 's:-O3:$(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"