From d1d25cf11647c9b2a8319e6a0586ab79684c2fb4 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 8 Jul 2010 02:21:20 +0000 Subject: Fix imagemagick vs. graphicsmagick depend wrt #314423 by Wojciech Porczyk. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- .../tango-icon-theme-extras-0.1.0-r1.ebuild | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild') diff --git a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild index 39d9ca5acdeb..75d20ce9f92d 100644 --- a/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild +++ b/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.13 2010/02/24 14:12:14 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.14 2010/07/08 02:21:20 ssuominen Exp $ EAPI=2 -inherit eutils gnome2-utils +inherit autotools eutils gnome2-utils DESCRIPTION="Tango icons for iPod Digital Audio Player (DAP) devices and the Dell Pocket DJ DAP." HOMEPAGE="http://tango.freedesktop.org" @@ -16,12 +16,17 @@ IUSE="png" RESTRICT="binchecks strip" -RDEPEND=">=x11-misc/icon-naming-utils-0.6.0 - >=gnome-base/librsvg-2.12.3 - >=x11-themes/tango-icon-theme-0.8" +RDEPEND=">=x11-themes/tango-icon-theme-0.8.90" DEPEND="${RDEPEND} - media-gfx/imagemagick[png?] - dev-util/pkgconfig" + dev-util/pkgconfig + >=gnome-base/librsvg-2.12.3 + || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) + >=x11-misc/icon-naming-utils-0.8.90" + +src_prepare() { + epatch "${FILESDIR}"/${P}-graphicsmagick.patch + eautoreconf +} src_configure() { econf \ -- cgit v1.2.3-65-gdbad