fix timestamp issue #10799

3 files changed, 15 insertions, 101 deletions

diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r4 b/sys-apps/net-tools/files/digest-net-tools-1.60-r4
deleted file mode 100644
index c5eb47ae6299..000000000000
--- a/sys-apps/net-tools/files/digest-net-tools-1.60-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520
-MD5 d5cc6a93c7d3ad2eb02bc637a1de9cf3 net-tools-1.60-gentoo-extra.tar.bz2 5785
diff --git a/sys-apps/net-tools/net-tools-1.60-r4.ebuild b/sys-apps/net-tools/net-tools-1.60-r4.ebuild
deleted file mode 100644
index f40094100d5a..000000000000
--- a/sys-apps/net-tools/net-tools-1.60-r4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2003 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-r4.ebuild,v 1.17 2003/02/13 16:07:40 vapier Exp $
-
-IUSE="nls build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="standard Linux network tools"
-SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-extra.tar.bz2
-	http://cvs.gentoo.org/~seemant/${P}-gentoo-extra.tar.bz2"
-HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha mips"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-
-	PATCHDIR=${WORKDIR}/${P}-gentoo
-
-	unpack ${A}
-	cd ${S}
-	cp ${PATCHDIR}/config.h .
-	cp ${PATCHDIR}/config.make .
-	touch config.{h,make}		#sync timestamps
-	cp Makefile Makefile.orig
-	sed "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
-
-	if [ -z "`use nls`" ]
-	then
-		cd ${S}
-		mv config.h config.h.orig
-		sed 's:\(#define I18N\) 1:\1 0:' config.h.orig > config.h
-
-		mv config.make config.make.orig
-		sed 's:I18N=1:I18N=0:' config.make.orig > config.make
-	fi
-}
-
-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`" ]
-	then
-		cd po
-		make || die
-	fi
-}
-
-src_install() {
-	make BASEDIR=${D} install || die
-	mv ${D}/bin/* ${D}/sbin
-	for i in hostname domainname netstat dnsdomainname ypdomainname nisdomainname
-	do
-		mv ${D}/sbin/${i} ${D}/bin
-	done
-	dodir /usr/bin
-	dosym /bin/hostname /usr/bin/hostname
-	if [ -z "`use build`" ]
-	then
-		dodoc COPYING README README.ipv6 TODO
-	else
-		#only install /bin/hostname
-		rm -rf ${D}/usr
-		rm -rf ${D}/sbin
-		rm -f ${D}/bin/{domainname,netstat,dnsdomainname}
-		rm -f ${D}/bin/{ypdomainname,nisdomainname}
-	fi
-}
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 0060728ad1fc..44acfd502770 100644
--- a/sys-apps/net-tools/net-tools-1.60-r5.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r5.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2003 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.15 2003/02/24 22:34:59 dragon Exp $
-
-IUSE="nls build"
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r5.ebuild,v 1.16 2003/02/28 09:34:50 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="standard Linux network tools"
 SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-extra.tar.bz2
-	http://cvs.gentoo.org/~seemant/${P}-gentoo-extra.tar.bz2"
+	mirror://gentoo/${P}-gentoo-extra.tar.bz2"
 HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha hppa arm mips"
+KEYWORDS="x86 ppc sparc alpha hppa arm mips"
+IUSE="nls build"
 
 DEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
-
 	PATCHDIR=${WORKDIR}/${P}-gentoo
 
 	unpack ${A}
-	
 	cd ${S}
+
 	# some redhat patches
 	epatch ${PATCHDIR}/net-tools-1.57-bug22040.patch
 	epatch ${PATCHDIR}/net-tools-1.60-manydevs.patch
@@ -33,20 +29,17 @@ src_unpack() {
 	
 	cp ${PATCHDIR}/net-tools-1.60-config.h config.h
 	cp ${PATCHDIR}/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 -f ${PATCHDIR}/ether-wake.c ${S}
 
-	if [ -z "`use nls`" ]
-	then
+	if [ -z "`use nls`" ] ; then
 		cd ${S}
 		mv config.h config.h.orig
 		sed 's:\(#define I18N\) 1:\1 0:' config.h.orig > config.h
@@ -54,6 +47,8 @@ src_unpack() {
 		mv config.make config.make.orig
 		sed 's:I18N=1:I18N=0:' config.make.orig > config.make
 	fi
+
+	touch config.{h,make}		# sync timestamps
 }
 
 src_compile() {
@@ -62,13 +57,13 @@ src_compile() {
 	# breaking parallel makes (if ./configure doesn't finish first) 
 	make || die	
 
-	if [ "`use nls`" ]
-	then
+	if [ "`use nls`" ] ; then
 		cd po
 		make || die
+		cd ${S}
 	fi
-	
-	cd ${S}; gcc ${CFLAGS} -o ether-wake ether-wake.c || die
+
+	gcc ${CFLAGS} -o ether-wake ether-wake.c || die
 }
 
 src_install() {