From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-863507-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 877B91381DF
	for <garchives@archives.gentoo.org>; Mon, 15 Feb 2016 16:19:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6B96221C002;
	Mon, 15 Feb 2016 16:19:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id D2D5D21C005
	for <gentoo-commits@lists.gentoo.org>; Mon, 15 Feb 2016 16:19:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id E46D2340BAB
	for <gentoo-commits@lists.gentoo.org>; Mon, 15 Feb 2016 16:19:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B63561069
	for <gentoo-commits@lists.gentoo.org>; Mon, 15 Feb 2016 16:19:16 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1455553147.edcf1c49ca25f6f46082f6ebd254af0d2e21d906.vapier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/net-tools/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/net-tools/net-tools-9999.ebuild
X-VCS-Directories: sys-apps/net-tools/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: edcf1c49ca25f6f46082f6ebd254af0d2e21d906
X-VCS-Branch: master
Date: Mon, 15 Feb 2016 16:19:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f24a3541-ffa8-4e3f-87d7-53c73968ee91
X-Archives-Hash: b6e1ffe3647a660897fc7564ce9bfbb5

commit:     edcf1c49ca25f6f46082f6ebd254af0d2e21d906
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 16:16:20 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 16:19:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edcf1c49

sys-apps/net-tools: switch to upstream config knobs

 sys-apps/net-tools/net-tools-9999.ebuild | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 5db331c..31bb147 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="http://net-tools.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static"
+REQUIRED_USE="nis? ( hostname )"
 
 RDEPEND="selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
@@ -67,6 +68,11 @@ src_configure() {
 	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 HAVE_SELINUX use selinux
+	set_opt HAVE_ARP_TOOLS use arp
+	set_opt HAVE_HOSTNAME_TOOLS use hostname
+	set_opt HAVE_HOSTNAME_SYMLINKS use nis
+	set_opt HAVE_PLIP_TOOLS use plipconfig
+	set_opt HAVE_SERIAL_TOOLS use slattach
 	if use static ; then
 		append-flags -static
 		append-ldflags -static
@@ -79,28 +85,4 @@ src_install() {
 	# We need to use emake by hand to pass ED. #567300
 	emake DESTDIR="${ED}" install
 	dodoc README THANKS TODO
-
-	# TODO: Make these into config knobs upstream.
-	if ! use arp ; then
-		rm "${ED}"/sbin/{,r}arp "${ED}"/usr/share/man/man8/{,r}arp.8* || die
-	fi
-	if ! use hostname ; then
-		if use nis ; then
-			# Since all the tools are symlinks, repoint them.
-			rm "${ED}"/bin/domainname || die
-			cp -p "${ED}"/bin/{host,domain}name || die
-			dosym domainname /bin/nisdomainname
-			dosym domainname /bin/ypdomainname
-		fi
-		rm "${ED}"/bin/{host,dnsdomain}name "${ED}"/usr/share/man/man1/{host,dnsdomain}name.1* || die
-	fi
-	if ! use nis ; then
-		rm "${ED}"/bin/{,nis,yp}domainname "${ED}"/usr/share/man/man1/{,nis,yp}domainname.1* || die
-	fi
-	if ! use plipconfig ; then
-		rm "${ED}"/sbin/plipconfig "${ED}"/usr/share/man/man8/plipconfig.8* || die
-	fi
-	if ! use slattach ; then
-		rm "${ED}"/sbin/slattach "${ED}"/usr/share/man/man8/slattach.8* || die
-	fi
 }