Version bump #522566.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 119 insertions, 15 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 9e723a546671..b3a91258e497 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.150 2014/09/08 01:02:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.151 2014/10/19 04:24:16 vapier Exp $
+
+*net-tools-1.60_p20141019041918 (19 Oct 2014)
+
+  19 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60_p20141019041918.ebuild:
+  Version bump #522566.
 
 *net-tools-1.60_p20130513023548-r1 (08 Sep 2014)
 
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 229f3af6448b..c998608b5fc2 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -10,28 +10,31 @@ DIST net-tools-1.60_p20120127084908.tar.xz 224992 SHA256 408a51964aa142a4f45c4cf
 DIST net-tools-1.60_p20130513023548-patches-1.tar.xz 3352 SHA256 926240c304e20a0ab966c3d278703a6ef8e7833a54aaf636598854450bd01f4e SHA512 6dd3eef6469a18581a98fc91f424b418f3875cd0eff86724d6bdbacca1b83d1229a567a184b82e0187d01a428ea6be933d53090796b5c7d301009b2e211c4531 WHIRLPOOL fb638e122f85e95fda35b77336fbb5d4f6e89c5f5a5b76d759bd08f53eb0741feb9c7221940b836e0e7f5c60bd312d99d823c3af89340d6e254f1be96e34d2ce
 DIST net-tools-1.60_p20130513023548-patches-2.tar.xz 14780 SHA256 4eba8545c64db6d2b0eedca45ff7346e4c0b6f1b526ca31b2db6462a0ec0be1b SHA512 6cb4ce7324bae696997839492edd3578e8c9971395de5d499a735ef6421aacc37d24311ada4b94e596c61b55660e2a4babb58f2403ef83da7ac32d2ccbf23201 WHIRLPOOL 200f0a5a88c1e637d183dd098ec1077ee565f0cac1b021b9500a803e2717143184d2c6c597158d73867331b1dc5e474e4858654b6927c314522cd228f660c00a
 DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa
+DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190
+DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec
 EBUILD net-tools-1.60_p20110409135728.ebuild 2318 SHA256 fc1167a6673ea8ee5e881cf1cd760db89941fba36a2d387c250554e129b4b652 SHA512 32f8db050cf9f751f19121ab74645cfae946a60ff19df727c51ff635218536dd679e63229ca6b7849d5cd2e7ad29ddd48eea575f16e022622755c3f46cecc18b WHIRLPOOL 353da3bc3272114e46cd7fdaafe6848c91934c47d6489e215cb20278f50f9ba556c648937eaf8e07194342c96b1698034077a73c305faa9eca48d8418f9380ff
 EBUILD net-tools-1.60_p20111120203157.ebuild 2764 SHA256 b028b4bf995a101b63700672b71023bcdef9ba899f27e53e7ef66604207a9675 SHA512 66d39c6eddd1dd53efceb35555431384eaac4e880b7075748db3c5e104e9e1da9ba77b79fcb558a35a7419f1aa581266b3f78594e062b552c3ce1bbe2991934f WHIRLPOOL f3fc83df4bc5d3992b5bc3af13d998d1148998d66823b862fd70015fb4a352982f5ca9aedda5bfa6dfb4cc5a87bca8b1b856a7ef27d4431bf75dc923d1489c1a
 EBUILD net-tools-1.60_p20120127084908.ebuild 2766 SHA256 6fec18b5b50f8e58bc5b351f8597e24457ef833bfbdbe31d024640fb7887a414 SHA512 e3b1327a4d9766cb4c3e891d202fb7b687782e02bb1cb87bdf2dcb967c194d2c742f2a5aacabf20bba5531cdf3f30e00eafd495ec38a0f26a4f800a3d8b2eaad WHIRLPOOL 3b73b4a5e496ed0cfcae2cf266a3d59ba7c541eecfca68ad93aca5cf69623c817d4985d1cbb26684482bc9db8feaf127a550699c1ea866cc0281450ff1298b80
 EBUILD net-tools-1.60_p20130513023548-r1.ebuild 2781 SHA256 a0b7aff3bf531dc9fd0a13748686eec55b13baec0d36cf782458f38f2275b483 SHA512 5a43c2e9a69ecb230b1c0fbd266456c05b70135c0ca0d9feaddd86c5bb35dff5d437c1b690ac8c5cb8064d59371509180ccab969c0ffd88dc214acc2634a5706 WHIRLPOOL b0c3af10af5b9610998936622e67a4ae924ea435172ed469c5bf350e8517fcd23856e7c4067f09d68d30d3693ad00fa42b3b67e674ef6f7a00c10cca12d855d5
 EBUILD net-tools-1.60_p20130513023548.ebuild 2768 SHA256 51081986a6e8788c4a2034344eb5243cc646c83c2978b407d6f40d9dc82124c1 SHA512 b3a88f4d043beec7617e9e0f39c19f3534bcbc336a5e59beab816328d56376a3848cb3f39b9d78f51dd245135dfae4351f857f520302ce21138062182ea8851f WHIRLPOOL bfcecee8be0a53a9015c8c93b9bfa5442f985d9f076abe4e32aa05f2f930df5ef639ec0ee8e7c886d14338beaa82a9a1c16ef4f6482f45fc44ad80f0fdbabcec
+EBUILD net-tools-1.60_p20141019041918.ebuild 2779 SHA256 af02cbaa726516dbcc2742f62c984c4c42e8f88752754aca61d8d769bcdec8f2 SHA512 9a5d1376ff6588258eb645e1b5c76f2e607e8840d274ae4951ab37883e7d795b98d428744c5d9c46a5737a7e502747c1a692a8ef6f6950b6ecaaa11cdc284048 WHIRLPOOL c1645db4db1ca99112c828adc016f472de8dd53fd9707fae8f13cbd7736f588deb92eeefefcdee25a89b97f0fff8593634bc9d3991f1a64b8611d2dc4cc09a97
 EBUILD net-tools-9999.ebuild 2763 SHA256 15d71db80959879b90a1a4631145a3ab29ba0bfec724bf7b2a48cd2f8af01be2 SHA512 552fc34031e13ff236540c33d4058d01d7869bd5845587f00c39c803e72c9bdfb293fbbc45f90d59a8e06a4b47baddc4e0574a3b8b2c898d984b4246372e4d52 WHIRLPOOL f068e1661fd3feeb48da5011d77d7b0e35145aacb62e5c74217ba7ae96126ac680e38a58b6e480e829d9614c96a252f4fd5f4071e6723978cef4cf4d89f41bb1
-MISC ChangeLog 23600 SHA256 a6783fe0359009aebaa02f4df55568560e638cf28e9904f5f73595ecba1fe0e3 SHA512 04a6cfe6e43bd276a66f8946ca1ba3968babd90500e5de98b09561179e3e4688d130512a7d975c4926514fc5f59be5db861234ac42c489b87ee9278332d7ea44 WHIRLPOOL eb6a280d13a927f3456a1add0f5ec127025bd3a6618a7d2f04d68edc5943b2fad7e4ce11c9e2248a0a3c5b6bc04fbdf905837c711a45e82f84765d2d2c9174ad
+MISC ChangeLog 23765 SHA256 fa76f53470130d569b5a87dbd46b227579ea204ce1b9e1f1b3cc66effe19db33 SHA512 05fb2906dbbc79c6ee4747100ffb88fe165c1e1ca2461ed4dafb86df8b064f931958d28331bfdd5ebea4054d6456a81c2f377d03b74483a2244bd6bce7174a47 WHIRLPOOL 42a6fc542f5ba03de88590306707b9cebc24ffbdf8a8f4026bec76b485b5b8687245d9455443519b311df683980f2fb225876c8d01a8024c56efe5d92ea9ac71
 MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUDQA+AAoJENsjoH7SXZXj8jAQAIceSGmasV/R4sXMlPo9W2dX
-vZVNdwuwGhzVhB4YNTMirWdW9yDx47nE6PY/YDQNyA9VKC6C4IOG77I4EqM0W8Mh
-dzk//sDEsvicFcW/4dh4LQYogIW6bW7AuK7Kw1XQXn3E4/7DtPZxDMRiMDaRvWUn
-PwNN4BUB25nJogfODYu0EaWioasDfMbmywzFy69jtX9UOlRq4WO7zV3KN1Aw4dmV
-FvmvEATfu43Uar/1Hp5yAH+jRlqcMlA8/w4Pv4tXu+3LaHMyl+w6CFg9KvjNRnNX
-y8aWR0bcPy/cChYW504qcqWJa0uhxHB37HZaOu5eHhuQNxEaUHTF3/SIHCUiYfWS
-3jevT1hRCwsL1cuBd7oemol0sPOcxIIUF4Xl4DQ+WKQVvyAys1l6Gjp0I0g9AXwI
-6ty1twCtMoPlpkt0t2YPOEK9dANC08OkASpwtQzkwv191ll6nymp+xP6oz6SIhVG
-PXONG665UBLmcm6vDoohFmKrvfAZbEq1UOrjpIpuHIiWZW41A/jwqgyXp6sBeMUK
-rwvfMI9rVU1K/eu97jliRBIss0IbfBjjDF/KUE9tZbyUT/D+HDYqB26KLsJxOQY8
-av9v3FukOWA76fFGDpvmZb4jcIQ8/Ba2YXFIgu+tHwIH4vyB7dkX+Rj/LhE55nR8
-9fSXjq9kMBloLM26wR3o
-=5/+z
+iQIcBAEBCAAGBQJUQzzyAAoJEPGu1DbS6WIAA10P/266CjHBSlzYcZp18D0optOz
+GTZ9ID844V3LOWn71TBcO87NL3KP6fos4DRQUuqTy0MAFfzvoA1d8kmI7HC3VrY2
+qiXu9vmj7nW6T5TTF5ohU+HkSEy9K2SJk6O7BG6vP6VJ7Uhiz+juTTeHVdYkEeNo
+N4v3x/RR44OL1kt0sW5mqbTdRnEhXwaiDYwvorSqczSlf7m6OquLhgE6mFFgB0sA
+wTdKIvvtmGOSxhknytT0OzKqdE6bHpC0r2jUd3YRpDjfraxjcMFODI3hoqIkeR9O
+yupBwV1r2C10Xo495XUUBO8iyrzCNgvgZb0afw24G6jfCLe22+oCD8QQ1jduNfIk
+X0bwHtH/JtkRyF2UN6VZcNgSnkbxobKsVpZohqfiIgo6TbSy294QRZ04E3gZvtph
+qF9U7+YTnCovl0mxtqWXeI+TQ2e6JBS59/KhouTp1DOhprJ5DNYjxjsgSe8KSnmN
+PkzaK3zAI0FdLLG70SYeFWrO+AJ+dzX5lPKiNZK7TPg/sf6fuciKGgdbfbPtLdtA
+t0e3/DSTxpIbasUhe+objL3LelviZhCXLjVAW4yZM0XcpCquYW1RbXYZiLpes/au
+E56kU3x37fWI25YyyRMfFHYP6T4oNFhqbZL8WJNnqFiG7XmrGpTuxPiqo/HN+hET
+VRRdmXv8kAl2Qd3C3P+Q
+=eyMT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild
new file mode 100644
index 000000000000..99c808a64ffb
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 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_p20141019041918.ebuild,v 1.1 2014/10/19 04:24:16 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
+else
+	PATCH_VER="1"
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 selinux static"
+
+RDEPEND="!<sys-apps/openrc-0.9.9.3
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	selinux? ( virtual/pkgconfig )
+	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="${p}/" master | tar xf - -C "${T}"
+	pushd "${T}" >/dev/null
+	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
+	tar cf - ${p}/ | xz > ${p}.tar.xz
+	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'
+	set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
+	set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
+	set_opt SELINUX use selinux
+	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"
+}