Fold etherwake and mii-diag into this package as well as a bunch of other diag utilities.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 101 insertions, 9 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index ae81f0e8b069..4f0467c44c4f 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2005/06/30 03:40:31 kumba Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.56 2006/03/11 05:39:11 vapier Exp $
+
+*net-tools-1.60-r12 (11 Mar 2006)
+
+  11 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60-r12.ebuild:
+  Fold etherwake and mii-diag into this package as well as a bunch of other
+  diag utilities.
 
   29 Jun 2005; Joshua Kinard <kumba@gentoo.org> net-tools-1.60-r11.ebuild:
   Marked stable on mips.
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 385b55d85534..894f0cd713ab 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d7179d0b79fdc01831668bf6e27d2efb ChangeLog 8920
-RMD160 cd15b828b19cbbc8bfcd5fe6a48b1f704a6606a4 ChangeLog 8920
-SHA256 e3760a8e4972adee2269964d92c12c0b4b9c1ee040f29ade6132666ba8de5777 ChangeLog 8920
+MD5 1f6978e04143e1fe80094828231126ee ChangeLog 9131
+RMD160 ec45543850b2cd022d70365de4becc2982017489 ChangeLog 9131
+SHA256 cf5a4a1385ae8afc05e75111c8b28443e25d548045f2f2aa6aae56d57d0b7a23 ChangeLog 9131
 MD5 05ebbcad45030e806f8be710defa0aac files/digest-net-tools-1.60-r11 145
 RMD160 07580e2db793ffa3ecc34b26d08b87eaca9843a0 files/digest-net-tools-1.60-r11 145
 SHA256 34a785cca437996fcf6d321fed6e103f5657283eae4b61afe1752f0e83870c49 files/digest-net-tools-1.60-r11 145
+MD5 4802eef34bc8a4b6054d38ed352e13e5 files/digest-net-tools-1.60-r12 530
+RMD160 14d13eb5c6ae7e56dea8ac90a53602d2286eefa3 files/digest-net-tools-1.60-r12 530
+SHA256 9169424321a91be50a4fdc3a4abcecf606c0fbc5dec9b7cc9d5396a30fd08962 files/digest-net-tools-1.60-r12 530
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 89b93cb8df63ffec2ad24ac8e30a5ea7 net-tools-1.60-r11.ebuild 1933
 RMD160 20b97f94baef955376da8a7f99233bed39fd8281 net-tools-1.60-r11.ebuild 1933
 SHA256 76cd1aa5be58d1a7dcc19cbb7cb6e2a86ed1e33f246fd093bf4a9082e000190c net-tools-1.60-r11.ebuild 1933
+MD5 4120e9abc576658aed17a07d49ca61a8 net-tools-1.60-r12.ebuild 2109
+RMD160 2b1fa478b5e02a3bf874350c32f56895254efc0c net-tools-1.60-r12.ebuild 2109
+SHA256 4781d7fbf175c5cd153beae8503a0a6620a89f49c4010318d40e1d6de961e587 net-tools-1.60-r12.ebuild 2109
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD+QWc2+ySkm8kpY0RAtyBAJ45XNUOmsM8rtf5gMxRC4/Iz5EPjgCfVc1K
-moOxs1/eTJMjeTfbyY7LJ6E=
-=/o3A
+iD8DBQFEEmLq2+ySkm8kpY0RAqf9AJ4kOwK1EsGPWkvKbwF7t07sK05rfACdEwa4
+EbjSws7DkeFCFLfDPZ0JePs=
+=FKHr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/files/digest-net-tools-1.60-r12 b/sys-apps/net-tools/files/digest-net-tools-1.60-r12
new file mode 100644
index 000000000000..41cee0a164e8
--- /dev/null
+++ b/sys-apps/net-tools/files/digest-net-tools-1.60-r12
@@ -0,0 +1,6 @@
+MD5 0513b10db47b41859babea4a1d7e06b6 net-tools-1.60-patches-1.2.tar.bz2 104902
+RMD160 f4f9fb022acb7ff6bade8858b749e07afb1394a4 net-tools-1.60-patches-1.2.tar.bz2 104902
+SHA256 59da1d7bff68f54f5a77b382e1e52e38312e77e721ef096b5c3a13407ee9fa6d net-tools-1.60-patches-1.2.tar.bz2 104902
+MD5 888774accab40217dde927e21979c165 net-tools-1.60.tar.bz2 198520
+RMD160 58376371a9383842640d2c4215cf771d522ee43e net-tools-1.60.tar.bz2 198520
+SHA256 7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b net-tools-1.60.tar.bz2 198520
diff --git a/sys-apps/net-tools/net-tools-1.60-r12.ebuild b/sys-apps/net-tools/net-tools-1.60-r12.ebuild
new file mode 100644
index 000000000000..cb1f45792acd
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60-r12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 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-r12.ebuild,v 1.1 2006/03/11 05:39:11 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils
+
+PVER=1.2
+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-${PVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls static"
+
+RDEPEND="!sys-apps/mii-diag
+	!net-misc/etherwake"
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/patch/*.patch
+	cp "${WORKDIR}"/extra/config.{h,make} . || die
+	mkdir include/linux
+	cp "${WORKDIR}"/extra/*.h include/linux/
+	mv "${WORKDIR}"/extra/ethercard-diag/ "${S}"/ || die
+
+	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 -C ethercard-diag || die "emake ethercard-diag failed"
+
+	if use nls ; then
+		emake i18ndir || die "emake i18ndir failed"
+	fi
+}
+
+src_install() {
+	make BASEDIR="${D}" install || die "make install failed"
+	make -C ethercard-diag DESTDIR="${D}" install || die "make install ethercard-diag failed"
+	mv "${D}"/usr/sbin/mii-diag "${D}"/sbin/ || die "mv mii-diag failed"
+	mv "${D}"/bin/* "${D}"/sbin/ || die "mv bin to sbin failed"
+	mv "${D}"/sbin/{hostname,domainname,netstat,dnsdomainname,ypdomainname,nisdomainname} "${D}"/bin/ \
+		|| die "mv sbin to bin failed"
+	dodir /usr/bin
+	dosym /bin/hostname /usr/bin/hostname
+
+	dodoc README README.ipv6 TODO
+}