Version bump, drop old.

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

2 files changed, 41 insertions, 22 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 8623f97d891e..ce0465cfec7e 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.273 2012/04/12 18:42:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.274 2012/04/20 08:14:46 tetromino Exp $
+
+*librsvg-2.36.1 (20 Apr 2012)
+
+  20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -librsvg-2.34.1.ebuild, +librsvg-2.36.1.ebuild:
+  Version bump, drop old.
 
   12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   librsvg-2.36.0.ebuild:
diff --git a/gnome-base/librsvg/librsvg-2.34.1.ebuild b/gnome-base/librsvg/librsvg-2.36.1.ebuild
index d3db6c3d5c7f..7631b2a7b719 100644
--- a/gnome-base/librsvg/librsvg-2.34.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.36.1.ebuild
@@ -1,55 +1,68 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.1.ebuild,v 1.7 2011/10/09 09:43:47 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.1.ebuild,v 1.1 2012/04/20 08:14:46 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
 
-inherit gnome2 multilib eutils autotools
+inherit autotools eutils gnome2 multilib
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk tools"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +gtk +introspection tools"
 
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=dev-libs/glib-2.24:2
+RDEPEND=">=dev-libs/glib-2.24:2
 	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.10
-	>=dev-libs/libxml2-2.4.7:2
+	>=x11-libs/pango-1.16
+	>=dev-libs/libxml2-2.7:2
 	>=dev-libs/libcroco-0.6.1
-	|| ( x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )
-	gtk? ( >=x11-libs/gtk+-2.16:2 )"
+	x11-libs/gdk-pixbuf:2[introspection?]
+	gtk? (
+		>=x11-libs/gtk+-2.16:2
+		tools? ( >=x11-libs/gtk+-3:3 ) )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12
 	doc? ( >=dev-util/gtk-doc-1.13 )
+
+	dev-libs/gobject-introspection-common
 	>=dev-util/gtk-doc-am-1.13"
-# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf
+# >=gtk-doc-am-1.13 and gobject-introspection-common needed by eautoreconf
 
 pkg_setup() {
-	# croco is forced on to respect SVG specification
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable tools)
 		$(use_enable gtk gtk-theme)
-		--with-croco
-		--enable-pixbuf-loader
-		--with-gtk=2.0"
+		$(use_enable introspection)
+		--enable-pixbuf-loader"
+	if use gtk && use tools; then
+		G2CONF="${G2CONF} --enable-rsvg-view"
+	else
+		G2CONF="${G2CONF} --disable-rsvg-view"
+	fi
+
 	DOCS="AUTHORS ChangeLog README NEWS TODO"
 }
 
 src_prepare() {
-	gnome2_src_prepare
+	# Make rsvg-view non-automagic
+	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
 
-	# Fix automagic gtk+ dependency, bug #371290
-	epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch"
 	eautoreconf
+	gnome2_src_prepare
+}
+
+src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
 }
 
 pkg_postinst() {