sed fixes and other misc

3 files changed, 52 insertions, 40 deletions

diff --git a/net-misc/clockspeed/ChangeLog b/net-misc/clockspeed/ChangeLog
index 534fe4489a45..4c94125a4d25 100644
--- a/net-misc/clockspeed/ChangeLog
+++ b/net-misc/clockspeed/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for net-misc/clockspeed
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.8 2003/01/10 01:36:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.9 2003/02/10 10:31:59 seemant Exp $
 
 *clockspeed-0.62-r2 (09 Jan 2003)
 
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Inherit eutils to use epatch instead, and also changed sed expression
+  delimiters from / to :, closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
+
   09 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
   Added a patch to support static in USE #12978
 
diff --git a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild b/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
index 69f6fcc14a50..aa9711055caf 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r1.ebuild
@@ -1,47 +1,48 @@
-# 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/clockspeed/clockspeed-0.62-r1.ebuild,v 1.12 2002/12/09 04:33:15 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r1.ebuild,v 1.13 2003/02/10 10:31:59 seemant Exp $
+
+inherit eutils
+
+IUSE=""
 
 S=${WORKDIR}/${P}
-DESCRIPTION="a simple ntp client"
+DESCRIPTION="A simple Network Time Protocol (NTP) client"
 SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/"
-KEYWORDS="x86 sparc  ppc"
-LICENSE="freeware"
-SLOT="0"
 
-DEPEND="virtual/glibc
-	sys-apps/groff"
-RDEPEND="virtual/glibc"
+SLOT="0"
+LICENSE="freeware"
+KEYWORDS="x86 sparc ppc"
 
+DEPEND="sys-apps/groff"
 
 src_compile() {
-    cd ${S}
-    patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
-    cp -a conf-cc conf-cc.orig
-    sed "s/@CFLAGS@/${CFLAGS}/" < conf-cc.orig > conf-cc
-    emake || die
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+
+	cp -a conf-cc conf-cc.orig
+	sed "s:@CFLAGS@:${CFLAGS}:" < conf-cc.orig > conf-cc
+
+	emake || die
 }
 
 src_install () {
-    dodir /etc /usr/bin /usr/sbin /usr/share/man/man1
-    insinto /etc
-    doins leapsecs.dat
+	dodir /etc /usr/bin /usr/sbin /usr/share/man/man1
+	insinto /etc
+	doins leapsecs.dat
 
-    into /usr
-    dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
-    doman clockspeed.1 clockadd.1 clockview.1 sntpclock.1 taiclock.1 taiclockd.1
+	into /usr
+	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
+	doman clockspeed.1 clockadd.1 clockview.1 sntpclock.1 taiclock.1 taiclockd.1
 
-    exeinto /usr/sbin
-    doexe ${FILESDIR}/ntpclockset
+	exeinto /usr/sbin
+	doexe ${FILESDIR}/ntpclockset
 
-    dodoc BLURB CHANGES README THANKS TODO INSTALL
+	dodoc BLURB CHANGES README THANKS TODO INSTALL
 }
 
 pkg_postinst() {
-
-    echo
-    einfo "Use ntpclockset to set your clock!"
-    echo
-
+	echo
+	einfo "Use ntpclockset to set your clock!"
+	echo
 }
diff --git a/net-misc/clockspeed/clockspeed-0.62-r2.ebuild b/net-misc/clockspeed/clockspeed-0.62-r2.ebuild
index 4db07fd6f322..69a59415c5de 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r2.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r2.ebuild
@@ -1,27 +1,32 @@
-# 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/clockspeed/clockspeed-0.62-r2.ebuild,v 1.1 2003/01/10 01:36:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r2.ebuild,v 1.2 2003/02/10 10:31:59 seemant Exp $
 
-DESCRIPTION="a simple ntp client"
+inherit eutils
+
+IUSE="static"
+
+DESCRIPTION="A simple Network Time Protocol (NTP) client"
 SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz"
 HOMEPAGE="http://cr.yp.to/"
 
-KEYWORDS="~x86 ~ppc ~sparc"
-LICENSE="freeware"
 SLOT="0"
-IUSE="static"
+LICENSE="freeware"
+KEYWORDS="~x86 ~ppc ~sparc"
 
-DEPEND="virtual/glibc
-	sys-apps/groff"
-RDEPEND="virtual/glibc"
+DEPEND="sys-apps/groff"
 
 src_compile() {
-	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+
 	cp conf-cc{,.old}
 	sed -e "s/@CFLAGS@/${CFLAGS}/" conf-cc.old > conf-cc
+
 	use static && LDFLAGS="${LDFLAGS} -static"
+
 	cp conf-ld{,.old}
-	sed -e "s/@LDFLAGS@/${LDFLAGS}/" conf-ld.old > conf-ld
+	sed -e "s:@LDFLAGS@:${LDFLAGS}:" conf-ld.old > conf-ld
+
 	emake || die
 }