Version bump, drop old

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

7 files changed, 44 insertions, 475 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 8e4d9d827de2..9be646c905fa 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.359 2014/08/25 10:59:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.360 2014/09/04 10:10:30 pacho Exp $
+
+*librsvg-2.40.3 (04 Sep 2014)
+
+  04 Sep 2014; Pacho Ramos <pacho@gentoo.org> +librsvg-2.40.3.ebuild,
+  -files/librsvg-2.36.0-rsvg-view-automagic.patch,
+  -files/librsvg-2.36.4-resource-uri-1.patch,
+  -files/librsvg-2.36.4-resource-uri-2.patch,
+  -files/librsvg-2.36.4-resource-uri-3.patch,
+  -files/librsvg-2.39.0-canonicalize-realpath.patch, -librsvg-2.40.1-r1.ebuild:
+  Version bump, drop old
 
   25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> librsvg-2.40.2-r1.ebuild:
   Stable for alpha, wrt bug #512012
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
deleted file mode 100644
index 854a554536cd..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.36.0-rsvg-view-automagic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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/files/librsvg-2.36.4-resource-uri-1.patch b/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-1.patch
deleted file mode 100644
index 4cf6efbf1e1e..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-1.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 56d0018d911eb5783f22125d9893fce075778c64 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sun, 3 Mar 2013 20:32:09 +0100
-Subject: [PATCH 1/3] io: Resolve relative URIs
-
----
- rsvg-base.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 64 insertions(+), 17 deletions(-)
-
-diff --git a/rsvg-base.c b/rsvg-base.c
-index 6210716..ed383d2 100644
---- a/rsvg-base.c
-+++ b/rsvg-base.c
-@@ -2154,36 +2154,83 @@ _rsvg_handle_allow_load (RsvgHandle *handle,
-     return TRUE;
- }
- 
-+static char *
-+_rsvg_handle_resolve_uri (RsvgHandle *handle,
-+                          const char *uri)
-+{
-+    RsvgHandlePrivate *priv = handle->priv;
-+    char *scheme, *resolved_uri;
-+    GFile *base, *resolved;
-+
-+    if (uri == NULL)
-+        return NULL;
-+
-+    scheme = g_uri_parse_scheme (uri);
-+    if (scheme != NULL ||
-+        priv->base_gfile == NULL ||
-+        (base = g_file_get_parent (priv->base_gfile)) == NULL) {
-+        g_free (scheme);
-+        return g_strdup (uri);
-+    }
-+
-+    resolved = g_file_resolve_relative_path (base, uri);
-+    resolved_uri = g_file_get_uri (resolved);
-+
-+    g_free (scheme);
-+    g_object_unref (base);
-+    g_object_unref (resolved);
-+
-+    return resolved_uri;
-+}
-+
- guint8* 
- _rsvg_handle_acquire_data (RsvgHandle *handle,
--                           const char *uri,
-+                           const char *url,
-                            char **content_type,
-                            gsize *len,
-                            GError **error)
- {
--    if (!_rsvg_handle_allow_load (handle, uri, error))
--        return NULL;
-+    char *uri;
-+    guint8 *data;
-+
-+    uri = _rsvg_handle_resolve_uri (handle, url);
-+
-+    if (_rsvg_handle_allow_load (handle, uri, error)) {
-+        data = _rsvg_io_acquire_data (uri, 
-+                                      rsvg_handle_get_base_uri (handle), 
-+                                      content_type, 
-+                                      len, 
-+                                      handle->priv->cancellable,
-+                                      error);
-+    } else {
-+        data = NULL;
-+    }
- 
--    return _rsvg_io_acquire_data (uri, 
--                                  rsvg_handle_get_base_uri (handle), 
--                                  content_type, 
--                                  len, 
--                                  handle->priv->cancellable,
--                                  error);
-+    g_free (uri);
-+    return data;
- }
- 
- GInputStream *
- _rsvg_handle_acquire_stream (RsvgHandle *handle,
--                             const char *uri,
-+                             const char *url,
-                              char **content_type,
-                              GError **error)
- {
--    if (!_rsvg_handle_allow_load (handle, uri, error))
--        return NULL;
-+    char *uri;
-+    GInputStream *stream;
-+
-+    uri = _rsvg_handle_resolve_uri (handle, url);
-+
-+    if (_rsvg_handle_allow_load (handle, uri, error)) {
-+        stream = _rsvg_io_acquire_stream (uri, 
-+                                          rsvg_handle_get_base_uri (handle), 
-+                                          content_type, 
-+                                          handle->priv->cancellable,
-+                                          error);
-+    } else {
-+        stream = NULL;
-+    }
- 
--    return _rsvg_io_acquire_stream (uri, 
--                                    rsvg_handle_get_base_uri (handle), 
--                                    content_type, 
--                                    handle->priv->cancellable,
--                                    error);
-+    g_free (uri);
-+    return stream;
- }
--- 
-1.8.3.2
-
diff --git a/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-2.patch b/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-2.patch
deleted file mode 100644
index bd5459fc78af..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d83e426fff3f6d0fa6042d0930fb70357db24125 Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Mon, 11 Feb 2013 22:36:30 +0100
-Subject: [PATCH 2/3] io: Use XML_PARSE_NONET
-
-We don't want to load resources off the net.
-
-Bug #691708.
----
- rsvg-base.c | 3 +++
- rsvg-css.c  | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/rsvg-base.c b/rsvg-base.c
-index ed383d2..1f88479 100644
---- a/rsvg-base.c
-+++ b/rsvg-base.c
-@@ -572,6 +572,7 @@ rsvg_start_xinclude (RsvgHandle * ctx, RsvgPropertyBag * atts)
-             goto fallback;
- 
-         xml_parser = xmlCreatePushParserCtxt (&rsvgSAXHandlerStruct, ctx, NULL, 0, NULL);
-+        xml_parser->options |= XML_PARSE_NONET;
- 
-         buffer = _rsvg_xml_input_buffer_new_from_stream (stream, NULL /* cancellable */, XML_CHAR_ENCODING_NONE, &err);
-         g_object_unref (stream);
-@@ -1111,6 +1112,7 @@ rsvg_handle_write_impl (RsvgHandle * handle, const guchar * buf, gsize count, GE
-     if (handle->priv->ctxt == NULL) {
-         handle->priv->ctxt = xmlCreatePushParserCtxt (&rsvgSAXHandlerStruct, handle, NULL, 0,
-                                                       rsvg_handle_get_base_uri (handle));
-+        handle->priv->ctxt->options |= XML_PARSE_NONET;
- 
-         /* if false, external entities work, but internal ones don't. if true, internal entities
-            work, but external ones don't. favor internal entities, in order to not cause a
-@@ -1767,6 +1769,7 @@ rsvg_handle_read_stream_sync (RsvgHandle   *handle,
-     if (priv->ctxt == NULL) {
-         priv->ctxt = xmlCreatePushParserCtxt (&rsvgSAXHandlerStruct, handle, NULL, 0,
-                                               rsvg_handle_get_base_uri (handle));
-+        priv->ctxt->options |= XML_PARSE_NONET;
- 
-         /* if false, external entities work, but internal ones don't. if true, internal entities
-            work, but external ones don't. favor internal entities, in order to not cause a
-diff --git a/rsvg-css.c b/rsvg-css.c
-index 7813098..3f703cc 100644
---- a/rsvg-css.c
-+++ b/rsvg-css.c
-@@ -836,6 +836,8 @@ rsvg_css_parse_xml_attribute_string (const char *attribute_string)
-     xmlSAX2InitDefaultSAXHandler (&handler, 0);
-     handler.serror = rsvg_xml_noerror;
-     parser = xmlCreatePushParserCtxt (&handler, NULL, tag, strlen (tag) + 1, NULL);
-+    parser->options |= XML_PARSE_NONET;
-+
-     if (xmlParseDocument (parser) != 0)
-         goto done;
- 
--- 
-1.8.3.2
-
diff --git a/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-3.patch b/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-3.patch
deleted file mode 100644
index cb3b46f1c054..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.36.4-resource-uri-3.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From f01aded72c38f0e18bc7ff67dee800e380251c8e Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Mon, 11 Feb 2013 22:36:58 +0100
-Subject: [PATCH 3/3] io: Implement strict load policy
-
-Allow any file to load from data:, and any resource to load from other
-resources. Only allow file: to load other file: URIs from below the path
-of the base file. Any other loads are denied.
-
-Bug #691708.
----
- rsvg-base.c    | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
- rsvg-io.c      |  2 +-
- rsvg-private.h |  4 +--
- 3 files changed, 84 insertions(+), 11 deletions(-)
-
-diff --git a/rsvg-base.c b/rsvg-base.c
-index 1f88479..9d7c1ea 100644
---- a/rsvg-base.c
-+++ b/rsvg-base.c
-@@ -25,6 +25,7 @@
- */
- 
- #include "config.h"
-+#define _GNU_SOURCE 1
- 
- #include "rsvg.h"
- #include "rsvg-private.h"
-@@ -1002,6 +1003,7 @@ void
- rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri)
- {
-     gchar *uri;
-+    GFile *file;
- 
-     g_return_if_fail (handle != NULL);
- 
-@@ -1013,11 +1015,10 @@ rsvg_handle_set_base_uri (RsvgHandle * handle, const char *base_uri)
-     else
-         uri = rsvg_get_base_uri_from_filename (base_uri);
- 
--    if (uri) {
--        if (handle->priv->base_uri)
--            g_free (handle->priv->base_uri);
--        handle->priv->base_uri = uri;
--    }
-+    file = g_file_new_for_uri (uri ? uri : "data:");
-+    rsvg_handle_set_base_gfile (handle, file);
-+    g_object_unref (file);
-+    g_free (uri);
- }
- 
- /**
-@@ -2149,12 +2150,84 @@ _rsvg_handle_allow_load (RsvgHandle *handle,
-                          const char *uri,
-                          GError **error)
- {
--    RsvgLoadPolicy policy = handle->priv->load_policy;
-+    RsvgHandlePrivate *priv = handle->priv;
-+    GFile *base;
-+    char *path, *dir;
-+    char *scheme = NULL, *cpath = NULL, *cdir = NULL;
- 
--    if (policy == RSVG_LOAD_POLICY_ALL_PERMISSIVE)
--        return TRUE;
-+    g_assert (handle->priv->load_policy == RSVG_LOAD_POLICY_STRICT);
-+
-+    scheme = g_uri_parse_scheme (uri);
-+
-+    /* Not a valid URI */
-+    if (scheme == NULL)
-+        goto deny;
-+
-+    /* Allow loads of data: from any location */
-+    if (g_str_equal (scheme, "data"))
-+        goto allow;
-+
-+    /* No base to compare to? */
-+    if (priv->base_gfile == NULL)
-+        goto deny;
-+
-+    /* Deny loads from differing URI schemes */
-+    if (!g_file_has_uri_scheme (priv->base_gfile, scheme))
-+        goto deny;
-+
-+    /* resource: is allowed to load anything from other resources */
-+    if (g_str_equal (scheme, "resource"))
-+        goto allow;
-+
-+    /* Non-file: isn't allowed to load anything */
-+    if (!g_str_equal (scheme, "file"))
-+        goto deny;
-+
-+    base = g_file_get_parent (priv->base_gfile);
-+    if (base == NULL)
-+        goto deny;
- 
-+    dir = g_file_get_path (base);
-+    g_object_unref (base);
-+
-+    /* FIXME portability */
-+    cdir = canonicalize_file_name (dir);
-+    g_free (dir);
-+    if (cdir == NULL)
-+        goto deny;
-+
-+    path = g_filename_from_uri (uri, NULL, NULL);
-+    if (path == NULL)
-+        goto deny;
-+
-+    /* FIXME portability */
-+    cpath = canonicalize_file_name (path);
-+    g_free (path);
-+
-+    if (cpath == NULL)
-+        goto deny;
-+
-+    /* Now check that @cpath is below @cdir */
-+    if (!g_str_has_prefix (cpath, cdir) ||
-+        cpath[strlen (cdir)] != G_DIR_SEPARATOR)
-+        goto deny;
-+
-+    /* Allow load! */
-+
-+ allow:
-+    g_free (scheme);
-+    free (cpath);
-+    free (cdir);
-     return TRUE;
-+
-+ deny:
-+    g_free (scheme);
-+    free (cpath);
-+    free (cdir);
-+
-+    g_set_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
-+                 "File may not link to URI \"%s\"", uri);
-+    return FALSE;
- }
- 
- static char *
-diff --git a/rsvg-io.c b/rsvg-io.c
-index 3d6c8b5..818d2ec 100644
---- a/rsvg-io.c
-+++ b/rsvg-io.c
-@@ -79,7 +79,7 @@ rsvg_acquire_data_data (const char *uri,
-     gboolean base64 = FALSE;
- 
-     g_assert (out_len != NULL);
--    g_assert (g_str_has_prefix (uri, "data:"));
-+    g_assert (strncmp (uri, "data:", 5) == 0);
- 
-     mime_type = NULL;
-     start = uri + 5;
-diff --git a/rsvg-private.h b/rsvg-private.h
-index 25283d4..1961eaf 100644
---- a/rsvg-private.h
-+++ b/rsvg-private.h
-@@ -123,10 +123,10 @@ struct RsvgSaxHandler {
- };
- 
- typedef enum {
--    RSVG_LOAD_POLICY_ALL_PERMISSIVE
-+    RSVG_LOAD_POLICY_STRICT
- } RsvgLoadPolicy;
- 
--#define RSVG_LOAD_POLICY_DEFAULT (RSVG_LOAD_POLICY_ALL_PERMISSIVE)
-+#define RSVG_LOAD_POLICY_DEFAULT (RSVG_LOAD_POLICY_STRICT)
- 
- struct RsvgHandlePrivate {
-     RsvgHandleFlags flags;
--- 
-1.8.3.2
-
diff --git a/gnome-base/librsvg/files/librsvg-2.39.0-canonicalize-realpath.patch b/gnome-base/librsvg/files/librsvg-2.39.0-canonicalize-realpath.patch
deleted file mode 100644
index 1fe9714b367a..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.39.0-canonicalize-realpath.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 02cb19835cb52bd84b0b5eaca1b4d6338417d261 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Tue, 15 Oct 2013 07:36:30 +0000
-Subject: portability: canonicalize_file_name -> realpath
-
-canonicalize_file_name() is a GNU extension so let's use the portable
-realpath() instead.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710163
----
-diff --git a/rsvg-base.c b/rsvg-base.c
-index cb9f64a..fb829e7 100644
---- a/rsvg-base.c
-+++ b/rsvg-base.c
-@@ -50,6 +50,8 @@
- #include <math.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <limits.h>
-+#include <stdlib.h>
- 
- #include "rsvg-path.h"
- #include "rsvg-paint-server.h"
-@@ -2190,8 +2192,7 @@ _rsvg_handle_allow_load (RsvgHandle *handle,
-     dir = g_file_get_path (base);
-     g_object_unref (base);
- 
--    /* FIXME portability */
--    cdir = canonicalize_file_name (dir);
-+    cdir = realpath (dir, NULL);
-     g_free (dir);
-     if (cdir == NULL)
-         goto deny;
-@@ -2200,8 +2201,7 @@ _rsvg_handle_allow_load (RsvgHandle *handle,
-     if (path == NULL)
-         goto deny;
- 
--    /* FIXME portability */
--    cpath = canonicalize_file_name (path);
-+    cpath = realpath (path, NULL);
-     g_free (path);
- 
-     if (cpath == NULL)
---
-cgit v0.9.2
diff --git a/gnome-base/librsvg/librsvg-2.40.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.3.ebuild
index 864126b55310..9f571b763735 100644
--- a/gnome-base/librsvg/librsvg-2.40.1-r1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.1-r1.ebuild,v 1.12 2014/04/21 10:29:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.40.3.ebuild,v 1.1 2014/09/04 10:10:30 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,26 +8,26 @@ GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools gnome2 vala
+inherit autotools gnome2 multilib-minimal vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/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"
+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="+introspection vala tools"
 REQUIRED_USE="
 	vala? ( introspection )
 "
 
 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.20:2[introspection?]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
 	tools? ( >=x11-libs/gtk+-3.2.0:3 )
 "
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	dev-libs/gobject-introspection-common
 	dev-libs/vala-common
 	>=dev-util/gtk-doc-am-1.13
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	vala? ( $(vala_depend) )
 "
 # >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
@@ -43,48 +43,59 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=712693
 	epatch "${FILESDIR}/${PN}-2.40.1-gtk-optional.patch"
-	# old "missing" file causes eautoreconf warnings
-	rm missing
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
+	epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
+
 	eautoreconf
 
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 
-src_configure() {
-	local myconf=""
+multilib_src_configure() {
+	local myconf=()
 
 	# -Bsymbolic is not supported by the Darwin toolchain
 	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
+		myconf+=( --disable-Bsymbolic )
 	fi
 
 	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
 	# only for librsvg developers
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tools \
-		$(use_enable introspection) \
-		$(use_with tools gtk3) \
-		$(use_enable vala) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with tools gtk3) \
+		$(multilib_native_use_enable vala) \
 		--enable-pixbuf-loader \
-		${myconf}
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
 }
 
-src_compile() {
+multilib_src_compile() {
 	# causes segfault if set, see bug #411765
 	unset __GL_NO_DSO_FINALIZER
 	gnome2_src_compile
 }
 
+multilib_src_install() {
+	gnome2_src_install
+}
+
 pkg_postinst() {
 	# causes segfault if set, see bug 375615
 	unset __GL_NO_DSO_FINALIZER
-	gnome2_pkg_postinst
+	multilib_foreach_abi gnome2_pkg_postinst
 }
 
 pkg_postrm() {
 	# causes segfault if set, see bug 375615
 	unset __GL_NO_DSO_FINALIZER
-	gnome2_pkg_postrm
+	multilib_foreach_abi gnome2_pkg_postrm
 }