Skip ipv6 tests when no ipv6 support is built

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 39 insertions, 3 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 9ef4b7f9e1c5..d2b25ccac969 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.304 2013/04/17 17:30:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.305 2013/04/18 20:11:25 pacho Exp $
+
+  18 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/libsoup-2.42.1-ipv6-tests.patch, libsoup-2.42.1.ebuild:
+  Skip ipv6 tests when no ipv6 support is built
 
 *libsoup-2.42.1 (17 Apr 2013)
 
diff --git a/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch b/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch
new file mode 100644
index 000000000000..cc71213adc8e
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.42.1-ipv6-tests.patch
@@ -0,0 +1,29 @@
+From ce2043a7a81d2d8c9fba3b87a03df52df99e4115 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Thu, 18 Apr 2013 15:40:55 -0400
+Subject: [PATCH] misc-test: skip the IPv6 server test if there's no IPv6
+ support
+
+https://bugzilla.gnome.org/show_bug.cgi?id=698220
+---
+ tests/misc-test.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/misc-test.c b/tests/misc-test.c
+index a9150a1..39ee960 100644
+--- a/tests/misc-test.c
++++ b/tests/misc-test.c
+@@ -1110,6 +1110,11 @@ do_ipv6_test (void)
+ 	ipv6_server = soup_server_new (SOUP_SERVER_INTERFACE, ipv6_addr,
+ 				       NULL);
+ 	g_object_unref (ipv6_addr);
++	if (!ipv6_server) {
++		debug_printf (1, "  skipping due to lack of IPv6 support\n");
++		return;
++	}
++
+ 	soup_server_add_handler (ipv6_server, NULL, ipv6_server_callback, NULL, NULL);
+ 	soup_server_run_async (ipv6_server);
+ 
+-- 
+1.8.1.4
\ No newline at end of file
diff --git a/net-libs/libsoup/libsoup-2.42.1.ebuild b/net-libs/libsoup/libsoup-2.42.1.ebuild
index a6ff61df7ccd..cbb9fde23a52 100644
--- a/net-libs/libsoup/libsoup-2.42.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.1.ebuild,v 1.1 2013/04/17 17:30:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.1.ebuild,v 1.2 2013/04/18 20:11:25 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit gnome2 python-any-r1
+inherit eutils gnome2 python-any-r1
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
@@ -46,6 +46,9 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
+	# Skip the IPv6 server test if there's no IPv6, upstream bug #698220
+	epatch "${FILESDIR}/${P}-ipv6-tests.patch"
+
 	gnome2_src_prepare
 }