Remove unused patches.

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

5 files changed, 7 insertions, 120 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 81c4ce3fcb51..755b8f06fd97 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.81 2010/01/06 20:02:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.82 2010/01/06 20:12:05 jer Exp $
+
+  06 Jan 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/iptraf-3.0.0-atheros.patch, -files/iptraf-3.0.0-bnep.patch,
+  -files/iptraf-3.0.0-ipv6-glibc24.patch:
+  Remove unused patches.
 
   06 Jan 2010; Jeroen Roovers <jer@gentoo.org> -iptraf-3.0.0-r4.ebuild:
   Remove old.
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index c1977633973a..f7d44fd9595a 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,11 +1,8 @@
 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
 AUX iptraf-3.0.0-build.patch 949 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee SHA1 dcb596e6d20fe7db043a4a21a63b8f8b294411b2 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91
 AUX iptraf-3.0.0-headerfix.patch 728 RMD160 99a4b283f94850dd9365194d86046f35c9042f05 SHA1 176c1a5e4926e8a60e96a5188c652a5cb3f820e0 SHA256 a4f00741052aba3482ddb4d3396b777cda3083e8e77983e200e8aec55b3ce6f8
 AUX iptraf-3.0.0-ipv6-glibc24-updated.patch 1408 RMD160 30760b73f66577a40c0c0509ee2b0dab90031742 SHA1 55aed266b6c6e22cce267355e470d1639de94f93 SHA256 d712126f83c5996802cb346d557addcdc6993c1c73c00fe62f798884e307896a
-AUX iptraf-3.0.0-ipv6-glibc24.patch 1324 RMD160 4e88de3dcc03d87508cf7acf83598dcd62419865 SHA1 c02cbc842a1758394abb38bd3cdd27d42fdd92c2 SHA256 a99ad5aacab94dcc7e6358014809211cfbe5eccb1da152bd3a5a873f650320b6
 AUX iptraf-3.0.0-ipv6-headerfix.patch 460 RMD160 0de05f8d46360c13420c508831e5e9ad45f0a038 SHA1 eb6ea3f504ab78ccddde2bdb1d89ad5d20621658 SHA256 9adae655d64ac02f6b07a08d19083223da602159c8b9532e9863479fe3b321a0
 AUX iptraf-3.0.0-linux-headers.patch 963 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 SHA1 79d90657a8b7ff49e4b0c1792406eec294c05625 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae
 AUX iptraf-3.0.0-ncursesw.patch 1296 RMD160 d0c2648b15d0c0e76278f6ba47c7a3da39ebdbb2 SHA1 876073e52255ab283402c984d5dd33bb8df4f415 SHA256 87ff765718a45518c74ae23427a6f3e5b65dfa9c44774b67e9404ec12e8d5e0f
@@ -14,5 +11,5 @@ AUX iptraf-3.0.0-vlan.patch 1090 RMD160 4bb6b575537a924e2561419732202274e433cf0b
 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-3.0.0-r5.ebuild 2161 RMD160 7c651013333dcb271143122fc5d80ff961144197 SHA1 e4d6b99229a0db8c834f9fddf7054ea909bacf5d SHA256 731efabfea3c6413d994f1ae4ff93edbbdd500e6eb0acb60a8e83511ca173ec7
-MISC ChangeLog 10987 RMD160 010fd4ddb6762d9b879477180a9b701e2444add4 SHA1 478f48d0d11b0838c2e8e61d2e8a5dd2739e8bf2 SHA256 fb647d41e04542c5e853ddd6caea8fa228f98714b64da68a559a8a932cdac832
+MISC ChangeLog 11171 RMD160 832938a358b8d31d04b84fce7b4a680e1cee4b31 SHA1 3169ae174971c47d4ed301030822160630337102 SHA256 67a3c94ff0377bd9b8c77655aea1f2b8175d7f8eb175670db5d0704e02ad0fc4
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch
deleted file mode 100644
index a903cfda1a38..000000000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Add support for 'ath' interfaces
-
---- iptraf-3.0.0/src/ifaces.c
-+++ iptraf-3.0.0/src/ifaces.c
-@@ -32,14 +32,14 @@
- #include "error.h"
- 
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 26
-+#define NUM_SUPPORTED_IFACES 27
- 
- 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", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
-+    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath"
- };
- 
- char *ltrim(char *buf)
---- iptraf-3.0.0/src/packet.c
-+++ iptraf-3.0.0/src/packet.c
-@@ -110,6 +110,8 @@
-             result = LINK_ETHERNET;
-         else if (strncmp(ifname, "tap", 3) == 0)
-             result = LINK_ETHERNET;
-+        else if (strncmp(ifname, "ath", 3) == 0)
-+            result = LINK_ETHERNET;
-         else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
-             isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
- 
---- iptraf-3.0.0/src/promisc.c
-+++ iptraf-3.0.0/src/promisc.c
-@@ -83,6 +83,7 @@
-             if ((strncmp(buf, "eth", 3) == 0) ||
-                 (strncmp(buf, "fddi", 4) == 0) ||
-                 (strncmp(buf, "tr", 2) == 0) ||
-+                (strncmp(buf, "ath", 3) == 0) ||
-                 (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
-                 (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
-                 (accept_unsupported_interfaces)) {
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch
deleted file mode 100644
index 881ca92925ac..000000000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --exclude=CVS --exclude=.svn -up --new-file --recursive iptraf-3.0.0.old/src/ifaces.c iptraf-3.0.0/src/ifaces.c
---- iptraf-3.0.0.old/src/ifaces.c	2006-01-10 01:13:49.000000000 +0100
-+++ iptraf-3.0.0/src/ifaces.c	2006-01-10 01:14:41.000000000 +0100
-@@ -32,14 +32,14 @@ details.
- #include "error.h"
- 
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 27
-+#define NUM_SUPPORTED_IFACES 28
- 
- 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", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath"
-+    "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath", "bnep"
- };
- 
- char *ltrim(char *buf)
-diff --exclude=CVS --exclude=.svn -up --new-file --recursive iptraf-3.0.0.old/src/packet.c iptraf-3.0.0/src/packet.c
---- iptraf-3.0.0.old/src/packet.c	2006-01-10 01:13:49.000000000 +0100
-+++ iptraf-3.0.0/src/packet.c	2006-01-10 01:15:51.000000000 +0100
-@@ -112,6 +112,8 @@ unsigned short getlinktype(unsigned shor
-             result = LINK_ETHERNET;
-         else if (strncmp(ifname, "ath", 3) == 0)
-             result = LINK_ETHERNET;
-+	else if (strncmp(ifname, "bnep", 4) == 0)
-+            result = LINK_ETHERNET;
-         else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
-             isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
- 
-diff --exclude=CVS --exclude=.svn -up --new-file --recursive iptraf-3.0.0.old/src/promisc.c iptraf-3.0.0/src/promisc.c
---- iptraf-3.0.0.old/src/promisc.c	2006-01-10 01:13:49.000000000 +0100
-+++ iptraf-3.0.0/src/promisc.c	2006-01-10 01:17:02.000000000 +0100
-@@ -84,6 +84,7 @@ void init_promisc_list(struct promisc_st
-                 (strncmp(buf, "fddi", 4) == 0) ||
-                 (strncmp(buf, "tr", 2) == 0) ||
-                 (strncmp(buf, "ath", 3) == 0) ||
-+                (strncmp(buf, "bnep", 4) == 0) ||
-                 (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
-                 (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
-                 (accept_unsupported_interfaces)) {
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
deleted file mode 100644
index 05171fbdb580..000000000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN ./iptraf-3.0.0.orig/src/othptab.c ./iptraf-3.0.0/src/othptab.c
---- ./iptraf-3.0.0.orig/src/othptab.c	2006-03-21 23:41:53.000000000 +0100
-+++ ./iptraf-3.0.0/src/othptab.c	2006-03-21 23:42:30.000000000 +0100
-@@ -560,8 +560,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");
-@@ -592,15 +592,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;