mark stable

1 files changed, 21 insertions, 11 deletions

diff --git a/sys-apps/net-tools/net-tools-1.60-r5.ebuild b/sys-apps/net-tools/net-tools-1.60-r5.ebuild
index afaada64742f..bf580c67bc24 100644
--- a/sys-apps/net-tools/net-tools-1.60-r5.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r5.ebuild
@@ -1,37 +1,45 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r5.ebuild,v 1.9 2002/11/19 20:01:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r5.ebuild,v 1.10 2002/12/09 22:52:50 azarah Exp $
 
 IUSE="nls build"
 
-S=${WORKDIR}/${P}
+inherit eutils
+
+S="${WORKDIR}/${P}"
 DESCRIPTION="standard Linux network tools"
 SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2"
 HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha"
 
 DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	# some redhat patches
-	cat ${FILESDIR}/net-tools-1.57-bug22040.patch | patch -d ${S} -p1
-	cat ${FILESDIR}/net-tools-1.60-manydevs.patch | patch -d ${S} -p0
-	cat ${FILESDIR}/net-tools-1.60-miiioctl.patch | patch -d ${S} -p1
+	
 	cd ${S}
+	# some redhat patches
+	epatch ${FILESDIR}/net-tools-1.57-bug22040.patch
+	epatch ${FILESDIR}/net-tools-1.60-manydevs.patch
+	epatch ${FILESDIR}/net-tools-1.60-miiioctl.patch
+	
 	cp ${FILESDIR}/net-tools-1.60-config.h config.h
 	cp ${FILESDIR}/net-tools-1.60-config.make config.make
+	
 	touch config.{h,make}		# sync timestamps
+	
 	cp Makefile Makefile.orig
 	sed -e "s/-O2 -Wall -g/${CFLAGS}/" Makefile.orig > Makefile
+	
 	cd man
 	cp Makefile Makefile.orig
 	sed -e "s:/usr/man:/usr/share/man:" Makefile.orig > Makefile
-	cp ${FILESDIR}/ether-wake.c ${S}
+	
+	cp -f ${FILESDIR}/ether-wake.c ${S}
 
 	if [ -z "`use nls`" ]
 	then
@@ -47,7 +55,6 @@ src_unpack() {
 src_compile() {
 	# Changing "emake" to "make" closes half of bug #820; configure is run from *inside*
 	# the Makefile, sometimes breaking parallel makes (if ./configure doesn't finish first) 
-	
 	make || die	
 
 	if [ "`use nls`" ]
@@ -55,12 +62,13 @@ src_compile() {
 		cd po
 		make || die
 	fi
-	cd ${S}
-	gcc ${CFLAGS} -o ether-wake ether-wake.c || die
+	
+	cd ${S}; gcc ${CFLAGS} -o ether-wake ether-wake.c || die
 }
 
 src_install() {
 	make BASEDIR=${D} install || die
+	
 	dosbin ether-wake
 	mv ${D}/bin/* ${D}/sbin
 	for i in hostname domainname netstat dnsdomainname ypdomainname nisdomainname
@@ -69,6 +77,7 @@ src_install() {
 	done
 	dodir /usr/bin
 	dosym /bin/hostname /usr/bin/hostname
+	
 	if [ -z "`use build`" ]
 	then
 		dodoc COPYING README README.ipv6 TODO
@@ -80,3 +89,4 @@ src_install() {
 		rm -f ${D}/bin/{ypdomainname,nisdomainname}
 	fi
 }
+