More GCC-3.3 compile fix0rs. Bump net-tools, add netstat improvements, and update ether-wake.

4 files changed, 113 insertions, 3 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 7b57afef83cd..c7480330d6f8 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.18 2003/03/18 21:36:25 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.19 2003/05/18 21:36:52 dragon Exp $
+
+*net-tools-1.60-r7 (18 May 2003)
+
+  18 May 2003; Nicholas Wourms <dragon@gentoo.org> net-tools-1.60-r7.ebuild:
+  Version bump. Add Manifest. Update ether-wake to Donald Becker's latest
+  version (1.08). Add an english manpage for ether-wake. Add newline characters
+  to various multi-line string literals in order to fix gcc-3.3 compile errors.
+  Update lib/masq_info.c to support ipvs configurations. Update netstat to fix
+  interface name output and to support modifying the statistics refresh delay as
+  a command-line argument.
 
 *net-tools-1.60-r6 (18 Mar 2003)
 
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 4005893422d8..86979aa9400d 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,5 +1,5 @@
-MD5 358f13b3d3431b89a33377972047fdf4 ChangeLog 3841
-MD5 6bd4de209644fc174d806cdc022d8215 net-tools-1.60-r7.ebuild 2440
+MD5 fa40f8c0a017cbfdfd3463b6b3055a92 ChangeLog 3840
+MD5 9f2b773c95973817537f36ce81683a32 net-tools-1.60-r7.ebuild 2546
 MD5 97c6879f072588bdaa14c894380672f4 net-tools-1.60-r6.ebuild 2278
 MD5 a959c1cde872578cac11854c55ab9d55 files/digest-net-tools-1.60-r6 145
 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r7 148
diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r7 b/sys-apps/net-tools/files/digest-net-tools-1.60-r7
new file mode 100644
index 000000000000..0a4ac9ee6c4e
--- /dev/null
+++ b/sys-apps/net-tools/files/digest-net-tools-1.60-r7
@@ -0,0 +1,2 @@
+MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520
+MD5 d733ef8b0bad3dbd0cf98e14b45fe1a6 net-tools-1.60-gentoo-extra-1.tar.bz2 10370
diff --git a/sys-apps/net-tools/net-tools-1.60-r7.ebuild b/sys-apps/net-tools/net-tools-1.60-r7.ebuild
new file mode 100644
index 000000000000..42fb78900016
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60-r7.ebuild
@@ -0,0 +1,98 @@
+# 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-r7.ebuild,v 1.1 2003/05/18 21:36:52 dragon Exp $
+
+inherit eutils
+
+DESCRIPTION="Standard Linux networking tools"
+SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-extra-1.tar.bz2"
+HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
+
+SLOT="0"
+LICENSE="GPL-2"
+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.54-ipvs.patch
+	epatch ${PATCHDIR}/net-tools-1.57-bug22040.patch
+	epatch ${PATCHDIR}/net-tools-1.60-manydevs.patch
+	epatch ${PATCHDIR}/net-tools-1.60-miiioctl.patch
+	epatch ${PATCHDIR}/net-tools-1.60-virtualname.patch
+	epatch ${PATCHDIR}/net-tools-1.60-cycle.patch
+
+	# GCC-3.3 Compile Fix
+	epatch ${PATCHDIR}/${P}-multiline-string.patch
+
+	cp ${PATCHDIR}/net-tools-1.60-config.h config.h
+	cp ${PATCHDIR}/net-tools-1.60-config.make config.make
+
+	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}
+	cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
+	cd ${S}
+
+	if [ -z "`use nls`" ] ; then
+		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
+
+	touch config.{h,make}		# sync timestamps
+}
+
+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
+
+	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
+	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
+}