Fix broken build with libsoup-2.4 present on the system

(Portage version: 2.1.4.4)

3 files changed, 133 insertions, 2 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 921c34abfd98..9784b12cfc51 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.229 2008/03/24 23:15:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.230 2008/04/01 20:16:50 leio Exp $
+
+  01 Apr 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/evolution-2.12.3-no-libsoup24.patch, evolution-2.12.3-r1.ebuild:
+  Fix broken build with libsoup-2.4 present on the system
 
 *evolution-2.22.0 (24 Mar 2008)
 
diff --git a/mail-client/evolution/evolution-2.12.3-r1.ebuild b/mail-client/evolution/evolution-2.12.3-r1.ebuild
index d94256645b20..a15291d60f9f 100644
--- a/mail-client/evolution/evolution-2.12.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.12.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.3-r1.ebuild,v 1.2 2008/03/05 19:30:32 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.12.3-r1.ebuild,v 1.3 2008/04/01 20:16:50 leio Exp $
 EAPI="1"
 
 inherit gnome2 flag-o-matic
@@ -117,6 +117,9 @@ src_unpack() {
 	# Fix CVE-2008-0072
 	epatch "${FILESDIR}"/${PN}-CVE-2008-0072.patch
 
+	# Fix build with libsoup-2.4 present on system
+	epatch "${FILESDIR}"/${P}-no-libsoup24.patch
+
 	# Fix tests (again)
 	echo "evolution-addressbook.xml" >> "${S}"/po/POTFILES.in
 	echo "evolution-calendar.xml" >> "${S}"/po/POTFILES.in
diff --git a/mail-client/evolution/files/evolution-2.12.3-no-libsoup24.patch b/mail-client/evolution/files/evolution-2.12.3-no-libsoup24.patch
new file mode 100644
index 000000000000..22d93ce7284f
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.12.3-no-libsoup24.patch
@@ -0,0 +1,124 @@
+Don't check for libsoup-2.4, as using its headers leads to broken compilation.
+It tried it only because the 2.2.10x series for a short time was installed as a new 2.4 in development.
+The real final libsoup-2.4 has API changes that don't work with the usage in this version (2.12.x) of evolution.
+
+--- configure.in.orig	2008-04-01 21:18:44.000000000 +0300
++++ configure.in	2008-04-01 21:28:09.000000000 +0300
+@@ -1518,14 +1518,11 @@
+ AC_SUBST(LIBNOTIFY_LIBS)
+ 
+ dnl --- evolution-calendar flags
+-PKG_CHECK_MODULES(SOUPTEMP, libsoup-2.4, have_libsoup_24="yes", have_libsoup_24="no")
+-if test $have_libsoup_24 = yes; then
+-    LIBSOUP_REQUIRED=2.3.0
+-    LIBSOUP=libsoup-2.4
+-else
+-    LIBSOUP_REQUIRED=2.2.2
+-    LIBSOUP=libsoup-2.2
+-fi
++dnl AC_ARG_VAR is used for keeping the diff against configure small
++AC_ARG_VAR(SOUPTEMP_CFLAGS)
++AC_ARG_VAR(SOUPTEMP_LIBS)
++LIBSOUP_REQUIRED=2.2.2
++LIBSOUP=libsoup-2.2
+ 
+ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
+ AC_SUBST(LIBSOUP_CFLAGS)
+--- configure.orig	2008-04-01 21:18:47.000000000 +0300
++++ configure	2008-04-01 21:28:38.000000000 +0300
+@@ -1989,9 +1989,9 @@
+   LIBNOTIFY_LIBS
+               linker flags for LIBNOTIFY, overriding pkg-config
+   SOUPTEMP_CFLAGS
+-              C compiler flags for SOUPTEMP, overriding pkg-config
++
+   SOUPTEMP_LIBS
+-              linker flags for SOUPTEMP, overriding pkg-config
++
+   LIBSOUP_CFLAGS
+               C compiler flags for LIBSOUP, overriding pkg-config
+   LIBSOUP_LIBS
+@@ -37358,81 +37358,9 @@
+ 
+ 
+ 
+-pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for SOUPTEMP" >&5
+-echo $ECHO_N "checking for SOUPTEMP... $ECHO_C" >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$SOUPTEMP_CFLAGS"; then
+-        pkg_cv_SOUPTEMP_CFLAGS="$SOUPTEMP_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SOUPTEMP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$SOUPTEMP_LIBS"; then
+-        pkg_cv_SOUPTEMP_LIBS="$SOUPTEMP_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SOUPTEMP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+-    fi
+-else
+-	pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        SOUPTEMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
+-        else
+-	        SOUPTEMP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$SOUPTEMP_PKG_ERRORS" >&5
+-
+-	have_libsoup_24="no"
+-elif test $pkg_failed = untried; then
+-	have_libsoup_24="no"
+-else
+-	SOUPTEMP_CFLAGS=$pkg_cv_SOUPTEMP_CFLAGS
+-	SOUPTEMP_LIBS=$pkg_cv_SOUPTEMP_LIBS
+-        { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-	have_libsoup_24="yes"
+-fi
+-if test $have_libsoup_24 = yes; then
+-    LIBSOUP_REQUIRED=2.3.0
+-    LIBSOUP=libsoup-2.4
+-else
+-    LIBSOUP_REQUIRED=2.2.2
+-    LIBSOUP=libsoup-2.2
+-fi
++LIBSOUP_REQUIRED=2.2.2
++LIBSOUP=libsoup-2.2
+ 
+ 
+