Add in optional dependency on tcpreplay to scapy-2.0.1 (bug 293821).

(Portage version: 2.2_rc50/cvs/Linux i686)

7 files changed, 28 insertions, 57 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index c719b9cee599..e9c0224bdc42 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/scapy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.22 2009/03/10 01:32:30 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.23 2009/11/20 12:57:57 ikelos Exp $
+
+  20 Nov 2009; Mike Auty <ikelos@gentoo.org> scapy-1.1.1-r1.ebuild,
+  -scapy-2.0.0.6.ebuild, -scapy-2.0.0.10.ebuild, scapy-2.0.0.11.ebuild,
+  scapy-2.0.1.ebuild, metadata.xml:
+  Push fix for bug 293821 to older ebuilds.
+
+  20 Nov 2009; Mike Auty <ikelos@gentoo.org> -scapy-2.0.0.6.ebuild,
+  -scapy-2.0.0.10.ebuild, scapy-2.0.1.ebuild, metadata.xml:
+  Clean out cruft.
+
+  20 Nov 2009; Mike Auty <ikelos@gentoo.org> scapy-2.0.1.ebuild,
+  metadata.xml:
+  Add in optional dependency on tcpreplay to scapy-2.0.1 (bug 293821).
 
 *scapy-2.0.1 (10 Mar 2009)
 
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 0552e79d7a81..080dce9db3a8 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -12,5 +12,6 @@ Scapy is a powerful interactive packet manipulation program.
 <use>
 <flag name='pyx'>Enable <pkg>dev-python/pyx</pkg> support for psdump/pdfdump commands</flag>
 <flag name='visual'>Enable <pkg>dev-python/visual</pkg> support for 3d graphs</flag>
+<flag name='tcpreplay'>Enable <pkg>net-analyzer/tcpreply</pkg> support for fast packet replay</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
index d51a8b6e2bfd..6e504d962919 100644
--- a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
+++ b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.3 2008/05/01 14:31:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.4 2009/11/20 12:57:57 ikelos Exp $
 
 inherit eutils python multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual"
+IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
 
 DEPEND="virtual/python"
 RDEPEND="net-analyzer/tcpdump
@@ -20,7 +20,8 @@ RDEPEND="net-analyzer/tcpdump
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
 	imagemagick? ( media-gfx/imagemagick )
-	visual? ( dev-python/visual )"
+	visual? ( dev-python/visual )
+	tcpreplay? ( net-analyzer/tcpreplay )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/scapy/scapy-2.0.0.10.ebuild b/net-analyzer/scapy/scapy-2.0.0.10.ebuild
deleted file mode 100644
index ca8444fef3dd..000000000000
--- a/net-analyzer/scapy/scapy-2.0.0.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.0.10.ebuild,v 1.1 2008/10/08 08:15:56 rbu Exp $
-
-inherit distutils
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
-SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual"
-
-DEPEND="virtual/python"
-RDEPEND="net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
-	visual? ( dev-python/visual )"
diff --git a/net-analyzer/scapy/scapy-2.0.0.11.ebuild b/net-analyzer/scapy/scapy-2.0.0.11.ebuild
index acb400a57053..1c9a112395ae 100644
--- a/net-analyzer/scapy/scapy-2.0.0.11.ebuild
+++ b/net-analyzer/scapy/scapy-2.0.0.11.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/scapy/scapy-2.0.0.11.ebuild,v 1.1 2009/01/16 00:38:38 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.0.11.ebuild,v 1.2 2009/11/20 12:57:57 ikelos Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual"
+IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
 
 DEPEND="virtual/python"
 RDEPEND="net-analyzer/tcpdump
@@ -20,4 +20,5 @@ RDEPEND="net-analyzer/tcpdump
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
 	imagemagick? ( media-gfx/imagemagick )
-	visual? ( dev-python/visual )"
+	visual? ( dev-python/visual )
+	tcpreplay? ( net-analyzer/tcpreplay )"
diff --git a/net-analyzer/scapy/scapy-2.0.0.6.ebuild b/net-analyzer/scapy/scapy-2.0.0.6.ebuild
deleted file mode 100644
index 58e026d0c2ae..000000000000
--- a/net-analyzer/scapy/scapy-2.0.0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.0.6.ebuild,v 1.2 2008/08/31 04:20:53 mr_bones_ Exp $
-
-inherit distutils
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
-SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual"
-
-DEPEND="virtual/python"
-RDEPEND="net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
-	visual? ( dev-python/visual )"
diff --git a/net-analyzer/scapy/scapy-2.0.1.ebuild b/net-analyzer/scapy/scapy-2.0.1.ebuild
index 8afa703bd1ee..0fdf1f3b1ca8 100644
--- a/net-analyzer/scapy/scapy-2.0.1.ebuild
+++ b/net-analyzer/scapy/scapy-2.0.1.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/scapy/scapy-2.0.1.ebuild,v 1.1 2009/03/10 01:32:30 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.1.ebuild,v 1.2 2009/11/20 12:57:57 ikelos Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual"
+IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
 
 DEPEND="virtual/python"
 RDEPEND="net-analyzer/tcpdump
@@ -20,4 +20,5 @@ RDEPEND="net-analyzer/tcpdump
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
 	imagemagick? ( media-gfx/imagemagick )
-	visual? ( dev-python/visual )"
+	visual? ( dev-python/visual )
+	tcpreplay? ( net-analyzer/tcpreplay )"