Update ipv6 patch revision, which can now be applied unconditionally. This fixes the USE=ipv6 compile failure that resulted from the bug 89458 fix. Both patches can now live in harmony.

(Portage version: 2.0.51.22-r1)

5 files changed, 53 insertions, 51 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index a962f222fdd2..bd77e3384738 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.29 2005/07/17 14:36:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.30 2005/07/19 09:14:45 ka0ttic Exp $
+
+  18 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
+  Update ipv6 patch revision, which can now be applied unconditionally. This
+  fixes the USE=ipv6 compile failure that resulted from the bug 89458 fix.
+  Both patches can now live in harmony.
 
   17 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
   +files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index 0989cb40da3d..1e7b0417a433 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0cf044d3db59db77e4b9442e42571ec5 iptraf-2.7.0-r1.ebuild 1372
-MD5 7a48c99ce0ddb1e35fc1448fe2b4d309 ChangeLog 3475
+MD5 c5434028fc76a7f0e684678f19e3e2ee iptraf-2.7.0-r1.ebuild 1469
+MD5 49e91c4d47e24beb354913faf7249e85 ChangeLog 3773
 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
-MD5 1822bd37e9eff2ce7881d2a46c074037 files/digest-iptraf-2.7.0-r1 138
-MD5 29df379f2586291b84b39c2cf1aa0b7f files/iptraf-2.7.0-2.6.patch 1587
+MD5 301043df68f5969e9455c53d409a8c3e files/digest-iptraf-2.7.0-r1 138
+MD5 98fb7659373bc05930f0f3837135c811 files/iptraf-2.7.0-2.6.patch 1711
 MD5 1bf72405b3017f7732841188b6914160 files/iptraf-2.7.0-atheros.patch 1644
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2m3cEZCkKN40op4RAk6ZAJwOM0oohLZv98MZIpLSHGsVPF0OZQCeOn4y
-FcKCr48sFwiqbGqoLz6TODY=
-=zMMI
------END PGP SIGNATURE-----
diff --git a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1 b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1
index 6bc436b76cea..b97ad87a0470 100644
--- a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1
+++ b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1
@@ -1,2 +1,2 @@
 MD5 7ff0bc933a0a57a4ca9e2b0443307539 iptraf-2.7.0.tar.gz 363496
-MD5 4bea3bd7fe1a28afd8d80a67e73ece3d iptraf-2.7.0-ipv6-alpha11.diff 47780
+MD5 34081a07879af189cca6865bc3b28c29 iptraf-2.7.0-ipv6-alpha12.diff 57251
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
index e4468273816c..35808f591acc 100644
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
+++ b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
@@ -1,52 +1,56 @@
-diff -ur iptraf-2.7.0/src/packet.c iptraf-2.7.0-2.6.11-r2/src/packet.c
---- iptraf-2.7.0/src/packet.c   2005-07-17 05:45:44.000000000 +0200
-+++ iptraf-2.7.0-2.6.11-r2/src/packet.c 2005-07-17 05:43:50.000000000 +0200
-@@ -32,6 +32,9 @@
+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
++#define _LINUX_IF_H
 +#endif
  #include <sys/ioctl.h>
  #include <linux/if_packet.h>
  #include <linux/if_ether.h>
-diff -ur iptraf-2.7.0/src/tcptable.h iptraf-2.7.0-2.6.11-r2/src/tcptable.h
---- iptraf-2.7.0/src/tcptable.h 2001-12-28 03:16:39.000000000 +0100
-+++ iptraf-2.7.0-2.6.11-r2/src/tcptable.h       2005-07-17 05:44:02.000000000 +0200
-@@ -20,11 +20,15 @@
+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
++#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 <net/if.h>
  #include <netinet/ip.h>
  #include <netinet/udp.h>
  #include "servname.h"
-diff -ur iptraf-2.7.0/src/othptab.c iptraf-2.7.0-2.6.11-r2/src/othptab.c
---- iptraf-2.7.0/src/othptab.c  2001-12-28 03:23:59.000000000 +0100
-+++ iptraf-2.7.0-2.6.11-r2/src/othptab.c        2005-07-17 14:24:00.000000000 +0200
-@@ -17,13 +17,10 @@
- ***/
-
- #include <asm/types.h>
--#include <linux/if_ether.h>
--#include <linux/if_tr.h>
--#include <linux/if_fddi.h>
- #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 --git a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
index f9863e69b85b..10464cd7c7bd 100644
--- a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
+++ b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 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.21 2005/07/17 14:40:07 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.22 2005/07/19 09:14:45 ka0ttic Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
-V6PATCH_LEVEL=alpha11
+V6PATCH_LEVEL=alpha12
 DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
 HOMEPAGE="http://cebu.mozcom.com/riker/iptraf/"
 SRC_URI="ftp://ftp.cebu.mozcom.com/pub/linux/net/${P}.tar.gz
@@ -20,8 +20,9 @@ DEPEND=">=sys-libs/ncurses-5.2-r1"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	epatch ${FILESDIR}/iptraf-2.7.0-atheros.patch
-	use ipv6 && epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
+	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' && \
@@ -34,6 +35,7 @@ src_unpack() {
 
 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"
 }