librsvg: version bump/merge to 2.40.1-r2

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 152 insertions, 0 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 6cda1fe..fa6cbb1 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -3,7 +3,10 @@ AUX librsvg-2.36.4-resource-uri-1.patch 3668 SHA256 1feffc8fc503971b87157d8d05fb
 AUX librsvg-2.36.4-resource-uri-2.patch 2423 SHA256 00ab1759bdaef45083c30f4b1744555487819774edda4a7aec1165e6a010765a SHA512 8f81b68f92a0dd071021c231c75dc2b8397edc27c77868bce9742ad7dec2ee9f9048656b816932466a271ce499551376573fabefd6e76c42bf44c2f8ededab51 WHIRLPOOL 802477a1c112a6f7fc22dfb658369754c2799bb2730aafa8aa1af960b4f79942c9d1b3059fc7fa4bb50c582f5dd1f292c889bd8ba0575ea44c26d45ee96d6000
 AUX librsvg-2.36.4-resource-uri-3.patch 4543 SHA256 512ff5ace57cc2b40e42128cbe8c9653562c0501593c09b84ec105d56da5ca4d SHA512 60307bbdbcf8e597027b2f7cf7606afafc52855ed09d7fcff42de09cd8522d3bbe468d85a85cd915f81fdb82895565931706a7f8572fe65f31111883e7e68a60 WHIRLPOOL 4ecf3dac3b808eee0cacba6618f3fe75ba2ead09c51b961da68f4d1a4ebc915557220285466b0f31b4ad052a769215b8b1359496a79d6861ed06bed931dd9a30
 AUX librsvg-2.39.0-canonicalize-realpath.patch 1222 SHA256 2fb7b9cea505ec6ec8d42372263682d2c458a257ca78f1bd9d5dbd31e43bbf4d SHA512 bc7c747d36ad7d839afeedfb9303fd97387f14d547d4581b55691e371449e9caeff738abcecd302a3a7cc9cc1b56b6bfd1bef6e017b5aa8b2de76b232168f1de WHIRLPOOL 78546a6436deb0d0cdf137cee7f0105546fe9507e20cad7cdafdd35b572a940cbcd16a154aeda3d8aa17cdadcb9b5d0a2dc78918ea6bcabebf8bc7344aa23a91
+AUX librsvg-2.40.1-gtk-optional.patch 2184 SHA256 060ad4965c51d334da543970f959022d519bd3e714c1ee22c4cf9081e875c1e3 SHA512 7232fab1817066469d43f29e3c338312e8ead15e1aa6b236bd6e1bb6a3f4c903f41467e3790c8011e5670370ee3292520212b63b458b8ab1341f3dbb1adc16c2 WHIRLPOOL 59813105025e68854d155dc6f051ac7ce06c18aa5903f910b079b84ee5882e2d626d971b539c07b701125c6489ed1dac5e519909084fb26e637e10d48839543e
 DIST librsvg-2.39.0.tar.xz 519088 SHA256 aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f SHA512 14e3224c2fad8c92beabce9b486d8cc94e288db5d7d0bda9016fa953ad31456f3934ad847dc7288185fcba840731c25c2eca75288cb2518d2d501abea9ecd98d WHIRLPOOL 3348a50701b3661cb96de039f868c21a319752e2f014329b2ab77bcf6d66ebba1b553f7d10334146a4c3f96d4c0e26defbd02424b8f1deae0483d59e5a3ede50
+DIST librsvg-2.40.1.tar.xz 505664 SHA256 8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7 SHA512 fe84430a7be4bb70c47745acb40628a806f066e4d4322c0fb90a77aa2bb7a41d8235e4055ab09cb166deb44a07781166146aa5c1a8508de9ad6f8e2686a32a49 WHIRLPOOL 1f50c68950b62bd3d76425f8fd70a57a5f810d9c63a0229deef040e1a602a61ec25755b956aec82f20782732e6ee4a63ccb9b36d0f2cd250e8911bce222f4ff7
 EBUILD librsvg-2.39.0-r1.ebuild 2340 SHA256 89a72522219c681f9263be0f37bd80c241dcfbf08c1d39dcbaf4fe626b1f9dbf SHA512 03ec99815b87bc8ffaebda8eb6ca0f1b83968ec2e1d180ad7ed3848b6be2118c0972d102edc2844bd9c94293a38da798d5e13af0bfba48cab5e47a25f2f09c33 WHIRLPOOL 727dce772607be77ba2136ee505b0ebb7eeb341ce69b67407ca3ad2c812676ad6aeb79eb08bbe193467523a07fc6680326e0035eacd600764d909c68d4581206
+EBUILD librsvg-2.40.1-r2.ebuild 2290 SHA256 316a009ae95ced01993b1a870668726edc914335384f6dbf201996e7274d4fdb SHA512 64f5706b3855cdee4e3b07492a91382716624b63dfe7d06265289d98cfd0dc738ae5757d266abfc4f9b220b9619dfdc35fab44982bdf776a19ff33267ba39ebb WHIRLPOOL d57e3d9736efb3d81d20fdbfd4122036020de84f3489d3dc19176aead5ec50bc62101fa618607e9b71f15570014a3479a1162cd21226f890c07dcca4ea923bc1
 MISC ChangeLog 42435 SHA256 cc202c2d96d64aff766eb6d494cafdd156aa76f5aaf8a90c370cbb47c604aef1 SHA512 a45eb5926b91c9b23cd7f75a052f378c5209251f33221fffdfce4b175bb67a60664fcf7f2bf6f6dbd45536195f0436080114162c36466ca7ca5e0d932a0722af WHIRLPOOL c00e5c4c1b1321d7f1b87f41ae06de4497008a4b872ffe18afa9b251592e8c02d3e55692d12739974acf5c8e0cf5e08b2eadfc05d6d7618ad7341a673b00412e
 MISC metadata.xml 395 SHA256 7f63e0973cef8b5da30264661e4bf924bdd228b26d0301760a70474d6a9a6945 SHA512 9dba6907b92f041a26e18cad46d3080120e19231c09eca5f76d80321a59806b049e56b9fce0ea729603d590609aa92b68de98a47937780ef8e67213cf89f119e WHIRLPOOL a735011b1461245244b67939ab7415401847c4d034ac14b2784538e5143eeacd4649f3a735901e7761bd200531ccf87dcf2578a014473ec79c9b1ac258666669
diff --git a/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
new file mode 100644
index 0000000..86b8fec
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
@@ -0,0 +1,58 @@
+From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Tue, 19 Nov 2013 16:00:29 +0000
+Subject: [PATCH] configure: add option to enable/disable use of GTK+
+
+Distro packagers like predictability and automatically detected optional
+dependencies are not predicable.  Add a --with-gtk3 option (default to "auto")
+for forcibly controlling whether GTK+ will be used or not.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712693
+---
+ configure.in |   17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f7a89dc..1498f72 100644
+--- a/configure.in
++++ b/configure.in
+@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
+ # GTK
+ # ===========================================================================
+ 
+-PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
+-
+ GTK3_BINARY_VERSION=
+ 
+-if test "$have_gtk_3" = "yes"; then
+-    GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
++AC_MSG_CHECKING([whether to use GTK+ 3])
++AC_ARG_WITH([gtk3],
++  [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
++  [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
++AC_MSG_RESULT([$with_gtk3])
++
++if test "$with_gtk3" = "yes"; then
++  PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
++  GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
+ fi
+ 
+ AC_SUBST([GTK3_BINARY_VERSION])
+ 
+-AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
++AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
+ 
+ dnl ===========================================================================
+ dnl GDK-Pixbuf SVG loader
+@@ -305,6 +310,6 @@ librsvg-$VERSION
+ 	Build introspectable bindings:  ${found_introspection}
+ 	Build Vala bindings:            ${enable_vala}
+ 	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
+-        GTK 3.0:                        ${have_gtk_3}
++        GTK 3.0:                        ${with_gtk3}
+ 	Build miscellaenous tools:      ${build_misc_tools}
+ "
+-- 
+1.7.10.4
\ No newline at end of file
diff --git a/gnome-base/librsvg/librsvg-2.40.1-r2.ebuild b/gnome-base/librsvg/librsvg-2.40.1-r2.ebuild
new file mode 100644
index 0000000..5945bb4
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.1-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit gtk-doc autotools eutils gnome2-multilib vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="+introspection vala tools"
+REQUIRED_USE="
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.32.6[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.7:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libcroco-0.6.1[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8[${MULTILIB_USEDEP}] )
+	tools? ( >=x11-libs/gtk+-3.2.0:3[${MULTILIB_USEDEP}] )
+"
+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() {
+	# 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
+	eautoreconf
+
+	use vala && vala_src_prepare
+
+	gnome2-multilib_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+	fi
+
+	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
+	# only for librsvg developers
+	gnome2-multilib_src_configure \
+		--disable-static \
+		--disable-tools \
+		$(use_enable introspection) \
+		$(use_enable tools gtk3) \
+		$(use_enable vala) \
+		--enable-pixbuf-loader \
+		${myconf}
+}
+
+src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2-multilib_src_compile
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	gnome2-multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	gnome2-multilib_pkg_postrm
+}