Fix imagemagick vs. graphicsmagick depend wrt #314421 by Wojciech Porczyk.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 18 insertions, 22 deletions

diff --git a/x11-themes/tango-icon-theme/ChangeLog b/x11-themes/tango-icon-theme/ChangeLog
index eeb6b50bf355..c2c4f60e0fed 100644
--- a/x11-themes/tango-icon-theme/ChangeLog
+++ b/x11-themes/tango-icon-theme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/tango-icon-theme
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.51 2010/01/06 19:43:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.52 2010/07/08 02:01:01 ssuominen Exp $
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  tango-icon-theme-0.8.90.ebuild:
+  Fix imagemagick vs. graphicsmagick depend wrt #314421 by Wojciech Porczyk.
 
   06 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   tango-icon-theme-0.8.90.ebuild:
diff --git a/x11-themes/tango-icon-theme/Manifest b/x11-themes/tango-icon-theme/Manifest
index b53cae4fde4b..244822005be9 100644
--- a/x11-themes/tango-icon-theme/Manifest
+++ b/x11-themes/tango-icon-theme/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST tango-icon-theme-0.8.90.tar.gz 1790489 RMD160 5accc7a4741e6acc8d89de59100f31a10206587c SHA1 acdfbf3749885d36349263188334f6d6be405acc SHA256 6e98d8032d57d818acc907ec47e6a718851ff251ae7c29aafb868743eb65c88e
-EBUILD tango-icon-theme-0.8.90.ebuild 1221 RMD160 677e649e35378813c418c855b9b832b60fc1e92b SHA1 b6c6a6b11152c168685a74dcc0a5604f728585e6 SHA256 bb0d09166cc37789d9d3fcb122b09bdf9b25b80006a953a1e8c3fd057662bf1b
-MISC ChangeLog 6530 RMD160 526ca3b71d97b3a3f1f501a3de46eb888f982e1a SHA1 e584a96a1554a8696c50a90f4cc6b5af26a5684b SHA256 d02953e5ac7c0114afc3578acbe2936de36404be93d2735328e4e24913f41991
+EBUILD tango-icon-theme-0.8.90.ebuild 1259 RMD160 f280d89c26cce970348a36143cc9d68b58c062af SHA1 77e050e2626515c1aac9beafbd02d6bf48f738f7 SHA256 24e3d13fa872f519938b89c3328ae84c93d28b5a1a6adb0f5de714daf2e953c0
+MISC ChangeLog 6700 RMD160 2453d4c2414a9036daa9a481754c19d2033b7aa9 SHA1 079d31c90356b6fb15d0b5455fd6b27cd8b84fd0 SHA256 cebcbbc9e16ca1c8be5bfd6381f5badefe23ee2d5fb555088cb1877174aa6814
 MISC metadata.xml 239 RMD160 43d9aecb8e923b569a18ae6e5aab55ef9438394a SHA1 6a98c4a7d62e030d70f279a318b00dc1079a56f6 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktE594ACgkQNQqtfCuFneN7SgCfYprMciajk6TCavD7N1k8FD9d
-VOgAnA6N1zAD+KEBdg8K/68pinr2p5ov
-=jo42
------END PGP SIGNATURE-----
diff --git a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
index 675268e8540e..6d62c16374e7 100644
--- a/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild
+++ b/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.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/tango-icon-theme/tango-icon-theme-0.8.90.ebuild,v 1.9 2010/01/06 19:43:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild,v 1.10 2010/07/08 02:01:01 ssuominen Exp $
 
 EAPI=2
 inherit gnome2-utils
@@ -14,24 +14,26 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png"
 
-RDEPEND=">=x11-misc/icon-naming-utils-0.8.90
-	media-gfx/imagemagick[png?]
-	>=gnome-base/librsvg-2.12.3
-	>=x11-themes/hicolor-icon-theme-0.9"
+RDEPEND=">=x11-themes/hicolor-icon-theme-0.12"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	dev-util/intltool
-	sys-devel/gettext"
+	dev-util/pkgconfig
+	>=gnome-base/librsvg-2.12.3
+	|| ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] )
+	sys-devel/gettext
+	>=x11-misc/icon-naming-utils-0.8.90"
+
 RESTRICT="binchecks strip"
 
 src_configure() {
-	econf $(use_enable png png-creation) \
+	econf \
+		$(use_enable png png-creation) \
 		$(use_enable png icon-framing)
 }
 
 src_install() {
 	addwrite /root/.gnome2
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README
 }