Clean up old revisions.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

7 files changed, 13 insertions, 433 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index f56ad1973db0..a7a8c7c05673 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.85 2009/03/15 22:08:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.86 2009/03/16 22:31:21 eva Exp $
+
+  16 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/evolution-exchange-2.12.3-fix-locks.patch,
+  -files/evolution-exchange-2.12.3-no-libsoup24.patch,
+  -evolution-exchange-2.12.3-r1.ebuild,
+  -evolution-exchange-2.22.3-r1.ebuild, -evolution-exchange-2.24.2.ebuild:
+  Clean up old revisions.
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org>
   evolution-exchange-2.24.4.ebuild:
diff --git a/gnome-extra/evolution-exchange/Manifest b/gnome-extra/evolution-exchange/Manifest
index 735456690110..a706e8df8d6e 100644
--- a/gnome-extra/evolution-exchange/Manifest
+++ b/gnome-extra/evolution-exchange/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX evolution-exchange-2.12.3-fix-locks.patch 4460 RMD160 935a763c56441b8c500aa1347aa74f44bb6b8b8b SHA1 e0226c670f6b008111c18ef7ab5137f0b7d85df1 SHA256 434cda88f36a7e145b3730e523c2ff2dcb77c80f3139060bf62a1308f8e8e547
-AUX evolution-exchange-2.12.3-no-libsoup24.patch 3754 RMD160 2b7148cc62028b75f3928f0fe94e91f51b19bc5f SHA1 22dac24671c43da7de5d26911443ebe37dae44fb SHA256 8bd039e257ef86f824775a9b329026e1a13cd8caa4789de21a2a88b83a3c6bc6
 AUX evolution-exchange-2.22.3-addressbook-crash.patch 1605 RMD160 8207035e781604cb8af5a534620f954438da7fe1 SHA1 14b627c06cb594446702e9fe69c3a0dd472f562c SHA256 72eff19232c9f83181c45d2fb8620d61e4757c92711d42a9f1c53c0015bc8623
 AUX evolution-exchange-2.22.3-exchange-contact.patch 2526 RMD160 d1447f8ceeeb93978fd4cb4502767fd932ce32d8 SHA1 c218a7ae822a177dba056509a64e197a3320a704 SHA256 4bedee77476ca90a29e8bdaa0c66485edd877f545ce12db2b50f6c3fba5f5d04
-DIST evolution-exchange-2.12.3.tar.bz2 1064907 RMD160 751c386011846d630228ba976e203b39e373f782 SHA1 099f61a31528b7cb6f14f382eb39e7e2e110dcd5 SHA256 96f86d5a36f9f5583e5d4c14e6e48d0a42ccd4f7e4e04bf8b5616232cd82b50b
 DIST evolution-exchange-2.22.3.tar.bz2 1082324 RMD160 ef81a7ba6cff7d407ff91fea778a0edf1bfe9c99 SHA1 162383003589100f0239612e2d184cb720164de2 SHA256 6c00be9ba87a7c9370cb99bbab030ac220ab396888fdc17e6eb2b2b12939cf89
-DIST evolution-exchange-2.24.2.tar.bz2 939118 RMD160 547f83648459892f07a63b36f0a950d08319868a SHA1 fb6b540fee6dc3ffa9e0c0e65a9f2f2aebf5054f SHA256 7486a9878ca932d0716cf1ced15bf3dc4e332b10b16648784bbfd4c55f4d5fb1
 DIST evolution-exchange-2.24.4.tar.bz2 938733 RMD160 bef0c342c147e0b4df0250059b632242b3745e4a SHA1 0a83f77fe99f34fcbb5cd9959c6342f3f00b898f SHA256 d59e84905930817628faabe946efa83ce0836154ff939ccb702d95fb757049b7
-EBUILD evolution-exchange-2.12.3-r1.ebuild 1519 RMD160 170a49d22c487abab7f2213d8c49c9cdf0fcb581 SHA1 35bbd469b310c019af26ce8279a4e80356faf6f3 SHA256 29d70844f55824c3b9093ce6f9ceb6022fd585e4d2f5c699cebfd16a8ea92a7f
-EBUILD evolution-exchange-2.22.3-r1.ebuild 1438 RMD160 4bbe1aba2125c6fdb2edc45a9b313bc0a1f4eeaa SHA1 b1c52031516b8c6a4a8b37282ebbafab13fa48dd SHA256 9c47b2b135dd734b6c8f7d19b395c91848396489019bbab7471786f1c3159f7d
 EBUILD evolution-exchange-2.22.3-r2.ebuild 1579 RMD160 91caa4633989e623c32a0db000dbdd5dc8a04d68 SHA1 e2b2d8169502340b1685147fba293af8057fbf24 SHA256 b0596d3403cfef0a6085f178f0d98f8b29eaf434ad7797985ea85a821ab5caf7
-EBUILD evolution-exchange-2.24.2.ebuild 1352 RMD160 0b1378ef56f41b61f914917995c0d80ae3787388 SHA1 da83b005c8d9b802c53d5b083deb26b30d41d07e SHA256 39ffc0a0374666025ebf8ce763661cedc791fee74a19174c419613b6a1998edb
 EBUILD evolution-exchange-2.24.4.ebuild 1573 RMD160 7bc0c9ced695239701759f97d87d83b9842698ee SHA1 663d8ee1d5c8aa2423b8672293c69d26b42d7892 SHA256 f0f7169b374ff90b01eccba62a93bd020999000496ac09e0e05786f5b63084af
-MISC ChangeLog 12755 RMD160 b3d6e08d29387ee7dfd0ecb1a711f4514af45ca4 SHA1 a0ac9b9ff2187a02204c3d5e7b1ddb21573733bd SHA256 3298f46c786a02c0fabf38c1a92f7a4d90b0664c8e4af6f93d504953d60feccb
+MISC ChangeLog 13055 RMD160 6d74b8ed14f68a0ef77cbc01807d28c792d62a35 SHA1 c316319481e95f13ba2163593f07adac57fb42fc SHA256 13dff9bc707c1e66e050fcf4cd9f47b303174f2ea8eb1a5373a96f839f885eb0
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm9fHkACgkQkKaRLQcq0GLCUACfYrWh6AM6HUDhE1sTwEOBwr9p
-EMAAmwbhW4+PO6G30PLIuwAPTSoL5S8K
-=MMm2
+iEYEARECAAYFAkm+0z4ACgkQ1fmVwcYIWAb8GwCg0+CmXXMJowPIn733r6LADy6v
+AAoAnR9GaSn87B7Gw6QuA2VBF/KpM678
+=INjg
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.12.3-r1.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.12.3-r1.ebuild
deleted file mode 100644
index e1d9f8ff7aaa..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.12.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.12.3-r1.ebuild,v 1.6 2008/04/08 22:41:48 jer Exp $
-EAPI="1"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="debug doc static"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	dev-libs/libxml2
-	>=mail-client/evolution-2.11
-	>=gnome-extra/evolution-data-server-1.11
-	>=net-libs/libsoup-2.2.96:2.2
-	>=net-nds/openldap-2.1.30-r2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.5
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_with debug e2k-debug)"
-
-	if ! built_with_use gnome-extra/evolution-data-server ldap || ! built_with_use gnome-extra/evolution-data-server kerberos; then
-		eerror "Please re-emerge gnome-extra/evolution-data-server with"
-		eerror "the use flags ldap and kerberos."
-		die
-	fi
-
-	G2CONF="${G2CONF} $(use_with static static-ldap) --with-openldap"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix bug 201824
-	epatch "${FILESDIR}/${P}-fix-locks.patch"
-
-	# Fix build with libsoup-2.4 present on the system
-	epatch "${FILESDIR}/${P}-no-libsoup24.patch"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild
deleted file mode 100644
index c325910d31aa..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild,v 1.6 2008/10/18 22:59:50 ranger Exp $
-EAPI="1"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-2.21.90
-	>=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	>=gnome-extra/evolution-data-server-2.22.3
-	>=net-nds/openldap-2.1.30-r2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.5
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_with debug e2k-debug)"
-
-	if ! built_with_use gnome-extra/evolution-data-server ldap || ! built_with_use gnome-extra/evolution-data-server kerberos; then
-		eerror "Please re-emerge gnome-extra/evolution-data-server with"
-		eerror "the use flags ldap and kerberos."
-		die
-	fi
-
-	G2CONF="${G2CONF} $(use_with static static-ldap) --with-openldap"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-addressbook-crash.patch"
-}
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.24.2.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.24.2.ebuild
deleted file mode 100644
index 1e4bba147f9f..000000000000
--- a/gnome-extra/evolution-exchange/evolution-exchange-2.24.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.24.2.ebuild,v 1.2 2008/12/31 03:27:09 mr_bones_ Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="debug doc static"
-
-RDEPEND="
-	>=mail-client/evolution-2.24.0
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	>=gnome-extra/evolution-data-server-2.24.0
-	>=net-nds/openldap-2.1.30-r2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_with debug e2k-debug)"
-
-	if ! built_with_use gnome-extra/evolution-data-server ldap || ! built_with_use gnome-extra/evolution-data-server kerberos; then
-		eerror "Please re-emerge gnome-extra/evolution-data-server with"
-		eerror "the use flags ldap and kerberos."
-		die
-	fi
-
-	G2CONF="${G2CONF} $(use_with static static-ldap) --with-openldap"
-}
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-fix-locks.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-fix-locks.patch
deleted file mode 100644
index 0b74e4fa0926..000000000000
--- a/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-fix-locks.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-** Fix for GNOME bug #501295, Gentoo bug #201824
-
-Create locks around the cache so that the file is protected well not to crash.
-
---- a/addressbook/e-book-backend-exchange.c.orig	2007-10-12 09:05:18.000000000 +0200
-+++ b/addressbook/e-book-backend-exchange.c	2008-01-21 11:02:48.000000000 +0100
-@@ -84,12 +84,15 @@
- 	gboolean is_cache_ready;
- 	gboolean marked_for_offline;
- 
--	GMutex *create_mutex;
-+	GMutex *cache_lock;
- 
- 	EBookBackendSummary *summary;
- 	EBookBackendCache *cache;
- };
- 
-+#define LOCK(x) g_mutex_lock (x->cache_lock)
-+#define UNLOCK(x) g_mutex_unlock (x->cache_lock)
-+
- typedef struct PropMapping PropMapping;
- 
- static void subscription_notify (E2kContext *ctx, const char *uri, E2kContextChangeType type, gpointer user_data);
-@@ -477,6 +480,7 @@
- 				       field_names, n_field_names,
- 				       bepriv->base_rn, NULL, TRUE);
- 
-+	LOCK (bepriv);
- 	e_file_cache_freeze_changes (E_FILE_CACHE (bepriv->cache));
- 	while ((result = e2k_result_iter_next (iter))) {
- 		contact = e_contact_from_props (be, result);
-@@ -488,6 +492,7 @@
- 	e_book_backend_cache_set_populated (bepriv->cache);
- 	bepriv->is_cache_ready=TRUE;
- 	e_file_cache_thaw_changes (E_FILE_CACHE (bepriv->cache));
-+	UNLOCK (bepriv);
- 	return NULL;
- }
- 
-@@ -520,6 +525,7 @@
- 				       field_names, n_field_names,
- 				       bepriv->base_rn, NULL, TRUE);
- 
-+	LOCK (bepriv);
- 	e_file_cache_freeze_changes (E_FILE_CACHE (bepriv->cache));
- 	while ((result = e2k_result_iter_next (iter))) {
- 		contact = e_contact_from_props (be, result);
-@@ -531,7 +537,7 @@
- 	e_book_backend_cache_set_populated (bepriv->cache);
- 	bepriv->is_cache_ready=TRUE;
- 	e_file_cache_thaw_changes (E_FILE_CACHE (bepriv->cache));
--
-+	UNLOCK (bepriv);
- 	return TRUE;
- }
- 
-@@ -1319,13 +1325,13 @@
- 
- 	d(printf("ebbe_create_contact(%p, %p, %s)\n", backend, book, vcard));
- 
--	g_mutex_lock (bepriv->create_mutex);
-+	LOCK (bepriv);
- 
- 	switch (bepriv->mode) {
- 
- 	case GNOME_Evolution_Addressbook_MODE_LOCAL:
- 		*contact = NULL;
--		g_mutex_unlock (bepriv->create_mutex);
-+		UNLOCK (bepriv);
- 		return GNOME_Evolution_Addressbook_RepositoryOffline;
- 	
- 	case GNOME_Evolution_Addressbook_MODE_REMOTE:	
-@@ -1346,6 +1353,7 @@
- 			state = e_book_backend_exchange_connect (be);
- 			if ( state != GNOME_Evolution_Addressbook_Success) {
- 				d(printf("Returning status %d while creating contact\n", state));
-+				UNLOCK (bepriv);
- 				return state;
- 			}
- 		}
-@@ -1375,18 +1383,18 @@
- 			e_book_backend_summary_add_contact (bepriv->summary,
- 							    *contact);
- 			e_book_backend_cache_add_contact (bepriv->cache, *contact);
--			g_mutex_unlock (bepriv->create_mutex);
-+			UNLOCK (bepriv);
- 			return GNOME_Evolution_Addressbook_Success;
- 		} else {
- 			g_object_unref (*contact);
- 			*contact = NULL;
--			g_mutex_unlock (bepriv->create_mutex);
-+			UNLOCK (bepriv);
- 			return http_status_to_pas (status);
- 		}
- 	default:
- 		break;
- 	}
--	g_mutex_unlock (bepriv->create_mutex);
-+	UNLOCK (bepriv);
- 	return GNOME_Evolution_Addressbook_Success;
- }
- 
-@@ -1501,13 +1509,14 @@
- 			e2k_results_free (results, nresults);
- 
- 		if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
-+ 			LOCK (bepriv);
- 			e_book_backend_summary_remove_contact (bepriv->summary,
- 							       uri);
- 			e_book_backend_summary_add_contact (bepriv->summary,
- 							    *contact);
- 			e_book_backend_cache_remove_contact (bepriv->cache, uri);
- 			e_book_backend_cache_add_contact (bepriv->cache, *contact);
--			
-+ 			UNLOCK (bepriv);			
- 			return GNOME_Evolution_Addressbook_Success;
- 		} else {
- 			g_object_unref (*contact);
-@@ -1550,11 +1559,13 @@
- 			uri = l->data;
- 			status = e2k_context_delete (bepriv->ctx, NULL, uri);
- 			if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
-+ 				LOCK (bepriv);
- 				e_book_backend_summary_remove_contact (
- 							bepriv->summary, uri);
- 				e_book_backend_cache_remove_contact (bepriv->cache, uri);
- 				*removed_ids = g_list_append (
- 						*removed_ids, g_strdup (uri));
-+				UNLOCK (bepriv);
- 			} else 
- 				ret_status = http_status_to_pas (status);
- 		}
-@@ -2537,8 +2548,8 @@
- 		if (be->priv->cache)
- 			g_object_unref (be->priv->cache);
- 
--		if (be->priv->create_mutex)
--			g_mutex_free (be->priv->create_mutex);
-+		if (be->priv->cache_lock)
-+			g_mutex_free (be->priv->cache_lock);
- 			
- 
- 		g_free (be->priv);
-@@ -2608,7 +2619,7 @@
- 	priv->original_uri 	= NULL;
- 	priv->is_writable 	= TRUE;
- 
--	priv->create_mutex      = g_mutex_new ();
-+	priv->cache_lock      = g_mutex_new ();
- 
- 	backend->priv 		= priv;
- }
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-no-libsoup24.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-no-libsoup24.patch
deleted file mode 100644
index c447226f4a09..000000000000
--- a/gnome-extra/evolution-exchange/files/evolution-exchange-2.12.3-no-libsoup24.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- configure.in.orig	2008-04-01 23:56:17.000000000 +0300
-+++ configure.in	2008-04-01 23:59:32.000000000 +0300
-@@ -182,15 +182,9 @@
- PKG_CHECK_MODULES(MAIL, libecal-$EDS_API_VERSION)
- AC_SUBST(MAIL_CFLAGS)
- 
--dnl Adding a manual detection check for libsoup, since evolution still has not 
--dnl yet decided to use which version of libsoup it would be using. This check
--dnl needs to be removed once evolution is fixed to use one version of libsoup
--PKG_CHECK_MODULES(SOUP, libsoup-2.4, have_libsoup_24="yes", have_libsoup_24="no")
--if test $have_libsoup_24 = yes; then
--	LIBSOUP_VERSION=2.4
--else
--	LIBSOUP_VERSION=2.2
--fi
-+AC_ARG_VAR(SOUP_CFLAGS, dummy)
-+AC_ARG_VAR(SOUP_LIBS, dummy)
-+LIBSOUP_VERSION=2.2
- 
- PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-$LIBSOUP_VERSION libglade-2.0 camel-provider-$EDS_API_VERSION)
- AC_SUBST(EXCHANGE_STORAGE_CFLAGS)
---- configure.orig	2008-04-01 23:56:14.000000000 +0300
-+++ configure	2008-04-01 23:59:37.000000000 +0300
-@@ -1659,8 +1659,8 @@
-   CAMEL_LIBS  linker flags for CAMEL, overriding pkg-config
-   MAIL_CFLAGS C compiler flags for MAIL, overriding pkg-config
-   MAIL_LIBS   linker flags for MAIL, overriding pkg-config
--  SOUP_CFLAGS C compiler flags for SOUP, overriding pkg-config
--  SOUP_LIBS   linker flags for SOUP, overriding pkg-config
-+  SOUP_CFLAGS dummy
-+  SOUP_LIBS   dummy
-   EXCHANGE_STORAGE_CFLAGS
-               C compiler flags for EXCHANGE_STORAGE, overriding pkg-config
-   EXCHANGE_STORAGE_LIBS
-@@ -24306,79 +24306,8 @@
- 
- 
- 
--pkg_failed=no
--{ echo "$as_me:$LINENO: checking for SOUP" >&5
--echo $ECHO_N "checking for SOUP... $ECHO_C" >&6; }
- 
--if test -n "$PKG_CONFIG"; then
--    if test -n "$SOUP_CFLAGS"; then
--        pkg_cv_SOUP_CFLAGS="$SOUP_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_SOUP_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 "$SOUP_LIBS"; then
--        pkg_cv_SOUP_LIBS="$SOUP_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_SOUP_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
--	        SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
--        else
--	        SOUP_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 "$SOUP_PKG_ERRORS" >&5
--
--	have_libsoup_24="no"
--elif test $pkg_failed = untried; then
--	have_libsoup_24="no"
--else
--	SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
--	SOUP_LIBS=$pkg_cv_SOUP_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_VERSION=2.4
--else
--	LIBSOUP_VERSION=2.2
--fi
-+LIBSOUP_VERSION=2.2
- 
- 
- pkg_failed=no