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

media-gfx/freewrl: 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/media-gfx/freewrl/freewrl-1.22.13-r4.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
similarity index 98%
rename from media-gfx/freewrl/freewrl-1.22.13-r4.ebuild
rename to media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
index 978562fbce12..bad734f866ec 100644
--- a/media-gfx/freewrl/freewrl-1.22.13-r4.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
@@ -38,9 +38,8 @@ DEPEND="${COMMONDEPEND}
 	nsplugin? ( net-misc/npapi-sdk )"
 RDEPEND="${COMMONDEPEND}
 	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
 	app-arch/unzip
+	virtual/imagemagick-tools
 	java? ( >=virtual/jre-1.4 )
 	sox? ( media-sound/sox )"
 
diff --git a/media-gfx/freewrl/freewrl-2.3.3-r1.ebuild b/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild
similarity index 97%
rename from media-gfx/freewrl/freewrl-2.3.3-r1.ebuild
rename to media-gfx/freewrl/freewrl-2.3.3-r2.ebuild
index c29dc70a7dc8..5d4e19b7774b 100644
--- a/media-gfx/freewrl/freewrl-2.3.3-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-2.3.3-r2.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$
 
@@ -46,9 +46,8 @@ DEPEND="${COMMONDEPEND}
 	nsplugin? ( net-misc/npapi-sdk )"
 RDEPEND="${COMMONDEPEND}
 	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
 	app-arch/unzip
+	virtual/imagemagick-tools
 	java? ( >=virtual/jre-1.4 )
 	sox? ( media-sound/sox )"
 
diff --git a/media-gfx/freewrl/freewrl-3.0.0.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
similarity index 97%
rename from media-gfx/freewrl/freewrl-3.0.0.ebuild
rename to media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index b2efb486f8fb..f349ca756008 100644
--- a/media-gfx/freewrl/freewrl-3.0.0.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -51,9 +51,8 @@ DEPEND="${COMMONDEPEND}
 	nsplugin? ( net-misc/npapi-sdk )"
 RDEPEND="${COMMONDEPEND}
 	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
 	app-arch/unzip
+	virtual/imagemagick-tools
 	java? ( >=virtual/jre-1.4 )
 	sox? ( media-sound/sox )"
 
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index a25bdd163b1f..302da6f5f56b 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -53,9 +53,8 @@ DEPEND="${COMMONDEPEND}
 	nsplugin? ( net-misc/npapi-sdk )"
 RDEPEND="${COMMONDEPEND}
 	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
 	app-arch/unzip
+	virtual/imagemagick-tools
 	java? ( >=virtual/jre-1.4 )
 	sox? ( media-sound/sox )"