Version bump w/cleaned up selinux support #469224 by Sven Vermeulen.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 132 insertions, 17 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 307ec88d727a..406458156fad 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.136 2013/02/17 23:44:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.137 2013/05/13 16:29:38 vapier Exp $
+
+*net-tools-1.60_p20130513023548 (13 May 2013)
+
+  13 May 2013; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60_p20130513023548.ebuild, net-tools-9999.ebuild:
+  Version bump w/cleaned up selinux support #469224 by Sven Vermeulen.
 
   17 Feb 2013; Zac Medico <zmedico@gentoo.org>
   net-tools-1.60_p20120127084908.ebuild:
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index a412bef95c2b..45e264dd622b 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -7,16 +7,29 @@ DIST net-tools-1.60_p201111202031570500-patches-1.tar.xz 3348 SHA256 98a5e20f4cc
 DIST net-tools-1.60_p201111202031570500.tar.xz 223532 SHA256 58bd85bd7d4776635754dc4ca2b2b164346967bad67cf661d4c9933e7d6b5474 SHA512 f894f59d4fce76cab97496df6d3dcc5cbca7b4146fd7e5daea95cb447e3460e448ad20398eb5a6b805b80f6050f30aa47e133c166b63f7a4cdfe9256383322d4 WHIRLPOOL d651b6f455faa5ffeb103aab08f0b28a95ff42fb8b77a73a1f8b1f9f0a9c3f39b5405c339696558a341c888e19c7486a807f83287cc6b4333dc72ed0480cee8a
 DIST net-tools-1.60_p20120127084908-patches-1.tar.xz 3332 SHA256 1240a3c139b684da195f665447a80e1d05f0d6f3c2319dbf340dfcbb78b01501 SHA512 97602993e273d2fadac2bf3df892e09ba7c7cda44a7825209a644ada4d203e0c3d2248cbf976545afb07113976694fb581511641725ce1b95b00688d357d0a02 WHIRLPOOL 4fd537e042ab368795ff0db55717c424ef3bd7bc37302c5fa64936c4ffe4772557c25c83224f9ee0017f812817143b7168e70b2fdcf146abab06d18cafe3448d
 DIST net-tools-1.60_p20120127084908.tar.xz 224992 SHA256 408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94 SHA512 1237a4bb0bba5273a25d707493d5bdb16f267bfa6731c526329cff459e06923e0d54aef6eded458d3cb72994bf4382f216212c34ad9329f5f1573a4228445996 WHIRLPOOL b14f24c13f2950fd92eb6b897cd14c5aa4d52e40062943fcb84de7e13555f98008db1aa6ec6fb6ca8f899a5bfdfc685f8822da2f3c0e5e002b9d20aec4d8b73c
+DIST net-tools-1.60_p20130513023548-patches-1.tar.xz 3352 SHA256 926240c304e20a0ab966c3d278703a6ef8e7833a54aaf636598854450bd01f4e SHA512 6dd3eef6469a18581a98fc91f424b418f3875cd0eff86724d6bdbacca1b83d1229a567a184b82e0187d01a428ea6be933d53090796b5c7d301009b2e211c4531 WHIRLPOOL fb638e122f85e95fda35b77336fbb5d4f6e89c5f5a5b76d759bd08f53eb0741feb9c7221940b836e0e7f5c60bd312d99d823c3af89340d6e254f1be96e34d2ce
+DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa
 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 2761 SHA256 bfd1da0d898bd273d34decb0edf9be501d16f7de1d6d5c36fbb68f271827acfa SHA512 9f0b7f223c7abd54fe2c421257c3eab1978edd3b076289acec0aad62d8b1350207bba9b9eaf915832b467b547349b2c1d410ea5d82af9a43ef37d3974b20e2fb WHIRLPOOL 0054007ef896d04986576af2de7b551b3b4c4a5f0a797ec010e379c682cf0545ffa7c36dae944b6d4c32f85c77dbb1b96f1f9ebe433dca881b2ad8b03f745269
-EBUILD net-tools-9999.ebuild 2653 SHA256 5a189846d461d5cb963ab28f885b56c6d981330b79eaeaa5e21cce816f66cf22 SHA512 43a49afdaf287c7c5485ae5e4b29baccf37fcc54d8ceed3ed333934768151f2c025382c29e709d178eb4042ec7c16513640d36ae1cf221ece031fadc5c6bbc18 WHIRLPOOL 76c67defb2bed8f600b487f3060b321968dbef472e62985c7eecf04822d4130f141114f1498b21730d95e3a2d85dbe47316826049cb928ac89e2ac340e8da10a
-MISC ChangeLog 21578 SHA256 9eefbd4a4535175a025a42af8a60dc5e89fcc75e7ae8323af7e3ca0b694c19a7 SHA512 637bc8a887a3c63ccf8cc771d84dc046f9cb4b8d3a0dad6582e0745ab90579bbc8799d7809021bb4f1b325939c1ae8925d318579ee7b713f89f4bec53a099430 WHIRLPOOL fcf032e441a1412b23899ac891f19cecb8e121314a0afeffdef3b6a6bd734e7b3b76e114a34a9507bccf24552e9113c19ad47bcbc0cfab0bb0620ac276737be3
+EBUILD net-tools-1.60_p20130513023548.ebuild 2785 SHA256 de72892df969a838115363a4d073fadc3c7a01ae6ddd7e041f592f6f33e592d8 SHA512 8e36204fc1133c587846ecb9478dfc6333df2ad43937d44887abadaaed62a324f00eb21d20ba6db771bcf1246d8e1d5b2deae2280d50930cafca99940fb7fcf9 WHIRLPOOL a1eb418c9706c37d5be1043e2ec196967c02d92a07da031bc56f5cc88ce2b206cd6da0cd0cd96f65a22becf45baa7199400b7451cc69ddc72a248c74a63d02f4
+EBUILD net-tools-9999.ebuild 2769 SHA256 b953ce07d0c81900b6e4aac4d76d1eca3c52fbd13a055c846c8308dc07fe5c19 SHA512 1511df971667227e712395cdbfd1b3e4573a202e63b5ff929fc142dcfd53a8c8232e937b97f3ddda915cd0c4b288d68b85c47e0701071009b0d6f170229de510 WHIRLPOOL 9373008a1845e7a7116f7aee85ad17385dcef0a14ca9eab707694c17590b029c213d0fcb57c5d44a5a8db82204ebc925e4d11bfd3772205421f1d1c64574ec84
+MISC ChangeLog 21811 SHA256 7b942bf18600c6574557b8e519f9c459856f5a746fc5561c29d1e29cba6a37b0 SHA512 113b9f7390333a46d4de6a7fd4f841564929d2e86673fc6e48f1a5b624784c7ac25c1b1f75b8916f8006351c05805928583371436f6e8433b273bd9fed3956c3 WHIRLPOOL b2aecdf98ad81a9750ddbf8b2a6770b27d1b20e31a0cfe0835705709052ecfc3267c1345b7de50e93f2380d392bb6fd959b142763bdb2d827c51b2899841433b
 MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEha2QACgkQ/ejvha5XGaPp2wCg85/AAexfFTTFMmiXtbiQqbjW
-tB8An34VUpJkHujQJZETyREw+uucLPz/
-=cdIx
+iQIcBAEBCAAGBQJRkRT3AAoJELEHsLL7fEFWtXEP/0d58m6ioz84aMfLK9+DKiWm
+5Gd7ZXf7csZi2hzuyH6HmcKjvgQcyKHQSkeBFyKwDsweTBtW1yD2lCbC+xSyf9QB
+HaIw+dYaT9iR2qInyqLoaaobSZYuPv/vlJje4bt95MpD5bFTXoRs96iCmu90CmKB
+hy8tYMKTpEygKxt48YqXQudGDleTp0rnEWGOqi26KuEX1c+VWreoOp60vQ1EAbjf
+QzmxAlJT8QTqe9Z4GBzjRd1XdpOKddtJb4dZN5GmqIL+i6agE05oAsvBYOvvCxdC
+15q36O9+9ix4VVEZY+M0Er57Hg0QBNGujG9DHBP99eSEWyVin8Pn7AdXqQ8C36tR
+aH7BLJ8IpF97SFq5NUPStxfDZpnjz+6vvOTzplm1IuJbCAE78KitelYEjPO3FcAU
+RTOM37zKbKOiMtCnqAk5aT40t/gqeX8OoLTw8jWTmCWFQ/q2c7jTEOs7ay+uWAaM
+Ykzse26BcF1DCmpLwUzfo/LfgBEPRwRqJf8tbkVs8AGNR9xuYUwm4WQMNMN/rPF8
+0fPpBjJljC77Nlc5VN1OnMsHX7FasSJBgxTHISJ4i8g9Xht2+pyXnSMIVUXpkzqb
++ZBXDNRORmZIYIGwzKVAax/knv4gJYGs/w4sQrNfo1GlWc5u5UVuqnkZC5fCM3pC
++Juj/XuAEhZuZen0VMMX
+=gvaQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
new file mode 100644
index 000000000000..25b349c4ba64
--- /dev/null
+++ b/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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_p20130513023548.ebuild,v 1.1 2013/05/13 16:29:38 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 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"
+}
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index d7755dc348a4..965b6f9edeb2 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.3 2012/07/23 01:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.4 2013/05/13 16:29:38 vapier Exp $
 
 EAPI="3"
 
@@ -22,10 +22,12 @@ HOMEPAGE="http://net-tools.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls old-output static"
+IUSE="nls old-output selinux static"
 
-RDEPEND=""
+RDEPEND="!<sys-apps/openrc-0.9.9.3
+	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
+	selinux? ( virtual/pkgconfig )
 	app-arch/xz-utils"
 
 maint_pkg_create() {
@@ -34,14 +36,10 @@ maint_pkg_create() {
 	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}"
+	git archive --prefix="${p}/" 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
+	sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
+	tar cf - ${p}/ | xz > ${p}.tar.xz
 	popd >/dev/null
 
 	local patches="${p}-patches-${PATCH_VER:-1}"
@@ -78,6 +76,8 @@ 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