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

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

4 files changed, 45 insertions, 10 deletions

diff --git a/x11-themes/tango-icon-theme-extras/ChangeLog b/x11-themes/tango-icon-theme-extras/ChangeLog
index 2c1476df7bdb..67b7d10071aa 100644
--- a/x11-themes/tango-icon-theme-extras/ChangeLog
+++ b/x11-themes/tango-icon-theme-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/tango-icon-theme-extras
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.23 2010/02/24 14:12:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.24 2010/07/08 02:21:20 ssuominen Exp $
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  tango-icon-theme-extras-0.1.0-r1.ebuild,
+  +files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch:
+  Fix imagemagick vs. graphicsmagick depend wrt #314423 by Wojciech Porczyk.
 
   24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   tango-icon-theme-extras-0.1.0-r1.ebuild:
diff --git a/x11-themes/tango-icon-theme-extras/Manifest b/x11-themes/tango-icon-theme-extras/Manifest
index b6b2092647d0..d7e61e246e77 100644
--- a/x11-themes/tango-icon-theme-extras/Manifest
+++ b/x11-themes/tango-icon-theme-extras/Manifest
@@ -1,4 +1,5 @@
+AUX tango-icon-theme-extras-0.1.0-graphicsmagick.patch 823 RMD160 b5d0f5a15f021eaa2781724b36bbafb70b6c0e06 SHA1 570b52dcd4fd66925bb299b4f8df2e982f2b9ba7 SHA256 2fd66f361053cad95daebe07522fa017d8fe16833e2c968d1b1696a47659bf99
 DIST tango-icon-theme-extras-0.1.0.tar.gz 228375 RMD160 7c301bbe6748fc770bc52f91624ce676624d00e3 SHA1 1bed3023139187c36e851df19506f4942bf2d1c1 SHA256 b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
-EBUILD tango-icon-theme-extras-0.1.0-r1.ebuild 1227 RMD160 36304d6015cb5c6bc61013d66c9b8665b87649f0 SHA1 8b0d4254472cb7effdfe4bbb143b00d5e77e19f7 SHA256 84f072a948cb43195280c055c0af6497474a9f825899ae61ea1c0a581327fb85
-MISC ChangeLog 3137 RMD160 53d61901604cff0e21b77b46233846c21890bf3a SHA1 591247729bbf051aff57bf845c20955953bb445d SHA256 b1f7a71ed4a66c9583054b3ff6dcdfe1a02ecca2d369e68b6b8597e907a32c9a
+EBUILD tango-icon-theme-extras-0.1.0-r1.ebuild 1371 RMD160 4b158061ed632a556378b4b8c6bcc4199035f769 SHA1 14114ac1bd3fa8e16b69458669b92e82e6076b34 SHA256 24c33169dbae1687f3e15f233da82f16e9ca34627728808758196ae29edf9d16
+MISC ChangeLog 3373 RMD160 6970887589cfbf31fef0c5525a1c6d2d5f62a006 SHA1 5b378c4e5c829f668dc15f81948816e0504a5315 SHA256 104caa719b33b726e7f90d2a24834f6d4686a1f4818bf6471200ea446b374bbb
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
diff --git a/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch
new file mode 100644
index 000000000000..446d42c8f433
--- /dev/null
+++ b/x11-themes/tango-icon-theme-extras/files/tango-icon-theme-extras-0.1.0-graphicsmagick.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/314423
+
+--- configure.ac
++++ configure.ac
+@@ -39,9 +39,6 @@
+ AM_CONDITIONAL(ENABLE_ICON_FRAMING, test x$enable_framing = xyes)
+ 
+ if test "x$enable_framing" = "xyes"; then
+-   PKG_CHECK_EXISTS([ImageMagick >= 5.5.7],
+-                    [enable_framing=yes], [enable_framing=no])
+-   if test "x$enable_framing" = "xyes"; then
+       AC_PATH_PROG(CONVERT, convert)
+       if test -z "$CONVERT"; then
+       	 AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme])
+@@ -50,9 +47,6 @@
+       # Add the command line options we need here
+       CONVERT="$CONVERT -bordercolor Transparent -border 1x1"
+       AC_SUBST(CONVERT)
+-   else
+-      AC_MSG_ERROR([ImageMagick is required to build tango-icon-theme])
+-   fi
+ fi
+ 
+ # Check for rsvg or ksvgtopng for creating large scale bitmaps from svg
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 \