sed expression fix

8 files changed, 54 insertions, 41 deletions

diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.0.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.0.ebuild
index 4e15e0bae314..0d1b2aeb5b15 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.0.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.0.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/media-libs/ladspa-sdk/ladspa-sdk-1.0.ebuild,v 1.5 2002/12/09 04:26:12 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.0.ebuild,v 1.6 2003/02/10 07:42:57 seemant Exp $
 
 S=${WORKDIR}/ladspa_sdk/src
 DESCRIPTION="The Linux Audio Developer's Simple Plugin API and some example plugins"
@@ -9,14 +9,14 @@ HOMEPAGE="http://www.ladspa.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	sed -e "/^CFLAGS/ s/-O3/${CFLAGS}/" < makefile > makefile.hacked
+	sed -e "/^CFLAGS/ s:-O3:${CFLAGS}:" < makefile > makefile.hacked
 	mv makefile.hacked makefile
 }
 
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.12.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.12.ebuild
index bf95b6d3180b..59d722c2090b 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.12.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.12.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/media-libs/ladspa-sdk/ladspa-sdk-1.12.ebuild,v 1.5 2003/01/12 17:22:35 viz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.12.ebuild,v 1.6 2003/02/10 07:42:57 seemant Exp $
 
 IUSE=""
 
@@ -14,14 +14,14 @@ HOMEPAGE="http://www.ladspa.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	sed -e "/^CFLAGS/ s/-O3/${CFLAGS}/" < makefile > makefile.hacked
+	sed -e "/^CFLAGS/ s:-O3:${CFLAGS}:" < makefile > makefile.hacked
 	mv makefile.hacked makefile
 }
 
diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index d46848ad9a79..46cb0aab8026 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,24 +1,13 @@
 # ChangeLog for media-libs/libpng
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.23 2003/01/21 21:22:10 vapier Exp $
-
-  21 Jan 2003; Mike Frysinger <vapier@gentoo.org> libpng-1.2.5-r4.ebuild :
-  Fixed 'doman' so that in doesn't mistakenly install library files.
-
-  19 Jan 2003; George Shapovalov <george@gentoo.org> libpng-1.2.5-r3.ebuild, libpng-1.0.15.ebuild :
-  update to libpng-1.0.15 may cause autocleaning of png.h if user did not remerge libpng-1.2.5 after
-  emerging 1.0.12. Revision bumped libpng-1.2.5-r3.ebuild to force remerge.
-  Also added warning to libpng-1.0.15.ebuild about this issue.
-
-  17 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> libpng-1.2.5-r2.ebuild :
-  Changed sed "/" to ":".
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.24 2003/02/10 07:42:57 seemant Exp $
 
 *libpng-1.0.15 (14 Jan 2003)
 
-  16 Jan 2003; Seemant Kulleen <seemant@gentoo.org> libpng-1.0.15.ebuild
-  libpng-1.2.5-r2.ebuild files/libpng-1.0.15-gentoo.diff :
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
 
-  fixed the diff and using epatch
+  Sed delimiter to : from /, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
 
   15 Jan 2003; Seemant Kulleen <seemant@gentoo.org>
   files/libpng-1.0.15-gentoo.diff :
@@ -35,6 +24,22 @@
 *libpng-1.2.5-r2 (08 Jan 2003)
 *libpng-1.0.12-r2 (08 Jan 2003)
 
+  21 Jan 2003; Mike Frysinger <vapier@gentoo.org> libpng-1.2.5-r4.ebuild :
+  Fixed 'doman' so that in doesn't mistakenly install library files.
+
+  19 Jan 2003; George Shapovalov <george@gentoo.org> libpng-1.2.5-r3.ebuild, libpng-1.0.15.ebuild :
+  update to libpng-1.0.15 may cause autocleaning of png.h if user did not remerge libpng-1.2.5 after
+  emerging 1.0.12. Revision bumped libpng-1.2.5-r3.ebuild to force remerge.
+  Also added warning to libpng-1.0.15.ebuild about this issue.
+
+  17 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> libpng-1.2.5-r2.ebuild :
+  Changed sed "/" to ":".
+
+  16 Jan 2003; Seemant Kulleen <seemant@gentoo.org> libpng-1.0.15.ebuild
+  libpng-1.2.5-r2.ebuild files/libpng-1.0.15-gentoo.diff :
+
+  fixed the diff and using epatch
+
   08 Jan 2003; Daniel Ahlberg <aliz@gentoo.rg> libpng-1.0.12-r2.ebuild, libpng-1.2.5-r2.ebuild :
   Applied Debian patch to fix buffer overflows.
 
diff --git a/media-libs/libpng/libpng-1.0.12-r2.ebuild b/media-libs/libpng/libpng-1.0.12-r2.ebuild
index e04afd839304..2472f95fa807 100644
--- a/media-libs/libpng/libpng-1.0.12-r2.ebuild
+++ b/media-libs/libpng/libpng-1.0.12-r2.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.12-r2.ebuild,v 1.1 2003/01/08 14:26:45 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.12-r2.ebuild,v 1.2 2003/02/10 07:42:57 seemant Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
-DESCRIPTION="libpng"
+DESCRIPTION="Portable Network Graphics library"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.libpng.org/"
+
 SLOT="1.0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc sparc "
@@ -16,14 +19,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	patch -p1 < ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
 		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
 		-e "s:prefix=/usr:prefix=${D}/usr:" \
-		-e "s/-O3/${CFLAGS}/" \
+		-e "s:-O3:${CFLAGS}:" \
 		scripts/makefile.linux > Makefile
-
 }
 
 src_compile() {
diff --git a/media-libs/libpng/libpng-1.0.15.ebuild b/media-libs/libpng/libpng-1.0.15.ebuild
index 6821240782bc..287a3c20827b 100644
--- a/media-libs/libpng/libpng-1.0.15.ebuild
+++ b/media-libs/libpng/libpng-1.0.15.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/media-libs/libpng/libpng-1.0.15.ebuild,v 1.4 2003/01/20 00:11:11 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.0.15.ebuild,v 1.5 2003/02/10 07:42:57 seemant Exp $
 
 inherit flag-o-matic eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 	sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \
 		-e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \
 		-e "s:prefix=/usr:prefix=${D}/usr:" \
-		-e "s/-O3/${CFLAGS}/" \
+		-e "s:-O3:${CFLAGS}:" \
 		scripts/makefile.linux > Makefile
 }
 
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() {