diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 02:21:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 02:21:20 +0000 |
| commit | f121421ab4c591c7fc4e6a31c08b91e6bcc3906b (patch) | |
| tree | f3b5c65fcbcd7b1df846aae03bf9cebaceca1312 /x11-themes | |
| parent | changed the live ebuild to refer to gentoo's repository (diff) | |
| download | gentoo-2-f121421ab4c591c7fc4e6a31c08b91e6bcc3906b.tar.gz gentoo-2-f121421ab4c591c7fc4e6a31c08b91e6bcc3906b.tar.bz2 gentoo-2-f121421ab4c591c7fc4e6a31c08b91e6bcc3906b.zip | |
Fix imagemagick vs. graphicsmagick depend wrt #314423 by Wojciech Porczyk.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes')
3 files changed, 42 insertions, 8 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/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 \ |