Move to using a patch tarball, add some updates from Fedora, add ipv6 hostname fix by pasi.valminen@hut.fi #42650, and add support for infiniband to ifconfig by Tom Duffy #81180.

Package-Manager: portage-2.0.51-r15

4 files changed, 93 insertions, 19 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index c198b578a027..4f229097fbfe 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.48 2005/01/10 18:30:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.49 2005/02/12 03:18:08 vapier Exp $
+
+*net-tools-1.60-r11 (11 Feb 2005)
+
+  11 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60-r11.ebuild:
+  Move to using a patch tarball, add some updates from Fedora, add ipv6
+  hostname fix by pasi.valminen@hut.fi #42650, and add support for infiniband
+  to ifconfig by Tom Duffy #81180.
 
   10 Jan 2005; Mike Frysinger <vapier@gentoo.org>
   +files/1.60-Makefile.patch, net-tools-1.60-r10.ebuild:
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index c1f16d97632b..55ca1ebfe2ae 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,25 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a2e3cc1e9d74acfbe8fe8d6014cd2c4d ChangeLog 7957
+MD5 8cc585921df8f068358c2fd68906ef72 ChangeLog 8258
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 7cc352d215a4d78c9a4c3485fca2cd6d net-tools-1.60-r10.ebuild 3398
 MD5 34331bb3a0cf59517f6f656296d01317 net-tools-1.60-r9.ebuild 3296
-MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
+MD5 b7f7823ce3e3a9276a57be203f73b8c6 net-tools-1.60-r11.ebuild 2116
 MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
-MD5 c71c1508ac5e5345d14c60b5fd625226 files/1.60-Makefile.patch 1950
 MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
 MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
-MD5 7677c2a1d1498eaba49ac1eae30d897a files/1.60-wide.patch 5137
 MD5 492e3dfd36d8f80cfd73ef58dcb2082e files/net-tools-1.60-get_name.patch 1608
-MD5 f0c76a8975a7d82c08059e8f8a24739a files/1.60-numeric-ports.patch 2470
-MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r10 148
-MD5 7af2e1df001555e6624e35e2bf2c9d09 files/1.60-appletalk.patch 3210
+MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB4spgroRuSHgZdywRAvx2AJsGib9pv6lDU1jp3KKz49bVdMQlaQCcCGVt
-nhR8n4dR0mglaEpQPYsD+ok=
-=ZkGS
------END PGP SIGNATURE-----
+MD5 00cdbdbaccfe3c23f00aa44cc718c5a0 files/digest-net-tools-1.60-r11 145
diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r11 b/sys-apps/net-tools/files/digest-net-tools-1.60-r11
new file mode 100644
index 000000000000..72ffcede8ffa
--- /dev/null
+++ b/sys-apps/net-tools/files/digest-net-tools-1.60-r11
@@ -0,0 +1,2 @@
+MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520
+MD5 2dc2754baac85bfa639a516ba138e22a net-tools-1.60-patches-1.0.tar.bz2 26098
diff --git a/sys-apps/net-tools/net-tools-1.60-r11.ebuild b/sys-apps/net-tools/net-tools-1.60-r11.ebuild
new file mode 100644
index 000000000000..4a68e50190e9
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60-r11.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r11.ebuild,v 1.1 2005/02/12 03:18:08 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
+SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-1.0.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls build static"
+
+RDEPEND=""
+DEPEND="nls? ( sys-devel/gettext )
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/patch
+	cp ${WORKDIR}/extra/config.{h,make} .
+	cp ${WORKDIR}/extra/ether-wake.c .
+	cp ${WORKDIR}/extra/ether-wake.8 man/en_US/
+	mkdir include/linux
+	cp ${WORKDIR}/extra/if_infiniband.h include/linux/
+
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+
+	sed -i \
+		-e "/^COPTS =/s:=:=${CFLAGS}:" \
+		-e "/^LOPTS =/s:=:=${LDFLAGS}:" \
+		Makefile || die "sed FLAGS Makefile failed"
+
+	if ! use nls ; then
+		sed -i \
+			-e '/define I18N/s:1$:0:' config.h \
+			|| die "sed config.h failed"
+		sed -i \
+			-e '/^I18N=/s:1$:0:' config.make \
+			|| die "sed config.make failed"
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake libdir || die "emake libdir failed"
+	emake || die "emake failed"
+	emake ether-wake || die "ether-wake failed to build"
+
+	if use nls ; then
+		emake i18ndir || die "emake i18ndir failed"
+	fi
+}
+
+src_install() {
+	make BASEDIR="${D}" install || die "make install failed"
+	dosbin ether-wake || die "dosbin failed"
+	mv "${D}"/bin/* "${D}"/sbin || die "mv failed"
+	mv "${D}"/sbin/{hostname,domainname,netstat,dnsdomainname,ypdomainname,nisdomainname} "${D}"/bin \
+		|| die "mv failed"
+	dodir /usr/bin
+	dosym /bin/hostname /usr/bin/hostname
+
+	if ! use build ; then
+		dodoc README README.ipv6 TODO
+	else
+		# only install /bin/hostname
+		rm -rf "${D}"/usr "${D}"/sbin
+		rm -f "${D}"/bin/{domainname,netstat,dnsdomainname,ypdomainname,nisdomainname}
+	fi
+}