update to 2.32.1

This switches to the gnome-2.32 release branch.

8 files changed, 432 insertions, 477 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 9e0e58ef884..061c5375087 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2010/11/15 22:57:47 abs Exp $
+# $NetBSD: Makefile,v 1.106 2010/11/24 20:19:43 drochner Exp $
 
-DISTNAME=	evolution-data-server-2.30.3
-PKGREVISION=	3
+DISTNAME=	evolution-data-server-2.32.1
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -72,6 +71,7 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .include "../../lang/python/application.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
+.include "../../net/libgdata/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libical+=	libical>=0.43
diff --git a/mail/evolution-data-server/PLIST b/mail/evolution-data-server/PLIST
index 0d5582d5dfd..9f86423ec78 100644
--- a/mail/evolution-data-server/PLIST
+++ b/mail/evolution-data-server/PLIST
@@ -1,227 +1,212 @@
-@comment $NetBSD: PLIST,v 1.31 2010/07/12 17:52:29 drochner Exp $
-include/evolution-data-server-2.30/camel/camel-address.h
-include/evolution-data-server-2.30/camel/camel-arg.h
-include/evolution-data-server-2.30/camel/camel-block-file.h
-include/evolution-data-server-2.30/camel/camel-certdb.h
-include/evolution-data-server-2.30/camel/camel-charset-map.h
-include/evolution-data-server-2.30/camel/camel-cipher-context.h
-include/evolution-data-server-2.30/camel/camel-data-cache.h
-include/evolution-data-server-2.30/camel/camel-data-wrapper.h
-include/evolution-data-server-2.30/camel/camel-db.h
-include/evolution-data-server-2.30/camel/camel-debug.h
-include/evolution-data-server-2.30/camel/camel-digest-folder.h
-include/evolution-data-server-2.30/camel/camel-digest-store.h
-include/evolution-data-server-2.30/camel/camel-digest-summary.h
-include/evolution-data-server-2.30/camel/camel-disco-diary.h
-include/evolution-data-server-2.30/camel/camel-disco-folder.h
-include/evolution-data-server-2.30/camel/camel-disco-store.h
-include/evolution-data-server-2.30/camel/camel-exception-list.def
-include/evolution-data-server-2.30/camel/camel-exception.h
-include/evolution-data-server-2.30/camel/camel-file-utils.h
-include/evolution-data-server-2.30/camel/camel-filter-driver.h
-include/evolution-data-server-2.30/camel/camel-filter-search.h
-include/evolution-data-server-2.30/camel/camel-folder-search.h
-include/evolution-data-server-2.30/camel/camel-folder-summary.h
-include/evolution-data-server-2.30/camel/camel-folder-thread.h
-include/evolution-data-server-2.30/camel/camel-folder.h
-include/evolution-data-server-2.30/camel/camel-gpg-context.h
-include/evolution-data-server-2.30/camel/camel-html-parser.h
-include/evolution-data-server-2.30/camel/camel-http-stream.h
-include/evolution-data-server-2.30/camel/camel-i18n.h
-include/evolution-data-server-2.30/camel/camel-iconv.h
-include/evolution-data-server-2.30/camel/camel-index.h
-include/evolution-data-server-2.30/camel/camel-internet-address.h
-include/evolution-data-server-2.30/camel/camel-junk-plugin.h
-include/evolution-data-server-2.30/camel/camel-list-utils.h
-include/evolution-data-server-2.30/camel/camel-lock-client.h
-include/evolution-data-server-2.30/camel/camel-lock-helper.h
-include/evolution-data-server-2.30/camel/camel-lock.h
-include/evolution-data-server-2.30/camel/camel-medium.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-basic.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-bestenc.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-canon.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-charset.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-crlf.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-enriched.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-from.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-gzip.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-html.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-index.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-linewrap.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-pgp.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-progress.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-save.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-tohtml.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-windows.h
-include/evolution-data-server-2.30/camel/camel-mime-filter-yenc.h
-include/evolution-data-server-2.30/camel/camel-mime-filter.h
-include/evolution-data-server-2.30/camel/camel-mime-message.h
-include/evolution-data-server-2.30/camel/camel-mime-parser.h
-include/evolution-data-server-2.30/camel/camel-mime-part-utils.h
-include/evolution-data-server-2.30/camel/camel-mime-part.h
-include/evolution-data-server-2.30/camel/camel-mime-utils.h
-include/evolution-data-server-2.30/camel/camel-movemail.h
-include/evolution-data-server-2.30/camel/camel-msgport.h
-include/evolution-data-server-2.30/camel/camel-multipart-encrypted.h
-include/evolution-data-server-2.30/camel/camel-multipart-signed.h
-include/evolution-data-server-2.30/camel/camel-multipart.h
-include/evolution-data-server-2.30/camel/camel-net-utils.h
-include/evolution-data-server-2.30/camel/camel-news-address.h
-include/evolution-data-server-2.30/camel/camel-nntp-address.h
-include/evolution-data-server-2.30/camel/camel-object.h
-include/evolution-data-server-2.30/camel/camel-offline-folder.h
-include/evolution-data-server-2.30/camel/camel-offline-journal.h
-include/evolution-data-server-2.30/camel/camel-offline-store.h
-include/evolution-data-server-2.30/camel/camel-operation.h
-include/evolution-data-server-2.30/camel/camel-partition-table.h
-include/evolution-data-server-2.30/camel/camel-process.h
-include/evolution-data-server-2.30/camel/camel-provider.h
-include/evolution-data-server-2.30/camel/camel-sasl-anonymous.h
-include/evolution-data-server-2.30/camel/camel-sasl-cram-md5.h
-include/evolution-data-server-2.30/camel/camel-sasl-digest-md5.h
-include/evolution-data-server-2.30/camel/camel-sasl-gssapi.h
-include/evolution-data-server-2.30/camel/camel-sasl-login.h
-include/evolution-data-server-2.30/camel/camel-sasl-ntlm.h
-include/evolution-data-server-2.30/camel/camel-sasl-plain.h
-include/evolution-data-server-2.30/camel/camel-sasl-popb4smtp.h
-include/evolution-data-server-2.30/camel/camel-sasl.h
-include/evolution-data-server-2.30/camel/camel-search-private.h
-include/evolution-data-server-2.30/camel/camel-search-sql-sexp.h
-include/evolution-data-server-2.30/camel/camel-search-sql.h
-include/evolution-data-server-2.30/camel/camel-seekable-stream.h
-include/evolution-data-server-2.30/camel/camel-seekable-substream.h
-include/evolution-data-server-2.30/camel/camel-service.h
-include/evolution-data-server-2.30/camel/camel-session.h
-include/evolution-data-server-2.30/camel/camel-smime-context.h
-include/evolution-data-server-2.30/camel/camel-store-summary.h
-include/evolution-data-server-2.30/camel/camel-store.h
-include/evolution-data-server-2.30/camel/camel-stream-buffer.h
-include/evolution-data-server-2.30/camel/camel-stream-filter.h
-include/evolution-data-server-2.30/camel/camel-stream-fs.h
-include/evolution-data-server-2.30/camel/camel-stream-mem.h
-include/evolution-data-server-2.30/camel/camel-stream-null.h
-include/evolution-data-server-2.30/camel/camel-stream-process.h
-include/evolution-data-server-2.30/camel/camel-stream-vfs.h
-include/evolution-data-server-2.30/camel/camel-stream.h
-include/evolution-data-server-2.30/camel/camel-string-utils.h
-include/evolution-data-server-2.30/camel/camel-tcp-stream-raw.h
-include/evolution-data-server-2.30/camel/camel-tcp-stream-ssl.h
-include/evolution-data-server-2.30/camel/camel-tcp-stream.h
-include/evolution-data-server-2.30/camel/camel-text-index.h
-include/evolution-data-server-2.30/camel/camel-transport.h
-include/evolution-data-server-2.30/camel/camel-trie.h
-include/evolution-data-server-2.30/camel/camel-types.h
-include/evolution-data-server-2.30/camel/camel-uid-cache.h
-include/evolution-data-server-2.30/camel/camel-url-scanner.h
-include/evolution-data-server-2.30/camel/camel-url.h
-include/evolution-data-server-2.30/camel/camel-utf8.h
-include/evolution-data-server-2.30/camel/camel-vee-folder.h
-include/evolution-data-server-2.30/camel/camel-vee-store.h
-include/evolution-data-server-2.30/camel/camel-vee-summary.h
-include/evolution-data-server-2.30/camel/camel-vtrash-folder.h
-include/evolution-data-server-2.30/camel/camel.h
-include/evolution-data-server-2.30/google/libgdata-google/gdata-google-service.h
-include/evolution-data-server-2.30/google/libgdata/gdata-entry.h
-include/evolution-data-server-2.30/google/libgdata/gdata-feed.h
-include/evolution-data-server-2.30/google/libgdata/gdata-service-iface.h
-include/evolution-data-server-2.30/groupwise/e-gw-connection.h
-include/evolution-data-server-2.30/groupwise/e-gw-container.h
-include/evolution-data-server-2.30/groupwise/e-gw-filter.h
-include/evolution-data-server-2.30/groupwise/e-gw-item.h
-include/evolution-data-server-2.30/groupwise/e-gw-message.h
-include/evolution-data-server-2.30/groupwise/e-gw-proxy.h
-include/evolution-data-server-2.30/groupwise/e-gw-recur-utils.h
-include/evolution-data-server-2.30/groupwise/e-gw-sendoptions.h
-include/evolution-data-server-2.30/groupwise/soup-soap-message.h
-include/evolution-data-server-2.30/groupwise/soup-soap-response.h
-include/evolution-data-server-2.30/libebackend/e-data-server-module.h
-include/evolution-data-server-2.30/libebackend/e-db3-utils.h
-include/evolution-data-server-2.30/libebackend/e-dbhash.h
-include/evolution-data-server-2.30/libebackend/e-file-cache.h
-include/evolution-data-server-2.30/libebackend/e-offline-listener.h
-include/evolution-data-server-2.30/libebook/e-address-western.h
-include/evolution-data-server-2.30/libebook/e-book-query.h
-include/evolution-data-server-2.30/libebook/e-book-types.h
-include/evolution-data-server-2.30/libebook/e-book-view.h
-include/evolution-data-server-2.30/libebook/e-book.h
-include/evolution-data-server-2.30/libebook/e-contact.h
-include/evolution-data-server-2.30/libebook/e-destination.h
-include/evolution-data-server-2.30/libebook/e-name-western.h
-include/evolution-data-server-2.30/libebook/e-vcard.h
-include/evolution-data-server-2.30/libecal/e-cal-check-timezones.h
-include/evolution-data-server-2.30/libecal/e-cal-component.h
-include/evolution-data-server-2.30/libecal/e-cal-recur.h
-include/evolution-data-server-2.30/libecal/e-cal-system-timezone.h
-include/evolution-data-server-2.30/libecal/e-cal-time-util.h
-include/evolution-data-server-2.30/libecal/e-cal-types.h
-include/evolution-data-server-2.30/libecal/e-cal-util.h
-include/evolution-data-server-2.30/libecal/e-cal-view.h
-include/evolution-data-server-2.30/libecal/e-cal.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend-cache.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend-db-cache.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend-factory.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend-sexp.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend-summary.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend-sync.h
-include/evolution-data-server-2.30/libedata-book/e-book-backend.h
-include/evolution-data-server-2.30/libedata-book/e-data-book-factory.h
-include/evolution-data-server-2.30/libedata-book/e-data-book-types.h
-include/evolution-data-server-2.30/libedata-book/e-data-book-view.h
-include/evolution-data-server-2.30/libedata-book/e-data-book.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-cache.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-factory.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-file-store.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-sexp.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-store.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-sync.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend-util.h
-include/evolution-data-server-2.30/libedata-cal/e-cal-backend.h
-include/evolution-data-server-2.30/libedata-cal/e-data-cal-common.h
-include/evolution-data-server-2.30/libedata-cal/e-data-cal-factory.h
-include/evolution-data-server-2.30/libedata-cal/e-data-cal-types.h
-include/evolution-data-server-2.30/libedata-cal/e-data-cal-view.h
-include/evolution-data-server-2.30/libedata-cal/e-data-cal.h
-include/evolution-data-server-2.30/libedataserver/e-account-list.h
-include/evolution-data-server-2.30/libedataserver/e-account.h
-include/evolution-data-server-2.30/libedataserver/e-categories.h
-include/evolution-data-server-2.30/libedataserver/e-data-server-util.h
-include/evolution-data-server-2.30/libedataserver/e-flag.h
-include/evolution-data-server-2.30/libedataserver/e-iconv.h
-include/evolution-data-server-2.30/libedataserver/e-iterator.h
-include/evolution-data-server-2.30/libedataserver/e-list-iterator.h
-include/evolution-data-server-2.30/libedataserver/e-list.h
-include/evolution-data-server-2.30/libedataserver/e-memory.h
-include/evolution-data-server-2.30/libedataserver/e-msgport.h
-include/evolution-data-server-2.30/libedataserver/e-proxy.h
-include/evolution-data-server-2.30/libedataserver/e-sexp.h
-include/evolution-data-server-2.30/libedataserver/e-source-group.h
-include/evolution-data-server-2.30/libedataserver/e-source-list.h
-include/evolution-data-server-2.30/libedataserver/e-source.h
-include/evolution-data-server-2.30/libedataserver/e-time-utils.h
-include/evolution-data-server-2.30/libedataserver/e-trie.h
-include/evolution-data-server-2.30/libedataserver/e-uid.h
-include/evolution-data-server-2.30/libedataserver/e-url.h
-include/evolution-data-server-2.30/libedataserver/e-xml-hash-utils.h
-include/evolution-data-server-2.30/libedataserver/e-xml-utils.h
-include/evolution-data-server-2.30/libedataserver/eds-version.h
-include/evolution-data-server-2.30/libedataserver/md5-utils.h
-include/evolution-data-server-2.30/libedataserverui/e-book-auth-util.h
-include/evolution-data-server-2.30/libedataserverui/e-categories-dialog.h
-include/evolution-data-server-2.30/libedataserverui/e-category-completion.h
-include/evolution-data-server-2.30/libedataserverui/e-cell-renderer-color.h
-include/evolution-data-server-2.30/libedataserverui/e-contact-store.h
-include/evolution-data-server-2.30/libedataserverui/e-destination-store.h
-include/evolution-data-server-2.30/libedataserverui/e-name-selector-dialog.h
-include/evolution-data-server-2.30/libedataserverui/e-name-selector-entry.h
-include/evolution-data-server-2.30/libedataserverui/e-name-selector-list.h
-include/evolution-data-server-2.30/libedataserverui/e-name-selector-model.h
-include/evolution-data-server-2.30/libedataserverui/e-name-selector.h
-include/evolution-data-server-2.30/libedataserverui/e-passwords.h
-include/evolution-data-server-2.30/libedataserverui/e-source-combo-box.h
-include/evolution-data-server-2.30/libedataserverui/e-source-option-menu.h
-include/evolution-data-server-2.30/libedataserverui/e-source-selector-dialog.h
-include/evolution-data-server-2.30/libedataserverui/e-source-selector.h
-include/evolution-data-server-2.30/libedataserverui/e-tree-model-generator.h
+@comment $NetBSD: PLIST,v 1.32 2010/11/24 20:19:44 drochner Exp $
+include/evolution-data-server-2.32/camel/camel-address.h
+include/evolution-data-server-2.32/camel/camel-block-file.h
+include/evolution-data-server-2.32/camel/camel-certdb.h
+include/evolution-data-server-2.32/camel/camel-charset-map.h
+include/evolution-data-server-2.32/camel/camel-cipher-context.h
+include/evolution-data-server-2.32/camel/camel-data-cache.h
+include/evolution-data-server-2.32/camel/camel-data-wrapper.h
+include/evolution-data-server-2.32/camel/camel-db.h
+include/evolution-data-server-2.32/camel/camel-debug.h
+include/evolution-data-server-2.32/camel/camel-disco-diary.h
+include/evolution-data-server-2.32/camel/camel-disco-folder.h
+include/evolution-data-server-2.32/camel/camel-disco-store.h
+include/evolution-data-server-2.32/camel/camel-file-utils.h
+include/evolution-data-server-2.32/camel/camel-filter-driver.h
+include/evolution-data-server-2.32/camel/camel-filter-search.h
+include/evolution-data-server-2.32/camel/camel-folder-search.h
+include/evolution-data-server-2.32/camel/camel-folder-summary.h
+include/evolution-data-server-2.32/camel/camel-folder-thread.h
+include/evolution-data-server-2.32/camel/camel-folder.h
+include/evolution-data-server-2.32/camel/camel-gpg-context.h
+include/evolution-data-server-2.32/camel/camel-html-parser.h
+include/evolution-data-server-2.32/camel/camel-http-stream.h
+include/evolution-data-server-2.32/camel/camel-iconv.h
+include/evolution-data-server-2.32/camel/camel-index.h
+include/evolution-data-server-2.32/camel/camel-internet-address.h
+include/evolution-data-server-2.32/camel/camel-junk-plugin.h
+include/evolution-data-server-2.32/camel/camel-list-utils.h
+include/evolution-data-server-2.32/camel/camel-lock-client.h
+include/evolution-data-server-2.32/camel/camel-lock-helper.h
+include/evolution-data-server-2.32/camel/camel-lock.h
+include/evolution-data-server-2.32/camel/camel-medium.h
+include/evolution-data-server-2.32/camel/camel-mempool.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-basic.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-bestenc.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-canon.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-charset.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-crlf.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-enriched.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-from.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-gzip.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-html.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-index.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-linewrap.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-pgp.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-progress.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-save.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-tohtml.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-windows.h
+include/evolution-data-server-2.32/camel/camel-mime-filter-yenc.h
+include/evolution-data-server-2.32/camel/camel-mime-filter.h
+include/evolution-data-server-2.32/camel/camel-mime-message.h
+include/evolution-data-server-2.32/camel/camel-mime-parser.h
+include/evolution-data-server-2.32/camel/camel-mime-part-utils.h
+include/evolution-data-server-2.32/camel/camel-mime-part.h
+include/evolution-data-server-2.32/camel/camel-mime-utils.h
+include/evolution-data-server-2.32/camel/camel-movemail.h
+include/evolution-data-server-2.32/camel/camel-msgport.h
+include/evolution-data-server-2.32/camel/camel-multipart-encrypted.h
+include/evolution-data-server-2.32/camel/camel-multipart-signed.h
+include/evolution-data-server-2.32/camel/camel-multipart.h
+include/evolution-data-server-2.32/camel/camel-net-utils.h
+include/evolution-data-server-2.32/camel/camel-nntp-address.h
+include/evolution-data-server-2.32/camel/camel-object-bag.h
+include/evolution-data-server-2.32/camel/camel-object.h
+include/evolution-data-server-2.32/camel/camel-offline-folder.h
+include/evolution-data-server-2.32/camel/camel-offline-journal.h
+include/evolution-data-server-2.32/camel/camel-offline-store.h
+include/evolution-data-server-2.32/camel/camel-operation.h
+include/evolution-data-server-2.32/camel/camel-partition-table.h
+include/evolution-data-server-2.32/camel/camel-provider.h
+include/evolution-data-server-2.32/camel/camel-sasl-anonymous.h
+include/evolution-data-server-2.32/camel/camel-sasl-cram-md5.h
+include/evolution-data-server-2.32/camel/camel-sasl-digest-md5.h
+include/evolution-data-server-2.32/camel/camel-sasl-gssapi.h
+include/evolution-data-server-2.32/camel/camel-sasl-login.h
+include/evolution-data-server-2.32/camel/camel-sasl-ntlm.h
+include/evolution-data-server-2.32/camel/camel-sasl-plain.h
+include/evolution-data-server-2.32/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server-2.32/camel/camel-sasl.h
+include/evolution-data-server-2.32/camel/camel-search-private.h
+include/evolution-data-server-2.32/camel/camel-search-sql-sexp.h
+include/evolution-data-server-2.32/camel/camel-search-sql.h
+include/evolution-data-server-2.32/camel/camel-seekable-stream.h
+include/evolution-data-server-2.32/camel/camel-seekable-substream.h
+include/evolution-data-server-2.32/camel/camel-service.h
+include/evolution-data-server-2.32/camel/camel-session.h
+include/evolution-data-server-2.32/camel/camel-smime-context.h
+include/evolution-data-server-2.32/camel/camel-store-summary.h
+include/evolution-data-server-2.32/camel/camel-store.h
+include/evolution-data-server-2.32/camel/camel-stream-buffer.h
+include/evolution-data-server-2.32/camel/camel-stream-filter.h
+include/evolution-data-server-2.32/camel/camel-stream-fs.h
+include/evolution-data-server-2.32/camel/camel-stream-mem.h
+include/evolution-data-server-2.32/camel/camel-stream-null.h
+include/evolution-data-server-2.32/camel/camel-stream-process.h
+include/evolution-data-server-2.32/camel/camel-stream-vfs.h
+include/evolution-data-server-2.32/camel/camel-stream.h
+include/evolution-data-server-2.32/camel/camel-string-utils.h
+include/evolution-data-server-2.32/camel/camel-tcp-stream-raw.h
+include/evolution-data-server-2.32/camel/camel-tcp-stream-ssl.h
+include/evolution-data-server-2.32/camel/camel-tcp-stream.h
+include/evolution-data-server-2.32/camel/camel-text-index.h
+include/evolution-data-server-2.32/camel/camel-transport.h
+include/evolution-data-server-2.32/camel/camel-trie.h
+include/evolution-data-server-2.32/camel/camel-uid-cache.h
+include/evolution-data-server-2.32/camel/camel-url-scanner.h
+include/evolution-data-server-2.32/camel/camel-url.h
+include/evolution-data-server-2.32/camel/camel-utf8.h
+include/evolution-data-server-2.32/camel/camel-vee-folder.h
+include/evolution-data-server-2.32/camel/camel-vee-store.h
+include/evolution-data-server-2.32/camel/camel-vee-summary.h
+include/evolution-data-server-2.32/camel/camel-vtrash-folder.h
+include/evolution-data-server-2.32/camel/camel.h
+include/evolution-data-server-2.32/groupwise/e-gw-connection.h
+include/evolution-data-server-2.32/groupwise/e-gw-container.h
+include/evolution-data-server-2.32/groupwise/e-gw-filter.h
+include/evolution-data-server-2.32/groupwise/e-gw-item.h
+include/evolution-data-server-2.32/groupwise/e-gw-message.h
+include/evolution-data-server-2.32/groupwise/e-gw-proxy.h
+include/evolution-data-server-2.32/groupwise/e-gw-recur-utils.h
+include/evolution-data-server-2.32/groupwise/e-gw-sendoptions.h
+include/evolution-data-server-2.32/groupwise/soup-soap-message.h
+include/evolution-data-server-2.32/groupwise/soup-soap-response.h
+include/evolution-data-server-2.32/libebackend/e-data-server-module.h
+include/evolution-data-server-2.32/libebackend/e-db3-utils.h
+include/evolution-data-server-2.32/libebackend/e-dbhash.h
+include/evolution-data-server-2.32/libebackend/e-file-cache.h
+include/evolution-data-server-2.32/libebackend/e-offline-listener.h
+include/evolution-data-server-2.32/libebook/e-address-western.h
+include/evolution-data-server-2.32/libebook/e-book-query.h
+include/evolution-data-server-2.32/libebook/e-book-types.h
+include/evolution-data-server-2.32/libebook/e-book-view.h
+include/evolution-data-server-2.32/libebook/e-book.h
+include/evolution-data-server-2.32/libebook/e-contact.h
+include/evolution-data-server-2.32/libebook/e-destination.h
+include/evolution-data-server-2.32/libebook/e-name-western.h
+include/evolution-data-server-2.32/libebook/e-vcard.h
+include/evolution-data-server-2.32/libecal/e-cal-check-timezones.h
+include/evolution-data-server-2.32/libecal/e-cal-component.h
+include/evolution-data-server-2.32/libecal/e-cal-recur.h
+include/evolution-data-server-2.32/libecal/e-cal-system-timezone.h
+include/evolution-data-server-2.32/libecal/e-cal-time-util.h
+include/evolution-data-server-2.32/libecal/e-cal-types.h
+include/evolution-data-server-2.32/libecal/e-cal-util.h
+include/evolution-data-server-2.32/libecal/e-cal-view.h
+include/evolution-data-server-2.32/libecal/e-cal.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend-cache.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend-db-cache.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend-factory.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend-sexp.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend-summary.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend-sync.h
+include/evolution-data-server-2.32/libedata-book/e-book-backend.h
+include/evolution-data-server-2.32/libedata-book/e-data-book-factory.h
+include/evolution-data-server-2.32/libedata-book/e-data-book-types.h
+include/evolution-data-server-2.32/libedata-book/e-data-book-view.h
+include/evolution-data-server-2.32/libedata-book/e-data-book.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-cache.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-factory.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-file-store.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-intervaltree.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-sexp.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-store.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-sync.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend-util.h
+include/evolution-data-server-2.32/libedata-cal/e-cal-backend.h
+include/evolution-data-server-2.32/libedata-cal/e-data-cal-common.h
+include/evolution-data-server-2.32/libedata-cal/e-data-cal-factory.h
+include/evolution-data-server-2.32/libedata-cal/e-data-cal-types.h
+include/evolution-data-server-2.32/libedata-cal/e-data-cal-view.h
+include/evolution-data-server-2.32/libedata-cal/e-data-cal.h
+include/evolution-data-server-2.32/libedataserver/e-account-list.h
+include/evolution-data-server-2.32/libedataserver/e-account.h
+include/evolution-data-server-2.32/libedataserver/e-categories.h
+include/evolution-data-server-2.32/libedataserver/e-data-server-util.h
+include/evolution-data-server-2.32/libedataserver/e-debug-log.h
+include/evolution-data-server-2.32/libedataserver/e-flag.h
+include/evolution-data-server-2.32/libedataserver/e-iterator.h
+include/evolution-data-server-2.32/libedataserver/e-list-iterator.h
+include/evolution-data-server-2.32/libedataserver/e-list.h
+include/evolution-data-server-2.32/libedataserver/e-memory.h
+include/evolution-data-server-2.32/libedataserver/e-proxy.h
+include/evolution-data-server-2.32/libedataserver/e-sexp.h
+include/evolution-data-server-2.32/libedataserver/e-source-group.h
+include/evolution-data-server-2.32/libedataserver/e-source-list.h
+include/evolution-data-server-2.32/libedataserver/e-source.h
+include/evolution-data-server-2.32/libedataserver/e-time-utils.h
+include/evolution-data-server-2.32/libedataserver/e-uid.h
+include/evolution-data-server-2.32/libedataserver/e-url.h
+include/evolution-data-server-2.32/libedataserver/e-xml-hash-utils.h
+include/evolution-data-server-2.32/libedataserver/e-xml-utils.h
+include/evolution-data-server-2.32/libedataserver/eds-version.h
+include/evolution-data-server-2.32/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-2.32/libedataserverui/e-categories-dialog.h
+include/evolution-data-server-2.32/libedataserverui/e-category-completion.h
+include/evolution-data-server-2.32/libedataserverui/e-cell-renderer-color.h
+include/evolution-data-server-2.32/libedataserverui/e-contact-store.h
+include/evolution-data-server-2.32/libedataserverui/e-destination-store.h
+include/evolution-data-server-2.32/libedataserverui/e-name-selector-dialog.h
+include/evolution-data-server-2.32/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-2.32/libedataserverui/e-name-selector-list.h
+include/evolution-data-server-2.32/libedataserverui/e-name-selector-model.h
+include/evolution-data-server-2.32/libedataserverui/e-name-selector.h
+include/evolution-data-server-2.32/libedataserverui/e-passwords.h
+include/evolution-data-server-2.32/libedataserverui/e-source-combo-box.h
+include/evolution-data-server-2.32/libedataserverui/e-source-selector-dialog.h
+include/evolution-data-server-2.32/libedataserverui/e-source-selector.h
+include/evolution-data-server-2.32/libedataserverui/e-tree-model-generator.h
 lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
 lib/evolution-data-server-1.2/camel-providers/libcamelimap.la
@@ -247,7 +232,6 @@ lib/evolution-data-server-1.2/extensions/libebookbackendwebdav.la
 lib/evolution-data-server-1.2/extensions/libecalbackendcaldav.la
 lib/evolution-data-server-1.2/extensions/libecalbackendcontacts.la
 lib/evolution-data-server-1.2/extensions/libecalbackendfile.la
-lib/evolution-data-server-1.2/extensions/libecalbackendgoogle.la
 lib/evolution-data-server-1.2/extensions/libecalbackendgroupwise.la
 lib/evolution-data-server-1.2/extensions/libecalbackendhttp.la
 lib/evolution-data-server-1.2/extensions/libecalbackendweather.la
@@ -261,8 +245,6 @@ lib/libedata-cal-1.2.la
 lib/libedataserver-1.2.la
 lib/libedataserverui-1.2.la
 lib/libegroupwise-1.2.la
-lib/libgdata-1.2.la
-lib/libgdata-google-1.2.la
 lib/pkgconfig/camel-1.2.pc
 lib/pkgconfig/camel-provider-1.2.pc
 lib/pkgconfig/evolution-data-server-1.2.pc
@@ -274,19 +256,97 @@ 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
 libexec/camel-index-control-1.2
 libexec/camel-lock-helper-1.2
 libexec/e-addressbook-factory
 libexec/e-calendar-factory
 share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
-share/evolution-data-server-2.30/evolutionperson.schema
-share/evolution-data-server-2.30/ui/e-categories-dialog.ui
-share/evolution-data-server-2.30/ui/e-name-selector-dialog.ui
-share/evolution-data-server-2.30/weather/Locations.xml
+share/evolution-data-server-2.32/evolutionperson.schema
+share/evolution-data-server-2.32/ui/e-categories-dialog.ui
+share/evolution-data-server-2.32/ui/e-name-selector-dialog.ui
+share/evolution-data-server-2.32/weather/Locations.xml
 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
@@ -305,99 +365,14 @@ 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-2.32.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
@@ -406,11 +381,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
@@ -435,6 +410,7 @@ 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-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
@@ -462,6 +438,8 @@ 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-2.32.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
@@ -486,6 +464,8 @@ 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-2.32.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
@@ -517,6 +497,8 @@ 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-2.32.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
@@ -543,6 +525,8 @@ 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-2.32.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
@@ -554,6 +538,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
@@ -574,6 +559,8 @@ 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-2.32.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
@@ -585,16 +572,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
@@ -609,7 +593,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
@@ -619,6 +602,8 @@ 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-2.32.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
@@ -628,95 +613,94 @@ 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
 share/gtk-doc/html/libedataserverui/right.png
 share/gtk-doc/html/libedataserverui/style.css
 share/gtk-doc/html/libedataserverui/up.png
-share/locale/am/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/as/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ast/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/en@shaw/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/kn/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/mai/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/oc/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/si/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/sr@latin/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/te/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-2.30.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-2.30.mo
+share/locale/am/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ar/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ast/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/az/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/be/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/bg/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/bn/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ca/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/cs/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/cy/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/da/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/de/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/el/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/en_AU/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/en_CA/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/en_GB/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/es/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/et/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/eu/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/fa/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/fi/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/fr/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ga/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/gl/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/gu/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/he/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/hr/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/hu/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/id/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/is/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/it/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ja/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/kn/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ko/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/lt/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/lv/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/mai/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/mn/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/mr/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ms/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/nb/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ne/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/nl/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/nn/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/or/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/pa/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/pl/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/pt/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ro/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ru/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/rw/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/si/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/sk/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/sl/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/sq/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/sr/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/sv/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/ta/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/th/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/tr/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/uk/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/vi/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/xh/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-data-server-2.32.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-data-server-2.32.mo
 share/pixmaps/evolution-data-server/category_birthday_16.png
 share/pixmaps/evolution-data-server/category_business_16.png
 share/pixmaps/evolution-data-server/category_favorites_16.png
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 1071068c691..b5a6dce5c69 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2010/09/15 16:01:52 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2010/11/24 20:19:44 drochner Exp $
 
 BUILDLINK_TREE+=	evolution-data-server
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	evolution-data-server
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.8.0
-BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.30.3nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server+=	evolution-data-server>=2.32.1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 
 BDB_ACCEPTED?=		db4 db5
@@ -15,6 +15,7 @@ BDB_ACCEPTED?=		db4 db5
 .include "../../devel/nss/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
+.include "../../net/libgdata/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index 20628c5dfdc..dde94acd863 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.70 2010/11/17 15:59:38 drochner Exp $
+$NetBSD: distinfo,v 1.71 2010/11/24 20:19:44 drochner Exp $
 
-SHA1 (evolution-data-server-2.30.3.tar.bz2) = 449d3e7a9b19768d5a792434ca5d55c9d2496993
-RMD160 (evolution-data-server-2.30.3.tar.bz2) = 2d4dc2fd6b8dfdc013042400b382f4684e642425
-Size (evolution-data-server-2.30.3.tar.bz2) = 4652416 bytes
-SHA1 (patch-ak) = 9a4721225e4faa82b12fd7a2e42a2f4ee5342007
-SHA1 (patch-bd) = b9d35859108aff62b0a18f756661070163004d4c
-SHA1 (patch-ca) = 414c0319e9642580197b7841969f7b57a1a29052
-SHA1 (patch-cc) = d7e46e68c924ae9b9f09c39ff7981c56e244c967
+SHA1 (evolution-data-server-2.32.1.tar.bz2) = aaf96d976dd0c5d8615adf6c7300c5098eb14046
+RMD160 (evolution-data-server-2.32.1.tar.bz2) = 1555b03669c60e70c01e57b35739f2953e7896d9
+Size (evolution-data-server-2.32.1.tar.bz2) = 4290087 bytes
+SHA1 (patch-bd) = 8df85b9ab7ae71558fb939565e944b614de628bb
+SHA1 (patch-ca) = e879d29105997045e1293fe627ec55a05e5ba88d
+SHA1 (patch-cc) = 254384f8065fb712f2bc4f34873238131ee7b16e
 SHA1 (patch-cd) = 6e366e65e68cd0c5a8eafa67c7f9152c6521de12
 SHA1 (patch-ce) = 1da2a3773ff89319bc79bbb7375e8259f0be89e4
diff --git a/mail/evolution-data-server/patches/patch-ak b/mail/evolution-data-server/patches/patch-ak
deleted file mode 100644
index f0c9857b8e5..00000000000
--- a/mail/evolution-data-server/patches/patch-ak
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ak,v 1.15 2010/11/17 15:59:38 drochner Exp $
-
---- configure.orig	2010-08-11 20:55:10.000000000 +0000
-+++ configure
-@@ -4397,7 +4397,6 @@ fi
- 
-   list="-DG_DISABLE_DEPRECATED
- 	-DPANGO_DISABLE_DEPRECATED
--	-DGDK_DISABLE_DEPRECATED
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED
- 	-DG_DISABLE_SINGLE_INCLUDES
- 	-DGTK_DISABLE_SINGLE_INCLUDES
-@@ -17395,13 +17394,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
- 
- 
- 	PTHREAD_LIB=""
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
--$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LIB}" >&5
-+$as_echo_n "checking for pthread_create in ${PTHREAD_LIB}... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LIB}  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -17432,7 +17431,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
--  PTHREAD_LIB="-lpthread"
-+  PTHREAD_LIB="${PTHREAD_LIB}"
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
- $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
diff --git a/mail/evolution-data-server/patches/patch-bd b/mail/evolution-data-server/patches/patch-bd
index a7725afde72..66c7a8b8433 100644
--- a/mail/evolution-data-server/patches/patch-bd
+++ b/mail/evolution-data-server/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.2 2009/03/19 12:02:09 drochner Exp $
+$NetBSD: patch-bd,v 1.3 2010/11/24 20:19:44 drochner Exp $
 
---- camel/camel-smime-context.c.orig	2009-03-17 20:28:40.000000000 +0100
+--- camel/camel-smime-context.c.orig	2010-09-21 06:20:59.000000000 +0000
 +++ camel/camel-smime-context.c
-@@ -380,8 +380,10 @@ nss_error_to_string (long errorcode)
+@@ -269,8 +269,10 @@ nss_error_to_string (glong errorcode)
  	cs (SEC_ERROR_CRL_ALREADY_EXISTS, "CRL already exists.")
  	cs (SEC_ERROR_NOT_INITIALIZED, "NSS is not initialized.")
  	cs (SEC_ERROR_TOKEN_NOT_LOGGED_IN, "The operation failed because the PKCS#11 token is not logged in.")
@@ -11,5 +11,5 @@ $NetBSD: patch-bd,v 1.2 2009/03/19 12:02:09 drochner Exp $
  	cs (SEC_ERROR_OCSP_BAD_SIGNATURE, "OCSP response has an invalid signature.")
 +#endif
  
- 	#if defined(NSS_VMAJOR) && defined(NSS_VMINOR) && defined(NSS_VPATCH) && (NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR > 12) || (NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH >= 2))
+ 	#if defined (NSS_VMAJOR) && defined (NSS_VMINOR) && defined (NSS_VPATCH) && (NSS_VMAJOR > 3 || (NSS_VMAJOR == 3 && NSS_VMINOR > 12) || (NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH >= 2))
  	cs (SEC_ERROR_OUT_OF_SEARCH_LIMITS, "Cert validation search is out of search limits")
diff --git a/mail/evolution-data-server/patches/patch-ca b/mail/evolution-data-server/patches/patch-ca
index 1f965eebec5..fe443dc906d 100644
--- a/mail/evolution-data-server/patches/patch-ca
+++ b/mail/evolution-data-server/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.1 2010/07/12 17:52:29 drochner Exp $
+$NetBSD: patch-ca,v 1.2 2010/11/24 20:19:44 drochner Exp $
 
---- camel/camel-search-sql-sexp.c.orig	2010-06-11 17:38:50.000000000 +0000
+--- camel/camel-search-sql-sexp.c.orig	2010-09-21 06:21:00.000000000 +0000
 +++ camel/camel-search-sql-sexp.c
-@@ -177,7 +177,7 @@ eval_eq(struct _ESExp *f, gint argc, str
+@@ -176,7 +176,7 @@ eval_eq(struct _ESExp *f, gint argc, str
  		if (r1->type == ESEXP_RES_INT)
  			g_string_append_printf(str, "%d", r1->value.number);
  		else if (r1->type == ESEXP_RES_TIME)
@@ -11,16 +11,16 @@ $NetBSD: patch-ca,v 1.1 2010/07/12 17:52:29 drochner Exp $
  		else if (r1->type == ESEXP_RES_STRING)
  			g_string_append_printf(str, "%s", r1->value.string);
  
-@@ -195,7 +195,7 @@ eval_eq(struct _ESExp *f, gint argc, str
+@@ -194,7 +194,7 @@ eval_eq(struct _ESExp *f, gint argc, str
  			if (r2->type == ESEXP_RES_BOOL)
- 				g_string_append_printf(str, "%d", r2->value.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, "%lld", (long long)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);
-@@ -230,7 +230,7 @@ eval_lt(struct _ESExp *f, gint argc, str
+@@ -229,7 +229,7 @@ eval_lt(struct _ESExp *f, gint argc, str
  		if (r1->type == ESEXP_RES_INT)
  			g_string_append_printf(str, "%d", r1->value.number);
  		else if (r1->type == ESEXP_RES_TIME)
@@ -29,16 +29,16 @@ $NetBSD: patch-ca,v 1.1 2010/07/12 17:52:29 drochner Exp $
  		else if (r1->type == ESEXP_RES_STRING)
  			g_string_append_printf(str, "%s", r1->value.string);
  
-@@ -240,7 +240,7 @@ eval_lt(struct _ESExp *f, gint argc, str
+@@ -239,7 +239,7 @@ eval_lt(struct _ESExp *f, gint argc, str
  		if (r2->type == ESEXP_RES_BOOL)
- 			g_string_append_printf(str, "%d", r2->value.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, "%lld", (long long)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);
-@@ -269,7 +269,7 @@ eval_gt(struct _ESExp *f, gint argc, str
+@@ -268,7 +268,7 @@ eval_gt(struct _ESExp *f, gint argc, str
  		if (r1->type == ESEXP_RES_INT)
  			g_string_append_printf(str, "%d", r1->value.number);
  		else if (r1->type == ESEXP_RES_TIME)
@@ -47,3 +47,12 @@ $NetBSD: patch-ca,v 1.1 2010/07/12 17:52:29 drochner Exp $
  		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, str
+ 		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, "%lld", (long long)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);
diff --git a/mail/evolution-data-server/patches/patch-cc b/mail/evolution-data-server/patches/patch-cc
index 99fd04c4bbc..4d5abdffe74 100644
--- a/mail/evolution-data-server/patches/patch-cc
+++ b/mail/evolution-data-server/patches/patch-cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-cc,v 1.1 2010/07/12 17:52:29 drochner Exp $
+$NetBSD: patch-cc,v 1.2 2010/11/24 20:19:44 drochner Exp $
 
---- camel/providers/local/camel-maildir-summary.c.orig	2010-06-11 17:47:27.000000000 +0000
+--- camel/providers/local/camel-maildir-summary.c.orig	2010-09-21 06:21:00.000000000 +0000
 +++ camel/providers/local/camel-maildir-summary.c
-@@ -378,7 +378,7 @@ static gchar *maildir_summary_next_uid_s
+@@ -375,7 +375,7 @@ static gchar *maildir_summary_next_uid_s
  				g_free(uid);
  				sleep(2);
  			}
@@ -10,4 +10,4 @@ $NetBSD: patch-cc,v 1.1 2010/07/12 17:52:29 drochner Exp $
 +			uid = g_strdup_printf("%lld.%d_%u.%s", (long long)time(NULL), getpid(), nextuid, mds->priv->hostname);
  			name = g_strdup_printf("%s/tmp/%s", cls->folder_path, uid);
  			retry++;
- 		} while (stat(name, &st) == 0 && retry<3);
+ 		} while (g_stat(name, &st) == 0 && retry<3);