Version bump. Lots of bugfixes.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 18 insertions, 80 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 00e7a9e8d4f7..a49b8d258e97 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.209 2010/05/08 15:00:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.210 2010/05/14 20:47:01 eva Exp $
+
+  14 May 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -librsvg-2.22.3.ebuild, librsvg-2.26.3.ebuild:
+  Version bump. Lots of bugfixes.
 
 *librsvg-2.26.3 (08 May 2010)
 
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index deabea7cc969..bfad2bb8a841 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -3,20 +3,18 @@ Hash: SHA1
 
 AUX librsvg-2.22.3-fix-segfault-with-firefox.patch 538 RMD160 e52da5a491d8b2a93b264a4d79b8a19307635dce SHA1 b773d7e022725f8bdc00707bfb8b5a3098d8e1a5 SHA256 bcd27c5d3662525cbc9df31c0f3bd4c36d7dc85c7ee867f9dd129cce233db2d7
 AUX librsvg-2.26.2-choosable-tools.patch 2372 RMD160 e1b842cd8eab8bec5affa8ad6dc12fc12bdd5311 SHA1 d6861edc02adaa50a40cb14a979dc1f51a332757 SHA256 6b29bd95e6c61619cd6cde778a38149db318e21315457b6ab7637d4ce1de0f7a
-DIST librsvg-2.22.3.tar.bz2 491576 RMD160 54c834fbfb028b98f699bfeec94cd411b2d3f7bb SHA1 032f8142b1e41e07740cd91030b1873a0b9c42d2 SHA256 63f7cc948b60447c76e6797a2d521cba308ed42c673bd4b2212e1f0b4cd60f0a
 DIST librsvg-2.26.0.tar.bz2 477499 RMD160 9e8197519e4e48f736e6bb65d2993478b0f64451 SHA1 61044be4bcd5945f5711f788e1aa303a80b69e32 SHA256 fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea
 DIST librsvg-2.26.2.tar.bz2 485744 RMD160 701d82a76a384aedb3ab1dcf7be589149ab456b8 SHA1 3c529b5e28a8924fa95d74814dd63b53182c903c SHA256 e82fb920901e211a54cff5df88c327bedec8565b324e2f529f428f492361c60f
 DIST librsvg-2.26.3.tar.bz2 511876 RMD160 14f51ae7997d8137e618ee117ef7980fc0ffe52c SHA1 ef0063eaa9e638364cc8ff142aadef8a267b7af5 SHA256 c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5
-EBUILD librsvg-2.22.3.ebuild 1579 RMD160 5138015365adf25c32ced9b058256de28d471bfd SHA1 5d6be0136f05c276e556a161e12ab26e5a57a176 SHA256 6ee5ba5e1f51b741c82e24388b0eabf7e5456c25c28c7b01b2aac059685893ba
 EBUILD librsvg-2.26.0.ebuild 1888 RMD160 875bacded459c11c7cdb6da8553141bb6e8b650f SHA1 7f500d61a7c198923526d3f8c90230dcfc56f0b7 SHA256 e2b42e4b7acc7db9105e0ca03c580f391338062d8fbd56da59b2cf952ae8c07e
 EBUILD librsvg-2.26.2.ebuild 1982 RMD160 b6602cf9c038bc068246e02c175702b64f932571 SHA1 6e9e54eee2bf43bed887797a8a0bad8da7544bce SHA256 19c01899a689483b39377452ceba64be871e46fd9f327a060c09806d6a07a969
-EBUILD librsvg-2.26.3.ebuild 1741 RMD160 8abd8e98c6dc161f9bad3adc5b5406c971a6f3dc SHA1 8badce688aecf2a398781c5dde64750743eaf721 SHA256 8eab502934fa98a7f3dd88da48a19b60b887b8573cb8a2978179e9f34c8d4b62
-MISC ChangeLog 26268 RMD160 0a2ee1d958d098cc24ef1a7404b4428d12cf8d85 SHA1 fe9b789b997aec29de4cce9e2c22a942decb2117 SHA256 9e797d98429923818c539d214256d826425be255248a734dfa8d2a0871fba612
+EBUILD librsvg-2.26.3.ebuild 1684 RMD160 f6165313d272838da5ed88ea0feb5c9943e5a2e9 SHA1 44a1b5e473da7ca5f8da39102895230bb687e4b8 SHA256 2fbafe2e19d7fab02fa934814534b07191efa0059df03f5dddae2be3d5c33abd
+MISC ChangeLog 26404 RMD160 539fbc60ea8b365ee045add5e8e5d8d9f844d792 SHA1 6dd3e5d711c7267f9fa11fc163ad25c37c0ff986 SHA256 f1321561d61e67a4a79efca0f2f85931862c2ab2e5fe289106b69988f357cc4e
 MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvlfH8ACgkQCaWpQKGI+9TT4ACfRHyQDU4qgqncmxepOFcW5D+h
-UOoAnjPzch2E3YWPNT0JBFBJWkRYcuLi
-=rnvh
+iEYEARECAAYFAkvttsoACgkQ1fmVwcYIWAZyhACfcJtQ1swu/ngJSX6mqMDruXRo
+cCwAoI1yxr9gBr7ryg6HCs1sgyRQtovh
+=YqZA
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.22.3.ebuild b/gnome-base/librsvg/librsvg-2.22.3.ebuild
deleted file mode 100644
index d585e943c93c..000000000000
--- a/gnome-base/librsvg/librsvg-2.22.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.22.3.ebuild,v 1.10 2009/04/28 10:55:32 armin76 Exp $
-
-inherit gnome2 multilib
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="http://librsvg.sourceforge.net/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc zlib"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.15.4
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.10
-	>=dev-libs/libxml2-2.4.7
-	>=dev-libs/libcroco-0.6.1
-	zlib? ( >=gnome-extra/libgsf-1.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-pkg_setup() {
-	# FIXME: USEify mozilla support (?)
-	# croco is forced on to respect SVG specification
-	G2CONF="${G2CONF}
-		$(use_with zlib svgz)
-		--disable-mozilla-plugin
-		--with-croco
-		--enable-pixbuf-loader
-		--enable-gtk-theme"
-}
-
-set_gtk_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${ROOT}etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR="${GTK2_CONFDIR:-/etc/gtk-2.0}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove gdk-pixbuf loaders (#47766)
-	rm -fr "${D}/etc"
-}
-
-pkg_postinst() {
-	set_gtk_confdir
-	gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-}
-
-pkg_postrm() {
-	set_gtk_confdir
-	gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-}
diff --git a/gnome-base/librsvg/librsvg-2.26.3.ebuild b/gnome-base/librsvg/librsvg-2.26.3.ebuild
index 2b69ba41c4cc..ca6833cbed71 100644
--- a/gnome-base/librsvg/librsvg-2.26.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.26.3.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.3.ebuild,v 1.1 2010/05/08 15:00:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.3.ebuild,v 1.2 2010/05/14 20:47:01 eva Exp $
 
-inherit eutils gnome2 multilib
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
@@ -24,12 +27,14 @@ RDEPEND=">=media-libs/fontconfig-1.0.1
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12
 	doc? ( >=dev-util/gtk-doc-1 )"
+# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf, feel free to drop it when not run it
 
 DOCS="AUTHORS ChangeLog README NEWS TODO"
 
 pkg_setup() {
 	# croco is forced on to respect SVG specification
 	G2CONF="${G2CONF}
+		--disable-static
 		$(use_enable tools)
 		$(use_with zlib svgz)
 		--with-croco
@@ -37,13 +42,6 @@ pkg_setup() {
 		--enable-gtk-theme"
 }
 
-src_unpack() {
-	gnome2_src_unpack
-
-	# gcc-4.3.2-r3 related segfault with various apps like firefox -- bug 239992
-	epatch "${FILESDIR}/${PN}-2.22.3-fix-segfault-with-firefox.patch"
-}
-
 set_gtk_confdir() {
 	# An arch specific config directory is used on multilib systems
 	has_multilib_profile && GTK2_CONFDIR="${ROOT}etc/gtk-2.0/${CHOST}"