From 3762423b0fbaeeb786329b7618e1344f4b96cf8d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 11 Feb 2017 20:21:54 +0100 Subject: net-analyzer/scapy: Depend on virtual/imagemagick-tools Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3907 --- net-analyzer/scapy/scapy-2.2.0-r2.ebuild | 38 -------------------------------- net-analyzer/scapy/scapy-2.2.0-r3.ebuild | 33 +++++++++++++++++++++++++++ net-analyzer/scapy/scapy-2.3.0-r1.ebuild | 29 ++++++++++++++++++++++++ net-analyzer/scapy/scapy-2.3.0.ebuild | 34 ---------------------------- net-analyzer/scapy/scapy-2.3.1-r1.ebuild | 29 ++++++++++++++++++++++++ net-analyzer/scapy/scapy-2.3.1.ebuild | 34 ---------------------------- net-analyzer/scapy/scapy-2.3.2-r1.ebuild | 29 ++++++++++++++++++++++++ net-analyzer/scapy/scapy-2.3.2.ebuild | 34 ---------------------------- net-analyzer/scapy/scapy-9999.ebuild | 9 ++------ 9 files changed, 122 insertions(+), 147 deletions(-) delete mode 100644 net-analyzer/scapy/scapy-2.2.0-r2.ebuild create mode 100644 net-analyzer/scapy/scapy-2.2.0-r3.ebuild create mode 100644 net-analyzer/scapy/scapy-2.3.0-r1.ebuild delete mode 100644 net-analyzer/scapy/scapy-2.3.0.ebuild create mode 100644 net-analyzer/scapy/scapy-2.3.1-r1.ebuild delete mode 100644 net-analyzer/scapy/scapy-2.3.1.ebuild create mode 100644 net-analyzer/scapy/scapy-2.3.2-r1.ebuild delete mode 100644 net-analyzer/scapy/scapy-2.3.2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild b/net-analyzer/scapy/scapy-2.2.0-r2.ebuild deleted file mode 100644 index 88074250ba0f..000000000000 --- a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils distutils-r1 - -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" - -RDEPEND=" - net-analyzer/tcpdump - gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) - pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) - graphviz? ( media-gfx/graphviz ) - imagemagick? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - ) - visual? ( dev-python/visual ) - tcpreplay? ( net-analyzer/tcpreplay ) -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-fix-sendpfast.patch -} diff --git a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild new file mode 100644 index 000000000000..d9f60640a6c1 --- /dev/null +++ b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils distutils-r1 + +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" + +RDEPEND=" + net-analyzer/tcpdump + gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) + pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) + crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + graphviz? ( media-gfx/graphviz ) + imagemagick? ( virtual/imagemagick-tools ) + visual? ( dev-python/visual ) + tcpreplay? ( net-analyzer/tcpreplay ) +" + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-sendpfast.patch +} diff --git a/net-analyzer/scapy/scapy-2.3.0-r1.ebuild b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild new file mode 100644 index 000000000000..ce408d20380f --- /dev/null +++ b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils distutils-r1 + +DESCRIPTION="A Python interactive packet manipulation program for mastering the network" +HOMEPAGE="http://www.secdev.org/projects/scapy/" +SRC_URI="http://bb.secdev.org/${PN}/downloads/${P}.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" + +RDEPEND=" + net-analyzer/tcpdump + gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) + pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) + crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + graphviz? ( media-gfx/graphviz ) + imagemagick? ( virtual/imagemagick-tools ) + visual? ( dev-python/visual ) + tcpreplay? ( net-analyzer/tcpreplay ) +" diff --git a/net-analyzer/scapy/scapy-2.3.0.ebuild b/net-analyzer/scapy/scapy-2.3.0.ebuild deleted file mode 100644 index d9bc94f6704b..000000000000 --- a/net-analyzer/scapy/scapy-2.3.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils distutils-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="http://www.secdev.org/projects/scapy/" -SRC_URI="http://bb.secdev.org/${PN}/downloads/${P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" - -RDEPEND=" - net-analyzer/tcpdump - gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) - pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) - graphviz? ( media-gfx/graphviz ) - imagemagick? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - ) - visual? ( dev-python/visual ) - tcpreplay? ( net-analyzer/tcpreplay ) -" diff --git a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild new file mode 100644 index 000000000000..ce408d20380f --- /dev/null +++ b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils distutils-r1 + +DESCRIPTION="A Python interactive packet manipulation program for mastering the network" +HOMEPAGE="http://www.secdev.org/projects/scapy/" +SRC_URI="http://bb.secdev.org/${PN}/downloads/${P}.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" + +RDEPEND=" + net-analyzer/tcpdump + gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) + pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) + crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + graphviz? ( media-gfx/graphviz ) + imagemagick? ( virtual/imagemagick-tools ) + visual? ( dev-python/visual ) + tcpreplay? ( net-analyzer/tcpreplay ) +" diff --git a/net-analyzer/scapy/scapy-2.3.1.ebuild b/net-analyzer/scapy/scapy-2.3.1.ebuild deleted file mode 100644 index 0b66fa7f10f3..000000000000 --- a/net-analyzer/scapy/scapy-2.3.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils distutils-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="http://www.secdev.org/projects/scapy/" -SRC_URI="http://bb.secdev.org/${PN}/downloads/${P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" - -RDEPEND=" - net-analyzer/tcpdump - gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) - pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) - graphviz? ( media-gfx/graphviz ) - imagemagick? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - ) - visual? ( dev-python/visual ) - tcpreplay? ( net-analyzer/tcpreplay ) -" diff --git a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild new file mode 100644 index 000000000000..179f5908d5da --- /dev/null +++ b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils distutils-r1 + +DESCRIPTION="A Python interactive packet manipulation program for mastering the network" +HOMEPAGE="http://www.secdev.org/projects/scapy/" +SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" + +RDEPEND=" + net-analyzer/tcpdump + gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) + pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) + crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) + graphviz? ( media-gfx/graphviz ) + imagemagick? ( virtual/imagemagick-tools ) + visual? ( dev-python/visual ) + tcpreplay? ( net-analyzer/tcpreplay ) +" diff --git a/net-analyzer/scapy/scapy-2.3.2.ebuild b/net-analyzer/scapy/scapy-2.3.2.ebuild deleted file mode 100644 index c4246b006ffb..000000000000 --- a/net-analyzer/scapy/scapy-2.3.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils distutils-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="http://www.secdev.org/projects/scapy/" -SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" - -RDEPEND=" - net-analyzer/tcpdump - gnuplot? ( dev-python/gnuplot-py[${PYTHON_USEDEP}] ) - pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) - crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) - graphviz? ( media-gfx/graphviz ) - imagemagick? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - ) - visual? ( dev-python/visual ) - tcpreplay? ( net-analyzer/tcpreplay ) -" diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild index dae68205a60f..97f6f372cf01 100644 --- a/net-analyzer/scapy/scapy-9999.ebuild +++ b/net-analyzer/scapy/scapy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -23,12 +23,7 @@ RDEPEND=" pyx? ( dev-python/pyx[${PYTHON_USEDEP}] ) crypt? ( dev-python/pycrypto[${PYTHON_USEDEP}] ) graphviz? ( media-gfx/graphviz ) - imagemagick? ( - || ( - media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] - ) - ) + imagemagick? ( virtual/imagemagick-tools ) visual? ( dev-python/visual ) tcpreplay? ( net-analyzer/tcpreplay ) " -- cgit v1.2.3-65-gdbad