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

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 82 insertions, 22 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/Manifest b/net-analyzer/iftop/Manifest
index cd8b1be10f99..5be9afa28fb2 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX iftop-0.16-bar_in_bytes.patch 530 SHA256 39f2b99aa9f16fa54aebd39e066c0cba579c18d82d5a169c91308e72c4439422 SHA512 fbcba72320bb9c98ab4a6ce241021c871bd51100590a201f4fa42b789f10320472505800f4e109ac4143275e8220112ba73c0c221ce1b1351a83628023d858dd WHIRLPOOL 0c1a37a8b957db9b70f8705ec5ffefb774dfc342d149691dff311f3c6bf71aeeac9dbd384c4e7d8f5a25e2f71c9f74991e968a2bc5be86166f47ba5f9bc91b77
+AUX iftop-1.0_pre2-tinfo.patch 1799 SHA256 ce7cd7ee920bcb755f732695413b3caeb99d61bebc1094d2d67257eb53f96d50 SHA512 f92664e47324064ebafcf0ba530afab54cabc68ff97fe43bbd1bc1c69f0abef8a14859626613b9a6022e35d248bc476501f5a145af5ff828d5870ab53d3c092a WHIRLPOOL 2748e8a93b49e80ac5fa22a860fec2178c3914e487b1542920010d968ae63565bd1f0eb5ffa277f45abd2cac206830756cd9351bb6074e04c18431a3103bd20e
 AUX iftoprc 1391 SHA256 f21c0324774c4b6635359e4de76d13ad6bafdebdcbb29df9f986cc47d3569fa2 SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b WHIRLPOOL 6dfc9099bf5d906844fce63b8aac8326535e0684cf5c26f13a39b9a7df8120dbd1f3bd246e81990f11cc4af2a3e0434958b072f4a63db66f6ae22fff65003eea
 DIST iftop-0.17.tar.gz 160381 SHA256 d032547c708307159ff5fd0df23ebd3cfa7799c31536fa0aea1820318a8e0eac SHA512 41e3bc5feac5927f67356f491fcab7a28f7a32102cc33c67d81c1dc755273c42e32b540b14b6254a540f1b6c1b1ad6c50e3095c3b5282db2ea12dd0049ce2ebd WHIRLPOOL 997867975de1809f158f824665ce05b700f94ba079f4645941321faac19790dc95a8ee3756989a208d59f55bc7b6646d5e73c31c84a13810438f4a5947ee6fdc
-DIST iftop-1.0pre2.tar.gz 172736 SHA256 1b193037bb3019afae88cd94c87468aac4b045d81ab816ed8d2f489716b14027
+DIST iftop-1.0pre2.tar.gz 172736 SHA256 1b193037bb3019afae88cd94c87468aac4b045d81ab816ed8d2f489716b14027 SHA512 708172baa00a94671b494f33e7290af9ed4e0f764fabb500187855ee39840e379590274802e9ef360c128e881cfe0cefe7a12a9bfdcf9cfa7ffb49746b02300a WHIRLPOOL a28996872762d25e6784ef11a98c200cd71bec63092e2b1fbe41e950273b38378e404db89fbfba7eccbbb2153af8cbd30bd2e91a0f577b838d6b591c7ef300a9
 EBUILD iftop-0.17.ebuild 796 SHA256 0f028a405150a951600c32b874b5e9981312fd1560438dc66fd83bf5c39530f8 SHA512 7f0ddb6d9784fe6648825eb2043734e21363338ac5ebac0b5c41d915c56ee526de92c56a760f3aa80130507b094998f5ea161739ca147ab090b4fafe0de4d735 WHIRLPOOL 3cda57e1135be95510851e77b0951541f533e918a20a1a6c26af52d1a3593a700d3fadd4c59275167daa3876e35cc56d3ad4e4a38a423deb0440d2e319ee8876
-EBUILD iftop-1.0_pre2.ebuild 740 SHA256 f043b23050a554abb37774bb4ee3347395f9a56ae9643a29f5ea1fd44fa25f95 SHA512 2dcba0a7d92c966c09d0005486a4056fb58e085d8c50ce2b9a36ffbf8404e92e9fb24372b42efa6b8331cdf96b5be3cc8955662da7a29b43cb84ad96ec8c1fec WHIRLPOOL e6f49c9f7a9be5680a966ef3196adc048f5926594fe7ced1e73c8de08779e0d22dd9182300456d1150bce63700f66a1fbf5033ee3572ef97d9ec029dd163d4b7
-MISC ChangeLog 5992 SHA256 7dae3c8866d6fac1a9dcba60ecf8be03da6a956161247da6bcfcb9df2a4247b7 SHA512 21f5352b8c233a4bab66d073d5e58b0c675f460c536279b2701c055c45cdc0db43135ee6f4d0eaafcb45a8a946838a3fddde1d53226305dfa630a3a0ccf4da7d WHIRLPOOL 6fabec4ed37ad2ca9710377ec0d54f8bd59c1d1fc721a1df9740a25582d8c8a4c8362fb76d495b4d4e710f5899fdda063da750383279df90b27767e191ceea25
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+EBUILD iftop-1.0_pre2.ebuild 898 SHA256 0b039ec244a2373dac1fd89d09e0046c8889b0b4e4137c43b584bfb4b9466e8b SHA512 e6ed02a3d8870f42f5b972f2f532e8dc5af4cb9958c7e30d4f35e532b43ff4866ce81e8e3d4b20ba48c870f6d8d621cd58336142377f999a3fad8de83c058d09 WHIRLPOOL 806fc8473fe60f1650150725f01f018dfac32848eb1b22dc023c0d7b994509571c06ddd2575e50408b93fd535e578859571940bb7a1857bce5deaed0b6ae4596
+MISC ChangeLog 6143 SHA256 4769f5cb7c6b0c6c452421ce0e0dab58eeeee0ce8c4c75796e35f72014e2ba56 SHA512 a7b986313bdb4ce0d2722e756a061c72fc0dc793198d40d55439baf89409fae254adeef31c41ec3b45661bda26f7f9ee3bec279e1627ac84b2fa6b2d444c2fdd WHIRLPOOL 8389b8f316c42813142a5b4c07385b56bf8743df75f5d4fa731b08035e80c0bdfec747b1a3555dea3ea682d60e42a26f644d65fa7a7b5013e0991fc9d7b174c7
+MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ+WJWAAoJEPiazRVxLXTFdIQQAKPj5WUqU7fKerq/xvPp1XEr
-GNaFSV69P5jIbonxKGDh+Msef9IMqqJck2tSu4ZjhJrmlx0+Lf81meQqNp/PL6Mi
-CdNZIEq6Hk6RZ1U4r2omoC78BSThiJIwDj7UmsIFRk4rd0u2HQehYfMvo8kOWBzx
-VY6fhjJ8yTqeOtohxu69QZ1SVz90La88U+5kxUFqKJ+K1012PkLalLOdh0L3l1af
-Hno2pgjcs+Q8H5EJz/NlHJ0JWJqnM+rTIR0SakawLAjJ7oCaQxx4j1L7ApZehMPp
-8Vnb/9llaVoDRIgK0h6G7X+SIj2lIZBgKOd2FF6qGlxqzD+qJQQ+L45KBhOwUnsT
-AwoPKNQCnFOv+fgrGiDLROFCoLmPVy3fK9L3/zMSYbryBb213qMNOkQ8QAi8xmyi
-WW7ZagGMBiqQbBtBOzv8o4VYnYdHO1hl5J1rLT5z9V49xoqxeFxjzzNbbm9a954x
-8NOpnNJHlPr5jxu7RWv7artKKtuvEIyqr/ITG8aceWN07HODszzTwriJbqpsN5c/
-tNxvdcyx9JofU9h71QT/XZEHifMnI0wPv0n5WGM44tI7To78c68sSe9+03QyJndH
-bm8BnBsWPE/fG0mDvUbiLp7SqkqyFWUFx6J2OvbfBYXW0S0JDQOMRHuDMOEw9Ykt
-BgmGepvRqBVdOvF7mxvB
-=akW2
+iEYEAREKAAYFAlGELo4ACgkQgAnW8HDreRaH9ACghvH7QDAIgPzvUZ+ho/dkHG8S
+IHUAoI2h2sTULsnhHA8x/QSVwRc/6OAK
+=1GTY
 -----END PGP SIGNATURE-----
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>