Use "rsvg-convert" instead of "rsvg" for compability with recent librsvg wrt #423179

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

2 files changed, 24 insertions, 18 deletions

diff --git a/x11-themes/tangerine-icon-theme/ChangeLog b/x11-themes/tangerine-icon-theme/ChangeLog
index ba526ad13063..6d10ec797474 100644
--- a/x11-themes/tangerine-icon-theme/ChangeLog
+++ b/x11-themes/tangerine-icon-theme/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/tangerine-icon-theme
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.26 2012/07/02 06:48:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/ChangeLog,v 1.27 2012/07/02 06:54:35 ssuominen Exp $
+
+  02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  tangerine-icon-theme-0.27.ebuild:
+  Use "rsvg-convert" instead of "rsvg" for compability with recent librsvg wrt
+  #423179
 
   02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   -tangerine-icon-theme-0.26.ebuild:
diff --git a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
index 5a420b776da3..2356a5ed1260 100644
--- a/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
+++ b/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild,v 1.7 2012/03/17 18:00:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/tangerine-icon-theme/tangerine-icon-theme-0.27.ebuild,v 1.8 2012/07/02 06:54:35 ssuominen Exp $
 
-EAPI=3
+EAPI=4
 inherit gnome2-utils
 
 DESCRIPTION="a derivative of the standard Tango theme, using a more orange approach"
@@ -13,16 +13,22 @@ SRC_URI="mirror://ubuntu/pool/universe/t/${PN}/${PN}_${PV}.tar.gz
 LICENSE="CCPL-Attribution-ShareAlike-2.5 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( kde-base/oxygen-icons x11-themes/gnome-icon-theme )"
-DEPEND="gnome-base/librsvg
-	>=x11-misc/icon-naming-utils-0.8.90
-	dev-util/intltool
-	sys-devel/gettext"
+IUSE="minimal"
 
 RESTRICT="binchecks strip"
 
+RDEPEND="!minimal? ( || ( x11-themes/gnome-icon-theme kde-base/oxygen-icons ) )"
+DEPEND="dev-util/intltool
+	>=gnome-base/librsvg-2.34
+	sys-devel/gettext
+	>=x11-misc/icon-naming-utils-0.8.90"
+
+DOCS="AUTHORS README"
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+}
+
 src_prepare() {
 	sed -i \
 		-e 's:lib/icon-naming-utils/icon:libexec/icon:' \
@@ -32,18 +38,13 @@ src_prepare() {
 
 	local res
 	for res in 16 22 32; do
-		rsvg -w ${res} -h ${res} scalable/places/start-here.svg \
-			${res}x${res}/places/start-here.png || die
+		rsvg-convert -w ${res} -h ${res} scalable/places/start-here.svg \
+			> ${res}x${res}/places/start-here.png || die
 	done
 }
 
 src_compile() {
-	emake index.theme || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
+	emake index.theme
 }
 
 pkg_preinst() { gnome2_icon_savelist; }