summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-05-30 10:36:38 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-05-30 10:36:38 +0000
commitdc7af8960d5828ee3f00942ba5ef7cf7b71413aa (patch)
tree06e4410631c2aa0aea9771d9bd2ba6cc79d5357a /x11-themes/tangerine-icon-theme
parentFix sedding of $MAKE in qt 4.5, bug 321335 (again). (diff)
downloadgentoo-2-dc7af8960d5828ee3f00942ba5ef7cf7b71413aa.tar.gz
gentoo-2-dc7af8960d5828ee3f00942ba5ef7cf7b71413aa.tar.bz2
gentoo-2-dc7af8960d5828ee3f00942ba5ef7cf7b71413aa.zip
Fix imagemagick dependencies wrt bug #314419
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes/tangerine-icon-theme')
-rw-r--r--x11-themes/tangerine-icon-theme/ChangeLog6
-rw-r--r--x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-themes/tangerine-icon-theme/ChangeLog b/x11-themes/tangerine-icon-theme/ChangeLog
index 8c7a3c761eeb..22ba1bdf71bf 100644
--- a/x11-themes/tangerine-icon-theme/ChangeLog
+++ b/x11-themes/tangerine-icon-theme/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-themes/tangerine-icon-theme
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.19 2010/04/02 15:40:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.20 2010/05/30 10:36:38 hwoarang Exp $
+
+ 30 May 2010; Markos Chandras <hwoarang@gentoo.org>
+ tangerine-icon-theme-0.26.ebuild:
+ Fix imagemagick dependencies wrt bug #314419
02 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
tangerine-icon-theme-0.27.ebuild:
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
index 509f4dc0fbc2..724ebf1a2c02 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.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/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.7 2010/04/02 15:42:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.26.ebuild,v 1.8 2010/05/30 10:36:38 hwoarang Exp $
EAPI=2
inherit autotools gnome2-utils
@@ -17,7 +17,7 @@ IUSE="png"
RDEPEND=">=x11-themes/gnome-icon-theme-2.24"
DEPEND=">=gnome-base/librsvg-2.12.3
- media-gfx/imagemagick[png?]
+ || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png] )
>=x11-misc/icon-naming-utils-0.8.2
dev-util/pkgconfig
dev-util/intltool