Enable multilib support.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 121 insertions, 16 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index e83635ad470e..8ab9bc088b87 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.347 2014/05/17 15:31:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.348 2014/06/17 20:09:08 mgorny Exp $
+
+*librsvg-2.40.2-r1 (17 Jun 2014)
+
+  17 Jun 2014; Michał Górny <mgorny@gentoo.org> +librsvg-2.40.2-r1.ebuild:
+  Enable multilib support.
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> librsvg-2.40.2.ebuild:
   Stable for alpha, wrt bug #508862
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index c283e0663264..ea24ee07fcfa 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -10,23 +10,26 @@ AUX librsvg-2.40.1-gtk-optional.patch 2184 SHA256 060ad4965c51d334da543970f95902
 DIST librsvg-2.40.1.tar.xz 505664 SHA256 8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7 SHA512 fe84430a7be4bb70c47745acb40628a806f066e4d4322c0fb90a77aa2bb7a41d8235e4055ab09cb166deb44a07781166146aa5c1a8508de9ad6f8e2686a32a49 WHIRLPOOL 1f50c68950b62bd3d76425f8fd70a57a5f810d9c63a0229deef040e1a602a61ec25755b956aec82f20782732e6ee4a63ccb9b36d0f2cd250e8911bce222f4ff7
 DIST librsvg-2.40.2.tar.xz 506048 SHA256 48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c SHA512 ecb144f8f02240f44edc4baf372477d6a8436abfcabad0e9fdce9cd629ace819f14d0c8174d9522b4cc63429031a1ecb611bbdabbdb432ec3f211cf331208f84 WHIRLPOOL 8063369ec5b5764c8dcdda47ba184efbcb13aa7b0683028f1c5bf795c02237c48a1403a6503beedaf2fdc76b2ff05eb37a0e5031496ee4ab206b9020a70e8e93
 EBUILD librsvg-2.40.1-r1.ebuild 2363 SHA256 2034f1b1df234a2f511f460270c64696b4c139a759e2e293d6d49f66ef88b77e SHA512 49ec7220c78e8c349fed1ca5a755dcc60d067f308952802fc147fd2e18f6533ea168ae332f49fff3c6a89bcac5dfa9d639c3a79840e26b3a5e7acb01d407e868 WHIRLPOOL f8aff9f7b1d4bc97c990720fc9039e858b9fd59ed456845c5e8f7c42c228124e7b46baa169a92d231a6c0501521195c286163bbae45458f470be9f1707e8bce3
+EBUILD librsvg-2.40.2-r1.ebuild 2721 SHA256 3a8c3101fb54c57115ae822213b311fd57038f55fa1cf8e4ebe623a61d244683 SHA512 5935cb29bf7c40f47b82d8b1ff2e1f44d54830ba6dc47050ef07082cf60a91f9c4fc4f7aeff1242b071da2fbbececa4713c936dda5408fa191e94855aaa8a74b WHIRLPOOL 2c58503330e843c15352bbc19ff31ffb1eca693403a00208dc19231e32331f56e328b3437e2ab2a76f1696beac321e716b0d7df0b13a4e66e6eac0c1ffefcd89
 EBUILD librsvg-2.40.2.ebuild 2298 SHA256 609329df8d369646f6c319cda8d81fe7264940b3ad3d6b893a12db8f07dd7619 SHA512 501ccde77eb3c858b598666244df35972a35e0af153ce77c976c925c59dc823b6a642b8119d9f43843bd08cd028d6f0f8a189b7625c5ee638678fec34b0b2824 WHIRLPOOL b5ffd391ed46642693ebf8e15ac7cc2017955ce1f31ee0bdd647f164701e89c28f7b77eb4603c9bb5d8c53bde8a8def1c4595aa9f7ea6931ce1980b0b2782c4d
-MISC ChangeLog 45165 SHA256 93fc1a45e4cb259091a3b6e1d39979a57a0e8fe0b5235c96469b34c6a9b0ee7b SHA512 5f892c156676b0a1001cc6141673be5a4a810a4dc0d9fcd1516f3f996d6a2d8f4907262e6ae0bec52fd2aeba3dae924fd4e7c21d17bb5901646a519d550d4803 WHIRLPOOL e5463f8a9f982b3c86f939bf8b4e31d5f5935498ba3709ff9ace7783f10574e8b23768a8f47b260f1b0a349b26fa5c8b3369ac30ca268ac41ef509478c1043d5
+MISC ChangeLog 45307 SHA256 20c4b17680b6b8c71ad3ff3826e48b2577aed745d6f3e02a1d9e3f4f84f8b442 SHA512 87fc6163a0d2c6a119b2cd6e70be3468c19116c910f319c711705c1d0652495b48e7ead8a14d247924a3c9bdf51d478b7af3dfdd01c147f7acf4169f4161110b WHIRLPOOL 7de10ffc72f04d20c735fc4d5ad65fffcb34eab1142e73fcfb35f65edb796ff49ae88787b9698b909380f233cf732e274464f2a9f4d872aedf55bf079ebc028c
 MISC metadata.xml 391 SHA256 4204d8b4ba91f579bf4c6db6564541b44257cbd736ca860ddd2ba650ae1b1fba SHA512 7f80de10e7a4e4368d8566e61f14cd0423cee5d8b3bc2e2c04d1a55f3ea86007cf0a9f6cf05dfd3b98a5b58795d36d32b326564791f9a68fa7476bdad0f275ac WHIRLPOOL 707dd74d92cb0ab17509a56f315cc99daf765732c63613388fbb87e2e8812b56d429bddad17be7ed07f653837eaf5fb55888b3958ea0c2790d2697f0451e0692
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTd4DSAAoJELp701BxlEWf+GoP/RqptgNYwFrm1jmsj4SpDCF3
-aTPTmBrPZBjpja/upGbzHuoA/xl+/juntB6FOKByzrLbR4wJNgZC8t0jMJO2Q1RQ
-JE8lGNEiMAZN5Sx3HdwfYS78TKGLerBp/4OP96cDVzD8p6CcO9+ecx9TPvPqkGc4
-/rjemx+GHROWha4hLn1eqPHe+k2PaR2uQJSR1bpHhGw+wWn1SbCysncLItJXhiAb
-XM8XtKDque/S/No+LikMFDiTXnkAfxCJyhQvg3kJT+pe8T4FmvGO+5RqHQVJmrrb
-cM/QK5oPzEXd4CWJ3gslcamBSozGB69PS0jP4JdU7sHf42aQZgFmTBpjjbdImQgZ
-1yPVK8w5w5GKym9vtVWLr3u9NNWzepGjP+uhq1fxWxtCCvXZojVwPvrDKr8m2HGS
-nnPUv3JsM3K60KHqK0heqATabbe0n57J6nnKwfP1Qyg38eZrjkNKc13le1JfW2Xu
-sP2caTAIeNMOG8Tr7qCanQD7EUEAjLLhjWoWUrs5lS/th1ni0yjJZo1Nv36R6bup
-cMGepQaA28mAQcEkUchHx/iXO5CHr/GO1uBHo5nrOG+SuFq0XVlY3j6dHUEf2Mx8
-/i31VbutkKeNYXKxaKJJhHRwPEds/L2RVuDzmAtVVYRSuxzmNXWAchjRLvNTJwvv
-KgZDrtZmNgJijKrTRW1x
-=EMKj
+iQJ8BAEBCABmBQJToKBlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkZAP/ijXx5h49r3FRgaCKobUnTi0
+5YpED8svgFqd7ZXiDvoGHb0OzNEAskyVNS5vPMCnbrDGYxt8VsNeb0q2/iNTblRW
+2wH001LWuFyWc3uwcndosp39BvFoFLbRTsPhbVYNdfCSSAQduzuOfI/J9brqWfsJ
+0czzhhMtUVoTYecYwbdDZfr2LCxprzZoAa4i95fBnpE40ahGXeem5DrAokr3VMpd
+y/v0UYWAbNYUsNOU+H9+vKiIlwgXPV4GGFZXSlJ5SbpmvmUjvRxeLgBzt9EIAnJW
+Lv78vsKyQHNdb1oUew6jA/Dv32SbYa5gTxPKDQRWVEZtnkuTUSlf26dYHvBbra3h
+Vj/SDM9c+rnrm5F6cpL7c0xfIikgqGQ/kZV0PspyGm8MJY7CmNv4CSDEsF3OEFHi
+RIGIgcd362FoT8PK26NuB0dbSObma/YxaEQi+QT+okTxDP+R4unP5HHrKwf170+6
+yhhEKWUFy0sWnNwsj72D/T1PeBXabvcDQ6gdpGxkpxjLEFEjoacutpVw/8xEylIV
+5cFfWFFliCIwbi+99xi5SviLhzlPauRzOydtHwhhRE/+sDLVAJ9IUQoJFeX5S5l+
+R40l5hm1XCketljcxwPJGwWermlwoo6mw8rlO4dXGyKPdSv7d/4GcPtOXnbMw5QI
+eQXCnPUqU70eT54HG9d3
+=igk0
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.40.2-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.2-r1.ebuild
new file mode 100644
index 000000000000..16641129dadb
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.2-r1.ebuild
@@ -0,0 +1,97 @@
+# 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.2-r1.ebuild,v 1.1 2014/06/17 20:09:08 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+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"
+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 )
+	tools? ( >=x11-libs/gtk+-3.2.0:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.13
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	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"
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		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 \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with tools gtk3) \
+		$(multilib_native_use_enable vala) \
+		--enable-pixbuf-loader \
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+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
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}