Update evolution-data-server to 3.22.7

Update evolution to 3.22.6
Update evolution-ews to 3.22.6

 * all: record missing dependancies.
 * eds: libsoup-gnome is not needed replace it with libsoup.
 * eds: merge the compiler USES into the main USES line, it is always
        needed. Remove the related text.
 * evo: move the canberra-gtk3 dependancy to the canberra option
 * evo-ews: drop google doc link in pkg-descr.

Obtained from:	gnome devel repo

3 files changed, 34 insertions, 21 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index e8bdbd36efb1..5d8f2af466f4 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	3.18.5
-PORTREVISION=	7
+PORTVERSION=	3.22.7
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,9 +13,9 @@ COMMENT=	Data backends for the Evolution integrated mail/PIM suite
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gcr>=3.11:security/gcr \
-		vapigen:lang/vala
-LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libgcr-base-3.so:security/gcr \
 		liboauth.so:net/liboauth \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgdata.so:devel/libgdata \
@@ -24,18 +23,19 @@ LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
 		libicui18n.so:devel/icu \
 		libnss3.so:security/nss \
 		libtasn1.so:security/libtasn1 \
+		libicudata.so:devel/icu \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libjson-glib-1.0.so:devel/json-glib \
+		libp11-kit.so:security/p11-kit \
+		libnspr4.so:devel/nspr \
 		libsecret-1.so:security/libsecret
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bdb:5 bison gettext gmake gnome gperf libtool pathfix pkgconfig \
+USES=		bdb:5 bison compiler:c++11-lib gettext gmake gnome gperf \
+		iconv:wchar_t libtool localbase pathfix pkgconfig ssl \
 		sqlite tar:xz
-# Unbreak mail/evolution with webkit-gtk3 on FreeBSD 8 and 9.  Normally
-# this change would be done there, but it is not a C++ application, so it
-# does not link directly to libstdc++ and adding the libstdc++ rpath to
-# the executable does not work at runtime.
-USES+=		compiler:c++11-lib
-USE_GNOME=	gtk30 intltool introspection:build libxml2
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -45,8 +45,7 @@ CONFIGURE_ARGS=	--enable-static \
 		--enable-vala-bindings \
 		--disable-gtk-doc \
 		--with-libdb=${LOCALBASE}
-CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.Evolution.DefaultSources.gschema.xml \
@@ -56,7 +55,7 @@ GLIB_SCHEMAS=	org.gnome.Evolution.DefaultSources.gschema.xml \
 		org.gnome.evolution-data-server.gschema.xml \
 		org.gnome.evolution.shell.network-config.gschema.xml
 
-PLIST_SUB=	VERSION="3.18" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="3.22" EVO_VERSION="1.2"
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	WEATHER KERBEROS
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 1f33e213fdcf..dc93873de246 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/evolution-data-server-3.18.5.tar.xz) = a897c789925e86df31a1c78212b431cca13dc4d5a3d87e1fb3d507df3994e8e1
-SIZE (gnome3/evolution-data-server-3.18.5.tar.xz) = 5414416
+TIMESTAMP = 1494102880
+SHA256 (gnome3/evolution-data-server-3.22.7.tar.xz) = 43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203
+SIZE (gnome3/evolution-data-server-3.22.7.tar.xz) = 5564924
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index c30bd73ee985..50b0525974a0 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -213,6 +213,7 @@ include/evolution-data-server/libedataserver/e-gdbus-templates.h
 include/evolution-data-server/libedataserver/e-iterator.h
 include/evolution-data-server/libedataserver/e-list-iterator.h
 include/evolution-data-server/libedataserver/e-list.h
+include/evolution-data-server/libedataserver/e-network-monitor.h
 include/evolution-data-server/libedataserver/e-memory.h
 include/evolution-data-server/libedataserver/e-module.h
 include/evolution-data-server/libedataserver/e-operation-pool.h
@@ -230,6 +231,7 @@ include/evolution-data-server/libedataserver/e-source-calendar.h
 include/evolution-data-server/libedataserver/e-source-camel.h
 include/evolution-data-server/libedataserver/e-source-collection.h
 include/evolution-data-server/libedataserver/e-source-contacts.h
+include/evolution-data-server/libedataserver/e-source-credentials-provider-impl-google.h
 include/evolution-data-server/libedataserver/e-source-credentials-provider-impl-password.h
 include/evolution-data-server/libedataserver/e-source-credentials-provider-impl.h
 include/evolution-data-server/libedataserver/e-source-credentials-provider.h
@@ -270,6 +272,7 @@ include/evolution-data-server/libedataserver/eds-version.h
 include/evolution-data-server/libedataserver/libedataserver.h
 include/evolution-data-server/libedataserverui/e-cell-renderer-color.h
 include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-password.h
+include/evolution-data-server/libedataserverui/e-credentials-prompter-impl-google.h
 include/evolution-data-server/libedataserverui/e-credentials-prompter-impl.h
 include/evolution-data-server/libedataserverui/e-credentials-prompter.h
 include/evolution-data-server/libedataserverui/e-trust-prompt.h
@@ -335,8 +338,8 @@ lib/evolution-data-server/registry-modules/module-yahoo-backend.a
 lib/evolution-data-server/registry-modules/module-yahoo-backend.so
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.54
-lib/libcamel-%%EVO_VERSION%%.so.54.0.0
+lib/libcamel-%%EVO_VERSION%%.so.59
+lib/libcamel-%%EVO_VERSION%%.so.59.0.0
 lib/libebackend-%%EVO_VERSION%%.a
 lib/libebackend-%%EVO_VERSION%%.so
 lib/libebackend-%%EVO_VERSION%%.so.10
@@ -363,8 +366,8 @@ lib/libedata-cal-%%EVO_VERSION%%.so.28
 lib/libedata-cal-%%EVO_VERSION%%.so.28.0.0
 lib/libedataserver-%%EVO_VERSION%%.a
 lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.21
-lib/libedataserver-%%EVO_VERSION%%.so.21.0.0
+lib/libedataserver-%%EVO_VERSION%%.so.22
+lib/libedataserver-%%EVO_VERSION%%.so.22.0.0
 lib/libedataserverui-%%EVO_VERSION%%.a
 lib/libedataserverui-%%EVO_VERSION%%.so
 lib/libedataserverui-%%EVO_VERSION%%.so.1
@@ -372,6 +375,10 @@ lib/libedataserverui-%%EVO_VERSION%%.so.1.0.0
 lib/girepository-1.0/EBook-%%EVO_VERSION%%.typelib
 lib/girepository-1.0/EBookContacts-%%EVO_VERSION%%.typelib
 lib/girepository-1.0/EDataServer-%%EVO_VERSION%%.typelib
+lib/systemd/user/evolution-addressbook-factory.service
+lib/systemd/user/evolution-calendar-factory.service
+lib/systemd/user/evolution-source-registry.service
+lib/systemd/user/evolution-user-prompter.service
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
@@ -383,6 +390,9 @@ libdata/pkgconfig/libedata-cal-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libedataserver-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libedataserverui-%%EVO_VERSION%%.pc
 libexec/camel-index-control-%%EVO_VERSION%%
+libexec/camel-gpg-photo-saver
+libexec/evolution-data-server/addressbook-export
+libexec/evolution-data-server/csv2vcard
 @(,mail,2755) libexec/camel-lock-helper-%%EVO_VERSION%%
 libexec/evolution-addressbook-factory
 libexec/evolution-addressbook-factory-subprocess
@@ -397,6 +407,7 @@ share/dbus-1/services/org.gnome.evolution.dataserver.AddressBook.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Sources.service
 share/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter.service
+share/gir-1.0/Camel-%%EVO_VERSION%%.gir
 share/gir-1.0/EBook-%%EVO_VERSION%%.gir
 share/gir-1.0/EBookContacts-%%EVO_VERSION%%.gir
 share/gir-1.0/EDataServer-%%EVO_VERSION%%.gir
@@ -505,6 +516,8 @@ share/pixmaps/evolution-data-server/category_status_16.png
 share/pixmaps/evolution-data-server/category_strategies_16.png
 share/pixmaps/evolution-data-server/category_suppliers_16.png
 share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
+share/vala/vapi/camel-%%EVO_VERSION%%.deps
+share/vala/vapi/camel-%%EVO_VERSION%%.vapi
 share/vala/vapi/libebook-%%EVO_VERSION%%.deps
 share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
 share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps