Make imagemagick switchable with graphicsmagick, bug #309047.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 24ac6610a98fbbb80bdcadf2eaf71925dafc6b0f..933427f896c94d263e3650769388b5b227045ac2 100644 (file)
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.69 2010/03/29 20:54:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.70 2010/04/06 13:00:21 eva Exp $
+
+  06 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.7.24.ebuild:
+  Make imagemagick switchable with graphicsmagick, bug #309047.
 
   29 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -tracker-0.7.23.ebuild, tracker-0.7.24.ebuild, tracker-9999.ebuild:

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 5f09c3401135a6a04e64eec90783fee253c21f5f..987c1c86154e596d8b8f07d4171c908be491b8ab 100644 (file)
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST tracker-0.7.24.tar.bz2 4729784 RMD160 90f76b3882d892b082c70451c934f5e3221426da SHA1 15073c99ea4268b918d06e3fc7005e8c60896ae7 SHA256 b491d09fc4301c85afe7f653591bb8598dbe55771fe2fb4e1cb3deb456d359da
-EBUILD tracker-0.7.24.ebuild 4628 RMD160 4285a3db71f223ef192a31f9f52a927fc6582cd1 SHA1 f6030cad91900dc55bc524b4fb3d27372f17a2bc SHA256 90a73c25c0bf53d1fb85a24bf137c36e49d795a29ea5d22490fcbd7e8f0814ea
+EBUILD tracker-0.7.24.ebuild 4687 RMD160 923a15410b470636ddc33275074fd2112c90d7c4 SHA1 819c776cf275ac54a44bc1ce8a554d6cc08ea8e0 SHA256 7d388963f450e720b5a447a2b0c0005df4e16cb9f5ae600a2c92476914e1264e
 EBUILD tracker-9999.ebuild 4828 RMD160 f811975c0f762573605ccf56d658ab42b19197af SHA1 9f6676eb5eb793601acabce0fb667190fad8dc47 SHA256 af35e8ec32faf58796a6ba494106032c699493a1089a0ddf4882c7c6cc29a152
-MISC ChangeLog 12062 RMD160 7ce3544f44f54d6118b4a12dad53cc1a5d4c0fb5 SHA1 777093bfbd1e2dec012cb9c0c20c1dba0d519d13 SHA256 90218432df9d35eb4bc33696da21590a5dd32f1a2755fa950f99f56da29bb36e
+MISC ChangeLog 12204 RMD160 e77598a04382cf53b1300aa66af62fa1c95b4b1a SHA1 a017b75ed021a53904aeb81d80e00bacc9181cf8 SHA256 d2930b6dce73fe767f3c8a6d79cd1642c24a9e3187ff583208a0f31322e8b206
 MISC metadata.xml 794 RMD160 a7d3f1b83e64992d390699746b31cd83798c1ccb SHA1 1066195580aff16094a3cb9709f68cd232d7c2d8 SHA256 07691bebfcf8caebf8d400aa2e8840681895a25ee7dc8a1a36884e692eb642d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuxE5EACgkQ1fmVwcYIWAamogCfcSoBd81FVPA6YY8+HVyDQqYr
-khwAn21esZ3GGbZvSdDspItv4wV9FvMp
-=9V0I
+iEYEARECAAYFAku7MGsACgkQ1fmVwcYIWAZlEACgkMxrz3dN62RZKuKWvP9CPznI
+2mUAmwYbtz+C5Ewmi4gii6g7xqXozmfp
+=RXMP
 -----END PGP SIGNATURE-----

diff --git a/app-misc/tracker/tracker-0.7.24.ebuild b/app-misc/tracker/tracker-0.7.24.ebuild
index 285d3fb75d8c8ceeb2f1f2d68ee6719ebef3ff44..410b7f5d202a552fbd3515d9d83eb15a6bacece4 100644 (file)
--- a/app-misc/tracker/tracker-0.7.24.ebuild
+++ b/app-misc/tracker/tracker-0.7.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.7.24.ebuild,v 1.2 2010/03/29 20:54:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.7.24.ebuild,v 1.3 2010/04/06 13:00:21 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -23,7 +23,9 @@ RDEPEND="
        >=dev-db/sqlite-3.6.16[threadsafe]
        >=dev-libs/dbus-glib-0.82-r1
        >=dev-libs/glib-2.20
-       >=media-gfx/imagemagick-5.2.1[png,jpeg=]
+       || (
+               >=media-gfx/imagemagick-5.2.1[png,jpeg=]
+               media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
        >=media-libs/libpng-1.2
        >=x11-libs/pango-1
        sys-apps/util-linux