Fix *magick dependency according to bugs 297830 and 314213.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/app-misc/booh/ChangeLog b/app-misc/booh/ChangeLog
index 149c1374372d90c7004b9a2ec94ff9c2d9b77e43..2d989b724fff5d837854b31f7c6601214f125c3e 100644 (file)
--- a/app-misc/booh/ChangeLog
+++ b/app-misc/booh/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/booh
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.24 2010/04/12 19:06:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/ChangeLog,v 1.25 2010/04/24 19:22:30 graaff Exp $
+
+  24 Apr 2010; Hans de Graaff <graaff@gentoo.org> booh-0.9.2.2.ebuild:
+  Fix *magick dependency according to bugs 297830 and 314213.
 
   12 Apr 2010; Hans de Graaff <graaff@gentoo.org> -booh-0.9.1.ebuild:
   Remove old version.

diff --git a/app-misc/booh/Manifest b/app-misc/booh/Manifest
index 6946973d003cee6dd32a3a5ef931572b5b6fcb27..abb3ed32b3100b649cbae95908f3fe5ef7f81275 100644 (file)
--- a/app-misc/booh/Manifest
+++ b/app-misc/booh/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX booh-0.9.1-require_gems.patch 2406 RMD160 6961b878f35e33f2ee1aad39e9bc2a55dc047d3e SHA1 868be77d94f306e3684a0a7190f1cfbc98f44210 SHA256 81c61ab145714c5a199514440e4360281686d771f85dd677f2f692f8a1edcff2
 DIST booh-0.9.2.2.tar.bz2 615063 RMD160 d2e57abeb953a6435f65981eab0e7140aa8fd0e7 SHA1 cba269ad20b00d9b36ca9e7fbb0b7634a2782c82 SHA256 5bb4642a442dac2658001cbc645a1e184bc5c4b36eb4270ba59fe7bf802dca9e
-EBUILD booh-0.9.2.2.ebuild 1796 RMD160 10ae7695e44179c4638729fbd99b939ac06c8466 SHA1 93567c81f125e609924eb35c66da2dfc811b361e SHA256 078b1f3aef5720d6ec064e002b3f09f0d709e77cca379a6b6c6c7b6e95373359
-MISC ChangeLog 3007 RMD160 6b902250f706143da3e5825c3330afe1844d85de SHA1 fb182db05f3f1dbfee0527a63e7c3ab661cbc046 SHA256 83f09e7b4ae47f89d9927f376e9c720dfad8069ce6cb36b5f05a3f425c977f04
+EBUILD booh-0.9.2.2.ebuild 1848 RMD160 cf3983ace7e0c93a92916d6bbf762875c7018e4c SHA1 a273f923d6376c30c45369ee56475e01a6ff0699 SHA256 f643eb8308e935a872361dda51c16137246633c72fa7f3bef675e6bead15136a
+MISC ChangeLog 3141 RMD160 7600430d382b8b62815a734b3722f3921a681501 SHA1 ca971e0d62b4b01ac8dd9149c1c2d87945367fc6 SHA256 5d179de4759a04d69c017d4ee27a18301c87aaa0df051316a0bbb974f599df8c
 MISC metadata.xml 237 RMD160 2acdd7d87289e9598af8091adaf7978979689355 SHA1 a475efa89d1992a036ad831837ff274ed831c0e1 SHA256 8af78ca867011fbef8c46c0d0b238b655cd03c23e28f861f5c3487db2a85de2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvDb1cACgkQeM7EJeUH71PSYQCcDUzAEXgmXR+6c6k3jS3NpKS2
-+4kAoI5xIzESGJZEGs4sIRy8invEyoCA
-=mkqC
+iEYEARECAAYFAkvTRQIACgkQeM7EJeUH71P0KwCfbUmJhr6kSB8c7GBRijzfJMuW
+cnYAoI/zCpLR09wgsDEEeFGBagvdNRGM
+=6MPJ
 -----END PGP SIGNATURE-----

diff --git a/app-misc/booh/booh-0.9.2.2.ebuild b/app-misc/booh/booh-0.9.2.2.ebuild
index 909b3f04427e1748e9d77c24349186b9691a5d67..f83c5770e979df8fc0a62ab1432de302b367bdf4 100644 (file)
--- a/app-misc/booh/booh-0.9.2.2.ebuild
+++ b/app-misc/booh/booh-0.9.2.2.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/booh/booh-0.9.2.2.ebuild,v 1.2 2010/02/27 08:23:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/booh/booh-0.9.2.2.ebuild,v 1.3 2010/04/24 19:22:30 graaff Exp $
 
 EAPI="2"
 
@@ -24,7 +24,7 @@ DEPEND="dev-lang/ruby
 
 RDEPEND="${DEPEND}
        dev-ruby/rubygems
-       media-gfx/imagemagick
+       || ( media-gfx/imagemagick[jpeg,png] media-gfx/graphicsmagick[jpeg,png] )
        exif? ( media-gfx/exif )
        encode? ( media-video/mplayer )"