diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 02:01:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 02:01:01 +0000 |
| commit | b01ab0bbed078e8e0de878f724b97eac86663ecd (patch) | |
| tree | f9a0dfd186f0c31077a4ae3358d99f413e607d12 /x11-themes | |
| parent | ppc64 stable wrt #319965 (diff) | |
| download | gentoo-2-b01ab0bbed078e8e0de878f724b97eac86663ecd.tar.gz gentoo-2-b01ab0bbed078e8e0de878f724b97eac86663ecd.tar.bz2 gentoo-2-b01ab0bbed078e8e0de878f724b97eac86663ecd.zip | |
Fix imagemagick vs. graphicsmagick depend wrt #314421 by Wojciech Porczyk.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes')
| -rw-r--r-- | x11-themes/tango-icon-theme/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild | 20 |
2 files changed, 16 insertions, 10 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/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 } |