Part two of the GNOME 3.6 update.

Submitted by:	Gustau Perez


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18422 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 182 insertions, 138 deletions

diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile
index 5feae1aea..49ecb6a50 100644
--- a/databases/evolution-data-server3/Makefile
+++ b/databases/evolution-data-server3/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/databases/evolution-data-server3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	3.4.4
+PORTVERSION=	3.6.4
 PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
@@ -15,7 +15,8 @@ COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+		gcr>=3.4.1:${PORTSDIR}/security/gcr
 LIB_DEPENDS=	soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \
 		oauth:${PORTSDIR}/net/liboauth \
 		goa-1:${PORTSDIR}/net/gnome-online-accounts \
@@ -30,7 +31,7 @@ CONFLICTS=	evolution-data-server-2.[0-9]*
 LATEST_LINK=	evolution-data-server3
 USE_XZ=		yes
 USE_GMAKE=	yes
-USES=		bison gettext pathfix pkgconfig
+USES=		bison pathfix gettext pkgconfig
 USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
 		libxml2 gtk30
 USE_OPENLDAP=	yes
@@ -44,10 +45,13 @@ CONFIGURE_ARGS=	--enable-static \
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-GLIB_SCHEMAS=	org.gnome.evolution.eds-shell.gschema.xml \
+GLIB_SCHEMAS=	org.gnome.Evolution.DefaultSources.gschema.xml \
+		org.gnome.evolution.eds-shell.gschema.xml \
+		org.gnome.evolution-data-server.addressbook.gschema.xml \
+		org.gnome.evolution-data-server.calendar.gschema.xml \
 		org.gnome.evolution.shell.network-config.gschema.xml
 
-PLIST_SUB=	VERSION="3.4" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="3.6" EVO_VERSION="1.2"
 
 OPTIONS_DEFINE=	WEATHER KERBEROS
 OPTIONS_DEFAULT=WEATHER KERBEROS
diff --git a/databases/evolution-data-server3/distinfo b/databases/evolution-data-server3/distinfo
index 3449e17df..64c730c93 100644
--- a/databases/evolution-data-server3/distinfo
+++ b/databases/evolution-data-server3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-data-server-3.4.4.tar.xz) = ce9e1d5625503cd7f1f0631ec2f552e26800c33305b45722b34eba8da5ced491
-SIZE (gnome3/evolution-data-server-3.4.4.tar.xz) = 3647048
+SHA256 (gnome3/evolution-data-server-3.6.4.tar.xz) = 50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e
+SIZE (gnome3/evolution-data-server-3.6.4.tar.xz) = 4079620
diff --git a/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c b/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
deleted file mode 100644
index 34ad35881..000000000
--- a/databases/evolution-data-server3/files/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	2011-01-18 17:09:50.000000000 +0000
-+++ ./calendar/libedata-cal/e-cal-backend-intervaltree.c	2011-01-18 17:09:59.000000000 +0000
-@@ -26,7 +26,7 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "e-cal-backend-intervaltree.h"
- 
diff --git a/databases/evolution-data-server3/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server3/files/patch-camel_camel-net-utils.c
deleted file mode 100644
index 17bddca39..000000000
--- a/databases/evolution-data-server3/files/patch-camel_camel-net-utils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- camel/camel-net-utils.c.orig	Tue Dec 21 13:38:52 2004
-+++ camel/camel-net-utils.c	Tue Dec 21 13:40:34 2004
-@@ -143,12 +143,21 @@
- 	case EAI_SERVICE:
- 		return NO_DATA;
- 		break;
-+#ifdef EAI_ADDRFAMILY
- 	case EAI_ADDRFAMILY:
- 		return NO_ADDRESS;
- 		break;
-+#endif
-+#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
- 	case EAI_NODATA:
- 		return NO_DATA;
- 		break;
-+#endif
-+#ifdef EAI_NOFAMILY
-+	case EAI_NOFAMILY:
-+		return NO_ADDRESS;
-+		break;
-+#endif
- 	case EAI_MEMORY:
- 		return ENOMEM;
- 		break;
diff --git a/databases/evolution-data-server3/files/patch-camel_camel-sasl-gssapi.c b/databases/evolution-data-server3/files/patch-camel_camel-sasl-gssapi.c
deleted file mode 100644
index 853a2f278..000000000
--- a/databases/evolution-data-server3/files/patch-camel_camel-sasl-gssapi.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- camel/camel-sasl-gssapi.c.orig	2012-05-20 12:44:42.000000000 +0200
-+++ camel/camel-sasl-gssapi.c	2012-05-20 12:45:21.000000000 +0200
-@@ -66,7 +66,7 @@
- #endif /* HAVE_MIT_KRB5 */
- 
- #ifdef HAVE_HEIMDAL_KRB5
--#include <gssapi.h>
-+#include <gssapi/gssapi.h>
- #else
- #ifdef HAVE_SUN_KRB5
- #include <gssapi/gssapi.h>
diff --git a/databases/evolution-data-server3/files/patch-camel_providers_imapx_Makefile.in b/databases/evolution-data-server3/files/patch-camel_providers_imapx_Makefile.in
deleted file mode 100644
index 0e1321d75..000000000
--- a/databases/evolution-data-server3/files/patch-camel_providers_imapx_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Our gperf (2.7.2) doesn't understand --output-file.
-
---- camel/providers/imapx/Makefile.in.orig	2010-04-26 14:33:56.000000000 +0200
-+++ camel/providers/imapx/Makefile.in	2010-04-26 14:35:10.000000000 +0200
-@@ -914,7 +914,7 @@ uninstall-am: uninstall-camel_providerDA
- 
- 
- camel-imapx-tokenise.h: camel-imapx-tokens.txt
--	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
-+	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< > $@
- 
- -include $(top_srcdir)/git.mk
- 
diff --git a/databases/evolution-data-server3/files/patch-camel_providers_imapx_camel-imapx-tokens.txt b/databases/evolution-data-server3/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
deleted file mode 100644
index 8ce6381e9..000000000
--- a/databases/evolution-data-server3/files/patch-camel_providers_imapx_camel-imapx-tokens.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- camel/providers/imapx/camel-imapx-tokens.txt.orig	2010-04-26 14:25:22.000000000 +0200
-+++ camel/providers/imapx/camel-imapx-tokens.txt	2010-04-26 14:25:32.000000000 +0200
-@@ -1,5 +1,3 @@
--/* This contains all of the keywords we care about.  These
--   can be converted to an id very efficiently */
- struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
- struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
- %%
diff --git a/databases/evolution-data-server3/files/patch-configure b/databases/evolution-data-server3/files/patch-configure
deleted file mode 100644
index 82e7be156..000000000
--- a/databases/evolution-data-server3/files/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig	2012-05-14 06:21:51.000000000 +0200
-+++ configure	2012-05-20 12:56:44.000000000 +0200
-@@ -16716,6 +16716,14 @@
- 	DL_LIB=''
- 	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
- 	;;
-+*freebsd*)
-+	os_win32=no
-+	NO_UNDEFINED=''
-+	SOCKET_LIBS=''
-+	DL_LIB=''
-+	SOFTOKN3_LIB='-lsoftokn3'
-+	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
-+	;;
- *)
- 	os_win32='no'
- 	NO_UNDEFINED=''
-@@ -19295,6 +19303,7 @@
- 			#include <com_err.h>
- 			#endif
- 
-+#include <sys/types.h>
- "
- if test "x$ac_cv_header_com_err_h" = xyes; then :
- 
diff --git a/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile b/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile
deleted file mode 100644
index 6d63d41e1..000000000
--- a/databases/evolution-data-server3/files/patch-docs_reference_camel_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/camel/Makefile.in.orig	2011-09-15 22:17:02.000000000 +0200
-+++ docs/reference/camel/Makefile.in	2011-09-15 22:18:09.000000000 +0200
-@@ -159,7 +159,7 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@
- GTKDOC_REBASE = @GTKDOC_REBASE@
- HAVE_JW = @HAVE_JW@
- HAVE_VALA = @HAVE_VALA@
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(datadir)/doc
- ICONV_LIBS = @ICONV_LIBS@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
diff --git a/databases/evolution-data-server3/pkg-plist b/databases/evolution-data-server3/pkg-plist
index 99d77a0d6..c09ec23c5 100644
--- a/databases/evolution-data-server3/pkg-plist
+++ b/databases/evolution-data-server3/pkg-plist
@@ -22,8 +22,19 @@ include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel-junk-filter.h
 include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
 include/evolution-data-server-%%VERSION%%/camel/camel-html-parser.h
-include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
 include/evolution-data-server-%%VERSION%%/camel/camel-iconv.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-command.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-conn-manager.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-job.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-server.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-settings.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-store-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-imapx-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-data-cache.h
 include/evolution-data-server-%%VERSION%%/camel/camel-index.h
 include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
 include/evolution-data-server-%%VERSION%%/camel/camel-local-settings.h
@@ -85,7 +96,6 @@ include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h
 include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h
 include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h
 include/evolution-data-server-%%VERSION%%/camel/camel-search-sql-sexp.h
-include/evolution-data-server-%%VERSION%%/camel/camel-search-sql.h
 include/evolution-data-server-%%VERSION%%/camel/camel-service.h
 include/evolution-data-server-%%VERSION%%/camel/camel-session.h
 include/evolution-data-server-%%VERSION%%/camel/camel-settings.h
@@ -119,6 +129,15 @@ include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
 include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
 include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
 include/evolution-data-server-%%VERSION%%/camel/camel.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-authentication-mediator.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-authentication-session.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-backend-enums.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-backend-enumtypes.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-collection-backend-factory.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-collection-backend.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-server-side-source.h
+include/evolution-data-server-%%VERSION%%/libebackend/e-source-registry-server.h
+include/evolution-data-server-%%VERSION%%/libebackend/libebackend.h
 include/evolution-data-server-%%VERSION%%/libebackend/e-backend.h
 include/evolution-data-server-%%VERSION%%/libebackend/e-backend-factory.h
 include/evolution-data-server-%%VERSION%%/libebackend/e-data-factory.h
@@ -131,6 +150,8 @@ include/evolution-data-server-%%VERSION%%/libebackend/e-file-cache.h
 include/evolution-data-server-%%VERSION%%/libebackend/e-module.h
 include/evolution-data-server-%%VERSION%%/libebackend/e-offline-listener.h
 include/evolution-data-server-%%VERSION%%/libebackend/e-sqlite3-vfs.h
+include/evolution-data-server-%%VERSION%%/libebook/e-book-enumtypes.h
+include/evolution-data-server-%%VERSION%%/libebook/libebook.h
 include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-client-view.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-client.h
@@ -142,6 +163,8 @@ include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
 include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
+include/evolution-data-server-%%VERSION%%/libecal/e-cal-enumtypes.h
+include/evolution-data-server-%%VERSION%%/libecal/libecal.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-check-timezones.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-client-view.h
 include/evolution-data-server-%%VERSION%%/libecal/e-cal-client.h
@@ -162,9 +185,10 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sync.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-factory.h
-include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-types.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h
 include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h
+include/evolution-data-server-%%VERSION%%/libedata-book/libedata-book.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-file-store.h
@@ -173,14 +197,42 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-store.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h
-include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-common.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-factory.h
-include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-types.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h
 include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h
+include/evolution-data-server-%%VERSION%%/libedata-cal/libedata-cal.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-address-book.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-alarms.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-authentication.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-authenticator.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-autocomplete.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-backend.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-calendar.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-camel.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-collection.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-enums.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-enumtypes.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-extension.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-goa.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mail-account.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mail-composition.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mail-identity.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mail-signature.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mail-submission.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mail-transport.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-mdn.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-offline.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-openpgp.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-refresh.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-registry.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-resource.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-security.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-selectable.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-smime.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-source-webdav.h
+include/evolution-data-server-%%VERSION%%/libedataserver/libedataserver.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/libedataserverui.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-client.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-credentials.h
@@ -196,8 +248,6 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-operation-pool.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-proxy.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h
-include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
@@ -255,6 +305,17 @@ lib/evolution-data-server/calendar-backends/libecalbackendhttp.so
 %%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.a
 %%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.la
 %%WEATHER%%lib/evolution-data-server/calendar-backends/libecalbackendweather.so
+lib/evolution-data-server/registry-modules/module-cache-reaper.a
+lib/evolution-data-server/registry-modules/module-cache-reaper.la
+lib/evolution-data-server/registry-modules/module-cache-reaper.so
+lib/evolution-data-server/registry-modules/module-google-backend.a
+lib/evolution-data-server/registry-modules/module-google-backend.la
+lib/evolution-data-server/registry-modules/module-google-backend.so
+lib/evolution-data-server/registry-modules/module-online-accounts.a
+lib/evolution-data-server/registry-modules/module-online-accounts.la
+lib/evolution-data-server/registry-modules/module-online-accounts.so
+lib/evolution-data-server/registry-modules/module-yahoo-backend.a
+lib/evolution-data-server/registry-modules/module-yahoo-backend.la
 lib/evolution-data-server/camel-providers/libcamelimap.a
 lib/evolution-data-server/camel-providers/libcamelimap.la
 lib/evolution-data-server/camel-providers/libcamelimap.so
@@ -283,41 +344,42 @@ lib/evolution-data-server/camel-providers/libcamelsmtp.a
 lib/evolution-data-server/camel-providers/libcamelsmtp.la
 lib/evolution-data-server/camel-providers/libcamelsmtp.so
 lib/evolution-data-server/camel-providers/libcamelsmtp.urls
+lib/evolution-data-server/registry-modules/module-yahoo-backend.so
 lib/girepository-1.0/EBook-1.2.typelib
 lib/girepository-1.0/ECalendar-1.2.typelib
 lib/girepository-1.0/EDataServer-1.2.typelib
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.33
+lib/libcamel-%%EVO_VERSION%%.so.40
 lib/libebackend-%%EVO_VERSION%%.a
 lib/libebackend-%%EVO_VERSION%%.la
 lib/libebackend-%%EVO_VERSION%%.so
-lib/libebackend-%%EVO_VERSION%%.so.2
+lib/libebackend-%%EVO_VERSION%%.so.5
 lib/libebook-%%EVO_VERSION%%.a
 lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
-lib/libebook-%%EVO_VERSION%%.so.13
+lib/libebook-%%EVO_VERSION%%.so.14
 lib/libecal-%%EVO_VERSION%%.a
 lib/libecal-%%EVO_VERSION%%.la
 lib/libecal-%%EVO_VERSION%%.so
-lib/libecal-%%EVO_VERSION%%.so.11
+lib/libecal-%%EVO_VERSION%%.so.15
 lib/libedata-book-%%EVO_VERSION%%.a
 lib/libedata-book-%%EVO_VERSION%%.la
 lib/libedata-book-%%EVO_VERSION%%.so
-lib/libedata-book-%%EVO_VERSION%%.so.13
+lib/libedata-book-%%EVO_VERSION%%.so.15
 lib/libedata-cal-%%EVO_VERSION%%.a
 lib/libedata-cal-%%EVO_VERSION%%.la
 lib/libedata-cal-%%EVO_VERSION%%.so
-lib/libedata-cal-%%EVO_VERSION%%.so.15
+lib/libedata-cal-%%EVO_VERSION%%.so.18
 lib/libedataserver-%%EVO_VERSION%%.a
 lib/libedataserver-%%EVO_VERSION%%.la
 lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.16
+lib/libedataserver-%%EVO_VERSION%%.so.17
 lib/libedataserverui-3.0.a
 lib/libedataserverui-3.0.la
 lib/libedataserverui-3.0.so
-lib/libedataserverui-3.0.so.1
+lib/libedataserverui-3.0.so.4
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
@@ -331,9 +393,29 @@ libexec/camel-index-control-%%EVO_VERSION%%
 libexec/camel-lock-helper-%%EVO_VERSION%%
 libexec/evolution-addressbook-factory
 libexec/evolution-calendar-factory
+libexec/evolution-source-registry
+share/GConf/gsettings/evolution-data-server.convert
 share/GConf/gsettings/libedataserver.convert
 share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
+share/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
+share/doc/camel/CamelIMAPXConnManager.html
+share/doc/camel/CamelIMAPXFolder.html
+share/doc/camel/CamelIMAPXServer.html
+share/doc/camel/CamelIMAPXSettings.html
+share/doc/camel/CamelIMAPXStore.html
+share/doc/camel/CamelIMAPXStoreSummary.html
+share/doc/camel/CamelIMAPXStream.html
+share/doc/camel/CamelIMAPXSummary.html
+share/doc/camel/CamelVeeDataCache.html
+share/doc/camel/CamelVeeMessageInfoData.html
+share/doc/camel/CamelVeeSubfolderData.html
+share/doc/camel/IMAP.html
+share/doc/camel/Virtual-Folders.html
+share/doc/camel/api-index-%%VERSION%%.html
+share/doc/camel/camel-CamelIMAPXCommand.html
+share/doc/camel/camel-CamelIMAPXJob.html
+share/doc/camel/camel-camel-search-sql-sexp.html
 share/doc/camel/Addresses.html
 share/doc/camel/CamelAddress.html
 share/doc/camel/CamelCertDB.html
@@ -348,7 +430,6 @@ share/doc/camel/CamelFolder.html
 share/doc/camel/CamelFolderSearch.html
 share/doc/camel/CamelFolderSummary.html
 share/doc/camel/CamelGpgContext.html
-share/doc/camel/CamelHttpStream.html
 share/doc/camel/CamelIndex.html
 share/doc/camel/CamelInternetAddress.html
 share/doc/camel/CamelJunkFilter.html
@@ -428,7 +509,6 @@ share/doc/camel/Filters.html
 share/doc/camel/Folders.html
 share/doc/camel/Fundamentals.html
 share/doc/camel/MIME.html
-share/doc/camel/Search-Folders.html
 share/doc/camel/Services.html
 share/doc/camel/Storage.html
 share/doc/camel/Stream-Filters.html
@@ -464,8 +544,6 @@ share/doc/camel/camel-camel-movemail.html
 share/doc/camel/camel-camel-net-utils.html
 share/doc/camel/camel-camel-operation.html
 share/doc/camel/camel-camel-provider.html
-share/doc/camel/camel-camel-search-sql-sexp.html
-share/doc/camel/camel-camel-search-sql.html
 share/doc/camel/camel-camel-string-utils.html
 share/doc/camel/camel-camel-trie.html
 share/doc/camel/camel-camel-uid-cache.html
@@ -482,6 +560,16 @@ share/doc/camel/left.png
 share/doc/camel/right.png
 share/doc/camel/style.css
 share/doc/camel/up.png
+share/doc/libebackend/EAuthenticationMediator.html
+share/doc/libebackend/EAuthenticationSession.html
+share/doc/libebackend/ECollectionBackend.html
+share/doc/libebackend/ECollectionBackendFactory.html
+share/doc/libebackend/EServerSideSource.html
+share/doc/libebackend/ESourceRegistryServer.html
+share/doc/libebackend/api-index-%%VERSION%%.html
+share/doc/libebackend/ch02.html
+share/doc/libebackend/ch03.html
+share/doc/libebackend/ch04.html
 share/doc/libebackend/EBackend.html
 share/doc/libebackend/EBackendFactory.html
 share/doc/libebackend/EDBusServer.html
@@ -511,6 +599,7 @@ share/doc/libebackend/libebackend.devhelp2
 share/doc/libebackend/right.png
 share/doc/libebackend/style.css
 share/doc/libebackend/up.png
+share/doc/libebook/api-index-%%VERSION%%.html
 share/doc/libebook/EBook.html
 share/doc/libebook/EBookClient.html
 share/doc/libebook/EBookClientView.html
@@ -545,6 +634,7 @@ share/doc/libebook/libebook.devhelp2
 share/doc/libebook/right.png
 share/doc/libebook/style.css
 share/doc/libebook/up.png
+share/doc/libecal/api-index-%%VERSION%%.html
 share/doc/libecal/ECal.html
 share/doc/libecal/ECalClient.html
 share/doc/libecal/ECalClientView.html
@@ -579,6 +669,10 @@ share/doc/libecal/libecal.devhelp2
 share/doc/libecal/right.png
 share/doc/libecal/style.css
 share/doc/libecal/up.png
+share/doc/libedata-book/EDataBookFactory.html
+share/doc/libedata-book/api-index-%%VERSION%%.html
+share/doc/libedata-cal/EDataCalFactory.html
+share/doc/libedata-cal/api-index-%%VERSION%%.html
 share/doc/libedata-book/EBookBackend.html
 share/doc/libedata-book/EBookBackendCache.html
 share/doc/libedata-book/EBookBackendFactory.html
@@ -606,7 +700,6 @@ share/doc/libedata-book/index.html
 share/doc/libedata-book/index.sgml
 share/doc/libedata-book/left.png
 share/doc/libedata-book/libedata-book-EBookBackendSqliteDB.html
-share/doc/libedata-book/libedata-book-EDataBookFactory.html
 share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
 share/doc/libedata-book/libedata-book-ximian-vcard.html
 share/doc/libedata-book/libedata-book.devhelp2
@@ -639,7 +732,6 @@ share/doc/libedata-cal/index.sgml
 share/doc/libedata-cal/left.png
 share/doc/libedata-cal/libedata-cal-ECalBackendFileStore.html
 share/doc/libedata-cal/libedata-cal-ECalBackendStore.html
-share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
 share/doc/libedata-cal/libedata-cal-EDataCalView.html
 share/doc/libedata-cal/libedata-cal-EIntervalTree.html
 share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
@@ -647,16 +739,13 @@ share/doc/libedata-cal/libedata-cal.devhelp2
 share/doc/libedata-cal/right.png
 share/doc/libedata-cal/style.css
 share/doc/libedata-cal/up.png
-share/doc/libedataserver/EAccount.html
-share/doc/libedataserver/EAccountList.html
+share/doc/libedataserver/ch04.html
 share/doc/libedataserver/EClient.html
 share/doc/libedataserver/EIterator.html
 share/doc/libedataserver/EList.html
 share/doc/libedataserver/EListIterator.html
 share/doc/libedataserver/EProxy.html
 share/doc/libedataserver/ESource.html
-share/doc/libedataserver/ESourceGroup.html
-share/doc/libedataserver/ESourceList.html
 share/doc/libedataserver/annotation-glossary.html
 share/doc/libedataserver/api-index-deprecated.html
 share/doc/libedataserver/api-index-1.12.html
@@ -675,6 +764,38 @@ share/doc/libedataserver/home.png
 share/doc/libedataserver/index.html
 share/doc/libedataserver/index.sgml
 share/doc/libedataserver/left.png
+share/doc/libedataserver/ESourceAddressBook.html
+share/doc/libedataserver/ESourceAlarms.html
+share/doc/libedataserver/ESourceAuthentication.html
+share/doc/libedataserver/ESourceAuthenticator.html
+share/doc/libedataserver/ESourceAutocomplete.html
+share/doc/libedataserver/ESourceBackend.html
+share/doc/libedataserver/ESourceCalendar.html
+share/doc/libedataserver/ESourceCamel.html
+share/doc/libedataserver/ESourceCollection.html
+share/doc/libedataserver/ESourceExtension.html
+share/doc/libedataserver/ESourceGoa.html
+share/doc/libedataserver/ESourceMDN.html
+share/doc/libedataserver/ESourceMailAccount.html
+share/doc/libedataserver/ESourceMailComposition.html
+share/doc/libedataserver/ESourceMailIdentity.html
+share/doc/libedataserver/ESourceMailSignature.html
+share/doc/libedataserver/ESourceMailSubmission.html
+share/doc/libedataserver/ESourceMailTransport.html
+share/doc/libedataserver/ESourceMemoList.html
+share/doc/libedataserver/ESourceOffline.html
+share/doc/libedataserver/ESourceOpenPGP.html
+share/doc/libedataserver/ESourceRefresh.html
+share/doc/libedataserver/ESourceRegistry.html
+share/doc/libedataserver/ESourceResource.html
+share/doc/libedataserver/ESourceSMIME.html
+share/doc/libedataserver/ESourceSecurity.html
+share/doc/libedataserver/ESourceSelectable.html
+share/doc/libedataserver/ESourceTaskList.html
+share/doc/libedataserver/ESourceWebdav.html
+share/doc/libedataserver/api-index-%%VERSION%%.html
+share/doc/libedataserver/ch02.html
+share/doc/libedataserver/ch03.html
 share/doc/libedataserver/libedataserver-ECredentials.html
 share/doc/libedataserver/libedataserver-EFlag.html
 share/doc/libedataserver/libedataserver-EOperationPool.html
@@ -692,6 +813,7 @@ share/doc/libedataserver/libedataserver.devhelp2
 share/doc/libedataserver/right.png
 share/doc/libedataserver/style.css
 share/doc/libedataserver/up.png
+share/doc/libedataserverui/api-index-%%VERSION%%.html
 share/doc/libedataserverui/ECategoriesDialog.html
 share/doc/libedataserverui/ECategoriesEditor.html
 share/doc/libedataserverui/ECategoriesSelector.html
@@ -735,6 +857,22 @@ share/doc/libedataserverui/right.png
 share/doc/libedataserverui/style.css
 share/doc/libedataserverui/up.png
 share/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/evolution-data-server-%%VERSION%%/ro-sources/caldav-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/contacts-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/google-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/ldap-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/local-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/weather-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/webcal-stub.source
+share/evolution-data-server-%%VERSION%%/ro-sources/webdav-stub.source
+share/evolution-data-server-%%VERSION%%/rw-sources/birthdays.source
+share/evolution-data-server-%%VERSION%%/rw-sources/local.source
+share/evolution-data-server-%%VERSION%%/rw-sources/sendmail.source
+share/evolution-data-server-%%VERSION%%/rw-sources/system-address-book.source
+share/evolution-data-server-%%VERSION%%/rw-sources/system-calendar.source
+share/evolution-data-server-%%VERSION%%/rw-sources/system-memo-list.source
+share/evolution-data-server-%%VERSION%%/rw-sources/system-task-list.source
+share/evolution-data-server-%%VERSION%%/rw-sources/vfolder.source
 share/gir-1.0/EBook-1.2.gir
 share/gir-1.0/ECalendar-1.2.gir
 share/gir-1.0/EDataServer-1.2.gir
@@ -842,7 +980,6 @@ share/pixmaps/evolution-data-server/category_strategies_16.png
 share/pixmaps/evolution-data-server/category_suppliers_16.png
 share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm share/pixmaps/evolution-data-server
-@dirrm share/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libedataserverui
 @dirrm share/doc/libedataserver
 @dirrm share/doc/libedata-cal
@@ -851,6 +988,7 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm share/doc/libebook
 @dirrm share/doc/libebackend
 @dirrm share/doc/camel
+@dirrm lib/evolution-data-server/registry-modules
 @dirrm lib/evolution-data-server/camel-providers
 @dirrm lib/evolution-data-server/calendar-backends
 @dirrm lib/evolution-data-server/addressbook-backends
@@ -898,3 +1036,8 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm %%DATADIR%%-%%VERSION%%/rw-sources
+@dirrm %%DATADIR%%-%%VERSION%%/ro-sources
+@dirrm %%DATADIR%%-%%VERSION%%
+@dirrm lib/evolution-data-server/registry-modules
+@dirrm lib/evolution-data-server