From: Dror Levin <spatz@gentoo.org>
Date: Sat, 13 Mar 2010 23:35:04 +0000 (+0000)
Subject: Version bump.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e5d34c175b8a53675c2768c15bfd7bd395d420d;p=gentoo.git

Version bump.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog
index a0f681c789e3..cc3b97e57962 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.81 2010/02/09 20:03:12 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.82 2010/03/13 23:35:03 spatz Exp $
+
+*pbzip2-1.1.0 (13 Mar 2010)
+
+  13 Mar 2010; Dror Levin <spatz@gentoo.org> +pbzip2-1.1.0.ebuild,
+  +files/pbzip2-1.1.0-makefile.patch:
+  Version bump.
 
 *pbzip2-1.0.5-r3 (09 Feb 2010)
 
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index ddb15cc0e180..132fe733e5eb 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -3,20 +3,23 @@ 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
 EBUILD pbzip2-1.0.5-r2.ebuild 1254 RMD160 e9d33d9458858e1328cc892f76ea02c432e79375 SHA1 2d47237eea4f7b406f97f9130ceda9d56d89735b SHA256 b06a60ba73b4bd2d88255568778952866e07b97bc17d778a37266392e6879670
 EBUILD pbzip2-1.0.5-r3.ebuild 1316 RMD160 b4b68db159b03c45b2e5e9284ea8519e0015be7a SHA1 d16add02bd549915b7fba122edd5a24cf7765472 SHA256 c3af32a2f2940a82649ff46926cf053ee90c97578237ba017fbcdff2bfc65335
-MISC ChangeLog 10095 RMD160 e6f0c34b895345e8b9488df224d8ad4f2e9cb9ec SHA1 1bf6219fa1e9260193d4eee68ebaff84e0043ac4 SHA256 503aaca16aa2128a680aae1487d4e6e9fb5b43b69343dda1b54df2c16c6bac04
+EBUILD pbzip2-1.1.0.ebuild 1178 RMD160 9b93c3d4fe4419da45b4405bed1ba532de64e4ed SHA1 8ba9eb43287936325b83909092ed8b6ead6f1615 SHA256 3727a94a76ad2f4062998ad5cba493547d28c88264fc32a3365741074e21d11a
+MISC ChangeLog 10246 RMD160 04003f993ad7f03d8639f5eff886bb74e11bc4ac SHA1 30ec3d93a053cdc1afd3be0a3e2dce53e4bbb6d5 SHA256 1323c2637dfae1f733d0e9c1a2d21cdf5169ce13c9a2590cd9ccd4c571f9e0c6
 MISC metadata.xml 250 RMD160 08f8cb4c4b17b986418f11e803927228d83141c1 SHA1 90963367c7515b7ebd76f633f24371b11a6a7ce5 SHA256 66e248b5390ab7408117c8b0dad7faafc2f8513dbc9ccba42f3a68f4e7eeb713
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLcb+KAAoJEAWF714uGAc6dIQH/30X0PAUEKNE/843HJxwjI0X
-ayIX+hCU5KSM83k44n79uzfxtDY5oTpysig81KkCyfLHzvJDxvVGRQP6/tkUgcjs
-kWEyMkgJJfJNc/zuXMY/LH3WyTJVGv5Np/oiDNDLKg2lyPB5AUNDs5juxYPwes3y
-rLhS/BxCStNNnnn89+WepcL1GIM9vkhZo0tidxU/BVm3DgCR37u6xpyGdNyoEjJ4
-UnKEgzT2CmrZO4aTXu8Cc3O97qS3Hpyz11K1n3tjRw96zC2XAJykESFbELV4KEeB
-8si6RviDxAVU0jr6CrqVYI3wL0tfGFvdJWOXnxmj6CPbL3HnIiw+AB9nP65D3kg=
-=Wyzd
+iQEcBAEBCgAGBQJLnCEvAAoJEAWF714uGAc6GSoH/1aMh1U39l/QpE9r0GwrmcEI
+oyqaJHN8zo6BRxr32kl5W7t5ZZ81W/vlFkKIKksaQFrCm1ZEinGms/cy6h2DnyhV
+Y6zlKbSSyzQUfVuDhEbLBzZvfBFdLV3geu7W2g0up0o4oyTCi70JuBUQYHUshxBC
+OpNU2FLC+xtLh+GChbk/F4II9NJiD3oKzYF0FBteAm0OsY6b9GseIXMQ6A1XbBqX
+e+T0coO3tvSkwtALUAFZCESKj6VV2/OIOGRDiUJtVH8tmNXbTIK5dY/3sQQAvDfr
+QtNb2ZQJRcEqXfDiIRc62aV1ygIiTSoojm5vDvSCrwZcAYZP3J6BQZJnrP9P3vE=
+=vD+E
 -----END PGP SIGNATURE-----
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.0-makefile.patch b/app-arch/pbzip2/files/pbzip2-1.1.0-makefile.patch
new file mode 100644
index 000000000000..81885e56ef33
--- /dev/null
+++ b/app-arch/pbzip2/files/pbzip2-1.1.0-makefile.patch
@@ -0,0 +1,57 @@
+--- Makefile.orig	2010-03-14 01:24:19.049620304 +0200
++++ Makefile	2010-03-14 01:29:23.231630037 +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,17 +20,17 @@
+ #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
+ 
+ # 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
+@@ -41,11 +39,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.1.0.ebuild b/app-arch/pbzip2/pbzip2-1.1.0.ebuild
new file mode 100644
index 000000000000..84b4fc163192
--- /dev/null
+++ b/app-arch/pbzip2/pbzip2-1.1.0.ebuild
@@ -0,0 +1,46 @@
+# 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.1.0.ebuild,v 1.1 2010/03/13 23:35:03 spatz 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() {
+	epatch "${FILESDIR}"/${P}-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
+}
+
+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
+}