Fix imagemagick dependencies wrt bug #314235

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

diff --git a/app-text/pdf2oo/ChangeLog b/app-text/pdf2oo/ChangeLog
index 8d903f4d64e657f15fcc4f2702e48b0d7cf4628d..0fdec517d6b99e3219b75cf4cd49c2d3dc28823f 100644 (file)
--- a/app-text/pdf2oo/ChangeLog
+++ b/app-text/pdf2oo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/pdf2oo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2oo/ChangeLog,v 1.8 2010/03/28 04:00:06 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2oo/ChangeLog,v 1.9 2010/06/15 16:19:24 hwoarang Exp $
+
+  15 Jun 2010; Markos Chandras <hwoarang@gentoo.org> pdf2oo-20090715.ebuild:
+  Fix imagemagick dependencies wrt bug #314235
 
   28 Mar 2010; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
   Drop myself from metadata, add maintainer-needed

diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
index 7e9afb7cc7c007800d163989b7e877e45bd96a8a..fd930338debeb323063619273ebda71be69cae4b 100644 (file)
--- a/app-text/pdf2oo/Manifest
+++ b/app-text/pdf2oo/Manifest
@@ -1,4 +1,4 @@
 DIST pdf2oo-20090715.tar.gz 14765 RMD160 c861782582c7716c8eb17f78e321c5b7851bd045 SHA1 7adf828be3a901018fcc9259ca1cf3e5856ab302 SHA256 e779e80f5c052dc7d3ccf5baf2dae81353c3f56b376cbd633bbb608979450df8
-EBUILD pdf2oo-20090715.ebuild 592 RMD160 4c5327e226a1c3554432a425c338ca7b4b640570 SHA1 ae4ddc8ceecc62e6b4be24a64636717baf2b6693 SHA256 4081bcaa8afde4289412df5a3edf0469bd112871388c9b51c25a6fc97c5260c8
-MISC ChangeLog 1070 RMD160 e8d6f569bf8f6461829117c5038a5c101751087e SHA1 14bac691e2241c3978f5fea527ad77863e3d0c63 SHA256 5fc85d3d3153d69e49e734cc3e62fd3c6009c11c6b71693e358c84ac884eccb8
+EBUILD pdf2oo-20090715.ebuild 636 RMD160 ccf4cb64dc8832d21013add18ce49807d56029df SHA1 63696ce2e34ae7d5bfe2e906e252e21cc729c26e SHA256 c33729c3fd603643fdd199704dcef65bcebc23c971442133c9c493de7f11e3cc
+MISC ChangeLog 1195 RMD160 a6c84358469a64aa465fa183e096fb9f4f36b81e SHA1 cfc8176a3e32b769bc0746098180db4fc1c53496 SHA256 b41deee289cf8b61cf061b02c909ff0b2c80a2b940537edd951b257ca4557561
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b

diff --git a/app-text/pdf2oo/pdf2oo-20090715.ebuild b/app-text/pdf2oo/pdf2oo-20090715.ebuild
index 829d59b35ec6c4e8b9f9c1c0b05ce672ddba2104..6e652f169a4bf499860f1debfd4df225a44961da 100644 (file)
--- a/app-text/pdf2oo/pdf2oo-20090715.ebuild
+++ b/app-text/pdf2oo/pdf2oo-20090715.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/pdf2oo/pdf2oo-20090715.ebuild,v 1.6 2010/02/10 22:13:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2oo/pdf2oo-20090715.ebuild,v 1.7 2010/06/15 16:19:24 hwoarang Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-arch/zip
-       media-gfx/imagemagick
+       || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
        >=app-text/poppler-0.12.3-r3[utils]"
 
 S=${WORKDIR}/${PN}