diff options
| -rw-r--r-- | net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild (renamed from net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild) | 8 | ||||
| -rw-r--r-- | net-wireless/kismet/kismet-9999.ebuild | 31 | ||||
| -rw-r--r-- | net-wireless/kismet/metadata.xml | 1 |
3 files changed, 14 insertions, 26 deletions
diff --git a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild index 9f06e02bc4de..69055f3a8ae8 100644 --- a/net-wireless/kismet/kismet-2018.08_beta1-r3.ebuild +++ b/net-wireless/kismet/kismet-2018.08_beta1-r4.ebuild @@ -74,22 +74,20 @@ src_prepare() { fi if ! use lm_sensors; then - sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure + sed -i "s#sensors.h#totally-not-sensors.h#" configure fi - #fix for bug #662726 - sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die if use networkmanager; then sed -i "s#havelibnm\=no#havelibnm\=yes#" configure else sed -i "s#havelibnm\=yes#havelibnm\=no#" configure fi - sed -i 's#-O3##' configure } src_configure() { econf \ - $(use_enable pcre) + $(use_enable pcre) \ + --disable-optimization } src_install() { diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index 9bd91454798a..9eecff37a2f8 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 networkmanager +pcre selinux +suid" +IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid" CDEPEND=" ${PYTHON_DEPS} @@ -42,7 +42,7 @@ CDEPEND=" dev-libs/libnl:3 net-libs/libpcap ) - dev-libs/libusb:= + mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= sys-libs/ncurses:= @@ -67,32 +67,21 @@ src_prepare() { sed -i -e 's| -s||g' \ -e 's|@mangrp@|root|g' Makefile.in - epatch "${FILESDIR}"/fix-setuptools3.patch + eapply "${FILESDIR}"/fix-setuptools3.patch eapply_user - if use lm_sensors; then - sed -i "s#HAVE_LMSENSORS_H=0#HAVE_LMSENSORS_H=1#" configure.ac || die - sed -i "s#HAVE_LIBLMSENSORS=0#HAVE_LMSENSORS=1#" configure.ac || die - else - sed -i "s#HAVE_LMSENSORS_H=1#HAVE_LMSENSORS_H=0#" configure.ac || die - sed -i "s#HAVE_LIBLMSENSORS=1#HAVE_LMSENSORS=0#" configure.ac || die + if [ "${PV}" = "9999" ]; then + eautoreconf fi - #fix for bug #662726 - sed -i "s#HAVE_SENSORS_SENSORS_H#HAVE_LMSENSORS_H#" system_monitor.cc || die - - if use networkmanager; then - sed -i "s#havelibnm\=no#havelibnm\=yes#" configure.ac || die - else - sed -i "s#havelibnm\=yes#havelibnm\=no#" configure.ac || die - fi - sed -i 's#-O3##' configure.ac || die - - eautoreconf } src_configure() { econf \ - $(use_enable pcre) + $(use_enable pcre) \ + $(use_enable lm_sensors lmsensors) \ + $(use_enable mousejack libusb) \ + $(use_enable networkmanager libnm) \ + --disable-optimization } src_install() { diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml index 3e3c9a3551a7..e5158f5c107b 100644 --- a/net-wireless/kismet/metadata.xml +++ b/net-wireless/kismet/metadata.xml @@ -12,6 +12,7 @@ this allows running kismet as a normal user, significantly reducing security risks </flag> + <flag name="mousejack">Add support for mousejack hardware using <pkg>dev-libs/libusb</pkg></flag> <flag name="pcre">Build with pcre support</flag> <flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag> <flag name="plugin-autowep">Build the autowep plugin</flag> |