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 978562fbce120f2bf6ce219b00295b887e27ae6b..bad734f866ec5a2ee5c58f4c6644c9d9fb82315b 100644 (file)
--- 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 c29dc70a7dc80d4a8faee0af397b2db0c52d1a44..5d4e19b7774b6558c92d61da78401ebe87766664 100644 (file)
--- 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 b2efb486f8fb72600650aa92f76db01725659c27..f349ca756008b7ef458014af49334df5c19e0023 100644 (file)
--- 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 a25bdd163b1fd03a79c6e8a3d46503d471733310..302da6f5f56b02b524335dffdface4c970abe832 100644 (file)
--- 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 )"