Version bump, remove old.

(Portage version: 2.1.10.36/cvs/Linux x86_64)

4 files changed, 23 insertions, 90 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index bd5d190c7d2b..475f5e78a1c8 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.256 2011/10/30 16:16:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.257 2011/11/20 16:06:18 pacho Exp $
+
+*librsvg-2.34.2 (20 Nov 2011)
+
+  20 Nov 2011; Pacho Ramos <pacho@gentoo.org> +librsvg-2.34.2.ebuild,
+  -librsvg-2.32.1.ebuild, -librsvg-2.34.0.ebuild, metadata.xml:
+  Version bump, remove old.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> librsvg-2.34.1-r1.ebuild:
   alpha/ia64/sh/sparc stable wrt #385699
diff --git a/gnome-base/librsvg/librsvg-2.32.1.ebuild b/gnome-base/librsvg/librsvg-2.32.1.ebuild
deleted file mode 100644
index 651f95a3cc62..000000000000
--- a/gnome-base/librsvg/librsvg-2.32.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.32.1.ebuild,v 1.11 2011/10/09 09:43:47 lxnay Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk tools"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=dev-libs/glib-2.24:2
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.10
-	>=dev-libs/libxml2-2.4.7:2
-	>=dev-libs/libcroco-0.6.1
-	|| ( x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )
-	gtk? ( >=x11-libs/gtk+-2.16:2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	doc? ( >=dev-util/gtk-doc-1.13 )"
-# >=dev-util/gtk-doc-am-1.13 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"
-	DOCS="AUTHORS ChangeLog README NEWS TODO"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove .la files, these libraries are dlopen()-ed.
-	rm -vf "${ED}"/usr/lib*/gtk-2.0/*/engines/libsvg.la
-	rm -vf "${ED}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.la
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
-	# be atomic!
-	gdk-pixbuf-query-loaders > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
-	fi
-	rm "${tmp_file}"
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
-	# be atomic!
-	gdk-pixbuf-query-loaders > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
-	fi
-	rm "${tmp_file}"
-}
diff --git a/gnome-base/librsvg/librsvg-2.34.0.ebuild b/gnome-base/librsvg/librsvg-2.34.2.ebuild
index e356a54fb04b..d7c844e0c61f 100644
--- a/gnome-base/librsvg/librsvg-2.34.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.34.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.0.ebuild,v 1.11 2011/10/09 09:43:47 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.1 2011/11/20 16:06:18 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 GCONF_DEBUG="no"
 
 inherit gnome2 multilib eutils autotools
@@ -14,8 +13,8 @@ HOMEPAGE="http://librsvg.sourceforge.net/"
 
 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +gtk gtk3 +introspection tools"
 
 RDEPEND=">=media-libs/fontconfig-1.0.1
 	>=media-libs/freetype-2
@@ -26,7 +25,9 @@ RDEPEND=">=media-libs/fontconfig-1.0.1
 	>=dev-libs/libcroco-0.6.1
 	|| ( x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:2 )
-	gtk? ( >=x11-libs/gtk+-2.16:2 )"
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	gtk3? ( >=x11-libs/gtk+-2.90.0:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12
 	doc? ( >=dev-util/gtk-doc-1.13 )
@@ -39,18 +40,22 @@ pkg_setup() {
 		--disable-static
 		$(use_enable tools)
 		$(use_enable gtk gtk-theme)
+		$(use_enable introspection)
 		--with-croco
-		--enable-pixbuf-loader
-		--with-gtk=2.0"
+		--enable-pixbuf-loader"
+	use gtk && ! use gtk3 && G2CONF+=" --with-gtk=2.0"
+	use gtk && use gtk3 && G2CONF+=" --with-gtk=both"
+	! use gtk && use gtk3 && G2CONF+=" --with-gtk=3.0 --enable-gtk-theme"
+
 	DOCS="AUTHORS ChangeLog README NEWS TODO"
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Fix automagic gtk+ dependency, bug #371290
 	epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch"
 	eautoreconf
+
+	gnome2_src_prepare
 }
 
 pkg_postinst() {
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index 03a9d4f3fc9b..9d83ffc773ce 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -4,6 +4,8 @@
 <herd>gnome</herd>
 <use>
 	<flag name="gtk3">Build with gtk+-3 support</flag>
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+	introspection</flag>
 	<flag name="tools">Build miscellaneous tools</flag>
 </use>
 </pkgmetadata>