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

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

6 files changed, 163 insertions, 10 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 4f3a4feb595f..fbf3688f03f8 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.115 2014/10/11 12:26:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.116 2014/11/22 20:45:54 mgorny Exp $
+
+*libsoup-gnome-2.46.0-r1 (22 Nov 2014)
+
+  22 Nov 2014; Michał Górny <mgorny@gentoo.org> +libsoup-gnome-2.46.0-r1.ebuild:
+  Introduce multilib support as needed for x11-libs/gtk+:3.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> libsoup-gnome-2.46.0.ebuild:
   arm stable, bug #512012
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index d62b3c4e08c3..f719e5f6aad6 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -6,13 +6,26 @@ AUX libsoup-gnome-2.46.0-system-lib.patch 7116 SHA256 4cea6b79912fcde4b8362a9ad2
 DIST libsoup-2.44.2.tar.xz 748592 SHA256 e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3 SHA512 f24c318d11aaf0f98d05a673ab87e17da391f1da9d22c63d32532304473ac77a9cc324978346a42a9a21165abd182c11122a33dd7e5d81c8953ba4b0b8e5ae30 WHIRLPOOL 87f201adf26caca64002943e788cf80b07d0fd95b1917a34b90188ae3f0c514cdf41cd1f1e928b0c1083ec7f89a19d031bef014d02fb4f1d9e399c159e2eec1d
 DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
 EBUILD libsoup-gnome-2.44.2.ebuild 1485 SHA256 2fa1e95ac84587505446661572e6e92a2ba2bf16adfa31e292bdbe99ea403ab5 SHA512 f15eed8a8b33b9a703c483723dadab1e54fffc08cacc552c6117cfb71cc842327604152ce7284720c155fca6311440b1975f9d3b975d3f3b00d34f3779e73824 WHIRLPOOL 4d5410fe4bf43b162f12e45d0a57b86d606de973c9ce5c349769a38df97a67567af09504f4448e05c6146bef74f44ec69ca89abe151fdbff5ef0c574b244aee5
+EBUILD libsoup-gnome-2.46.0-r1.ebuild 1735 SHA256 530a4d0a7de97130e2ec7374319a6651aee0b5c5900a3afd3ec1d37dc838ed6f SHA512 79384378f54ff28662d9306c9904b73efd12e84b59b401db4617239df845fe66c52b8db07cea7beca9a7b1d8c9da6e4256a29d5bdefab9b0e048816444b1640b WHIRLPOOL 375477a2720a8d92555f2a1d66c4633ae15b97a9e0924024c61141193e7f2c960d5d1fae1961aab33d5d53918607fac90ce111f8a4d47d6925e23bdbfef167b9
 EBUILD libsoup-gnome-2.46.0.ebuild 1487 SHA256 a07aee9803e5d6625d47a20ea6808f4c220fd53dde07355d6d5fdf80ebceea09 SHA512 415ccdb2beb0548995aea6ce5f1f2b85da306b2d591491b829e3e6ee2a613656517cf624248f6b62637e8359b7cfa836e50590a953d9ba97c70c8cbd6969a40c WHIRLPOOL b7a5893b23970678d9c3fb3b18bb19aaef2f40ad2ddaf6466149cfd51420b1ff3021d5a4c0a768595b9510bcd83d85c6f2362f6a440fd2474ce554a1e7ea252e
-MISC ChangeLog 17707 SHA256 720f82fd8707f7b8598abb4835587824a9b7399c61260bcf249445d47b26aec8 SHA512 cd412db0b1e5c4e16b6c3e1b31064c49234051fe3d3e08fb6a3bcc56dcf567ed162a30592aa6c7ab73d1fbc93cbe50b0827f9d33c4800835e314cc983942d684 WHIRLPOOL 11f9b4c42372e0bd098f8886328e0b06d7ebd0337329d9fdac15ca23d123fcb410f170c39965ded41ac7a976737a67f44001853d063f0192a5ad1dc200d60df4
+MISC ChangeLog 17891 SHA256 018e9b916bfc419c15753bb638081e13e6c525599218a56a9cc96cbb481e43d3 SHA512 62081a409dd3d6ecb11c8ebcffb4b6761e246c62e0bbb1bfad88f0b27d2c48e6261faa09a48cd49f2a235ce5f2cf8c5823292ba9bab2ac2b95e181296d9e9dad WHIRLPOOL f90fef0d83b178d9e2ef8c1afed3b58a8c5729b45ffd3b7b1bf0b5609189a5d8d1001804f19c49cb15f187fdbb903ee426d686d1ce76d2dd5bbec8439e9b30c4
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5IegACgkQkKaRLQcq0GKflwCeOmcuDzXAkYHLqCBBcFf1gphe
-jI8Ani2Zr0z6a0e9PRpToIpFxPfZGrW0
-=hnkv
+iQJ8BAEBCABmBQJUcPYEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpFIQALDokk7r9yT7p2zaFKwEPbAe
+SHjROy9upimajwrhNg3vmfE/S6i5ja5GEpFY/zs3sm2nOzjJHjvtgWBMpQslel5J
+g9llx2CTVgpxq1nptJTJ8xZFHYWXLuptDk2RgGnMrIWjQNaVAynLvCyr0XwJdHhy
+Voa973eT3OAzVV9efNFAj4F91D/ziQ91amC1uMavx3uOOKkV0uGyNuEYApOhHtKf
+qe11nn7ZddNH62Ndl0o0ptMa/sw3v0g27u5Fgz2VOzz4WmKbUx5UH2+Ut72FChBL
+eqvVjLi728hVz+7yAjf4Y+vwHEsTvz8A0Azq8XxPxldPZ02e/e4XHLsVfZW7hRqy
+xJ+XBHEKC8vHvdBpGP8bV6pZxAqpHhZqavtB/WLM4qSbWvrlU/Fq0CEkT9TqYS3d
+sILKTpYzaQFx6M+V3jYj4aPS8L2rnOVJTcnBWIxPaLJQC2x30lr71JD8mWLN5byn
+bheTYY017n6a8n2or20zG7WxmW2U/pXgncQ+Gv/tGO3tHlxu/8skrAbnGtViE+bX
+3w6qsMnM8LpoEoxUnOjZkeoiU9twj6NwrCJjczXiQ5e9NoUPLu8KXGrJB9pBkp7/
+MIWHK8eG03lzjv058pipjOBz+8VqdxwYCU1fJZlQAb95wDMXgpxN0OSLoAvQ4i5I
+/VjXCeuAJK+2EcHpvQgF
+=oyAc
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
new file mode 100644
index 000000000000..642ab78c1af1
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.46.0-r1.ebuild,v 1.1 2014/11/22 20:45:54 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
+	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	>=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Use lib present on the system
+	epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		$(multilib_native_use_enable introspection) \
+		--with-libsoup-system \
+		--with-gnome \
+		--without-apache-httpd
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/rest/ChangeLog b/net-libs/rest/ChangeLog
index ddb54bea1b6d..e0b910ccaa93 100644
--- a/net-libs/rest/ChangeLog
+++ b/net-libs/rest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/rest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/ChangeLog,v 1.27 2014/09/04 15:21:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/ChangeLog,v 1.28 2014/11/22 20:46:13 mgorny Exp $
+
+*rest-0.7.92-r1 (22 Nov 2014)
+
+  22 Nov 2014; Michał Górny <mgorny@gentoo.org> +rest-0.7.92-r1.ebuild:
+  Introduce multilib support as needed for x11-libs/gtk+:3.
 
 *rest-0.7.92 (04 Sep 2014)
 
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 5663955cf84f..2a9defc0c4f8 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -4,13 +4,26 @@ Hash: SHA256
 DIST rest-0.7.91.tar.xz 321120 SHA256 838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a SHA512 3fa63ca2c2b0d2a0bcccdc5cdd2a7b0d55a7e2600c564fe84e638bac4ac3b24d50199c7e65cb0e15946d9f80965165e5f01bc3521e7d797a66ca90e04a31d659 WHIRLPOOL cbc01285445a9785d36a0231230abde336927e4104cffcd994ac6ba01b4b38f560253c244c6eef4af3de4ac3188f49dc46f893bd451d9319c0e178ae3a615911
 DIST rest-0.7.92.tar.xz 321580 SHA256 07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec SHA512 9e30e185b0c2bdbbc507cef35f7c2e286917d2a9a0c97b075b8dea3eb9312e1a0a757185679109ca569de5dda7fee7fd2e6e19a24d7ca66aa9fcf5166dd5de86 WHIRLPOOL 1ade25a20d81e08a937c37f36c051c07eaef1792be1be118e4baf26d283e4ee1ce351b34d698b69bda591641af5644c406e8be8c11a0f8b94c8aedf252ea0d68
 EBUILD rest-0.7.91.ebuild 1141 SHA256 69e67212897ec23e376cabb604c738773394231a7fe9fa401644532031512b90 SHA512 324177558be94f938ad7af5e2ab26a6e6e9a39ac1ab12acd6723331a4ce38317e1bd81984bc8a96ecc5d224c0a2935654fdaaf551e1f8aa1b823d407f6492d92 WHIRLPOOL 09cc69d574583e801a147acfbc259ad6da1c9282d97dca3f767b8a185900d547b12cdf0e819dd7d605f36910a5a9191f6bda494a8f639d660819576b0dd9ad1d
+EBUILD rest-0.7.92-r1.ebuild 1552 SHA256 5f3ac68928e2e560012921d58556eab5db720a6c137d53bd16b948104c5334e2 SHA512 ec9cf77575e316591357485b27dd4968e2551777af93174f42f4cd7d3c27e1beaa144cb7322375327368e72fcef2b4ecb6ed839dcabcfca47eddf9e19405777e WHIRLPOOL 03c31a19197bbd763a2b1270ed19ad32be0101b900228191451016f4614176344ee9839006ce996c5e8e7a0b3c592c04afd4f480c5d8602f4afe3b857f87e52a
 EBUILD rest-0.7.92.ebuild 1151 SHA256 5482e77726a4cb7c161716f48e9296a3a83e00fa8e9ac4349b5bb13b65cfed27 SHA512 83f05efd5e3f3d7911e825cf25ff17ebd1690b098c8eb1e8ac83682cb56488c1f4f3c416ddcc6d8af1333ef6020c4ab8c80a61731a039bc94786be5acf8c0f9a WHIRLPOOL 54cfacebc54604d98594240529c43bcf12937003e8549a2f1760e8ff0410e497d1aca3d5c2b951613884b66e74932318e7f823e357435e0cd63f8415b158434b
-MISC ChangeLog 3562 SHA256 fc6f591a936a6d68cd131133e28611717133cd282d6f9df327e7899011270dc6 SHA512 5e5e7cce793d4b21028c4cb0e538d5c2cb2491c9029e3320fe91ff9466ef30b7981820d3444eabbf635c1af6a7800f8a741b1e8dfbf259acfc754b4336bab153 WHIRLPOOL 7b2dc1dad06f8b55400dbb0e0f0ac574624ca35e9342e39ab05ea92384f33922a8d48e5d9d1a3e7b2e1e56ef6c93c474014e0e26c66f76645a66eea027656728
+MISC ChangeLog 3729 SHA256 e92358ef6bb02acef5ae97d8c50febb099c66d39838250b25cb8aabbe0eb2b00 SHA512 987d26a178ff85b80b164647a02251f7b9d95ec9e83688622a5da38dbd7b1b26cea8848cb064c3328a708bd97ab7b5c55a58f6e09b3b22cbe3fe888266b6d3e6 WHIRLPOOL 67c10d0e30eaa6173e416264ad480cab73a9fd4e93072a8df1e181a71a6df0b1d9ecbfa37b9f0270c100f01332ba4e56fe2a8b483581208635e3563520b5e4d7
 MISC metadata.xml 279 SHA256 688824d65296493f7c53e26eef986d647df2c137a419bc2e55b31eb77c7bd5a0 SHA512 449d5f4daa7de31f2aae7228e492f826fea80c3243255f5be61ef401bf8fc45880528e4e922e9ecd1060f0039c7f0ef37ec0f825f295f9594ae4ed8d9af8fa1c WHIRLPOOL 1aca9c991f4f47907eb08bf9dc75e5d7c7197822948519cb4bc44c6dca3514bd94068b774555ed6d1a527be1c72671c517efe0c40532db12ecf95a99a8e09447
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQIg2sACgkQCaWpQKGI+9TIwQCfTjQKRvn0/I6KHSNCL8fo9W9Q
-AKYAn00nLg7YVPnjX4e69mPaTFT58DBe
-=NOon
+iQJ8BAEBCABmBQJUcPYWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjXwP/3LdmzC8V0SUFLcy11jfqlm3
+Y9OeWOX+r9GK26eT3G/+bFdPeAJUajv7HfyZnccPOl1hTB60A/iyBrRxQEuCXOKx
+Tek+fdeO7LDWl5JMxITTYJ91IIV2DUL9bb2mxO94tsATLp271BbqqGFmJ8bMs7C0
+bKFc/sSTGiiwemgsdpjzHVCK3GcFWFJpaEkBoJWuLdEvTJtlyYPgnyUwHmhb8yMx
+ubo8aVVYtnuahG7lSe5X6KiAfGkTxwmTHQQP+slROOip/cMsgiMmHI7ZRY5zpTsV
+8rP1LAdBr6hTc4I5LohIO+wWYprl9NG9joT9XBJGP3Exy9bCtWawL+hZzjq/qzNr
+8JTbzgfuhPu1BLtovaiyqRyBhxqnBROk+xUj1pPlHA3JAuWW881DP4oyYOrbWAZ6
+d8K44jJi9BqaBaI2ttNEGvYg7OsfvEVne2HemY95vfmZaePSAVyZqodRlYfZVcHn
+tz/ttXN5RiOONFwDxj3xLQ2+AzsetKd6WaXRf2fAHZteXCr2Yz0zt/Y5WRnhRTdq
+5xDQInyqMt++6ZC0vDEIJ8t3zMuvWL/qcRjC13VzhANBIL5eojWICKvPghgmkcj4
+//fIrG/xJ8IsVqO1Yg273rl3OMFiBx1gs4vFJgtry5STufS3A840WV7UqmdbY2M3
+h7ZIF3zg0IgqTHvFwGiB
+=o7M7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/rest/rest-0.7.92-r1.ebuild b/net-libs/rest/rest-0.7.92-r1.ebuild
new file mode 100644
index 000000000000..18637e0ddf98
--- /dev/null
+++ b/net-libs/rest/rest-0.7.92-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/rest-0.7.92-r1.ebuild,v 1.1 2014/11/22 20:46:13 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Helper library for RESTful services"
+HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
+
+LICENSE="LGPL-2.1"
+SLOT="0.7"
+IUSE="+gnome +introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Coverage testing should not be enabled
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+	net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
+	gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-gcov \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(use_with gnome) \
+		$(multilib_native_use_enable introspection)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die
+	fi
+}
+
+multilib_src_test() {
+	# Tests need dbus
+	Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }