added patch to deal with libgcrypt-1.1.91 changes. (#40016,#37732)

4 files changed, 23 insertions, 6 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 4e6d0a863b35..471ab3681b7e 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libsoup
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.21 2004/01/05 18:39:09 weeve Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.22 2004/02/04 18:23:50 liquidx Exp $
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> libsoup-1.99.26-r1.ebuild:
+  added patch to deal with libgcrypt-1.1.91 changes. (#40016,#37732)
 
   05 Jan 2004; Jason Wever <weeve@gentoo.org> libsoup-1.99.26-r1.ebuild:
   Marked stable on sparc.
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index caad71194337..102d5bc23af8 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,12 +1,13 @@
-MD5 396f20437604059e5eb73b5c4554987a ChangeLog 2807
+MD5 1cf9d5ffe7d8a46dc0308f970c9daba0 ChangeLog 2955
 MD5 f512ef86c6c90d0192f989c609ab7f91 libsoup-1.99.22.ebuild 840
 MD5 1185b3561a784c1655c1f79b6cc3f4f0 libsoup-1.99.23.ebuild 845
-MD5 b66b7d80a9da8f34f56fb617268a3a36 libsoup-1.99.26-r1.ebuild 1236
+MD5 77d192e7803ccc7cfba1bea197b1729f libsoup-1.99.26-r1.ebuild 1329
 MD5 8f6eb89d5f8ca4ee5eeb93f2de3656dc libsoup-1.99.26.ebuild 1156
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4ed2ee4ad5a6e2b7041129cabbcb78d2 files/digest-libsoup-1.99.22 68
 MD5 f45a9e30ed0c538e279fc46a19c88bbf files/digest-libsoup-1.99.23 68
 MD5 ceb6a90e8f49bead5b674b989de37ad7 files/digest-libsoup-1.99.26 68
 MD5 ceb6a90e8f49bead5b674b989de37ad7 files/digest-libsoup-1.99.26-r1 68
+MD5 4cf83ac1dc09f7d21c0a29bf231bfe94 files/libsoup-1.99.26-gnutls_1.0.patch 414
 MD5 6128cc7bbf088e07b4040e8296a7c57b files/libsoup-1.99.26-msn.patch 627
 MD5 09a0c3f27613d90ffeb8abb875598ace files/libsoup-1.99.26-with_ssl.patch 2861
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
new file mode 100644
index 000000000000..0eb987dcc7a0
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch
@@ -0,0 +1,11 @@
+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/libsoup-1.99.26-r1.ebuild b/net-libs/libsoup/libsoup-1.99.26-r1.ebuild
index 81c1485c7078..0b10cc11d54a 100644
--- a/net-libs/libsoup/libsoup-1.99.26-r1.ebuild
+++ b/net-libs/libsoup/libsoup-1.99.26-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.26-r1.ebuild,v 1.8 2004/01/05 18:39:09 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.26-r1.ebuild,v 1.9 2004/02/04 18:23:50 liquidx Exp $
 
 inherit gnome.org libtool
 
@@ -25,7 +25,9 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-msn.patch
+	EPATCH_OPTS="-d ${S}"  epatch ${FILESDIR}/${P}-gnutls_1.0.patch
 	# added --with-ssl=openssl|gnutls to choose between the two.
+	export WANT_AUTOCONF=1.4
 	epatch ${FILESDIR}/${P}-with_ssl.patch
 	cd ${S}; autoconf
 }