Fix broken build with libsoup-2.4 present on the system

Package-Manager: portage-2.1.4.4

4 files changed, 141 insertions, 9 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/Manifest b/mail-client/evolution/Manifest
index fca10db44f25..f7ade58a9bb5 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 AUX evolution-2.10.2-fbsd.patch 1094 RMD160 d1e2ff1fe20f39ea7b2f812ae655f6782485de93 SHA1 74963e72dc0926bb714990432590ff0a1b1bfdba SHA256 226e248ce85db7f6eec28b31e8b69b2adf82e93a11672ee82e0599623247f092
 AUX evolution-2.12.1-mail-remote-broken.patch 563 RMD160 994638aa50c3b1170fb1a70de2999b490f472724 SHA1 58b37ac3463a96789173dbdd55bb72d4e78178a1 SHA256 3d3bc2ab0de5fe6ace2cddad6503287becbeea78e354fbf28337f0af383cb7b4
+AUX evolution-2.12.3-no-libsoup24.patch 3790 RMD160 8a2f44545f5b394c590bda637aa01975443a1e40 SHA1 adbaf7e6d1d9ead80ca19a28cf4c47f4019a224e SHA256 f08bfd5974bf577af059544ae15309cbe410509394f4eab3ee4ec0d90851d25c
 AUX evolution-2.21.3-fbsd.patch 1107 RMD160 7dbbf08ed68124a398b9db64bac6a4b0cecfa9ef SHA1 05f581d030bb81aad2e0f734f432dd23add4b3c2 SHA256 942b81689f9e4b5a1896ec7c810c323bfaeb74d40c6c6683d8dfd8b670236e77
 AUX evolution-2.22.0-e_profile_event_emit.patch 456 RMD160 cceb720be546d6fe16ee71f888d58b2ea7014eac SHA1 d0941ff1a1bf5b425bb36a08b3ddcf03f90dd8cb SHA256 103b0277386398c41e9d6dde3ad1330fb74b429a377554744d2b6d763e9fa2f6
 AUX evolution-CVE-2008-0072.patch 2890 RMD160 8911d13efd9c86d1b95cd844ebeab695e2e80ab6 SHA1 f040da832c681efe7ac85c281ec54f3b991ff6bf SHA256 28a7cda8c1a3aab284d69a7142e74fc345f7130627e180b6de0ae8389e8adbc1
 DIST evolution-2.12.3.tar.bz2 25938535 RMD160 afe803833e213387fde3c180afc91bfc1e792262 SHA1 14861dd497e935074424269f2d1e6c11be56abfe SHA256 1703f6888c1549a1b9b89112bed73504f4ae2db5b2fb8f926adb5cf3a490d6bf
-DIST evolution-2.22.0.tar.bz2 29556434 RMD160 59b1ff729846e61b81e6957635d115485c3817ce SHA1 887cb6d261633508ba2d31ff9f90d4163f69c533 SHA256 03a6842c195d950b1273f7d492b274b40e03311161d5f68ef87f9c45bf2d1e63
-EBUILD evolution-2.12.3-r1.ebuild 5880 RMD160 819d40f7d6499265be85d86e2305b2c2a4dd298f SHA1 64f60999e0db7d6a67200c5c9b2c8c13c70251fc SHA256 2fae5edbf9870efaabb56de2e2f893b1349136fc4e6155ca91d9420bc22aeccf
+DIST evolution-2.22.0.tar.bz2 238420 RMD160 78297bfb1ad018b69ab99a51e9bb9c34e8fd0b47 SHA1 965e18d45d6b2a363f9f0841d88b2f7019e079ac SHA256 f3a171bcc764567a23ea14b5ac44d5d0b78c0f1d87bf7bdff2437e6ab7e425b5
+EBUILD evolution-2.12.3-r1.ebuild 5969 RMD160 8cf10d034ef92e4b986e9b9a15ad766d33584ed0 SHA1 d3e88be18390a08ba1e894bdaa1a3617524557a5 SHA256 189b8bdbeb7b0403f2bb29122ae89ed90b66e434f64cf26427814295cf910c21
 EBUILD evolution-2.22.0.ebuild 4608 RMD160 a76079d938ee0587d5e020e9a5be904616808913 SHA1 b3d6e99624d27fc0eb0befa1114f40081996374c SHA256 ae9560b145c31a5c584ebfb8323e2ca8657bc1382f84e68a8f8f41d00d60f672
-MISC ChangeLog 53321 RMD160 d8654daf78597e9a3a606cbc359d6c59197b9e17 SHA1 e956f894fe57a45b6ba80dde4c86ebb49dfb7622 SHA256 3366ff1d529f1190f0c9dbed269c2717da5761fda52e91aa558ea87df0aeb172
+MISC ChangeLog 53502 RMD160 0242a04410bf895cd510a826328e6cdd9dbb53d8 SHA1 d69c0ddd6fc27c25962eb0754bb40a322995e48a SHA256 906b696a8486e0248be8ebc2156c692a52c26cf201b4efa16897de9c6d796b56
 MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFH6DYx1fmVwcYIWAYRAsIDAJ4jZVCXaqPRoOeK2BWBBP6eOY4BFwCgnnJD
-GDclwURsvm/VRzZUJA1KeD8=
-=eG8F
+iEYEARECAAYFAkfymD0ACgkQkeYb6olFHJdlhACfRFuYhphPeTFJi7KkXOja0SWO
+wqMAnRvCvoUFAKQ7Izo7wZPS7cr21WGq
+=YvoE
 -----END PGP SIGNATURE-----
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
+ 
+ 
+