net-libs/libsoup: 2.46.0-r1 → 2.48.0

3 files changed, 61 insertions, 21 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index ad6e96d6..8d079350 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
+DIST libsoup-2.48.0.tar.xz 1709072 SHA256 ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784 SHA512 9976819e69403eb666dea04e58fe030e730af9a5ef07cacc3abd45944ae695ea1b7276e2cb46a90d24dd613246959939eebd0aea679fb9173fcc00c0413931b9 WHIRLPOOL 284cc721566577237b05727f3e65d16ac24a4ef87d64eae22489a2dfdc03b476f66b4de2622d171565c596a02eb10a4e01343c6b006d9bfef1e201bc572c384b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREKAAYFAlNa1pkACgkQ1fmVwcYIWAb30ACfVyJOADaHSyJrMNsB94AQ17be
-UQ4AmwYVA2IsPlPru+v392AjPk7zfwcL
-=sIkg
+iEYEAREKAAYFAlQ67NIACgkQ1fmVwcYIWAYnxgCfWbinfX/NovqGwXYnRmiDj/Bd
+GgcAoOklPwvzDlyDT77Nn0YhcK4EtZYZ
+=1U8X
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.46.0.ebuild b/net-libs/libsoup/libsoup-2.48.0.ebuild
index d962883a..24efa692 100644
--- a/net-libs/libsoup/libsoup-2.46.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.48.0.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python-any-r1
+inherit gnome2 multilib-minimal python-any-r1
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="https://wiki.gnome.org/LibSoup"
@@ -15,13 +15,13 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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
-	>=dev-libs/libxml2-2:2
-	dev-db/sqlite:3
-	>=net-libs/glib-networking-2.30.0[ssl?]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
 "
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${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,
@@ -38,6 +38,12 @@ DEPEND="${RDEPEND}
 #		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
@@ -58,12 +64,26 @@ src_configure() {
 	# 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 \
-		$(use_enable introspection) \
+		$(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
 }
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index db2012d0..21d1f431 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python-any-r1
+inherit gnome2 multilib-minimal python-any-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -22,14 +22,14 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 	IUSE="${IUSE} doc"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2:2
-	dev-db/sqlite:3
-	>=net-libs/glib-networking-2.30.0[ssl?]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )
 "
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 if [[ ${PV} = 9999 ]]; then
@@ -51,6 +51,12 @@ fi
 #		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 [[ ${PV} = 9999 ]]; then
@@ -72,12 +78,26 @@ src_configure() {
 	# 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 \
-		$(use_enable introspection) \
+		$(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
 }