3 files changed, 113 insertions, 6 deletions
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index e7d4d6232d82..0e16fb6dee71 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.331 2014/04/27 17:45:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.332 2014/06/08 12:55:19 mgorny Exp $
+
+*libsoup-2.46.0-r1 (08 Jun 2014)
+
+  08 Jun 2014; Michał Górny <mgorny@gentoo.org> +libsoup-2.46.0-r1.ebuild:
+  Enable multilib support.
 
 *libsoup-2.46.0 (27 Apr 2014)
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 633ef4446cfb..917200ee0ff7 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -4,13 +4,26 @@ Hash: SHA256
 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-2.44.2.ebuild 2084 SHA256 348e77f8610d5dbf9215a97688fd989dde6acf23ef5ea6f7c4e7388b5802d93d SHA512 14f0521b1ee0e882bd6689802761d3e438798ffd6f7dcc57ed5376ff652eb8c736f77255fa2c1e69fff1935517dfb7559522b155d82df5c963ffcb7f510e1d09 WHIRLPOOL 160791901cc08d39dc7fac1e2508d0008175bd5d604899034850feb26e8891ee732e5dfc07388bba60fa6e3667e9895250c1953aa172b984b2a373bf47c82150
+EBUILD libsoup-2.46.0-r1.ebuild 2737 SHA256 634ee67b2caa71da3fb4e417d2a0de6e4ad6702d9e70786a580057d80ce28866 SHA512 2fca69b4e2f84d5df76f5356d0fbbbe9e647176d91671d9eb59a1f031a75f859b04a4ace88f9155ba6be93dd356a3828fefa6fd975720ce30d6fc96c32cf215e WHIRLPOOL 49a3634c4451982252592cbbe155c681563b83f230fd8407492e58501266a81c4f7f8877b0d8200e1607bc16124710157ac8357b2295d247ed57f6329d5cf060
 EBUILD libsoup-2.46.0.ebuild 2200 SHA256 12b5d4ef6b576bbcdbb6559ae932526fffa4258741d6a0327765fd4548b0a1fa SHA512 68c0d0afe663707b221863a7a2ad4aa7495df9ad3775764d62ec267b8552799eb620b2da0b425fe45197345dda50c7cd0e93705bfe8dc4aa28e696d504eb68d9 WHIRLPOOL fb7ab20f9d0e263ab147098f506445da93f3db845582bc751b610c389ece765fb36a3ed017cf1034ed043ad1a73c06e0653d58c8eba03b122fef2f90b3431f3d
-MISC ChangeLog 43731 SHA256 dabfecf3ff59392c1a2992c2db82823ed167e7617dff9a528f0640f2e4b8f6fb SHA512 5c77244a8e67eb1ad9d03561f5860266efc68027d4358bc80ef610f09dce9f2dfcb4abd7d9f3a81b70a696f6dbf10782e0b13c13ab849531edb79edff5126ade WHIRLPOOL f5f76a8c99521c51fc39866566c6be518f97ba2609edc392cae701b0a342f5b888968efa5ce34aebebf1125d0805a5cb214d394c388f851a0e33b65e03cf9f89
+MISC ChangeLog 43873 SHA256 1a1da0c7058d81fe053e6c60a333649e2cfefb10bc7dd45bb211d416d2144551 SHA512 a148113e732ccf504c6a055e35a54e158b008d95b6e4300c1fc478c29197509771ffb7a90d07e9bf9417591b08889f1550ec51c9880eb13f66e25a089fa8f07a WHIRLPOOL c2b2d5a5170d0ea49eb5201b3eac72f105ffd810e95a8dacc6036fa8b848e2b8876c91b496a4627c400ee86b1f7a94b7efa1eaaf33202da4ea3c8ce9a51bb37f
 MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNdQiAACgkQ1fmVwcYIWAZ4GwCguR8r3LaHqAi+nMmOOYxkttnK
-jnQAoOJ3fZmUvHs19+5avCIHgPx+UHw5
-=FJ/q
+iQJ8BAEBCABmBQJTlF05XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnU8P/27b6B6pkGmazElv8+Vwo5Ue
+SA9E54cWhFPRF6eza7UvQk3nYmZ5Y+cN/qM71smPCKzSTjyw/hMA+JtmMROZYq8i
+Ft8h9bVeYMjw/evKXs+yGDJU+69L0BCuVg9BwBDd7/6vYS2ruSInqp5+Q+nkQn9j
+TkZxiR3cntpkt1pLnifOsJ1BlOxcKYKmNvklTcc6TSmA8iVMcNRW6ywD3EFo4TgH
+tDDlrutqQnDyLmISH1nIh4lIbJvQlZSF6HAWQ/+41kwBU3dAbTHVNZA55EByHM/W
+XWXNwYvsnSy4hYOevnLuenRtr6VMOPWOyI9oj7izTVX4/cnO3xzL6EY197j0jncv
+iclsByL37t1XAtzgPgVfJyWa6/rdsH0Hpk/LJKuZ9YRVAe+QFVogHzTFfsLOCtCy
+wkatbkwV5vUyKakbOl1q+7wv+bTFpM0ho5iuEz2vSp2F5FouobQsDQkCKXp2WL4U
+5Ri4/F9dSilPn9Vb8bBu8lMpmJ72D5Eqal3LAEsdk5SY7Yj6JqOdutbMxojUtKdF
+6ADduidlFHaLksltI+WeOYB3Y7RamlEUfxYRlA7rwDv9DNtJWXn+BwXLEFpFP0BS
+/62C1gyZnBQI4echgg1uOYAzqHzqiAegTcWutCG2fUiw7z8ora1HLNeenXXSx61U
+RZL/fNeqqhgJ7XlEflkY
+=NQZc
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.46.0-r1.ebuild b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
new file mode 100644
index 000000000000..bc32f54595c2
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.46.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.46.0-r1.ebuild,v 1.1 2014/06/08 12:55:19 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 multilib-minimal python-any-r1
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="https://wiki.gnome.org/LibSoup"
+
+LICENSE="LGPL-2+"
+SLOT="2.4"
+IUSE="debug +introspection samba ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2:2[${MULTILIB_USEDEP}]
+	dev-db/sqlite:3[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.30.0[ssl?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	samba? ( net-fs/samba )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.10
+	sys-devel/gettext
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests (bug #226271)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# FIXME: does not behave as expected
+	sed -e 's|\(g_test_add.*\)|/*\1*/|' \
+		-i tests/socket-test.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tls-check \
+		--without-gnome \
+		--without-apache-httpd \
+		$(multilib_native_use_enable introspection) \
+		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
+
+	if multilib_is_native_abi; then
+		# fix gtk-doc
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}