cleanup

13 files changed, 7 insertions, 282 deletions

diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 74d39e4d4d2a..11e6c18a5c74 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/tcpdump
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.32 2004/07/18 03:30:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.33 2004/10/30 16:17:16 eldad Exp $
+
+  30 Oct 2004; Eldad Zack <eldad@gentoo.org>
+  -files/tcpdump-3.6.2-afsprinting.patch, -files/tcpdump-3.7.2-sctp.patch,
+  -tcpdump-3.6.2-r1.ebuild, -tcpdump-3.7.1.ebuild, -tcpdump-3.7.2.ebuild,
+  -tcpdump-3.8.1.ebuild, -tcpdump-3.8.3.ebuild:
+  Cleanup
 
   17 Jul 2004; Tom Gall <tgall@gentoo.org> tcpdump-3.8.3-r1.ebuild:
   stable on ppc64, bug #56913
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.6.2-r1 b/net-analyzer/tcpdump/files/digest-tcpdump-3.6.2-r1
deleted file mode 100644
index 22a5109041e7..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bc8da35f9eed4e675bfdf04ce312248 tcpdump-3.6.2.tar.gz 380635
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.7.1 b/net-analyzer/tcpdump/files/digest-tcpdump-3.7.1
deleted file mode 100644
index 2fb4bb4fa8f6..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03e5eac68c65b7e6ce8da03b0b0b225e tcpdump-3.7.1.tar.gz 428737
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.7.2 b/net-analyzer/tcpdump/files/digest-tcpdump-3.7.2
deleted file mode 100644
index 4797d9a1a9ae..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.7.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e44b59abba39a48e3680bc2cffb8a6a tcpdump-3.7.2.tar.gz 427223
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.1 b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.1
deleted file mode 100644
index 887fccfcf52d..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9edcf0d7f526f0f03138286959ccc802 tcpdump-3.8.1.tar.gz 522137
diff --git a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3 b/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3
deleted file mode 100644
index 3fe68092ba2f..000000000000
--- a/net-analyzer/tcpdump/files/digest-tcpdump-3.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30645001f4b97019677cad88d3811904 tcpdump-3.8.3.tar.gz 567116
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.6.2-afsprinting.patch b/net-analyzer/tcpdump/files/tcpdump-3.6.2-afsprinting.patch
deleted file mode 100644
index 801d0ba87749..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-3.6.2-afsprinting.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- tcpdump-3.6.2/print-rx.c.afsprinting	Wed Jan 10 09:12:01 2001
-+++ tcpdump-3.6.2/print-rx.c	Thu Jul 19 12:13:37 2001
-@@ -13,7 +13,7 @@
- 
- #ifndef lint
- static const char rcsid[] =
--    "@(#) $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/files/tcpdump-3.6.2-afsprinting.patch,v 1.2 2004/07/18 03:49:07 dragonheart Exp $";
-+    "@(#) $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/files/tcpdump-3.6.2-afsprinting.patch,v 1.2 2004/07/18 03:49:07 dragonheart Exp $";
- #endif
- 
- #ifdef HAVE_CONFIG_H
-@@ -635,14 +635,16 @@
- 			printf(" fid %d/%d/%d", (int) n1, (int) n2, (int) n3); \
- 		}
- 
--#define STROUT(MAX) { int i; \
-+#define STROUT(MAX) { unsigned int i; \
- 			TCHECK2(bp[0], sizeof(int32_t)); \
--			i = (int) EXTRACT_32BITS(bp); \
-+			i = EXTRACT_32BITS(bp); \
-+			if (i > MAX) \
-+				goto trunc; \
- 			bp += sizeof(int32_t); \
--			TCHECK2(bp[0], i); \
--			strncpy(s, (char *) bp, min(MAX, i)); \
--			s[i] = '\0'; \
--			printf(" \"%s\"", s); \
-+			printf(" \""); \
-+			if (fn_printn(bp, i, snapend)) \
-+				goto trunc; \
-+			printf("\""); \
- 			bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \
- 		}
- 
-@@ -727,7 +729,9 @@
- 				bp += sizeof(int32_t); \
- 			} \
- 			s[MAX] = '\0'; \
--			printf(" \"%s\"", s); \
-+			printf(" \""); \
-+			fn_print(s, NULL); \
-+			printf("\""); \
- 		}
- 
- static void
-@@ -1087,7 +1091,9 @@
- 		if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
- 			goto finish;
- 		s += n;
--		printf(" +{%s ", user);
-+		printf(" +{");
-+		fn_print(user, NULL);
-+		printf(" ");
- 		ACLOUT(acl);
- 		printf("}");
- 		if (s > end)
-@@ -1098,7 +1104,9 @@
- 		if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
- 			goto finish;
- 		s += n;
--		printf(" -{%s ", user);
-+		printf(" -{");
-+		fn_print(user, NULL);
-+		printf(" ");
- 		ACLOUT(acl);
- 		printf("}");
- 		if (s > end)
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.7.2-sctp.patch b/net-analyzer/tcpdump/files/tcpdump-3.7.2-sctp.patch
deleted file mode 100644
index 8e7fb258eebf..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-3.7.2-sctp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- print-sctp.c.orig	2003-02-26 07:07:22.000000000 +0100
-+++ print-sctp.c	2003-07-30 02:03:56.775625176 +0200
-@@ -47,11 +47,13 @@
- #include <sys/socket.h>
- 
- #include <unistd.h>
-+
-+#include <netinet/in.h>
-+
- #include "sctpHeader.h"
- #include "sctpConstants.h"
- #include <assert.h>
- 
--#include <netinet/in.h>
- 
- #include <stdio.h>
- #include <string.h>
diff --git a/net-analyzer/tcpdump/tcpdump-3.6.2-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.6.2-r1.ebuild
deleted file mode 100644
index c0fbbc35cb93..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.6.2-r1.ebuild,v 1.18 2004/07/14 22:37:59 agriffis Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-	 http://www.jp.tcpdump.org/release/${P}.tar.gz"
-HOMEPAGE="http://www.tcpdump.org/"
-
-DEPEND=">=net-libs/libpcap-0.6.2
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
-
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=49294
-	patch -p1 < ${FILESDIR}/${P}-afsprinting.patch
-
-}
-src_compile() {
-	local myconf
-	use ssl || myconf="--without-crypto"
-
-	econf \
-		--enable-ipv6 \
-		${myconf} || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	into /usr
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc README FILES VERSION CHANGES
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.7.1.ebuild b/net-analyzer/tcpdump/tcpdump-3.7.1.ebuild
deleted file mode 100644
index 25311d76238d..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.7.1.ebuild,v 1.19 2004/07/14 22:37:59 agriffis Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
-	 http://www.jp.tcpdump.org/release/${P}.tar.gz"
-HOMEPAGE="http://www.tcpdump.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~alpha mips"
-
-DEPEND=">=net-libs/libpcap-0.6.1
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
-
-
-src_compile() {
-	local myconf
-
-	use ssl || myconf="--without-crypto"
-	econf \
-		--enable-ipv6 \
-		${myconf} || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	into /usr
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.7.2.ebuild b/net-analyzer/tcpdump/tcpdump-3.7.2.ebuild
deleted file mode 100644
index f134d2307e5d..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.7.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.7.2.ebuild,v 1.13 2004/07/14 22:37:59 agriffis Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="mirror://sourceforge/tcpdump/${P}.tar.gz
-	http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-HOMEPAGE="http://www.tcpdump.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa ia64"
-
-DEPEND=">=net-libs/libpcap-0.6.1
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-sctp.patch
-}
-
-src_compile() {
-	local myconf
-
-	use ssl || myconf="--without-crypto"
-	econf \
-		--enable-ipv6 \
-		${myconf} || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	into /usr
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.1.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.1.ebuild
deleted file mode 100644
index d076506b4dd3..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.1.ebuild,v 1.10 2004/07/14 22:37:59 agriffis Exp $
-
-inherit flag-o-matic
-
-IUSE="ssl ipv6"
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="mirror://sourceforge/tcpdump/${P}.tar.gz
-	http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-HOMEPAGE="http://www.tcpdump.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ppc sparc alpha ~mips hppa ia64 amd64"
-
-DEPEND=">=net-libs/libpcap-0.6.1
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
-
-src_compile() {
-	replace-flags -O[3-9] -O2
-
-	econf `use_with ssl crypto` `use_enable ipv6` || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	into /usr
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3.ebuild
deleted file mode 100644
index 7f9f39872224..000000000000
--- a/net-analyzer/tcpdump/tcpdump-3.8.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3.ebuild,v 1.6 2004/07/14 22:37:59 agriffis Exp $
-
-inherit flag-o-matic
-
-IUSE="ssl ipv6"
-
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="mirror://sourceforge/tcpdump/${P}.tar.gz
-	http://www.tcpdump.org/release/${P}.tar.gz
-	http://www.jp.tcpdump.org/release/${P}.tar.gz"
-HOMEPAGE="http://www.tcpdump.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc sparc ~alpha ~mips ~hppa ~ia64 amd64"
-
-DEPEND=">=net-libs/libpcap-0.6.1
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
-
-src_compile() {
-	replace-flags -O[3-9] -O2
-
-	econf `use_with ssl crypto` `use_enable ipv6` || die
-	make CCOPT="$CFLAGS" || die
-}
-
-src_install() {
-	into /usr
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc README FILES VERSION CHANGES
-}