sed expression fix

3 files changed, 16 insertions, 10 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index 1501ee965cc0..ab35ca91da2b 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-nds/portmap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.4 2002/12/31 20:27:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.5 2003/02/10 07:38:13 seemant Exp $
 
 *portmap-5b-r7 (31 Dec 2002)
 
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+  
+  Sed expression delimiter from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>; also use epatch in the r6 ebuild.
+
   31 Dec 2002; Martin Schlemmer <azarah@gentoo.org> portmap-5b-r7.ebuild :
   Should include errno.h, and not define as external.  Fix
   relocation error and build problem with glibc-2.3.2 cvs ...
diff --git a/net-nds/portmap/portmap-5b-r6.ebuild b/net-nds/portmap/portmap-5b-r6.ebuild
index c0356ac72dd9..9076326dec7b 100644
--- a/net-nds/portmap/portmap-5b-r6.ebuild
+++ b/net-nds/portmap/portmap-5b-r6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r6.ebuild,v 1.11 2002/12/15 10:44:21 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r6.ebuild,v 1.12 2003/02/10 07:38:13 seemant Exp $
+
+inherit eutils
 
 MY_P=${PN}_${PV}eta
 A0=portmap_5beta.dif
@@ -9,19 +11,18 @@ DESCRIPTION="Netkit - portmapper"
 SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 
-DEPEND="virtual/glibc
-		sys-apps/tcp-wrappers"
-
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc sparc alpha"
 
+DEPEND="sys-apps/tcp-wrappers"
+
 src_unpack() {
 	unpack ${A}
 	cd $S || die
-	patch -p0 < $FILESDIR/$A0 || die
+	epatch $FILESDIR/$A0
 	mv Makefile Makefile.orig || die
-	sed -e "s/-O2/$CFLAGS/" Makefile.orig > Makefile || die
+	sed -e "s:-O2:$CFLAGS:" Makefile.orig > Makefile || die
 }
 
 src_compile() {
diff --git a/net-nds/portmap/portmap-5b-r7.ebuild b/net-nds/portmap/portmap-5b-r7.ebuild
index 35245eb2ac35..3c8487672cf1 100644
--- a/net-nds/portmap/portmap-5b-r7.ebuild
+++ b/net-nds/portmap/portmap-5b-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r7.ebuild,v 1.1 2002/12/31 20:27:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-5b-r7.ebuild,v 1.2 2003/02/10 07:38:13 seemant Exp $
 
 IUSE=""
 
@@ -33,7 +33,7 @@ src_unpack() {
 	
 	# Get portmap to use our CFLAGS ...
 	mv Makefile Makefile.orig
-	sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile || die
+	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile || die
 }
 
 src_compile() {