replace-flags and remove a single annoying space

4 files changed, 21 insertions, 11 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index f8f022dcbb73..d87ac0d79781 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.21 2003/04/19 19:28:39 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.22 2003/04/19 19:36:25 lostlogic Exp $
 
 *netpbm-10.11.5-r2 (20 Mar 2003)
 
+  19 Apr 2003; Brandon Low <lostlogic@gentoo.org> netpbm-10.11.5-r2.ebuild,
+  netpbm-9.12-r4.ebuild:
+  Add replace-flags for ultrasparcs
+
   14 Apr 2003; Stefan Jones <cretin@gentoo.org> netpbm-10.11.5-r2.ebuild:
   Added -fPIC to CFLAGS for prelink.
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index eed6639a6e3c..026256d6dfc2 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,6 +1,6 @@
-MD5 e52e6a1c3c361d3782d119e3ee3b1e55 netpbm-9.12-r4.ebuild 1171
-MD5 6686fd1deb3e4b78a8b3eff260f2f400 netpbm-10.11.5-r2.ebuild 1681
-MD5 7b164f655670f93e8ac03294df7b712f ChangeLog 3378
+MD5 792c636fe90732e678b3df6ac8b15066 netpbm-9.12-r4.ebuild 1170
+MD5 a929c09d42ed726cd21a261b42cbdfdf netpbm-10.11.5-r2.ebuild 1908
+MD5 aa43434f7217cb32e46b960ca22350b8 ChangeLog 3516
 MD5 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
 MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r2 64
 MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
diff --git a/media-libs/netpbm/netpbm-10.11.5-r2.ebuild b/media-libs/netpbm/netpbm-10.11.5-r2.ebuild
index 8cae6495e430..58f8224194d5 100644
--- a/media-libs/netpbm/netpbm-10.11.5-r2.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.5-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.5-r2.ebuild,v 1.2 2003/04/14 10:52:20 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.5-r2.ebuild,v 1.3 2003/04/19 19:36:25 lostlogic Exp $
 
 IUSE="svga"
 
+inherit flag-o-matic
+
 S=${WORKDIR}/${P}
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
@@ -33,17 +35,21 @@ src_unpack() {
 		fi
 	fi
 
-	sed <${FILESDIR}/${PV}/Makefile.${cfg} >Makefile.config \
-		-e "s|-O3|${CFLAGS} -fPIC|"
+	# Sparc support ...
+	replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
+	replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
+
+	sed -e "s:-O3:${CFLAGS} -fPIC:" ${FILESDIR}/${PV}/Makefile.${cfg} \
+		> Makefile.config || die "Flag replacement failed"
 }
 
 src_compile() {
 	MAKEOPTS="${MAKEOPTS} -j1"
-	emake CC="${CC}" CXX="${CXX}"|| die
+	emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
 }
 
 src_install () {
-	make package pkgdir=${D}/usr/ || die
+	make package pkgdir=${D}/usr/ || die "make package failed"
 
 	# Fix symlink not being created.
 	dosym `basename ${D}/usr/lib/libnetpbm.so.*` /usr/lib/libnetpbm.so
diff --git a/media-libs/netpbm/netpbm-9.12-r4.ebuild b/media-libs/netpbm/netpbm-9.12-r4.ebuild
index bbe9921f9584..d83b967e435f 100644
--- a/media-libs/netpbm/netpbm-9.12-r4.ebuild
+++ b/media-libs/netpbm/netpbm-9.12-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r4.ebuild,v 1.7 2003/04/19 19:28:39 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r4.ebuild,v 1.8 2003/04/19 19:36:25 lostlogic Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
@@ -13,7 +13,7 @@ DEPEND=">=media-libs/jpeg-6b
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 src_unpack() {
 	unpack ${A}