Fix broken build with libsoup-2.4 present on the system

(Portage version: 2.1.4.4)

3 files changed, 164 insertions, 3 deletions

diff --git a/gnome-extra/evolution-webcal/ChangeLog b/gnome-extra/evolution-webcal/ChangeLog
index 77840fff33dc..963fe54476fe 100644
--- a/gnome-extra/evolution-webcal/ChangeLog
+++ b/gnome-extra/evolution-webcal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-webcal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-webcal/ChangeLog,v 1.85 2008/03/26 22:39:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-webcal/ChangeLog,v 1.86 2008/04/01 21:06:01 leio Exp $
+
+  01 Apr 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/evolution-webcal-2.12.0-no-libsoup24.patch,
+  evolution-webcal-2.12.0.ebuild:
+  Fix broken build with libsoup-2.4 present on the system
 
 *evolution-webcal-2.21.92 (26 Mar 2008)
 
diff --git a/gnome-extra/evolution-webcal/evolution-webcal-2.12.0.ebuild b/gnome-extra/evolution-webcal/evolution-webcal-2.12.0.ebuild
index af282a3ab1e8..829001d722cd 100644
--- a/gnome-extra/evolution-webcal/evolution-webcal-2.12.0.ebuild
+++ b/gnome-extra/evolution-webcal/evolution-webcal-2.12.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-webcal/evolution-webcal-2.12.0.ebuild,v 1.8 2008/01/29 18:02:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-webcal/evolution-webcal-2.12.0.ebuild,v 1.9 2008/04/01 21:06:01 leio Exp $
 EAPI="1"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A GNOME URL handler for web-published ical calendar files"
 HOMEPAGE="http://www.gnome.org/"
@@ -26,3 +26,10 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog TODO"
 USE_DESTDIR="1"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix build with libsoup-2.4 present on the system
+	epatch "${FILESDIR}/${P}-no-libsoup24.patch"
+}
diff --git a/gnome-extra/evolution-webcal/files/evolution-webcal-2.12.0-no-libsoup24.patch b/gnome-extra/evolution-webcal/files/evolution-webcal-2.12.0-no-libsoup24.patch
new file mode 100644
index 000000000000..5cb2d2c231bd
--- /dev/null
+++ b/gnome-extra/evolution-webcal/files/evolution-webcal-2.12.0-no-libsoup24.patch
@@ -0,0 +1,149 @@
+--- configure.ac.orig	2008-04-01 23:34:47.000000000 +0300
++++ configure.ac	2008-04-01 23:38:17.000000000 +0300
+@@ -28,8 +28,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ AM_GCONF_SOURCE_2
+ 
+-# Check for libsoup-2.4 and fall back to 2.2 if not found
+-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, LIBSOUP_API=2.4, LIBSOUP_API=2.2)
++LIBSOUP_API=2.2
+ 
+ PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.4 libgnome-2.0 >= 2.14 libgnomeui-2.0 libecal-1.2 >= 1.1.0 libsoup-$LIBSOUP_API >= 2.1.8)
+ AC_SUBST(EVOLUTION_WEBCAL_CFLAGS)
+--- configure.orig	2008-04-01 23:34:50.000000000 +0300
++++ configure	2008-04-01 23:38:20.000000000 +0300
+@@ -748,8 +748,6 @@
+ GCONF_SCHEMAS_INSTALL_TRUE
+ GCONF_SCHEMAS_INSTALL_FALSE
+ PKG_CONFIG
+-LIBSOUP_CFLAGS
+-LIBSOUP_LIBS
+ EVOLUTION_WEBCAL_CFLAGS
+ EVOLUTION_WEBCAL_LIBS
+ LIBOBJS
+@@ -765,8 +763,6 @@
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
+-LIBSOUP_CFLAGS
+-LIBSOUP_LIBS
+ EVOLUTION_WEBCAL_CFLAGS
+ EVOLUTION_WEBCAL_LIBS'
+ 
+@@ -1368,10 +1364,6 @@
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   PKG_CONFIG  path to pkg-config utility
+-  LIBSOUP_CFLAGS
+-              C compiler flags for LIBSOUP, overriding pkg-config
+-  LIBSOUP_LIBS
+-              linker flags for LIBSOUP, overriding pkg-config
+   EVOLUTION_WEBCAL_CFLAGS
+               C compiler flags for EVOLUTION_WEBCAL, overriding pkg-config
+   EVOLUTION_WEBCAL_LIBS
+@@ -6890,7 +6882,8 @@
+ 
+ 
+ 
+-# Check for libsoup-2.4 and fall back to 2.2 if not found
++LIBSOUP_API=2.2
++
+ 
+ 
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+@@ -7013,78 +7006,6 @@
+ fi
+ 
+ pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for LIBSOUP" >&5
+-echo $ECHO_N "checking for LIBSOUP... $ECHO_C" >&6; }
+-
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$LIBSOUP_CFLAGS"; then
+-        pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_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_LIBSOUP_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 "$LIBSOUP_LIBS"; then
+-        pkg_cv_LIBSOUP_LIBS="$LIBSOUP_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_LIBSOUP_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
+-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
+-        else
+-	        LIBSOUP_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 "$LIBSOUP_PKG_ERRORS" >&5
+-
+-	{ echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-                LIBSOUP_API=2.2
+-elif test $pkg_failed = untried; then
+-	LIBSOUP_API=2.2
+-else
+-	LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
+-	LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
+-        { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-	LIBSOUP_API=2.4
+-fi
+-
+-
+-pkg_failed=no
+ { echo "$as_me:$LINENO: checking for EVOLUTION_WEBCAL" >&5
+ echo $ECHO_N "checking for EVOLUTION_WEBCAL... $ECHO_C" >&6; }
+ 
+@@ -8043,15 +7964,13 @@
+ GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
+ GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim
+ PKG_CONFIG!$PKG_CONFIG$ac_delim
+-LIBSOUP_CFLAGS!$LIBSOUP_CFLAGS$ac_delim
+-LIBSOUP_LIBS!$LIBSOUP_LIBS$ac_delim
+ EVOLUTION_WEBCAL_CFLAGS!$EVOLUTION_WEBCAL_CFLAGS$ac_delim
+ EVOLUTION_WEBCAL_LIBS!$EVOLUTION_WEBCAL_LIBS$ac_delim
+ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5