app-misc/tracker: 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/app-misc/tracker/tracker-1.10.1.ebuild b/app-misc/tracker/tracker-1.10.1-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-1.10.1.ebuild
rename to app-misc/tracker/tracker-1.10.1-r1.ebuild
index e096ccf3c413c97f9611474572b7bfa63878f837..a4edb29a23e0fa05c4d4ccf4c5557a33dff0e7df 100644 (file)
--- a/app-misc/tracker/tracker-1.10.1.ebuild
+++ b/app-misc/tracker/tracker-1.10.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$
 
@@ -34,13 +34,11 @@ RDEPEND="
        >=dev-libs/glib-2.44:2
        >=dev-libs/gobject-introspection-0.9.5:=
        >=dev-libs/icu-4.8.1.1:=
-       || (
-               >=media-gfx/imagemagick-5.2.1[png,jpeg?]
-               media-gfx/graphicsmagick[imagemagick,png,jpeg?] )
        >=media-libs/libpng-1.2:0=
        >=media-libs/libmediaart-1.9:2.0
        >=x11-libs/pango-1:=
        sys-apps/util-linux
+       virtual/imagemagick-tools[png,jpeg?]
 
        cue? ( media-libs/libcue )
        elibc_glibc? ( >=sys-libs/glibc-2.12 )

diff --git a/app-misc/tracker/tracker-1.8.0.ebuild b/app-misc/tracker/tracker-1.8.0-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-1.8.0.ebuild
rename to app-misc/tracker/tracker-1.8.0-r1.ebuild
index fdbf7dfbb824640108a706ca0c5282e4b4e0a014..fa738e84fe0ca95e0226b71d4d6060ba0b2bd398 100644 (file)
--- a/app-misc/tracker/tracker-1.8.0.ebuild
+++ b/app-misc/tracker/tracker-1.8.0-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$
 
@@ -34,13 +34,11 @@ RDEPEND="
        >=dev-libs/glib-2.40:2
        >=dev-libs/gobject-introspection-0.9.5:=
        >=dev-libs/icu-4.8.1.1:=
-       || (
-               >=media-gfx/imagemagick-5.2.1[png,jpeg?]
-               media-gfx/graphicsmagick[imagemagick,png,jpeg?] )
        >=media-libs/libpng-1.2:0=
        >=media-libs/libmediaart-1.9:2.0
        >=x11-libs/pango-1:=
        sys-apps/util-linux
+       virtual/imagemagick-tools[png,jpeg?]
 
        cue? ( media-libs/libcue )
        elibc_glibc? ( >=sys-libs/glibc-2.12 )

diff --git a/app-misc/tracker/tracker-1.8.3.ebuild b/app-misc/tracker/tracker-1.8.3-r1.ebuild
similarity index 98%
rename from app-misc/tracker/tracker-1.8.3.ebuild
rename to app-misc/tracker/tracker-1.8.3-r1.ebuild
index 08d86e2b73aca82b99ec2c718714993bdaad4080..90b27a3f8fff2f62b0d7c7d2a924df23a2b53e5b 100644 (file)
--- a/app-misc/tracker/tracker-1.8.3.ebuild
+++ b/app-misc/tracker/tracker-1.8.3-r1.ebuild
@@ -38,13 +38,11 @@ RDEPEND="
        >=dev-libs/glib-2.40:2
        >=dev-libs/gobject-introspection-0.9.5:=
        >=dev-libs/icu-4.8.1.1:=
-       || (
-               >=media-gfx/imagemagick-5.2.1[png,jpeg?]
-               media-gfx/graphicsmagick[imagemagick,png,jpeg?] )
        >=media-libs/libpng-1.2:0=
        >=media-libs/libmediaart-1.9:2.0
        sys-apps/util-linux
        >=x11-libs/pango-1:=
+       virtual/imagemagick-tools[png,jpeg?]
 
        cue? ( media-libs/libcue )
        elibc_glibc? ( >=sys-libs/glibc-2.12 )