Link bzip2 against the shared lib #504648 by Nikoli.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 136 insertions, 15 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 470ba2dbe292..2c89b7694f7a 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.116 2014/03/14 22:36:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.117 2014/03/18 01:21:06 vapier Exp $
+
+*bzip2-1.0.6-r7 (18 Mar 2014)
+
+  18 Mar 2014; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r7.ebuild:
+  Link bzip2 against the shared lib #504648 by Nikoli.
 
   14 Mar 2014; Johannes Huber <johu@gentoo.org> bzip2-1.0.6-r6.ebuild:
   x86 stable, bug #504004
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index f1be847b9ec8..4e2bbd232db9 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -16,23 +16,24 @@ EBUILD bzip2-1.0.6-r2.ebuild 2155 SHA256 664d950904d6a048cb299fc6eb93f18cb820c6f
 EBUILD bzip2-1.0.6-r3.ebuild 2432 SHA256 bf618c1c0e7b8c990001df454ccb6fef913b444aba22b0e701ec24186cee5677 SHA512 a3f794bec32f4a1f2d960b46753c6ff2280ed396f862e17fd94cf4944af6f80a227a61427e2065a18ce3b8b003dd380caf96a51ca9bc9235c279e41465721863 WHIRLPOOL 93d27d6268f78acfcc5aa9feb4c614769cc6c8831287d35e70c71c4732f59546634fac37121fa69afe095685515957c72870f814f4dda6619ce04fe019e3b2a6
 EBUILD bzip2-1.0.6-r4.ebuild 2585 SHA256 83bcff894cd5c1e93e75b05c3a893471bf237d014469f913c6571952f8359d17 SHA512 bbd13ff80f8088ab19bd1c04226a2e1b31e08799ed5cc5ceb2535e22467544c311936dc7e315efb74e938f5057c29ba895bfaa0916f2352a285979f4b8df567f WHIRLPOOL f9275d628719b632a58e1d32e17c51b0773f30144919da05217abfefc40ff2b1f05330b34ed0f27253bec4fefb80335d9f57da21f3352dd781035e355b493220
 EBUILD bzip2-1.0.6-r6.ebuild 3141 SHA256 188c2e419bcb749d266c2bbd6897ab85da855d6cf69eb5f9789124d9888a2acb SHA512 694de34aa9e933018f492f51b879de37ae4367c773a29763386b2059370d017c319ed5992fdf11020f5009d20fa3d1b3b2ee1ee48ed0b93fa2ad75c32b0dce99 WHIRLPOOL de88a085c7be2c53b5a3a3325d7f8f70f2e85223d36fb29bc4c8f017d94fe53f786e0adbbba16648989e21b0674d2dcb1cfaa1c44503d90b9634f5fad274c3cd
+EBUILD bzip2-1.0.6-r7.ebuild 3233 SHA256 52f86ac64e1704dce9e45ff5b966b615ad68724ef374aa0aaf6fb4afb2dfed66 SHA512 7fe9c5c6e47974947d5adbfcbe99d4c91ac5d38f372082991151b51316e9ffe60721fea10a8d45d1c0800788d8c9f6801fd1c680efd16b66cb11cc9a19f17984 WHIRLPOOL d2bfeba6606e0d51a935a9969af3ede5811ed325e4f100c97b80f1b6b0ddd74f980e87edfe89cb6a0785bbd6f287a1b9a548d040ad7e35eb6da1ecceeb10475c
 EBUILD bzip2-1.0.6.ebuild 2045 SHA256 c8d2600e7a05cfe24a1c252ea0a44f66ea6239dc9f87ee8d2c1fd06e32e69196 SHA512 5c8a274078b798d74f66f41fb44691b80f5c077d2f68fd0416fa8d1ab2f4a1fa73d0a6e87c8b8851fb98cd235fd4c10cbc72ef29512b1b27b841e8ed3ab1d725 WHIRLPOOL 8e2215e34cae5792eb025490a9dad88b6458f127ed2dd2abd09e8c973ae5c07e618237b3ff4da1eedebf277f6826cc2e12f859be9ba67df92199aa57e827b04f
-MISC ChangeLog 17617 SHA256 24a68edc89990d6d82962ad694497e68c81a3d463a2c411a3fb413f79c1618f9 SHA512 b62c35df66475242ce3c8762f514f5e992299b646f64e1690e33c0009b93ec4b3aa60445df64432bb72dc8571d0b94409b4c55af9814eceed9ef0bd8f6068d86 WHIRLPOOL a6ab142a58dd2d78f16253cd34cfbf833aedc617370e6cad18bf742d06369acafc640b2617c202492085e6820942041c36fffd9aa31225a4db37caec587c336c
+MISC ChangeLog 17780 SHA256 85b128deac8deaa6c685c35438c340ec123bb128903a635df357e6c003a21326 SHA512 1cca1406fe2063701f87a38815e933169a9380c9f3672108dcd7f715f77a80454287bd11a74cf0996a0c681b267ef215c18770832373e1fd01a1d9e689d29d91 WHIRLPOOL 620bb111d311c6a05638e7fd92a7723c7c579742ebe91b5b24a71773e17ed8bbc8ad53cbdb617913e7f3bb357775148db20c35ea593f102aaebfb48129d60dee
 MISC metadata.xml 241 SHA256 c9ef9f8a652ceb4655983472cec571c6762f53934447a83b38b311cf9e50254d SHA512 23ed7f7371d00caf97235d7a4f905286637cd286f9e8fc7c0413865dbab0772ff00dd9ecf65b5f199d694b42f032dc14ad9d3ac447cf1bb95124abf9203c0f1d WHIRLPOOL d687e040f4378e573d241a08b46ba7bd0f4c9d5ef4c9cf836a479102e5f8902e67244308747adf34b6bc605511244d37873b796f8089dc3e181a627302843d02
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTI4SGAAoJEGVpnaTzz9K90b0QAMkvI3gJdSTI32iguihHKqZP
-0JYhCkkikWZ2eQuRAs5xwqhI5uPc982Y3q8AJK/ZknMsFeXWWWpVICsSko3W5Li0
-qT3gdDLxbYBNjSDYA2R8mPfQRC2gzV8BOrJxZsWqOd/VSTBn2uILRQrtzHL/Q0ER
-t6DIC5+ymuRM4n+TAhXaTF7UA1YJQD3BbhQeZs/NKtnZCs3pMi5VxZL1m4pCew28
-IKVMn/6sHmMPIKMVgr0OyrGvR1M0yw/3vZZFO9zCDxna1HjGm09MI0bZXbDTejTQ
-HOTvwolLRPR8j3blhE5aWh+RJTKiqrwjrNtEhhKoUR0KgVcjXznTKJ7yOlmykQ6e
-H4qxtgnIPLFugLNTGDYJiRimCChStKU8DSUtzoCu3AdzR0WH0PBQajt1dxW71E1b
-0j089L/NrrHVoHWAeUkv/iFaPRFjGTBGfDOtgOW7q05cZo7h2POjrEAgF7rt1xyt
-Fjzm3nXQG8bC5UpxJKMR644odZmrDSYz5ODpYQPUwI5S0cBoei6BK9yV4CuFt2N4
-4k65kBer/7yHMxm+2LPmxOsBzwcvy3sa7EmxT7qyCdGvAWVlAhn9oYdC+qz7SyL9
-zsqws/bmgS2mryWcON3kGDcdtLgyywlEgcFBQsLd8kB8Yhz1VIY5iqbM5gQTaPDQ
-Ya9rq8RbH7ksO0uO9Uuo
-=4djT
+iQIcBAEBCAAGBQJTJ5+JAAoJEPGu1DbS6WIAjysP/RQkIGSvtTE5nNNPOszuQb4+
+Qeu1O20e9La1qzzj6PRgfPCY9flXpI102K+wpmdjMLzuNJiPveXTE3mPBO3TOiIV
+I9NBdqCwydZRkOgb1G23YZt+1QeeSUKc0ejAlEvVEjqDoY/kLp8lsnhQlPGQCNlM
+75d/I03Md1E3AZft4d7/Scy4KqyydsnuA1jXRTK4YVja7oK+uMbhvdJIBtUvjUNC
+HH6hPbR4FPFWvYy3/j2fw+SDZEvXycAphbta3BCLMpGYqCqDCMNO1Np5aycxaVwq
+faWj6o7e3xL8JZ7q6OD15ho5IuqzSkffAiDaz+WZ8DmmU+7taw1oQWS+IKedNLpQ
+dfftxCIHNbTU3I+9m8T+ReICwnJpLC8CerPm5qKHEc1KxjHz6/Ox+uycu7mR71y/
+u348u61r/K1qb+ft6clYEFfiBJ4hU7vZi/WXvoESWM5NpFIRebtcP55ywvdsPupN
++SsL9iztj1ReWL3BNjd4wlf9GInFcjzGxQyX4MMeFQvbe2TRlWbBiX1y9MKIQ5GO
+xIXJJVcPoY9Vf8fIxSAPwyXUoGz2/m1APZadGbYAsWRprCoAKzUUAEbvyCrB/Au9
+EkNle6g48rZHcFys8OYRftwapyJNQVySIcpq4aimybfkC+lXD6J6pbuMuAJu7d5J
+RxwgxuOxNj6yJ5I3wuBx
+=nB3+
 -----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 000000000000..130819917ece
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -0,0 +1,115 @@
+# 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.1 2014/03/18 01:21:06 vapier 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
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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
+
+	# - 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
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# 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
+
+	# 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.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_build_binaries ; 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
+}