Try to prevent more test failures, bug #413233#c7 by Markus Oehme, drop old.

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

3 files changed, 13 insertions, 67 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 2ced4d743bb5..fbc9d0e71f31 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.312 2013/11/15 20:13:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.313 2013/11/29 21:15:48 pacho Exp $
+
+  29 Nov 2013; Pacho Ramos <pacho@gentoo.org> -libsoup-2.42.2-r1.ebuild,
+  libsoup-2.42.3.1.ebuild:
+  Try to prevent more test failures, bug #413233#c7 by Markus Oehme, drop old.
 
 *libsoup-2.42.3.1 (15 Nov 2013)
 
diff --git a/net-libs/libsoup/libsoup-2.42.2-r1.ebuild b/net-libs/libsoup/libsoup-2.42.2-r1.ebuild
deleted file mode 100644
index 4c2f4c81d060..000000000000
--- a/net-libs/libsoup/libsoup-2.42.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.2-r1.ebuild,v 1.2 2013/09/05 19:01:33 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-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"
-IUSE="debug +introspection samba ssl test"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=dev-libs/libxml2-2:2
-	dev-db/sqlite:3
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	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"
-#	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])"
-
-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
-
-	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
-
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(use_enable introspection) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-}
diff --git a/net-libs/libsoup/libsoup-2.42.3.1.ebuild b/net-libs/libsoup/libsoup-2.42.3.1.ebuild
index 89848aca9610..ec5af64677bd 100644
--- a/net-libs/libsoup/libsoup-2.42.3.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.42.3.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.3.1.ebuild,v 1.1 2013/11/15 20:13:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.42.3.1.ebuild,v 1.2 2013/11/29 21:15:48 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit gnome2 python-any-r1
+inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="https://wiki.gnome.org/LibSoup"
@@ -63,3 +63,9 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
 }
+
+src_test() {
+	# Try to prevent more test failures, bug #413233#c7
+	dbus-launch
+	Xemake check
+}