net-analyzer/iftop: Version Bump

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 167 insertions, 15 deletions

diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog
index 25780ddafb3c..998871b42924 100644
--- a/net-analyzer/iftop/ChangeLog
+++ b/net-analyzer/iftop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/iftop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.57 2014/01/20 14:06:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.58 2014/01/20 14:22:30 jlec Exp $
+
+*iftop-1.0_pre4 (20 Jan 2014)
+
+  20 Jan 2014; Justin Lecher <jlec@gentoo.org> +iftop-1.0_pre4.ebuild,
+  +files/iftop-1.0_pre4-pthread.patch, +files/iftop-1.0_pre4-tinfo.patch:
+  Version Bump
 
   20 Jan 2014; Justin Lecher <jlec@gentoo.org> iftop-0.17.ebuild,
   iftop-1.0_pre2.ebuild, iftop-1.0_pre3.ebuild:
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index aed6fa527774..c57a6668985d 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -6,29 +6,33 @@ AUX iftop-0.16-bar_in_bytes.patch 530 SHA256 39f2b99aa9f16fa54aebd39e066c0cba579
 AUX iftop-1.0_pre2-pthread.patch 1442 SHA256 1993f18b717a5c7d08e824135b9873622cb0b0e68d7b2897e53448ae2ee5368f SHA512 59f3139284701dda0f961253ceefc2823096820baa67c3f0fd437cf542582608722a90662617bcaf029de1688726ac5e071f67386eee09cb2809e084e386a074 WHIRLPOOL 8cbca4106079f0a292fa989a4d6c48c692077ad978196de82d2796e985509fcd334eb6473b5f8427621266bfca64cf48d4928f3f2ed293ab6eef129ea0ad78c4
 AUX iftop-1.0_pre2-tinfo.patch 1536 SHA256 7b7e30748c23b84298c3d026f95c130236d22aabfa969b79c6353638af265d2b SHA512 38640013ff32319d436cddc804d5dd2d573ff1e71f7a0012394458876d0d93129455d701236068b758e7411f25647c3e66c6663fadf2814146880364275b7751 WHIRLPOOL 6cbda7d71feef0ae1955d16f98968e2528c6c24d1ccd040a070538c0ff6b0dbe0dd1735fce3d355257896a7c28e5ec409e0261cde034f65874be1e915f2e25dc
 AUX iftop-1.0_pre3-tinfo.patch 1229 SHA256 2ff69b8c21ca8fe34c8690bd3c2859b5c801727cddd8ddd905f0e6eedade8dc9 SHA512 aa9c4a3ff6dbd608a7d0cd8a1c39622c5808ca39efc73e9866e8a2d608dfaba854ddd506bf2adc5eb4024b4490d728907f07773a2f6a0bf344f094edd335fc07 WHIRLPOOL 2570feceed68c503038f4b385f84ac459fada6b8561a0836586dc0d592a4a9dadd3f7569691c59c7ebed09033dbe3cc0a9295f77c5e3075f8ae200b2c3ae5bc0
+AUX iftop-1.0_pre4-pthread.patch 1462 SHA256 ad36fa74aaf72c2e79775fae8f26386c0436a39ac032d3ffd72f4ef72cd4f6b7 SHA512 0befb38a673d826f25319517d64e4aecea641cdc8626ab51bd468dc0e2f23c779854fbfd9e7cfe51e30ecdf04e3c831fc793ab5e402df3c8153044c679add2b8 WHIRLPOOL 4e486cfd9a55313c872857a3e04bc76ce0e4c9817b53411135c3c54f50ecf535ca11201f9a33537f69922abb775a2c74c617f844ebd2f61e013879cc1b9776ea
+AUX iftop-1.0_pre4-tinfo.patch 1610 SHA256 dcc3b5cac610e07bae35e717e7707ae2c4c2f316b508a7d7d6b342325e218b68 SHA512 06b3af6013f6b539cf9a09671c6d976c99fa4f6a7ed25bb74ec6b54c82c282ffd15c5699e2db9a6801fad9d0101ee50a405716af7b9e82b720887276d0cfda28 WHIRLPOOL 52d83129302941a6f105482a78ddafa4baf2192faa2943aac52023998ee27444c2eff7891632674e2aa171b3b12fede3b42d970cb1659bdf33ac39bb85e68069
 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 SHA512 708172baa00a94671b494f33e7290af9ed4e0f764fabb500187855ee39840e379590274802e9ef360c128e881cfe0cefe7a12a9bfdcf9cfa7ffb49746b02300a WHIRLPOOL a28996872762d25e6784ef11a98c200cd71bec63092e2b1fbe41e950273b38378e404db89fbfba7eccbbb2153af8cbd30bd2e91a0f577b838d6b591c7ef300a9
 DIST iftop-1.0pre3.tar.gz 196516 SHA256 6a900c56ab87f4249066e62a087f496038b2762f96152da747efb7b65d7c0c15 SHA512 eabe5f7443db8181ce4b3d8a41282dfc235613723861179b00310b73bc75e2a40c47262635a047f11f8d533db505d5767b064389ec858cd5cbea80ebeb861c6c WHIRLPOOL 408d9ef19dc095950e20c88326c2e0edbc11841ca8b04f9d35b3f0c923fdd1fd957d3a9de540ca1110699000fe2be1f69ab162ef9c196521695354947ada9b65
+DIST iftop-1.0pre4.tar.gz 204665 SHA256 f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22 WHIRLPOOL 5c02d8d23fe3d73ced4c0e8626226323f2266ef16ef00dc2b00059f4a213066c22c366f9458fe516da05a59830acd581ee23f17dc92e097ca720b220e88103cb
 EBUILD iftop-0.17.ebuild 793 SHA256 e873a641fb2e679685a23ec4114436656ab371316be58b37b1512ae7c27872e5 SHA512 07d69599e9769457d1f6990f404bd665985b08b8ff0051017c291ba9bba2fdb6d50dddca1bd01af2704fbdaef1df16c1eecdc9902738dec24b555d6624927520 WHIRLPOOL 41529aea957f1f22d10c7ec6913ad6b68fb32e0bc1051448f9644ba7c0f9ae029d219f63adb3d4e4fb741370c4c2fe63100f9d71fd772559dde9377acd8df5d8
 EBUILD iftop-1.0_pre2.ebuild 1019 SHA256 86394626b24659fe1bc30cf312d4305c220055e36c7a500c63ad145bc6c67113 SHA512 96ea2b3777cbfd9f073acedc41a5ea2462c0fef629fa243e96e1c6d6d9efebf8c1bcc46efd929be9214b1ea8afe7faec1242ba7fba4cfdca6c99aa95da71bc59 WHIRLPOOL 4b7651db32ce611841b9e0772cd9c26bae5f51333465a2ad804a7eb84ec7ceedaded279e8acba89cca941173bf64500aaeafb06a7f97ac545563b34e3c55e090
 EBUILD iftop-1.0_pre3.ebuild 1084 SHA256 9da1250edd258053e98aaed4c1ec61e8caf264d20bdad71e3fa6c90b11acb145 SHA512 50c13a5c9a0fb1ce3fb4033b73e8434a1220bbca3fa4d0d0cd5a99d164b573e328948cbb8872a7b4d110c1b64b85ccae1ca9581a261fd25a3dddcdf8e5c87545 WHIRLPOOL 08d719936af1e2fe0563e8d97ab263fb773abdcfcc83468eb84b8e5eee6c1fc04702c2de84d7868d7bc6dcdc96a70298ce70414f1c4dec2c62d9aa56b9dc6767
-MISC ChangeLog 7203 SHA256 c2b986139df6c872ae4bb31ec828dc4de2bf319e42630d0e0389d5e391acde21 SHA512 ccf9541d1974f8770115d31d4583f37569635ec14785879e2d9130e82616543b1958f6893d0b7bff44526325ea68d4767a8fc5e806bae402362fb5f385ca6ee6 WHIRLPOOL 51bde36683900514f2f4375cec5e8195275a49be9bb14f9cb26e7516ff17b1cfaa68117aea7da37d3dcdc94144a5b8a472c819466888b42b99f7ae83534997a2
+EBUILD iftop-1.0_pre4.ebuild 1064 SHA256 0787429a4c9d3c18574fefd42dd890090a9d9e943d77d595b3f2ccbf474f2486 SHA512 2127dacc099ab8141d1b7ff3bd6c5b6a826c4b7075da1ce6627a0b868630a2a2f0e64461659968cc26bbd1af96237fba2f34a046713dd84e79d240eba5f5020f WHIRLPOOL a9a532039967d1006a49654d3aa8493d1b061a872d51e8c1c4ff5363e33e53c1a3697c30fbb900972cbd06aecacfc0c126ca2a395cd5da1b152a58342dc8f4b9
+MISC ChangeLog 7395 SHA256 b56dbc596cf26231ff556db92327759927735016714397a73ac98944a5349863 SHA512 68905f6e4635900e72142e38c273b0d9dacd7b024a74852baa6b66844bed11a6156b3bb6986ed5d078123739c47c9cc308c675d50c348ad30fe7bc84a6260ede WHIRLPOOL f2c4b7d5f999086ccc2a32b59cde12903427913a60f6c4c85c120b6d732eeedfb42cd23628a87f4d77f92d76a7f284ab1c06bc831556a80f883bf4ee1149ccf5
 MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS3S1pAAoJELnU8jG9FVir1hQQAJnldmYykGB9tCBmHQuUzGof
-kQZGv1xL2RsY7K93DWV5WsCIrx7kyV5FdVC6OgsgBl4Jqlrqp5EBKDmP8KPL/z0z
-lWBpkoWaHtRpYfKO+CpOUJH2DX5GzsEytmDN5RKaoSrwHCb44CCoPB/WrpXGnJlI
-RsddKkx/TwOXzzEBARYeSMXPiBDk4oMG97NAxgOm6Q1Kk1IKx9TBenb5mLA/ll/c
-2HTkXTcrVEUBqtXzFG3Quy2Pd0AkUkeWjVZAwV3vtdsJTHpoCP19ZrkMV3B49khH
-xidMxGIXj3NzESL/d9oTAymRJRDJMhsT6BuMyGt7YCtpnUXCpPpaph/vOeTsHWQG
-T1TIgtoiw6IH2NvyGRydSRD9C7OLdytOFuqZjZ6Z0B9bW0cR2iZZIVkSF7EUeP6i
-0hrfjion4fdNM0+/aDq214jzxsOzveqfuemm7lt1Gho/ydFgPm1mJDJ0/fZ89FaX
-u0XL6+ASl1RwizQfOu/7sgia14HKv3zQGQEoWWDqWan8GnR6SK16vfDj/b59KDnT
-yOrd2mNnyjb0u5nILSg4HXhQX0UpXcjIRqfopZWbJrb+rvUVANiSmKMS5oB4I7DT
-X2txnpYHcH28GWp2/zkScCl9sTGzcSen9/E65FotJ4+orOGMo37N231uk4N9Dart
-J5gLU7QqPtuOwycuMU40
-=DyoF
+iQIcBAEBCgAGBQJS3TEnAAoJELnU8jG9FVirSf8P/RmFYplniBtcdGb/4uQGvqXh
+JBuTJU4WTVPdx8R/F1EKAPmO/GIs7oADlmwmmTeF4zVK2ksxMt5wKAwRXIpV8EQS
+ASH1G52/WpyUZJAxJAU6MVAWJeMYSIXthvYu/jz3nJ54jxs3E7HjhRXHF1uGvoOw
+r48qbKf+P4NHAT/RznYj/V9eLE+xIi9on3Fa7YMDn+11emfKX/+M31s9wSwWzk4m
+KIigBWPevIQsbNkiVLR2E2j/YRCf8RQeMn1CxQJCt9VTdrtRcpEjbZqu2XmdSe7c
+Nukj7H196t+h4pWINe4Ok8zUM52qQ7jVFrofsPpZch9T9IhI/A1m8AvhlC6k4r37
+O5JrDry2WGW1er/EFgkB0kxppMIg56pddQhweUGmealU34UsUpbYRvK2tdDdtG6O
+13s5ZdFn97nNfHUHFhCWVrv1rRMR/51AGtlqKJ6SatnMFlVXY+/5xLLR1NyHRCwc
+us62M1Cqjegc4V2DcrS5wj0C9loARPycbX+QxF+AoEcZsGEXRtHX2IkZOFIeBVhF
+ldAFBmzj7MWlZdZsE4Gl8LcBkifjy8PjvfE19M4X9hKf3f7nw1HzoFfhdqIttWpy
+3i4faytiAEaxZqbIMmiLPUE6ObKJZHw6n0jcACm6aK+gkgmmnsGQHA8a29cDlqHN
+BGvUWbi07QY6QhZ6j9Od
+=glJx
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
new file mode 100644
index 000000000000..ce04c46a65ef
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
@@ -0,0 +1,46 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -383,39 +383,10 @@
+ dnl libraries, etc. We use a test program to figure this stuff out.
+ dnl
+ 
+-AC_MSG_CHECKING([POSIX threads compilation])
+-thrfail=1
+-oldCFLAGS=$CFLAGS
+-oldLIBS=$LIBS
+-for flag in "" -mt -pthread -thread ; do
+-    CFLAGS="$oldCFLAGS $flag"
+-    for lib in "" -lpthread "-lpthread -lposix4" ; do
+-        LIBS="$oldLIBS $lib"
+-        AC_LINK_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], [
+-            foundthrlib=$lib
+-            foundthrflag=$flag
+-            thrfail=0
+-            break
+-            ])
+-    done
+-    if test $thrfail = 0 ; then
+-        break
+-    fi
+-done
+-
+-if test $thrfail = 1 ; then
+-    AC_MSG_RESULT([no idea])
+-    AC_MSG_ERROR([can't figure out how to compile with POSIX threads
+-  If your system actually supports POSIX threads, this means we've messed up.])
+-fi
+-
+-AC_MSG_RESULT([CFLAGS=$foundthrflag and LIBS=$foundthrlib])
+-AC_MSG_CHECKING([POSIX threads usability])
+-AC_RUN_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])],
+-	      [AC_MSG_RESULT([yes])],
+-              [AC_MSG_ERROR(
+-	       [it fails.  We probably guessed the wrong CFLAGS.])],
+-	      [AC_MSG_RESULT([can't test because we are cross-compiling])])
++AX_PTHREAD(
++  [LIBS="$PTHREAD_LIBS $LIBS"
++  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"],
++  AC_MSG_ERROR([Could not find out how to enable POSIX threads]))
+ 
+ dnl
+ dnl Are we on a system (like Solaris) that requires promiscuous mode in order to
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
new file mode 100644
index 000000000000..3e407784c3f2
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
@@ -0,0 +1,52 @@
+ Makefile.am  |  2 +-
+ configure.ac | 18 +++++++++++-------
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1a9320c..a9bd7f1 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.ac b/configure.ac
+index 671241e..83352c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -348,19 +348,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 <$curseslib.h>
+         ], [
+         mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
+         ], [
+-        foundcurseslib=$curseslib
++        foundcurseslib=-l$curseslib
+         break
+         ])
+-done
++    done
++	])
++])
+ 
+ if test x$foundcurseslib = x ; then
+     AC_MSG_RESULT([none found])
diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
new file mode 100644
index 000000000000..57cf1b465e3e
--- /dev/null
+++ b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-1.0_pre4.ebuild,v 1.1 2014/01/20 14:22:30 jlec Exp $
+
+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"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/${P/_/}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	# bug 490168
+	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
+	epatch "${FILESDIR}"/${P}-pthread.patch
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin iftop
+	doman iftop.8
+
+	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
+}