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

(Portage version: 2.2_rc86/cvs/Linux x86_64)

2 files changed, 80 insertions, 1 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/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
+}