Version bump, drop old.

(Portage version: 2.1.11.24/cvs/Linux x86_64)

3 files changed, 26 insertions, 106 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index a6211e072438..a9f5c41bfab5 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.288 2012/10/16 05:47:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.289 2012/10/20 06:55:57 pacho Exp $
+
+*librsvg-2.36.4 (20 Oct 2012)
+
+  20 Oct 2012; Pacho Ramos <pacho@gentoo.org> +librsvg-2.36.4.ebuild,
+  -librsvg-2.34.1-r1.ebuild, -librsvg-2.36.0.ebuild:
+  Version bump, drop old.
 
   16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> librsvg-2.36.1.ebuild:
   stable ppc, bug #427544
diff --git a/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild
deleted file mode 100644
index edea0ceec67c..000000000000
--- a/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-r1.ebuild,v 1.11 2012/05/05 05:38:09 jdhore Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib eutils autotools
-
-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 gtk3 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 )
-	gtk3? ( >=x11-libs/gtk+-2.90.0:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	>=dev-util/gtk-doc-am-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"
-	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
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp -t tmp.XXXXXXXXXXlibrsvg_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 -t tmp.XXXXXXXXXXlibrsvg_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.36.0.ebuild b/gnome-base/librsvg/librsvg-2.36.4.ebuild
index b59971073765..b1d80ceb8595 100644
--- a/gnome-base/librsvg/librsvg-2.36.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.36.4.ebuild
@@ -1,21 +1,23 @@
 # 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.36.0.ebuild,v 1.4 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.4.ebuild,v 1.1 2012/10/20 06:55:57 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2 multilib
+inherit autotools eutils gnome2 multilib vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="http://librsvg.sourceforge.net/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+HOMEPAGE="https://live.gnome.org/LibRsvg"
 
 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk +introspection tools"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+gtk +introspection tools vala"
+REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=x11-libs/cairo-1.2
@@ -29,35 +31,34 @@ RDEPEND=">=dev-libs/glib-2.24:2
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-
 	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.13"
-# >=gtk-doc-am-1.13 and gobject-introspection-common needed by eautoreconf
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.13
+	vala? ( $(vala_depend) )"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable tools)
 		$(use_enable gtk gtk-theme)
 		$(use_enable introspection)
+		$(use_enable vala)
 		--enable-pixbuf-loader"
 	if use gtk && use tools; then
 		G2CONF="${G2CONF} --enable-rsvg-view"
 	else
 		G2CONF="${G2CONF} --disable-rsvg-view"
 	fi
+	# -Bsymbolic is not supported by the Darwin toolchain
+	[[ ${CHOST} == *-darwin* ]] && G2CONF="${G2CONF} --disable-Bsymbolic"
 
 	DOCS="AUTHORS ChangeLog README NEWS TODO"
-}
-
-src_prepare() {
-	# Fix man page
-	mv rsvg.1 rsvg-convert.1 || die "mv failed"
-	epatch "${FILESDIR}/${P}-rsvg-convert.1.patch"
 
 	# Make rsvg-view non-automagic
-	epatch "${FILESDIR}/${P}-rsvg-view-automagic.patch"
+	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
+
+	use vala && vala_src_prepare
 
 	eautoreconf
 	gnome2_src_prepare