Version bump. Lots of bugfixes.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 12 insertions, 72 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/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}"