Restore libbz2.so.1.0 symlink and document why it is kept around #338321 by Nathan Caldwell.

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

3 files changed, 86 insertions, 6 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index e84a1fb232ab..3695571d0e8a 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.80 2010/09/22 13:06:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.81 2010/09/23 09:19:49 vapier Exp $
+
+*bzip2-1.0.6-r1 (23 Sep 2010)
+
+  23 Sep 2010; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r1.ebuild:
+  Restore libbz2.so.1.0 symlink and document why it is kept around #338321
+  by Nathan Caldwell.
 
   22 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> bzip2-1.0.6.ebuild:
   Stable on x86 per bug #338215. Thanks to Thomas Kahle for testing.
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 951eeb8f41e1..5124265f0f12 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX bzip2-1.0.2-progress.patch 6141 RMD160 213842d0d7742dce4c1d938b79134b9e910bc8ec SHA1 90a0032645886b633c9b730d0a1abb88c88a9873 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787
 AUX bzip2-1.0.3-no-test.patch 161 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f1 SHA1 6a8a9495e71f291aaf5bd89b134e83ccd0b5e006 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49
@@ -11,13 +11,14 @@ AUX bzip2-1.0.6-saneso.patch 439 RMD160 9738dcd8bd4c482ea3bec4409a9e5bce49ef82eb
 DIST bzip2-1.0.5.tar.gz 841402 RMD160 2b31a22138e3914d82a656fee28e2bf029cbc3d4 SHA1 8b02713ea0c8eb501cc8bdac4432d7f29700f767 SHA256 f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
 DIST bzip2-1.0.6.tar.gz 782025 RMD160 cc31bbae95e8eec259cef7627eae0c667654a339 SHA1 3f89f861209ce81a6bab1fd1998c0ef311712002 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 EBUILD bzip2-1.0.5-r1.ebuild 2244 RMD160 ad29267336ca62e0d0958145824ec4d919590bc9 SHA1 d8010ed719d3c83a11a4724c0f9c13931819577c SHA256 6956b9abd9e83ffeae1f17a4c903578eed16bcafe7ee4be8210c6dffba2da0df
+EBUILD bzip2-1.0.6-r1.ebuild 2183 RMD160 a1e61ea3f7afa19c5b00d40e1b8712668aed46f2 SHA1 1d9a42eafef0a0b86bea516e1dcdd3ee8c053e1f SHA256 4d7615ffc4a8b3fa39d5626a7c2fa3d18ec9e34577a6983bf0c87039f1c2bbe3
 EBUILD bzip2-1.0.6.ebuild 2055 RMD160 43b0aebd15b045f32ee4ebb0e121a39e2dc8830c SHA1 f11541515ed99edbd844195333b87d4b95123ccd SHA256 cc4609e433e270673e5d6f2a97733cf23c381ddd1f13f49bf5c52fefefe22045
-MISC ChangeLog 12879 RMD160 1fd2a60d15d5b712e718a1fecc9d70c58d8abc99 SHA1 23dccfa8f6a837a2252ac15df732adc263d49326 SHA256 f9e651b2239999d9ab2ea8f8b1fc6f6a15a009e8d9ea4f64f4a3885bc223e37a
+MISC ChangeLog 13079 RMD160 d94f80075c2531ed336ac4c5da02abb6e757be57 SHA1 280a97a6f93d7a0a33705e832a30884a09da879f SHA256 40925f8ec24e675677d77fd5e3dfbfdd3a34edeb8e5b1d703bbb96de0171acff
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyZ/0oACgkQHB6c3gNBRYcCWACfRL8w6DhaDPhiRs8k9tLlkrlv
-6xsAoKUhyW5Sxsim+UzXvoIz1cL/BedH
-=jate
+iF4EAREIAAYFAkybG6EACgkQTwhj9JtAlp5ctQEAwG3cX64JBr50wMF0uI5iBftM
+Z3z8UiKNrN85AC5icxgBAKEXOWWpWHJW1T2JnVjWJjtxnCcCtGIeUlrZ0tVN1Fz1
+=raoL
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r1.ebuild b/app-arch/bzip2/bzip2-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..5315ab1fbab3
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/09/23 09:19:49 vapier Exp $
+
+inherit eutils multilib toolchain-funcs flag-o-matic
+
+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 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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.2-progress.patch
+	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+
+	# - 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 :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@" || die
+}
+src_compile() {
+	bemake -f Makefile-libbz2_so all || die
+	use static && append-flags -static
+	bemake all || die
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr LIBDIR=$(get_libdir) install || die
+	dodoc README* CHANGES bzip2.txt manual.*
+
+	# 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} || die
+	local s
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} || die
+	done
+	gen_usr_ldscript -a bz2
+
+	if ! use static ; then
+		newbin bzip2-shared bzip2 || die
+	fi
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dodir /bin
+	mv "${D}"/usr/bin/b{zip2,zcat,unzip2} "${D}"/bin/ || die
+	dosym bzip2 /bin/bzcat || die
+	dosym bzip2 /bin/bunzip2 || die
+}