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

diff --git a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild
similarity index 85%
rename from net-analyzer/scapy/scapy-2.2.0-r2.ebuild
rename to net-analyzer/scapy/scapy-2.2.0-r3.ebuild
index 88074250ba0f101835f11fca8ac47777a7468fa9..d9f60640a6c149321844eb6a41ab98962a0a9aa5 100644 (file)
--- a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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 )
 "

diff --git a/net-analyzer/scapy/scapy-2.3.0.ebuild b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild
similarity index 84%
rename from net-analyzer/scapy/scapy-2.3.0.ebuild
rename to net-analyzer/scapy/scapy-2.3.0-r1.ebuild
index d9bc94f6704ba710289a84cd2cf36c86d1a3558d..ce408d20380f5a036242dcc2da2ce35c58c755f3 100644 (file)
--- a/net-analyzer/scapy/scapy-2.3.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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 )
 "

diff --git a/net-analyzer/scapy/scapy-2.3.1.ebuild b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild
similarity index 84%
rename from net-analyzer/scapy/scapy-2.3.1.ebuild
rename to net-analyzer/scapy/scapy-2.3.1-r1.ebuild
index 0b66fa7f10f31a969a3baa845451325187050040..ce408d20380f5a036242dcc2da2ce35c58c755f3 100644 (file)
--- a/net-analyzer/scapy/scapy-2.3.1.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.1-r1.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 )
 "

diff --git a/net-analyzer/scapy/scapy-2.3.2.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
similarity index 84%
rename from net-analyzer/scapy/scapy-2.3.2.ebuild
rename to net-analyzer/scapy/scapy-2.3.2-r1.ebuild
index c4246b006ffb066aa9fcbad1b86cf77c35be421f..179f5908d5da7c363d1132e3de405cac47a4665e 100644 (file)
--- a/net-analyzer/scapy/scapy-2.3.2.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.2-r1.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 )
 "

diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index dae68205a60f97314d8a9a6202943e0481db747e..97f6f372cf0152946bc42761d04ad86d79a2d73c 100644 (file)
--- 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 )
 "