summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-23 05:19:26 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-23 05:19:26 +0000
commitf4e6f83d46c98fdac51c531cb5c698426d68c3a0 (patch)
tree1e212a36c8a45d514e31fa0a6b1a1af9182e45c2 /x11-themes
parentVersion bump (diff)
downloadgentoo-2-f4e6f83d46c98fdac51c531cb5c698426d68c3a0.tar.gz
gentoo-2-f4e6f83d46c98fdac51c531cb5c698426d68c3a0.tar.bz2
gentoo-2-f4e6f83d46c98fdac51c531cb5c698426d68c3a0.zip
Force more recent librsvg to ensure rsvg-convert command is available (and use it instead of plain rsvg) wrt #413183 by "nvinson"
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/tango-icon-theme/ChangeLog9
-rw-r--r--x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild17
2 files changed, 18 insertions, 8 deletions
diff --git a/x11-themes/tango-icon-theme/ChangeLog b/x11-themes/tango-icon-theme/ChangeLog
index 4fed31ec7ca1..2f1469816009 100644
--- a/x11-themes/tango-icon-theme/ChangeLog
+++ b/x11-themes/tango-icon-theme/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-themes/tango-icon-theme
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.55 2011/06/15 08:32:30 mduft Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/ChangeLog,v 1.56 2012/04/23 05:19:26 ssuominen Exp $
+
+ 23 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+ tango-icon-theme-0.8.90.ebuild:
+ Force more recent librsvg to ensure rsvg-convert command is available (and
+ use it instead of plain rsvg) wrt #413183 by "nvinson"
15 Jun 2011; Markus Duft <mduft@gentoo.org> tango-icon-theme-0.8.90.ebuild:
add ~x86-interix prefix keyword
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 bda3c0b10073..d620ebab55b3 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,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.13 2011/06/15 08:32:30 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme/tango-icon-theme-0.8.90.ebuild,v 1.14 2012/04/23 05:19:26 ssuominen Exp $
-EAPI=2
+EAPI=4
inherit gnome2-utils
DESCRIPTION="SVG and PNG icon theme from the Tango project"
@@ -18,13 +18,19 @@ RDEPEND=">=x11-themes/hicolor-icon-theme-0.12"
DEPEND="${RDEPEND}
dev-util/intltool
dev-util/pkgconfig
- >=gnome-base/librsvg-2.12.3
+ >=gnome-base/librsvg-2.34
|| ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] )
sys-devel/gettext
>=x11-misc/icon-naming-utils-0.8.90"
RESTRICT="binchecks strip"
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ sed -i -e '/svgconvert_prog/s:rsvg:&-convert:' configure || die #413183
+}
+
src_configure() {
econf \
$(use_enable png png-creation) \
@@ -33,8 +39,7 @@ src_configure() {
src_install() {
addwrite /root/.gnome2
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README
+ default
}
pkg_preinst() { gnome2_icon_savelist; }