Fix broken USE=static handling and respect env CPPFLAGS.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 23 insertions, 30 deletions

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 4693041b00f8..c371a0718584 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/pbzip2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.96 2011/08/02 19:17:04 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.97 2011/09/02 21:12:15 vapier Exp $
+
+  02 Sep 2011; Mike Frysinger <vapier@gentoo.org>
+  files/pbzip2-1.1.2-makefile.patch, pbzip2-1.1.5.ebuild:
+  Fix broken USE=static handling and respect env CPPFLAGS.
 
 *pbzip2-1.1.5 (02 Aug 2011)
 
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index b1cac8abe441..5b087b35fe91 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX pbzip2-1.1.0-makefile.patch 1797 RMD160 0a81750a8a15b0fc4a3b6281fbb57b5be5983c44 SHA1 7039d02ca14395af74cfafd47990d357bd1a9d23 SHA256 30cb3094cbd2d32e34fbbf5db396697cf21bdbdc1e85376f6d5ad6e16be3f3a0
-AUX pbzip2-1.1.2-makefile.patch 2008 RMD160 e8c9d6bee70546bcec7448f005d00b6d84f25a09 SHA1 9cd271d6d83f074d77a8e1af125190ba55c0b2a0 SHA256 2780b3ddc67ea73b191b4ca506648679cccc39107d03641fe1d8b06e79b1992e
+AUX pbzip2-1.1.2-makefile.patch 2032 RMD160 732e0e92f5eac57e7ad915580ad6557170dff92e SHA1 c3f8836b2de2d015a689b8a99b46e3be6f6fea9e SHA256 8f4d25eb91ed5e485f3e36d9f13c4611843c23d7cabffdbb8235af788314f5a7
 DIST pbzip2-1.1.1.tar.gz 46953 RMD160 ad1755174cdaa7b172f1e0da674f93256d5acaf6 SHA1 605e2cc1596b540358d650bf3ab647ad9152f233 SHA256 f6fc18db5c217e5637c0afa8db81a1c755691f29c42ed2ee0bac7df5103668b4
 DIST pbzip2-1.1.4.tar.gz 51027 RMD160 9526a9da53c01e8e80b27af6d30b7bba341610c6 SHA1 862603fd9946fce2dd15a555bbb40642e21b576a SHA256 b1dcd2a39ecbd147386bc43901bb5159e2526757c42a780ff44b9747c39ac371
 DIST pbzip2-1.1.5.tar.gz 51337 RMD160 4892bf6e88af3a2cd0fca904b2a4862f9778664a SHA1 047d4d6403a6663a2247f1c194e67dc9f787c807 SHA256 5af02b79dcebd6bbf6d93e40f8a5d5eca0b3da363b3399dbd5170f840364d323
 EBUILD pbzip2-1.1.1.ebuild 1182 RMD160 f6df19fdb01aca8271c14563c598a3cf4d5411d2 SHA1 0b21a2fdfb47c61214be2b0b2084ea8f7d59e993 SHA256 29a5e75604f325788138211c583b8a7b293abf61ac8608e4e9c1a0b5a0921d9b
 EBUILD pbzip2-1.1.4.ebuild 1192 RMD160 d506fb05b55f687ea9c43bcf247b990a7ae110c0 SHA1 63486bd839f868685ce5662a960d5801b9461d3a SHA256 5e41282ba869bc3a0e3ee670e9491930a432c5e7e0cfca2742808cf22e5d129d
-EBUILD pbzip2-1.1.5.ebuild 1192 RMD160 ec3707aa942c261ce6369d1c40006a8a74b31245 SHA1 af092da8f2166857d530b7f35b48fd2f9e5b89ae SHA256 4d805933611f6835e372e6cabb1e11a5bf8b7aef1d4fec2ab9fc79579f3abaab
-MISC ChangeLog 12147 RMD160 4de2ae3bda6d04c4e93e8e63b0dd307c9aac85b9 SHA1 69d944cc1ce6c9a289ac0450d61298df8818d456 SHA256 ca61c5b51d42e4e943b95a720a250c5c430a5d4052dbd0a12c40ebdaf3c89bde
+EBUILD pbzip2-1.1.5.ebuild 1017 RMD160 80d459b3cb99a05fb764fb1ad33a8296649a7330 SHA1 56b7f7861b4fb347b5266cf90120aa318a8ce37e SHA256 30f73e761a61e1385cf7485df3c82a97a862ce8805ebfe1e8994b3f45caf6a61
+MISC ChangeLog 12316 RMD160 6f7f469b6fff97c336053f7d654050428ce21c4a SHA1 2f297a4a2de6ceb963ba3ab3be8d0ef7ab75127c SHA256 db1a8b1ec573fc1da18e4e42c29dd20793512a292a366c78bec4b2a99246544d
 MISC metadata.xml 368 RMD160 8935209d9c697a9312fcbc87a82b4ad9ee46a741 SHA1 f2988d3d361c0b5d096c6bf44ace87a775668fd5 SHA256 52b61e7c958e5bca86fc0d33219e84942f62bb80410b706bd8c82da949589ddd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOOE08AAoJEAWF714uGAc66iIIAJ48driD2qDagx37uGAp1Gu9
-4oLX4HYOhffK2rEuzHPLAFZ9Po+nfFdAqza8r5HxUFdzj5gglmyBBfb6wBXmKiLt
-RxHH2Tfvg7cNq+8UPa7dU4KW/ivFFPetuqefaxPD9r4JIF89WhAb7abJjoGqbP/G
-nDX4QRkDUgZv9qM11l0H2kCm1sI8oVeP3yETntSzaoN22t2aKZGCbs7Fse04EDLZ
-KPlb+yDBvIVP7gBbykjG9wR/a+DwcaLZNkdpT+ZkRZIO/7ksyQCsCi7d45Tv2Dg6
-n2cahFawFtccbGp6CrPq4szyOOdrUOLPblzYwqB1Gbc8oPySeSk95Rsdqb0fN+Q=
-=qQqh
+iF4EAREIAAYFAk5hRrYACgkQaC/OocHi7JbFrwD9Gj7VYpcT6fSqreVs7dZDk4tC
+5gZLCmVihqC/Xq/G0W4BAJTbazIgt1lgHjcp4/x/aiF+05qu0b8NM7Nb0f34Fnp2
+=/8jL
 -----END PGP SIGNATURE-----
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
index 2457f0197be7..cc4cb2b15b72 100644
--- a/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
+++ b/app-arch/pbzip2/files/pbzip2-1.1.2-makefile.patch
@@ -51,12 +51,12 @@
  # Standard pbzip2 compile
  pbzip2: pbzip2.cpp BZ2StreamScanner.cpp
 -	$(CC) $(CFLAGS) $^ -o pbzip2 $(LDFLAGS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o pbzip2
++	$(CXX) $(CPPFLAGS) $(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.
++	$(CXX) $(CPPFLAGS) $(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.1.5.ebuild b/app-arch/pbzip2/pbzip2-1.1.5.ebuild
index ae846a1dd127..5c6c5ef17958 100644
--- a/app-arch/pbzip2/pbzip2-1.1.5.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.5.ebuild
@@ -1,10 +1,10 @@
 # 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.1.5.ebuild,v 1.1 2011/08/02 19:17:04 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.2 2011/09/02 21:12:15 vapier Exp $
 
 EAPI=4
 
-inherit multilib eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
 HOMEPAGE="http://compression.ca/pbzip2/"
@@ -21,26 +21,19 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.2-makefile.patch
 	tc-export CXX
-}
-
-src_compile() {
-	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
+	use static && append-ldflags -static
 }
 
 src_install() {
 	dobin pbzip2 || die "Failed to install"
 	dodoc AUTHORS ChangeLog README || die
 	doman pbzip2.1 || die "Failed to install man page"
-	dosym /usr/bin/pbzip2 /usr/bin/pbunzip2
+	dosym 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
+	if use symlink ; then
+		local s
+		for s in bzip2 bunzip2 bzcat ; do
+			dosym pbzip2 /usr/bin/${s} || die
+		done
 	fi
 }