net-analyzer/iftop: Add fix for ncurss[tinfo], #468520

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 73 insertions, 4 deletions

diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog
index 60cd5c033ec0..9901dc9f5f58 100644
--- a/net-analyzer/iftop/ChangeLog
+++ b/net-analyzer/iftop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/iftop
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.47 2013/01/18 14:55:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.48 2013/05/03 21:39:15 jlec Exp $
+
+  03 May 2013; Justin Lecher <jlec@gentoo.org> iftop-1.0_pre2.ebuild,
+  +files/iftop-1.0_pre2-tinfo.patch, metadata.xml:
+  Add fix for ncurss[tinfo], #468520
 
   18 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> iftop-1.0_pre2.ebuild:
   non-maintaienr commit: Removed ipv6 dependency now that a proper fix went
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch
new file mode 100644
index 000000000000..75468a73215b
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch
@@ -0,0 +1,57 @@
+ Makefile.am  |  2 +-
+ configure.in | 28 ++++++++++++++++------------
+ 2 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5e5363f..16713ab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
+ #		 addrs_ioctl.c addrs_dlpi.c dlcommon.c \
+ #		 stringmap.c cfgfile.c 
+ 
+-
++iftop_LDADD = $(NCURSES_LIBS)
+ 
+ noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
+                  integers.h ip.h llc.h ns_hash.h options.h resolver.h \
+diff --git a/configure.in b/configure.in
+index bb525b6..8e0ed6a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -350,19 +350,23 @@ dnl a solid chance that mvchgat is a macro, so we can't just use
+ dnl AC_SEARCH_LIBS....
+ dnl
+ 
+-AC_MSG_CHECKING([for a curses library containing mvchgat])
+-oldLIBS=$LIBS
+-for curseslib in ncursesw curses ncurses ; do
+-    LIBS="$oldLIBS -l$curseslib"
+-    AC_TRY_LINK([
++PKG_CHECK_MODULES([NCURSES], [ncursesw], [foundcurseslib="$NCURSES_LIBS"], [
++    PKG_CHECK_MODULES([NCURSES], [ncurses], [foundcurseslib="$NCURSES_LIBS"], [
++        AC_MSG_CHECKING([for a curses library containing mvchgat])
++        oldLIBS=$LIBS
++        for curseslib in ncursesw curses ncurses ; do
++            LIBS="$oldLIBS -l$curseslib"
++            AC_TRY_LINK([
+ #include <curses.h>
+-        ], [
+-        mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
+-        ], [
+-        foundcurseslib=$curseslib
+-        break
+-        ])
+-done
++                 ], [
++                 mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
++                 ], [
++                 foundcurseslib=-l$curseslib
++                 break
++                 ])
++        done
++    ])
++])
+ 
+ if test x$foundcurseslib = x ; then
+     AC_MSG_RESULT([none found])
diff --git a/net-analyzer/iftop/iftop-1.0_pre2.ebuild b/net-analyzer/iftop/iftop-1.0_pre2.ebuild
index 11fa1a6aaf02..751a4a78cc1a 100644
--- a/net-analyzer/iftop/iftop-1.0_pre2.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-1.0_pre2.ebuild,v 1.5 2013/01/18 14:55:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-1.0_pre2.ebuild,v 1.6 2013/05/03 21:39:15 jlec Exp $
 
-EAPI=4
+EAPI=5
+
+inherit autotools eutils
 
 DESCRIPTION="display bandwidth usage on an interface"
 SRC_URI="http://www.ex-parrot.com/~pdw/iftop/download/${P/_/}.tar.gz"
@@ -19,6 +21,12 @@ DEPEND="
 
 S="${WORKDIR}"/${P/_/}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+	eautoreconf
+}
+
 src_install() {
 	dosbin iftop
 	doman iftop.8
diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml
index 03aa50bab7e3..43ff75467369 100644
--- a/net-analyzer/iftop/metadata.xml
+++ b/net-analyzer/iftop/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+  <herd>netmon</herd>
 </pkgmetadata>