From: Markos Chandras Date: Fri, 25 Jun 2010 23:34:29 +0000 (+0000) Subject: Fix imagemagick dependency wrt bug #314289 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3edd18e4e216b3822a7da0b9f461c249669ca98e;p=gentoo.git Fix imagemagick dependency wrt bug #314289 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-gfx/smile/ChangeLog b/media-gfx/smile/ChangeLog index c19392cb116b..09326b5bb9c5 100644 --- a/media-gfx/smile/ChangeLog +++ b/media-gfx/smile/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/smile # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/smile/ChangeLog,v 1.5 2010/01/07 12:17:50 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/smile/ChangeLog,v 1.6 2010/06/25 23:34:29 hwoarang Exp $ + + 25 Jun 2010; Markos Chandras smile-1.0.ebuild: + Fix imagemagick dependency wrt bug #314289 07 Jan 2010; smile-1.0.ebuild: migrate to qt4-r2 eclass diff --git a/media-gfx/smile/Manifest b/media-gfx/smile/Manifest index d8b9fca320a0..6ff560405ee4 100644 --- a/media-gfx/smile/Manifest +++ b/media-gfx/smile/Manifest @@ -3,6 +3,6 @@ AUX fix_installation.patch 5070 RMD160 d88450a9e2e1252b95d6180311b5051ef89ed4f7 DIST smile-0.9.10.tar.gz 10484086 RMD160 23dfea19081572e33dc3449d5070ab5965f6d000 SHA1 94f2e8986e8e5df915157b403270b72dd1a31892 SHA256 81e56091b0736f85ecd36f659e1df1d4336a2461b39f956b6f2ca7378675572e DIST smile-1.0.tar.gz 15103785 RMD160 68aa313d418ffb8ef5029f212c4483271128de1f SHA1 d8b962c11d6dac657fd722f2ec1467a159379265 SHA256 d6a6f5a2c7bce2dff174c4cb7f09a6326a926416c1ea47c6bdfc592b9cece9bf EBUILD smile-0.9.10.ebuild 1475 RMD160 d4edbe1cb1c00ea93b2620c3686b15ab20b5106d SHA1 1290aca9adec6801e3db36943ba5a5d8f859edd4 SHA256 12038777187e8c9b93dfb96f01a4aca984f0baabb4319857a4cd1ee56549ac67 -EBUILD smile-1.0.ebuild 1549 RMD160 d63746bec8a6db353e63c19441a9a26ea2872f25 SHA1 91888d4bfa6908cb1e21bc1fb8c5df6662a0ee47 SHA256 eb61c3f4b7f33e21a4fe055a47c8b2b5697791ae53819a0128a747579abcf1be -MISC ChangeLog 906 RMD160 254e2616fccfbc2538bcbd100a9d493a4149e0fb SHA1 76a15308b5c080c1a9aa1587185a34364a5cbbb0 SHA256 d1b590d0bc46cdf98e8c4f3b270ea9b8099b1abc7b5dc576e1c00737d796435d +EBUILD smile-1.0.ebuild 1594 RMD160 91feb633f8aae9db5c661b89b338f22ba59ee469 SHA1 3c847cc54fef4de3c928d68ef3668ba1ef7ca1b7 SHA256 2ddf55ad666d2d3f2d48216308390394600f612dede0992d001a272196de2e24 +MISC ChangeLog 1023 RMD160 e1dbf8f6ff0f67cf7c4492bbbb0b9c85d538f9d9 SHA1 ecf395be054b62299d1b0246e204a55599829829 SHA256 6dfb79c3ae17b7425962d64442e557d7d88477cfc1f872fa3c6cb8a9c7cd7f29 MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba diff --git a/media-gfx/smile/smile-1.0.ebuild b/media-gfx/smile/smile-1.0.ebuild index c861fe0e8282..42bab836a04b 100644 --- a/media-gfx/smile/smile-1.0.ebuild +++ b/media-gfx/smile/smile-1.0.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/media-gfx/smile/smile-1.0.ebuild,v 1.2 2010/01/07 12:17:50 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/smile/smile-1.0.ebuild,v 1.3 2010/06/25 23:34:29 hwoarang Exp $ EAPI="2" LANGS="de en it pl pt ru" @@ -21,7 +21,7 @@ DEPEND="media-sound/sox x11-libs/qt-gui:4[debug?] x11-libs/qt-opengl:4[debug?] x11-libs/qt-webkit:4[debug?] - media-gfx/imagemagick" + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )" RDEPEND="${DEPEND}" PATCHES=(