[gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/

[Richard Farina]

commit:     43688dd1b1d61df26559dcb91eee323c172a770c
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 20:35:44 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 20:36:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43688dd1

net-wireless/kismet: fix use flags

fix lm_sensors use flag
add networkmanager use flag

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 ...8.08_beta1.ebuild => kismet-2018.08_beta1-r1.ebuild} | 17 +++++++++++------
 net-wireless/kismet/kismet-9999.ebuild                  | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/net-wireless/kismet/kismet-2018.08_beta1.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
similarity index 90%
rename from net-wireless/kismet/kismet-2018.08_beta1.ebuild
rename to net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
index 1f6e8da8176..ddf8e2e5e78 100644
--- a/net-wireless/kismet/kismet-2018.08_beta1.ebuild
+++ b/net-wireless/kismet/kismet-2018.08_beta1-r1.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm_sensors +pcre selinux +suid"
+IUSE="lm_sensors networkmanager +pcre selinux +suid"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -67,18 +67,23 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
+
 	if [[ ${PV} == "9999" ]] ; then
-		sed -i 's#-O3##' configure.ac
 		eautoreconf
+	fi
+
+	if ! use lm_sensors; then
+		sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure
+	fi
+	if use networkmanager; then
+		sed -i "s#havelibnm\=no#havelibnm\=yes#" configure
 	else
-		sed -i 's#-O3##' configure
+		sed -i "s#havelibnm\=yes#havelibnm\=no#" configure
 	fi
+	sed -i 's#-O3##' configure
 }
 
 src_configure() {
-	if ! use lm_sensors; then
-		adddeny /usr/include/sensors/sensors.h
-	fi
 	econf \
 		$(use_enable pcre)
 }

diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 1f6e8da8176..ddf8e2e5e78 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm_sensors +pcre selinux +suid"
+IUSE="lm_sensors networkmanager +pcre selinux +suid"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -67,18 +67,23 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
+
 	if [[ ${PV} == "9999" ]] ; then
-		sed -i 's#-O3##' configure.ac
 		eautoreconf
+	fi
+
+	if ! use lm_sensors; then
+		sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure
+	fi
+	if use networkmanager; then
+		sed -i "s#havelibnm\=no#havelibnm\=yes#" configure
 	else
-		sed -i 's#-O3##' configure
+		sed -i "s#havelibnm\=yes#havelibnm\=no#" configure
 	fi
+	sed -i 's#-O3##' configure
 }
 
 src_configure() {
-	if ! use lm_sensors; then
-		adddeny /usr/include/sensors/sensors.h
-	fi
 	econf \
 		$(use_enable pcre)
 }