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)

2 files changed, 16 insertions, 13 deletions

diff --git a/x11-themes/tango-icon-theme-extras/ChangeLog b/x11-themes/tango-icon-theme-extras/ChangeLog
index 67b7d10071aa..4d2b5e27728e 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.24 2010/07/08 02:21:20 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/ChangeLog,v 1.25 2012/04/23 05:45:42 ssuominen Exp $
+
+  23 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  tango-icon-theme-extras-0.1.0-r1.ebuild:
+  Force more recent librsvg to ensure rsvg-convert command is available (and
+  use it instead of plain rsvg) wrt #413183 by "nvinson"
 
   08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   tango-icon-theme-extras-0.1.0-r1.ebuild,
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 75d20ce9f92d..2a335d9380a3 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,8 +1,8 @@
-# Copyright 1999-2010 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-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.14 2010/07/08 02:21:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tango-icon-theme-extras/tango-icon-theme-extras-0.1.0-r1.ebuild,v 1.15 2012/04/23 05:45:42 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit autotools eutils gnome2-utils
 
 DESCRIPTION="Tango icons for iPod Digital Audio Player (DAP) devices and the Dell Pocket DJ DAP."
@@ -14,17 +14,20 @@ 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"
 
-RESTRICT="binchecks strip"
-
 RDEPEND=">=x11-themes/tango-icon-theme-0.8.90"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=gnome-base/librsvg-2.12.3
+	>=gnome-base/librsvg-2.34
 	|| ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] )
 	>=x11-misc/icon-naming-utils-0.8.90"
 
+RESTRICT="binchecks strip"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-graphicsmagick.patch
+	sed -i -e '/svgconvert_prog/s:rsvg:&-convert:' configure{,.ac} || die #413183
 	eautoreconf
 }
 
@@ -34,11 +37,6 @@ src_configure() {
 		$(use_enable png icon-framing)
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
 pkg_preinst() { gnome2_icon_savelist; }
 pkg_postinst() { gnome2_icon_cache_update; }
 pkg_postrm() { gnome2_icon_cache_update; }