Version bump #338215 by Dirkjan Ochtman.

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

3 files changed, 88 insertions, 1 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 653dcca8a717..c3c0a141ffae 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.75 2010/08/14 20:05:30 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.76 2010/09/20 22:30:46 vapier Exp $
+
+*bzip2-1.0.6 (20 Sep 2010)
+
+  20 Sep 2010; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6.ebuild,
+  +files/bzip2-1.0.6-saneso.patch:
+  Version bump #338215 by Dirkjan Ochtman.
 
   14 Aug 2010; Harald van Dijk <truedfx@gentoo.org> bzip2-1.0.5-r1.ebuild:
   Fix quoting
diff --git a/app-arch/bzip2/bzip2-1.0.6.ebuild b/app-arch/bzip2/bzip2-1.0.6.ebuild
new file mode 100644
index 000000000000..bb5c8d543105
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6.ebuild
@@ -0,0 +1,68 @@
+# 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.ebuild,v 1.1 2010/09/20 22:30:46 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
+	dolib.so libbz2.so.${PV} || die
+	dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so || die
+	dosym libbz2.so.${PV} /usr/$(get_libdir)/libbz2.so.${PV%%.*} || die
+	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
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
new file mode 100644
index 000000000000..9c4ddf05307b
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
@@ -0,0 +1,13 @@
+--- Makefile-libbz2_so
++++ Makefile-libbz2_so
+@@ -35,8 +35,8 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
++	$(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
+