Old.

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

4 files changed, 6 insertions, 254 deletions

diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog
index 2a38c2c116e3..844ecb0a566a 100644
--- a/net-analyzer/iftop/ChangeLog
+++ b/net-analyzer/iftop/ChangeLog
@@ -1,6 +1,11 @@
 # 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.76 2014/10/27 18:47:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.77 2014/10/27 23:09:43 jer Exp $
+
+  27 Oct 2014; Jeroen Roovers <jer@gentoo.org> -iftop-1.0_pre4-r1.ebuild,
+  -files/iftop-1.0_pre4-ac_check_sizeof.patch,
+  -files/iftop-1.0_pre4-single-quote.patch:
+  Old.
 
   27 Oct 2014; Jeroen Roovers <jer@gentoo.org> iftop-1.0_pre4-r2.ebuild,
   +files/iftop-1.0_pre4-Makefile.am.patch,
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-ac_check_sizeof.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-ac_check_sizeof.patch
deleted file mode 100644
index 3710cf8d258c..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-ac_check_sizeof.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,45 +98,14 @@
- AC_CHECK_FUNCS(inet_aton inet_pton)
- 
- dnl
--dnl Find integers of known physical size. This is a pain in the arse because
--dnl we can't use AC_CHECK_SIZEOF to find the original variables, since that
--dnl function doesn't permit us to include a header file. Sigh.
-+dnl Find integers of known physical size.
- dnl
- 
--for type in u_int8_t u_int16_t u_int32_t ; do
--    AC_MSG_CHECKING([size of $type])
--    AC_RUN_IFELSE([AC_LANG_SOURCE([
--#include <sys/types.h>
--#include <stdio.h>
--int main() {
--    $type dummy;
--    FILE *f=fopen("conftestval", "w");
--    if (!f) exit(1);
--    fprintf(f, "%d\n", sizeof($1));
--    exit(0);
--}
--    ])], [
--        x=`cat conftestval`
--        eval "size_$type=$x"
--        AC_MSG_RESULT([$x])
--    ], [
--        eval "size_$type=0"
--        AC_MSG_RESULT([unknown type])
--    ], [
--        eval "size_$type=0"
--        AC_MSG_RESULT([can't determine when cross-compiling])
--    ])
--done
--
--dnl Groan. Have to do things this way so that autoheader can do its thing....
--AC_DEFINE_UNQUOTED(SIZEOF_U_INT8_T,  [$size_u_int8_t],  [size of u_int8_t])
--AC_DEFINE_UNQUOTED(SIZEOF_U_INT16_T, [$size_u_int16_t], [size of u_int16_t])
--AC_DEFINE_UNQUOTED(SIZEOF_U_INT32_T, [$size_u_int32_t], [size of u_int32_t])
-+AC_CHECK_SIZEOF([u_int8_t])
-+AC_CHECK_SIZEOF([u_int16_t])
-+AC_CHECK_SIZEOF([u_int32_t])
- 
--dnl If we already have these types, don't piss about any more....
--
--if test $size_u_int8_t != 1 || test $size_u_int16_t != 2 || test $size_u_int32_t != 4 ; then
--dnl XXXif test $size_u_int8_t != 1 -o $size_u_int16_t != 2 -o $size_u_int32_t != 4 ; then
-+if test $ac_cv_sizeof_u_int8_t = 0 || test $ac_cv_sizeof_u_int16_t = 0 || test $ac_cv_sizeof_u_int32_t = 0; then
-     do_int_types=1
-     AC_CHECK_HEADERS(
-         stdint.h             dnl C99
-@@ -154,6 +123,10 @@
-     fi
- fi
- 
-+AC_DEFINE_UNQUOTED([SIZEOF_U_INT8_T],[$ac_cv_sizeof_u_int8_t],[size of u_int8_t])
-+AC_DEFINE_UNQUOTED([SIZEOF_U_INT16_T],[$ac_cv_sizeof_u_int16_t],[size of u_int16_t])
-+AC_DEFINE_UNQUOTED([SIZEOF_U_INT32_T],[$ac_cv_sizeof_u_int32_t],[size of u_int32_t])
-+
- dnl
- dnl Name resolution.
- dnl
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-single-quote.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-single-quote.patch
deleted file mode 100644
index f6291e222d00..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-single-quote.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,10 +51,10 @@
- 			  forking        use the REALLY SUCKY forking resolver.
- 			  guess          run experiments to guess a
- 					 reasonable value.  Only works if you
--					 aren't cross-compiling.  This
-+					 are not cross-compiling.  This
- 					 is the default.  guess will
- 					 either select netdb or netdb_1thread.
--			  none           don't do name resolution.],
-+			  none           do not do name resolution.],
-     [resolver=$withval],
-     [resolver=guess])
- 
-@@ -132,7 +132,7 @@
- dnl
- dnl This is complicated because we need some sort of reentrant mechanism for
- dnl name resolution. Naturally, UNIX vendors have come up with a variety of
--dnl incompatible schemes for this, many of which don't work at all.
-+dnl incompatible schemes for this, many of which do not work at all.
- dnl
- 
- dnl First, the default resolver, which uses getnameinfo or gethostbyaddr_r. If
-@@ -148,7 +148,7 @@
-     use_getnameinfo=0
-     AC_SEARCH_LIBS(getnameinfo, [nsl], [use_getnameinfo=1])
- 
--    dnl XXX For the moment, don't use getnameinfo, since it isn't actually
-+    dnl XXX For the moment, do not use getnameinfo, since it is not actually
-     dnl thread safe on, e.g., NetBSD.
-     use_getnameinfo=0
- 
-@@ -165,7 +165,7 @@
-     dnl Can use gethostbyaddr_r?
-     AC_SEARCH_LIBS(gethostbyaddr_r, [nsl], , [resolver=guess])
-     if test x$resolver = xguess && test x$specified_resolver != xguess ; then
--       dnl They wanted gethostbyaddr_r, but they can't have it, so stop.
-+       dnl They wanted gethostbyaddr_r, but they cannot have it, so stop.
-        AC_MSG_ERROR([no library defines gethostbyaddr_r])
-     fi
- fi
-@@ -189,15 +189,15 @@
- 	            AC_DEFINE(GETHOSTBYADDR_R_RETURNS_INT, 1,
-                     [8-argument gethostbyaddr_r returns int])], [
-     dnl Neither.
--    AC_MSG_RESULT([don't know how])
-+    AC_MSG_RESULT([do not know how])
-     resolver=guess])])
-     if test x$resolver = xguess && test x$specified_resolver != xguess ; then
--       dnl They wanted gethostbyaddr_r, but they can't have it, so stop.
-+       dnl They wanted gethostbyaddr_r, but they cannot have it, so stop.
-        AC_MSG_ERROR([gethostbyaddr_r has no known calling convention])
-     fi
- fi
- 
--dnl If we still want to do gethostbyaddr_r, and we aren't
-+dnl If we still want to do gethostbyaddr_r, and we are not
- dnl cross-compiling, test it.
- if test x$resolver = xnetdb ; then
-     if test x$ghba_args = x8 ; then
-@@ -210,13 +210,13 @@
-                   [AC_MSG_RESULT([yes])],
- 		  [AC_MSG_RESULT([no])
- 		   resolver=guess],
--		  [AC_MSG_RESULT([can't test because we are cross-compiling])])
-+		  [AC_MSG_RESULT([cannot test because we are cross-compiling])])
-     if test x$resolver = xguess ; then
-         if test x$specified_resolver = xguess ; then
--           AC_MSG_RESULT([gethostbyaddr_r doesn't work, so we'll try something else])
-+           AC_MSG_RESULT([gethostbyaddr_r does not work, so we will try something else])
-         else
--           dnl They wanted gethostbyaddr_r, but it doesn't work, so stop.
--           AC_MSG_ERROR([gethostbyaddr_r doesn't work])
-+           dnl They wanted gethostbyaddr_r, but it does not work, so stop.
-+           AC_MSG_ERROR([gethostbyaddr_r does not work])
-         fi
-     fi
- fi
-@@ -233,11 +233,11 @@
-     AC_SEARCH_LIBS(ares_init, [ares], [
-         AC_DEFINE(USE_ARES, 1, [use ARES for name resolution])
-         ], [
--        dnl They asked for ares, but we can't give it to them, so stop.
--        AC_MSG_ERROR([can't find ARES.  Re-run configure and ask for a different resolver.])])
-+        dnl They asked for ares, but we cannot give it to them, so stop.
-+        AC_MSG_ERROR([cannot find ARES.  Re-run configure and ask for a different resolver.])])
- fi
- 
--dnl Last thing to try if we haven't decided yet is netdb_1thread.
-+dnl Last thing to try if we have not decided yet is netdb_1thread.
- if test x$resolver = xguess ; then
-    resolver=netdb_1thread
- fi
-@@ -290,16 +290,16 @@
- 
- if test $foundpcaph = 0 ; then
-     AC_MSG_RESULT([no idea])
--    AC_MSG_ERROR([can't find pcap.h
--  You're not going to get very far without libpcap.])
-+    AC_MSG_ERROR([cannot find pcap.h
-+  You are not going to get very far without libpcap.])
- else
-     dnl assume that -lpcap is under $test_prefix/lib
-     if test x$test_prefix != x ; then
-         LDFLAGS="$LDFLAGS -L$test_prefix/lib"
-     fi
-     AC_CHECK_LIB(pcap, pcap_open_live, , [
--            AC_MSG_ERROR([can't find libpcap
--  You're not going to get very far without libpcap.])
-+            AC_MSG_ERROR([cannot find libpcap
-+  You are not going to get very far without libpcap.])
-         ])
- fi
- 
-@@ -310,14 +310,14 @@
-     ])
- 
- if test $foundpcap = 0 ; then
--    AC_MSG_ERROR([can't find pcap.h
--  You're not going to get very far without libpcap.])
-+    AC_MSG_ERROR([cannot find pcap.h
-+  You are not going to get very far without libpcap.])
- fi
- 
- dnl
- dnl Curses. Really, we need ncurses or something similarly advanced, since
- dnl we use the (apparently obscure) mvchgat function. Unfortunately, there's
--dnl a solid chance that mvchgat is a macro, so we can't just use
-+dnl a solid chance that mvchgat is a macro, so we cannot just use
- dnl AC_SEARCH_LIBS....
- dnl
- 
-@@ -338,7 +338,7 @@
-     done
- 	],
-     AC_MSG_ERROR([Curses! Foiled again!
--  (Can't find a curses library supporting mvchgat.)
-+  (Cannot find a curses library supporting mvchgat.)
-   Consider installing ncurses.])
- 	)
- ])
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r1.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r1.ebuild
deleted file mode 100644
index cb82819687f1..000000000000
--- a/net-analyzer/iftop/iftop-1.0_pre4-r1.ebuild
+++ /dev/null
@@ -1,47 +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_pre4-r1.ebuild,v 1.2 2014/10/25 10:04:41 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}-ac_check_sizeof.patch \
-		"${FILESDIR}"/${P}-pthread.patch \
-		"${FILESDIR}"/${P}-tinfo.patch \
-		"${FILESDIR}"/${P}-tsent-set-but-not-used.patch
-
-	# bug 490168
-	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-
-	eautoreconf
-}
-
-src_install() {
-	dosbin iftop
-	doman iftop.8
-
-	dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
-}