update to 2.30.2.1

This switches to the gnome-2.30 release branch.

9 files changed, 521 insertions, 415 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 7e947bff8ce..c09d2b62df4 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2010/06/13 22:44:54 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2010/07/12 17:52:29 drochner Exp $
 
-DISTNAME=	evolution-data-server-2.28.3.1
-PKGREVISION=	2
+DISTNAME=	evolution-data-server-2.30.2.1
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -42,10 +41,6 @@ CPPFLAGS+=	-DBIND_8_COMPAT
 CFLAGS.SunOS+=	-D__FUNCTION__=__func__
 .endif
 
-CONFIGURE_ARGS+=	--with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
-CONFIGURE_ARGS+=	--with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib
-CONFIGURE_ARGS+=	--with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
-CONFIGURE_ARGS+=	--with-nss-libs=${BUILDLINK_PREFIX.nss}/lib
 CONFIGURE_ARGS+=	--with-openldap
 CONFIGURE_ARGS+=	--with-libdb=${BDBBASE}
 
@@ -69,7 +64,6 @@ BUILDLINK_TRANSFORM+=	rm:-ldl
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgweather/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
diff --git a/mail/evolution-data-server/PLIST b/mail/evolution-data-server/PLIST
index 0566a6e29e4..0d5582d5dfd 100644
--- a/mail/evolution-data-server/PLIST
+++ b/mail/evolution-data-server/PLIST
@@ -1,268 +1,233 @@
-@comment $NetBSD: PLIST,v 1.30 2010/04/13 16:22:47 drochner Exp $
-include/evolution-data-server-2.28/camel/camel-address.h
-include/evolution-data-server-2.28/camel/camel-arg.h
-include/evolution-data-server-2.28/camel/camel-block-file.h
-include/evolution-data-server-2.28/camel/camel-certdb.h
-include/evolution-data-server-2.28/camel/camel-charset-map.h
-include/evolution-data-server-2.28/camel/camel-cipher-context.h
-include/evolution-data-server-2.28/camel/camel-data-cache.h
-include/evolution-data-server-2.28/camel/camel-data-wrapper.h
-include/evolution-data-server-2.28/camel/camel-db.h
-include/evolution-data-server-2.28/camel/camel-debug.h
-include/evolution-data-server-2.28/camel/camel-digest-folder.h
-include/evolution-data-server-2.28/camel/camel-digest-store.h
-include/evolution-data-server-2.28/camel/camel-digest-summary.h
-include/evolution-data-server-2.28/camel/camel-disco-diary.h
-include/evolution-data-server-2.28/camel/camel-disco-folder.h
-include/evolution-data-server-2.28/camel/camel-disco-store.h
-include/evolution-data-server-2.28/camel/camel-exception-list.def
-include/evolution-data-server-2.28/camel/camel-exception.h
-include/evolution-data-server-2.28/camel/camel-file-utils.h
-include/evolution-data-server-2.28/camel/camel-filter-driver.h
-include/evolution-data-server-2.28/camel/camel-filter-search.h
-include/evolution-data-server-2.28/camel/camel-folder-search.h
-include/evolution-data-server-2.28/camel/camel-folder-summary.h
-include/evolution-data-server-2.28/camel/camel-folder-thread.h
-include/evolution-data-server-2.28/camel/camel-folder.h
-include/evolution-data-server-2.28/camel/camel-gpg-context.h
-include/evolution-data-server-2.28/camel/camel-html-parser.h
-include/evolution-data-server-2.28/camel/camel-http-stream.h
-include/evolution-data-server-2.28/camel/camel-i18n.h
-include/evolution-data-server-2.28/camel/camel-iconv.h
-include/evolution-data-server-2.28/camel/camel-index.h
-include/evolution-data-server-2.28/camel/camel-internet-address.h
-include/evolution-data-server-2.28/camel/camel-junk-plugin.h
-include/evolution-data-server-2.28/camel/camel-list-utils.h
-include/evolution-data-server-2.28/camel/camel-lock-client.h
-include/evolution-data-server-2.28/camel/camel-lock-helper.h
-include/evolution-data-server-2.28/camel/camel-lock.h
-include/evolution-data-server-2.28/camel/camel-medium.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-basic.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-bestenc.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-canon.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-charset.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-crlf.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-enriched.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-from.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-gzip.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-html.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-index.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-linewrap.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-pgp.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-progress.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-save.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-tohtml.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-windows.h
-include/evolution-data-server-2.28/camel/camel-mime-filter-yenc.h
-include/evolution-data-server-2.28/camel/camel-mime-filter.h
-include/evolution-data-server-2.28/camel/camel-mime-message.h
-include/evolution-data-server-2.28/camel/camel-mime-parser.h
-include/evolution-data-server-2.28/camel/camel-mime-part-utils.h
-include/evolution-data-server-2.28/camel/camel-mime-part.h
-include/evolution-data-server-2.28/camel/camel-mime-utils.h
-include/evolution-data-server-2.28/camel/camel-movemail.h
-include/evolution-data-server-2.28/camel/camel-msgport.h
-include/evolution-data-server-2.28/camel/camel-multipart-encrypted.h
-include/evolution-data-server-2.28/camel/camel-multipart-signed.h
-include/evolution-data-server-2.28/camel/camel-multipart.h
-include/evolution-data-server-2.28/camel/camel-net-utils.h
-include/evolution-data-server-2.28/camel/camel-news-address.h
-include/evolution-data-server-2.28/camel/camel-nntp-address.h
-include/evolution-data-server-2.28/camel/camel-object.h
-include/evolution-data-server-2.28/camel/camel-offline-folder.h
-include/evolution-data-server-2.28/camel/camel-offline-journal.h
-include/evolution-data-server-2.28/camel/camel-offline-store.h
-include/evolution-data-server-2.28/camel/camel-operation.h
-include/evolution-data-server-2.28/camel/camel-partition-table.h
-include/evolution-data-server-2.28/camel/camel-process.h
-include/evolution-data-server-2.28/camel/camel-provider.h
-include/evolution-data-server-2.28/camel/camel-sasl-anonymous.h
-include/evolution-data-server-2.28/camel/camel-sasl-cram-md5.h
-include/evolution-data-server-2.28/camel/camel-sasl-digest-md5.h
-include/evolution-data-server-2.28/camel/camel-sasl-gssapi.h
-include/evolution-data-server-2.28/camel/camel-sasl-kerberos4.h
-include/evolution-data-server-2.28/camel/camel-sasl-login.h
-include/evolution-data-server-2.28/camel/camel-sasl-ntlm.h
-include/evolution-data-server-2.28/camel/camel-sasl-plain.h
-include/evolution-data-server-2.28/camel/camel-sasl-popb4smtp.h
-include/evolution-data-server-2.28/camel/camel-sasl.h
-include/evolution-data-server-2.28/camel/camel-search-private.h
-include/evolution-data-server-2.28/camel/camel-search-sql-sexp.h
-include/evolution-data-server-2.28/camel/camel-search-sql.h
-include/evolution-data-server-2.28/camel/camel-seekable-stream.h
-include/evolution-data-server-2.28/camel/camel-seekable-substream.h
-include/evolution-data-server-2.28/camel/camel-service.h
-include/evolution-data-server-2.28/camel/camel-session.h
-include/evolution-data-server-2.28/camel/camel-smime-context.h
-include/evolution-data-server-2.28/camel/camel-store-summary.h
-include/evolution-data-server-2.28/camel/camel-store.h
-include/evolution-data-server-2.28/camel/camel-stream-buffer.h
-include/evolution-data-server-2.28/camel/camel-stream-filter.h
-include/evolution-data-server-2.28/camel/camel-stream-fs.h
-include/evolution-data-server-2.28/camel/camel-stream-mem.h
-include/evolution-data-server-2.28/camel/camel-stream-null.h
-include/evolution-data-server-2.28/camel/camel-stream-process.h
-include/evolution-data-server-2.28/camel/camel-stream-vfs.h
-include/evolution-data-server-2.28/camel/camel-stream.h
-include/evolution-data-server-2.28/camel/camel-string-utils.h
-include/evolution-data-server-2.28/camel/camel-tcp-stream-raw.h
-include/evolution-data-server-2.28/camel/camel-tcp-stream-ssl.h
-include/evolution-data-server-2.28/camel/camel-tcp-stream.h
-include/evolution-data-server-2.28/camel/camel-text-index.h
-include/evolution-data-server-2.28/camel/camel-transport.h
-include/evolution-data-server-2.28/camel/camel-trie.h
-include/evolution-data-server-2.28/camel/camel-types.h
-include/evolution-data-server-2.28/camel/camel-uid-cache.h
-include/evolution-data-server-2.28/camel/camel-url-scanner.h
-include/evolution-data-server-2.28/camel/camel-url.h
-include/evolution-data-server-2.28/camel/camel-utf8.h
-include/evolution-data-server-2.28/camel/camel-vee-folder.h
-include/evolution-data-server-2.28/camel/camel-vee-store.h
-include/evolution-data-server-2.28/camel/camel-vee-summary.h
-include/evolution-data-server-2.28/camel/camel-vtrash-folder.h
-include/evolution-data-server-2.28/camel/camel.h
-include/evolution-data-server-2.28/exchange/e-folder-exchange.h
-include/evolution-data-server-2.28/exchange/e-folder.h
-include/evolution-data-server-2.28/exchange/e-storage.h
-include/evolution-data-server-2.28/exchange/e2k-autoconfig.h
-include/evolution-data-server-2.28/exchange/e2k-context.h
-include/evolution-data-server-2.28/exchange/e2k-freebusy.h
-include/evolution-data-server-2.28/exchange/e2k-global-catalog-ldap.h
-include/evolution-data-server-2.28/exchange/e2k-global-catalog.h
-include/evolution-data-server-2.28/exchange/e2k-http-utils.h
-include/evolution-data-server-2.28/exchange/e2k-marshal.h
-include/evolution-data-server-2.28/exchange/e2k-operation.h
-include/evolution-data-server-2.28/exchange/e2k-properties.h
-include/evolution-data-server-2.28/exchange/e2k-propnames.h
-include/evolution-data-server-2.28/exchange/e2k-restriction.h
-include/evolution-data-server-2.28/exchange/e2k-result.h
-include/evolution-data-server-2.28/exchange/e2k-security-descriptor.h
-include/evolution-data-server-2.28/exchange/e2k-sid.h
-include/evolution-data-server-2.28/exchange/e2k-types.h
-include/evolution-data-server-2.28/exchange/e2k-uri.h
-include/evolution-data-server-2.28/exchange/e2k-utils.h
-include/evolution-data-server-2.28/exchange/e2k-validate.h
-include/evolution-data-server-2.28/exchange/e2k-xml-utils.h
-include/evolution-data-server-2.28/exchange/exchange-account.h
-include/evolution-data-server-2.28/exchange/exchange-constants.h
-include/evolution-data-server-2.28/exchange/exchange-esource.h
-include/evolution-data-server-2.28/exchange/exchange-folder-size.h
-include/evolution-data-server-2.28/exchange/exchange-hierarchy-foreign.h
-include/evolution-data-server-2.28/exchange/exchange-hierarchy-somedav.h
-include/evolution-data-server-2.28/exchange/exchange-hierarchy-webdav.h
-include/evolution-data-server-2.28/exchange/exchange-hierarchy.h
-include/evolution-data-server-2.28/exchange/exchange-oof.h
-include/evolution-data-server-2.28/exchange/exchange-types.h
-include/evolution-data-server-2.28/exchange/mapi.h
-include/evolution-data-server-2.28/google/libgdata-google/gdata-google-service.h
-include/evolution-data-server-2.28/google/libgdata/gdata-entry.h
-include/evolution-data-server-2.28/google/libgdata/gdata-feed.h
-include/evolution-data-server-2.28/google/libgdata/gdata-service-iface.h
-include/evolution-data-server-2.28/groupwise/e-gw-connection.h
-include/evolution-data-server-2.28/groupwise/e-gw-container.h
-include/evolution-data-server-2.28/groupwise/e-gw-filter.h
-include/evolution-data-server-2.28/groupwise/e-gw-item.h
-include/evolution-data-server-2.28/groupwise/e-gw-message.h
-include/evolution-data-server-2.28/groupwise/e-gw-proxy.h
-include/evolution-data-server-2.28/groupwise/e-gw-recur-utils.h
-include/evolution-data-server-2.28/groupwise/e-gw-sendoptions.h
-include/evolution-data-server-2.28/groupwise/soup-soap-message.h
-include/evolution-data-server-2.28/groupwise/soup-soap-response.h
-include/evolution-data-server-2.28/libebackend/e-data-server-module.h
-include/evolution-data-server-2.28/libebackend/e-db3-utils.h
-include/evolution-data-server-2.28/libebackend/e-dbhash.h
-include/evolution-data-server-2.28/libebackend/e-file-cache.h
-include/evolution-data-server-2.28/libebook/e-address-western.h
-include/evolution-data-server-2.28/libebook/e-book-query.h
-include/evolution-data-server-2.28/libebook/e-book-types.h
-include/evolution-data-server-2.28/libebook/e-book-view.h
-include/evolution-data-server-2.28/libebook/e-book.h
-include/evolution-data-server-2.28/libebook/e-contact.h
-include/evolution-data-server-2.28/libebook/e-destination.h
-include/evolution-data-server-2.28/libebook/e-name-western.h
-include/evolution-data-server-2.28/libebook/e-vcard.h
-include/evolution-data-server-2.28/libecal/e-cal-check-timezones.h
-include/evolution-data-server-2.28/libecal/e-cal-component.h
-include/evolution-data-server-2.28/libecal/e-cal-recur.h
-include/evolution-data-server-2.28/libecal/e-cal-system-timezone.h
-include/evolution-data-server-2.28/libecal/e-cal-time-util.h
-include/evolution-data-server-2.28/libecal/e-cal-types.h
-include/evolution-data-server-2.28/libecal/e-cal-util.h
-include/evolution-data-server-2.28/libecal/e-cal-view.h
-include/evolution-data-server-2.28/libecal/e-cal.h
-include/evolution-data-server-2.28/libedata-book/Evolution-DataServer-Addressbook.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend-cache.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend-db-cache.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend-factory.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend-sexp.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend-summary.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend-sync.h
-include/evolution-data-server-2.28/libedata-book/e-book-backend.h
-include/evolution-data-server-2.28/libedata-book/e-data-book-factory.h
-include/evolution-data-server-2.28/libedata-book/e-data-book-types.h
-include/evolution-data-server-2.28/libedata-book/e-data-book-view.h
-include/evolution-data-server-2.28/libedata-book/e-data-book.h
-include/evolution-data-server-2.28/libedata-cal/Evolution-DataServer-Calendar.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-cache.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-factory.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-file-store.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-loader-factory.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-sexp.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-store.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-sync.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend-util.h
-include/evolution-data-server-2.28/libedata-cal/e-cal-backend.h
-include/evolution-data-server-2.28/libedata-cal/e-data-cal-common.h
-include/evolution-data-server-2.28/libedata-cal/e-data-cal-factory.h
-include/evolution-data-server-2.28/libedata-cal/e-data-cal-view.h
-include/evolution-data-server-2.28/libedata-cal/e-data-cal.h
-include/evolution-data-server-2.28/libedataserver/e-account-list.h
-include/evolution-data-server-2.28/libedataserver/e-account.h
-include/evolution-data-server-2.28/libedataserver/e-categories.h
-include/evolution-data-server-2.28/libedataserver/e-component-listener.h
-include/evolution-data-server-2.28/libedataserver/e-data-server-util.h
-include/evolution-data-server-2.28/libedataserver/e-flag.h
-include/evolution-data-server-2.28/libedataserver/e-iconv.h
-include/evolution-data-server-2.28/libedataserver/e-iterator.h
-include/evolution-data-server-2.28/libedataserver/e-list-iterator.h
-include/evolution-data-server-2.28/libedataserver/e-list.h
-include/evolution-data-server-2.28/libedataserver/e-memory.h
-include/evolution-data-server-2.28/libedataserver/e-msgport.h
-include/evolution-data-server-2.28/libedataserver/e-proxy.h
-include/evolution-data-server-2.28/libedataserver/e-sexp.h
-include/evolution-data-server-2.28/libedataserver/e-source-group.h
-include/evolution-data-server-2.28/libedataserver/e-source-list.h
-include/evolution-data-server-2.28/libedataserver/e-source.h
-include/evolution-data-server-2.28/libedataserver/e-time-utils.h
-include/evolution-data-server-2.28/libedataserver/e-trie.h
-include/evolution-data-server-2.28/libedataserver/e-uid.h
-include/evolution-data-server-2.28/libedataserver/e-url.h
-include/evolution-data-server-2.28/libedataserver/e-xml-hash-utils.h
-include/evolution-data-server-2.28/libedataserver/e-xml-utils.h
-include/evolution-data-server-2.28/libedataserver/eds-version.h
-include/evolution-data-server-2.28/libedataserver/md5-utils.h
-include/evolution-data-server-2.28/libedataserverui/e-book-auth-util.h
-include/evolution-data-server-2.28/libedataserverui/e-categories-dialog.h
-include/evolution-data-server-2.28/libedataserverui/e-category-completion.h
-include/evolution-data-server-2.28/libedataserverui/e-cell-renderer-color.h
-include/evolution-data-server-2.28/libedataserverui/e-contact-store.h
-include/evolution-data-server-2.28/libedataserverui/e-destination-store.h
-include/evolution-data-server-2.28/libedataserverui/e-name-selector-dialog.h
-include/evolution-data-server-2.28/libedataserverui/e-name-selector-entry.h
-include/evolution-data-server-2.28/libedataserverui/e-name-selector-list.h
-include/evolution-data-server-2.28/libedataserverui/e-name-selector-model.h
-include/evolution-data-server-2.28/libedataserverui/e-name-selector.h
-include/evolution-data-server-2.28/libedataserverui/e-passwords.h
-include/evolution-data-server-2.28/libedataserverui/e-source-combo-box.h
-include/evolution-data-server-2.28/libedataserverui/e-source-option-menu.h
-include/evolution-data-server-2.28/libedataserverui/e-source-selector-dialog.h
-include/evolution-data-server-2.28/libedataserverui/e-source-selector.h
-include/evolution-data-server-2.28/libedataserverui/e-tree-model-generator.h
-lib/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
+@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
 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
 lib/evolution-data-server-1.2/camel-providers/libcamelimap.urls
+lib/evolution-data-server-1.2/camel-providers/libcamelimapx.la
+lib/evolution-data-server-1.2/camel-providers/libcamelimapx.urls
 lib/evolution-data-server-1.2/camel-providers/libcamellocal.la
 lib/evolution-data-server-1.2/camel-providers/libcamellocal.urls
 lib/evolution-data-server-1.2/camel-providers/libcamelnntp.la
@@ -296,7 +261,6 @@ lib/libedata-cal-1.2.la
 lib/libedataserver-1.2.la
 lib/libedataserverui-1.2.la
 lib/libegroupwise-1.2.la
-lib/libexchange-storage-1.2.la
 lib/libgdata-1.2.la
 lib/libgdata-google-1.2.la
 lib/pkgconfig/camel-1.2.pc
@@ -310,16 +274,18 @@ 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/libexchange-storage-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/evolution-data-server-2.28
-share/evolution-data-server-2.28/evolutionperson.schema
-share/evolution-data-server-2.28/glade/e-categories-dialog.glade
-share/evolution-data-server-2.28/glade/e-name-selector-dialog.glade
-share/evolution-data-server-2.28/weather/Locations.xml
+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/gtk-doc/html/camel/Addresses.html
 share/gtk-doc/html/camel/ClassTree.html
 share/gtk-doc/html/camel/Crypto.html
@@ -328,18 +294,31 @@ share/gtk-doc/html/camel/Filters.html
 share/gtk-doc/html/camel/Folders.html
 share/gtk-doc/html/camel/Fundamentals.html
 share/gtk-doc/html/camel/MIME.html
-share/gtk-doc/html/camel/SearchFolders.html
+share/gtk-doc/html/camel/Search-Folders.html
 share/gtk-doc/html/camel/Services.html
 share/gtk-doc/html/camel/Storage.html
-share/gtk-doc/html/camel/StreamFilters.html
+share/gtk-doc/html/camel/Stream-Filters.html
 share/gtk-doc/html/camel/Streams.html
 share/gtk-doc/html/camel/Utilities.html
+share/gtk-doc/html/camel/api-index-2.22.html
+share/gtk-doc/html/camel/api-index-2.24.html
+share/gtk-doc/html/camel/api-index-2.26.html
+share/gtk-doc/html/camel/api-index-2.28.html
+share/gtk-doc/html/camel/api-index-2.30.html
+share/gtk-doc/html/camel/api-index-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
@@ -388,7 +367,6 @@ 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-CamelSaslKerberos4.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
@@ -423,7 +401,6 @@ 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
-share/gtk-doc/html/camel/camel-camel-i18n.html
 share/gtk-doc/html/camel/camel-camel-iconv.html
 share/gtk-doc/html/camel/camel-camel-junk-plugin.html
 share/gtk-doc/html/camel/camel-camel-list-utils.html
@@ -443,23 +420,28 @@ share/gtk-doc/html/camel/camel-camel-uid-cache.html
 share/gtk-doc/html/camel/camel-camel-url-scanner.html
 share/gtk-doc/html/camel/camel-camel-url.html
 share/gtk-doc/html/camel/camel-camel-utf8.html
+share/gtk-doc/html/camel/camel-camel.html
 share/gtk-doc/html/camel/camel.devhelp
 share/gtk-doc/html/camel/camel.devhelp2
 share/gtk-doc/html/camel/classes.html
 share/gtk-doc/html/camel/home.png
 share/gtk-doc/html/camel/index.html
 share/gtk-doc/html/camel/index.sgml
-share/gtk-doc/html/camel/ix01.html
-share/gtk-doc/html/camel/ix02.html
 share/gtk-doc/html/camel/left.png
 share/gtk-doc/html/camel/right.png
 share/gtk-doc/html/camel/style.css
 share/gtk-doc/html/camel/up.png
+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/ch01.html
 share/gtk-doc/html/libebackend/home.png
 share/gtk-doc/html/libebackend/index.html
 share/gtk-doc/html/libebackend/index.sgml
+share/gtk-doc/html/libebackend/ix01.html
 share/gtk-doc/html/libebackend/left.png
+share/gtk-doc/html/libebackend/libebackend-EOfflineListener.html
 share/gtk-doc/html/libebackend/libebackend-e-data-server-module.html
 share/gtk-doc/html/libebackend/libebackend-e-db3-utils.html
 share/gtk-doc/html/libebackend/libebackend-e-dbhash.html
@@ -470,18 +452,23 @@ share/gtk-doc/html/libebackend/right.png
 share/gtk-doc/html/libebackend/style.css
 share/gtk-doc/html/libebackend/up.png
 share/gtk-doc/html/libebook/EBook.html
-share/gtk-doc/html/libebook/EBookListener.html
 share/gtk-doc/html/libebook/EBookView.html
-share/gtk-doc/html/libebook/EBookViewListener.html
 share/gtk-doc/html/libebook/EContact.html
 share/gtk-doc/html/libebook/EDestination.html
 share/gtk-doc/html/libebook/EVCard.html
+share/gtk-doc/html/libebook/api-index-1.12.html
+share/gtk-doc/html/libebook/api-index-2.22.html
+share/gtk-doc/html/libebook/api-index-2.24.html
+share/gtk-doc/html/libebook/api-index-2.26.html
+share/gtk-doc/html/libebook/api-index-2.28.html
+share/gtk-doc/html/libebook/api-index-2.30.html
+share/gtk-doc/html/libebook/api-index-full.html
 share/gtk-doc/html/libebook/ch01.html
 share/gtk-doc/html/libebook/home.png
 share/gtk-doc/html/libebook/index.html
 share/gtk-doc/html/libebook/index.sgml
-share/gtk-doc/html/libebook/ix01.html
 share/gtk-doc/html/libebook/left.png
+share/gtk-doc/html/libebook/libebook-EAddressWestern.html
 share/gtk-doc/html/libebook/libebook-ENameWestern.html
 share/gtk-doc/html/libebook/libebook-e-book-query.html
 share/gtk-doc/html/libebook/libebook-e-book-types.html
@@ -492,16 +479,22 @@ share/gtk-doc/html/libebook/style.css
 share/gtk-doc/html/libebook/up.png
 share/gtk-doc/html/libecal/ECal.html
 share/gtk-doc/html/libecal/ECalComponent.html
-share/gtk-doc/html/libecal/ECalListener.html
 share/gtk-doc/html/libecal/ECalView.html
-share/gtk-doc/html/libecal/ECalViewListener.html
+share/gtk-doc/html/libecal/api-index-1.12.html
+share/gtk-doc/html/libecal/api-index-2.22.html
+share/gtk-doc/html/libecal/api-index-2.24.html
+share/gtk-doc/html/libecal/api-index-2.26.html
+share/gtk-doc/html/libecal/api-index-2.28.html
+share/gtk-doc/html/libecal/api-index-2.30.html
+share/gtk-doc/html/libecal/api-index-full.html
 share/gtk-doc/html/libecal/ch01.html
 share/gtk-doc/html/libecal/home.png
 share/gtk-doc/html/libecal/index.html
 share/gtk-doc/html/libecal/index.sgml
-share/gtk-doc/html/libecal/ix01.html
 share/gtk-doc/html/libecal/left.png
+share/gtk-doc/html/libecal/libecal-e-cal-check-timezones.html
 share/gtk-doc/html/libecal/libecal-e-cal-recur.html
+share/gtk-doc/html/libecal/libecal-e-cal-system-timezone.html
 share/gtk-doc/html/libecal/libecal-e-cal-time-util.html
 share/gtk-doc/html/libecal/libecal-e-cal-types.html
 share/gtk-doc/html/libecal/libecal-e-cal-util.html
@@ -512,16 +505,27 @@ share/gtk-doc/html/libecal/style.css
 share/gtk-doc/html/libecal/up.png
 share/gtk-doc/html/libedata-book/EBookBackend.html
 share/gtk-doc/html/libedata-book/EBookBackendCache.html
+share/gtk-doc/html/libedata-book/EBookBackendFactory.html
 share/gtk-doc/html/libedata-book/EBookBackendSExp.html
+share/gtk-doc/html/libedata-book/EBookBackendSummary.html
 share/gtk-doc/html/libedata-book/EBookBackendSync.html
 share/gtk-doc/html/libedata-book/EDataBook.html
 share/gtk-doc/html/libedata-book/EDataBookView.html
+share/gtk-doc/html/libedata-book/api-index-1.12.html
+share/gtk-doc/html/libedata-book/api-index-2.22.html
+share/gtk-doc/html/libedata-book/api-index-2.24.html
+share/gtk-doc/html/libedata-book/api-index-2.26.html
+share/gtk-doc/html/libedata-book/api-index-2.28.html
+share/gtk-doc/html/libedata-book/api-index-2.30.html
+share/gtk-doc/html/libedata-book/api-index-full.html
 share/gtk-doc/html/libedata-book/ch01.html
 share/gtk-doc/html/libedata-book/home.png
 share/gtk-doc/html/libedata-book/index.html
 share/gtk-doc/html/libedata-book/index.sgml
-share/gtk-doc/html/libedata-book/ix01.html
 share/gtk-doc/html/libedata-book/left.png
+share/gtk-doc/html/libedata-book/libedata-book-EDataBookFactory.html
+share/gtk-doc/html/libedata-book/libedata-book-e-book-backend-db-cache.html
+share/gtk-doc/html/libedata-book/libedata-book-ximian-vcard.html
 share/gtk-doc/html/libedata-book/libedata-book.devhelp
 share/gtk-doc/html/libedata-book/libedata-book.devhelp2
 share/gtk-doc/html/libedata-book/right.png
@@ -533,14 +537,24 @@ share/gtk-doc/html/libedata-cal/ECalBackendFactory.html
 share/gtk-doc/html/libedata-cal/ECalBackendSExp.html
 share/gtk-doc/html/libedata-cal/ECalBackendSync.html
 share/gtk-doc/html/libedata-cal/EDataCal.html
-share/gtk-doc/html/libedata-cal/EDataCalFactory.html
-share/gtk-doc/html/libedata-cal/EDataCalView.html
+share/gtk-doc/html/libedata-cal/api-index-1.12.html
+share/gtk-doc/html/libedata-cal/api-index-2.22.html
+share/gtk-doc/html/libedata-cal/api-index-2.24.html
+share/gtk-doc/html/libedata-cal/api-index-2.26.html
+share/gtk-doc/html/libedata-cal/api-index-2.28.html
+share/gtk-doc/html/libedata-cal/api-index-2.30.html
+share/gtk-doc/html/libedata-cal/api-index-full.html
 share/gtk-doc/html/libedata-cal/ch01.html
 share/gtk-doc/html/libedata-cal/home.png
 share/gtk-doc/html/libedata-cal/index.html
 share/gtk-doc/html/libedata-cal/index.sgml
-share/gtk-doc/html/libedata-cal/ix01.html
 share/gtk-doc/html/libedata-cal/left.png
+share/gtk-doc/html/libedata-cal/libedata-cal-ECalBackendFileStore.html
+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-e-cal-backend-util.html
 share/gtk-doc/html/libedata-cal/libedata-cal.devhelp
 share/gtk-doc/html/libedata-cal/libedata-cal.devhelp2
 share/gtk-doc/html/libedata-cal/right.png
@@ -548,22 +562,28 @@ share/gtk-doc/html/libedata-cal/style.css
 share/gtk-doc/html/libedata-cal/up.png
 share/gtk-doc/html/libedataserver/EAccount.html
 share/gtk-doc/html/libedataserver/EAccountList.html
-share/gtk-doc/html/libedataserver/EComponentListener.html
 share/gtk-doc/html/libedataserver/EIterator.html
 share/gtk-doc/html/libedataserver/EList.html
 share/gtk-doc/html/libedataserver/EListIterator.html
 share/gtk-doc/html/libedataserver/ESource.html
 share/gtk-doc/html/libedataserver/ESourceGroup.html
 share/gtk-doc/html/libedataserver/ESourceList.html
+share/gtk-doc/html/libedataserver/api-index-1.12.html
+share/gtk-doc/html/libedataserver/api-index-2.22.html
+share/gtk-doc/html/libedataserver/api-index-2.24.html
+share/gtk-doc/html/libedataserver/api-index-2.26.html
+share/gtk-doc/html/libedataserver/api-index-2.28.html
+share/gtk-doc/html/libedataserver/api-index-2.30.html
+share/gtk-doc/html/libedataserver/api-index-full.html
 share/gtk-doc/html/libedataserver/ch01.html
 share/gtk-doc/html/libedataserver/home.png
 share/gtk-doc/html/libedataserver/index.html
 share/gtk-doc/html/libedataserver/index.sgml
-share/gtk-doc/html/libedataserver/ix01.html
 share/gtk-doc/html/libedataserver/left.png
 share/gtk-doc/html/libedataserver/libedataserver-EFlag.html
 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-memory.html
@@ -573,6 +593,7 @@ 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
@@ -592,101 +613,110 @@ 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
+share/gtk-doc/html/libedataserverui/api-index-1.12.html
+share/gtk-doc/html/libedataserverui/api-index-2.22.html
+share/gtk-doc/html/libedataserverui/api-index-2.24.html
+share/gtk-doc/html/libedataserverui/api-index-2.26.html
+share/gtk-doc/html/libedataserverui/api-index-2.28.html
+share/gtk-doc/html/libedataserverui/api-index-2.30.html
+share/gtk-doc/html/libedataserverui/api-index-full.html
 share/gtk-doc/html/libedataserverui/ch01.html
 share/gtk-doc/html/libedataserverui/home.png
 share/gtk-doc/html/libedataserverui/index.html
 share/gtk-doc/html/libedataserverui/index.sgml
-share/gtk-doc/html/libedataserverui/ix01.html
 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/idl/evolution-data-server-1.2/Evolution-DataServer-Addressbook.idl
-share/idl/evolution-data-server-1.2/Evolution-DataServer-Calendar.idl
-share/idl/evolution-data-server-1.2/Evolution-DataServer.idl
-share/locale/am/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/as/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ast/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/kn/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/mai/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/oc/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/si/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/sr@latin/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/te/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-2.28.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-2.28.mo
+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/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 f3bcc30b8d6..d7819eaffc0 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/06/13 22:44:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/07/12 17:52:29 drochner Exp $
 
 BUILDLINK_TREE+=	evolution-data-server
 
@@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 BDB_ACCEPTED?=		db4 db5
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index 17ae05134e9..0051ceae8ab 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.67 2010/05/19 21:52:57 drochner Exp $
+$NetBSD: distinfo,v 1.68 2010/07/12 17:52:29 drochner Exp $
 
-SHA1 (evolution-data-server-2.28.3.1.tar.bz2) = 64dec0b300f3ba15da3969eb8e84b0e81b2842de
-RMD160 (evolution-data-server-2.28.3.1.tar.bz2) = 11f5c0311de98e590bba73a9a46d33c4d42d8538
-Size (evolution-data-server-2.28.3.1.tar.bz2) = 14461320 bytes
-SHA1 (patch-ab) = fff3e022aee934c463d7a66b681e020d3bebe1b0
-SHA1 (patch-ak) = 7cb93df533fdb942f0605a517f713cfe96401434
-SHA1 (patch-aq) = 375d592b72f59fa70160bf23aa260338d350c517
-SHA1 (patch-ar) = b6b92b068f94954d435cff11543a4de7d07712ac
-SHA1 (patch-at) = 32bb4f9de33a3799ad7a1a00dd072b38a800185c
+SHA1 (evolution-data-server-2.30.2.1.tar.bz2) = 38773add77d69d229f430c25b93628b773041dbd
+RMD160 (evolution-data-server-2.30.2.1.tar.bz2) = d9b6d91d9662c513e98a41d68f8b770fd6bc5560
+Size (evolution-data-server-2.30.2.1.tar.bz2) = 4645500 bytes
+SHA1 (patch-ak) = 8899171378b9d13fbe6ed77a8ae90c9bac228fa9
 SHA1 (patch-bd) = b9d35859108aff62b0a18f756661070163004d4c
+SHA1 (patch-ca) = 414c0319e9642580197b7841969f7b57a1a29052
+SHA1 (patch-cc) = d7e46e68c924ae9b9f09c39ff7981c56e244c967
+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
index f4e4f565632..1f88b981906 100644
--- a/mail/evolution-data-server/patches/patch-ak
+++ b/mail/evolution-data-server/patches/patch-ak
@@ -1,40 +1,30 @@
-$NetBSD: patch-ak,v 1.13 2010/05/19 21:52:57 drochner Exp $
+$NetBSD: patch-ak,v 1.14 2010/07/12 17:52:29 drochner Exp $
 
---- configure.orig	2010-03-02 06:36:33.000000000 +0000
+--- configure.orig	2010-04-26 03:11:28.000000000 +0000
 +++ configure
-@@ -22466,14 +22466,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
+@@ -17395,13 +17395,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
  
  
- 
--	PTHREAD_LIB=""
--	{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+ 	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:$LINENO: checking for pthread_create in ${PTHREAD_LIB}" >&5
++	{ $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
+ 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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22533,7 +22532,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -17432,7 +17432,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
+ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
 -  PTHREAD_LIB="-lpthread"
 +  PTHREAD_LIB="${PTHREAD_LIB}"
  else
-   { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
  $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
-@@ -22737,7 +22736,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_attr_init_system" >&5
- $as_echo "$ac_cv_lib_pthread___pthread_attr_init_system" >&6; }
- if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then
--  PTHREAD_LIB="-lpthread"
-+  PTHREAD_LIB="${PTHREAD_LIB}"
- else
-   { $as_echo "$as_me:$LINENO: checking for pthread_create" >&5
- $as_echo_n "checking for pthread_create... " >&6; }
diff --git a/mail/evolution-data-server/patches/patch-ca b/mail/evolution-data-server/patches/patch-ca
new file mode 100644
index 00000000000..1f965eebec5
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ca
@@ -0,0 +1,49 @@
+$NetBSD: patch-ca,v 1.1 2010/07/12 17:52:29 drochner Exp $
+
+--- camel/camel-search-sql-sexp.c.orig	2010-06-11 17:38:50.000000000 +0000
++++ camel/camel-search-sql-sexp.c
+@@ -177,7 +177,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)
+-			g_string_append_printf(str, "%ld", r1->value.time);
++			g_string_append_printf(str, "%lld", (long long)r1->value.time);
+ 		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
+ 			if (r2->type == ESEXP_RES_BOOL)
+ 				g_string_append_printf(str, "%d", r2->value.bool);
+ 			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
+ 		if (r1->type == ESEXP_RES_INT)
+ 			g_string_append_printf(str, "%d", r1->value.number);
+ 		else if (r1->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r1->value.time);
++			g_string_append_printf(str, "%lld", (long long)r1->value.time);
+ 		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
+ 		if (r2->type == ESEXP_RES_BOOL)
+ 			g_string_append_printf(str, "%d", r2->value.bool);
+ 		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
+ 		if (r1->type == ESEXP_RES_INT)
+ 			g_string_append_printf(str, "%d", r1->value.number);
+ 		else if (r1->type == ESEXP_RES_TIME)
+-			g_string_append_printf(str, "%ld", r1->value.time);
++			g_string_append_printf(str, "%lld", (long long)r1->value.time);
+ 		else if (r1->type == ESEXP_RES_STRING)
+ 			g_string_append_printf(str, "%s", r1->value.string);
+ 
diff --git a/mail/evolution-data-server/patches/patch-cc b/mail/evolution-data-server/patches/patch-cc
new file mode 100644
index 00000000000..99fd04c4bbc
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-cc,v 1.1 2010/07/12 17:52:29 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
+@@ -378,7 +378,7 @@ static gchar *maildir_summary_next_uid_s
+ 				g_free(uid);
+ 				sleep(2);
+ 			}
+-			uid = g_strdup_printf("%ld.%d_%u.%s", time(NULL), getpid(), nextuid, mds->priv->hostname);
++			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);
diff --git a/mail/evolution-data-server/patches/patch-cd b/mail/evolution-data-server/patches/patch-cd
new file mode 100644
index 00000000000..4a64cef4e57
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-cd
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2010/07/12 17:52:29 drochner Exp $
+
+--- addressbook/backends/vcf/e-book-backend-vcf.c.orig	2010-06-11 17:49:13.000000000 +0000
++++ addressbook/backends/vcf/e-book-backend-vcf.c
+@@ -77,7 +77,7 @@ e_book_backend_vcf_create_unique_id (voi
+ 	   it's doubtful 2^32 id's will be created in a second, so we
+ 	   should be okay. */
+ 	static guint c = 0;
+-	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time(NULL), c++);
++	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", (long)time(NULL), c++);
+ }
+ 
+ static void
diff --git a/mail/evolution-data-server/patches/patch-ce b/mail/evolution-data-server/patches/patch-ce
new file mode 100644
index 00000000000..058ff672883
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ce
@@ -0,0 +1,18 @@
+$NetBSD: patch-ce,v 1.1 2010/07/12 17:52:29 drochner Exp $
+
+--- addressbook/backends/ldap/e-book-backend-ldap.c.orig	2010-06-11 17:50:57.000000000 +0000
++++ addressbook/backends/ldap/e-book-backend-ldap.c
+@@ -1267,11 +1267,11 @@ create_dn_from_contact (EContact *contac
+ 		}
+ 	}
+ 
+-	dn = g_strdup_printf ("%s=%s%s%lu",
++	dn = g_strdup_printf ("%s=%s%s%llu",
+ 			      get_dn_attribute_name (rootdn),
+ 			      (cn_part && *cn_part) ? cn_part : "",
+ 			      (cn_part && *cn_part) ? "." : "",
+-			      time (NULL));
++			      (long long)time (NULL));
+ 
+ 	g_free (cn_part);
+