sed fixes and other misc

3 files changed, 38 insertions, 19 deletions

diff --git a/net-misc/netkit-rsh/ChangeLog b/net-misc/netkit-rsh/ChangeLog
index dd1297966168..95ad39f5213a 100644
--- a/net-misc/netkit-rsh/ChangeLog
+++ b/net-misc/netkit-rsh/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for net-misc/netkit-rsh
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.7 2002/12/15 11:58:45 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/ChangeLog,v 1.8 2003/02/10 10:31:59 seemant Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *netkit-rsh-0.17-r3 (25 Oct 2002)
 
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Inherit eutils to use epatch instead.  Also, changed sed expression
+  delimiters to : from /, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> netkit-rsh-0.17-r3.ebuild :
   Add alpha to KEYWORDS
 
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r2.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r2.ebuild
index 3788e851e382..5f6f3775c0db 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r2.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r2.ebuild
@@ -1,29 +1,34 @@
-# 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-misc/netkit-rsh/netkit-rsh-0.17-r2.ebuild,v 1.10 2002/12/09 04:33:17 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r2.ebuild,v 1.11 2003/02/10 10:31:59 seemant Exp $
+
+inherit eutils
+
+IUSE=""
 
 S=${WORKDIR}/${P}
-DESCRIPTION="Netkit - rshd"
+DESCRIPTION="Netkit's Remote Shell Daemon"
 SRC_URI="http://ftp.debian.org/debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-KEYWORDS="x86 sparc  ppc"
-LICENSE="bsd"
+
 SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 sparc ppc"
 
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2
+DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/pam-0.72"
 
 src_unpack () {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${O}/files/rlogind-auth.diff || die
+	epatch ${FILESDIR}/rlogind-auth.diff
 }
 
 src_compile() {
 	./configure || die
+
 	cp MCONFIG MCONFIG.orig
-	sed -e "s/-pipe -O2/${CFLAGS}/" \
+	sed -e "s:-pipe -O2:${CFLAGS}:" \
 		-e "s:-Wpointer-arith::" \
 		MCONFIG.orig > MCONFIG
 
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r3.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r3.ebuild
index c3d073535f07..1286c8aebc92 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r3.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r3.ebuild
@@ -1,28 +1,36 @@
-# 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-misc/netkit-rsh/netkit-rsh-0.17-r3.ebuild,v 1.3 2002/12/15 11:58:45 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-rsh/netkit-rsh-0.17-r3.ebuild,v 1.4 2003/02/10 10:32:00 seemant Exp $
+
+inherit eutils
+
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Netkit - rshd"
 SRC_URI="http://ftp.debian.org/debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-KEYWORDS="x86 sparc ppc alpha"
-LICENSE="bsd"
+
 SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 sparc ppc alpha"
 
-DEPEND=">=sys-libs/ncurses-5.2 >=sys-libs/pam-0.72"
+DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/pam-0.72"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
-	patch -p0 <${FILESDIR}/rlogind-auth.diff || die
+	epatch ${FILESDIR}/rlogind-auth.diff
 }
 
 src_compile() {
 	./configure || die
+
 	cp MCONFIG MCONFIG.orig
-	sed -e "s/-pipe -O2/${CFLAGS}/" \
+	sed -e "s:-pipe -O2:${CFLAGS}:" \
 		-e "s:-Wpointer-arith::" \
 		MCONFIG.orig > MCONFIG
+
 	make || die
 }