Version bump, bug 316113. Remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 41 insertions, 14 deletions

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index 55af600fd491..68a60110dabc 100644
--- a/app-arch/pbzip2/ChangeLog
+++ b/app-arch/pbzip2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.83 2010/04/06 07:30:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.84 2010/04/20 12:46:37 spatz Exp $
+
+*pbzip2-1.1.1 (20 Apr 2010)
+
+  20 Apr 2010; Dror Levin <spatz@gentoo.org> -pbzip2-1.0.5-r1.ebuild,
+  +pbzip2-1.1.1.ebuild:
+  Version bump, bug 316113. Remove old.
 
   06 Apr 2010; Markos Chandras <hwoarang@gentoo.org> pbzip2-1.0.5-r2.ebuild:
   Stable on amd64 wrt bug #300113
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 194a8fc2c88c..8dfbc354ac29 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX pbzip2-1.0.5-fix-stdout-optparse.patch 564 RMD160 e9a8ff7ca020dd8ad0325a9545a01f6999312dbe SHA1 c3fd15e958f712089c8c6cda93648061089136ca SHA256 922bef0e5e5d09100868bff2629942b01730be7cfb1354ac621ce22a56ddca48
 AUX pbzip2-1.0.5-ldflags.patch 647 RMD160 a496b710dd484fbd70dd1cf96a39f2d6cef6b6a5 SHA1 98952607e07e6d6fe5d8f20f7d6e4bc79484a86e SHA256 2ec7717f9908360eede500d45cecf2cd819599b32aa858c883d3d705e839a698
 AUX pbzip2-1.1.0-makefile.patch 1797 RMD160 0a81750a8a15b0fc4a3b6281fbb57b5be5983c44 SHA1 7039d02ca14395af74cfafd47990d357bd1a9d23 SHA256 30cb3094cbd2d32e34fbbf5db396697cf21bdbdc1e85376f6d5ad6e16be3f3a0
 DIST pbzip2-1.0.5.tar.gz 26997 RMD160 31b390b3023d8d5b64496b5bb43a11fc253a5b62 SHA1 a4ebe13d9168af17789ef0b49072c64e381d6c71 SHA256 415d8c8a69080b7e55a50784852971fca249cd9e5ec4ada8e617ca2696c9896d
 DIST pbzip2-1.1.0.tar.gz 44102 RMD160 427c9157343f5edf6b220bd2ef60e2ce241d0fb8 SHA1 32c521a887dd12c337cfdeb3cbfd3c95fc574c7e SHA256 d907e4543dd8dcbdf1c4be8c913c56daa20df95e062bc1a307d976b2013c3656
-EBUILD pbzip2-1.0.5-r1.ebuild 1094 RMD160 b5dc2591936d7b355d5fde074fdc06efec9e7b3e SHA1 cff613f7936d4237041ec8b4e9b6b7fef51d00a5 SHA256 855f243691056857c479c241c38974ce1ab07448a701c8bc47dfeacc7bd4403d
+DIST pbzip2-1.1.1.tar.gz 46953 RMD160 ad1755174cdaa7b172f1e0da674f93256d5acaf6 SHA1 605e2cc1596b540358d650bf3ab647ad9152f233 SHA256 f6fc18db5c217e5637c0afa8db81a1c755691f29c42ed2ee0bac7df5103668b4
 EBUILD pbzip2-1.0.5-r2.ebuild 1254 RMD160 96afe6637294dc1dd292b98e21c1821228dfe4c5 SHA1 41ff04d094aeadf3ea1dd47157e186b2f019ce46 SHA256 8ea132373ca25e56e1efd080337c657f1b5aeb93f6f7218661ab1f70860eb061
 EBUILD pbzip2-1.0.5-r3.ebuild 1316 RMD160 b4b68db159b03c45b2e5e9284ea8519e0015be7a SHA1 d16add02bd549915b7fba122edd5a24cf7765472 SHA256 c3af32a2f2940a82649ff46926cf053ee90c97578237ba017fbcdff2bfc65335
 EBUILD pbzip2-1.1.0.ebuild 1178 RMD160 9b93c3d4fe4419da45b4405bed1ba532de64e4ed SHA1 8ba9eb43287936325b83909092ed8b6ead6f1615 SHA256 3727a94a76ad2f4062998ad5cba493547d28c88264fc32a3365741074e21d11a
-MISC ChangeLog 10361 RMD160 124788015b094914ace18954f863165ac77b199c SHA1 37e13ffe5044cd5b7e6795fbfc4645d711754015 SHA256 68e1931ff62436a71442af727e2d6a8602b3558360652344c243209df21d646b
+EBUILD pbzip2-1.1.1.ebuild 1192 RMD160 ffc8fb46a4ba206e6f638137cdcaab45cd6ff793 SHA1 8adac2fb0e6183f11fd126dd314e678c33a7e2ed SHA256 fe40f475c1798ee0417b8362af9a60065210e945c0726e12894112dc63398a46
+MISC ChangeLog 10522 RMD160 6f7bde52945ee5ae5473bb551e5be866e702cf19 SHA1 3c7c4dbae6bc23a43ee1f1a9ce6abfbdfac0c6dd SHA256 2e8ec3738344274e5140c82c69babbeba009ed6aa090fffb4497f921d13a4a38
 MISC metadata.xml 250 RMD160 08f8cb4c4b17b986418f11e803927228d83141c1 SHA1 90963367c7515b7ebd76f633f24371b11a6a7ce5 SHA256 66e248b5390ab7408117c8b0dad7faafc2f8513dbc9ccba42f3a68f4e7eeb713
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLzaJAAAoJEAWF714uGAc6A+AH/RCXVCLp5uq9NXkfBw6O8iM4
+YEuVZbh59BuFIkc4hRr92uV8/fT1Chsc+BNV7egqg97HD3iJJ+dTs/3lE+RGvWH3
+ccXvZsffD8RD18UGuMEv7AZWPxKI4WWd1RNv34EI/hQtYdLCMV+Az0W2J+809a0Y
+q0Go58i/ComOcMYKI4/DtqyZLeF/rM18153RNS3GgPazqRf5SeofLW1oP1YuNBTo
+Mdn7niea1aliJrTdig6MGiTyLBVlHg7xd24A9z2HojcgTod901zQyTBTY7I5daj9
+RkR7YCkDA3iYbOt7ija6epuXVaYNRZx/jOk43z1WV3/htixlkglcogAoojIiNaQ=
+=nxZH
+-----END PGP SIGNATURE-----
diff --git a/app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.1.ebuild
index 617157e9026a..6515ee505588 100644
--- a/app-arch/pbzip2/pbzip2-1.0.5-r1.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.1.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-r1.ebuild,v 1.7 2009/08/09 15:37:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.1.ebuild,v 1.1 2010/04/20 12:46:37 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"
 
 LICENSE="PBZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="static"
+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_unpack() {
-	unpack ${A}
-	sed -e 's:^CFLAGS = .*$:#&:g' -e 's:g++:$(CXX):g' -i ${P}/Makefile || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.0-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"
@@ -34,7 +34,13 @@ 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
+
+	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
 }