From: J Robert Ray <jrray@gentoo.org>
Date: Wed, 6 Nov 2002 04:26:16 +0000 (+0000)
Subject: Combine both sed calls into one, avoiding attempt to overwrite 0444
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b14d9d04d8138311200027769c2b9e78ffd901c7;p=gentoo.git

Combine both sed calls into one, avoiding attempt to overwrite 0444
perm'd file (fakeroot issue).
---

diff --git a/sys-apps/procps/ChangeLog b/sys-apps/procps/ChangeLog
index 1c5f6390a93d..e2105b766ef3 100644
--- a/sys-apps/procps/ChangeLog
+++ b/sys-apps/procps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/procps
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.7 2002/10/31 17:27:28 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/ChangeLog,v 1.8 2002/11/06 04:26:16 jrray Exp $
+
+  05 Nov 2002; J Robert Ray <jrray@gentoo.org> procps-2.0.10-r1.ebuild :
+  Combine both sed calls into one, avoiding attempt to overwrite 0444
+  perm'd file (fakeroot issue).
 
 *procps-2.0.10-r1 (31 Oct 2002)
 
diff --git a/sys-apps/procps/procps-2.0.10-r1.ebuild b/sys-apps/procps/procps-2.0.10-r1.ebuild
index b631ec56abd9..e7c4222c3a5a 100644
--- a/sys-apps/procps/procps-2.0.10-r1.ebuild
+++ b/sys-apps/procps/procps-2.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.10-r1.ebuild,v 1.4 2002/10/31 17:48:16 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.10-r1.ebuild,v 1.5 2002/11/06 04:26:16 jrray Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools"
@@ -18,10 +18,10 @@ src_unpack() {
 	cd ${S}
 
 	# Use the CFLAGS from /etc/make.conf.
-
+	# remove /etc/X11/applnk/Desktop/top.app from makefile
 	mv Makefile Makefile.orig
 	sed -e "s/-O3/${CFLAGS}/" -e 's/all: config/all: /' \
-	    -e "s:--strip::" Makefile.orig > Makefile
+	    -e "s:--strip::" -e 's/$.DESKTOP.//' Makefile.orig > Makefile
 
 	# WARNING! In case of a version bump, check the line below that removes a line from the Makefile file.
 	cd ${S}/ps
@@ -32,12 +32,6 @@ src_unpack() {
 	cd ${S}/proc
 	mv Makefile Makefile.orig
 	sed -e "s/-O2/${CFLAGS}/" -e "s:--strip::" Makefile.orig > Makefile
-
-	#remove /etc/X11/applnk/Desktop/top.app from makefile
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's/$.DESKTOP.//' Makefile.orig > Makefile
-
 }
 
 src_compile() { 
@@ -71,4 +65,4 @@ pkg_postinst() {
 	einfo "NOTE: By default \"ps\" and \"top\" no longer"
 	einfo "show threads. You can use the '-m' flag"
 	einfo "in ps or the 'H' key in top to show them"
-}	
\ No newline at end of file
+}