summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-10-30 23:00:42 +0000
committerJeroen Roovers <jer@gentoo.org>2014-10-30 23:00:42 +0000
commitd68d4584d68de2f0bbff28f2faa9e6daac8d7d14 (patch)
tree9191f41396a6023cb44d21a437c38d26ddde0836 /net-wireless
parentLinux patch 3.16.7 (diff)
downloadgentoo-2-d68d4584d68de2f0bbff28f2faa9e6daac8d7d14.tar.gz
gentoo-2-d68d4584d68de2f0bbff28f2faa9e6daac8d7d14.tar.bz2
gentoo-2-d68d4584d68de2f0bbff28f2faa9e6daac8d7d14.zip
Fix building against sys-libs/ncurses[tinfo] (bug #490972).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/kismet/ChangeLog8
-rw-r--r--net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch11
-rw-r--r--net-wireless/kismet/kismet-2013.03.1-r1.ebuild14
3 files changed, 26 insertions, 7 deletions
diff --git a/net-wireless/kismet/ChangeLog b/net-wireless/kismet/ChangeLog
index 4f1696a6e6bf..0fd2d7fd8bef 100644
--- a/net-wireless/kismet/ChangeLog
+++ b/net-wireless/kismet/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/kismet
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.141 2013/12/06 17:55:58 swift Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/ChangeLog,v 1.142 2014/10/30 23:00:42 jer Exp $
+
+ 30 Oct 2014; Jeroen Roovers <jer@gentoo.org>
+ +files/kismet-2013.03.1-tinfo.patch, kismet-2013.03.1-r1.ebuild:
+ Fix building against sys-libs/ncurses[tinfo] (bug #490972).
06 Dec 2013; Sven Vermeulen <swift@gentoo.org> kismet-2011.03.2-r3.ebuild,
kismet-2013.03.1-r1.ebuild, kismet-9999.ebuild:
diff --git a/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch b/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch
new file mode 100644
index 000000000000..ac1a39004479
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -423,6 +423,8 @@
+ foundlcurses=yes curseaux="-lcurses" termcontrol="curses" )
+ fi
+
++ AC_SEARCH_LIBS([stdscr], tinfo ncurses,curseaux="$curseaux $ac_res")
++
+ if test "$foundlcurses" != "yes"; then
+ AC_MSG_ERROR(Failed to find libcurses or libncurses. Install them or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)
+ fi
diff --git a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild b/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
index 1e82a0fb0964..9dd17555c96e 100644
--- a/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2013.03.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.7 2013/12/06 17:55:58 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kismet/kismet-2013.03.1-r1.ebuild,v 1.8 2014/10/30 23:00:42 jer Exp $
EAPI=5
-inherit eutils multilib user
+inherit autotools eutils multilib user
MY_P=${P/\./-}
MY_P=${MY_P/./-R}
@@ -48,12 +48,16 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-tinfo.patch
+
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet.conf.in
+ conf/kismet.conf.in || die
# Don't strip and set correct mangrp
sed -i -e 's| -s||g' \
- -e 's|@mangrp@|root|g' Makefile.in
+ -e 's|@mangrp@|root|g' Makefile.in || die
+
+ eautoreconf
}
src_configure() {