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

[Richard Farina]

commit:     cbf8b8432e0f5bc1bb1877c667c0bc9651a30080
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 21:17:18 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 21:17:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf8b843

net-wireless/kismet: some minor ebuild fixes

Package-Manager: portage-2.3.0_rc1

 net-wireless/kismet/kismet-2016.01.1.ebuild | 6 ++++--
 net-wireless/kismet/kismet-9999.ebuild      | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/net-wireless/kismet/kismet-2016.01.1.ebuild 
b/net-wireless/kismet/kismet-2016.01.1.ebuild
index 4fc6aa0..01dd3f3 100644
--- a/net-wireless/kismet/kismet-2016.01.1.ebuild
+++ b/net-wireless/kismet/kismet-2016.01.1.ebuild
@@ -36,7 +36,6 @@ CDEPEND="net-wireless/wireless-tools
        suid? ( sys-libs/libcap )
        client? ( sys-libs/ncurses:0= )
        !arm? ( speech? ( app-accessibility/flite ) )
-       ruby? ( dev-lang/ruby:* )
        plugin-btscan? ( net-wireless/bluez )
        plugin-dot15d4? ( virtual/libusb:0 )
        plugin-spectools? ( net-wireless/spectools )
@@ -47,12 +46,12 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
+       ruby? ( dev-lang/ruby:* )
        selinux? ( sec-policy/selinux-kismet )
 "
 
 src_prepare() {
        epatch -p1 "${FILESDIR}"/${P}-tinfo.patch
-       eautoreconf
 
        sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
                conf/kismet.conf.in
@@ -60,6 +59,9 @@ src_prepare() {
        # Don't strip and set correct mangrp
        sed -i -e 's| -s||g' \
                -e 's|@mangrp@|root|g' Makefile.in
+
+       epatch_user
+       eautoreconf
 }
 
 src_configure() {

diff --git a/net-wireless/kismet/kismet-9999.ebuild 
b/net-wireless/kismet/kismet-9999.ebuild
index 442025f..18490cf 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib user
+inherit autotools eutils multilib user
 
 MY_P=${P/\./-}
 MY_P=${MY_P/./-R}
@@ -34,9 +34,8 @@ CDEPEND="net-wireless/wireless-tools
                        )
        pcre? ( dev-libs/libpcre )
        suid? ( sys-libs/libcap )
-       client? ( sys-libs/ncurses:= )
+       client? ( sys-libs/ncurses:0= )
        !arm? ( speech? ( app-accessibility/flite ) )
-       ruby? ( dev-lang/ruby:* )
        plugin-btscan? ( net-wireless/bluez )
        plugin-dot15d4? ( virtual/libusb:0 )
        plugin-spectools? ( net-wireless/spectools )
@@ -47,6 +46,7 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
+       ruby? ( dev-lang/ruby:* )
        selinux? ( sec-policy/selinux-kismet )
 "
 
@@ -57,6 +57,9 @@ src_prepare() {
        # Don't strip and set correct mangrp
        sed -i -e 's| -s||g' \
                -e 's|@mangrp@|root|g' Makefile.in
+
+       epatch_user
+       eautoreconf
 }
 
 src_configure() {