From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 12 Aug 2011 21:42:37 +0000 (+0000)
Subject: Add USE=static-libs support #378211 by Agostino Sarubbo.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5661460bb87f8567023ac000ac1c58fa602132cb;p=gentoo.git

Add USE=static-libs support #378211 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64
---

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index b5f239bf9d39..3e05cbfbf72f 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.86 2011/05/16 03:31:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.87 2011/08/12 21:42:37 vapier Exp $
+
+*bzip2-1.0.6-r3 (12 Aug 2011)
+
+  12 Aug 2011; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.6-r3.ebuild:
+  Add USE=static-libs support #378211 by Agostino Sarubbo.
 
 *bzip2-1.0.6-r2 (16 May 2011)
 
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 44e9c6f3468e..a4e111898366 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -11,13 +11,14 @@ AUX bzip2-1.0.6-saneso.patch 439 RMD160 9738dcd8bd4c482ea3bec4409a9e5bce49ef82eb
 DIST bzip2-1.0.6.tar.gz 782025 RMD160 cc31bbae95e8eec259cef7627eae0c667654a339 SHA1 3f89f861209ce81a6bab1fd1998c0ef311712002 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
 EBUILD bzip2-1.0.6-r1.ebuild 2183 RMD160 a1e61ea3f7afa19c5b00d40e1b8712668aed46f2 SHA1 1d9a42eafef0a0b86bea516e1dcdd3ee8c053e1f SHA256 4d7615ffc4a8b3fa39d5626a7c2fa3d18ec9e34577a6983bf0c87039f1c2bbe3
 EBUILD bzip2-1.0.6-r2.ebuild 2170 RMD160 8b03c4c9b6e0673a4d29961fa50a9b83545cb84d SHA1 6c5f7d014ba3416d6b7288fd57d1bb533b94569c SHA256 d921cef213b66cb5f2bb13ee6f07160dce861f1cfa85a340c177b82905e64473
+EBUILD bzip2-1.0.6-r3.ebuild 2371 RMD160 bad2e0a71c2f3d0cc6b351226e5a8b678d367f4f SHA1 f9f5249ea67fb9c58a2384d931a9d0bfe0ec5d8a SHA256 cfb685ab896e456cc3569e11a84f4a4fa1d440b6e7a17fdc1a7698e3063e30cc
 EBUILD bzip2-1.0.6.ebuild 2045 RMD160 ba8dd3bc5344fcf3a71d1f19af1808fc813d8e58 SHA1 f94effdd275b308cb20f2609addec001e00799a8 SHA256 c8d2600e7a05cfe24a1c252ea0a44f66ea6239dc9f87ee8d2c1fd06e32e69196
-MISC ChangeLog 13717 RMD160 a33bc0062dfa61b81ed38f7f95a0710dfc4421f8 SHA1 29c24f59ebff20995b65c4395502dc7503872e85 SHA256 c4f62e72403c15de72de224e097d350a478fdb37dc69f82f088ee714720a5a6b
+MISC ChangeLog 13882 RMD160 26aa2efe06621c736dd53c8a4b8295fdf6f3f0aa SHA1 522fd8b28d10902c8f2c5fb5f0460331fcaafb3e SHA256 5cef8ab118aed986a8899bb97af38f46f571a81530ef46b27dd298aae569549e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3QmoUACgkQaC/OocHi7JZZwwEAg+PFYqbv2AzgMOY7bm1NxdHN
-XPVgT/149/Qph+dP6QsA/ih70Kdh5M1SgsjWAX8pq5xexPpOZ6Ip+QN6icDy3lu5
-=CwxZ
+iF4EAREIAAYFAk5FnlQACgkQaC/OocHi7Jbb+AD+MPB4yW8SJAhj/wLUXHIxChA9
+Y+LUOENR1kpnb1t7TJ0A/3Us3M7J/LwBnHBqzvsVwVWhBQ9Z3ZanrIdc1uOoik9E
+=Bpsu
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..ec663efbe0a4
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 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-r3.ebuild,v 1.1 2011/08/12 21:42:37 vapier Exp $
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI="2"
+
+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 static-libs"
+
+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
+
+	# - 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
+	if ! use static-libs ; then
+		rm -f "${D}"/usr/lib*/libbz2.a || 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
+}