Introduce multilib support as needed for x11-libs/gtk+:3.

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

3 files changed, 74 insertions, 5 deletions

diff --git a/dev-libs/json-glib/ChangeLog b/dev-libs/json-glib/ChangeLog
index 98f14dff9b21..e736e00005d5 100644
--- a/dev-libs/json-glib/ChangeLog
+++ b/dev-libs/json-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/json-glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.73 2014/10/11 13:45:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/ChangeLog,v 1.74 2014/11/22 20:46:08 mgorny Exp $
+
+*json-glib-1.0.2-r1 (22 Nov 2014)
+
+  22 Nov 2014; Michał Górny <mgorny@gentoo.org> +json-glib-1.0.2-r1.ebuild:
+  Introduce multilib support as needed for x11-libs/gtk+:3.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> json-glib-1.0.2.ebuild:
   arm stable, bug #512012
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index efbe25627019..60edffbf7f70 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -7,13 +7,26 @@ DIST json-glib-1.0.0.tar.xz 547100 SHA256 dbf558d2da989ab84a27e4e13daa51ceaa97eb
 DIST json-glib-1.0.2.tar.xz 550340 SHA256 887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a SHA512 c2934298d146749514706bcafda21e47a815480e2a85ae34560a6e4fd9063be2761786b8f8532965b417ccb18f96d2487ca5118c70d6112b3bbcdfe193bfcefd WHIRLPOOL 67ec22e65b847e7395c3f0a10000191b4d9ea296f24c334b0d1d0f06da4859be7c752a046757c64ec0c07c4c6e314108dc4a5a79f048370bf0682b3bd64af7d1
 EBUILD json-glib-0.16.2.ebuild 898 SHA256 04b4d381c79097cd2bdf0af205ff886934701e1315c3942763061010715dffbf SHA512 6db141f3cc479d4df919f0081f863162565b7cf0298dc15b36b53929a2ff0cd02460afaf092057cd606c6a9609424ab49c1723dd07d38f32d8483bb28fdee2a2 WHIRLPOOL 207ab2efdaa14716bf284b1264217372539db71d6f5ad4353253da5298afc92796f4f5b5bf2d4b3fb60c9f904efd2325713e358b18a2824b64af17b5e6aa2427
 EBUILD json-glib-1.0.0.ebuild 1173 SHA256 5c2c21b8750de123bdf2ef31cd3522cb5463c6e4c8d6c5f803f3a1486dc61412 SHA512 15790c484735c7413e8f174611c2c47c3f726ce6149956f44b20b907e4bf4dce50defef6a4105f93f2afd45cca570929e52116efc9222eb9a2ead8b994d25964 WHIRLPOOL 0f5a2de81f4746fd139004661eec5f6da37644d9edf0fded19099c7a658091e41e266c60862ce243d887bef8461e3d83e7729b2a027be8a2a7aca78a8e17deeb
+EBUILD json-glib-1.0.2-r1.ebuild 1484 SHA256 9a2b987cbd185f39fd2613b5e9893efc16d744d133ddf1cf3e7d12bb710cda45 SHA512 9bdd34fef926f95d13b5eb6645fd90b16314facc91b6aaf472f969605f0720c70f586ca78208f11de8097a77e3aae9d3b2d617236815c930daf528c6eb4b0fa7 WHIRLPOOL c6a05f737a74cb2a152b70a4ff4a7d79789ad703865afa1d6105bfbb929007be64427c55e0b4ca8de1ea5672ddf7dda1645692c771c256fb609e6cbb82cdf72d
 EBUILD json-glib-1.0.2.ebuild 1177 SHA256 005b9fe606a0676fa107ea53da31379547e3ce4921fd4d4738d46c0dca0ed75f SHA512 f6437e480ebfec7597fa810b791af4cfaa65b829683faac8bd1fb914b881aa83a6b69920f6d6aa2208faf49792a96e6222a535d40d43b5104fb61bb0fa0119cc WHIRLPOOL f58c95edcdd26e14ef32812d3ce9d903e7818e2993a78b1321e746683e267e7d04ec7a122c8f54a4a3f089ff006230b3aecf1481b6838c31319f769eba0ff80d
-MISC ChangeLog 9787 SHA256 ce6158d1a193c12a72d88b8b0a00701f52c7108e05d060e6785e5f25cd77861d SHA512 da3ea942b08bce503b98b3c25a277e62e572a5a609129ca7d0fd716bcb05f1005df372032b1caed0a8708704c32a04cdd1eb2d96a6ba514e226591182c53d380 WHIRLPOOL 1d02221a171a7b117f6c604855f63164d15caf7b95179dfe88f939b7539f6fa2d6bac86b4a415876a9bc161a1d3b62f0c060c5f28c2097c2c2f43ca9be6e3f37
+MISC ChangeLog 9961 SHA256 8e78f7efc0680d9571a1b80339e88a596f8cfb7fbfa5d00787a0ec3990adf44d SHA512 6d5d720594d817e5425e0bedeb30c4f6406d07ff9a0684eacc684187ec3c34687435f5c91b182ef101e296a1e3053fd845756ec150a1b689200695fe748086f2 WHIRLPOOL 637bbce41c5da5e2aa12c036778adb0a831f09e9a2926bcdb59784f8cf837cd840b29e01dfe4cf293dcd037e819ebc80da9ab7d09e09bf0e31c1515f2b3ec9b7
 MISC metadata.xml 1060 SHA256 f8c41c5a7e4950f631ab6cdb55ed4e4867dbdb24e9a89b116f9189620a06f6e7 SHA512 b05ed9cb8464da4462cd56044fde8b720dac53276d5a76f1697e536b37d1e96dfb3348c93f2d838559f122050c75c54516527f758da40878c76c8ec772fe5770 WHIRLPOOL cff42f26f1d5de50756271e13b8ba28f9863ed08ed96b6418693fb47009f9d191c9bfbc60dd486140ad482034cf21a92c3c6e17a0c3d67334d63e6488d009047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5NJIACgkQkKaRLQcq0GJ9BgCfRKXfTopKxn1yiK5VnpsbT59t
-id0An041rHwXUExDimzoyEY+GLb4MUC7
-=vU45
+iQJ8BAEBCABmBQJUcPYRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOu7oQALwbpddFlDqH8mvDtw1ykXMS
+uNPOKreJ9HWzNNTSFMaEE5f+ZFXMNAfy9kxaLaIfMuEW2FNuPDAe8/7Ypo5hx9Mc
+ggKaaYtGd4NDI/IbYO6IFx6M8h3MxP0ugOBm4+S/9+sYXYhFkyXDCgRma3crOjqe
+dHhn5MBMf20maRqesFn4fFu+0PiQT1UztDRjuZO9s2WHz7hX49vOyLHZEtTFPhIw
+ekY8fEAGQJrjj5XSDpPckiT5O4ESsI5yNxXE1I8hCqx2gyA/MNcmIgmUQSrhA/+W
+qPkLH0avFvb486fsBsuU6u+j701n1+pe7DekFQeeDO0OzTLMxICWnupMMjFDiSpg
+lz6tqowXGCPT5ALAH4ajm0xjYlXsAY0cMDvn1DaFUVJAKrN9B+VWorUQMW9GEh67
+CF5O8c3rMnSGSHSYSmMrFOxytuvRVj/LanPijmIV74VhT/hOThdMVdmt5bvi+j1J
+RQbgY+E646/oDQNxlZ4RN5vk4uMSgVf/UDV08jisxzp0/yxPk/z4OZfbIUhdxvPa
+J/SPzvm/bqvaASjKVXDpBrb5GlSpybXapI7xUp+MbbzKyh1ux+VThVJ0H8iNLtm0
+2x+wcNYeIgTIf3YruhP1w8fIoBwR9MJ2VSqI1k4YmrtNG8FKr4IkrraV3LpZ6dtM
++JpKGt4L1F196JHlkCvA
+=h7eK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/json-glib/json-glib-1.0.2-r1.ebuild b/dev-libs/json-glib/json-glib-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..7232497bbf9f
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.0.2-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-glib/json-glib-1.0.2-r1.ebuild,v 1.1 2014/11/22 20:46:08 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+DEPEND="${RDEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# Do not touch CFLAGS
+	sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die
+}
+
+multilib_src_configure() {
+	# Coverage support is useless, and causes runtime problems
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--enable-man \
+		--disable-gcov \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(multilib_native_use_enable introspection)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/reference/html doc/reference/html || die
+	fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }