Version bump for gnome-3.6; libsoup's I/O code has been rewritten and improved. Switch to global introspection flag. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 42 insertions, 196 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 7e174be72a30..ecc73872f98c 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.295 2012/10/28 16:28:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.296 2012/12/17 05:14:55 tetromino Exp $
+
+*libsoup-2.40.2 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libsoup-2.36.1.ebuild, -libsoup-2.36.1-r1.ebuild,
+  -files/libsoup-2.36.1-SoupHTTPInputStream-GCancellable.patch,
+  +libsoup-2.40.2.ebuild, metadata.xml:
+  Version bump for gnome-3.6; libsoup's I/O code has been rewritten and
+  improved. Switch to global introspection flag. Drop old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> libsoup-2.38.1.ebuild:
   ia64/sh/sparc stable wrt #427544
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 090639bf3a29..67545cd983b5 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX libsoup-2.34.2-fix-build-without-gnome-with-doc.patch 1834 SHA256 d4c1e1a36eebb9264a2d33b4b6efcc5076c62d9669eed67151b5d777e6112986 SHA512 c67b39f150b492c3044f5dff4de5197033e18d11f76bf2097b5672a8ac30aa1c79f2a2a3b3d80437590bb3493617dd4a8fba5e21bea83e2bbb9bffdb479d1597 WHIRLPOOL 9fce71a8799268540388a0705c12859197bc17ba101c6bbb13c974602609a5ed658e8efe0b565e352ffcd41e20868fea216ad933ead01522d620592073af0b3b
-AUX libsoup-2.36.1-SoupHTTPInputStream-GCancellable.patch 3461 SHA256 3282bdb0f5872bae48392d1ea744c711ed1ac17bcd7ea9e3879e9073c9f66d35 SHA512 a6b49762966028e2ed9c3a7042674690083bdb34a655ab8f6c4f17e47f7b4666835cd76f734cc01664974e62281cd3211e201d3c4cdec4c514bf1fa027b90975 WHIRLPOOL afdf270a2fb30231299fb8ffabaa49de0543092803ed62c3492c2a40b331c46020656bce0e3d99f7446ccfd8acefbb35911cfbeb1b82df55b97fde16010d5e7e
-DIST libsoup-2.36.1.tar.xz 608308 SHA256 73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65 SHA512 6f4ff97ca62758d72687ee00b991306ee65465898292db7ba4202ae09184bd324f2cece185eaf61790d11920853aa72d0c79653507fc3c431862789d22b5bbb7 WHIRLPOOL f41c9a83228f28f48502d4425f6f7d637ac5de9ea157959866dc6f20373739a958abe3670408ea37b39fc5dfb6e330265b41ab60b937892ccedd36912ad2cc11
 DIST libsoup-2.38.1.tar.xz 620832 SHA256 71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a SHA512 57d4327abb59bee0def4fe8419fbb63e3112255a12792405329a25fafa4e8cf2a531a3eade13304adbd27cd94c9a8e6bd25d7f83674978f351ea62de27222127 WHIRLPOOL 38e19a1060270d76685ca3a99a93d441acf8775621f022b6a1a475701848f839189bf868a08736bfec6160fda64f2dd4f6ac1fef8f2ffea98c9f554a506e2e8f
-EBUILD libsoup-2.36.1-r1.ebuild 2185 SHA256 04581d47be3f9b975cdd38740099419a0c34f33622539f610f0fd32bf02d7edf SHA512 4e0fd79d3e0b6b6911afccda13e3ec4917889910d893f5d9e93e564e4fd154b6c09a8cebf067fed8e1254ec57ddec6b2fac7620f385242fc45777f4a58394057 WHIRLPOOL dc94542e81fe39dcc29f849732882842b1e294c964baa662d859805d6df4c214c85aade4063ca5d5d834a0394719f512e9040e5ed45aa818e943cf3b3dbb445a
-EBUILD libsoup-2.36.1.ebuild 2052 SHA256 704d0d1a2226cae842ee4d199898583125392bb4f5138cb542eb4b19906d86f9 SHA512 122f1dc212b9b4f3fc3b9fa6a124534aea209f0ca39e117a1d1529e5797bb0081ebe00a272f920b343db63fb2ab47f015d6e2c9b6baa941b0447a4cbe7e20969 WHIRLPOOL c4d12556dbe7d6889bb14604acedfe6ac04f113d9b25619e7fa9efedb5e1394ac6cf447e346c541a774e992e2729bc660ca7960237a66ee2c84aac981868fd25
+DIST libsoup-2.40.2.tar.xz 707104 SHA256 32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc SHA512 7803517ed8d594ef5ee2cd67e4a16baa91c22057fcf9aa2758a7d88659e6cc357017b79a7e5d32b6dafa4a95eaf5eba2b659616c5675669d891399c309316c93 WHIRLPOOL fc1a1c45f65fab56533d122bb545184e96bdfb5dd5af112ac10ffbc8461f14ab390ca9f7aaf67bf5bcb282fe3a5e6321f6eab7dee63084ee51a79f9aba296f54
 EBUILD libsoup-2.38.1.ebuild 1995 SHA256 b03f25e36298ebdb5d576ec2b068e0748b6d7584e4d8886cada0b613cc59dd61 SHA512 2914117d4494a8f34b42ae2483028b84d90d9e1c5c84789a094d548b79463e5736fef2070e16734bbf624afb53845261340fbc5c9d7da8ee420266f1698294a5 WHIRLPOOL 8d8dd7c571ed9ccd0121007ce6da55b688b04afa1379b34dea1f4439b26dd3177eba8d1b9a56d6c00a01be79175b2963f95f93f34066b985ca4b805774936d32
-MISC ChangeLog 38943 SHA256 cbbd118d6ddcf872a48826a0adc3095ef06ccfeeeef7a8da65f651cecdfcd07a SHA512 34de958f0ab79c64647546354e9c92c879342647f5df1f774fce1769a138918fda0fb93d3ad41084db504a63b765ff7fa4660ece1fefe53de57ac01cdffa9d39 WHIRLPOOL 39bbd2c3c35223998bd7faf8f9b8ca69d90425b344fa1705920b2d8094ba193182cb5c50ed7dd77d5904788910040863fc8c0216cd28b0fcd9e4b1f273c42964
-MISC metadata.xml 360 SHA256 02b6b0b09606924604c828622c68f4e1eb238628561812f354cdae9b7e44b1cd SHA512 f9d4059775f067840d24c764beae3890d7f4d86f357a07e809cf2f6b10023082375453565dd1866e2cb985d3064a7303d6c59de39bf972aa8abbb12b191ad7cd WHIRLPOOL 1b0bda9689a10012da9b0b4099edac8fea685c540f1c99919924e6ead3fa5e7fa98bd4b699a6a3f76d1bf644632e10470eb6e9b931c7a1107a7e786be0a56bb3
+EBUILD libsoup-2.40.2.ebuild 2099 SHA256 4803cef71f7f7bf450b95639f3c151646bab6357f714dd83c093a92d9d562033 SHA512 a9e8e95f195f06605ca20c4b11a409227aa93866415e1851814b5c8cd1d9126067e5e9eeff958a6b0a6c4f0fb4737ef25181833711542bc430eb62311c6361e3 WHIRLPOOL 65767c96ef6b2467ad1c1e1f120530bd8212fc150978b8dee2ac305d2c80e663cac87e9f075be8b3fcc19485798d94ac1e593d9c7e85334b5c7bb658327962a5
+MISC ChangeLog 39324 SHA256 0dae53d530ef5983525757b8a435367f105dfcadd80cc5ecdc1e1b3adbfbf58b SHA512 3627a11a6cc46ac4a88059f32dd9c2e45b511395b434e2405fbac0af9e6be6edac0be9d0b2590e8fec3a8e08befd37f0f1a028e766050549d746ba4e8113bab8 WHIRLPOOL bcdf025f2fff586682519031c8ee64c634325c0b03faeeabc8a47101e9eeb23989b57e6d346169c06164d5fa1d746a7b6a47a74e2ad18449d72c4dc19cb00268
+MISC metadata.xml 257 SHA256 ee7dfc9e6af8bfc278c145d407d4a9c39458109886dba15303cc1c4c9d1c3ea2 SHA512 68402e9d9c7f3aea455729538fd16d692acad9a52861fa5088f2d170c9da1080c3c284fad0232ea042b5efd765e4988802778802979b927f90853ab26a01eb32 WHIRLPOOL 6d61388c9de173897cb4cff9bd1cf5799eea1e57383ace5f5e2a93193eaac9567e548c1faed6d0703c011e81ef98fff413e8801dbf27fb1f2e351d95ebc6699e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNXRwACgkQuQc30/atMkBrhgCffWq+sZMnexLchhrwaMtxbwmV
-OQsAn14IpKLxY4VPKUhNBIz/ups/Tjjr
-=4oB/
+iQEcBAEBCAAGBQJQzqpQAAoJEJ0WA1zPCt1hxvgH/ipGRI2GwRSxfWYJ0HHEPQ/m
+Gf/cKP2JI4QmAPWZ0WViIy1SXRiNMHffrXorzgOhbhYYsmb59zXs6EQ7cAKPaKD2
+ZN5I+6Tk3dWUKD3lgues1mNiNn7h6H9G8R7RwSe82Ur1TsPbSioXMojZ4U1J7Xon
+MQx5AeM/7Cl1iRWiXeAN8bJLB+bN6OZa/Ehtar8nEwHPABNZ5g1f8pd7htV4WymO
+OsYYXqAsNYoTcSiVy9znIu832EblOS0GZFmNEj+gSC/MUcvG7k3nIqqYv35vyobM
+R/uSo0+HcXokFBeyQ+ryhOjfJZHfI3HkhL1HDsSCL6ZkmsNoR+vwFy8T0tUbIDI=
+=E7Lc
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/files/libsoup-2.36.1-SoupHTTPInputStream-GCancellable.patch b/net-libs/libsoup/files/libsoup-2.36.1-SoupHTTPInputStream-GCancellable.patch
deleted file mode 100644
index 9e1a59e62cfb..000000000000
--- a/net-libs/libsoup/files/libsoup-2.36.1-SoupHTTPInputStream-GCancellable.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 856df33301221711789f0db744fce951eb70ba76 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Mon, 23 Jan 2012 12:34:12 -0500
-Subject: [PATCH] SoupHTTPInputStream: don't burn through GCancellable fds
-
-SoupSession limits the number of outgoing TCP connections, but
-SoupRequestHTTP/SoupHTTPInputStream were still using a file descriptor
-for the GCancellable of each request that got queued, even before it
-was sent. This meant that if the app queued 1000ish requests all at
-once (eg, while rendering an HTML page with *lots* of images), we
-would run out of file descriptors.
-
-Fix this by just using the GCancellable::cancelled signal rather than
-g_cancellable_get_fd().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668508
----
- libsoup/soup-http-input-stream.c |   38 ++++++++++++++++----------------------
- 1 files changed, 16 insertions(+), 22 deletions(-)
-
-diff --git a/libsoup/soup-http-input-stream.c b/libsoup/soup-http-input-stream.c
-index 45f181c..c0337e9 100644
---- a/libsoup/soup-http-input-stream.c
-+++ b/libsoup/soup-http-input-stream.c
-@@ -43,7 +43,7 @@ typedef struct {
- 	goffset offset;
- 
- 	GCancellable *cancellable;
--	GSource *cancel_watch;
-+	guint cancel_id;
- 	SoupHTTPInputStreamCallback got_headers_cb;
- 	SoupHTTPInputStreamCallback got_chunk_cb;
- 	SoupHTTPInputStreamCallback finished_cb;
-@@ -323,39 +323,34 @@ soup_http_input_stream_finished (SoupMessage *msg, gpointer stream)
- 		priv->finished_cb (stream);
- }
- 
--static gboolean
--soup_http_input_stream_cancelled (GIOChannel *chan, GIOCondition condition,
--					 gpointer stream)
-+static void
-+soup_http_input_stream_cancelled (GCancellable *cancellable,
-+				  gpointer      user_data)
- {
-+	SoupHTTPInputStream *stream = user_data;
- 	SoupHTTPInputStreamPrivate *priv = SOUP_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
- 
--	priv->cancel_watch = NULL;
-+	g_signal_handler_disconnect (cancellable, priv->cancel_id);
-+	priv->cancel_id = 0;
- 
- 	soup_session_pause_message (priv->session, priv->msg);
- 	if (priv->cancelled_cb)
--		priv->cancelled_cb (stream);
--
--	return FALSE;
-+		priv->cancelled_cb (G_INPUT_STREAM (stream));
- }
- 
- static void
- soup_http_input_stream_prepare_for_io (GInputStream *stream,
- 				       GCancellable *cancellable,
- 				       guchar       *buffer,
--				       gsize count)
-+				       gsize         count)
- {
- 	SoupHTTPInputStreamPrivate *priv = SOUP_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
--	int cancel_fd;
- 
- 	priv->cancellable = cancellable;
--	cancel_fd = g_cancellable_get_fd (cancellable);
--	if (cancel_fd != -1) {
--		GIOChannel *chan = g_io_channel_unix_new (cancel_fd);
--		priv->cancel_watch = soup_add_io_watch (priv->async_context, chan,
--							G_IO_IN | G_IO_ERR | G_IO_HUP,
--							soup_http_input_stream_cancelled,
--							stream);
--		g_io_channel_unref (chan);
-+	if (cancellable) {
-+		priv->cancel_id = g_signal_connect (cancellable, "cancelled",
-+						    G_CALLBACK (soup_http_input_stream_cancelled),
-+						    stream);
- 	}
- 
- 	priv->caller_buffer = buffer;
-@@ -371,10 +366,9 @@ soup_http_input_stream_done_io (GInputStream *stream)
- {
- 	SoupHTTPInputStreamPrivate *priv = SOUP_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
- 
--	if (priv->cancel_watch) {
--		g_source_destroy (priv->cancel_watch);
--		priv->cancel_watch = NULL;
--		g_cancellable_release_fd (priv->cancellable);
-+	if (priv->cancel_id) {
-+		g_signal_handler_disconnect (priv->cancellable, priv->cancel_id);
-+		priv->cancel_id = 0;
- 	}
- 	priv->cancellable = NULL;
- 
--- 
-1.7.8.4
-
diff --git a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild b/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
deleted file mode 100644
index ae6e3358934c..000000000000
--- a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1-r1.ebuild,v 1.13 2012/10/20 06:16:02 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug +introspection samba ssl test"
-
-# glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
-RDEPEND=">=dev-libs/glib-2.30.0:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10"
-#	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])"
-
-pkg_setup() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-}
-
-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
-
-	# Patch from 2.37.x, fixes 'Too many open files' error
-	epatch "${FILESDIR}/${P}-SoupHTTPInputStream-GCancellable.patch"
-
-	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
-	gnome2_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-2.36.1.ebuild b/net-libs/libsoup/libsoup-2.40.2.ebuild
index fec287c1453a..97ccc09f48c0 100644
--- a/net-libs/libsoup/libsoup-2.36.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.40.2.ebuild
@@ -1,30 +1,32 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.13 2012/10/20 06:16:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.40.2.ebuild,v 1.1 2012/12/17 05:14:55 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit gnome2 python
 
 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 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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"
 IUSE="debug +introspection samba ssl test"
 
-# glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
-RDEPEND=">=dev-libs/glib-2.30.0:2
+RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10"
+	=dev-lang/python-2*
+	>=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]
@@ -33,15 +35,8 @@ DEPEND="${RDEPEND}
 #		net-libs/glib-networking[ssl])"
 
 pkg_setup() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
+	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -55,6 +50,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		--without-gnome
+		--without-apache-httpd
+		$(use_enable introspection)
+		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
+
 	# FIXME: we need addpredict to workaround bug #324779 until
 	# root cause (bug #249496) is solved
 	addpredict /usr/share/snmp/mibs/.index
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index 73ad8d8ea155..f96b3e310f95 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
 		<flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
 			Sign-On</flag>
 	</use>