Old.

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

8 files changed, 7 insertions, 270 deletions

diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog
index 6f9a22b384db..fd65b492ee9a 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.70 2014/08/03 18:37:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.71 2014/10/22 23:02:08 jer Exp $
+
+  22 Oct 2014; Jeroen Roovers <jer@gentoo.org> -iftop-0.17.ebuild,
+  -iftop-1.0_pre2.ebuild, -iftop-1.0_pre3.ebuild,
+  -files/iftop-0.16-bar_in_bytes.patch, -files/iftop-1.0_pre2-pthread.patch,
+  -files/iftop-1.0_pre2-tinfo.patch, -files/iftop-1.0_pre3-tinfo.patch:
+  Old.
 
   03 Aug 2014; Agostino Sarubbo <ago@gentoo.org> iftop-1.0_pre4.ebuild:
   Stable for ppc, wrt bug #511716
diff --git a/net-analyzer/iftop/files/iftop-0.16-bar_in_bytes.patch b/net-analyzer/iftop/files/iftop-0.16-bar_in_bytes.patch
deleted file mode 100644
index 7e89c499c80a..000000000000
--- a/net-analyzer/iftop/files/iftop-0.16-bar_in_bytes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ui.c	2004-02-05 23:53:19.000000000 +0100
-+++ b/ui.c	2005-09-28 18:41:13.000000000 +0200
-@@ -263,7 +263,7 @@
-             char s[40], *p;
-             int x;
-             /* This 1024 vs 1000 stuff is just plain evil */
--            readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 0);
-+            readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, options.bandwidth_in_bytes);
-             p = s + strspn(s, " ");
-             x = get_bar_length(i * 8);
-             mvaddch(*y + 1, x, ACS_BTEE);
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre2-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre2-pthread.patch
deleted file mode 100644
index 75424e5043b7..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre2-pthread.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -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([`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_pre2-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch
deleted file mode 100644
index 68210e35c197..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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 \
---- 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/files/iftop-1.0_pre3-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre3-tinfo.patch
deleted file mode 100644
index a00d48a03263..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre3-tinfo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -350,19 +350,23 @@
- 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])
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,7 @@
- #		 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/net-analyzer/iftop/iftop-0.17.ebuild b/net-analyzer/iftop/iftop-0.17.ebuild
deleted file mode 100644
index 798483df6c7d..000000000000
--- a/net-analyzer/iftop/iftop-0.17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-0.17.ebuild,v 1.13 2014/01/20 14:06:32 jlec Exp $
-
-inherit eutils
-
-DESCRIPTION="display bandwidth usage on an interface"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
-SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	net-libs/libpcap"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	# bug 101926
-	epatch "${FILESDIR}"/${PN}-0.16-bar_in_bytes.patch
-}
-
-src_install() {
-	dosbin iftop
-	doman iftop.8
-
-	dodoc ChangeLog README "${FILESDIR}"/iftoprc
-}
diff --git a/net-analyzer/iftop/iftop-1.0_pre2.ebuild b/net-analyzer/iftop/iftop-1.0_pre2.ebuild
deleted file mode 100644
index 6a9ea7ce3c60..000000000000
--- a/net-analyzer/iftop/iftop-1.0_pre2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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_pre2.ebuild,v 1.14 2014/06/05 11:34:06 jer 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.in || 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
-}
diff --git a/net-analyzer/iftop/iftop-1.0_pre3.ebuild b/net-analyzer/iftop/iftop-1.0_pre3.ebuild
deleted file mode 100644
index 3e093db8ce11..000000000000
--- a/net-analyzer/iftop/iftop-1.0_pre3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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_pre3.ebuild,v 1.3 2014/01/20 14:06:32 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}"/${PN}-1.0_pre3-tinfo.patch
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-
-	# bug 490168
-	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-	epatch "${FILESDIR}"/${PN}-1.0_pre2-pthread.patch
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin iftop
-	doman iftop.8
-
-	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
-}