Version bump with numerous bugfixes. Deprecated /usr/bin/rsvg utility was removed. The rsvg-view-3 utility is now built only when USE="gtk tools".

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

4 files changed, 248 insertions, 1 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 550c0c928ebc..83a8e9dc8511 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.271 2012/03/25 16:28:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.272 2012/04/12 02:49:02 tetromino Exp $
+
+*librsvg-2.36.0 (12 Apr 2012)
+
+  12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +librsvg-2.36.0.ebuild, +files/librsvg-2.36.0-rsvg-convert.1.patch,
+  +files/librsvg-2.36.0-rsvg-view-automagic.patch:
+  Version bump with numerous bugfixes. Deprecated /usr/bin/rsvg utility was
+  removed. The rsvg-view-3 utility is now built only when USE="gtk tools".
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> librsvg-2.34.2.ebuild:
   alpha/ia64/sh/sparc stable wrt #393007
diff --git a/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch b/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch
new file mode 100644
index 000000000000..f4b9a0011250
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-convert.1.patch
@@ -0,0 +1,85 @@
+From 3b246c8cf907b0f2ed491b4fe452bb7f3ee55cfc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 8 Apr 2012 14:18:24 -0400
+Subject: [PATCH] Rename rsvg.1 to rsvg-convert.1 and update for
+ rsvg-convert's options
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673748
+---
+ Makefile.am              |    4 +---
+ rsvg-convert.1           |   28 ++++++++++++++++++++--------
+ 2 files changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8e2732b..1adb278 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -105,9 +105,7 @@ librsvginc_HEADERS = 	\
+ 	librsvg-features.h \
+ 	librsvg-enum-types.h
+ 
+-if HAVE_GTK_2
+-dist_man_MANS = rsvg.1
+-endif
++dist_man_MANS = rsvg-convert.1
+ 
+ rsvg_convert_SOURCES = \
+ 	rsvg-convert.c \
+diff --git a/rsvg-convert.1 b/rsvg-convert.1
+index 51a478d..6af32fd 100644
+--- a/rsvg.1
++++ b/rsvg-convert.1
+@@ -1,12 +1,12 @@
+-.TH rsvg 1
++.TH rsvg-convert 1
+ .SH NAME
+-rsvg \- Turn SVG files into raster images.
++rsvg-convert \- turn SVG files into raster images.
+ .SH SYNOPSIS
+-.B rsvg
+-[options] in.svg out.png
++.B rsvg-convert
++[options] in.svg > out.png
+ .I ""
+ .SH DESCRIPTION
+-RSVG converts SVG images into PNG, JPEG, and ICO raster images.
++Converts SVG images into PNG raster images, PDF, PS, or SVG vector images, or dumps of Cairo XML or recording surfaces.
+ .SS OPTIONS
+ .TP
+ .I "\-d \-\-dpi-x number"
+@@ -21,17 +21,29 @@ X Zoom factor, as a percentage. If unspecified, 1.0 is used as the default.
+ .I "\-y \-\-y\-zoom number"
+ Y Zoom factor, as a percentage. If unspecified, 1.0 is used as the default.
+ .TP
++.I "\-z \-\-\-zoom number"
++Zoom factor, as a percentage. If unspecified, 1.0 is used as the default.
++.TP
+ .I "\-w \-\-width integer"
+ Specify how wide you wish the image to be. If unspecified, the natural width of the image is used as the default.
+ .TP
+ .I "\-h \-\-height integer"
+ Specify how tall you wish the image to be. If unspecified, the natural height of the image is used as the default.
+ .TP
+-.I "\-f \-\-format [png, jpeg, ico]"
++.I "\-f \-\-format [png, pdf, ps, svg, xml, recording]"
+ Specify the output format you wish the image to be saved in. If unspecified, PNG is used as the default.
+ .TP
+-.I "\-q \-\-quality integer"
+-Specify JPEG compression factor. Number must be between 1 and 100, inclusive.
++.I "\-o \-\-output filename"
++Specify the output filename. If unspecified, outputs to stdout.
++.TP
++.I "\-a \-\-keep-aspect-ratio"
++Specify that the aspect ratio is to be preserved. If unspecified, aspect ratio will not be preserved.
++.TP
++.I "\-b \-\-background-color [black, white, #abccee, #aaa...]"
++Specify the background color. If unspecified, none is used as the default.
++.TP
++.I "\-\-base-uri uri"
++Specify the base URI for SVG files. If unspecified, none is used as the default.
+ .TP
+ .I "\-v \-\-version"
+ Display what version of rsvg this is.
+-- 
+1.7.8.5
+
diff --git a/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-view-automagic.patch b/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-view-automagic.patch
new file mode 100644
index 000000000000..854a554536cd
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-view-automagic.patch
@@ -0,0 +1,60 @@
+From 5858b0b859c9a5fbdfb05f3dc93b47d672443d7a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 11 Apr 2012 20:22:49 -0400
+Subject: [PATCH] Make choice of whether to build rsvg-view-3 non-automagic
+
+---
+ Makefile.am  |    2 +-
+ configure.in |   17 +++++++++++++++++
+ 2 files changed, 18 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1adb278..77c2ad1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,7 @@ endif
+ lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la
+ 
+ bin_PROGRAMS = rsvg-convert
+-if HAVE_GTK_3
++if ENABLE_RSVG_VIEW
+ bin_PROGRAMS += rsvg-view-3
+ endif
+ 
+diff --git a/configure.in b/configure.in
+index 005aff4..68b522c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -154,6 +154,22 @@ fi
+ 
+ AM_CONDITIONAL([ENABLE_GTK2_ENGINE],[test "$enable_gtk_theme" = "yes"])
+ 
++# ===========================================================================
++# rsvg-view-3 application
++# ===========================================================================
++
++if test "have_gtk_3"; then
++  AC_MSG_CHECKING([whether to build the rsvg-view-3 application])
++  AC_ARG_ENABLE([rsvg-view],
++    [AS_HELP_STRING([--disable-rsvg-view],[Disable the rsvg-view-3 application (default=yes)])],
++    [],[enable_rsvg_view=yes])
++  AC_MSG_RESULT([$enable_rsvg_view])
++else
++  enable_rsvg_view=no
++fi
++
++AM_CONDITIONAL([ENABLE_RSVG_VIEW],[test "$enable_rsvg_view" = "yes"])
++
+ dnl ===========================================================================
+ dnl GDK-Pixbuf SVG loader
+ dnl ===========================================================================
+@@ -339,5 +355,6 @@ librsvg-$VERSION
+         GTK 2.0:                        ${have_gtk_2}
+         GTK 3.0:                        ${have_gtk_3}
+ 	Build GTK 2.0 theme engine:     ${enable_gtk_theme}
++	Build rsvg-view-3 application:  ${enable_rsvg_view}
+ 	Build miscellaenous tools:      ${build_misc_tools}
+ "
+-- 
+1.7.8.5
+
diff --git a/gnome-base/librsvg/librsvg-2.36.0.ebuild b/gnome-base/librsvg/librsvg-2.36.0.ebuild
new file mode 100644
index 000000000000..9123a1c9a39b
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.36.0.ebuild
@@ -0,0 +1,94 @@
+# 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.1 2012/04/12 02:49:02 tetromino 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="~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=">=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}
+	>=dev-util/pkgconfig-0.12
+	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
+
+	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"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+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}"
+}