app-arch/bzip2: sync

(Portage version: 2.2.10.1-prefix/hg/Linux x86_64, signed Manifest commit with key 0x10FB016B)

5 files changed, 319 insertions, 4 deletions

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 9a2ddf157d..eaae70ba28 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -12,18 +12,32 @@ AUX bzip2-1.0.5-Makefile-libbz2_dylib 1762 SHA256 2faed340d874e8fda2d6d00158501f
 AUX bzip2-1.0.5-checkenv.patch 823 SHA256 13d4f7c38523416d124ba8c6519f31d4f9bd633dca7325e3b78f8bfbc29ecc1e SHA512 332bf4e7fee4f5797183e60c634236f56712b7e8f9f38f1ba8fe342dc4c324876bf69422f3eb0148b406e49b19fb31278f88d27090376206689782b1d9a3294c WHIRLPOOL c24266ac1331415cbd5cba1730d622cb6a2c6590d6ed26fabe241f5c27cea9967368a6fba899de972c6fe2585cdc7a6d91d4010584201c4e6cd7576113076cfd
 AUX bzip2-1.0.5-soldflags.patch 1055 SHA256 76060539c08dea7e7276b1651f5a034caf672ce517c574076b17131d41ce0845 SHA512 4064f9eff3241aca617209f46f5981ea4dd0e19bf04a87e787927bcec64784aadf4fdce43d581de52ef7ada38e89ed7fb9f5acf35f8aefa4d4b7b2577a86bf73 WHIRLPOOL 8dd8215a1a63ece487ac59ebc7989720de611bcbd782a595066abb7ae894601a58de09203f7ef0d009b2da1010457ca74197557bc1c35c85c41ddb2a7caeca37
 AUX bzip2-1.0.6-Makefile-libbz2_dylib 1774 SHA256 b4163f07fc554a9a380cb64b6d648ab158c998a045e08ccd4dacc818a1c835c9 SHA512 1ed4f41e32ba0b407b53a9184dabf241f8cd6c31c6ef065a47581749389b1bbb6fd86c2ffbdb1287627aba0c23a7e81801616dde9200fc64b56cbcd9f5bbb35e WHIRLPOOL 6a6388ecbebd349245e5c2619aa701ab3b3961449cbe9b0ac638c001703486f6c1e2d86502b60fe21b4552a35b5e99c5a13cf1edc2f12f31bd6e798e48f08404
+AUX bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree 1335 SHA256 a67f858abe62451faf2a73508b72bb1f12447a5505b6aca520ecaadf8d9b1b90 SHA512 9066d88ac12a45bd4096b99209a2c86e594aeab31fb0becf23a98ba5e0e9db3f5cdfb34434d5992017ec211b2349b6a9c4164fbbf1dcf3346a3ecb57691dd9b1 WHIRLPOOL 628c06637eb55d1dd55361c4ab1dd23b165fed1ec34507dfe3823b58fd7a8a73e4066ef4920472e42c0187ab8abcf7e8a52974ee5ab87fa804ea0e0ffa097fb5
 AUX bzip2-1.0.6-mingw.patch 556 SHA256 8da568f1d7daac4ac6b9d7946dd3b807e062b5a1710a2548029cc4f158e8d717 SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8 WHIRLPOOL 66cbedef7eef3b4890a56dd0aad28529960c2e205fc7809ded96dd7ece17cdd3f18d92eeca25e009f2ca3689f9ad2d2bf81238562078d4147d87124107ac41af
+AUX bzip2-1.0.6-out-of-tree-build.patch 2121 SHA256 2dd4db48de0a3b1a927725640ad4f56e90d68c33ea3cea9ff0dab7bdb8f7ccc1 SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e WHIRLPOOL 18491f4d99ef866154379112d4c0b840bf6960a116cb03c338aa132cb5440f8cfec8a0933460794902e11b2c0cc13edd99aefc424d3d0f91e4b30d221230ff56
 AUX bzip2-1.0.6-progress.patch 5756 SHA256 f93e6b50082a8e880ee8436c7ec6a65a8f01e9282436af77f95bb259b1c7f7f7 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc WHIRLPOOL 830dab52ec0efd50a0266863dec0180e40db7ef519cd5c02991bc12fb978bb5df5d0329ede896aff02fc2abbfa09c4380949c8f5eb48a9ccbb562675fa5d2003
+AUX bzip2-1.0.6-r7-checkenv.patch 811 SHA256 d5928027625148a0fc395adc2d8a9353b265bcb87e7ec56d455df234cde46a39 SHA512 ca56cf142a99b6b0530221f13ac161f20507ef87443c8097a7647c158ac9684d5787e121c24327a6b418e03cf47e40606c91c7e552c44bcaa2800b420dae0474 WHIRLPOOL 12776268035574f3ff2a70977905f24275f3a9fe2017d85e226964d2ab8ea448b98f43f7c9d97298a5a759dd35e158c647663204cd95c4b90306670b831495b3
 AUX bzip2-1.0.6-saneso.patch 439 SHA256 8345a9fcfce28a459a12126748ac27480a384e80974c31d9fae752d818ea05d9 SHA512 4f5d499227e3381e87c43b4afa48b5cd1f796142805dee19bf7f9f3a8547ca5baaf0b1d1f42079a61b63e3c279650292cca119e7d177ad04425c93e23f1bbd88 WHIRLPOOL 35d83bd455116a1121c87675bf0ceda0e37ac48a76a1379d0455e39026b1445c3d90493923ee1c4c49f3cc388c8344b8a4379d6c44e01564d658ebd22c3a5a10
 DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12 WHIRLPOOL 8e92c24f77c3711f5103a26d6fefbe61fe49a7d1e46879d259d46347c606ca956b7228ab011aa88007db771f86a500d4954057c7f9c70bd8380ca6c9430bd81e
 EBUILD bzip2-1.0.6-r1.ebuild 3796 SHA256 e06ecf3470052e3e3842673f6b70fe775349e2b1d61b7954b9ae31c85ceef97a SHA512 65cb52d4f614ec0b2b8d0a31deee460ad5befd8f51937041f9ef31810fc5b64878b7d98460ebcc1975faaad1c473843c77ed15e6d6d8ffaab9feac7ac5a991df WHIRLPOOL 30c5dd687fce9362f5c21cbe10241d9506395eab577c82d0e434b8df702e20543f65ecfc0f0497dcf750165872d25e0fff374d8a2d42e278500904f2ee78dfbc
 EBUILD bzip2-1.0.6-r3.ebuild 4041 SHA256 3857a5568a10021f90eb68c5f628c57a6cfaf5c924edc9b206a7bd1b9c879e77 SHA512 342cea6ebd73dcfdd795ee447e6ff277115a30f9b40a9bafe2f856f493f65bded5811a62a644cbd4b7f5ef278e24163061ef0a971d8cf2562f3a1a2ef44b5abb WHIRLPOOL 1c44d5b2e7747af81aac8635dd381a6e782552893429a025b7b378fc6a8898bf2bcafcec32b3e5bdfe3ea5aeba43713f037d5b2f0fd010d8f31e066ccc743e2a
+EBUILD bzip2-1.0.6-r7.ebuild 4817 SHA256 826c29014a968cfc08d789d2c66a325c4006bdaa01f0f3798e174f57187f7352 SHA512 459ad9e5da212243af6f676f729b4c244e811e43a1322a98aa1e0ed629574874a9e1c4073c60531aee731977d79e24d7b84ad55d6a265c466ef6c9e96d002c20 WHIRLPOOL 0f4873fbb1bf1cc8d480ee88b47225afb5d050188e4583289cf008b8894c26c1e3cfe5e45218ba251dd94341e87b9725ca0ec02932cd9f3c319ced4f2ccc830f
 MISC ChangeLog 16032 SHA256 87645b94a2b0aff5394ae2853049b844d822aff9d5e6203463ffe74695f0da1b SHA512 2a4079fd2ebd677e1a6226a629714f21d19762751d43d4a5b40afc93b0dcdb7bfd00bbef4729324cf95b0018079c192f0e21afc61be92e3b6bd7a60264b3fed0 WHIRLPOOL 9e3fdd96d0abed7a04747ad7cd4f699f640957b25b1027153d438329e692f7f80da0ff25869b00d0685849bfefb2d952f40e36089aed3ee09960f6f146d18f0a
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEX8HAACgkQX3X2B8XHTombKwCdHkUDSoMj4yfDOJ4c4hW6mfXY
-iZ8AnRpGJ8JeB6GCwWlCS8WVbJjq9OnN
-=e2Ju
+iQIcBAEBCAAGBQJTrPduAAoJEMcu9QQQ+wFr6W0QAKlJEwRzCLPKYUgDlbiZUAU7
+NMlr2HRoJ90l5wPvcnxDksoKJRZQyAhHsRcJ2Nn6ueCOkQ/7fFYOuZPYrM9KB+5p
+meL3xkylRSRYM8xWzC1xUaPly+pSXcPhIVktrBbiUGq8vvWf58wZtphWqR5YlOjF
+WsLEjgi5nn/HQa9rNvCs72NAcYz/u4lhbJsViaXA3wU5oSLamIclhoBZ7JBRpWoF
+qZ6bgvISI09AnKi+4/A+9DixutMeBGa1JRJzQVXlSWxRklfpEP8praxFu/VI33Oc
+v1arXUGcvbjHQ0ukz7APZyhiWoZhakZr8kUJEAy4nW08a931Hu1ydYHvHM0UusQJ
+3llKgkU5bOQl6kw0xGvlZWINd1ZgHEOojpMT/6EanSf0ka7onPXQ7gkgpk1fojmn
+hfU/Qm+ltLAqz6tew+aNP21GTN/ZoDC/E+hvvAQumS5PMOgbCY5ydzQFmtpXUesV
+PHME/b10o1tmdl82bTrOeirS9qi9Nno/s4zaclwHqizY5y5hOaegFZOTjdw2+jM0
+Iw4x/vcH94pzXTGPUXNYvZZwPC8Y7ASArOSo6C+f+i74WbDG2HkvIdjMubtwrwMd
+Wn2zg0a8q0trbLbc6vRh5P5zuFpJqjzkktxbKxJuka56hmth+QVGTzOVFh361qpl
+YzfaHYow65sMWGc7IzBI
+=//W5
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
new file mode 100644
index 0000000000..c3d09996b5
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r7.ebuild,v 1.2 2014/04/28 17:18:31 mgorny Exp $
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=4
+
+inherit eutils toolchain-funcs multilib multilib-minimal prefix
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="static static-libs"
+
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
+	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+	epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+	epatch "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
+
+	epatch "${FILESDIR}"/${PN}-1.0.6-r7-checkenv.patch # for AIX, Darwin?
+	epatch "${FILESDIR}"/${PN}-1.0.4-prefix.patch
+	eprefixify bz{diff,grep,more}
+	# this a makefile for Darwin, which already "includes" saneso
+	cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib-out-of-tree Makefile-libbz2_dylib || die
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+
+	if [[ ${CHOST} == *-hpux* ]] ; then
+		sed -i -e 's,-soname,+h,' Makefile-libbz2_so || die "cannot replace -soname with +h"
+		if [[ ${CHOST} == hppa*-hpux* && ${CHOST} != hppa64*-hpux* ]] ; then
+			sed -i -e '/^SOEXT/s,so,sl,' Makefile-libbz2_so || die "cannot replace so with sl"
+			sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' Makefile-libbz2_so || die "cannt set soname"
+		fi
+	elif [[ ${CHOST} == *-interix* ]] ; then
+		sed -i -e 's,-soname,-h,' Makefile-libbz2_so || die "cannot replace -soname with -h"
+		sed -i -e 's,-fpic,,' -e 's,-fPIC,,' Makefile-libbz2_so || die "cannot replace pic options"
+	fi
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	local checkopts=
+	case "${CHOST}" in
+		*-darwin*)
+			bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib || die
+		;;
+		*-mint*)
+			# do nothing, no shared libraries
+			:
+		;;
+		*)
+			bemake -f "${S}"/Makefile-libbz2_so all || die
+		;;
+	esac
+	# Make sure we link against the shared lib #504648
+	ln -sf libbz2.so.${PV} libbz2.so
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+	into /usr
+
+	if ! tc-is-static-only; then
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2$(get_libname ${PV})
+	local s
+	for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do
+		dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
+	done
+
+	[[ ${CHOST} == *-winnt* ]] && dolib.so libbz2$(get_libname ${PV}).dll
+	fi
+
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		dobin bzip2
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman *.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	local x
+	for x in bunzip2 bzcat bzip2recover ; do
+		dosym bzip2.1 /usr/share/man/man1/${x}.1
+	done
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	dodoc README* CHANGES manual.pdf
+	dohtml manual.html
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+
+	# on windows, we want to continue using bzip2 from interix.
+	# building bzip2 on windows gives the libraries only!
+	[[ ${CHOST} == *-winnt* ]] && rm -rf "${ED}"/bin "${ED}"/usr/bin
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree b/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree
new file mode 100644
index 0000000000..1f0100460a
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib-out-of-tree
@@ -0,0 +1,47 @@
+
+# This Makefile builds a shared version of the library, 
+# libbz2.1.0.6.dylib, with install_name libbz2.1.dylib on Darwin
+#
+# Makefile created and used by Gentoo
+
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.6 of 6 September 2010
+# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
+
+
+SHELL=/bin/sh
+CC=gcc
+BIGFILES=-D_FILE_OFFSET_BITS=64
+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS)
+PREFIX=/usr
+LIBDIR=lib
+SOLDFLAGS=-dynamiclib -install_name $(PREFIX)/$(LIBDIR)/libbz2.1.dylib -compatibility_version 1.0.0 -current_version 1.0.6
+
+OBJS= blocksort.o  \
+      huffman.o    \
+      crctable.o   \
+      randtable.o  \
+      compress.o   \
+      decompress.o \
+      bzlib.o
+
+all: $(OBJS)
+	$(CC) $(LDFLAGS) $(SOLDFLAGS) -o libbz2.1.0.6.dylib $(OBJS)
+	ln -sf libbz2.1.0.6.dylib libbz2.1.0.dylib
+
+
+clean: 
+	rm -f $(OBJS) bzip2.o libbz2.1.0.6.dylib libbz2.1.0.dylib bzip2-shared
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
new file mode 100644
index 0000000000..806339ebb6
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-out-of-tree-build.patch
@@ -0,0 +1,79 @@
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,6 @@ libbz2.a: $(OBJS)
+ 
+ check: test
+ test: bzip2
+-	@cat words1
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
+@@ -66,7 +65,6 @@ test: bzip2
+ 	cmp sample1.tst sample1.ref
+ 	cmp sample2.tst sample2.ref
+ 	cmp sample3.tst sample3.ref
+-	@cat words3
+ 
+ install: bzip2 bzip2recover
+ 	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+@@ -115,25 +113,8 @@ clean:
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+-	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
+ 
+ 
+ distclean: clean
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
+@@ -36,9 +36,7 @@ OBJS= blocksort.o  \
+ 
+ all: $(OBJS)
+ 	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+-	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+-	rm -f libbz2.so.1.0
+-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
++	ln -sf libbz2.so.1.0.6 libbz2.so.1.0
+ 
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+@@ -43,17 +43,5 @@ all: $(OBJS)
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+ 
+-blocksort.o: blocksort.c
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
++%.o: %.c
++	$(CC) $(CFLAGS) -c $<
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-r7-checkenv.patch b/app-arch/bzip2/files/bzip2-1.0.6-r7-checkenv.patch
new file mode 100644
index 0000000000..205515adc4
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-r7-checkenv.patch
@@ -0,0 +1,21 @@
+--- Makefile	2005-02-17 05:28:24.000000000 -0600
++++ Makefile-new	2005-10-12 20:26:29.000000000 -0500
+@@ -42,12 +42,12 @@
+ 
+ check: test
+ test: bzip2
+-	./bzip2 -1  < sample1.ref > sample1.rb2
+-	./bzip2 -2  < sample2.ref > sample2.rb2
+-	./bzip2 -3  < sample3.ref > sample3.rb2
+-	./bzip2 -d  < sample1.bz2 > sample1.tst
+-	./bzip2 -d  < sample2.bz2 > sample2.tst
+-	./bzip2 -ds < sample3.bz2 > sample3.tst
++	$(TESTENV) ./bzip2 -1  < sample1.ref > sample1.rb2
++	$(TESTENV) ./bzip2 -2  < sample2.ref > sample2.rb2
++	$(TESTENV) ./bzip2 -3  < sample3.ref > sample3.rb2
++	$(TESTENV) ./bzip2 -d  < sample1.bz2 > sample1.tst
++	$(TESTENV) ./bzip2 -d  < sample2.bz2 > sample2.tst
++	$(TESTENV) ./bzip2 -ds < sample3.bz2 > sample3.tst
+ 	cmp sample1.bz2 sample1.rb2 
+ 	cmp sample2.bz2 sample2.rb2
+ 	cmp sample3.bz2 sample3.rb2