9 files changed, 92 insertions, 37 deletions
diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index 6eeb8e03fb4c..eb3b6f34b422 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for net-analyzer/tcpreplay
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.1 2003/09/22 14:53:59 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  tcpreplay-3.0_beta1.ebuild:
+  Use make install instead of emake install.
+
+  05 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> tcpreplay-3.0_beta1.ebuild:
+  Don't install their man2html, bug 88017.
+
+*tcpreplay-3.0_beta1 (04 Apr 2005)
+
+  04 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +tcpreplay-3.0_beta1.ebuild:
+  Version bump. Thanks Marco Morales <soulse@gmail.com>. Fixes bug 87868.
+
+*tcpreplay-2.3.3-r1 (16 Mar 2005)
+
+  16 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +tcpreplay-2.3.3-r1.ebuild:
+  Revision bump; added new optional dep on libpcapnav. Thanks to soulse in bug
+  84895.
+
+*tcpreplay-2.3.3 (07 Mar 2005)
+
+  07 Mar 2005; Daniel Black <dragonheart@gentoo.org> +tcpreplay-2.3.3.ebuild:
+  Version bump as per bug #83992. Thanks to Dave Stahl <cybertech@cybertech.org>
+
+*tcpreplay-2.3.2 (30 Jan 2005)
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcpreplay-1.4.6.ebuild,
+  tcpreplay-2.2.2.ebuild, +tcpreplay-2.3.2.ebuild:
+  Version bump and transition to virtual/libpcap
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> tcpreplay-2.2.2.ebuild:
+  marked x86 stable
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> tcpreplay-2.2.2.ebuild:
+  Marked ~amd64, resolves bug 58732.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  tcpreplay-1.4.6.ebuild:
+  metadata: changed bugwranglers to netmon. 1.4.6 marked x86 stable.
+
+*tcpreplay-2.2.2 (23 Jun 2004)
+
+  23 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml,
+  tcpreplay-1.4.6.ebuild, +tcpreplay-2.2.2.ebuild:
+  Version bump. Added support for the debug USE flag. Added metadata.xml and
+  IUSE="".
+
+*tcpreplay-1.4.6 (11 Dec 2003)
+
+  11 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #35373.
 
 *tcpreplay-1.4.5 (22 Sep 2003)
 
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index fc8af876f25e..d29b5feaf81a 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,3 +1,14 @@
-MD5 eeacf82d14b22e56a063e754336ee1a3 files/digest-tcpreplay-1.4.5 67
-MD5 487345edba436dd2cc749e7b3e3254a9 tcpreplay-1.4.5.ebuild 660
-MD5 4885315c4c92a52339ab11bb13f791f6 ChangeLog 395
+MD5 611a4d1a9a0e4a832fdc3234f91434a5 tcpreplay-2.3.3.ebuild 1168
+MD5 94ac072464d33db5ccc07ea57e78267e tcpreplay-2.2.2.ebuild 842
+MD5 bab9e9b493dccbe89c009e787a922585 tcpreplay-3.0_beta1.ebuild 1215
+MD5 ec7bc993123faf48a1371d6785ddb60d tcpreplay-2.3.2.ebuild 1168
+MD5 d8f75cf7a4b5758c9d7c4498256b5806 tcpreplay-2.3.3-r1.ebuild 1204
+MD5 6dfe4e8560053aca3b386985e0fffb3f ChangeLog 2135
+MD5 1cd3590be14655cd8346c467d76e8484 metadata.xml 250
+MD5 afa76b28a7e31d137461093ff1fe7e43 tcpreplay-1.4.6.ebuild 741
+MD5 8daa7ddc53cfe4ef8cd88df8f312339e files/digest-tcpreplay-2.3.3-r1 67
+MD5 0b75692f271546f9eb50aa1af1887fdf files/digest-tcpreplay-1.4.6 67
+MD5 a2e378f507f02665aa74c92df8ea254b files/digest-tcpreplay-2.2.2 67
+MD5 bc5984507a3e4ebbee2b6d68de8d6eae files/digest-tcpreplay-2.3.2 67
+MD5 8daa7ddc53cfe4ef8cd88df8f312339e files/digest-tcpreplay-2.3.3 67
+MD5 7a5a48c32b202a4c9bf697c4c0f1ee31 files/digest-tcpreplay-3.0_beta1 71
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index d8b96be3c5cd..c61b83d26848 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
+<herd>netmon</herd>
+<longdescription>replay saved tcpdump or snoop files at arbitrary speeds</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild b/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild
index 0ec03676804e..07c35727798f 100644
--- a/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild,v 1.1 2003/12/11 23:52:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
@@ -8,10 +8,11 @@ SRC_URI="mirror://sourceforge/tcpreplay/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=net-libs/libnet-1.1.1
-	net-libs/libpcap"
+	virtual/libpcap"
 
 src_compile() {
 	econf || die
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild
index 50af72beea45..30b9f0be1ffb 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild,v 1.1 2004/06/23 00:09:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
@@ -9,11 +9,11 @@ RESTRICT="nomirror"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="debug"
 
 DEPEND=">=net-libs/libnet-1.1.1
-	net-libs/libpcap
+	virtual/libpcap
 	net-analyzer/tcpdump"
 
 src_compile() {
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild
index bc37fe2aa271..6c7aeadd3d7f 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild,v 1.1 2005/01/29 20:46:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
@@ -24,22 +24,15 @@ src_compile() {
 }
 
 src_test() {
-	# This would work if src_test was run as root when FEATURES didn't
-	# have user priv.
-
-	#if hasq userpriv "${FEATURES}"; then
+	whoami
+	if hasq userpriv "${FEATURES}"; then
 		ewarn "Some tested disabled due to FEATURES=userpriv"
 		ewarn "For a full test as root - make -C ${S}/test"
-		if ! make -C test tcpprep; then
-			cat test/test.log
-			die "self test failed"
-		fi
-	#else
-	#	if ! make test; then
-	#		cat test/test.log
-	#		die "self test failed"
-	#	fi
-	#fi
+		make -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		make test || \
+			die "self test failed - see ${S}/test/test.log"
+	fi
 
 }
 
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild
index 2270a6965a8d..35f02a5a7652 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild,v 1.1 2005/03/16 12:55:44 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild
index 0c80350a9306..28027e31041b 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild,v 1.1 2005/03/07 08:46:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild
index de96f9170b12..cd8d18566280 100644
--- a/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild,v 1.1 2005/04/04 21:38:58 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 MY_P=${PN}-${PV/_beta1/.beta1}
 S=${WORKDIR}/${MY_P}
@@ -40,6 +40,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	make DESTDIR=${D} install || die "emake install failed"
+	rm ${D}/usr/bin/man2html
 	dodoc docs/*
 }