Update snapshot.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 97 insertions, 13 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 91574bbe7fb8..f278f150ee1a 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/net-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.89 2009/09/06 17:13:56 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.90 2010/01/01 06:10:59 vapier Exp $
+
+*net-tools-1.60_p20100101055920 (01 Jan 2010)
+
+  01 Jan 2010; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60_p20100101055920.ebuild:
+  Update snapshot.
 
   06 Sep 2009; Mike Frysinger <vapier@gentoo.org>
   net-tools-1.60_p20090728014017-r1.ebuild:
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 5242afeac77d..6f70d4404071 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.60_p20071202044231/0001-git-ignores.patch 654 RMD160 244cdb40c5969f29a9690ad1781142e6c5b91442 SHA1 a06a5ff44bea3d34f124ea52ff94226a7fb50966 SHA256 377a46a5ab37a654c5bf58fa42adccb1ceee11a8c083e6000a3df4dc958e1811
 AUX 1.60_p20071202044231/0002-respect-normal-toolchain-envvars.patch 1704 RMD160 5dd0f00322fb58944d8d462f7738ca7250531d72 SHA1 611a52dc05671716a6b6cbb19136cc23c0d31883 SHA256 ecc53f99547031dc33bc587af260fc797f4bc2696b55bbeba98bc321744479a2
 AUX 1.60_p20071202044231/0003-libdir-needs-version.h.patch 529 RMD160 c9391036b30265231e572eababae568ecbf520aa SHA1 a89fdcc1244892985e29f26557b68b021f053948 SHA256 89bb41bbb361466d2e75d054b302c5d09668710b1bb2c558f3053fa8ae34c447
@@ -19,15 +16,11 @@ DIST net-tools-1.60.tar.bz2 198520 RMD160 58376371a9383842640d2c4215cf771d522ee4
 DIST net-tools-1.60_p20071202044231.tar.lzma 183956 RMD160 c3a836b865333326cb868da1d586383d30b3d153 SHA1 0b34c293ae3fde2ac2ec1c416e71478d242c1002 SHA256 381bce364d144b140d2e44b4a9430cd292d8410185099b5cc45502a5e6111de8
 DIST net-tools-1.60_p20090728014017-patches-3.tar.lzma 12545 RMD160 9640e3ae1a5e147c74708989684a121ef4ad4632 SHA1 c9c979d0316931e339176c9aa207fb389e022618 SHA256 f592ec69354b6910319bfea4179829b9be0662a5418417780cdc7dc2cdece60e
 DIST net-tools-1.60_p20090728014017.tar.lzma 187111 RMD160 5f6f21c725cbd69f1a9609f95f98f98425fbe5c3 SHA1 c7159f7ed892cf326c0665a5720edac0b3c912f8 SHA256 bcac2d566264f52c4c35c9e1cc130d22d93e95aa49ff3a77d0cf26e4dafc6fe6
+DIST net-tools-1.60_p20100101055920-patches-1.tar.lzma 5925 RMD160 40dab75994bcc6316dd3f8b1ef48749d93debe53 SHA1 b104f4a92321cea9625207f782d6dbaa027ad47d SHA256 ac74dc41141d27dbd15afb0ea9078ff5679faf3216bc8a15241a6bbe1ddb3c0f
+DIST net-tools-1.60_p20100101055920.tar.lzma 222810 RMD160 560e9230958fb68f5a30834456c630a4254193cf SHA1 6deddeb3819e349beac24e5b5408a12bc45e1803 SHA256 db4ca0d4fdf8c4459cce1464f976ae9041a1cfac5fe43420e55dea63998f111d
 EBUILD net-tools-1.60-r13.ebuild 2267 RMD160 6fed42c892dbfa5fd13daba8ebd8b6c8d63365c8 SHA1 a26ad4ec81a9003a586eb58f87248e9e006db6ba SHA256 22f1c4ab8848ae781813e89701eaff9147f68a6534c39831dd9aa1ff0dac70d5
 EBUILD net-tools-1.60_p20071202044231-r1.ebuild 1885 RMD160 5196d4583965b89472cb1937d76e988fb5afb62f SHA1 d031b0d22370de362a61ed2059117884ec9bcad7 SHA256 9d8f689338f7a05712bff44b4ff60023793c09161b0d3bea91ecdc28407ce57a
 EBUILD net-tools-1.60_p20090728014017-r1.ebuild 2139 RMD160 defffc0fe91974a9aee09feb199697b762394c01 SHA1 e790ba5de166ec1b34492868b4fbd16b6365f9fd SHA256 69e9b3c154689f9b4c7d7035285d39483dd214c4955795fc28845cca3382254c
-MISC ChangeLog 14775 RMD160 1bbc4a85ff1e0b16bab97b90fd48a3499d810c90 SHA1 c50820a2260849ba3b552831bcd286f9da67a93d SHA256 b12124a613bdfdd3f360cab72c3001f62cd91a18ddc25590150faa4ff57b29f8
+EBUILD net-tools-1.60_p20100101055920.ebuild 2240 RMD160 e7f82448634c83ced26ff22a7579ab9adc5b4f08 SHA1 c32357a5bf48a96a258565d9b29f8d1e3e0f617b SHA256 ba669cd98ad61d18a65399803e31c013c41fd26f18d3d3677db13950a2c23feb
+MISC ChangeLog 14934 RMD160 1aaae7f8925d0b7ae3c28aadead59fd076e58d9d SHA1 b7a33b0f4b10c59694eafcfe585be1b61460fba2 SHA256 eb4e2987f69d220d8f3fa2a7c0b2f080f51cd2d6b5f2319529b5a522b0e0ea3e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqmmUoACgkQlPl3HsVfCDr5TQCdHP3Jk7WJyYO6jgrJl6izrVvl
-QHYAnjw4xAtOh1CMhcN71Rj7Um44IEO4
-=dKQl
------END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60_p20100101055920.ebuild b/sys-apps/net-tools/net-tools-1.60_p20100101055920.ebuild
new file mode 100644
index 000000000000..54cfb6c8360f
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20100101055920.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 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_p20100101055920.ebuild,v 1.1 2010/01/01 06:10:59 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils
+
+PATCH_VER="1"
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.berlios.de/"
+SRC_URI="mirror://gentoo/${P}.tar.lzma
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools/git
+	#git-update
+	local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
+	local pv="${PV/_p*}_p${stamp}"
+	local p="${PN}-${pv}"
+	git archive --prefix="nt/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	pushd nt >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
+	emake dist >/dev/null
+	popd >/dev/null
+	zcat ${p}.tar.gz | lzma > ${p}.tar.lzma
+	rm -f ${p}.tar.gz
+	popd >/dev/null
+
+	local patches="${p}-patches-${PATCH_VER}"
+	mkdir "${T}"/${patches}
+	git format-patch -o "${T}"/${patches} master..gentoo > /dev/null
+	tar cf - -C "${T}" ${patches} | lzma > "${T}"/${patches}.tar.lzma
+	rm -rf "${T}"/${patches}
+
+	du -b "${T}"/*.tar.lzma
+}
+
+pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
+
+set_opt() {
+	local opt=$1 ans
+	shift
+	ans=$("$@" && echo y || echo n)
+	einfo "Setting option ${opt} to ${ans}"
+	sed -i \
+		-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
+		config.in || die
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+
+	set_opt I18N use nls
+	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
+	if use static ; then
+		append-flags -static
+		append-ldflags -static
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+	einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}