Marking 2.2.3 stable (x86). Modified patch for 1.99.28 to fix bug #82654.

(Portage version: 2.0.51.22-r1)

7 files changed, 62 insertions, 42 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index a3ce976e6481..186f19ebf074 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.56 2005/05/11 13:36:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.57 2005/05/30 06:31:59 leonardop Exp $
+
+  30 May 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-1.99.28.ebuild,
+  files/libsoup-1.99.28-gnutls.patch:
+  Modified gnutls patch so libsoup compiles with recent versions of it.
+  Resolves bug #82654.
+
+  29 May 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-2.2.3.ebuild:
+  Stable on x86.
 
   11 May 2005; Guy Martin <gmsoft@gentoo.org> libsoup-2.2.2.ebuild:
   Stable on hppa.
diff --git a/net-libs/libsoup/files/digest-libsoup-2.2.0 b/net-libs/libsoup/files/digest-libsoup-2.2.0
deleted file mode 100644
index 907c0f808dcf..000000000000
--- a/net-libs/libsoup/files/digest-libsoup-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c47b1985e4e55a0916db6888a7374a92 libsoup-2.2.0.tar.bz2 403612
diff --git a/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch b/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch
deleted file mode 100644
index 0eb987dcc7a0..000000000000
--- a/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u libsoup/soup-gnutls.c.old libsoup/soup-gnutls.c
---- libsoup/soup-gnutls.c.old	2004-01-20 01:00:23.000000000 +0000
-+++ libsoup/soup-gnutls.c	2004-01-20 01:05:17.000000000 +0000
-@@ -58,7 +58,6 @@
- 
- 	if (status & GNUTLS_CERT_INVALID ||
- 	    status & GNUTLS_CERT_NOT_TRUSTED ||
--	    status & GNUTLS_CERT_CORRUPTED ||
- 	    status & GNUTLS_CERT_REVOKED)
- 	{
- 		g_warning ("The certificate is not trusted.");
diff --git a/net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch b/net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch
new file mode 100644
index 000000000000..20b4d4ef78c5
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch
@@ -0,0 +1,48 @@
+diff -NurdB libsoup-1.99.28/libsoup/soup-gnutls.c libsoup-1.99.28-patched/libsoup/soup-gnutls.c
+--- libsoup-1.99.28/libsoup/soup-gnutls.c	2003-03-31 17:32:48.000000000 -0500
++++ libsoup-1.99.28-patched/libsoup/soup-gnutls.c	2005-05-30 00:20:21.000000000 -0500
+@@ -76,8 +76,9 @@
+ 	}
+ 
+ 	if (status & GNUTLS_CERT_INVALID ||
++#ifdef GNUTLS_CERT_NOT_TRUSTED
+ 	    status & GNUTLS_CERT_NOT_TRUSTED ||
+-	    status & GNUTLS_CERT_CORRUPTED ||
++#endif
+ 	    status & GNUTLS_CERT_REVOKED)
+ 	{
+ 		g_warning ("The certificate is not trusted.");
+@@ -328,31 +329,19 @@
+ static gboolean
+ init_dh_params (void)
+ {
+-	gnutls_datum prime, generator;
+-
+ 	if (gnutls_dh_params_init (&dh_params) != 0)
+ 		goto THROW_CREATE_ERROR;
+ 
+-	if (gnutls_dh_params_generate (&prime, &generator, DH_BITS) != 0)
+-		goto THROW_CREATE_ERROR;
+-
+-	if (gnutls_dh_params_set (dh_params, prime, generator, DH_BITS) != 0)
++	if (gnutls_dh_params_generate2 (dh_params, DH_BITS) != 0)
+ 		goto THROW_CREATE_ERROR;
+ 
+-	free (prime.data);
+-	free (generator.data);
+-
+ 	return TRUE;
+ 
+-    THROW_CREATE_ERROR:
++THROW_CREATE_ERROR:
+ 	if (dh_params) {
+ 		gnutls_dh_params_deinit (dh_params);
+ 		dh_params = NULL;
+ 	}
+-	if (prime.data)
+-		free (prime.data);
+-	if (generator.data)
+-		free (generator.data);
+ 	return FALSE;
+ }
+ 
diff --git a/net-libs/libsoup/libsoup-1.99.28.ebuild b/net-libs/libsoup/libsoup-1.99.28.ebuild
index 8ef39c8f0642..01ccd9b70095 100644
--- a/net-libs/libsoup/libsoup-1.99.28.ebuild
+++ b/net-libs/libsoup/libsoup-1.99.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.28.ebuild,v 1.12 2005/01/23 01:31:27 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.28.ebuild,v 1.13 2005/05/30 06:31:59 leonardop Exp $
 
 inherit gnome.org libtool eutils
 
@@ -14,7 +14,7 @@ IUSE="gnutls"
 
 RDEPEND=">=dev-libs/glib-2.0
 	!gnutls? ( dev-libs/openssl )
-	gnutls?  ( net-libs/gnutls )"
+	gnutls?  ( >=net-libs/gnutls-1 )"
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	dev-libs/popt
 	sys-devel/automake
@@ -24,7 +24,7 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 src_unpack() {
 	unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-1.99.26-msn.patch
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-1.99.26-gnutls_1.0.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-gnutls.patch
 	# added --with-ssl=openssl|gnutls to choose between the two.
 	export WANT_AUTOCONF=1.4
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-1.99.26-with_ssl.patch
diff --git a/net-libs/libsoup/libsoup-2.2.0.ebuild b/net-libs/libsoup/libsoup-2.2.0.ebuild
deleted file mode 100644
index efd8a66b99ef..000000000000
--- a/net-libs/libsoup/libsoup-2.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.0.ebuild,v 1.5 2005/01/23 01:31:27 swtaylor Exp $
-
-inherit gnome2
-
-DESCRIPTION="Soup is a SOAP implementation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="ssl doc ipv6"
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	ssl? ( >=net-libs/gnutls-1.0
-		>=dev-libs/libgpg-error-0.4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.0 )"
-
-G2CONF="${G2CONF} $(use_enable ssl) $(use_enable ipv6)"
-DOCS="AUTHORS ChangeLog README* TODO"
diff --git a/net-libs/libsoup/libsoup-2.2.3.ebuild b/net-libs/libsoup/libsoup-2.2.3.ebuild
index fda8696b3e10..731ad64a993b 100644
--- a/net-libs/libsoup/libsoup-2.2.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.3.ebuild,v 1.1 2005/03/21 11:43:56 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.3.ebuild,v 1.2 2005/05/30 06:31:59 leonardop Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ssl doc ipv6"
 
 RDEPEND=">=dev-libs/glib-2