Fix imagemagick dependencies wrt bug #314325.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index 39f94923ae635d4014045451b9f60b0405d668fb..aac948cfea8ea45fa3de6204d370a9a4b01afb90 100644 (file)
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/kwave
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.22 2012/01/03 14:48:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.23 2012/01/05 12:38:06 johu Exp $
+
+  05 Jan 2012; Johannes Huber <johu@gentoo.org> kwave-0.8.7.ebuild:
+  Fix imagemagick dependencies wrt bug #314325.
 
 *kwave-0.8.7 (03 Jan 2012)
 

diff --git a/media-sound/kwave/Manifest b/media-sound/kwave/Manifest
index fe05ebe3d385305bc311e0a04fed0771c27c1983..27484f66ab49190701540183888414b671e9e5fc 100644 (file)
--- a/media-sound/kwave/Manifest
+++ b/media-sound/kwave/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA512
 
 DIST kwave-0.8.7-1.tar.bz2 2867049 RMD160 a97f6e8c3e321e18706840a177a8190e077e04d9 SHA1 3a4a784aafa1ca9c61460cdd57bd11bdc98ec896 SHA256 3874af895ed80986505613df013e08704cce56ef773296907eab39e09498aec7
-EBUILD kwave-0.8.7.ebuild 1279 RMD160 cc117f5d93d15cff989328fac8505216f413fdcf SHA1 ee834365e08b19190c800dccb72281d9bf698696 SHA256 629eab9e5c7df536113819e52fedacfe8779a17f5113f1ec700d396310e4605c
-MISC ChangeLog 4143 RMD160 ecd3910cbcdcf1eb78ae1616ce77579efff35385 SHA1 fd7abb77209e52dc52e4a70a7012b60d9e7a15e7 SHA256 2a58d84ed36304635b1d2166946d5d0a860a7d62d95c028769d76b5839d78307
+EBUILD kwave-0.8.7.ebuild 1334 RMD160 dfdc0022f678764e84cf6b6dc3f42be41babe07e SHA1 eb7b3970ad410af3f3c3eeb5ed92a873504e15de SHA256 05b639e98e5c3b2d3cdde4928d11a303f2aa728e32bdb975568b7c3cd5c0fd96
+MISC ChangeLog 4260 RMD160 7378090b182f69dd38b8343da7449f94dda39720 SHA1 4e41a83c8a8e9fd03931bc3d22010914a1b349c5 SHA256 5479558947929760454e2d3bce8d0ceffb13fa594eca19c1b411be7afb4b598a
 MISC metadata.xml 521 RMD160 9d33fece426f8ae7cc9b73ce9453eabfc41eb35c SHA1 8d3f1536c4b6cc82bed328e6d714fca8b9072cfc SHA256 81070daf140e53eb1261998d7c13c8b1de6f436e7700b042a414ff0897d4aa89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPAxUxAAoJEO+t9ga+3I3aT+8H/R1DScaFJXpkyuedXgT1VSAB
-yiquZlK9IfbGNX/8mNrBJ24R+fXqFwb+8GC+P4E0NS91Kvp8YJNsOjWINNlopWnr
-mt/Sd6cIqx1YVx5y9cQtG9YHZHjyQE2+TxM3JF0+Rw97CmjDfDIG1272MKrbicoK
-6tm/MQoyYfX2iONO46BOfbDcE1hlIcRbcjtO7KAXIx0EyIH47Z80sPRRNFJ55ZZZ
-kXH3ccVHeuYAzZqTbEIklBCtXdecRTRLB3u8NlrhBoqYe560IIVtoOrEVZDpfD7a
-8AVKin/YMZwWPYZsPZ3ruVLCpG7CJoht9aQsxvqYTB+uSs5AM3FhpW6hfcKW4fY=
-=pdZj
+iQEcBAEBCgAGBQJPBZmSAAoJEO+t9ga+3I3abYoH/2XKA6ueH8j81waaOrPicaCO
+ojR16UGa/y+Gsog/gtly6thgozPutqkPMEnKIAPjt84F0SH2kJcCCfkX9TlHKGie
+t/iKxuf08B/ZKCwob9fvDEbQVVlYw00Fn4MX1OrzImtjqh1aieVa2nWDkGZssCd6
+IFD7b0AhbeTeghKO+RdjDE+yeNdHtW6oALrIArAB1zmLTSyhD19NitWqO+RUqWle
+jUeCQYiImAs9Ni5rZIgOXkfCZjoc6DkgmMxmbd2YBQuQ8nYnNXLWEhTyWLO+Zo0H
++tWG7NAl/I+wNSYRgJsY4khM7shCRx07+i4sUsxh0dj53M8NXmPP+ueYJ+7KTys=
+=LmYO
 -----END PGP SIGNATURE-----

diff --git a/media-sound/kwave/kwave-0.8.7.ebuild b/media-sound/kwave/kwave-0.8.7.ebuild
index ddf76bb2373cd593a7f42968fb75cab0d429d0f4..b6acbd119de71b1410756ceb3e47ca1dd9658252 100644 (file)
--- a/media-sound/kwave/kwave-0.8.7.ebuild
+++ b/media-sound/kwave/kwave-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.7.ebuild,v 1.1 2012/01/03 14:48:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.8.7.ebuild,v 1.2 2012/01/05 12:38:06 johu Exp $
 
 EAPI=4
 
@@ -34,7 +34,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        $(add_kdebase_dep kdesdk-misc extras)
-       media-gfx/imagemagick"
+       || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
+"
 
 DOCS=( AUTHORS CHANGES README TODO )