cleanup ebuild and stabilize for hppa/s390

(Portage version: 2.1_pre7-r2)

1 files changed, 10 insertions, 23 deletions

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
 }