Bug #314229 - Fix deps to pull in graphicsmagick instead of imagemagick if appropriate.

Package-Manager: portage-2.2_rc67_p65/cvs/Linux i686

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 8dbaef0f799cf4f7a1eee2ee747db1ebc3b8d529..b01682870d002c506df28079588bb8f343b5c925 100644 (file)
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.82 2010/04/09 19:01:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.83 2010/04/12 00:26:11 zmedico Exp $
+
+  12 Apr 2010; Zac Medico <zmedico@gentoo.org> calibre-0.6.47.ebuild:
+  Bug #314229 - Fix deps to pull in graphicsmagick instead of imagemagick if
+  appropriate.
 
 *calibre-0.6.47 (09 Apr 2010)
 

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 1eb31647b42a0702bb61e65662a58cc5cb57ba21..45473de171b80fb18fa18f6840c528b44536d39f 100644 (file)
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -12,13 +12,13 @@ EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd825743576
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
 EBUILD calibre-0.6.44.ebuild 4525 RMD160 bc77cbc495ca788432093043fb866e2c9e803481 SHA1 b73d734297b3a8a128d1f48fd2651ff39a8801b1 SHA256 e16691dde420f2a3489c75ad733a7cf987d3b8f88e53ae27b63e66322c9d2338
 EBUILD calibre-0.6.45.ebuild 4525 RMD160 2776962e1c24fefb5cf78324a21498a63715a845 SHA1 d983e131d255757cda42c22c4bd50ab587c19046 SHA256 30b751855485566756d099350c43274116f0ae603d3bbb9454a56fe69a81e213
-EBUILD calibre-0.6.47.ebuild 4487 RMD160 c1972f5e90c9d3bd5b5e1a3fd40f62107b249e0a SHA1 f088d4494aa0d315e14b432d02327778727fb373 SHA256 f947dd6ea8ecb27a006f1fad5a23c17abce099b321f966204665b3647f1b89d8
-MISC ChangeLog 13058 RMD160 c3352f553bd856b05479ada0b092ce14bbec6bc2 SHA1 d4a263eddae9aa4954547d2a2daa992c310ea73d SHA256 f90565e36e33bc363ae85a66fd0123a935ce5ee62a46d1f6912c41e6db58710a
+EBUILD calibre-0.6.47.ebuild 4532 RMD160 a868cbca3d42a9fc22a4ada4be25f4f13416ff48 SHA1 df4fb65b8e3a8202840d80f5c8524aae4d1e140f SHA256 9e7a24ced47353ab6e998c94ddf997a66cf2e75b066c6ae28229e13541896765
+MISC ChangeLog 13221 RMD160 a4318cb1fc86d0407faadb7470351900485acbe3 SHA1 69a6a64ac9078a6e14aada889bc94a478f679315 SHA256 84fb554f37fd91679b9174e16f12c6a2511e27f64fc8f70e11ee011bb6ae10d4
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku/eYoACgkQ/ejvha5XGaNi6QCfTGs8A9aNErjwjOhrmLTYUNLc
-ps0AnicG8xEzvyV0dKrjr3HUy3Hc+UD9
-=Zk77
+iEYEARECAAYFAkvCaJYACgkQ/ejvha5XGaNsewCglEkG5k5+nuqNXZYtyIbgYXbs
+GukAn3MRVIMlWju3AZu2KeQQ8rT9K1TD
+=uApM
 -----END PGP SIGNATURE-----

diff --git a/app-text/calibre/calibre-0.6.47.ebuild b/app-text/calibre/calibre-0.6.47.ebuild
index eacb0cc25edaf9472bf0a699a0537580fce15c6d..1762124496074bb45767fb7916c196ac73776650 100644 (file)
--- a/app-text/calibre/calibre-0.6.47.ebuild
+++ b/app-text/calibre/calibre-0.6.47.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-text/calibre/calibre-0.6.47.ebuild,v 1.1 2010/04/09 19:01:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.47.ebuild,v 1.2 2010/04/12 00:26:11 zmedico Exp $
 
 EAPI=2
 PYTHON_DEPEND=2:2.6
@@ -27,7 +27,7 @@ SHARED_DEPEND=">=dev-python/cssutils-0.9.7_alpha2
        virtual/libusb:0
        >=dev-python/PyQt4-4.5[X,svg,webkit]
        >=dev-python/mechanize-0.1.11
-       >=media-gfx/imagemagick-6.3.5
+       || ( >=media-gfx/imagemagick-6.3.5 media-gfx/graphicsmagick[imagemagick] )
        >=x11-misc/xdg-utils-1.0.2
        >=dev-python/dbus-python-0.82.2
        >=dev-python/lxml-2.1.5