Restrict tests for now as they hang for some unknown reason, bug #537836, also bug #326957 is pending; drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 18 insertions, 76 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index acf3f958b073..c2480de854e5 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.346 2014/12/23 23:00:59 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.347 2015/01/29 11:19:58 pacho Exp $
+
+  29 Jan 2015; Pacho Ramos <pacho@gentoo.org> -libsoup-2.44.2.ebuild,
+  libsoup-2.48.1.ebuild:
+  Restrict tests for now as they hang for some unknown reason, bug #537836, also
+  bug #326957 is pending; drop old
 
 *libsoup-2.48.1 (23 Dec 2014)
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 63fec587fd6c..d9fd37f90d74 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c
-EBUILD libsoup-2.44.2.ebuild 1903 SHA256 9e2462ef7738f4eb1e01a4d951f2e4192b49c43c8a29ff9a4f3fe9c2ca983bcd SHA512 d5121fc3d8b60cf3baad7d4a49d5a869e27553303c7751699f1ec5c2c519e3c14b1f3f9c6fdd5390b8e7048160b67e2d0d21b400ad4df1d2462f8760a004f4fb WHIRLPOOL e950efc962b016ce3915fc61a9649601f6a0a5132519535d9290983d9fcf5c131e91ed9d7cb991565cd9f52a2f43089513f6189c961cb7be4b55d1c0551c365c
 EBUILD libsoup-2.46.0-r1.ebuild 2811 SHA256 cfb3a2dc946d3599fc019a3ca4e26caf0d84648a62536aa9ea3bd77b1120d006 SHA512 80b7428564f51eef3d52a9f9c4c56cd3ceab4bfcaf062fe86d3b9b8844ce7ab4a0a7e55ea8fff6907c9b7c79b1cf574cc4b8e07d16b8cce2427e6778d7c0646d WHIRLPOOL fc948a5b5be7f42e7c980a02a88fa86c6d5025120dda0fa1f6df1e8603f290b063f03ec74f97d114a50497797dd805278f1c4eae04e426b73bd3b1de365d0115
-EBUILD libsoup-2.48.1.ebuild 2820 SHA256 b5c8d317c2ee2821e1ed729828bbdcc12364329840665af620dd56ddc4b4ac77 SHA512 63ca51e82b3db0af68268fcf13d0bbc24dcf52458d147ae97d11986b6af066ec064afbadb01a5026bb252eac0c282dc273757804ce4bc6d9996f8a1b233c2d2b WHIRLPOOL 9c567dd011773c8136cddebc400f5eeaedece9978044a6271502522bb21f3403027a50bd746c3eab05c12b0ea28ebad85ceb34cf12b18ef9e29b18f41d9224c3
-MISC ChangeLog 45668 SHA256 c1bbe313f53eb9c1e0c5aeb27dfe70da81fa53510bba27ef5e3b95d3b6e56fba SHA512 f97fabb27550aa56cdc6a71aa0e4a11f768f3d9e9f2ee7e5916b8f477b09a963f025b51969653dd317f196aff37aa333156897ab95dbd38f64a2b5be0f199ed8 WHIRLPOOL 79e830db121360807bb8d5ce6670cf8b1c5b3bc6db6485ddb59cae80f687db84b65d16f0327e71ad076bca448961cd953e54373b24eb383fa9d16c6588d89a06
+EBUILD libsoup-2.48.1.ebuild 2918 SHA256 425df64284ca6b44ed1c08ec1a0b63a516ffce9a86e8f50e9ff9f4e6702ed8d3 SHA512 0f1f5610c8a7bd95ab26c709e07cfca5e9a3ae1a5ecdf11677bdedf0f65bbceb5d1bcd64750213d1bfa333a1fe5bfc27cd10ed0fd958f1fce800b997660fad31 WHIRLPOOL 7e0f3e49b462f4c405ceb56e4ecabfba16f82f1472ccf38d02fbe7273046fe81a1e245e2353e79c45d9630490154a6d1b690b1145cee24551004b8a46c5a6438
+MISC ChangeLog 45882 SHA256 217523772468e551fa599bef48518ec7c830dfb201b48e990c33dff77efb09b9 SHA512 77e7b9106f7301b98a06e0b28c5b030dd41bccbd321dfd3fbe822b5dd6b893b7e584eca922e018bd85edb79d3cc10a04d6543f0dd4996302ff73f374e8e5a415 WHIRLPOOL 350437e6dcb0e40f206a944f39cfa33831f77ab0dee80cb9ee9e914a97171241fc78560ea13f8745a1e0f7c27dd11a8cf43ee9c1afe1caaae45b447a3ddb5d26
 MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSZ9CwACgkQ1fmVwcYIWAbEJgCZAX2XJExJzAibaUyDfGTKEx2u
-LwkAoMzNbJ0PXv+1n/35lOvH4x04GI4E
-=s6Be
+iEYEAREIAAYFAlTKF18ACgkQCaWpQKGI+9Rg2gCcDK9MLM65eEBwUPgD3pjd0m0K
+eu8Anj8fPEHaai14iLfZiq4b2irtzdeI
+=r38Y
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.44.2.ebuild b/net-libs/libsoup/libsoup-2.44.2.ebuild
deleted file mode 100644
index a24e6febe3ac..000000000000
--- a/net-libs/libsoup/libsoup-2.44.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.44.2.ebuild,v 1.15 2014/12/23 23:00:59 eva 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="https://wiki.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection samba ssl test"
-KEYWORDS="arm64"
-
-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.48.1.ebuild b/net-libs/libsoup/libsoup-2.48.1.ebuild
index 52f1c44cef0e..7a8eb0b4f4c8 100644
--- a/net-libs/libsoup/libsoup-2.48.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.48.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.48.1.ebuild,v 1.1 2014/12/23 23:00:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.48.1.ebuild,v 1.2 2015/01/29 11:19:58 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
 #		dev-lang/php[apache2,xmlrpc]
 #		net-misc/curl
 #		net-libs/glib-networking[ssl])"
+
+# They hang for some unknown reason, bug #537836, also bug #326957 is pending
+RESTRICT="test"
+
 RDEPEND="${RDEPEND}
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140508-r8