gentoo resync : 19.04.2018

2 files changed, 14 insertions, 14 deletions

diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index a6880a6e5617..5438d888427b 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -3,5 +3,5 @@ AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 EBUILD kismet-2016.07.1-r1.ebuild 4190 BLAKE2B ef050f41fda06b2130d4483948d84bbf5a22b9197225f86a7ef1c20fcc05cc67b5dc94b85ca26b7b5c30c3afdd0645c7e1e8e2479305fdd967326eebe0d9685f SHA512 b0f441d0ac5082c4f2ffef6334934afd9e596e112b46349e0c7912c834e4d671f1986cfcd4a20387e00d5561dd926ebe0c2eb8ecbf9b27caff7b32e5c12c0255
-EBUILD kismet-9999.ebuild 4829 BLAKE2B 3672aedbaa2a4e420cdc52fa95858c59ac1d6a1031b4c1b739f3f477731ec45a9803766d03a85a257c0bcf92daf48faa0c2e3eb4e8a936b4c5ba3e95f7f5a9aa SHA512 a876b8afc036bcee7dca283c91df99d2363f2116667b8084c15f5f0676ee523dda55b97450eeb1cf8b401d82f8f28da1695c8dfb490fca10c41efac17a99fde7
+EBUILD kismet-9999.ebuild 4585 BLAKE2B fcdd532ba0f68b04a5375c3f6de965c3bea2faadbdebd00535864ddfd8fd7b9cde48cbcf37a6d81d81de740cc2630db5fc2399e9dbbe8d723b63d841377971ef SHA512 198e3ceff3a1243983ebf3536d2565304e674e3aae2333669cce1632b72ef81c3dbd9097770d876f0765c574f2a398f9d22ffb058b2c128c8e78b4e30aaf58d1
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 0cd7c6acad68..2b1292aff57d 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,8 +25,7 @@ HOMEPAGE="http://www.kismetwireless.net/"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-#IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog selinux +suid"
-IUSE="+client +pcre speech selinux +suid"
+IUSE="+pcre speech selinux +suid"
 
 CDEPEND="
 	net-misc/networkmanager:=
@@ -39,9 +38,10 @@ CDEPEND="
 			dev-libs/libnl:3
 			net-libs/libpcap
 			)
+	dev-libs/protobuf-c:=
+	sys-libs/ncurses:=
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
-	client? ( sys-libs/ncurses:0= )
 	!arm? ( speech? ( app-accessibility/flite ) )
 	"
 	#plugin-btscan? ( net-wireless/bluez )
@@ -58,7 +58,7 @@ RDEPEND="${CDEPEND}
 
 src_prepare() {
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
+		conf/kismet_logging.conf || die
 
 	# Don't strip and set correct mangrp
 	sed -i -e 's| -s||g' \
@@ -70,8 +70,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
+		$(use_enable pcre) \
+		--disable-python-tools
 }
 
 src_compile() {
@@ -159,14 +159,14 @@ src_install() {
 pkg_preinst() {
 	if use suid; then
 		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture_tools/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_capture_tools/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_capture_tools/kismet_cap_pcapfile
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
 		# Need to set the permissions after chowning.
 		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture_tools/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_capture_tools/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_capture_tools/kismet_cap_pcapfile
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
 		elog "Kismet has been installed with a setuid-root helper binary"
 		elog "to enable minimal-root operation.  Users need to be part of"
 		elog "the 'kismet' group to perform captures from physical devices."