Set dev-python/gnuplot-py[${PYTHON_USEDEP}] dependency.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 7 insertions, 70 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 37db6b56b91a..577c351dd7db 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/scapy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.37 2014/06/27 14:50:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.38 2014/06/27 15:14:09 jer Exp $
+
+  27 Jun 2014; Jeroen Roovers <jer@gentoo.org> -scapy-2.1.0.ebuild,
+  -scapy-2.2.0.ebuild, scapy-2.2.0-r2.ebuild:
+  Set dev-python/gnuplot-py[${PYTHON_USEDEP}] dependency.
 
 *scapy-2.2.0-r2 (27 Jun 2014)
 
diff --git a/net-analyzer/scapy/scapy-2.1.0.ebuild b/net-analyzer/scapy/scapy-2.1.0.ebuild
deleted file mode 100644
index 704e3a385dd3..000000000000
--- a/net-analyzer/scapy/scapy-2.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.1.0.ebuild,v 1.7 2011/04/19 11:39:14 tomka Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-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 tcpreplay"
-
-DEPEND=""
-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
-						media-gfx/graphicsmagick[imagemagick] ) )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
diff --git a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild b/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
index 92448ed20bf8..7ec3177cd5b3 100644
--- a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0-r2.ebuild,v 1.1 2014/06/27 14:50:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0-r2.ebuild,v 1.2 2014/06/27 15:14:09 jer Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
 
 RDEPEND="
 	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
+	gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] )
 	pyx? ( dev-python/pyx[${PYTHON_USEDEP}] )
 	crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] )
 	graphviz? ( media-gfx/graphviz )
diff --git a/net-analyzer/scapy/scapy-2.2.0.ebuild b/net-analyzer/scapy/scapy-2.2.0.ebuild
deleted file mode 100644
index cdb957640a8d..000000000000
--- a/net-analyzer/scapy/scapy-2.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0.ebuild,v 1.5 2011/04/05 17:37:07 arfrever Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.6"
-
-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 tcpreplay"
-
-DEPEND=""
-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
-						media-gfx/graphicsmagick[imagemagick] ) )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}