update to 2.22.1

This switches to the gnome-2.22 release branch.

6 files changed, 426 insertions, 402 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 5b3d1a54853..4f766b83246 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.63 2008/03/06 14:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2008/04/15 17:45:38 drochner Exp $
 #
 
-DISTNAME=	evolution-data-server-1.12.3
-PKGREVISION=	2
+DISTNAME=	evolution-data-server-2.22.1
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/1.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -45,6 +44,8 @@ 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=${LOCALBASE}
+BUILDLINK_TRANSFORM+=	l:db:db4
 
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
@@ -72,6 +73,7 @@ DEPENDS+= zonetab-[0-9]*:../../time/zonetab
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -81,7 +83,7 @@ DEPENDS+= zonetab-[0-9]*:../../time/zonetab
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../net/libsoup-devel/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/mail/evolution-data-server/PLIST b/mail/evolution-data-server/PLIST
index 9b91556d3ff..610a6f37828 100644
--- a/mail/evolution-data-server/PLIST
+++ b/mail/evolution-data-server/PLIST
@@ -1,287 +1,295 @@
-@comment $NetBSD: PLIST,v 1.19 2007/11/03 21:51:28 drochner Exp $
-include/evolution-data-server-1.12/camel/broken-date-parser.h
-include/evolution-data-server-1.12/camel/camel-address.h
-include/evolution-data-server-1.12/camel/camel-arg.h
-include/evolution-data-server-1.12/camel/camel-block-file.h
-include/evolution-data-server-1.12/camel/camel-certdb.h
-include/evolution-data-server-1.12/camel/camel-charset-map.h
-include/evolution-data-server-1.12/camel/camel-cipher-context.h
-include/evolution-data-server-1.12/camel/camel-data-cache.h
-include/evolution-data-server-1.12/camel/camel-data-wrapper.h
-include/evolution-data-server-1.12/camel/camel-debug.h
-include/evolution-data-server-1.12/camel/camel-digest-folder.h
-include/evolution-data-server-1.12/camel/camel-digest-store.h
-include/evolution-data-server-1.12/camel/camel-digest-summary.h
-include/evolution-data-server-1.12/camel/camel-disco-diary.h
-include/evolution-data-server-1.12/camel/camel-disco-folder.h
-include/evolution-data-server-1.12/camel/camel-disco-store.h
-include/evolution-data-server-1.12/camel/camel-exception-list.def
-include/evolution-data-server-1.12/camel/camel-exception.h
-include/evolution-data-server-1.12/camel/camel-file-utils.h
-include/evolution-data-server-1.12/camel/camel-filter-driver.h
-include/evolution-data-server-1.12/camel/camel-filter-search.h
-include/evolution-data-server-1.12/camel/camel-folder-search.h
-include/evolution-data-server-1.12/camel/camel-folder-summary.h
-include/evolution-data-server-1.12/camel/camel-folder-thread.h
-include/evolution-data-server-1.12/camel/camel-folder.h
-include/evolution-data-server-1.12/camel/camel-gpg-context.h
-include/evolution-data-server-1.12/camel/camel-html-parser.h
-include/evolution-data-server-1.12/camel/camel-http-stream.h
-include/evolution-data-server-1.12/camel/camel-i18n.h
-include/evolution-data-server-1.12/camel/camel-iconv.h
-include/evolution-data-server-1.12/camel/camel-index.h
-include/evolution-data-server-1.12/camel/camel-internet-address.h
-include/evolution-data-server-1.12/camel/camel-junk-plugin.h
-include/evolution-data-server-1.12/camel/camel-list-utils.h
-include/evolution-data-server-1.12/camel/camel-lock-client.h
-include/evolution-data-server-1.12/camel/camel-lock-helper.h
-include/evolution-data-server-1.12/camel/camel-lock.h
-include/evolution-data-server-1.12/camel/camel-medium.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-basic.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-bestenc.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-canon.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-charset.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-crlf.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-enriched.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-from.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-gzip.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-html.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-index.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-linewrap.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-pgp.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-save.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-tohtml.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-windows.h
-include/evolution-data-server-1.12/camel/camel-mime-filter-yenc.h
-include/evolution-data-server-1.12/camel/camel-mime-filter.h
-include/evolution-data-server-1.12/camel/camel-mime-message.h
-include/evolution-data-server-1.12/camel/camel-mime-parser.h
-include/evolution-data-server-1.12/camel/camel-mime-part-utils.h
-include/evolution-data-server-1.12/camel/camel-mime-part.h
-include/evolution-data-server-1.12/camel/camel-mime-utils.h
-include/evolution-data-server-1.12/camel/camel-movemail.h
-include/evolution-data-server-1.12/camel/camel-multipart-encrypted.h
-include/evolution-data-server-1.12/camel/camel-multipart-signed.h
-include/evolution-data-server-1.12/camel/camel-multipart.h
-include/evolution-data-server-1.12/camel/camel-net-utils.h
-include/evolution-data-server-1.12/camel/camel-news-address.h
-include/evolution-data-server-1.12/camel/camel-nntp-address.h
-include/evolution-data-server-1.12/camel/camel-object.h
-include/evolution-data-server-1.12/camel/camel-offline-folder.h
-include/evolution-data-server-1.12/camel/camel-offline-journal.h
-include/evolution-data-server-1.12/camel/camel-offline-store.h
-include/evolution-data-server-1.12/camel/camel-operation.h
-include/evolution-data-server-1.12/camel/camel-partition-table.h
-include/evolution-data-server-1.12/camel/camel-process.h
-include/evolution-data-server-1.12/camel/camel-provider.h
-include/evolution-data-server-1.12/camel/camel-sasl-anonymous.h
-include/evolution-data-server-1.12/camel/camel-sasl-cram-md5.h
-include/evolution-data-server-1.12/camel/camel-sasl-digest-md5.h
-include/evolution-data-server-1.12/camel/camel-sasl-gssapi.h
-include/evolution-data-server-1.12/camel/camel-sasl-kerberos4.h
-include/evolution-data-server-1.12/camel/camel-sasl-login.h
-include/evolution-data-server-1.12/camel/camel-sasl-ntlm.h
-include/evolution-data-server-1.12/camel/camel-sasl-plain.h
-include/evolution-data-server-1.12/camel/camel-sasl-popb4smtp.h
-include/evolution-data-server-1.12/camel/camel-sasl.h
-include/evolution-data-server-1.12/camel/camel-search-private.h
-include/evolution-data-server-1.12/camel/camel-seekable-stream.h
-include/evolution-data-server-1.12/camel/camel-seekable-substream.h
-include/evolution-data-server-1.12/camel/camel-service.h
-include/evolution-data-server-1.12/camel/camel-session.h
-include/evolution-data-server-1.12/camel/camel-smime-context.h
-include/evolution-data-server-1.12/camel/camel-store-summary.h
-include/evolution-data-server-1.12/camel/camel-store.h
-include/evolution-data-server-1.12/camel/camel-stream-buffer.h
-include/evolution-data-server-1.12/camel/camel-stream-filter.h
-include/evolution-data-server-1.12/camel/camel-stream-fs.h
-include/evolution-data-server-1.12/camel/camel-stream-mem.h
-include/evolution-data-server-1.12/camel/camel-stream-null.h
-include/evolution-data-server-1.12/camel/camel-stream-process.h
-include/evolution-data-server-1.12/camel/camel-stream-vfs.h
-include/evolution-data-server-1.12/camel/camel-stream.h
-include/evolution-data-server-1.12/camel/camel-string-utils.h
-include/evolution-data-server-1.12/camel/camel-tcp-stream-raw.h
-include/evolution-data-server-1.12/camel/camel-tcp-stream-ssl.h
-include/evolution-data-server-1.12/camel/camel-tcp-stream.h
-include/evolution-data-server-1.12/camel/camel-text-index.h
-include/evolution-data-server-1.12/camel/camel-transport.h
-include/evolution-data-server-1.12/camel/camel-types.h
-include/evolution-data-server-1.12/camel/camel-uid-cache.h
-include/evolution-data-server-1.12/camel/camel-url-scanner.h
-include/evolution-data-server-1.12/camel/camel-url.h
-include/evolution-data-server-1.12/camel/camel-utf8.h
-include/evolution-data-server-1.12/camel/camel-vee-folder.h
-include/evolution-data-server-1.12/camel/camel-vee-store.h
-include/evolution-data-server-1.12/camel/camel-vee-summary.h
-include/evolution-data-server-1.12/camel/camel-vtrash-folder.h
-include/evolution-data-server-1.12/camel/camel.h
-include/evolution-data-server-1.12/exchange/e-folder-exchange.h
-include/evolution-data-server-1.12/exchange/e-folder.h
-include/evolution-data-server-1.12/exchange/e-storage.h
-include/evolution-data-server-1.12/exchange/e2k-autoconfig.h
-include/evolution-data-server-1.12/exchange/e2k-context.h
-include/evolution-data-server-1.12/exchange/e2k-freebusy.h
-include/evolution-data-server-1.12/exchange/e2k-global-catalog-ldap.h
-include/evolution-data-server-1.12/exchange/e2k-global-catalog.h
-include/evolution-data-server-1.12/exchange/e2k-http-utils.h
-include/evolution-data-server-1.12/exchange/e2k-marshal.h
-include/evolution-data-server-1.12/exchange/e2k-operation.h
-include/evolution-data-server-1.12/exchange/e2k-properties.h
-include/evolution-data-server-1.12/exchange/e2k-propnames.h
-include/evolution-data-server-1.12/exchange/e2k-restriction.h
-include/evolution-data-server-1.12/exchange/e2k-result.h
-include/evolution-data-server-1.12/exchange/e2k-security-descriptor.h
-include/evolution-data-server-1.12/exchange/e2k-sid.h
-include/evolution-data-server-1.12/exchange/e2k-types.h
-include/evolution-data-server-1.12/exchange/e2k-uri.h
-include/evolution-data-server-1.12/exchange/e2k-utils.h
-include/evolution-data-server-1.12/exchange/e2k-validate.h
-include/evolution-data-server-1.12/exchange/e2k-xml-utils.h
-include/evolution-data-server-1.12/exchange/exchange-account.h
-include/evolution-data-server-1.12/exchange/exchange-constants.h
-include/evolution-data-server-1.12/exchange/exchange-esource.h
-include/evolution-data-server-1.12/exchange/exchange-folder-size.h
-include/evolution-data-server-1.12/exchange/exchange-hierarchy-foreign.h
-include/evolution-data-server-1.12/exchange/exchange-hierarchy-somedav.h
-include/evolution-data-server-1.12/exchange/exchange-hierarchy-webdav.h
-include/evolution-data-server-1.12/exchange/exchange-hierarchy.h
-include/evolution-data-server-1.12/exchange/exchange-oof.h
-include/evolution-data-server-1.12/exchange/exchange-types.h
-include/evolution-data-server-1.12/exchange/mapi.h
-include/evolution-data-server-1.12/groupwise/e-gw-connection.h
-include/evolution-data-server-1.12/groupwise/e-gw-container.h
-include/evolution-data-server-1.12/groupwise/e-gw-filter.h
-include/evolution-data-server-1.12/groupwise/e-gw-item.h
-include/evolution-data-server-1.12/groupwise/e-gw-message.h
-include/evolution-data-server-1.12/groupwise/e-gw-proxy.h
-include/evolution-data-server-1.12/groupwise/e-gw-recur-utils.h
-include/evolution-data-server-1.12/groupwise/e-gw-sendoptions.h
-include/evolution-data-server-1.12/libebook/e-address-western.h
-include/evolution-data-server-1.12/libebook/e-book-query.h
-include/evolution-data-server-1.12/libebook/e-book-types.h
-include/evolution-data-server-1.12/libebook/e-book-view.h
-include/evolution-data-server-1.12/libebook/e-book.h
-include/evolution-data-server-1.12/libebook/e-contact.h
-include/evolution-data-server-1.12/libebook/e-destination.h
-include/evolution-data-server-1.12/libebook/e-name-western.h
-include/evolution-data-server-1.12/libebook/e-vcard.h
-include/evolution-data-server-1.12/libecal/e-cal-component.h
-include/evolution-data-server-1.12/libecal/e-cal-recur.h
-include/evolution-data-server-1.12/libecal/e-cal-time-util.h
-include/evolution-data-server-1.12/libecal/e-cal-types.h
-include/evolution-data-server-1.12/libecal/e-cal-util.h
-include/evolution-data-server-1.12/libecal/e-cal-view.h
-include/evolution-data-server-1.12/libecal/e-cal.h
-include/evolution-data-server-1.12/libedata-book/Evolution-DataServer-Addressbook.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend-cache.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend-db-cache.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend-factory.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend-sexp.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend-summary.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend-sync.h
-include/evolution-data-server-1.12/libedata-book/e-book-backend.h
-include/evolution-data-server-1.12/libedata-book/e-data-book-factory.h
-include/evolution-data-server-1.12/libedata-book/e-data-book-types.h
-include/evolution-data-server-1.12/libedata-book/e-data-book-view.h
-include/evolution-data-server-1.12/libedata-book/e-data-book.h
-include/evolution-data-server-1.12/libedata-cal/Evolution-DataServer-Calendar.h
-include/evolution-data-server-1.12/libedata-cal/e-cal-backend-cache.h
-include/evolution-data-server-1.12/libedata-cal/e-cal-backend-factory.h
-include/evolution-data-server-1.12/libedata-cal/e-cal-backend-sexp.h
-include/evolution-data-server-1.12/libedata-cal/e-cal-backend-sync.h
-include/evolution-data-server-1.12/libedata-cal/e-cal-backend-util.h
-include/evolution-data-server-1.12/libedata-cal/e-cal-backend.h
-include/evolution-data-server-1.12/libedata-cal/e-data-cal-common.h
-include/evolution-data-server-1.12/libedata-cal/e-data-cal-factory.h
-include/evolution-data-server-1.12/libedata-cal/e-data-cal-view.h
-include/evolution-data-server-1.12/libedata-cal/e-data-cal.h
-include/evolution-data-server-1.12/libedataserver/e-account-list.h
-include/evolution-data-server-1.12/libedataserver/e-account.h
-include/evolution-data-server-1.12/libedataserver/e-categories.h
-include/evolution-data-server-1.12/libedataserver/e-component-listener.h
-include/evolution-data-server-1.12/libedataserver/e-data-server-module.h
-include/evolution-data-server-1.12/libedataserver/e-data-server-util.h
-include/evolution-data-server-1.12/libedataserver/e-db3-utils.h
-include/evolution-data-server-1.12/libedataserver/e-dbhash.h
-include/evolution-data-server-1.12/libedataserver/e-file-cache.h
-include/evolution-data-server-1.12/libedataserver/e-flag.h
-include/evolution-data-server-1.12/libedataserver/e-iconv.h
-include/evolution-data-server-1.12/libedataserver/e-iterator.h
-include/evolution-data-server-1.12/libedataserver/e-list-iterator.h
-include/evolution-data-server-1.12/libedataserver/e-list.h
-include/evolution-data-server-1.12/libedataserver/e-memory.h
-include/evolution-data-server-1.12/libedataserver/e-msgport.h
-include/evolution-data-server-1.12/libedataserver/e-sexp.h
-include/evolution-data-server-1.12/libedataserver/e-source-group.h
-include/evolution-data-server-1.12/libedataserver/e-source-list.h
-include/evolution-data-server-1.12/libedataserver/e-source.h
-include/evolution-data-server-1.12/libedataserver/e-time-utils.h
-include/evolution-data-server-1.12/libedataserver/e-trie.h
-include/evolution-data-server-1.12/libedataserver/e-uid.h
-include/evolution-data-server-1.12/libedataserver/e-url.h
-include/evolution-data-server-1.12/libedataserver/e-xml-hash-utils.h
-include/evolution-data-server-1.12/libedataserver/e-xml-utils.h
-include/evolution-data-server-1.12/libedataserver/md5-utils.h
-include/evolution-data-server-1.12/libedataserverui/e-book-auth-util.h
-include/evolution-data-server-1.12/libedataserverui/e-categories-dialog.h
-include/evolution-data-server-1.12/libedataserverui/e-contact-store.h
-include/evolution-data-server-1.12/libedataserverui/e-destination-store.h
-include/evolution-data-server-1.12/libedataserverui/e-name-selector-dialog.h
-include/evolution-data-server-1.12/libedataserverui/e-name-selector-entry.h
-include/evolution-data-server-1.12/libedataserverui/e-name-selector-list.h
-include/evolution-data-server-1.12/libedataserverui/e-name-selector-model.h
-include/evolution-data-server-1.12/libedataserverui/e-name-selector.h
-include/evolution-data-server-1.12/libedataserverui/e-passwords.h
-include/evolution-data-server-1.12/libedataserverui/e-source-option-menu.h
-include/evolution-data-server-1.12/libedataserverui/e-source-selector-dialog.h
-include/evolution-data-server-1.12/libedataserverui/e-source-selector.h
-include/evolution-data-server-1.12/libedataserverui/e-tree-model-generator.h
-include/evolution-data-server-1.12/libical/ical.h
-include/evolution-data-server-1.12/libical/icalarray.h
-include/evolution-data-server-1.12/libical/icalattach.h
-include/evolution-data-server-1.12/libical/icalcalendar.h
-include/evolution-data-server-1.12/libical/icalclassify.h
-include/evolution-data-server-1.12/libical/icalcluster.h
-include/evolution-data-server-1.12/libical/icalcomponent.h
-include/evolution-data-server-1.12/libical/icalderivedparameter.h
-include/evolution-data-server-1.12/libical/icalderivedproperty.h
-include/evolution-data-server-1.12/libical/icalderivedvalue.h
-include/evolution-data-server-1.12/libical/icaldirset.h
-include/evolution-data-server-1.12/libical/icaldirsetimpl.h
-include/evolution-data-server-1.12/libical/icalduration.h
-include/evolution-data-server-1.12/libical/icalenums.h
-include/evolution-data-server-1.12/libical/icalerror.h
-include/evolution-data-server-1.12/libical/icalfileset.h
-include/evolution-data-server-1.12/libical/icalfilesetimpl.h
-include/evolution-data-server-1.12/libical/icalgauge.h
-include/evolution-data-server-1.12/libical/icalgaugeimpl.h
-include/evolution-data-server-1.12/libical/icallangbind.h
-include/evolution-data-server-1.12/libical/icalmemory.h
-include/evolution-data-server-1.12/libical/icalmessage.h
-include/evolution-data-server-1.12/libical/icalmime.h
-include/evolution-data-server-1.12/libical/icalparameter.h
-include/evolution-data-server-1.12/libical/icalparser.h
-include/evolution-data-server-1.12/libical/icalperiod.h
-include/evolution-data-server-1.12/libical/icalproperty.h
-include/evolution-data-server-1.12/libical/icalrecur.h
-include/evolution-data-server-1.12/libical/icalrestriction.h
-include/evolution-data-server-1.12/libical/icalset.h
-include/evolution-data-server-1.12/libical/icalspanlist.h
-include/evolution-data-server-1.12/libical/icalss.h
-include/evolution-data-server-1.12/libical/icalssyacc.h
-include/evolution-data-server-1.12/libical/icaltime.h
-include/evolution-data-server-1.12/libical/icaltimezone.h
-include/evolution-data-server-1.12/libical/icaltypes.h
-include/evolution-data-server-1.12/libical/icaltz-util.h
-include/evolution-data-server-1.12/libical/icalvalue.h
-include/evolution-data-server-1.12/libical/icalvcal.h
-include/evolution-data-server-1.12/libical/port.h
-include/evolution-data-server-1.12/libical/pvl.h
-include/evolution-data-server-1.12/libical/sspm.h
-include/evolution-data-server-1.12/libical/vcaltmp.h
-include/evolution-data-server-1.12/libical/vcc.h
-include/evolution-data-server-1.12/libical/vobject.h
+@comment $NetBSD: PLIST,v 1.20 2008/04/15 17:45:38 drochner Exp $
+include/evolution-data-server-2.22/camel/broken-date-parser.h
+include/evolution-data-server-2.22/camel/camel-address.h
+include/evolution-data-server-2.22/camel/camel-arg.h
+include/evolution-data-server-2.22/camel/camel-block-file.h
+include/evolution-data-server-2.22/camel/camel-certdb.h
+include/evolution-data-server-2.22/camel/camel-charset-map.h
+include/evolution-data-server-2.22/camel/camel-cipher-context.h
+include/evolution-data-server-2.22/camel/camel-data-cache.h
+include/evolution-data-server-2.22/camel/camel-data-wrapper.h
+include/evolution-data-server-2.22/camel/camel-debug.h
+include/evolution-data-server-2.22/camel/camel-digest-folder.h
+include/evolution-data-server-2.22/camel/camel-digest-store.h
+include/evolution-data-server-2.22/camel/camel-digest-summary.h
+include/evolution-data-server-2.22/camel/camel-disco-diary.h
+include/evolution-data-server-2.22/camel/camel-disco-folder.h
+include/evolution-data-server-2.22/camel/camel-disco-store.h
+include/evolution-data-server-2.22/camel/camel-exception-list.def
+include/evolution-data-server-2.22/camel/camel-exception.h
+include/evolution-data-server-2.22/camel/camel-file-utils.h
+include/evolution-data-server-2.22/camel/camel-filter-driver.h
+include/evolution-data-server-2.22/camel/camel-filter-search.h
+include/evolution-data-server-2.22/camel/camel-folder-search.h
+include/evolution-data-server-2.22/camel/camel-folder-summary.h
+include/evolution-data-server-2.22/camel/camel-folder-thread.h
+include/evolution-data-server-2.22/camel/camel-folder.h
+include/evolution-data-server-2.22/camel/camel-gpg-context.h
+include/evolution-data-server-2.22/camel/camel-html-parser.h
+include/evolution-data-server-2.22/camel/camel-http-stream.h
+include/evolution-data-server-2.22/camel/camel-i18n.h
+include/evolution-data-server-2.22/camel/camel-iconv.h
+include/evolution-data-server-2.22/camel/camel-index.h
+include/evolution-data-server-2.22/camel/camel-internet-address.h
+include/evolution-data-server-2.22/camel/camel-junk-plugin.h
+include/evolution-data-server-2.22/camel/camel-list-utils.h
+include/evolution-data-server-2.22/camel/camel-lock-client.h
+include/evolution-data-server-2.22/camel/camel-lock-helper.h
+include/evolution-data-server-2.22/camel/camel-lock.h
+include/evolution-data-server-2.22/camel/camel-medium.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-basic.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-bestenc.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-canon.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-charset.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-crlf.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-enriched.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-from.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-gzip.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-html.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-index.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-linewrap.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-pgp.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-save.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-tohtml.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-windows.h
+include/evolution-data-server-2.22/camel/camel-mime-filter-yenc.h
+include/evolution-data-server-2.22/camel/camel-mime-filter.h
+include/evolution-data-server-2.22/camel/camel-mime-message.h
+include/evolution-data-server-2.22/camel/camel-mime-parser.h
+include/evolution-data-server-2.22/camel/camel-mime-part-utils.h
+include/evolution-data-server-2.22/camel/camel-mime-part.h
+include/evolution-data-server-2.22/camel/camel-mime-utils.h
+include/evolution-data-server-2.22/camel/camel-movemail.h
+include/evolution-data-server-2.22/camel/camel-multipart-encrypted.h
+include/evolution-data-server-2.22/camel/camel-multipart-signed.h
+include/evolution-data-server-2.22/camel/camel-multipart.h
+include/evolution-data-server-2.22/camel/camel-net-utils.h
+include/evolution-data-server-2.22/camel/camel-news-address.h
+include/evolution-data-server-2.22/camel/camel-nntp-address.h
+include/evolution-data-server-2.22/camel/camel-object.h
+include/evolution-data-server-2.22/camel/camel-offline-folder.h
+include/evolution-data-server-2.22/camel/camel-offline-journal.h
+include/evolution-data-server-2.22/camel/camel-offline-store.h
+include/evolution-data-server-2.22/camel/camel-operation.h
+include/evolution-data-server-2.22/camel/camel-partition-table.h
+include/evolution-data-server-2.22/camel/camel-process.h
+include/evolution-data-server-2.22/camel/camel-provider.h
+include/evolution-data-server-2.22/camel/camel-sasl-anonymous.h
+include/evolution-data-server-2.22/camel/camel-sasl-cram-md5.h
+include/evolution-data-server-2.22/camel/camel-sasl-digest-md5.h
+include/evolution-data-server-2.22/camel/camel-sasl-gssapi.h
+include/evolution-data-server-2.22/camel/camel-sasl-kerberos4.h
+include/evolution-data-server-2.22/camel/camel-sasl-login.h
+include/evolution-data-server-2.22/camel/camel-sasl-ntlm.h
+include/evolution-data-server-2.22/camel/camel-sasl-plain.h
+include/evolution-data-server-2.22/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server-2.22/camel/camel-sasl.h
+include/evolution-data-server-2.22/camel/camel-search-private.h
+include/evolution-data-server-2.22/camel/camel-seekable-stream.h
+include/evolution-data-server-2.22/camel/camel-seekable-substream.h
+include/evolution-data-server-2.22/camel/camel-service.h
+include/evolution-data-server-2.22/camel/camel-session.h
+include/evolution-data-server-2.22/camel/camel-smime-context.h
+include/evolution-data-server-2.22/camel/camel-store-summary.h
+include/evolution-data-server-2.22/camel/camel-store.h
+include/evolution-data-server-2.22/camel/camel-stream-buffer.h
+include/evolution-data-server-2.22/camel/camel-stream-filter.h
+include/evolution-data-server-2.22/camel/camel-stream-fs.h
+include/evolution-data-server-2.22/camel/camel-stream-mem.h
+include/evolution-data-server-2.22/camel/camel-stream-null.h
+include/evolution-data-server-2.22/camel/camel-stream-process.h
+include/evolution-data-server-2.22/camel/camel-stream-vfs.h
+include/evolution-data-server-2.22/camel/camel-stream.h
+include/evolution-data-server-2.22/camel/camel-string-utils.h
+include/evolution-data-server-2.22/camel/camel-tcp-stream-raw.h
+include/evolution-data-server-2.22/camel/camel-tcp-stream-ssl.h
+include/evolution-data-server-2.22/camel/camel-tcp-stream.h
+include/evolution-data-server-2.22/camel/camel-text-index.h
+include/evolution-data-server-2.22/camel/camel-transport.h
+include/evolution-data-server-2.22/camel/camel-types.h
+include/evolution-data-server-2.22/camel/camel-uid-cache.h
+include/evolution-data-server-2.22/camel/camel-url-scanner.h
+include/evolution-data-server-2.22/camel/camel-url.h
+include/evolution-data-server-2.22/camel/camel-utf8.h
+include/evolution-data-server-2.22/camel/camel-vee-folder.h
+include/evolution-data-server-2.22/camel/camel-vee-store.h
+include/evolution-data-server-2.22/camel/camel-vee-summary.h
+include/evolution-data-server-2.22/camel/camel-vtrash-folder.h
+include/evolution-data-server-2.22/camel/camel.h
+include/evolution-data-server-2.22/exchange/e-folder-exchange.h
+include/evolution-data-server-2.22/exchange/e-folder.h
+include/evolution-data-server-2.22/exchange/e-storage.h
+include/evolution-data-server-2.22/exchange/e2k-autoconfig.h
+include/evolution-data-server-2.22/exchange/e2k-context.h
+include/evolution-data-server-2.22/exchange/e2k-freebusy.h
+include/evolution-data-server-2.22/exchange/e2k-global-catalog-ldap.h
+include/evolution-data-server-2.22/exchange/e2k-global-catalog.h
+include/evolution-data-server-2.22/exchange/e2k-http-utils.h
+include/evolution-data-server-2.22/exchange/e2k-marshal.h
+include/evolution-data-server-2.22/exchange/e2k-operation.h
+include/evolution-data-server-2.22/exchange/e2k-properties.h
+include/evolution-data-server-2.22/exchange/e2k-propnames.h
+include/evolution-data-server-2.22/exchange/e2k-restriction.h
+include/evolution-data-server-2.22/exchange/e2k-result.h
+include/evolution-data-server-2.22/exchange/e2k-security-descriptor.h
+include/evolution-data-server-2.22/exchange/e2k-sid.h
+include/evolution-data-server-2.22/exchange/e2k-types.h
+include/evolution-data-server-2.22/exchange/e2k-uri.h
+include/evolution-data-server-2.22/exchange/e2k-utils.h
+include/evolution-data-server-2.22/exchange/e2k-validate.h
+include/evolution-data-server-2.22/exchange/e2k-xml-utils.h
+include/evolution-data-server-2.22/exchange/exchange-account.h
+include/evolution-data-server-2.22/exchange/exchange-constants.h
+include/evolution-data-server-2.22/exchange/exchange-esource.h
+include/evolution-data-server-2.22/exchange/exchange-folder-size.h
+include/evolution-data-server-2.22/exchange/exchange-hierarchy-foreign.h
+include/evolution-data-server-2.22/exchange/exchange-hierarchy-somedav.h
+include/evolution-data-server-2.22/exchange/exchange-hierarchy-webdav.h
+include/evolution-data-server-2.22/exchange/exchange-hierarchy.h
+include/evolution-data-server-2.22/exchange/exchange-oof.h
+include/evolution-data-server-2.22/exchange/exchange-types.h
+include/evolution-data-server-2.22/exchange/mapi.h
+include/evolution-data-server-2.22/google/gdata-google/gdata-google-service.h
+include/evolution-data-server-2.22/google/gdata/gdata-entry.h
+include/evolution-data-server-2.22/google/gdata/gdata-feed.h
+include/evolution-data-server-2.22/google/gdata/gdata-service-iface.h
+include/evolution-data-server-2.22/groupwise/e-gw-connection.h
+include/evolution-data-server-2.22/groupwise/e-gw-container.h
+include/evolution-data-server-2.22/groupwise/e-gw-filter.h
+include/evolution-data-server-2.22/groupwise/e-gw-item.h
+include/evolution-data-server-2.22/groupwise/e-gw-message.h
+include/evolution-data-server-2.22/groupwise/e-gw-proxy.h
+include/evolution-data-server-2.22/groupwise/e-gw-recur-utils.h
+include/evolution-data-server-2.22/groupwise/e-gw-sendoptions.h
+include/evolution-data-server-2.22/groupwise/soup-soap-message.h
+include/evolution-data-server-2.22/groupwise/soup-soap-response.h
+include/evolution-data-server-2.22/libebook/e-address-western.h
+include/evolution-data-server-2.22/libebook/e-book-query.h
+include/evolution-data-server-2.22/libebook/e-book-types.h
+include/evolution-data-server-2.22/libebook/e-book-view.h
+include/evolution-data-server-2.22/libebook/e-book.h
+include/evolution-data-server-2.22/libebook/e-contact.h
+include/evolution-data-server-2.22/libebook/e-destination.h
+include/evolution-data-server-2.22/libebook/e-name-western.h
+include/evolution-data-server-2.22/libebook/e-vcard.h
+include/evolution-data-server-2.22/libecal/e-cal-component.h
+include/evolution-data-server-2.22/libecal/e-cal-recur.h
+include/evolution-data-server-2.22/libecal/e-cal-time-util.h
+include/evolution-data-server-2.22/libecal/e-cal-types.h
+include/evolution-data-server-2.22/libecal/e-cal-util.h
+include/evolution-data-server-2.22/libecal/e-cal-view.h
+include/evolution-data-server-2.22/libecal/e-cal.h
+include/evolution-data-server-2.22/libedata-book/Evolution-DataServer-Addressbook.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend-cache.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend-db-cache.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend-factory.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend-sexp.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend-summary.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend-sync.h
+include/evolution-data-server-2.22/libedata-book/e-book-backend.h
+include/evolution-data-server-2.22/libedata-book/e-data-book-factory.h
+include/evolution-data-server-2.22/libedata-book/e-data-book-types.h
+include/evolution-data-server-2.22/libedata-book/e-data-book-view.h
+include/evolution-data-server-2.22/libedata-book/e-data-book.h
+include/evolution-data-server-2.22/libedata-cal/Evolution-DataServer-Calendar.h
+include/evolution-data-server-2.22/libedata-cal/e-cal-backend-cache.h
+include/evolution-data-server-2.22/libedata-cal/e-cal-backend-factory.h
+include/evolution-data-server-2.22/libedata-cal/e-cal-backend-sexp.h
+include/evolution-data-server-2.22/libedata-cal/e-cal-backend-sync.h
+include/evolution-data-server-2.22/libedata-cal/e-cal-backend-util.h
+include/evolution-data-server-2.22/libedata-cal/e-cal-backend.h
+include/evolution-data-server-2.22/libedata-cal/e-data-cal-common.h
+include/evolution-data-server-2.22/libedata-cal/e-data-cal-factory.h
+include/evolution-data-server-2.22/libedata-cal/e-data-cal-view.h
+include/evolution-data-server-2.22/libedata-cal/e-data-cal.h
+include/evolution-data-server-2.22/libedataserver/e-account-list.h
+include/evolution-data-server-2.22/libedataserver/e-account.h
+include/evolution-data-server-2.22/libedataserver/e-categories.h
+include/evolution-data-server-2.22/libedataserver/e-component-listener.h
+include/evolution-data-server-2.22/libedataserver/e-data-server-module.h
+include/evolution-data-server-2.22/libedataserver/e-data-server-util.h
+include/evolution-data-server-2.22/libedataserver/e-db3-utils.h
+include/evolution-data-server-2.22/libedataserver/e-dbhash.h
+include/evolution-data-server-2.22/libedataserver/e-file-cache.h
+include/evolution-data-server-2.22/libedataserver/e-flag.h
+include/evolution-data-server-2.22/libedataserver/e-iconv.h
+include/evolution-data-server-2.22/libedataserver/e-iterator.h
+include/evolution-data-server-2.22/libedataserver/e-list-iterator.h
+include/evolution-data-server-2.22/libedataserver/e-list.h
+include/evolution-data-server-2.22/libedataserver/e-memory.h
+include/evolution-data-server-2.22/libedataserver/e-msgport.h
+include/evolution-data-server-2.22/libedataserver/e-sexp.h
+include/evolution-data-server-2.22/libedataserver/e-source-group.h
+include/evolution-data-server-2.22/libedataserver/e-source-list.h
+include/evolution-data-server-2.22/libedataserver/e-source.h
+include/evolution-data-server-2.22/libedataserver/e-time-utils.h
+include/evolution-data-server-2.22/libedataserver/e-trie.h
+include/evolution-data-server-2.22/libedataserver/e-uid.h
+include/evolution-data-server-2.22/libedataserver/e-url.h
+include/evolution-data-server-2.22/libedataserver/e-xml-hash-utils.h
+include/evolution-data-server-2.22/libedataserver/e-xml-utils.h
+include/evolution-data-server-2.22/libedataserver/md5-utils.h
+include/evolution-data-server-2.22/libedataserverui/e-book-auth-util.h
+include/evolution-data-server-2.22/libedataserverui/e-categories-dialog.h
+include/evolution-data-server-2.22/libedataserverui/e-cell-renderer-color.h
+include/evolution-data-server-2.22/libedataserverui/e-contact-store.h
+include/evolution-data-server-2.22/libedataserverui/e-destination-store.h
+include/evolution-data-server-2.22/libedataserverui/e-name-selector-dialog.h
+include/evolution-data-server-2.22/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-2.22/libedataserverui/e-name-selector-list.h
+include/evolution-data-server-2.22/libedataserverui/e-name-selector-model.h
+include/evolution-data-server-2.22/libedataserverui/e-name-selector.h
+include/evolution-data-server-2.22/libedataserverui/e-passwords.h
+include/evolution-data-server-2.22/libedataserverui/e-source-combo-box.h
+include/evolution-data-server-2.22/libedataserverui/e-source-option-menu.h
+include/evolution-data-server-2.22/libedataserverui/e-source-selector-dialog.h
+include/evolution-data-server-2.22/libedataserverui/e-source-selector.h
+include/evolution-data-server-2.22/libedataserverui/e-tree-model-generator.h
+include/evolution-data-server-2.22/libical/ical.h
+include/evolution-data-server-2.22/libical/icalarray.h
+include/evolution-data-server-2.22/libical/icalattach.h
+include/evolution-data-server-2.22/libical/icalcalendar.h
+include/evolution-data-server-2.22/libical/icalclassify.h
+include/evolution-data-server-2.22/libical/icalcluster.h
+include/evolution-data-server-2.22/libical/icalcomponent.h
+include/evolution-data-server-2.22/libical/icalderivedparameter.h
+include/evolution-data-server-2.22/libical/icalderivedproperty.h
+include/evolution-data-server-2.22/libical/icalderivedvalue.h
+include/evolution-data-server-2.22/libical/icaldirset.h
+include/evolution-data-server-2.22/libical/icaldirsetimpl.h
+include/evolution-data-server-2.22/libical/icalduration.h
+include/evolution-data-server-2.22/libical/icalenums.h
+include/evolution-data-server-2.22/libical/icalerror.h
+include/evolution-data-server-2.22/libical/icalfileset.h
+include/evolution-data-server-2.22/libical/icalfilesetimpl.h
+include/evolution-data-server-2.22/libical/icalgauge.h
+include/evolution-data-server-2.22/libical/icalgaugeimpl.h
+include/evolution-data-server-2.22/libical/icallangbind.h
+include/evolution-data-server-2.22/libical/icalmemory.h
+include/evolution-data-server-2.22/libical/icalmessage.h
+include/evolution-data-server-2.22/libical/icalmime.h
+include/evolution-data-server-2.22/libical/icalparameter.h
+include/evolution-data-server-2.22/libical/icalparser.h
+include/evolution-data-server-2.22/libical/icalperiod.h
+include/evolution-data-server-2.22/libical/icalproperty.h
+include/evolution-data-server-2.22/libical/icalrecur.h
+include/evolution-data-server-2.22/libical/icalrestriction.h
+include/evolution-data-server-2.22/libical/icalset.h
+include/evolution-data-server-2.22/libical/icalspanlist.h
+include/evolution-data-server-2.22/libical/icalss.h
+include/evolution-data-server-2.22/libical/icalssyacc.h
+include/evolution-data-server-2.22/libical/icaltime.h
+include/evolution-data-server-2.22/libical/icaltimezone.h
+include/evolution-data-server-2.22/libical/icaltypes.h
+include/evolution-data-server-2.22/libical/icaltz-util.h
+include/evolution-data-server-2.22/libical/icalvalue.h
+include/evolution-data-server-2.22/libical/icalvcal.h
+include/evolution-data-server-2.22/libical/port.h
+include/evolution-data-server-2.22/libical/pvl.h
+include/evolution-data-server-2.22/libical/sspm.h
+include/evolution-data-server-2.22/libical/vcaltmp.h
+include/evolution-data-server-2.22/libical/vcc.h
+include/evolution-data-server-2.22/libical/vobject.h
 lib/bonobo/servers/GNOME_Evolution_DataServer_1.2.server
 lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls
@@ -306,6 +314,7 @@ lib/evolution-data-server-1.2/extensions/libebookbackendvcf.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
@@ -319,6 +328,8 @@ 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
 lib/pkgconfig/camel-provider-1.2.pc
 lib/pkgconfig/evolution-data-server-1.2.pc
@@ -330,13 +341,15 @@ 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-1.12
-share/evolution-data-server-1.12/evolutionperson.schema
-share/evolution-data-server-1.12/glade/e-categories-dialog.glade
-share/evolution-data-server-1.12/glade/e-name-selector-dialog.glade
-share/evolution-data-server-1.12/weather/Locations.xml
+libexec/evolution-data-server-2.22
+share/evolution-data-server-2.22/evolutionperson.schema
+share/evolution-data-server-2.22/glade/e-categories-dialog.glade
+share/evolution-data-server-2.22/glade/e-name-selector-dialog.glade
+share/evolution-data-server-2.22/weather/Locations.xml
 share/gtk-doc/html/camel/Addresses.html
 share/gtk-doc/html/camel/ClassTree.html
 share/gtk-doc/html/camel/Crypto.html
@@ -551,6 +564,7 @@ share/gtk-doc/html/libedataserverui/ENameSelectorDialog.html
 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
@@ -561,6 +575,7 @@ 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-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
@@ -572,82 +587,84 @@ 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-1.12.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/as/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/oc/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/te/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-1.12.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-1.12.mo
+share/locale/am/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ar/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/az/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/be/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/bg/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/bn/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ca/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/cs/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/cy/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/da/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/de/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/el/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/en_AU/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/en_CA/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/en_GB/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/es/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/et/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/eu/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/fa/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/fi/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/fr/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ga/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/gl/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/gu/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/he/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/hr/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/hu/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/id/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/is/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/it/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ja/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/kn/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ko/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/lt/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/lv/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/mn/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/mr/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ms/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/nb/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ne/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/nl/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/nn/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/or/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/pa/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/pl/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/pt/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ro/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ru/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/rw/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/si/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/sk/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/sl/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/sq/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/sr/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/sv/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/ta/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/th/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/tr/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/uk/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/vi/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/xh/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-data-server-2.22.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-data-server-2.22.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
@@ -677,21 +694,24 @@ share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 @dirrm share/gtk-doc/html/libecal
 @dirrm share/gtk-doc/html/libebook
 @dirrm share/gtk-doc/html/camel
-@dirrm share/evolution-data-server-1.12/weather
-@dirrm share/evolution-data-server-1.12/glade
-@dirrm share/evolution-data-server-1.12
+@dirrm share/evolution-data-server-2.22/weather
+@dirrm share/evolution-data-server-2.22/glade
+@dirrm share/evolution-data-server-2.22
 @dirrm lib/evolution-data-server-1.2/extensions
 @dirrm lib/evolution-data-server-1.2/camel-providers
 @dirrm lib/evolution-data-server-1.2
 @comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/evolution-data-server-1.12/libical
-@dirrm include/evolution-data-server-1.12/libedataserverui
-@dirrm include/evolution-data-server-1.12/libedataserver
-@dirrm include/evolution-data-server-1.12/libedata-cal
-@dirrm include/evolution-data-server-1.12/libedata-book
-@dirrm include/evolution-data-server-1.12/libecal
-@dirrm include/evolution-data-server-1.12/libebook
-@dirrm include/evolution-data-server-1.12/groupwise
-@dirrm include/evolution-data-server-1.12/exchange
-@dirrm include/evolution-data-server-1.12/camel
-@dirrm include/evolution-data-server-1.12
+@dirrm include/evolution-data-server-2.22/libical
+@dirrm include/evolution-data-server-2.22/libedataserverui
+@dirrm include/evolution-data-server-2.22/libedataserver
+@dirrm include/evolution-data-server-2.22/libedata-cal
+@dirrm include/evolution-data-server-2.22/libedata-book
+@dirrm include/evolution-data-server-2.22/libecal
+@dirrm include/evolution-data-server-2.22/libebook
+@dirrm include/evolution-data-server-2.22/groupwise
+@dirrm include/evolution-data-server-2.22/google/gdata-google
+@dirrm include/evolution-data-server-2.22/google/gdata
+@dirrm include/evolution-data-server-2.22/google
+@dirrm include/evolution-data-server-2.22/exchange
+@dirrm include/evolution-data-server-2.22/camel
+@dirrm include/evolution-data-server-2.22
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 1761b60c1a6..7db7d8fa401 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2008/03/06 14:53:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2008/04/15 17:45:38 drochner Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=	${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+
@@ -27,5 +27,6 @@ PRINT_PLIST_AWK+=/^@dirrm lib\/evolution-data-server-1.2$$/ \
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index 88c27fb23e5..2da6373bfe9 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.43 2008/01/14 12:50:16 drochner Exp $
+$NetBSD: distinfo,v 1.44 2008/04/15 17:45:38 drochner Exp $
 
-SHA1 (evolution-data-server-1.12.3.tar.bz2) = 12b8b23fb77ff6436def3cc5ea472886c8e0350e
-RMD160 (evolution-data-server-1.12.3.tar.bz2) = c7102c38af4888f3f8933c9d28981d1809d504f8
-Size (evolution-data-server-1.12.3.tar.bz2) = 7447166 bytes
-SHA1 (patch-ab) = b3d5e176aa792c5a31558f733f715ec237aa5af4
+SHA1 (evolution-data-server-2.22.1.tar.bz2) = b78f6865db1358c1dbece6c09f92e9ba6a523d6d
+RMD160 (evolution-data-server-2.22.1.tar.bz2) = d0082d45c40d8a76897343778dcca00df4f511e6
+Size (evolution-data-server-2.22.1.tar.bz2) = 7602166 bytes
+SHA1 (patch-ab) = c8efcca7debbbd9b53a1282e10d584a7aab0ea8b
 SHA1 (patch-af) = 1e458720684cfe3823b3b73665044336588c4620
 SHA1 (patch-ak) = e363f45994be14f7c1f0cf6cfd35e66646c69a51
 SHA1 (patch-ao) = c98089bab9110eb29339e529fb88b01dbe454623
 SHA1 (patch-aq) = 375d592b72f59fa70160bf23aa260338d350c517
 SHA1 (patch-ar) = b6b92b068f94954d435cff11543a4de7d07712ac
-SHA1 (patch-as) = 6aca887951562eb26d2e3de0ef0f0d909c0ce886
+SHA1 (patch-as) = ce5e7768c421abdafbcc6937da7c09cf9fba683e
 SHA1 (patch-at) = 2b94015299ab7a97aca4c9edda8dd3794b07437b
 SHA1 (patch-au) = 6b6ad9dd3120924e932f893dbb396e05e4c44fb4
diff --git a/mail/evolution-data-server/patches/patch-ab b/mail/evolution-data-server/patches/patch-ab
index 2d5f7d6409d..db329380b7a 100644
--- a/mail/evolution-data-server/patches/patch-ab
+++ b/mail/evolution-data-server/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2007/07/18 12:45:40 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2008/04/15 17:45:38 drochner Exp $
 
---- calendar/libedata-cal/Makefile.in.orig	2007-07-17 13:01:35.000000000 +0200
+--- calendar/libedata-cal/Makefile.in.orig	2008-03-09 18:55:15.000000000 +0100
 +++ calendar/libedata-cal/Makefile.in
-@@ -63,9 +63,7 @@ am__DEPENDENCIES_1 =
- libedata_cal_1_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -60,9 +60,7 @@ libedata_cal_1_2_la_DEPENDENCIES =  \
  	$(top_builddir)/calendar/libecal/libecal-1.2.la \
- 	$(top_builddir)/libedataserver/libedataserver-1.2.la
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+ 	$(am__DEPENDENCIES_1)
 -am__objects_1 = Evolution-DataServer-Calendar-common.lo \
 -	Evolution-DataServer-Calendar-skels.lo \
 -	Evolution-DataServer-Calendar-stubs.lo
diff --git a/mail/evolution-data-server/patches/patch-as b/mail/evolution-data-server/patches/patch-as
index a3754ba4d3f..f9eb0f79684 100644
--- a/mail/evolution-data-server/patches/patch-as
+++ b/mail/evolution-data-server/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.3 2007/11/03 21:51:29 drochner Exp $
+$NetBSD: patch-as,v 1.4 2008/04/15 17:45:38 drochner Exp $
 
---- calendar/libical/src/libical/icaltz-util.c.orig	2007-10-12 08:31:10.000000000 +0200
+--- calendar/libical/src/libical/icaltz-util.c.orig	2008-01-23 12:16:42.000000000 +0100
 +++ calendar/libical/src/libical/icaltz-util.c
-@@ -21,12 +21,14 @@
+@@ -21,6 +21,7 @@
   */
  
  #include <string.h>
@@ -10,14 +10,15 @@ $NetBSD: patch-as,v 1.3 2007/11/03 21:51:29 drochner Exp $
  #if defined(sun) && defined(__SVR4)
  #include <sys/byteorder.h>
  #else
- #include <byteswap.h>
+@@ -34,6 +35,7 @@
  #include <endian.h>
  #endif
+ #endif
 +#endif
  #include <limits.h>
  #include <time.h>
  #include <stdlib.h>
-@@ -78,6 +80,7 @@ typedef struct
+@@ -85,6 +87,7 @@ typedef struct
  static int
  decode (const void *ptr)
  {
@@ -25,7 +26,7 @@ $NetBSD: patch-as,v 1.3 2007/11/03 21:51:29 drochner Exp $
  #if defined(sun) && defined(__SVR4)
      if (sizeof (int) == 4)
  #ifdef _BIG_ENDIAN
-@@ -92,9 +95,10 @@ decode (const void *ptr)
+@@ -99,9 +102,10 @@ decode (const void *ptr)
          return bswap_32 (*(const int *) ptr);
  #endif
  	else