From: David Seifert <soap@gentoo.org>
Date: Sat, 11 Feb 2017 19:21:54 +0000 (+0100)
Subject: net-analyzer/scapy: Depend on virtual/imagemagick-tools
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3762423b0fbaeeb786329b7618e1344f4b96cf8d;p=gentoo.git

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 88074250ba0f..d9f60640a6c1 100644
--- 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 d9bc94f6704b..ce408d20380f 100644
--- 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 0b66fa7f10f3..ce408d20380f 100644
--- 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 c4246b006ffb..179f5908d5da 100644
--- 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 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 )
 "