EAPI bump. List sys-libs/ncurses dependency and fix building against sys-libs/ncurses[tinfo].

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 36 insertions, 19 deletions

diff --git a/net-wireless/airtraf/ChangeLog b/net-wireless/airtraf/ChangeLog
index 76e99e501353..5fc5351df0bb 100644
--- a/net-wireless/airtraf/ChangeLog
+++ b/net-wireless/airtraf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/airtraf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.18 2011/08/20 21:05:36 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.19 2014/07/18 21:54:58 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> airtraf-1.1-r1.ebuild,
+  metadata.xml:
+  EAPI bump. List sys-libs/ncurses dependency and fix building against
+  sys-libs/ncurses[tinfo].
 
   20 Aug 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove useless maintainer tag.
diff --git a/net-wireless/airtraf/airtraf-1.1-r1.ebuild b/net-wireless/airtraf/airtraf-1.1-r1.ebuild
index f5223fc6583d..1293f53fb24c 100644
--- a/net-wireless/airtraf/airtraf-1.1-r1.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r1.ebuild
@@ -1,26 +1,36 @@
-# Copyright 1999-2010 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/airtraf/airtraf-1.1-r1.ebuild,v 1.2 2010/09/17 03:28:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1-r1.ebuild,v 1.3 2014/07/18 21:54:58 jer Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
+LICENSE="GPL-2"
 HOMEPAGE="http://www.elixar.com/"
-SRC_URI="http://www.elixar.com/${P}.tar.gz"
-
-IUSE=""
-
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
 SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}.patch
+	sed -i \
+		-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
+		src/libncurses/Makefile || die
+	sed -i \
+		-e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs panel)|' \
+		src/sniffd/Makefile || die
+	tc-export PKG_CONFIG
 }
 
 src_compile() {
@@ -35,6 +45,6 @@ src_compile() {
 }
 
 src_install () {
-	dobin src/airtraf || die
-	newdoc docs/airtraf_doc.html airtraf_documentation.html
+	dobin src/airtraf
+	dodoc Authors COMPATIBILITY docs/airtraf_doc.html
 }
diff --git a/net-wireless/airtraf/metadata.xml b/net-wireless/airtraf/metadata.xml
index b7dcddf18f9d..8c9992e713f9 100644
--- a/net-wireless/airtraf/metadata.xml
+++ b/net-wireless/airtraf/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>AirTraf 1.0 is a wireless sniffer that can detect and determine exactly 
-what is being transmitted over 802.11 wireless networks. This open-source program tracks 
-and identifies legitimate and rogue access points, keeps performance statistics on a 
-by-user and by-protocol basis, measures the signal strength of network components, and 
-more. Do you want to capture the sky? </longdescription>
+<longdescription>
+AirTraf 1.0 is a wireless sniffer that can detect and determine exactly what is
+being transmitted over 802.11 wireless networks. This open-source program
+tracks and identifies legitimate and rogue access points, keeps performance
+statistics on a by-user and by-protocol basis, measures the signal strength of
+network components, and more. Do you want to capture the sky?
+</longdescription>
 </pkgmetadata>