From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 28 Mar 2006 18:31:28 +0000 (+0000)
Subject: cleanup ebuild and stabilize for hppa/s390
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ee68daf62f71e5d93668c9328b6a10c52165a6d;p=gentoo.git

cleanup ebuild and stabilize for hppa/s390
Package-Manager: portage-2.1_pre7-r2
---

diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 3039d959a1be..8b4eacd85d75 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e9cf09e594de3da81cf145aa9872a046 ChangeLog 2618
 RMD160 287ced1ce0a7bd45d5e8009939927ca8e0142bb6 ChangeLog 2618
 SHA256 19e6c347f4815fa898848fdd50ca91bc66158f4c998ea298f1f638940d282358 ChangeLog 2618
@@ -16,9 +19,16 @@ SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata
 MD5 101f6a64cb0582b601970ffe5ff64ffc pbzip2-0.8.ebuild 712
 RMD160 c0f107ef1fed08bcff836df2334950bada8959de pbzip2-0.8.ebuild 712
 SHA256 b03eb7757bf88fe4eaa7c072201d40fd717829cad9c44e518a02412e1ef621b0 pbzip2-0.8.ebuild 712
-MD5 29e9771757aab4bd083e8c1d312e5649 pbzip2-0.9.5.ebuild 1098
-RMD160 2874ed2234a7f8147a95b815d303339e1759a9d1 pbzip2-0.9.5.ebuild 1098
-SHA256 2dde415eda6d1d4632e1a5733dad2750622c999510e54441688c0f0706216bf7 pbzip2-0.9.5.ebuild 1098
+MD5 67113cc262d56aca8b417c6929673280 pbzip2-0.9.5.ebuild 825
+RMD160 30b4ef124021d36d9361f5c422441b41d2107e5d pbzip2-0.9.5.ebuild 825
+SHA256 c7d2eeb2a6cd375032cbe574dce189304e66bcb4472598be8406d64cea66e184 pbzip2-0.9.5.ebuild 825
 MD5 4be47d61656c0e12cd9987857631be26 pbzip2-0.9.6.ebuild 1109
 RMD160 dccb7a8ef98728086b0d7e2c56f94c995c5e93ba pbzip2-0.9.6.ebuild 1109
 SHA256 cdfcd20cbf911345b11d183e96f70ad24a93c30cc9d0f3896d5ca0bcc9953d87 pbzip2-0.9.6.ebuild 1109
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEKYFg2+ySkm8kpY0RArWuAJ9DdT9K1CKpFt50BgWLret8zM/B1ACfQWle
+BUoYPzID7eqHtv2b7knkPAY=
+=JCsl
+-----END PGP SIGNATURE-----
diff --git a/app-arch/pbzip2/pbzip2-0.9.5.ebuild b/app-arch/pbzip2/pbzip2-0.9.5.ebuild
index 067162da7866..e4574aca1876 100644
--- a/app-arch/pbzip2/pbzip2-0.9.5.ebuild
+++ b/app-arch/pbzip2/pbzip2-0.9.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.9.5.ebuild,v 1.9 2006/03/27 23:48:11 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-0.9.5.ebuild,v 1.10 2006/03/28 18:31:28 vapier Exp $
 
-inherit eutils
+inherit flag-o-matic
 
 DESCRIPTION="A parallel version of BZIP2"
 HOMEPAGE="http://compression.ca/pbzip2/"
@@ -10,37 +10,24 @@ SRC_URI="http://compression.ca/${PN}/${P}.tar.gz"
 
 LICENSE="PBZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc-macos ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sparc x86"
 IUSE="static"
 
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-pkg_setup() {
-	if use static
-	then
-		built_with_use app-arch/bzip2 static || \
-			die "You must compile bzip2 with USE=static"
-	fi
-}
+DEPEND="app-arch/bzip2"
 
 src_unpack() {
 	unpack ${A}
-	sed -i -e 's:-O3:${CFLAGS}:g' ${P}/Makefile || die
+	cd "${S}"
+	sed -i -e 's:-O3:$(CXXFLAGS) $(LDFLAGS):g' Makefile || die
 }
 
 src_compile() {
-	if use static
-	then
-		cp -f /usr/$(get_libdir)/libbz2.a ${S}
-		emake pbzip2-static || die "Failed to build"
-	else
-		emake pbzip2 || die "Failed to build"
-	fi
+	use static && append-ldflags -static
+	emake pbzip2 || die "Failed to build"
 }
 
 src_install() {
 	dobin pbzip2 || die "Failed to install"
-	dodoc AUTHORS ChangeLog README || Die "Failed to install docs"
-	doman pbzip2.1 || die "Failed to install man page"
+	dodoc AUTHORS ChangeLog README
+	doman pbzip2.1
 }