media-gfx/zbar: 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/zbar/zbar-0.10-r5.ebuild b/media-gfx/zbar/zbar-0.10-r6.ebuild
similarity index 92%
rename from media-gfx/zbar/zbar-0.10-r5.ebuild
rename to media-gfx/zbar/zbar-0.10-r6.ebuild
index 34c55306ec3b46ac925385a5186fd12eec110b1e..f3ca161657e019ac6ffba8b6aa98f8a42080e913 100644 (file)
--- a/media-gfx/zbar/zbar-0.10-r5.ebuild
+++ b/media-gfx/zbar/zbar-0.10-r6.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$
 
@@ -18,9 +18,7 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv"
 
 RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
-       imagemagick? (
-               || ( media-gfx/imagemagick
-               media-gfx/graphicsmagick[imagemagick] ) )
+       imagemagick? ( virtual/imagemagick-tools )
        jpeg? ( virtual/jpeg:0 )
        python? ( ${PYTHON_DEPS}
                gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) )

diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
similarity index 94%
rename from media-gfx/zbar/zbar-0.10_p20121015.ebuild
rename to media-gfx/zbar/zbar-0.10_p20121015-r1.ebuild
index 8a10c4ba8d5fa57c1ef38a13a0b87de1a3090608..e0e063cd122cb1dc5756d6127ec6748179389ad3 100644 (file)
--- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015-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$
 
@@ -18,9 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
 
 CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
-       imagemagick? (
-               || ( media-gfx/imagemagick
-               media-gfx/graphicsmagick[imagemagick] ) )
+       imagemagick? ( virtual/imagemagick-tools )
        jpeg? ( virtual/jpeg:0 )
        python? ( ${PYTHON_DEPS}
                gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) )