Update to evolution-data-server-2.32.0.

ok jasper@

databases/evolution-data-server/Makefile

@@ -1,27 +1,24 @@
-# $OpenBSD: Makefile,v 1.69 2010/08/30 21:48:15 fgsch Exp $
+# $OpenBSD: Makefile,v 1.70 2010/09/30 07:32:08 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		data backends for the Evolution mail/PIM suite
 
 GNOME_PROJECT=		evolution-data-server
-GNOME_VERSION=		2.30.3
-REVISION =		0
+GNOME_VERSION=		2.32.0
 
 CATEGORIES=		databases
 
-SHARED_LIBS +=	edataserver-1.2      10.1     # .11.0
-SHARED_LIBS +=	ebackend-1.2         0.1      # .0.0
-SHARED_LIBS +=	egroupwise-1.2       13.1     # .13.1
-SHARED_LIBS +=	gdata-1.2            1.0      # .1.0
-SHARED_LIBS +=	gdata-google-1.2     1.0      # .1.0
-SHARED_LIBS +=	camel-1.2            14.1     # .14.1
-SHARED_LIBS +=	camel-provider-1.2   14.1     # .14.1
-SHARED_LIBS +=	ebook-1.2            12.1     # .12.1
-SHARED_LIBS +=	edata-book-1.2       6.1      # .6.1
-SHARED_LIBS +=	ecal-1.2             9.1      # .9.1
-SHARED_LIBS +=	edata-cal-1.2        6.2      # .6.2
-SHARED_LIBS +=	edataserverui-1.2    9.1      # .9.1
+SHARED_LIBS +=  edataserver-1.2      11.0     # .14.0
+SHARED_LIBS +=  ebackend-1.2         1.0      # .0.1
+SHARED_LIBS +=  egroupwise-1.2       14.0     # .13.1
+SHARED_LIBS +=  camel-1.2            15.0     # .19.0
+SHARED_LIBS +=  camel-provider-1.2   15.0     # .19.0
+SHARED_LIBS +=  ebook-1.2            13.0     # .13.1
+SHARED_LIBS +=  edata-book-1.2       7.0      # .8.0
+SHARED_LIBS +=  ecal-1.2             10.0     # .10.2
+SHARED_LIBS +=  edata-cal-1.2        7.0      # .10.0
+SHARED_LIBS +=  edataserverui-1.2    10.0     # .11.0
 
 HOMEPAGE=	http://www.gnome.org/projects/evolution/
 
@@ -44,23 +41,25 @@ WANTLIB += pangoft2-1.0 pcre pixman-1 plc4 plds4 png proxy pthread
 WANTLIB += pthread-stubs sasl2 soup-2.4 soup-gnome-2.4 sqlite3
 WANTLIB += ssl tasn1 xcb xcb-render xcb-render-util xml2 z
 WANTLIB += db ldap lber gpg-error gnutls nss3.>=19 smime3 ssl3 ical
-WANTLIB += icalss icalvcal gnome-keyring.>=6 gweather
+WANTLIB += icalss icalvcal gnome-keyring.>=6 gweather gdata
 
 MODULES=		devel/gettext \
 			lang/python \
-			textproc/intltool \
 			x11/gnome
 
 BUILD_DEPENDS=		:bison-*:devel/bison \
 			:gperf-*:devel/gperf
 LIB_DEPENDS= 		:db->=4,<5:databases/db/v4 \
 			::databases/openldap \
-			::security/libgpg-error \
-			::security/gnutls \
 			:nss->=3.11.4p1:security/nss \
 			::textproc/libical \
-			:libgnome-keyring-*:x11/gnome/libgnome-keyring \
-			::x11/gnome/libgweather
+			::x11/gnome/libgweather \
+			::devel/libgdata \
+			::devel/eggdbus
+
+# XXX Use of uninitialized value $filename in concatenation (.) or string at /usr/ports/infrastructure/bin/libtool line 1112.
+# objdump: 'a.out': No such file
+USE_LIBTOOL=		gnu
 
 USE_X11=		Yes
 YACC=			bison
@@ -69,7 +68,6 @@ CONFIGURE_STYLE= 	autoconf gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-gnome-keyring=yes \
 			--enable-smime=yes \
-			--with-broken-spool=no \
 			--with-nss-libs="${LOCALBASE}/lib" \
 			--with-nss-includes="${LOCALBASE}/include/nss" \
 			--with-nspr-libs=${LOCALBASE}/lib \
@@ -80,7 +78,7 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-libdb="${PREFIX}/lib" \
 			--with-openldap=${LOCALBASE}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+			LDFLAGS="-L${LOCALBASE}/lib -pthread"
 
 # Only get the first x.y which is needed in the PLIST.
 R=			${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}

databases/evolution-data-server/distinfo

@@ -1,5 +1,5 @@
-MD5 (evolution-data-server-2.30.3.tar.bz2) = CVusCoAEPVfQD2Qxnzy9uw==
-RMD160 (evolution-data-server-2.30.3.tar.bz2) = LU3C/WuN/cATBCQAs4L0aE5kJCU=
-SHA1 (evolution-data-server-2.30.3.tar.bz2) = RJ0+epsZdo1aeSQ0yl1VydJJaZM=
-SHA256 (evolution-data-server-2.30.3.tar.bz2) = N3Pmd6s7n/VWSiZAnsawC8G9aLr1ioeBEJhmp+Kd+JA=
-SIZE (evolution-data-server-2.30.3.tar.bz2) = 4652416
+MD5 (evolution-data-server-2.32.0.tar.bz2) = xZZaMA0EqKtIS/nKCVnc3w==
+RMD160 (evolution-data-server-2.32.0.tar.bz2) = aUYFQOOHxAj4g3htP2UlWo6/pLE=
+SHA1 (evolution-data-server-2.32.0.tar.bz2) = 4daO/u1DmCQCkCGmIdCv54CJfJU=
+SHA256 (evolution-data-server-2.32.0.tar.bz2) = MeoQl6e7EZC0qlHRbsJ7JCB89kITFMnBMgGWdS8CwN4=
+SIZE (evolution-data-server-2.32.0.tar.bz2) = 4269713

databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.5 2010/09/30 07:32:09 ajacoutot Exp $
+--- addressbook/backends/file/e-book-backend-file.c.orig	Tue Sep 28 07:47:33 2010
++++ addressbook/backends/file/e-book-backend-file.c	Tue Sep 28 07:49:03 2010
+@@ -175,7 +175,7 @@ e_book_backend_file_create_unique_id (void)
+ 	   it's doubtful 2^32 id's will be created in a second, so we
+ 	   should be okay. */
+ 	static guint c = 0;
+-	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time(NULL), c++);
++	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", (long)time(NULL), c++);
+ }
+ 
+ static void

databases/evolution-data-server/patches/patch-addressbook_backends_ldap_e-book-backend-ldap_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- addressbook/backends/ldap/e-book-backend-ldap.c.orig	Tue Sep 28 07:49:59 2010
++++ addressbook/backends/ldap/e-book-backend-ldap.c	Tue Sep 28 07:51:32 2010
+@@ -1194,7 +1194,7 @@ create_dn_from_contact (EContact *contact, gchar *root
+ 		}
+ 	}
+ 
+-	dn = g_strdup_printf ("%s=%s%s%lu",
++	dn = g_strdup_printf ("%s=%s%s%d",
+ 			      get_dn_attribute_name (rootdn),
+ 			      (cn_part && *cn_part) ? cn_part : "",
+ 			      (cn_part && *cn_part) ? "." : "",

databases/evolution-data-server/patches/patch-addressbook_backends_vcf_e-book-backend-vcf_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.3 2010/09/30 07:32:09 ajacoutot Exp $
+--- addressbook/backends/vcf/e-book-backend-vcf.c.orig	Tue Sep 28 07:49:28 2010
++++ addressbook/backends/vcf/e-book-backend-vcf.c	Tue Sep 28 07:49:42 2010
+@@ -79,7 +79,7 @@ e_book_backend_vcf_create_unique_id (void)
+ 	   it's doubtful 2^32 id's will be created in a second, so we
+ 	   should be okay. */
+ 	static guint c = 0;
+-	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time(NULL), c++);
++	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", (long)time(NULL), c++);
+ }
+ 
+ static void

databases/evolution-data-server/patches/patch-calendar_libedata-cal_Makefile_in

@@ -0,0 +1,13 @@
+$OpenBSD: patch-calendar_libedata-cal_Makefile_in,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- calendar/libedata-cal/Makefile.in.orig	Mon Sep 27 21:29:52 2010
++++ calendar/libedata-cal/Makefile.in	Mon Sep 27 21:29:57 2010
+@@ -598,8 +598,7 @@ test_intervaltree_coverage_LDADD = \
+ 	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
+ 	libedata-cal-1.2.la		\
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la			\
+-	$(EVOLUTION_CALENDAR_LIBS)						\
+-	-lgcov
++	$(EVOLUTION_CALENDAR_LIBS)
+ 
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am

databases/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	Tue Sep 28 07:51:44 2010
++++ calendar/libedata-cal/e-cal-backend-intervaltree.c	Tue Sep 28 07:52:54 2010
+@@ -579,7 +579,7 @@ e_intervaltree_node_dump (EIntervalTree *tree, EInterv
+ 	*/
+ 	EIntervalTreePrivate *priv = tree->priv;
+ 	if (node != priv->nil)
+-		g_print ("%*s[%ld - %ld] [%ld - %ld] red %d\n", indent, "", node->start,
++		g_print ("%*s[%d - %d] [%d - %d] red %d\n", indent, "", node->start,
+ 				node->end, node->min, node->max, node->red);
+ 	else
+ 	{

databases/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-sexp_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-sexp_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- calendar/libedata-cal/e-cal-backend-sexp.c.orig	Tue Sep 28 07:53:05 2010
++++ calendar/libedata-cal/e-cal-backend-sexp.c	Tue Sep 28 07:53:16 2010
+@@ -1476,7 +1476,7 @@ test_query (const gchar * query)
+ 	gboolean generator = e_cal_backend_sexp_evaluate_occur_times(sexp, &start, &end);
+ 
+ 	if (generator) {
+-		printf ("%s: %ld - %ld\n", query, start, end);
++		printf ("%s: %d - %d\n", query, start, end);
+ 	} else {
+ 		printf ("%s: no time prunning possible\n", query);
+ 	}

databases/evolution-data-server/patches/patch-calendar_libedata-cal_test-intervaltree_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-calendar_libedata-cal_test-intervaltree_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- calendar/libedata-cal/test-intervaltree.c.orig	Tue Sep 28 07:53:30 2010
++++ calendar/libedata-cal/test-intervaltree.c	Tue Sep 28 07:53:38 2010
+@@ -164,7 +164,7 @@ create_test_component (time_t start, time_t end)
+ 
+ 	summary = g_new (ECalComponentText, 1);
+ 
+-	summary->value = g_strdup_printf ("%ld - %ld", start, end);
++	summary->value = g_strdup_printf ("%d - %d", start, end);
+ 	summary->altrep = NULL;
+ 
+ 	e_cal_component_set_summary (comp, summary);

databases/evolution-data-server/patches/patch-camel_camel-block-file_h

@@ -1,11 +1,11 @@
-$OpenBSD: patch-camel_camel-block-file_h,v 1.1 2010/04/22 09:17:50 ajacoutot Exp $
---- camel/camel-block-file.h.orig	Wed Apr 21 18:35:53 2010
-+++ camel/camel-block-file.h	Wed Apr 21 18:36:06 2010
-@@ -21,6 +21,7 @@
- #ifndef _CAMEL_BLOCK_FILE_H
- #define _CAMEL_BLOCK_FILE_H
+$OpenBSD: patch-camel_camel-block-file_h,v 1.2 2010/09/30 07:32:09 ajacoutot Exp $
+--- camel/camel-block-file.h.orig	Mon Sep 13 14:16:52 2010
++++ camel/camel-block-file.h	Mon Sep 27 19:11:45 2010
+@@ -25,6 +25,7 @@
+ #ifndef CAMEL_BLOCK_FILE_H
+ #define CAMEL_BLOCK_FILE_H
  
 +#include <sys/types.h>
  #include <camel/camel-object.h>
  #include <camel/camel-list-utils.h>
- #include <glib.h>
+ #include <stdio.h>

databases/evolution-data-server/patches/patch-camel_camel-lock_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-camel_camel-lock_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- camel/camel-lock.c.orig	Tue Sep 28 07:46:38 2010
++++ camel/camel-lock.c	Tue Sep 28 07:46:50 2010
+@@ -128,7 +128,7 @@ camel_lock_dot (const gchar *path,
+ 		/* check for stale lock, kill it */
+ 		if (g_stat(lock, &st) == 0) {
+ 			time_t now = time (NULL);
+-			(printf("There is an existing lock %ld seconds old\n", now-st.st_ctime));
++			(printf("There is an existing lock %d seconds old\n", now-st.st_ctime));
+ 			if (st.st_ctime < now - CAMEL_LOCK_DOT_STALE) {
+ 				d(printf("Removing it now\n"));
+ 				unlink(lock);

databases/evolution-data-server/patches/patch-camel_camel-search-sql-sexp_c

@@ -0,0 +1,57 @@
+$OpenBSD: patch-camel_camel-search-sql-sexp_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- camel/camel-search-sql-sexp.c.orig	Tue Sep 28 07:45:42 2010
++++ camel/camel-search-sql-sexp.c	Tue Sep 28 07:46:29 2010
+@@ -176,7 +176,7 @@ eval_eq(struct _ESExp *f, gint argc, struct _ESExpTerm
+ 		if (r1->type == ESEXP_RES_INT)
+ 			g_string_append_printf(str, "%d", r1->value.number);
+ 		else if (r1->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r1->value.time);
++			g_string_append_printf(str, "%d", r1->value.time);
+ 		else if (r1->type == ESEXP_RES_STRING)
+ 			g_string_append_printf(str, "%s", r1->value.string);
+ 
+@@ -194,7 +194,7 @@ eval_eq(struct _ESExp *f, gint argc, struct _ESExpTerm
+ 			if (r2->type == ESEXP_RES_BOOL)
+ 				g_string_append_printf(str, "%d", r2->value.boolean);
+ 			else if (r2->type == ESEXP_RES_TIME)
+-				g_string_append_printf(str, "%ld", r2->value.time);
++				g_string_append_printf(str, "%d", r2->value.time);
+ 			else if (r2->type == ESEXP_RES_STRING) {
+ 				gchar *tmp = g_strdup_printf("%c%s%c", ut ? '%':' ', r2->value.string, ut?'%':' ');
+ 				gchar *safe = get_db_safe_string(tmp);
+@@ -229,7 +229,7 @@ eval_lt(struct _ESExp *f, gint argc, struct _ESExpTerm
+ 		if (r1->type == ESEXP_RES_INT)
+ 			g_string_append_printf(str, "%d", r1->value.number);
+ 		else if (r1->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r1->value.time);
++			g_string_append_printf(str, "%d", r1->value.time);
+ 		else if (r1->type == ESEXP_RES_STRING)
+ 			g_string_append_printf(str, "%s", r1->value.string);
+ 
+@@ -239,7 +239,7 @@ eval_lt(struct _ESExp *f, gint argc, struct _ESExpTerm
+ 		if (r2->type == ESEXP_RES_BOOL)
+ 			g_string_append_printf(str, "%d", r2->value.boolean);
+ 		else if (r2->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r2->value.time);
++			g_string_append_printf(str, "%d", r2->value.time);
+ 		else if (r2->type == ESEXP_RES_STRING)
+ 			g_string_append_printf(str, "%s", r2->value.string);
+ 		e_sexp_result_free(f, r1);
+@@ -268,7 +268,7 @@ eval_gt(struct _ESExp *f, gint argc, struct _ESExpTerm
+ 		if (r1->type == ESEXP_RES_INT)
+ 			g_string_append_printf(str, "%d", r1->value.number);
+ 		else if (r1->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r1->value.time);
++			g_string_append_printf(str, "%d", r1->value.time);
+ 		else if (r1->type == ESEXP_RES_STRING)
+ 			g_string_append_printf(str, "%s", r1->value.string);
+ 
+@@ -278,7 +278,7 @@ eval_gt(struct _ESExp *f, gint argc, struct _ESExpTerm
+ 		if (r2->type == ESEXP_RES_BOOL)
+ 			g_string_append_printf(str, "%d", r2->value.boolean);
+ 		else if (r2->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r2->value.time);
++			g_string_append_printf(str, "%d", r2->value.time);
+ 		else if (r2->type == ESEXP_RES_STRING)
+ 			g_string_append_printf(str, "%s", r2->value.string);
+ 		e_sexp_result_free(f, r1);

databases/evolution-data-server/patches/patch-camel_providers_local_camel-maildir-summary_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.1 2010/09/30 07:32:09 ajacoutot Exp $
+--- camel/providers/local/camel-maildir-summary.c.orig	Tue Sep 28 07:47:03 2010
++++ camel/providers/local/camel-maildir-summary.c	Tue Sep 28 07:47:23 2010
+@@ -375,7 +375,7 @@ static gchar *maildir_summary_next_uid_string(CamelFol
+ 				g_free(uid);
+ 				sleep(2);
+ 			}
+-			uid = g_strdup_printf("%ld.%d_%u.%s", time(NULL), getpid(), nextuid, mds->priv->hostname);
++			uid = g_strdup_printf("%d.%d_%u.%s", time(NULL), getpid(), nextuid, mds->priv->hostname);
+ 			name = g_strdup_printf("%s/tmp/%s", cls->folder_path, uid);
+ 			retry++;
+ 		} while (g_stat(name, &st) == 0 && retry<3);

databases/evolution-data-server/patches/patch-configure_ac

@@ -1,11 +1,11 @@
-$OpenBSD: patch-configure_ac,v 1.2 2010/04/22 09:17:50 ajacoutot Exp $
+$OpenBSD: patch-configure_ac,v 1.3 2010/09/30 07:32:09 ajacoutot Exp $
 
 Stupid configure is stupid. Using a variable that's set
 hundreds of lines later...
 
---- configure.ac.orig	Wed Mar 17 12:17:31 2010
-+++ configure.ac	Thu Apr 22 09:54:50 2010
-@@ -181,8 +181,6 @@ dnl XXX This really belongs in AM_CFLAGS.
+--- configure.ac.orig	Mon Sep 27 12:25:46 2010
++++ configure.ac	Mon Sep 27 19:11:45 2010
+@@ -199,8 +199,6 @@ dnl	-Wstrict-aliasing=2
  AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
  AC_SUBST(AM_CPPFLAGS)
  
@@ -14,7 +14,7 @@ hundreds of lines later...
  dnl ******************************
  dnl Initialize maintainer mode
  dnl ******************************
-@@ -256,6 +254,13 @@ case "$host" in
+@@ -285,6 +283,13 @@ case "$host" in
  	AC_CACHE_VAL(ac_cv_have_addrinfo, [ac_cv_have_addrinfo=yes])
  	AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
  	;;
@@ -28,10 +28,11 @@ hundreds of lines later...
  *)
  	os_win32='no'
  	NO_UNDEFINED=''
-@@ -483,6 +488,29 @@ AC_RUN_IFELSE([AC_LANG_SOURCE(
+@@ -512,6 +517,29 @@ AC_RUN_IFELSE([AC_LANG_SOURCE(
+ 	]]
  	)],[AC_DEFINE(HAVE_LKSTRFTIME, 1, [strftime supports use of l and k]) ac_cv_lkstrftime=yes],[ac_cv_lkstrftime=no],[ac_cv_lkstrftime=no])
  AC_MSG_RESULT([$ac_cv_lkstrftime])
- 
++
 +dnl ******************************
 +dnl Posix thread support
 +dnl ******************************
@@ -54,37 +55,6 @@ hundreds of lines later...
 +AC_SUBST(THREADS_LIBS)
 +AC_SUBST(THREADS_CFLAGS)
 +AC_DEFINE(ENABLE_THREADS,1,[Required])
-+
+ 
  dnl ********************************************************************************
  dnl security extension support (SSL and S/MIME)
- dnl
-@@ -1144,29 +1172,6 @@ AM_PATH_GLIB_2_0
- dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines
- EVO_MARSHAL_RULE=$srcdir/marshal.mk
- AC_SUBST_FILE(EVO_MARSHAL_RULE)
--
--dnl ******************************
--dnl Posix thread support
--dnl ******************************
--
--dnl GLIB_CONFIG=${GLIB_CONFIG-glib-config}
--dnl GNOME_PTHREAD_CHECK
--
--dnl if test "x$PTHREAD_LIB" = "x" ; then
--dnl 	AC_MSG_ERROR([POSIX threads are currently required for Evolution])
--dnl fi
--
--dnl Notice that this is a hack, and we wont be able to use this forever, but
--dnl at least for some time
--
--EVO_PTHREAD_CHECK
--
--THREADS_LIBS="$PTHREAD_LIB"
--THREADS_CFLAGS="$PTHREAD_CFLAGS"
--
--AC_SUBST(THREADS_LIBS)
--AC_SUBST(THREADS_CFLAGS)
--AC_DEFINE(ENABLE_THREADS,1,[Required])
- 
- dnl ******************************
- dnl DBus stuff

databases/evolution-data-server/patches/patch-m4_evo_pthread_check_m4

@@ -1,17 +0,0 @@
-$OpenBSD: patch-m4_evo_pthread_check_m4,v 1.2 2010/04/22 09:17:50 ajacoutot Exp $
---- m4/evo_pthread_check.m4.orig	Wed Apr 21 10:20:08 2010
-+++ m4/evo_pthread_check.m4	Wed Apr 21 10:20:21 2010
-@@ -2,10 +2,10 @@ dnl EVO_PTHREAD_CHECK
- #serial 0.1
- AC_DEFUN([EVO_PTHREAD_CHECK],[
- 	PTHREAD_LIB=""
--	AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIB="-lpthread"],
--		[AC_CHECK_LIB(pthreads, pthread_create, [PTHREAD_LIB="-lpthreads"],
-+	AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIB="-pthread"],
-+		[AC_CHECK_LIB(pthreads, pthread_create, [PTHREAD_LIB="-pthread"],
- 			[AC_CHECK_LIB(c_r, pthread_create, [PTHREAD_LIB="-lc_r"],
--			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, [PTHREAD_LIB="-lpthread"],
-+			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, [PTHREAD_LIB="-pthread"],
- 				[AC_CHECK_FUNC(pthread_create)]
- 			)]
- 			)]

databases/evolution-data-server/pkg/PLIST

@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.21 2010/04/27 09:30:21 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.22 2010/09/30 07:32:09 ajacoutot Exp $
 include/evolution-data-server-${R}/
 include/evolution-data-server-${R}/camel/
 include/evolution-data-server-${R}/camel/camel-address.h
-include/evolution-data-server-${R}/camel/camel-arg.h
 include/evolution-data-server-${R}/camel/camel-block-file.h
 include/evolution-data-server-${R}/camel/camel-certdb.h
 include/evolution-data-server-${R}/camel/camel-charset-map.h
@@ -11,14 +10,9 @@ include/evolution-data-server-${R}/camel/camel-data-cache.h
 include/evolution-data-server-${R}/camel/camel-data-wrapper.h
 include/evolution-data-server-${R}/camel/camel-db.h
 include/evolution-data-server-${R}/camel/camel-debug.h
-include/evolution-data-server-${R}/camel/camel-digest-folder.h
-include/evolution-data-server-${R}/camel/camel-digest-store.h
-include/evolution-data-server-${R}/camel/camel-digest-summary.h
 include/evolution-data-server-${R}/camel/camel-disco-diary.h
 include/evolution-data-server-${R}/camel/camel-disco-folder.h
 include/evolution-data-server-${R}/camel/camel-disco-store.h
-include/evolution-data-server-${R}/camel/camel-exception-list.def
-include/evolution-data-server-${R}/camel/camel-exception.h
 include/evolution-data-server-${R}/camel/camel-file-utils.h
 include/evolution-data-server-${R}/camel/camel-filter-driver.h
 include/evolution-data-server-${R}/camel/camel-filter-search.h
@@ -29,7 +23,6 @@ include/evolution-data-server-${R}/camel/camel-folder.h
 include/evolution-data-server-${R}/camel/camel-gpg-context.h
 include/evolution-data-server-${R}/camel/camel-html-parser.h
 include/evolution-data-server-${R}/camel/camel-http-stream.h
-include/evolution-data-server-${R}/camel/camel-i18n.h
 include/evolution-data-server-${R}/camel/camel-iconv.h
 include/evolution-data-server-${R}/camel/camel-index.h
 include/evolution-data-server-${R}/camel/camel-internet-address.h
@@ -39,6 +32,7 @@ include/evolution-data-server-${R}/camel/camel-lock-client.h
 include/evolution-data-server-${R}/camel/camel-lock-helper.h
 include/evolution-data-server-${R}/camel/camel-lock.h
 include/evolution-data-server-${R}/camel/camel-medium.h
+include/evolution-data-server-${R}/camel/camel-mempool.h
 include/evolution-data-server-${R}/camel/camel-mime-filter-basic.h
 include/evolution-data-server-${R}/camel/camel-mime-filter-bestenc.h
 include/evolution-data-server-${R}/camel/camel-mime-filter-canon.h
@@ -68,15 +62,14 @@ include/evolution-data-server-${R}/camel/camel-multipart-encrypted.h
 include/evolution-data-server-${R}/camel/camel-multipart-signed.h
 include/evolution-data-server-${R}/camel/camel-multipart.h
 include/evolution-data-server-${R}/camel/camel-net-utils.h
-include/evolution-data-server-${R}/camel/camel-news-address.h
 include/evolution-data-server-${R}/camel/camel-nntp-address.h
+include/evolution-data-server-${R}/camel/camel-object-bag.h
 include/evolution-data-server-${R}/camel/camel-object.h
 include/evolution-data-server-${R}/camel/camel-offline-folder.h
 include/evolution-data-server-${R}/camel/camel-offline-journal.h
 include/evolution-data-server-${R}/camel/camel-offline-store.h
 include/evolution-data-server-${R}/camel/camel-operation.h
 include/evolution-data-server-${R}/camel/camel-partition-table.h
-include/evolution-data-server-${R}/camel/camel-process.h
 include/evolution-data-server-${R}/camel/camel-provider.h
 include/evolution-data-server-${R}/camel/camel-sasl-anonymous.h
 include/evolution-data-server-${R}/camel/camel-sasl-cram-md5.h
@@ -112,7 +105,6 @@ include/evolution-data-server-${R}/camel/camel-tcp-stream.h
 include/evolution-data-server-${R}/camel/camel-text-index.h
 include/evolution-data-server-${R}/camel/camel-transport.h
 include/evolution-data-server-${R}/camel/camel-trie.h
-include/evolution-data-server-${R}/camel/camel-types.h
 include/evolution-data-server-${R}/camel/camel-uid-cache.h
 include/evolution-data-server-${R}/camel/camel-url-scanner.h
 include/evolution-data-server-${R}/camel/camel-url.h
@@ -122,13 +114,6 @@ include/evolution-data-server-${R}/camel/camel-vee-store.h
 include/evolution-data-server-${R}/camel/camel-vee-summary.h
 include/evolution-data-server-${R}/camel/camel-vtrash-folder.h
 include/evolution-data-server-${R}/camel/camel.h
-include/evolution-data-server-${R}/google/
-include/evolution-data-server-${R}/google/libgdata/
-include/evolution-data-server-${R}/google/libgdata-google/
-include/evolution-data-server-${R}/google/libgdata-google/gdata-google-service.h
-include/evolution-data-server-${R}/google/libgdata/gdata-entry.h
-include/evolution-data-server-${R}/google/libgdata/gdata-feed.h
-include/evolution-data-server-${R}/google/libgdata/gdata-service-iface.h
 include/evolution-data-server-${R}/groupwise/
 include/evolution-data-server-${R}/groupwise/e-gw-connection.h
 include/evolution-data-server-${R}/groupwise/e-gw-container.h
@@ -182,6 +167,7 @@ include/evolution-data-server-${R}/libedata-cal/
 include/evolution-data-server-${R}/libedata-cal/e-cal-backend-cache.h
 include/evolution-data-server-${R}/libedata-cal/e-cal-backend-factory.h
 include/evolution-data-server-${R}/libedata-cal/e-cal-backend-file-store.h
+include/evolution-data-server-${R}/libedata-cal/e-cal-backend-intervaltree.h
 include/evolution-data-server-${R}/libedata-cal/e-cal-backend-sexp.h
 include/evolution-data-server-${R}/libedata-cal/e-cal-backend-store.h
 include/evolution-data-server-${R}/libedata-cal/e-cal-backend-sync.h
@@ -197,26 +183,23 @@ include/evolution-data-server-${R}/libedataserver/e-account-list.h
 include/evolution-data-server-${R}/libedataserver/e-account.h
 include/evolution-data-server-${R}/libedataserver/e-categories.h
 include/evolution-data-server-${R}/libedataserver/e-data-server-util.h
+include/evolution-data-server-${R}/libedataserver/e-debug-log.h
 include/evolution-data-server-${R}/libedataserver/e-flag.h
-include/evolution-data-server-${R}/libedataserver/e-iconv.h
 include/evolution-data-server-${R}/libedataserver/e-iterator.h
 include/evolution-data-server-${R}/libedataserver/e-list-iterator.h
 include/evolution-data-server-${R}/libedataserver/e-list.h
 include/evolution-data-server-${R}/libedataserver/e-memory.h
-include/evolution-data-server-${R}/libedataserver/e-msgport.h
 include/evolution-data-server-${R}/libedataserver/e-proxy.h
 include/evolution-data-server-${R}/libedataserver/e-sexp.h
 include/evolution-data-server-${R}/libedataserver/e-source-group.h
 include/evolution-data-server-${R}/libedataserver/e-source-list.h
 include/evolution-data-server-${R}/libedataserver/e-source.h
 include/evolution-data-server-${R}/libedataserver/e-time-utils.h
-include/evolution-data-server-${R}/libedataserver/e-trie.h
 include/evolution-data-server-${R}/libedataserver/e-uid.h
 include/evolution-data-server-${R}/libedataserver/e-url.h
 include/evolution-data-server-${R}/libedataserver/e-xml-hash-utils.h
 include/evolution-data-server-${R}/libedataserver/e-xml-utils.h
 include/evolution-data-server-${R}/libedataserver/eds-version.h
-include/evolution-data-server-${R}/libedataserver/md5-utils.h
 include/evolution-data-server-${R}/libedataserverui/
 include/evolution-data-server-${R}/libedataserverui/e-book-auth-util.h
 include/evolution-data-server-${R}/libedataserverui/e-categories-dialog.h
@@ -231,7 +214,6 @@ include/evolution-data-server-${R}/libedataserverui/e-name-selector-model.h
 include/evolution-data-server-${R}/libedataserverui/e-name-selector.h
 include/evolution-data-server-${R}/libedataserverui/e-passwords.h
 include/evolution-data-server-${R}/libedataserverui/e-source-combo-box.h
-include/evolution-data-server-${R}/libedataserverui/e-source-option-menu.h
 include/evolution-data-server-${R}/libedataserverui/e-source-selector-dialog.h
 include/evolution-data-server-${R}/libedataserverui/e-source-selector.h
 include/evolution-data-server-${R}/libedataserverui/e-tree-model-generator.h
@@ -297,9 +279,6 @@ lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.so
 @comment lib/evolution-data-server-1.2/extensions/libecalbackendfile.a
 @comment lib/evolution-data-server-1.2/extensions/libecalbackendfile.la
 lib/evolution-data-server-1.2/extensions/libecalbackendfile.so
-@comment lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.a
-@comment lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.la
-lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.so
 @comment lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.a
 @comment lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.la
 lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so
@@ -339,12 +318,6 @@ lib/libedataserverui-1.2.la
 lib/libegroupwise-1.2.a
 lib/libegroupwise-1.2.la
 @lib lib/libegroupwise-1.2.so.${LIBegroupwise-1.2_VERSION}
-lib/libgdata-1.2.a
-lib/libgdata-1.2.la
-@lib lib/libgdata-1.2.so.${LIBgdata-1.2_VERSION}
-lib/libgdata-google-1.2.a
-lib/libgdata-google-1.2.la
-@lib lib/libgdata-google-1.2.so.${LIBgdata-google-1.2_VERSION}
 lib/pkgconfig/camel-1.2.pc
 lib/pkgconfig/camel-provider-1.2.pc
 lib/pkgconfig/evolution-data-server-1.2.pc
@@ -356,8 +329,6 @@ lib/pkgconfig/libedata-cal-1.2.pc
 lib/pkgconfig/libedataserver-1.2.pc
 lib/pkgconfig/libedataserverui-1.2.pc
 lib/pkgconfig/libegroupwise-1.2.pc
-lib/pkgconfig/libgdata-1.2.pc
-lib/pkgconfig/libgdata-google-1.2.pc
 @bin libexec/camel-index-control-1.2
 @mode 4555
 @bin libexec/camel-lock-helper-1.2
@@ -375,6 +346,86 @@ share/evolution-data-server-${R}/weather/
 share/evolution-data-server-${R}/weather/Locations.xml
 share/gtk-doc/html/camel/
 share/gtk-doc/html/camel/Addresses.html
+share/gtk-doc/html/camel/CamelAddress.html
+share/gtk-doc/html/camel/CamelCertDB.html
+share/gtk-doc/html/camel/CamelCipherContext.html
+share/gtk-doc/html/camel/CamelDataCache.html
+share/gtk-doc/html/camel/CamelDataWrapper.html
+share/gtk-doc/html/camel/CamelDiscoDiary.html
+share/gtk-doc/html/camel/CamelDiscoFolder.html
+share/gtk-doc/html/camel/CamelDiscoStore.html
+share/gtk-doc/html/camel/CamelFilterDriver.html
+share/gtk-doc/html/camel/CamelFolder.html
+share/gtk-doc/html/camel/CamelFolderSearch.html
+share/gtk-doc/html/camel/CamelFolderSummary.html
+share/gtk-doc/html/camel/CamelGpgContext.html
+share/gtk-doc/html/camel/CamelHttpStream.html
+share/gtk-doc/html/camel/CamelIndex.html
+share/gtk-doc/html/camel/CamelInternetAddress.html
+share/gtk-doc/html/camel/CamelKeyFile.html
+share/gtk-doc/html/camel/CamelKeyTable.html
+share/gtk-doc/html/camel/CamelMedium.html
+share/gtk-doc/html/camel/CamelMimeFilter.html
+share/gtk-doc/html/camel/CamelMimeFilterBasic.html
+share/gtk-doc/html/camel/CamelMimeFilterBestenc.html
+share/gtk-doc/html/camel/CamelMimeFilterCRLF.html
+share/gtk-doc/html/camel/CamelMimeFilterCanon.html
+share/gtk-doc/html/camel/CamelMimeFilterCharset.html
+share/gtk-doc/html/camel/CamelMimeFilterEnriched.html
+share/gtk-doc/html/camel/CamelMimeFilterFrom.html
+share/gtk-doc/html/camel/CamelMimeFilterGZip.html
+share/gtk-doc/html/camel/CamelMimeFilterHTML.html
+share/gtk-doc/html/camel/CamelMimeFilterIndex.html
+share/gtk-doc/html/camel/CamelMimeFilterLinewrap.html
+share/gtk-doc/html/camel/CamelMimeFilterPgp.html
+share/gtk-doc/html/camel/CamelMimeFilterProgress.html
+share/gtk-doc/html/camel/CamelMimeFilterSave.html
+share/gtk-doc/html/camel/CamelMimeFilterToHTML.html
+share/gtk-doc/html/camel/CamelMimeFilterWindows.html
+share/gtk-doc/html/camel/CamelMimeFilterYenc.html
+share/gtk-doc/html/camel/CamelMimeMessage.html
+share/gtk-doc/html/camel/CamelMimeParser.html
+share/gtk-doc/html/camel/CamelMimePart.html
+share/gtk-doc/html/camel/CamelMultipart.html
+share/gtk-doc/html/camel/CamelMultipartEncrypted.html
+share/gtk-doc/html/camel/CamelMultipartSigned.html
+share/gtk-doc/html/camel/CamelNNTPAddress.html
+share/gtk-doc/html/camel/CamelObject.html
+share/gtk-doc/html/camel/CamelOfflineFolder.html
+share/gtk-doc/html/camel/CamelOfflineJournal.html
+share/gtk-doc/html/camel/CamelOfflineStore.html
+share/gtk-doc/html/camel/CamelSMIMEContext.html
+share/gtk-doc/html/camel/CamelSasl.html
+share/gtk-doc/html/camel/CamelSaslAnonymous.html
+share/gtk-doc/html/camel/CamelSaslCramMd5.html
+share/gtk-doc/html/camel/CamelSaslDigestMd5.html
+share/gtk-doc/html/camel/CamelSaslGssapi.html
+share/gtk-doc/html/camel/CamelSaslLogin.html
+share/gtk-doc/html/camel/CamelSaslNTLM.html
+share/gtk-doc/html/camel/CamelSaslPOPB4SMTP.html
+share/gtk-doc/html/camel/CamelSaslPlain.html
+share/gtk-doc/html/camel/CamelSeekableStream.html
+share/gtk-doc/html/camel/CamelSeekableSubstream.html
+share/gtk-doc/html/camel/CamelService.html
+share/gtk-doc/html/camel/CamelSession.html
+share/gtk-doc/html/camel/CamelStore.html
+share/gtk-doc/html/camel/CamelStoreSummary.html
+share/gtk-doc/html/camel/CamelStream.html
+share/gtk-doc/html/camel/CamelStreamBuffer.html
+share/gtk-doc/html/camel/CamelStreamFilter.html
+share/gtk-doc/html/camel/CamelStreamFs.html
+share/gtk-doc/html/camel/CamelStreamMem.html
+share/gtk-doc/html/camel/CamelStreamNull.html
+share/gtk-doc/html/camel/CamelStreamProcess.html
+share/gtk-doc/html/camel/CamelStreamVFS.html
+share/gtk-doc/html/camel/CamelTcpStream.html
+share/gtk-doc/html/camel/CamelTcpStreamRaw.html
+share/gtk-doc/html/camel/CamelTextIndexName.html
+share/gtk-doc/html/camel/CamelTransport.html
+share/gtk-doc/html/camel/CamelVTrashFolder.html
+share/gtk-doc/html/camel/CamelVeeFolder.html
+share/gtk-doc/html/camel/CamelVeeStore.html
+share/gtk-doc/html/camel/CamelVeeSummary.html
 share/gtk-doc/html/camel/ClassTree.html
 share/gtk-doc/html/camel/Crypto.html
 share/gtk-doc/html/camel/Deprecated.html
@@ -392,100 +443,15 @@ share/gtk-doc/html/camel/api-index-2.22.html
 share/gtk-doc/html/camel/api-index-2.24.html
 share/gtk-doc/html/camel/api-index-2.26.html
 share/gtk-doc/html/camel/api-index-2.28.html
+share/gtk-doc/html/camel/api-index-2.30.html
 share/gtk-doc/html/camel/api-index-${R}.html
 share/gtk-doc/html/camel/api-index-deprecated.html
 share/gtk-doc/html/camel/api-index-full.html
-share/gtk-doc/html/camel/camel-CamelAddress.html
-share/gtk-doc/html/camel/camel-CamelCertDB.html
-share/gtk-doc/html/camel/camel-CamelCipherContext.html
 share/gtk-doc/html/camel/camel-CamelDB.html
-share/gtk-doc/html/camel/camel-CamelDataCache.html
-share/gtk-doc/html/camel/camel-CamelDataWrapper.html
-share/gtk-doc/html/camel/camel-CamelDigestFolder.html
-share/gtk-doc/html/camel/camel-CamelDigestStore.html
-share/gtk-doc/html/camel/camel-CamelDigestSummary.html
-share/gtk-doc/html/camel/camel-CamelDiscoDiary.html
-share/gtk-doc/html/camel/camel-CamelDiscoFolder.html
-share/gtk-doc/html/camel/camel-CamelDiscoStore.html
-share/gtk-doc/html/camel/camel-CamelFilterDriver.html
-share/gtk-doc/html/camel/camel-CamelFolder.html
-share/gtk-doc/html/camel/camel-CamelFolderSearch.html
-share/gtk-doc/html/camel/camel-CamelFolderSummary.html
-share/gtk-doc/html/camel/camel-CamelGpgContext.html
-share/gtk-doc/html/camel/camel-CamelHttpStream.html
-share/gtk-doc/html/camel/camel-CamelIndex.html
-share/gtk-doc/html/camel/camel-CamelInternetAddress.html
-share/gtk-doc/html/camel/camel-CamelKeyFile.html
-share/gtk-doc/html/camel/camel-CamelKeyTable.html
-share/gtk-doc/html/camel/camel-CamelMedium.html
-share/gtk-doc/html/camel/camel-CamelMimeFilter.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterBasic.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterBestenc.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterCRLF.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterCanon.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterCharset.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterEnriched.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterFrom.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterGZip.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterHTML.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterIndex.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterLinewrap.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterPgp.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterProgress.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterSave.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterToHTML.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterWindows.html
-share/gtk-doc/html/camel/camel-CamelMimeFilterYenc.html
-share/gtk-doc/html/camel/camel-CamelMimeMessage.html
-share/gtk-doc/html/camel/camel-CamelMimeParser.html
-share/gtk-doc/html/camel/camel-CamelMimePart.html
 share/gtk-doc/html/camel/camel-CamelMsgPort.html
-share/gtk-doc/html/camel/camel-CamelMultipart.html
-share/gtk-doc/html/camel/camel-CamelMultipartEncrypted.html
-share/gtk-doc/html/camel/camel-CamelMultipartSigned.html
-share/gtk-doc/html/camel/camel-CamelNNTPAddress.html
-share/gtk-doc/html/camel/camel-CamelNewsAddress.html
-share/gtk-doc/html/camel/camel-CamelObject.html
-share/gtk-doc/html/camel/camel-CamelOfflineFolder.html
-share/gtk-doc/html/camel/camel-CamelOfflineJournal.html
-share/gtk-doc/html/camel/camel-CamelOfflineStore.html
-share/gtk-doc/html/camel/camel-CamelSMIMEContext.html
-share/gtk-doc/html/camel/camel-CamelSasl.html
-share/gtk-doc/html/camel/camel-CamelSaslAnonymous.html
-share/gtk-doc/html/camel/camel-CamelSaslCramMd5.html
-share/gtk-doc/html/camel/camel-CamelSaslDigestMd5.html
-share/gtk-doc/html/camel/camel-CamelSaslGssapi.html
-share/gtk-doc/html/camel/camel-CamelSaslLogin.html
-share/gtk-doc/html/camel/camel-CamelSaslNTLM.html
-share/gtk-doc/html/camel/camel-CamelSaslPOPB4SMTP.html
-share/gtk-doc/html/camel/camel-CamelSaslPlain.html
-share/gtk-doc/html/camel/camel-CamelSeekableStream.html
-share/gtk-doc/html/camel/camel-CamelSeekableSubstream.html
-share/gtk-doc/html/camel/camel-CamelService.html
-share/gtk-doc/html/camel/camel-CamelSession.html
-share/gtk-doc/html/camel/camel-CamelStore.html
-share/gtk-doc/html/camel/camel-CamelStoreSummary.html
-share/gtk-doc/html/camel/camel-CamelStream.html
-share/gtk-doc/html/camel/camel-CamelStreamBuffer.html
-share/gtk-doc/html/camel/camel-CamelStreamFilter.html
-share/gtk-doc/html/camel/camel-CamelStreamFs.html
-share/gtk-doc/html/camel/camel-CamelStreamMem.html
-share/gtk-doc/html/camel/camel-CamelStreamNull.html
-share/gtk-doc/html/camel/camel-CamelStreamProcess.html
-share/gtk-doc/html/camel/camel-CamelStreamVFS.html
-share/gtk-doc/html/camel/camel-CamelTcpStream.html
-share/gtk-doc/html/camel/camel-CamelTcpStreamRaw.html
 share/gtk-doc/html/camel/camel-CamelTcpStreamSSL.html
-share/gtk-doc/html/camel/camel-CamelTextIndexName.html
-share/gtk-doc/html/camel/camel-CamelTransport.html
-share/gtk-doc/html/camel/camel-CamelVTrashFolder.html
-share/gtk-doc/html/camel/camel-CamelVeeFolder.html
-share/gtk-doc/html/camel/camel-CamelVeeStore.html
-share/gtk-doc/html/camel/camel-CamelVeeSummary.html
-share/gtk-doc/html/camel/camel-camel-arg.html
 share/gtk-doc/html/camel/camel-camel-charset-map.html
 share/gtk-doc/html/camel/camel-camel-debug.html
-share/gtk-doc/html/camel/camel-camel-exception.html
 share/gtk-doc/html/camel/camel-camel-file-utils.html
 share/gtk-doc/html/camel/camel-camel-filter-search.html
 share/gtk-doc/html/camel/camel-camel-folder-thread.html
@@ -494,11 +460,11 @@ share/gtk-doc/html/camel/camel-camel-junk-plugin.html
 share/gtk-doc/html/camel/camel-camel-list-utils.html
 share/gtk-doc/html/camel/camel-camel-lock-client.html
 share/gtk-doc/html/camel/camel-camel-lock.html
+share/gtk-doc/html/camel/camel-camel-mempool.html
 share/gtk-doc/html/camel/camel-camel-mime-utils.html
 share/gtk-doc/html/camel/camel-camel-movemail.html
 share/gtk-doc/html/camel/camel-camel-net-utils.html
 share/gtk-doc/html/camel/camel-camel-operation.html
-share/gtk-doc/html/camel/camel-camel-process.html
 share/gtk-doc/html/camel/camel-camel-provider.html
 share/gtk-doc/html/camel/camel-camel-search-sql-sexp.html
 share/gtk-doc/html/camel/camel-camel-search-sql.html
@@ -523,7 +489,8 @@ share/gtk-doc/html/libebackend/
 share/gtk-doc/html/libebackend/api-index-2.24.html
 share/gtk-doc/html/libebackend/api-index-2.26.html
 share/gtk-doc/html/libebackend/api-index-2.28.html
-share/gtk-doc/html/libebackend/api-index-${R}.html
+share/gtk-doc/html/libebackend/api-index-2.30.html
+share/gtk-doc/html/libebackend/api-index-deprecated.html
 share/gtk-doc/html/libebackend/ch01.html
 share/gtk-doc/html/libebackend/home.png
 share/gtk-doc/html/libebackend/index.html
@@ -551,7 +518,9 @@ share/gtk-doc/html/libebook/api-index-2.22.html
 share/gtk-doc/html/libebook/api-index-2.24.html
 share/gtk-doc/html/libebook/api-index-2.26.html
 share/gtk-doc/html/libebook/api-index-2.28.html
+share/gtk-doc/html/libebook/api-index-2.30.html
 share/gtk-doc/html/libebook/api-index-${R}.html
+share/gtk-doc/html/libebook/api-index-deprecated.html
 share/gtk-doc/html/libebook/api-index-full.html
 share/gtk-doc/html/libebook/ch01.html
 share/gtk-doc/html/libebook/home.png
@@ -576,7 +545,9 @@ share/gtk-doc/html/libecal/api-index-2.22.html
 share/gtk-doc/html/libecal/api-index-2.24.html
 share/gtk-doc/html/libecal/api-index-2.26.html
 share/gtk-doc/html/libecal/api-index-2.28.html
+share/gtk-doc/html/libecal/api-index-2.30.html
 share/gtk-doc/html/libecal/api-index-${R}.html
+share/gtk-doc/html/libecal/api-index-deprecated.html
 share/gtk-doc/html/libecal/api-index-full.html
 share/gtk-doc/html/libecal/ch01.html
 share/gtk-doc/html/libecal/home.png
@@ -608,7 +579,9 @@ share/gtk-doc/html/libedata-book/api-index-2.22.html
 share/gtk-doc/html/libedata-book/api-index-2.24.html
 share/gtk-doc/html/libedata-book/api-index-2.26.html
 share/gtk-doc/html/libedata-book/api-index-2.28.html
+share/gtk-doc/html/libedata-book/api-index-2.30.html
 share/gtk-doc/html/libedata-book/api-index-${R}.html
+share/gtk-doc/html/libedata-book/api-index-deprecated.html
 share/gtk-doc/html/libedata-book/api-index-full.html
 share/gtk-doc/html/libedata-book/ch01.html
 share/gtk-doc/html/libedata-book/home.png
@@ -635,7 +608,9 @@ share/gtk-doc/html/libedata-cal/api-index-2.22.html
 share/gtk-doc/html/libedata-cal/api-index-2.24.html
 share/gtk-doc/html/libedata-cal/api-index-2.26.html
 share/gtk-doc/html/libedata-cal/api-index-2.28.html
+share/gtk-doc/html/libedata-cal/api-index-2.30.html
 share/gtk-doc/html/libedata-cal/api-index-${R}.html
+share/gtk-doc/html/libedata-cal/api-index-deprecated.html
 share/gtk-doc/html/libedata-cal/api-index-full.html
 share/gtk-doc/html/libedata-cal/ch01.html
 share/gtk-doc/html/libedata-cal/home.png
@@ -647,6 +622,7 @@ share/gtk-doc/html/libedata-cal/libedata-cal-ECalBackendLoaderFactory.html
 share/gtk-doc/html/libedata-cal/libedata-cal-ECalBackendStore.html
 share/gtk-doc/html/libedata-cal/libedata-cal-EDataCalFactory.html
 share/gtk-doc/html/libedata-cal/libedata-cal-EDataCalView.html
+share/gtk-doc/html/libedata-cal/libedata-cal-EIntervalTree.html
 share/gtk-doc/html/libedata-cal/libedata-cal-e-cal-backend-util.html
 share/gtk-doc/html/libedata-cal/libedata-cal.devhelp
 share/gtk-doc/html/libedata-cal/libedata-cal.devhelp2
@@ -667,7 +643,9 @@ share/gtk-doc/html/libedataserver/api-index-2.22.html
 share/gtk-doc/html/libedataserver/api-index-2.24.html
 share/gtk-doc/html/libedataserver/api-index-2.26.html
 share/gtk-doc/html/libedataserver/api-index-2.28.html
+share/gtk-doc/html/libedataserver/api-index-2.30.html
 share/gtk-doc/html/libedataserver/api-index-${R}.html
+share/gtk-doc/html/libedataserver/api-index-deprecated.html
 share/gtk-doc/html/libedataserver/api-index-full.html
 share/gtk-doc/html/libedataserver/ch01.html
 share/gtk-doc/html/libedataserver/home.png
@@ -679,16 +657,13 @@ share/gtk-doc/html/libedataserver/libedataserver-EProxy.html
 share/gtk-doc/html/libedataserver/libedataserver-ESExp.html
 share/gtk-doc/html/libedataserver/libedataserver-Version-Information.html
 share/gtk-doc/html/libedataserver/libedataserver-e-categories.html
-share/gtk-doc/html/libedataserver/libedataserver-e-iconv.html
+share/gtk-doc/html/libedataserver/libedataserver-e-debug-log.html
 share/gtk-doc/html/libedataserver/libedataserver-e-memory.html
-share/gtk-doc/html/libedataserver/libedataserver-e-msgport.html
 share/gtk-doc/html/libedataserver/libedataserver-e-time-utils.html
-share/gtk-doc/html/libedataserver/libedataserver-e-trie.html
 share/gtk-doc/html/libedataserver/libedataserver-e-uid.html
 share/gtk-doc/html/libedataserver/libedataserver-e-url.html
 share/gtk-doc/html/libedataserver/libedataserver-e-util.html
 share/gtk-doc/html/libedataserver/libedataserver-e-xml-hash-utils.html
-share/gtk-doc/html/libedataserver/libedataserver-md5-utils.html
 share/gtk-doc/html/libedataserver/libedataserver.devhelp
 share/gtk-doc/html/libedataserver/libedataserver.devhelp2
 share/gtk-doc/html/libedataserver/right.png
@@ -704,7 +679,6 @@ share/gtk-doc/html/libedataserverui/ENameSelectorEntry.html
 share/gtk-doc/html/libedataserverui/ENameSelectorList.html
 share/gtk-doc/html/libedataserverui/ENameSelectorModel.html
 share/gtk-doc/html/libedataserverui/ESourceComboBox.html
-share/gtk-doc/html/libedataserverui/ESourceOptionMenu.html
 share/gtk-doc/html/libedataserverui/ESourceSelector.html
 share/gtk-doc/html/libedataserverui/ESourceSelectorDialog.html
 share/gtk-doc/html/libedataserverui/ETreeModelGenerator.html
@@ -713,7 +687,9 @@ share/gtk-doc/html/libedataserverui/api-index-2.22.html
 share/gtk-doc/html/libedataserverui/api-index-2.24.html
 share/gtk-doc/html/libedataserverui/api-index-2.26.html
 share/gtk-doc/html/libedataserverui/api-index-2.28.html
+share/gtk-doc/html/libedataserverui/api-index-2.30.html
 share/gtk-doc/html/libedataserverui/api-index-${R}.html
+share/gtk-doc/html/libedataserverui/api-index-deprecated.html
 share/gtk-doc/html/libedataserverui/api-index-full.html
 share/gtk-doc/html/libedataserverui/ch01.html
 share/gtk-doc/html/libedataserverui/home.png
@@ -723,7 +699,6 @@ share/gtk-doc/html/libedataserverui/left.png
 share/gtk-doc/html/libedataserverui/libedataserverui-ECategoryCompletion.html
 share/gtk-doc/html/libedataserverui/libedataserverui-ECellRendererColor.html
 share/gtk-doc/html/libedataserverui/libedataserverui-e-book-auth-util.html
-share/gtk-doc/html/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
 share/gtk-doc/html/libedataserverui/libedataserverui-e-passwords.html
 share/gtk-doc/html/libedataserverui/libedataserverui.devhelp
 share/gtk-doc/html/libedataserverui/libedataserverui.devhelp2