Version bump.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 119 insertions, 15 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 79fc335799d5..22af8474827e 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.121 2012/02/01 21:26:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.122 2012/03/10 18:52:24 vapier Exp $
+
+*net-tools-1.60_p20120127084908 (10 Mar 2012)
+
+  10 Mar 2012; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60_p20120127084908.ebuild:
+  Version bump.
 
   01 Feb 2012; 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 0f2d0f3df621..568b4dc3e0a4 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -5,25 +5,28 @@ DIST net-tools-1.60_p20110409135728-patches-1.tar.xz 3976 RMD160 96b104edca816ae
 DIST net-tools-1.60_p20110409135728.tar.xz 223168 RMD160 61ef911a9bf6bc28d92de96a9ccdbe852eb06f12 SHA1 47e6c6684999cccf48e014cb2248bc03677e5627 SHA256 2379dab69c68c0b6755cd063c9cb170d4b3862be9f0154cf4c28d749d232b98f
 DIST net-tools-1.60_p201111202031570500-patches-1.tar.xz 3348 RMD160 e3a5ee4a4ccb943bbf97d0eb0c57bea2ed102052 SHA1 0aa724cf0ab29db6e36d6a3bb96c0fb4a4c52b5b SHA256 98a5e20f4cc6aca911e3b24cc04a071bff0f694023013755dc195da26089f837
 DIST net-tools-1.60_p201111202031570500.tar.xz 223532 RMD160 cf72be8dcd92676bd904e673799b61b5275b0d64 SHA1 63d31f76459a8e58e3f1c527d28f4ca309a95799 SHA256 58bd85bd7d4776635754dc4ca2b2b164346967bad67cf661d4c9933e7d6b5474
+DIST net-tools-1.60_p20120127084908-patches-1.tar.xz 3332 RMD160 9aa990353d0bc7dda2d9c0c84503714651bfefdd SHA1 7aaf0a18b62ec46080a8d4d313604ac01e597278 SHA256 25c66e4d112d1b5d5f39abe76632df8d995534e5ffc43047d1e9d39f12c04e0c
+DIST net-tools-1.60_p20120127084908.tar.xz 224992 RMD160 64b1b0045f5394e6678f6a6ce9c868fef09df2f5 SHA1 495046e76eefbe3b3f14875db04873da7884be52 SHA256 408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94
 EBUILD net-tools-1.60_p20110409135728.ebuild 2255 RMD160 db4b3c05982f59f732a51125143610142d875c76 SHA1 6d3475263a73bf2043fb2e29a0ec55ff9ce44c36 SHA256 80b1c01a4484b7f2f71ac2f9f2ce4d634f694a60ec349b2648c833bcd7797aa5
 EBUILD net-tools-1.60_p20111120203157.ebuild 2701 RMD160 84257979a6945c7229ef43799f80dedee6e38105 SHA1 dad6f7dee27845c2508745f8eeb6918b69a00a0d SHA256 bbc16f8c9638661edca133c2a096b40cf6af75c93909ea35d27752cb5cb80b65
+EBUILD net-tools-1.60_p20120127084908.ebuild 2606 RMD160 a245276eec10308a4131d8f46c8526af079f8be0 SHA1 703e404b73b9b256bcf59c2cd1868081e5f8e12a SHA256 52ceb4c971f886a65be74ef729634c71af50e780f339ef9bf57045530002cb5c
 EBUILD net-tools-9999.ebuild 2590 RMD160 7493169771bda765782b39a94b8ce4ec26769778 SHA1 15b9fc7987374d8f9403d30b44273f6019eefb66 SHA256 075cd48c7ad1e9b5bd6a7c3f93849251853afe902947244fba92fb8378acbd0b
-MISC ChangeLog 19337 RMD160 0d8047c5476a1743c80e123e5b51653861e3bc68 SHA1 d8d0822b63e29829e75fe951905285bc52ae7fad SHA256 fe75d50bd2f285138ace920f024638c71bd16bd80f4f6092ccd8d24427a82818
+MISC ChangeLog 19493 RMD160 5f02dcb54294fd42936c39c42534482383790a7a SHA1 a443bbb0fc221579e7f7548813d6ed2ef2f9a275 SHA256 86ccaf6ec216c4b61649f8e8c2ad3e8b1901c732c06ead4374f5c3493fed7a7a
 MISC metadata.xml 283 RMD160 81fc4d8272396ca42e82bdb0c886829cee76d462 SHA1 aa3da7f4f3a7bd1f794ef04bcc42c80a84480ee2 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPKa4sAAoJELEHsLL7fEFWXLwQALUKkA5EH8lvCmuMp3xTXzD5
-m48jPX+C1OhzNxUzGFsrVin7svvgGWP0hGbAXC6Oqfy0nTMWj9dGs4AEW9dXj+j1
-QA5NWLhe69iTploiOO6fB729WqZyiKdfjQa3X3ot8JaS/CBXFiZvKVuTUcjxqJ4d
-PEUbgoauAuMbGwFqPclDbV0tMLkfqv129IX7W+kPqWcW5T6BUFOfRYj1YHiKeTwi
-vdCzLUnNY5MtkokGZ2ZAwfo4sg+Sou2fREBbo+scYwz8OS6TOZHbcXpdXpvUXHm6
-bw6KgtRrs3+AYQ4cdHb1CsoVS/PqE0XgjSVrFpYUmR6/ajeGobAinkbmekzlq8sc
-mf3bfE7ZFO72ThCbTYA4wqSaTvVbGyHaehssRL6Dvx0b6HgyAiCevXTDKlG4ywiz
-l4JXaYmQFML9Bcc046G9Rx5lJezlrxUH+cVLfqSZC7fdYT02qXX1MYUuaRtSObJR
-IFWkHphRTDoo1vdBB3Lv3xVE9Gwc2gQPt2NqHFvEaq0Agi2NmdrhtyyMsRdXEDSu
-OGYSquOSpV9x9eQKEM9PaaQxhd8A86Mw14a1t2WaEslT2gyXAR4S0yewMlNCUzVC
-S68w5trW0IEfghzSH8dElt55d3NY7nlO1ngTXcny+oeDQcjPyW9+7x1tMPTvDINF
-FGe/VUiZrcQ6U9jUOjh2
-=7pvb
+iQIcBAEBAgAGBQJPW6LvAAoJELEHsLL7fEFWdBgP/j4dYx0pA9R3j1tYADIo2EnV
+/P3VT4JLqTAFTU/XOpWfQ8rWJP6e1YvmeYHdaa0ifatJY1sfG5T2gXrgOCLsdeAZ
+2LCERSKi14OCoSDkDz+Hjmi0edb2VoFVyL7s5muGvNGYrK7S1xabJRn2MXUfKG3J
+lPeiwgnEutTa9gpb+BGntwPMVmeZ6VVp79RCso7pygW1g2+pTB6y+Yq8m8+/gG9q
+sqiXfEizTfMm/ZwJAtCn60wUu8Ij+LFY/pg5YPr5MWfENnQv7c7V+VWVkhQg0pBc
+gCgkY3C/+Q7TcyVWYaYBCltzia2RH5v4cCIJ8+26MbF5GjXhT54ru1URe7QOU28s
+nXwKfDHx1GMsxe2GPI/vDhxPkKx/G4w0PMd6GnnIJmZ8YrqAaCF+rbwDMQOc3lB8
+YjLn4WkgQwn4rIivcZF3En0xxFFXs9gNvwn41f0+ofRPJlQZ4JXH7LnmLoJxWr6D
+crrDNgNj0xuAFgdrRWI4EaKsPvD22ArBMwXF+AyX3p+LZLGiKDwzv7fLrvW7K66f
+c2kBC5MIQ7bbnpJt0fBg6bRNANlRo4iNjL6gI9bqszP5PYAoXo9itMchCMc7jkq7
+8d/0yRdAcVe7A01Fr2Ei65Q2iyorLrDcVgd1mdSYcKanOrClqx7zY8rP5UtAibyO
+1eGzAl9sfZ9zxYQ6ibMO
+=8xR9
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60_p20120127084908.ebuild b/sys-apps/net-tools/net-tools-1.60_p20120127084908.ebuild
new file mode 100644
index 000000000000..de64c98ecfad
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20120127084908.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 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_p20120127084908.ebuild,v 1.1 2012/03/10 18:52:24 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
+	inherit git-2
+	KEYWORDS=""
+else
+	PATCH_VER="1"
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://net-tools.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls old-output static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+maint_pkg_create() {
+	cd /usr/local/src/net-tools
+	#git-update
+	local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
+	local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
+	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 | xz > ${p}.tar.xz
+	rm -f ${p}.tar.gz
+	popd >/dev/null
+
+	local patches="${p}-patches-${PATCH_VER:-1}"
+	local d="${T}/${patches}"
+	mkdir "${d}"
+	git format-patch -o "${d}" master..gentoo > /dev/null
+	echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
+	tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
+	rm -rf "${d}"
+
+	du -b "${T}"/*.tar.xz
+}
+
+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_prepare() {
+	if [[ -n ${PATCH_VER} ]] ; then
+		use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
+		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
+	fi
+}
+
+src_configure() {
+	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
+	tc-export AR CC
+	yes "" | ./configure.sh config.in || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README README.ipv6 TODO
+}
+
+pkg_postinst() {
+	einfo "etherwake and such have been split into net-misc/ethercard-diag"
+}