Force more recent librsvg to ensure rsvg-convert command is available (and use it instead of plain rsvg) wrt #413183 by "nvinson"

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 32 insertions, 15 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/Manifest b/x11-themes/tango-icon-theme-extras/Manifest
index d7e61e246e77..a98b8177ea59 100644
--- a/x11-themes/tango-icon-theme-extras/Manifest
+++ b/x11-themes/tango-icon-theme-extras/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tango-icon-theme-extras-0.1.0-graphicsmagick.patch 823 RMD160 b5d0f5a15f021eaa2781724b36bbafb70b6c0e06 SHA1 570b52dcd4fd66925bb299b4f8df2e982f2b9ba7 SHA256 2fd66f361053cad95daebe07522fa017d8fe16833e2c968d1b1696a47659bf99
 DIST tango-icon-theme-extras-0.1.0.tar.gz 228375 RMD160 7c301bbe6748fc770bc52f91624ce676624d00e3 SHA1 1bed3023139187c36e851df19506f4942bf2d1c1 SHA256 b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
-EBUILD tango-icon-theme-extras-0.1.0-r1.ebuild 1371 RMD160 4b158061ed632a556378b4b8c6bcc4199035f769 SHA1 14114ac1bd3fa8e16b69458669b92e82e6076b34 SHA256 24c33169dbae1687f3e15f233da82f16e9ca34627728808758196ae29edf9d16
-MISC ChangeLog 3373 RMD160 6970887589cfbf31fef0c5525a1c6d2d5f62a006 SHA1 5b378c4e5c829f668dc15f81948816e0504a5315 SHA256 104caa719b33b726e7f90d2a24834f6d4686a1f4818bf6471200ea446b374bbb
+EBUILD tango-icon-theme-extras-0.1.0-r1.ebuild 1393 RMD160 1fd24ba12dcdc8985b4e024ebd38f1f03612ebe6 SHA1 3eba5a759103790134e60b98daa6d0ca7ae18d8f SHA256 bfb13ed29b2b7bdc7d1f0475e5b52ec3f9959c92237e8f541ed0c700c362fdaf
+MISC ChangeLog 3605 RMD160 2a98c485a3485c0ff4cee69f1da9510452aa7555 SHA1 7c79e4435bbc07c11b34e936f6f6934c362d280c SHA256 77ddee2f948455dabb81cdcc8c338586260ee2979aaf44567a6a06384c5a0fbe
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPlOwoAAoJEEdUh39IaPFN8MYIAJNGqPHdSoHPTq/vMcB6zvmv
++4WTVLn3zKIEpJ0Zj+wwkfm9sMJIgTHQVFKCAKHjv/4hcAz0s+VwCBSzwwC1adOm
+Per/FxFcKgDVYRm5IyMhztP+ujyiZJWSp/zSjUWC4zVaT7OHpujhV/wx7jLoYklI
+IcY/A1kefdKwyukfIknTRXEkFyDgM3mJG1F5OLFgpmMMc1/SoRXrB22PAjTSZK57
+RSeIK1IFlbpaqJ/4u3S4aRzoG9R+5QaxhCDXOV4FKmYUuaF4fuDvbYyc/dBZK50I
+lZQN74ntHESIoEM5CjaVQANyabmtPRLDL1FszTVFpngKnO9pV2ZvfYZ7U95U4qs=
+=z5Sp
+-----END PGP SIGNATURE-----
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; }