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

Package-Manager: portage-2.2_rc26/cvs/Linux i686

8 files changed, 34 insertions, 191 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/Manifest b/net-analyzer/iptraf/Manifest
index abaa2f4ae7cb..2e11a19c738d 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,7 +1,4 @@
-AUX iptraf-2.7.0-2.6.patch 1711 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b SHA1 9f448ea798350f5c97a8623f4b23ac6799bb4979 SHA256 59441534079f43a381c68d48f1160ddd64bbf0ecdc42bd364559287504e8b57a
-AUX iptraf-2.7.0-atheros.patch 1644 RMD160 90c21cbced797182f39c22713bef74e110fe004a SHA1 fef0a734e3ca856e1ab78a7e7c3d9cd112cb9500 SHA256 17d3d64c204297dca178e546b49f5ab980377b3f7a6cfa53c7e724de44eed127
-AUX iptraf-2.7.0-ipv6-glibc24.patch 1299 RMD160 881d15260024a062277abdd88e2f80666fb4722a SHA1 a6c645a18dfc5f3f648b26cf99f7b8695d27f739 SHA256 ef4430bed8ec7fa1ed83f79d537e8520f505279d74e115bafca27e7b88299023
-AUX iptraf-3.0.0-Makefile.patch 740 RMD160 5d7b61d42843c2c2e70e7b33358e11caf4ee73be SHA1 86c65171654f54d7585e39e6bd60a17ca0439bc8 SHA256 d4246568afb834b35deca81e49860335cfa1c57d2f6848d0f3713c34843a9835
+AUX iptraf-3.0.0-Makefile.patch 1311 RMD160 9e83755100f8cc5b1b36bbc41dc2af5679621c87 SHA1 528086a05c2ca8ed4e695df19508b77a72621c57 SHA256 91c5131ca7ff3e408355027d03a6c3abf26f7bff5e85972d5441dc7eae246bf0
 AUX iptraf-3.0.0-add-devnames.patch 2765 RMD160 8975f882802558fe042be71c6488468d8550df4c SHA1 74c2181279e93d5e59e8f9a2c1aee1850d7e5887 SHA256 82c41b11130749bbd0b2b977bca4ed421ceaf7262c8ae8a4a9254bc389bac820
 AUX iptraf-3.0.0-atheros.patch 1508 RMD160 b27416c045e1f0c9de5ea1d3ca3eb1390c87f7ca SHA1 703de9ea7c4674fb6bccfb89ba833caf51846637 SHA256 b7201f79837046fcb787c4e76bafada04236a4c90b45ba5f140eca05c66b33b6
 AUX iptraf-3.0.0-bnep.patch 2156 RMD160 3a054a51015f93f6115758c4cb088e450036665b SHA1 e40e6070ee4c0ab5ece8e5adbc7e61e282dc268e SHA256 dcd54d8dd2cb5c92448359f9ffe9312d6171586fb47a2d091a3c933040713531
@@ -14,12 +11,9 @@ AUX iptraf-3.0.0-linux-headers.patch 963 RMD160 aac7828fdeab874ad44f6f019398497a
 AUX iptraf-3.0.0-ncursesw.patch 1296 RMD160 d0c2648b15d0c0e76278f6ba47c7a3da39ebdbb2 SHA1 876073e52255ab283402c984d5dd33bb8df4f415 SHA256 87ff765718a45518c74ae23427a6f3e5b65dfa9c44774b67e9404ec12e8d5e0f
 AUX iptraf-3.0.0-setlocale.patch 474 RMD160 dafa0ce1dce44c1108c1a8e76ce03cde0a918a4f SHA1 6a2bc2ddd4f3b99cf4cbfa90dd32df4ddb94fcc0 SHA256 3e2b39946039d39ed35a17752790ac06be4c7726e71721224d9534d736f71f3a
 AUX iptraf-3.0.0-vlan.patch 1090 RMD160 4bb6b575537a924e2561419732202274e433cf0b SHA1 e958027df27996a867b0f095efbd43ca669ab7d6 SHA256 33e127970c581d88d001b68090242e6ed4ea7581453cb844b75e831bc05fc130
-DIST iptraf-2.7.0-ipv6-alpha12.diff 57251 RMD160 5a1851ea0c5fa8d9a5f7910b80c8f35192d8ed6c SHA1 7ea33075729a2a77549fa122749752953ebd7933 SHA256 fca50b42120ae5dd4c86b00880c7867a4c9e6f804cd7d22ea3c8b8d4e1cf05a3
-DIST iptraf-2.7.0.tar.gz 363496 RMD160 49e09c9e74a09828c477cc22d75f9e64114d390b SHA1 f5ec59aaa31721e285e0cd509acf0026d47f4489 SHA256 5a335c8c22d02f7ccc640b37fcc7c0ea6840d4287e532a9efd0d0c9b6f1a16ae
 DIST iptraf-3.0.0-ipv6.patch.bz2 10069 RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 SHA1 f0032c78f72ba1c3fe7ecbb51135142fb7d3318c SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b
 DIST iptraf-3.0.0.tar.gz 575169 RMD160 aaef797076056d6b788a9c9eff29500060594526 SHA1 e5032b564593a8ec336751d41c090e5cdb7663a1 SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163
-EBUILD iptraf-2.7.0-r1.ebuild 1446 RMD160 3e404caad9c14fe86b82167a8fdb9e2104aee8a6 SHA1 73448ecbfaaaed65559a84fe60ae7bda962bfbdb SHA256 f821f149f1f857f2cda01711c04ec01ddbb10de9fc6e8b82b8a1007feac66f9b
 EBUILD iptraf-3.0.0-r4.ebuild 2108 RMD160 aacd37a3f942f25f13ad411ee11fa944f4bdb414 SHA1 893cf36bcb039be2b2a72c9456c16a7905a68520 SHA256 71a7ab0f6286337ed9b6465352f5378dd59faf64cbff8b16fcfd4cfb0b82448f
-EBUILD iptraf-3.0.0-r5.ebuild 2119 RMD160 4314e510cfc52d560e73b3f2daad1199163d3120 SHA1 ae7e4a1e03d9a179e548a52eefff821fe4e208b4 SHA256 71108b661ef99ed10bd4a5792af940975b2d33f17028b6735269eaa3e4a3f9e1
-MISC ChangeLog 9603 RMD160 14754100346656e79dc245760cff08d2a9fc23e0 SHA1 32a7dc780e12eb0f6844b006683083082ad5bdf1 SHA256 18bc9ae8804a346e94475e954fe4f58adedb9e13e14ddcac3a29bc6d98d62fb5
+EBUILD iptraf-3.0.0-r5.ebuild 2139 RMD160 8e335202384c4c22ca8679fa62334b9454ff55e4 SHA1 ac3174ea7d148e487c5bb8420b7f31fc5519033b SHA256 5b72d8304471032342f5976f3ae91eae49f9f78ac62de708bc53ade82ffea883
+MISC ChangeLog 9954 RMD160 4ddd763bdbeca3f1c216f10cffe7dee52699af65 SHA1 42f36ee5b23bbc597603436203839cbb01c61006 SHA256 45fc76a971b066e299060612b60edb408621d40b45bdf66a6f16c2561c1b15b3
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
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