New revision, add patch to fix compilation with gcc-4.1.

(Portage version: 2.1.1_pre2-r8)

5 files changed, 97 insertions, 1 deletions

diff --git a/net-libs/soup/ChangeLog b/net-libs/soup/ChangeLog
index b48f1f8fc03c..78d8ace1d159 100644
--- a/net-libs/soup/ChangeLog
+++ b/net-libs/soup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/soup
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/soup/ChangeLog,v 1.24 2006/05/14 14:18:04 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/soup/ChangeLog,v 1.25 2006/08/01 19:34:07 chutzpah Exp $
+
+*soup-0.7.11-r1 (01 Aug 2006)
+
+  01 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/soup-0.7.11-gcc41.patch, +soup-0.7.11-r1.ebuild:
+  New revision, add patch to fix compilation with gcc-4.1.
 
   14 May 2006; Thomas Cort <tcort@gentoo.org> soup-0.7.11.ebuild:
   Stable on alpha.
diff --git a/net-libs/soup/files/digest-soup-0.7.11 b/net-libs/soup/files/digest-soup-0.7.11
index d0f9cca48b8f..5d0e867a1015 100644
--- a/net-libs/soup/files/digest-soup-0.7.11
+++ b/net-libs/soup/files/digest-soup-0.7.11
@@ -1 +1,3 @@
 MD5 61bb2fef816ce164af62f8a3a5bd782e soup-0.7.11.tar.bz2 323824
+RMD160 d63a0af5a4739a6e529bd797e5cb570e872b6d6b soup-0.7.11.tar.bz2 323824
+SHA256 f9c4465f8aafaac099a7de7f5ceccba15d647aaddb8f83a867719e9a370c2863 soup-0.7.11.tar.bz2 323824
diff --git a/net-libs/soup/files/digest-soup-0.7.11-r1 b/net-libs/soup/files/digest-soup-0.7.11-r1
new file mode 100644
index 000000000000..5d0e867a1015
--- /dev/null
+++ b/net-libs/soup/files/digest-soup-0.7.11-r1
@@ -0,0 +1,3 @@
+MD5 61bb2fef816ce164af62f8a3a5bd782e soup-0.7.11.tar.bz2 323824
+RMD160 d63a0af5a4739a6e529bd797e5cb570e872b6d6b soup-0.7.11.tar.bz2 323824
+SHA256 f9c4465f8aafaac099a7de7f5ceccba15d647aaddb8f83a867719e9a370c2863 soup-0.7.11.tar.bz2 323824
diff --git a/net-libs/soup/files/soup-0.7.11-gcc41.patch b/net-libs/soup/files/soup-0.7.11-gcc41.patch
new file mode 100644
index 000000000000..e720a0a52ea9
--- /dev/null
+++ b/net-libs/soup/files/soup-0.7.11-gcc41.patch
@@ -0,0 +1,22 @@
+--- src/libsoup/soup-queue.c.orig	2006-08-01 15:14:39.000000000 -0400
++++ src/libsoup/soup-queue.c	2006-08-01 15:14:50.000000000 -0400
+@@ -30,7 +30,7 @@
+ #include "soup-ssl.h"
+ #include "soup-transfer.h"
+ 
+-static GSList *soup_active_requests = NULL, *soup_active_request_next = NULL;
++GSList *soup_active_requests = NULL, *soup_active_request_next = NULL;
+ 
+ static guint soup_queue_idle_tag = 0;
+ 
+--- src/libsoup/soup-server.c.orig	2006-08-01 15:20:33.000000000 -0400
++++ src/libsoup/soup-server.c	2006-08-01 15:23:08.000000000 -0400
+@@ -312,7 +312,7 @@
+ 	/*
+ 	 * Get request HTTP method
+ 	 */
+-	(gchar *) msg->method = g_strdup (g_getenv ("REQUEST_METHOD"));
++	msg->method = g_strdup (g_getenv ("REQUEST_METHOD"));
+ 
+ 	/* 
+ 	 * Get content length of request body
diff --git a/net-libs/soup/soup-0.7.11-r1.ebuild b/net-libs/soup/soup-0.7.11-r1.ebuild
new file mode 100644
index 000000000000..2ad59deda363
--- /dev/null
+++ b/net-libs/soup/soup-0.7.11-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/soup/soup-0.7.11-r1.ebuild,v 1.1 2006/08/01 19:34:07 chutzpah Exp $
+
+inherit gnome.org libtool eutils
+
+DESCRIPTION="Soup is a SOAP implementation"
+HOMEPAGE="http://www.gnome.org/"
+
+DEPEND=">=dev-util/pkgconfig-0.12.0
+	=dev-libs/glib-1.2*
+	dev-libs/libxml
+	dev-libs/popt
+	ssl? ( dev-libs/openssl )
+	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
+
+IUSE="ssl doc"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~hppa ~ppc ~sparc ~x86"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# fix gcc bailing (#68047)
+	epatch "${FILESDIR}/${P}-gcc3.patch"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+
+}
+
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+	use ssl \
+		&&  myconf="--enable-ssl" \
+		||  myconf="--disable-ssl"
+
+	use doc \
+		&& myconf="${myconf} --enable-gtk-doc" \
+		|| myconf="${myconf} --disable-gtk-doc"
+
+	# disable apache support. too much trouble than
+	# it is worth. it only works with apache1.
+	export ac_cv_path_APXS=no
+	econf \
+		${myconf} \
+		--with-libxml=1 || die
+	# Evolution 1.1 and 1.2 need it with libxml1
+	unset ac_cv_path_APXS
+
+	# dont always work with -j4 -- <azarah@gentoo.org> 9 Nov 2002
+	make || die
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS ABOUT-NLS COPYING* ChangeLog README* INSTALL NEWS TODO
+}