New version for GNOME 2.26. CalDAV support for VTODO and VJOURNAL. Drop libical fork and use system's copy. Mail DB reorganization for unreleased beagle/tracker. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

13 files changed, 67 insertions, 514 deletions

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
deleted file mode 100644
index fe287ea2377a..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/Makefile.am evolution-data-server-1.11.3/Makefile.am
---- evolution-data-server-1.11.3.orig/Makefile.am	2007-06-04 01:41:14.000000000 -0400
-+++ evolution-data-server-1.11.3/Makefile.am	2007-06-07 11:03:46.000000000 -0400
-@@ -9,8 +9,8 @@ if ENABLE_CALENDAR
- CALENDAR_DIR = calendar
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
--DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
-+SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui servers server.deps src docs art po
-+DIST_SUBDIRS= win32 libedataserver camel addressbook calendar libedataserverui servers server.deps src docs art po
- 
- changelogs =			\
- 	ChangeLog
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am
---- evolution-data-server-1.11.3.orig/servers/exchange/storage/Makefile.am	2007-06-01 03:06:39.000000000 -0400
-+++ evolution-data-server-1.11.3/servers/exchange/storage/Makefile.am	2007-06-07 11:02:23.000000000 -0400
-@@ -63,14 +63,15 @@ libexchange_storage_1_2_la_LIBADD =				\
- 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
- 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-+	$(top_builddir)/libedataserverui/libedataserverui-1.2.la\
- 	$(E_DATA_SERVER_LIBS)					\
- 	$(E_DATA_SERVER_UI_LIBS)				\
- 	$(LDAP_LIBS)						\
- 	$(SOUP_LIBS)						\
--	$(SOCKET_LIBS)
-+	$(SOCKET_LIBS)						\
-+	$(KRB5_LDFLAGS)
- 
- libexchange_storage_1_2_la_LDFLAGS =				\
--	$(KRB5_LDFLAGS)						\
- 	$(NO_UNDEFINED)						\
- 	-version-info $(LIBEXCHANGE_STORAGE_CURRENT):$(LIBEXCHANGE_STORAGE_REVISION):$(LIBEXCHANGE_STORAGE_AGE)
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
deleted file mode 100644
index 982291b274aa..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.1-icaltz-util.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur a/calendar/libical/src/libical/icaltz-util.c b/calendar/libical/src/libical/icaltz-util.c
---- a/calendar/libical/src/libical/icaltz-util.c	2007-10-12 07:31:10 +0100
-+++ b/calendar/libical/src/libical/icaltz-util.c	2007-10-19 11:34:38 +0100
-@@ -23,9 +23,11 @@
- #include <string.h>
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
--#else
-+#elif defined(__linux__)
- #include <byteswap.h>
- #include <endian.h>
-+#else
-+#include <sys/endian.h>
- #endif
- #include <limits.h>
- #include <time.h>
-@@ -89,7 +91,11 @@
-     if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
-         return *(const int *) ptr;
-     else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
-+#ifdef __linux__
-         return bswap_32 (*(const int *) ptr);
-+#else
-+         return bswap32 (*(const uint32_t *) ptr);
-+#endif
- #endif
- 	else
- 	{
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch
deleted file mode 100644
index 62577ea90621..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-gtk-doc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gtk-doc.make	2008-01-20 13:50:03.000000000 +0100
-+++ gtk-doc.make	2007-10-14 19:45:39.000000000 +0200
-@@ -5,11 +5,11 @@
- ####################################
- 
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- else
--GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- endif
- 
- # We set GPATH here; this gives us semantics for GNU make
-@@ -139,8 +139,9 @@
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+	  if test `which gtkdoc-rebase` != ""; then \
-+        gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+	  fi \
- 	fi
- 	
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch
deleted file mode 100644
index 2f78ccdf7c73..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.12.3-no-libsoup24.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.in.orig	2008-03-26 02:45:26.000000000 +0200
-+++ configure.in	2008-03-26 02:46:03.000000000 +0200
-@@ -1407,14 +1407,8 @@
- AC_SUBST(E_FACTORY_LIBS)
- 
- dnl --- Groupwise flags
--PKG_CHECK_EXISTS(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.91
--    LIBSOUP=libsoup-2.2
--fi
-+LIBSOUP_REQUIRED=2.2.91
-+LIBSOUP=libsoup-2.2
- AC_SUBST(LIBSOUP_REQUIRED)
- AC_SUBST(LIBSOUP)
- EVO_SET_COMPILE_FLAGS(SOUP, $LIBSOUP >= $LIBSOUP_REQUIRED)
---- configure.orig	2008-03-26 02:45:29.000000000 +0200
-+++ configure	2008-03-26 02:46:18.000000000 +0200
-@@ -31479,23 +31479,8 @@
- 
- 
- 
--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
--  have_libsoup_24=yes
--else
--  have_libsoup_24=no
--fi
--if test $have_libsoup_24 = yes; then
--    LIBSOUP_REQUIRED=2.3.0
--    LIBSOUP=libsoup-2.4
--else
--    LIBSOUP_REQUIRED=2.2.91
--    LIBSOUP=libsoup-2.2
--fi
-+LIBSOUP_REQUIRED=2.2.91
-+LIBSOUP=libsoup-2.2
- 
- 
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-as-needed.patch
deleted file mode 100644
index a64d5675e581..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/addressbook/backends/Makefile.am evolution-data-server-2.21.4/addressbook/backends/Makefile.am
---- evolution-data-server-2.21.4.orig/addressbook/backends/Makefile.am	2007-10-23 05:57:41.000000000 -0400
-+++ evolution-data-server-2.21.4/addressbook/backends/Makefile.am	2007-12-17 13:25:00.000000000 -0500
-@@ -4,4 +4,4 @@ else
- LDAP_SUBDIR =
- endif
- 
--SUBDIRS = file vcf $(LDAP_SUBDIR) groupwise 
-+SUBDIRS = file vcf $(LDAP_SUBDIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/calendar/backends/Makefile.am evolution-data-server-2.21.4/calendar/backends/Makefile.am
---- evolution-data-server-2.21.4.orig/calendar/backends/Makefile.am	2007-10-24 02:39:45.000000000 -0400
-+++ evolution-data-server-2.21.4/calendar/backends/Makefile.am	2007-12-17 13:33:56.000000000 -0500
-@@ -1 +1 @@
--SUBDIRS = file groupwise http contacts weather caldav google
-+SUBDIRS = file http contacts weather caldav
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/camel/providers/Makefile.am evolution-data-server-2.21.4/camel/providers/Makefile.am
---- evolution-data-server-2.21.4.orig/camel/providers/Makefile.am	2007-10-23 05:57:04.000000000 -0400
-+++ evolution-data-server-2.21.4/camel/providers/Makefile.am	2007-12-17 13:24:50.000000000 -0500
-@@ -17,6 +17,6 @@ else
- SENDMAIL_DIR=sendmail
- endif
- 
--SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula
-+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) hula
- 
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/Makefile.am evolution-data-server-2.21.4/Makefile.am
---- evolution-data-server-2.21.4.orig/Makefile.am	2007-10-23 05:59:44.000000000 -0400
-+++ evolution-data-server-2.21.4/Makefile.am	2007-12-17 13:33:44.000000000 -0500
-@@ -7,9 +7,12 @@ endif
- 
- if ENABLE_CALENDAR
- CALENDAR_DIR = calendar
-+CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google
- endif
- 
--SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-+LATER = camel/providers/groupwise addressbook/backends/groupwise $(CALENDAR_LATER)
-+
-+SUBDIRS = $(LIBDB) win32 libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po
- DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
- 
- changelogs =			\
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.21.4/servers/exchange/storage/Makefile.am
---- evolution-data-server-2.21.4.orig/servers/exchange/storage/Makefile.am	2007-10-23 05:57:26.000000000 -0400
-+++ evolution-data-server-2.21.4/servers/exchange/storage/Makefile.am	2007-12-17 13:20:50.000000000 -0500
-@@ -63,6 +63,7 @@ libexchange_storage_1_2_la_LIBADD =				\
- 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
- 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-+	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
- 	$(E_DATA_SERVER_LIBS)					\
- 	$(E_DATA_SERVER_UI_LIBS)				\
- 	$(LDAP_LIBS)						\
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-gtkdoc-rebase.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-gtkdoc-rebase.patch
deleted file mode 100644
index 963d5e2b0130..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.4-gtkdoc-rebase.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.4.orig/gtk-doc.make evolution-data-server-2.21.4/gtk-doc.make
---- evolution-data-server-2.21.4.orig/gtk-doc.make	2007-12-16 22:56:57.000000000 -0500
-+++ evolution-data-server-2.21.4/gtk-doc.make	2007-12-17 10:51:40.000000000 -0500
-@@ -139,8 +139,7 @@ install-data-local:
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+	  gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) || true ; \
- 	fi
- 	
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.90-icaltz-util.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.90-icaltz-util.patch
deleted file mode 100644
index 0fbc8cb30b84..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.21.90-icaltz-util.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.21.90.orig/calendar/libical/src/libical/icaltz-util.c evolution-data-server-2.21.90/calendar/libical/src/libical/icaltz-util.c
---- evolution-data-server-2.21.90.orig/calendar/libical/src/libical/icaltz-util.c	2008-01-23 06:16:42.000000000 -0500
-+++ evolution-data-server-2.21.90/calendar/libical/src/libical/icaltz-util.c	2008-01-30 18:27:13.000000000 -0500
-@@ -23,16 +23,16 @@
- #include <string.h>
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
--#else
--#ifdef _WIN32
-+#elif defined(_WIN32)
- #define BIG_ENDIAN 'B'
- #define LITTLE_ENDIAN 'l'
- #define BYTE_ORDER LITTLE_ENDIAN
- #define bswap_32(val) ((((val) & 0x000000ffU) << 24) | (((val) & 0x0000ff00U) <<  8) | (((val) & 0x00ff0000U) >>  8) | (((val) & 0xff000000U) >> 24))
--#else
-+#elif defined(__linux__)
- #include <byteswap.h>
- #include <endian.h>
--#endif
-+#else
-+#include <sys/endian.h>
- #endif
- #include <limits.h>
- #include <time.h>
-@@ -96,7 +96,11 @@ decode (const void *ptr)
-     if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4)
-         return *(const int *) ptr;
-     else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4)
-+#ifdef __linux__
-         return bswap_32 (*(const int *) ptr);
-+#else
-+         return bswap32 (*(const uint32_t *) ptr);
-+#endif
- #endif
- 	else
- 	{
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch
deleted file mode 100644
index 7ce27faf4723..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-CVE-2009-0547.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.22.3.orig/camel/camel-smime-context.c evolution-data-server-2.22.3/camel/camel-smime-context.c
---- evolution-data-server-2.22.3.orig/camel/camel-smime-context.c	2008-04-04 05:01:59.000000000 -0400
-+++ evolution-data-server-2.22.3/camel/camel-smime-context.c	2009-03-07 15:44:47.000000000 -0500
-@@ -40,6 +40,7 @@
- #include <smime.h>
- #include <pkcs11t.h>
- #include <pk11func.h>
-+#include <secoid.h>
- 
- #include <errno.h>
- 
-@@ -534,6 +535,7 @@ sm_verify_cmsg(CamelCipherContext *conte
- 	for (i = 0; i < count; i++) {
- 		NSSCMSContentInfo *cinfo = NSS_CMSMessage_ContentLevel(cmsg, i);
- 		SECOidTag typetag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-+		int which_digest;
- 
- 		switch (typetag) {
- 		case SEC_OID_PKCS7_SIGNED_DATA:
-@@ -543,45 +545,50 @@ sm_verify_cmsg(CamelCipherContext *conte
- 				goto fail;
- 			}
- 
--			/* need to build digests of the content */
--			if (!NSS_CMSSignedData_HasDigests(sigd)) {
--				if (extstream == NULL) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
--					goto fail;
--				}
--
--				if ((poolp = PORT_NewArena(1024)) == NULL) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
--					goto fail;
--				}
--
--				digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd);
- 
--				digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
--				if (digcx == NULL) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
--					goto fail;
--				}
--
--				mem = (CamelStreamMem *)camel_stream_mem_new();
--				camel_stream_write_to_stream(extstream, (CamelStream *)mem);
--				NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len);
--				camel_object_unref(mem);
--
--				if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
--					goto fail;
--				}
--
--				if (NSS_CMSSignedData_SetDigests(sigd, digestalgs, digests) != SECSuccess) {
--					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
--					goto fail;
--				}
--
--				PORT_FreeArena(poolp, PR_FALSE);
--				poolp = NULL;
-+			if (extstream == NULL) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
-+  				goto fail;
- 			}
--
-+  
-+			if ((poolp = PORT_NewArena(1024)) == NULL) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
-+				goto fail;
-+  			}
-+ 
-+			digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd);
-+			
-+			digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
-+			if (digcx == NULL) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-+				goto fail;
-+			}
-+  
-+			mem = (CamelStreamMem *)camel_stream_mem_new();
-+			camel_stream_write_to_stream(extstream, (CamelStream *)mem);
-+			NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len);
-+			camel_object_unref(mem);
-+  
-+			if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
-+				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-+				goto fail;
-+			}
-+  
-+			for (which_digest = 0; digests[which_digest] != NULL; which_digest++) {
-+				SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm);
-+				if (digest_alg == NULL) {
-+					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-+  					goto fail;
-+  				}
-+				if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) {
-+					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-+					goto fail;
-+  				}
-+  			}
-+  
-+			PORT_FreeArena(poolp, PR_FALSE);
-+			poolp = NULL;
-+			
- 			/* import all certificates present */
- 			if (NSS_CMSSignedData_ImportCerts(sigd, p->certdb, certUsageEmailSigner, PR_TRUE) != SECSuccess) {
- 				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Certificate import failed"));
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch
deleted file mode 100644
index 51030a14df37..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-mail-cleanup-delay.patch
+++ /dev/null
@@ -1,98 +0,0 @@
----
-
-At http://bugzilla.gnome.org/show_bug.cgi?id=514827
-
-I have POP account in web.de
-I would like to leave in server only 1 days, and older messages should be
-deleted.
-I tried to do this with the pop account preference setting:
-x Leave messages on server
-x Delete messages older than 1 days
-
-However, the messages are still kept in the server although it is more than
-several days. 
-
-Index: b/camel/providers/pop3/camel-pop3-folder.c
-===================================================================
---- a/camel/providers/pop3/camel-pop3-folder.c	(revision 9476)
-+++ b/camel/providers/pop3/camel-pop3-folder.c	(working copy)
-@@ -356,6 +356,48 @@
- 	camel_pop3_store_expunge (pop3_store, ex);
- }
- 
-+static gboolean
-+pop3_get_message_time_from_cache (CamelFolder *folder, const char *uid, time_t *message_time)
-+{
-+	CamelPOP3Store *pop3_store;
-+	CamelStream *stream = NULL;
-+	char buffer[1];
-+	gboolean res = FALSE;
-+
-+	g_return_val_if_fail (folder != NULL, FALSE);
-+	g_return_val_if_fail (uid != NULL, FALSE);
-+	g_return_val_if_fail (message_time != NULL, FALSE);
-+
-+	pop3_store = CAMEL_POP3_STORE (folder->parent_store);
-+
-+	g_return_val_if_fail (pop3_store->cache != NULL, FALSE);
-+
-+	if ((stream = camel_data_cache_get (pop3_store->cache, "cache", uid, NULL)) != NULL
-+	    && camel_stream_read (stream, buffer, 1) == 1
-+	    && buffer[0] == '#') {
-+		CamelMimeMessage *message;
-+
-+		message = camel_mime_message_new ();
-+		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)message, stream) == -1) {
-+			g_warning (_("Cannot get message %s: %s"), uid, g_strerror (errno));
-+			camel_object_unref ((CamelObject *)message);
-+			message = NULL;
-+		}
-+
-+		if (message) {
-+			res = TRUE;
-+			*message_time = message->date + message->date_offset;
-+
-+			camel_object_unref ((CamelObject *)message);
-+		}
-+	}
-+
-+	if (stream) {
-+		camel_object_unref (stream);
-+	}
-+	return res;
-+}
-+
- int
- camel_pop3_delete_old(CamelFolder *folder, int days_to_delete,	CamelException *ex)
- {
-@@ -363,8 +405,7 @@
- 	CamelPOP3FolderInfo *fi;
- 	int i;
- 	CamelPOP3Store *pop3_store;
--	time_t temp;
--	CamelMessageInfo *minfo;
-+	time_t temp, message_time;
- 
- 	pop3_folder = CAMEL_POP3_FOLDER (folder);
- 	pop3_store = CAMEL_POP3_STORE (CAMEL_FOLDER(pop3_folder)->parent_store);
-@@ -374,10 +415,8 @@
- 	for (i = 0; i < pop3_folder->uids->len; i++) {
- 		fi = pop3_folder->uids->pdata[i];
- 
--		minfo = camel_folder_get_message_info (folder, fi->uid);
- 		d(printf("%s(%d): fi->uid=[%s]\n", __FILE__, __LINE__, fi->uid));
--		if(minfo) {
--			time_t message_time = ((CamelMessageInfoBase *)minfo)->date_received;
-+		if (pop3_get_message_time_from_cache (folder, fi->uid, &message_time)) {
- 			double time_diff = difftime(temp,message_time);
- 			int day_lag = time_diff/(60*60*24);
- 
-@@ -407,8 +446,6 @@
- 					camel_data_cache_remove(pop3_store->cache, "cache", fi->uid, NULL);
- 				}
- 			}
--			/* free message - not used anymore */
--			camel_folder_free_message_info (folder, minfo);
- 		}
- 	}
- 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch
deleted file mode 100644
index e1a4e6c2a12d..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.22.3-timezone-western.patch
+++ /dev/null
@@ -1,54 +0,0 @@
----
-At http://bugzilla.gnome.org/show_bug.cgi?id=548268
-
-As discussed in bug #528902, Evolution now uses time zone information extracted
-from the binary system time zone database.
-
-This conversion fails in at least in one case: Germany's (and therefore
-probably much of Western Europe) switch from summer saving time to normal time
-is exported in iCalendar events as [...]
-
-Index: b/calendar/libical/src/libical/icaltz-util.c
-===================================================================
---- a/calendar/libical/src/libical/icaltz-util.c	(revision 646)
-+++ b/calendar/libical/src/libical/icaltz-util.c	(working copy)
-@@ -198,6 +198,21 @@ icaltzutil_get_zone_directory (void)
- 	return zdir;
- }
- 
-+/* Calculate the relative position of the week in a month from a date */
-+static int
-+calculate_pos (icaltimetype icaltime)
-+{
-+	int pos;
-+
-+	pos = (icaltime.day -1) / 7;
-+
-+	/* Check if pos 3 is the last occurence of the week day in the month */	
-+	if (pos == 3 && ((icaltime.day + 7) > icaltime_days_in_month (icaltime.month, icaltime.year))) 
-+		pos = 4;
-+
-+	return r_pos [pos];
-+}
-+
- icalcomponent*
- icaltzutil_fetch_timezone (const char *location)
- {
-@@ -349,7 +364,7 @@ icaltzutil_fetch_timezone (const char *l
- 			icalrecurrencetype_clear (&ical_recur);
- 			ical_recur.freq = ICAL_YEARLY_RECURRENCE;
- 			ical_recur.by_month [0] = icaltime.month;
--			pos = r_pos [icaltime.day/7];
-+			pos = calculate_pos (icaltime);
- 			pos < 0 ? (sign = -1): (sign = 1);
- 			ical_recur.by_day [0] = sign * ((abs (pos) * 8) + icaltime_day_of_week (icaltime));
- 			icalprop = icalproperty_new_rrule (ical_recur);
-@@ -387,7 +402,7 @@ icaltzutil_fetch_timezone (const char *l
- 		icalrecurrencetype_clear (&ical_recur);
- 		ical_recur.freq = ICAL_YEARLY_RECURRENCE;
- 		ical_recur.by_month [0] = icaltime.month;
--		pos = r_pos [icaltime.day/7];
-+		pos = calculate_pos (icaltime);
- 		pos < 0 ? (sign = -1): (sign = 1);
- 		ical_recur.by_day [0] = sign * ((abs (pos) * 8) + icaltime_day_of_week (icaltime));
- 		icalprop = icalproperty_new_rrule (ical_recur);
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch
new file mode 100644
index 000000000000..c8c33b400ed6
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.5-as-needed.patch
@@ -0,0 +1,54 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am evolution-data-server-2.23.6/addressbook/backends/Makefile.am
+--- evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am	2008-08-04 00:28:27.000000000 -0400
++++ evolution-data-server-2.23.6/addressbook/backends/Makefile.am	2008-08-05 12:26:15.000000000 -0400
+@@ -4,4 +4,4 @@ else
+ LDAP_SUBDIR =
+ endif
+ 
+-SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav
++SUBDIRS = file vcf $(LDAP_SUBDIR)
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am evolution-data-server-2.23.6/calendar/backends/Makefile.am
+--- evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am	2008-04-11 07:10:31.000000000 -0400
++++ evolution-data-server-2.23.6/calendar/backends/Makefile.am	2008-08-05 12:25:51.000000000 -0400
+@@ -7 +7 @@
+-SUBDIRS = file groupwise http contacts $(WEATHER_SUBDIR) caldav google
++SUBDIRS = file http contacts $(WEATHER_SUBDIR) caldav
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/camel/providers/Makefile.am evolution-data-server-2.23.6/camel/providers/Makefile.am
+--- evolution-data-server-2.23.6.orig/camel/providers/Makefile.am	2008-08-01 02:34:59.000000000 -0400
++++ evolution-data-server-2.23.6/camel/providers/Makefile.am	2008-08-05 12:26:59.000000000 -0400
+@@ -21,6 +21,6 @@ else
+ SENDMAIL_DIR=sendmail
+ endif
+ 
+-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR)
++SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) $(HULA_DIR)
+ 
+ 
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/Makefile.am evolution-data-server-2.23.6/Makefile.am
+--- evolution-data-server-2.23.6.orig/Makefile.am	2008-08-01 02:35:37.000000000 -0400
++++ evolution-data-server-2.23.6/Makefile.am	2008-08-05 12:28:22.000000000 -0400
+@@ -7,9 +7,12 @@ endif
+ 
+ if ENABLE_CALENDAR
+ CALENDAR_DIR = calendar
++CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google
+ endif
+ 
+-SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
++LATER = camel/providers/groupwise addressbook/backends/groupwise addressbook/backends/google addressbook/backends/webdav $(CALENDAR_LATER)
++
++SUBDIRS = $(LIBDB) win32 libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po
+ DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po	
+ changelogs =			\
+ 	ChangeLog
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am
+--- evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am	2008-04-11 07:10:16.000000000 -0400
++++ evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am	2008-08-05 12:25:51.000000000 -0400
+@@ -64,6 +64,7 @@ libexchange_storage_1_2_la_LIBADD =				\
+ 	$(top_builddir)/servers/exchange/lib/libexchange.la	\
+ 	$(top_builddir)/servers/exchange/xntlm/libxntlm.la	\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
++	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
+ 	$(E_DATA_SERVER_LIBS)					\
+ 	$(E_DATA_SERVER_UI_LIBS)				\
+ 	$(LDAP_LIBS)						\
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch
new file mode 100644
index 000000000000..d201a56ac9b7
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.25.90-no-libdb.patch
@@ -0,0 +1,13 @@
+# We only support dynamic libdb
+--- a/configure.in	2007-06-04 06:50:47.000000000 -0400
++++ b/configure.in	2007-06-07 10:58:22.000000000 -0400
+@@ -1431,9 +1431,6 @@ export privdatadir
+ export privincludedir
+ export privdatadir
+
+-if test $dynamic_libdb = no; then
+-        AC_CONFIG_SUBDIRS(libdb/dist)
+-fi
+ AC_OUTPUT([
+ Makefile
+ evolution-data-server-zip
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
deleted file mode 100644
index a094433c8c93..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-no_lazy_bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB evolution-data-server-1.3.7/camel/Makefile.am evolution-data-server-1.3.7-patched/camel/Makefile.am
---- evolution-data-server-1.3.7/camel/Makefile.am	2005-07-08 11:57:02.000000000 -0500
-+++ evolution-data-server-1.3.7-patched/camel/Makefile.am	2005-08-17 15:40:24.000000000 -0500
-@@ -271,6 +271,8 @@
- 	camel-lock-helper.c 			\
- 	camel-lock-helper.h
- 
-+camel_lock_helper_1_2_LDFLAGS = -Wl,-z,now
-+
- # NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
- # because it might be setuid.
- camel_lock_helper_1_2_LDADD =			\