Remove ancient version. Fix parallel make thanks to Davide Pesavento (bug #262971). Explicate RDEPEND.

(Portage version: 2.2_rc26/cvs/Linux i686)

7 files changed, 31 insertions, 182 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 50ecfb0c5cc3..4c05bf6e9b26 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.71 2009/03/08 12:12:42 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.72 2009/03/21 01:39:45 jer Exp $
+
+  21 Mar 2009; Jeroen Roovers <jer@gentoo.org>
+  -files/iptraf-2.7.0-2.6.patch, -files/iptraf-2.7.0-atheros.patch,
+  -files/iptraf-2.7.0-ipv6-glibc24.patch, files/iptraf-3.0.0-Makefile.patch,
+  -iptraf-2.7.0-r1.ebuild, iptraf-3.0.0-r5.ebuild:
+  Remove ancient version. Fix parallel make thanks to Davide Pesavento (bug
+  #262971). Explicate RDEPEND.
 
   08 Mar 2009; Dawid Węgliński <cla@gentoo.org> iptraf-3.0.0-r4.ebuild,
   iptraf-3.0.0-r5.ebuild:
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
deleted file mode 100644
index 35808f591acc..000000000000
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/othptab.c iptraf-2.7.0/src/othptab.c
---- iptraf-2.7.0.orig/src/othptab.c	2005-07-18 18:55:28.000000000 -0400
-+++ iptraf-2.7.0/src/othptab.c	2005-07-18 18:57:39.000000000 -0400
-@@ -17,9 +17,6 @@
- ***/
- 
- #include <asm/types.h>
--#include <linux/if_ether.h>
--#include <linux/if_tr.h>
--#include <linux/if_fddi.h>
- 
- #ifdef USE_IPV6
- # include <netinet/ip6.h>
-@@ -27,9 +24,9 @@
- #endif
- 
- #include <winops.h>
-+#include "tcptable.h"
- #include "arphdr.h"
- #include "options.h"
--#include "tcptable.h"
- #include "othptab.h"
- #include "deskman.h"
- #include "attrs.h"
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/packet.c iptraf-2.7.0/src/packet.c
---- iptraf-2.7.0.orig/src/packet.c	2005-07-18 18:55:28.000000000 -0400
-+++ iptraf-2.7.0/src/packet.c	2005-07-18 18:56:13.000000000 -0400
-@@ -35,6 +35,9 @@
- #include <sys/time.h>
- #include <net/if_arp.h>
- #include <net/if.h>
-+#ifdef _NET_IF_H
-+#define _LINUX_IF_H
-+#endif
- #include <sys/ioctl.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/tcptable.h iptraf-2.7.0/src/tcptable.h
---- iptraf-2.7.0.orig/src/tcptable.h	2005-07-18 18:55:28.000000000 -0400
-+++ iptraf-2.7.0/src/tcptable.h	2005-07-18 18:57:01.000000000 -0400
-@@ -20,11 +20,14 @@
- #include <arpa/inet.h>
- #include <net/if_arp.h>
- #include <asm/types.h>
-+#include <net/if.h>
-+#ifdef _NET_IF_H
-+#define _LINUX_IF_H
-+#endif
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <net/if.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
- #include "servname.h"
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch
deleted file mode 100644
index 3c79401b8a4d..000000000000
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur iptraf-2.7.0/src/ifaces.c iptraf-2.7.0-ath0/src/ifaces.c
---- iptraf-2.7.0/src/ifaces.c	2002-05-08 02:43:27.000000000 -0700
-+++ iptraf-2.7.0-ath0/src/ifaces.c	2004-08-05 12:48:53.000000000 -0700
-@@ -32,14 +32,14 @@
- #include "error.h"
- 
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 20
-+#define NUM_SUPPORTED_IFACES 21
- 
- extern int daemonized;
- 
- char ifaces[][6] =
-     { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
-       "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
--      "pent", "lec" };
-+      "pent", "lec", "ath" };
- 
- char *ltrim(char *buf)
- {
-diff -ur iptraf-2.7.0/src/packet.c iptraf-2.7.0-ath0/src/packet.c
---- iptraf-2.7.0/src/packet.c	2002-05-08 02:44:08.000000000 -0700
-+++ iptraf-2.7.0-ath0/src/packet.c	2004-08-05 12:56:57.000000000 -0700
-@@ -80,6 +80,8 @@
-     case ARPHRD_ETHER:
- 	if (strncmp(ifname, "eth", 3) == 0)
- 	    result = LINK_ETHERNET;
-+	else if (strncmp(ifname, "ath", 3) == 0)
-+	    result = LINK_ETHERNET;
- 	else if (strncmp(ifname, "plip", 4) == 0)
- 	    result = LINK_PLIP;
- 	else if (strncmp(ifname, "fddi", 4) == 0)    /* For some Ethernet- */
-diff -ur iptraf-2.7.0/src/promisc.c iptraf-2.7.0-ath0/src/promisc.c
---- iptraf-2.7.0/src/promisc.c	2002-01-15 17:51:03.000000000 -0800
-+++ iptraf-2.7.0-ath0/src/promisc.c	2004-08-05 12:57:20.000000000 -0700
-@@ -81,6 +81,7 @@
- 	     */
- 
- 	    if ((strncmp(buf, "eth", 3) == 0) ||
-+	        (strncmp(buf, "ath", 3) == 0) ||
- 		(strncmp(buf, "fddi", 4) == 0) ||
-   	        (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
- 	        (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch
deleted file mode 100644
index 5f502090813e..000000000000
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN ./iptraf-2.7.0.orig/src/othptab.c ./iptraf-2.7.0/src/othptab.c
---- ./iptraf-2.7.0.orig/src/othptab.c	2006-03-21 23:13:42.000000000 +0100
-+++ ./iptraf-2.7.0/src/othptab.c	2006-03-21 23:18:58.000000000 +0100
-@@ -595,8 +595,8 @@
-                case ICMP6_DST_UNREACH_ADMIN:
-                    strcpy(additional, "admin");
-                    break;
--               case ICMP6_DST_UNREACH_NOTNEIGHBOR:
--                   strcpy(additional, "not neigh");
-+               case ICMP6_DST_UNREACH_BEYONDSCOPE:
-+                   strcpy(additional, "beyondscope");
-                    break;
-                case ICMP6_DST_UNREACH_ADDR:
-                    strcpy(additional, "unreach addr");
-@@ -627,15 +627,6 @@
-            case ND_ROUTER_ADVERT:
-                strcpy(description, "router adv");
-                break;
--           case ICMP6_MEMBERSHIP_QUERY:
--               strcpy(description, "mbrship query");
--               break;
--           case ICMP6_MEMBERSHIP_REPORT:
--               strcpy(description, "mbrship report");
--               break;
--           case ICMP6_MEMBERSHIP_REDUCTION:
--               strcpy(description, "mbrship reduc");
--               break;
-            case ND_NEIGHBOR_SOLICIT:
-                strcpy(description, "neigh sol");
-                break;
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch
index 9a5274d89835..29f514b0d1cd 100644
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch
@@ -1,5 +1,6 @@
---- ./iptraf-3.0.0.orig/src/Makefile	2006-01-10 07:51:13.000000000 +0100
-+++ ./iptraf-3.0.0/src/Makefile	2006-01-10 07:53:33.000000000 +0100
+diff -Naur iptraf-3.0.0~orig/src/Makefile iptraf-3.0.0/src/Makefile
+--- iptraf-3.0.0~orig/src/Makefile	2009-03-20 21:50:35.000000000 +0100
++++ iptraf-3.0.0/src/Makefile	2009-03-20 21:52:35.000000000 +0100
 @@ -29,10 +29,11 @@
  # options to be passed to the compiler.  I don't believe they need to be
  # modified (except for -m486 on non-Intel x86 platforms).
@@ -16,3 +17,21 @@
  
  # you may want to change this to point to your ncurses include directory
  # if the ncurses include files are not in the default location.
+@@ -111,7 +112,7 @@
+ 	$(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS)
+ 
+ textlib:
+-	make -C ../support
++	$(MAKE) -C ../support
+ 
+ %.o: %.c *.h version
+ 	$(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $<
+@@ -130,7 +131,7 @@
+ 
+ clean:
+ 	rm -f *.o *~ core $(BINS)
+-	make -C ../support clean 
++	$(MAKE) -C ../support clean 
+ 
+ # I just included this rule to clear out the .o files, leaving the
+ # executables, stripped and ready for packing.
diff --git a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
deleted file mode 100644
index 0fd854db8eb0..000000000000
--- a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.24 2006/03/05 20:53:03 jokey Exp $
-
-inherit eutils flag-o-matic
-
-V6PATCH_LEVEL=alpha12
-DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
-HOMEPAGE="http://iptraf.seul.org/"
-SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
-	http://dev.gentoo.org/~gmsoft/patches/${P}-ipv6-${V6PATCH_LEVEL}.diff"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND=">=sys-libs/ncurses-5.2-r1"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-atheros.patch
-	epatch "${DISTDIR}"/${P}-ipv6-${V6PATCH_LEVEL}.diff
-#    use ipv6 && epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
-
-	# bug 89458
-	has_version '>=sys-kernel/linux-headers-2.6.11-r2' && \
-		epatch "${FILESDIR}"/${P}-2.6.patch
-
-	cd src
-	cp dirs.h dirs.h.orig
-	sed -e s:/var/local/iptraf:/var/lib/iptraf: -e s:/usr/local/bin:/usr/sbin: dirs.h.orig > dirs.h
-}
-
-src_compile() {
-	cd src
-	use ipv6 && append-flags -DUSE_IPV6
-	emake -j1 CFLAGS="$CFLAGS" DEBUG="" TARGET="/usr/sbin" WORKDIR="/var/lib/iptraf" \
-	clean all || die "emake failed"
-}
-
-src_install() {
-	dosbin src/{iptraf,cfconv,rvnamed} || die
-	dodoc  FAQ README* CHANGES RELEASE-NOTES
-	doman Documentation/*.8
-	dohtml Documentation/*.html
-	keepdir /var/{lib,run,log}/iptraf
-}
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
index 944923197327..0a3b8adc7718 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild,v 1.5 2009/03/08 12:12:42 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild,v 1.6 2009/03/21 01:39:45 jer Exp $
 
 EAPI="2"
 
@@ -18,6 +18,7 @@ IUSE="ipv6 suid unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2-r1
 	unicode? ( >=sys-libs/ncurses-5.2-r1[unicode] )"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${P}.tar.gz