Fix USE=static handling #92557 by Alexander Skwar.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 17 insertions, 10 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index ff173f37c9ab..5b890c678c57 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/bzip2
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.23 2005/05/13 02:25:39 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.24 2005/05/14 17:36:14 vapier Exp $
+
+*bzip2-1.0.3-r2 (14 May 2005)
+
+  14 May 2005; Mike Frysinger <vapier@gentoo.org> -bzip2-1.0.3-r1.ebuild,
+  +bzip2-1.0.3-r2.ebuild:
+  Fix USE=static handling #92557 by Alexander Skwar.
 
 *bzip2-1.0.3-r1 (13 May 2005)
 
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index eade480f8b64..434f3a6d6c46 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,8 +1,8 @@
-MD5 5aa11e4f8082961469a3895c86f11e33 ChangeLog 5912
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c9a4c4af5d8bef58a8fc297c976a57aa ChangeLog 6097
 MD5 c7ae74d80c4fd172fc83b5f41de30ea4 bzip2-1.0.2-r5.ebuild 2203
-MD5 25945abe7b28103eeaf097ba36d92c2a bzip2-1.0.3-r1.ebuild 2183
 MD5 2bced66d4d3c68070477627caa87f172 bzip2-1.0.3.ebuild 2021
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 328d582d46b23f945a883dd946d975a2 bzip2-1.0.3-r2.ebuild 2213
 MD5 9c63b399f71b03f2a58b061c1e038d0c files/bzip2-1.0.2-saneso.patch 457
 MD5 f413035bf75710d87670f302692e1233 files/digest-bzip2-1.0.3 63
 MD5 5f7a98f0aaaed6554126d30e28383ee0 files/bzip2-1.0.2-progress.patch 6141
@@ -11,4 +11,4 @@ MD5 378e8d34dd95cc65b7f65565df5d85f7 files/bzip2-1.0.2-makefile-CFLAGS.patch 841
 MD5 382f154f0ba01de10aff6207652d6799 files/digest-bzip2-1.0.2-r5 63
 MD5 be84e51b1bd56731f5d7762980e3ad47 files/bzip2-1.0.3-makefile-CFLAGS.patch 489
 MD5 d1cf85cb43e35c9ecba9954295318ab8 files/bzip2-1.0.3-saneso.patch 323
-MD5 f413035bf75710d87670f302692e1233 files/digest-bzip2-1.0.3-r1 63
+MD5 f413035bf75710d87670f302692e1233 files/digest-bzip2-1.0.3-r2 63
diff --git a/app-arch/bzip2/bzip2-1.0.3-r1.ebuild b/app-arch/bzip2/bzip2-1.0.3-r2.ebuild
index 2b446e667679..17091542482a 100644
--- a/app-arch/bzip2/bzip2-1.0.3-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r1.ebuild,v 1.1 2005/05/13 02:25:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r2.ebuild,v 1.1 2005/05/14 17:36:14 vapier Exp $
 
 inherit multilib toolchain-funcs flag-o-matic
 
@@ -24,8 +24,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch
 	sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath"
 
-	use static && append-flags -static
-
 	# - Generate symlinks instead of hardlinks
 	# - pass custom variables to control libdir
 	sed -i \
@@ -49,6 +47,7 @@ src_compile() {
 	if ! use build ; then
 		emake ${makeopts} -f Makefile-libbz2_so all || die "Make failed libbz2"
 	fi
+	use static && append-flags -static
 	emake ${makeopts} all || die "Make failed"
 }
 
@@ -59,7 +58,9 @@ src_install() {
 		# move bzip2 binaries to / and use the shared libbz2.so
 		mv "${D}"/usr/bin "${D}"/
 		into /
-		newbin bzip2-shared bzip2 || die "dobin shared"
+		if ! use static ; then
+			newbin bzip2-shared bzip2 || die "dobin shared"
+		fi
 		dolib.so "${S}"/libbz2.so.${PV} || die "dolib shared"
 		for v in ${PV%%.*} ${PV%.*} ; do
 			dosym libbz2.so.${PV} /$(get_libdir)/libbz2.so.${v}
diff --git a/app-arch/bzip2/files/digest-bzip2-1.0.3-r1 b/app-arch/bzip2/files/digest-bzip2-1.0.3-r2
index 24bf9c7e285a..24bf9c7e285a 100644
--- a/app-arch/bzip2/files/digest-bzip2-1.0.3-r1
+++ b/app-arch/bzip2/files/digest-bzip2-1.0.3-r2