BSD fixes: Replaced dependency on app-shells/dash with app-shells/bash; Added option to use freebsd-ubin instead of sys-process/time. Removed _X_OPEN_SOURCE from Makefile. Thanks to Alexis Ballier, Laszlo Ersek, and Naohiro Aota for their suggestions in bug 370685.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 119 insertions, 5 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index 01cc1fffdad0..bcd75af1c60b 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.15 2011/08/06 18:53:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.16 2011/08/06 19:19:45 mattst88 Exp $
+
+*lbzip2-0.23-r2 (06 Aug 2011)
+
+  06 Aug 2011; Matt Turner <mattst88@gentoo.org> +files/0.23-Makefile.patch,
+  +lbzip2-0.23-r2.ebuild:
+  BSD fixes: Replaced dependency on app-shells/dash with app-shells/bash; Added
+  option to use freebsd-ubin instead of sys-process/time. Removed
+  _X_OPEN_SOURCE from Makefile. Thanks to Alexis Ballier, Laszlo Ersek, and
+  Naohiro Aota for their suggestions in bug 370685.
 
   06 Aug 2011; Matt Turner <mattst88@gentoo.org> metadata.xml:
   Add myself as a maintainer.
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index a3d7cf7d73a8..361533d4b924 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 0.20-Makefile.patch 1421 RMD160 8ddbb18af454e17b88af17778cf428a03df1daf1 SHA1 dbfed4e90b83cb55d63a82743a1feb4152066d86 SHA256 6e9a50209ce7523af3543b7323ef6c385282d2e6467d6dfa41614142cd7321d4
 AUX 0.22-Makefile.patch 1421 RMD160 8ddbb18af454e17b88af17778cf428a03df1daf1 SHA1 dbfed4e90b83cb55d63a82743a1feb4152066d86 SHA256 6e9a50209ce7523af3543b7323ef6c385282d2e6467d6dfa41614142cd7321d4
+AUX 0.23-Makefile.patch 1389 RMD160 98bcdfba3697608bf46f9f83de63edd1950fe367 SHA1 16c3a8f418554e50b7ca59016983cb539c41fd04 SHA256 1fa306143aa8030381d561c29022bab2775877b7e5dcd3aa63476205ae3c375a
 AUX 0.23-s_isreg.patch 350 RMD160 7df41d6497744477c8976a9d04c607cca3863bec SHA1 26c5dab3730669b6bf36f35ce0258ccdf62a5119 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3e75ed6a149eeb5d1d6
 DIST lbzip2-0.20.tar.gz 75983 RMD160 e2fc720341bcfba65370411bd67b4a484cb41426 SHA1 5ec3dd318c55c8ff9b24ed06a4a4a0cfdae4b71e SHA256 d73942a99f1158bc59bfc5828a2abbe00d738a961651e050fb362621825482da
 DIST lbzip2-0.22.tar.gz 76373 RMD160 2ee38fcab11f8c365d7c403e1f464c06bc13ecd9 SHA1 76e13c4b88e2a055daa73ebab1aa86c17fa1c702 SHA256 759d737928a665f06a690667ae930a1a84d993103ca997b8afeb19ada36060a3
@@ -10,13 +11,14 @@ DIST lbzip2-0.23.tar.gz 77720 RMD160 404cdfdfde7f65f7742a8c9345512238c310d9d8 SH
 EBUILD lbzip2-0.20.ebuild 1321 RMD160 550e6079534d2f156ab41a6c25be5bd0d659143f SHA1 ad8e2f8e6f9b92cc3d1a438905d0570b9bd2f1d4 SHA256 c088c71a173308239a19f8e27f33d256644f534036ce764060c3bd3e00eb47c3
 EBUILD lbzip2-0.22.ebuild 1321 RMD160 e405be2e5ff318bd7dff6d56f1af6106f0677c72 SHA1 c9d29045e5736c7bcb8590cc1fbfdf9010bfcd5c SHA256 197c87e6f251a862e0db92b8a4848d54a0d93a34fdf60f3af0e83dd72827b518
 EBUILD lbzip2-0.23-r1.ebuild 1448 RMD160 9b103758315adb727dc675f5337ca050bd299da2 SHA1 d3fb6d3bda40ca3da3a5919be51b6d2454096889 SHA256 9316072dfd72cdf226c37adc081512073108502fbd70ee8cf7f1503094efd64c
+EBUILD lbzip2-0.23-r2.ebuild 1489 RMD160 c92e2066efd708bf11dd66ea1fe2b37bc6fa28e2 SHA1 a5ede3c1f5821eda53094196d49290c8ba2e14e5 SHA256 afff709d68ed8f50ed228362de61a1c09c9a4bb6c93525f3fe49e460ffd95e12
 EBUILD lbzip2-0.23.ebuild 1364 RMD160 dee822d1c83a2b2bbaa6b2666416a39f9c1a2ca0 SHA1 44476992364550eb5a421a014c22d3d325d2b87d SHA256 976ebb8df12e6c2aaa0368296556a1c5b4ba5d293b3a35cedbdcdc579535b6ea
-MISC ChangeLog 1997 RMD160 23dbc111e906afc08a87c6f58f135511378448c3 SHA1 c858a53c6a639aa6ecfb24d06ddadeb75f5935c9 SHA256 e5a070091ff97e0618cb11a863af626fd6fbc6a7a8869afa27c90661ce2449e3
+MISC ChangeLog 2406 RMD160 ccc557b44342bba05650a431a6f689bf3d080e92 SHA1 3e07f848ebccecc0f2b5ecb6f1c882d6112f1cee SHA256 fdc98c3dbdde3bfe6b21ef27738ae1f2579056667d1cc67778d98c2c3beba9fe
 MISC metadata.xml 520 RMD160 e6a56aa8f6c8d3c98ddfbad46a75c0500ce015ae SHA1 5059d633aad4510ed93a2199e0b635f195e24787 SHA256 7ef596606ea4a9790b7749274a0e476ab83d1107f10a77c5c731e312c9e00d09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk49jboACgkQTVUdg23rv53LyACgiQxqlf3XZ+dp6FlWRTsxllGN
-txUAoIxcSrbxa1WUMh3Pht3q7HmJUE58
-=3XPU
+iEYEARECAAYFAk49k9QACgkQTVUdg23rv53jEACfQYEmO5kq+Whjuao2Fl02lVho
+7qwAn21Xi9gqLfx9VHYIHS/3mif8JXlc
+=2HJx
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/0.23-Makefile.patch b/app-arch/lbzip2/files/0.23-Makefile.patch
new file mode 100644
index 000000000000..9b8b439399cf
--- /dev/null
+++ b/app-arch/lbzip2/files/0.23-Makefile.patch
@@ -0,0 +1,44 @@
+--- Makefile	2009-04-04 00:33:49.000000000 +0200
++++ Makefile.new	2009-04-15 21:12:02.886390550 +0200
+@@ -1,34 +1,26 @@
+ # Makefile,v 1.9 2009-04-03 22:33:49 lacos Exp
+ .POSIX:
+ 
+-CC=gcc
+-CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \
+-    -O2
+-
+-
+-
+-
+-LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS)
+-LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS)
++LIBS=-lpthread -lbz2
+ 
+ lbzip2: main.o lbzip2.o lbunzip2.o lbunzip2_single.o lacos_rbtree.o
+-	$(CC) -o lbzip2 $(LDFLAGS) main.o lbzip2.o lbunzip2.o \
++	$(CC) $(CPPFLAGS) $(LDFLAGS) -o lbzip2 main.o lbzip2.o lbunzip2.o \
+   lbunzip2_single.o lacos_rbtree.o $(LIBS)
+ 
+ main.o: main.c main.h lbunzip2_single.h lbunzip2.h lbzip2.h
+-	$(CC) $(CFLAGS) -c main.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c main.c
+ 
+ lbzip2.o: lbzip2.c main.h lbzip2.h lacos_rbtree.h
+-	$(CC) $(CFLAGS) -c lbzip2.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbzip2.c
+ 
+ lbunzip2.o: lbunzip2.c main.h lbunzip2.h lacos_rbtree.h
+-	$(CC) $(CFLAGS) -c lbunzip2.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2.c
+ 
+ lbunzip2_single.o: lbunzip2_single.c main.h lbunzip2_single.h
+-	$(CC) $(CFLAGS) -c lbunzip2_single.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lbunzip2_single.c
+ 
+ lacos_rbtree.o: lacos_rbtree.c lacos_rbtree.h
+-	$(CC) $(CFLAGS) -c lacos_rbtree.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c lacos_rbtree.c
+ 
+ clean:
+ 	rm -f lbzip2 main.o lbzip2.o lbunzip2.o lbunzip2_single.o \
diff --git a/app-arch/lbzip2/lbzip2-0.23-r2.ebuild b/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
new file mode 100644
index 000000000000..8836d20c458c
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23-r2.ebuild,v 1.1 2011/08/06 19:19:45 mattst88 Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parallel bzip2 utility"
+HOMEPAGE="http://lacos.hu/"
+SRC_URI="http://lacos.web.elte.hu/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="symlink test"
+
+RDEPEND="app-arch/bzip2"
+DEPEND="${REDEPEND}
+	test? (
+		app-shells/bash
+		sys-devel/bc
+		|| ( sys-process/time sys-freebsd/freebsd-ubin )
+	)"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-s_isreg.patch
+	epatch "${FILESDIR}"/0.23-Makefile.patch
+}
+
+src_compile() {
+	append-lfs-flags
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_test() {
+	if [ -t 0 ] || return; then
+		rm -rf "${T}/scratch" "${T}/results" "${T}/rnd"
+		hexdump -n 10485760 /dev/urandom > "${T}/rnd"
+		emake -j1 SHELL="${EPREFIX}/bin/bash --posix" PATH="${S}:${PATH}" TESTFILE="${T}/rnd" check \
+			|| die "make check failed"
+	else
+		ewarn "make check must be run attached to a terminal"
+	fi
+}
+
+src_install() {
+	dobin ${PN} || die "Installation of ${PN} failed"
+	dodoc ChangeLog README || die "no docs"
+	doman ${PN}.1 || die "no man"
+	insinto /usr/share/${PN}
+	doins corr-perf.sh malloc_trace.pl || die
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2 || die
+	fi
+}