Version bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 98 insertions, 81 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index b2efc067fcdf..7fcd92dd91f5 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.309 2013/09/03 22:12:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.310 2013/09/30 21:57:30 pacho Exp $
+
+*librsvg-2.39.0 (30 Sep 2013)
+
+  30 Sep 2013; Pacho Ramos <pacho@gentoo.org> +librsvg-2.39.0.ebuild,
+  -librsvg-2.36.1.ebuild:
+  Version bump
 
   03 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> librsvg-2.36.1.ebuild,
   -librsvg-2.36.3.ebuild:
diff --git a/gnome-base/librsvg/librsvg-2.36.1.ebuild b/gnome-base/librsvg/librsvg-2.36.1.ebuild
deleted file mode 100644
index 3b9fd1a1d238..000000000000
--- a/gnome-base/librsvg/librsvg-2.36.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.36.1.ebuild,v 1.16 2013/09/03 22:12:02 eva Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-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="s390"
-IUSE="doc +gtk +introspection tools"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.16
-	>=dev-libs/libxml2-2.7:2
-	>=dev-libs/libcroco-0.6.1
-	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}
-	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
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable tools)
-		$(use_enable gtk gtk-theme)
-		$(use_enable introspection)
-		--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() {
-	# Make rsvg-view non-automagic
-	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.39.0.ebuild b/gnome-base/librsvg/librsvg-2.39.0.ebuild
new file mode 100644
index 000000000000..160ecf2a7025
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.39.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.39.0.ebuild,v 1.1 2013/09/30 21:57:30 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils gnome2 multilib vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://live.gnome.org/LibRsvg"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+gtk +introspection tools vala"
+REQUIRED_USE="
+	vala? ( introspection )
+	tools? ( gtk )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.24:2
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pango-1.32.6
+	>=dev-libs/libxml2-2.7:2
+	>=dev-libs/libcroco-0.6.1
+	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-libs/gobject-introspection-common
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.13
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+src_prepare() {
+	# Make rsvg-view non-automagic, upstream bug #653323
+	epatch "${FILESDIR}/${PN}-2.36.0-rsvg-view-automagic.patch"
+
+	use vala && vala_src_prepare
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tools \
+		$(use_enable tools rsvg-view) \
+		$(use_enable gtk gtk-theme) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		--enable-pixbuf-loader \
+		${myconf}
+}
+
+src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_pkg_postrm
+}