Update evolution suite to 3.24.

 * The build system switched to CMake, with ninja. Drop USES=gmake
 * Remove systemd files, we have no need for them.
 * Add/update WWW to new location

evolution-data-server:
 * Remove double icu dependacy
 * Make LDAP into a option, like mail/evolution
 * Remove BDB warning message. This message was here if the user had a
   nondefault bdb version selected. Due to that the eds only use bdb
   version 5, the message can go.

evolution:
 * Reenable MAPS option
 * Add YTNEF option to support MS Outlook TNEF format
 * Gstreamer is not used anymore

12 files changed, 97 insertions, 581 deletions

diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 32ffc14f4015..397c0bc16d93 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution-ews
-PORTVERSION=	3.22.6
+PORTVERSION=	3.24.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,6 +12,7 @@ COMMENT=	Evolution Microsoft Exchange plugin through Exchange Web Services
 
 BUILD_DEPENDS=	evolution>=3.0.0:mail/evolution
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libicuuc.so:devel/icu \
 		libmspack.so:archivers/libmspack \
 		libsecret-1.so:security/libsecret \
 		libnspr4.so:devel/nspr \
@@ -22,16 +23,8 @@ RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bdb:5 gettext gmake gnome libtool localbase pathfix \
+USES=		bdb:5 cmake ninja gettext gnome localbase pathfix \
 		pkgconfig sqlite tar:xz
-USE_GNOME=	atk cairo evolutiondataserver3 gdkpixbuf2 gtk30 glib20 \
-		intltool libxml2 pango
-GNU_CONFIGURE=	yes
-USE_OPENLDAP=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--datarootdir=${PREFIX}/share \
-		--localedir=${PREFIX}/share/locale \
-		--prefix=${PREFIX}
-INSTALL_TARGET=	install-strip
+USE_GNOME=	cairo gdkpixbuf2 evolutiondataserver3 intltool
 
 .include <bsd.port.mk>
diff --git a/mail/evolution-ews/distinfo b/mail/evolution-ews/distinfo
index ba397b3e00fc..9856154614d1 100644
--- a/mail/evolution-ews/distinfo
+++ b/mail/evolution-ews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494106823
-SHA256 (gnome3/evolution-ews-3.22.6.tar.xz) = eddc94d9a7f759a20dc35a8635318a425f8687bb3af5b72b94c996101c8fb0e5
-SIZE (gnome3/evolution-ews-3.22.6.tar.xz) = 715320
+TIMESTAMP = 1496958885
+SHA256 (gnome3/evolution-ews-3.24.2.tar.xz) = 31eb84a204a50b31932696c03394a7d2563ec2c3eefa52a802e63d0346a28851
+SIZE (gnome3/evolution-ews-3.24.2.tar.xz) = 486848
diff --git a/mail/evolution-ews/pkg-descr b/mail/evolution-ews/pkg-descr
index 82ea4bd5af0a..5d7d65b84c58 100644
--- a/mail/evolution-ews/pkg-descr
+++ b/mail/evolution-ews/pkg-descr
@@ -1,4 +1,4 @@
 Evolution-ews is a plugin for Evolution that adds Exchange integration though
 Exchange Web Service.
 
-WWW: https://wiki.gnome.org/Apps/Evolution/EWS
+WWW: https://wiki.gnome.org/Apps/Evolution
diff --git a/mail/evolution-ews/pkg-plist b/mail/evolution-ews/pkg-plist
index 390d8319ff1d..706412eb157c 100644
--- a/mail/evolution-ews/pkg-plist
+++ b/mail/evolution-ews/pkg-plist
@@ -1,26 +1,10 @@
-include/evolution-data-server/ews/e-ews-connection-utils.h
-include/evolution-data-server/ews/e-ews-connection.h
-include/evolution-data-server/ews/e-ews-debug.h
-include/evolution-data-server/ews/e-ews-enums.h
-include/evolution-data-server/ews/e-ews-enumtypes.h
-include/evolution-data-server/ews/e-ews-folder.h
-include/evolution-data-server/ews/e-ews-item-change.h
-include/evolution-data-server/ews/e-ews-item.h
-include/evolution-data-server/ews/e-ews-message.h
-include/evolution-data-server/ews/e-ews-notification.h
-include/evolution-data-server/ews/e-ews-oof-settings.h
-include/evolution-data-server/ews/ews-errors.h
 lib/evolution-data-server/addressbook-backends/libebookbackendews.so
 lib/evolution-data-server/calendar-backends/libecalbackendews.so
 lib/evolution-data-server/camel-providers/libcamelews.so
 lib/evolution-data-server/camel-providers/libcamelews.urls
-lib/evolution-data-server/libeews-1.2.so
-lib/evolution-data-server/libeews-1.2.so.0
-lib/evolution-data-server/libeews-1.2.so.0.0.0
-lib/evolution-data-server/libewsutils.so
-lib/evolution-data-server/libewsutils.so.0
-lib/evolution-data-server/libewsutils.so.0.0.0
 lib/evolution-data-server/registry-modules/module-ews-backend.so
+lib/evolution-ews/libcamelews-priv.so
+lib/evolution-ews/libevolution-ews.so
 lib/evolution/modules/module-ews-configuration.so
 share/appdata/evolution-ews.metainfo.xml
 share/evolution-data-server/ews/windowsZones.xml
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9544b3eddafe..5173e0908e40 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	evolution
-PORTVERSION=	3.22.6
+PORTVERSION=	3.24.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,39 +17,38 @@ LICENSE_FILE_OPENLDAP=	${WRKSRC}/COPYING.OPENLDAP
 LICENSE_PERMS_OPENLDAP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	itstool:textproc/itstool \
+		iso-codes>=0:misc/iso-codes \
 		highlight:textproc/highlight
 LIB_DEPENDS=	libnss3.so:security/nss \
 		libgcr-3.so:security/gcr \
 		libgtkspell3-3.so:textproc/gtkspell3 \
-		libgeocode-glib.so:net/geocode-glib \
+		libgnome-autoar-gtk-0.so:archivers/gnome-autoar \
+		libsoup-2.4.so:devel/libsoup \
+		libicuuc.so:devel/icu \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libnspr4.so:devel/nspr \
 		libical.so:devel/libical \
 		libsecret-1.so:security/libsecret \
 		libenchant.so:textproc/enchant \
 		libp11-kit.so:security/p11-kit \
-		libsoup-2.4.so:devel/libsoup \
 		libcryptui.so:security/libcryptui \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify
 RUN_DEPENDS=	highlight:textproc/highlight \
-		gnome-keyring>=3.0.0:security/gnome-keyring
+		iso-codes>=0:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils bison gettext gmake gnome iconv:wchar_t \
-		libtool localbase pathfix perl5 pkgconfig sqlite tar:xz
+USES=		desktop-file-utils cmake gettext gnome iconv:wchar_t \
+		sqlite libarchive ninja localbase pathfix pkgconfig tar:xz
 USE_GNOME=	cairo evolutiondataserver3 gnomedesktop3 intltool
 GNU_CONFIGURE=	yes
-USE_GSTREAMER1=	yes
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-nss=yes \
-		--disable-autoar \
-		--with-sub-version=" FreeBSD GNOME Team Port"
-INSTALL_TARGET=	install-strip
+CMAKE_ARGS=	-DENABLE_TEXT_HIGHLIGHT=YES \
+		-DVERSION_COMMENT="FreeBSD GNOME Team"
 
 GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.addressbook.gschema.xml \
@@ -70,65 +69,61 @@ GLIB_SCHEMAS=	org.gnome.evolution.gschema.xml \
 		org.gnome.evolution.plugin.publish-calendar.gschema.xml \
 		org.gnome.evolution.plugin.templates.gschema.xml
 
-EVO_VERSION=	3.22
+EVO_VERSION=	3.24
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
-OPTIONS_DEFINE=	LDAP WEATHER CANBERRA PST
-OPTIONS_DEFAULT=LDAP WEATHER CANBERRA BOGOFILTER
-OPTIONS_GROUP=	SPAM
-OPTIONS_GROUP_SPAM=SPAMASSASSIN BOGOFILTER
-
 OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	LDAP WEATHER CANBERRA PST YTNEF MAPS
+OPTIONS_DEFAULT=LDAP WEATHER CANBERRA BOGOFILTER
 
-CANBERRA_DESC=	Canberra theme audio plugin
-WEATHER_DESC=	Weather calendar backend
 SPAM_DESC=	Spam filter support
-SPAMASSASSIN_DESC=	SpamAssassin spam filtering
-BOGOFILTER_DESC=	Bogofilter spam filtering
-PST_DESC=	Outlook .pst importer
-MAPS_DESC=	Contact maps
+OPTIONS_GROUP=	SPAM
+OPTIONS_GROUP_SPAM=SPAMASSASSIN BOGOFILTER
 
-LDAP_CONFIGURE_WITH=	openldap
+LDAP_CMAKE_ON=	-DWITH_OPENLDAP=${LOCALBASE}
+LDAP_CMAKE_OFF=	-DWITH_OPENLDAP=OFF
 LDAP_USE=	OPENLDAP=yes
 
+YTNEF_DESC=		Support MS Outlook TNEF format
+YTNEF_LIB_DEPENDS=	libytnef.so:converters/ytnef
+YTNEF_CMAKE_BOOL=	ENABLE_YTNEF
+
+WEATHER_DESC=		Weather calendar backend
 WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
-WEATHER_CONFIGURE_ENABLE=	weather
+WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
 
-SPAMASSASSIN_CONFIGURE_WITH=	spamassassin=${LOCALBASE}/bin/spamassassin \
-				sa-learn=${LOCALBASE}/bin/sa-learn
+SPAMASSASSIN_DESC=		SpamAssassin spam filtering
+SPAMASSASSIN_CMAKE_ON=		-DWITH_SPAMASSASSIN=${LOCALBASE}/spamassassin \
+				-DWITH_SA_LEARN=${LOCALBASE}/bin/sa-learn
+SPAMASSASSIN_CMAKE_OFF=		-DWITH_SPAMASSASSIN=NO
 SPAMASSASSIN_BUILD_DEPENDS=	spamassassin:mail/spamassassin
 SPAMASSASSIN_RUN_DEPENDS=	spamassassin:mail/spamassassin
 
-BOGOFILTER_CONFIGURE_WITH=	bogofilter=${LOCALBASE}/bin/bogofilter
+BOGOFILTER_DESC=		Bogofilter spam filtering
+BOGOFILTER_CMAKE_ON=		-DWITH_BOGOFILTER=${LOCALBASE}/bin/bogofilter
+BOGOFILTER_CMAKE_OFF=		-DWITH_BOGOFILTER=OFF
 BOGOFILTER_BUILD_DEPENDS=	bogofilter:mail/bogofilter
-BOGOFILTER_RUN_DEPENDS=	bogofilter:mail/bogofilter
+BOGOFILTER_RUN_DEPENDS=		bogofilter:mail/bogofilter
 
+CANBERRA_DESC=		Canberra theme audio plugin
 CANBERRA_LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 			libcanberra-gtk3.so:audio/libcanberra-gtk3
-CANBERRA_CONFIGURE_ENABLE=	canberra
+CANBERRA_CMAKE_BOOL=	ENABLE_CANBERRA
 
-PST_CONFIGURE_ENABLE=	pst-import
+PST_DESC=	Outlook .pst importer
+PST_CMAKE_BOOL=		ENABLE_PST_IMPORT
 PST_BUILD_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 PST_RUN_DEPENDS=	libpst>=0.6.58_1:mail/libpst
 
-CONFIGURE_ARGS+=--disable-contact-maps
-#MAPS_CONFIGURE_ENABLE=	contact-maps
-#MAPS_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
-#			libclutter-gtk-1.0.so:graphics/clutter-gtk3
-#MAPS_BUILD_DEPENDS=	geoclue>=0:net/geoclue
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \
-		-e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \
-		-e 's|-Wl,--no-undefined||g' \
-		-e 's|-Wmissing-include-dirs||g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
-		${WRKSRC}/modules/spamassassin/evolution-spamassassin.c \
-		${WRKSRC}/modules/bogofilter/evolution-bogofilter.c
-#	@${SH} ${FILESDIR}/fix-plugins.sh ${WRKSRC}
+MAPS_DESC=	Contact maps
+MAPS_CMAKE_BOOL=	ENABLE_CONTACT_MAPS
+MAPS_LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
+			libgeocode-glib.so:net/geocode-glib \
+			libcogl.so:graphics/cogl \
+			libclutter-1.0.so:graphics/clutter \
+			libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+			libchamplain-0.12.so:graphics/libchamplain
+MAPS_USE=		xorg=xcomposite,xdamage,xext,xfixes,xi,xrandr gl=egl
 
 .include <bsd.port.mk>
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 7f6012e1cf3c..316734e82d0c 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494104477
-SHA256 (gnome3/evolution-3.22.6.tar.xz) = 9f4be4a1d5ee4d5eb9b132cf751ba3afc833025aa6dc7baa1f9483489d8a943e
-SIZE (gnome3/evolution-3.22.6.tar.xz) = 12288232
+TIMESTAMP = 1496947688
+SHA256 (gnome3/evolution-3.24.2.tar.xz) = e7b35a60f4ad53bb5416d8e96390aa79c8601b09a71e635c1de730b94f3aebdf
+SIZE (gnome3/evolution-3.24.2.tar.xz) = 12132032
diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh
deleted file mode 100644
index b0171dcb5d0a..000000000000
--- a/mail/evolution/files/fix-plugins.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-plugin_srcs="attachment-reminder/attachment-reminder.c bbdb/bbdb.c dbx-import/dbx-importer.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c image-inline/image-inline.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c pst-import/pst-importer.c publish-calendar/publish-calendar.c save-calendar/save-calendar.c templates/templates.c"
-
-module_srcs="addressbook/evolution-module-addressbook.c audio-inline/evolution-module-audio-inline.c backup-restore/evolution-backup-tool.c bogofilter/evolution-bogofilter.c book-config-google/evolution-book-config-google.c book-config-ldap/evolution-book-config-ldap.c book-config-local/evolution-book-config-local.c book-config-webdav/evolution-book-config-webdav.c cal-config-caldav/evolution-cal-config-caldav.c cal-config-contacts/evolution-cal-config-contacts.c cal-config-google/evolution-cal-config-google.c cal-config-local/evolution-cal-config-local.c cal-config-weather/evolution-cal-config-weather.c cal-config-webcal/evolution-cal-config-webcal.c calendar/evolution-module-calendar.c composer-autosave/evolution-composer-autosave.c imap-features/evolution-imap-features.c itip-formatter/itip-view.c itip-formatter/plugin/config-ui.c mail-config/evolution-mail-config.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c mdn/evolution-mdn.c offline-alert/evolution-offline-alert.c online-accounts/evolution-online-accounts.c plugin-lib/evolution-module-plugin-lib.c plugin-manager/evolution-plugin-manager.c prefer-plain/evolution-module-prefer-plain.c prefer-plain/plugin/config-ui.c spamassassin/evolution-spamassassin.c startup-wizard/evolution-startup-wizard.c text-highlight/languages.c tnef-attachment/evolution-module-tnef-attachment.c vcard-inline/evolution-module-vcard-inline.c web-inspector/evolution-web-inspector.c"
-
-WRKSRC=$1
-
-for i in ${plugin_srcs}; do
-    if [ ! -f ${WRKSRC}/plugins/${i} ]; then
-	echo "WARNING: Failed to find plugin source file ${WRKSRC}/plugins/${i}"
-	continue
-    fi
-    cp ${WRKSRC}/plugins/${i} ${WRKSRC}/plugins/${i}.bak
-    printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
-    printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/plugins/${i}
-    printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
-    printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/plugins/${i}
-    dir=$(dirname ${WRKSRC}/plugins/${i})
-    if ! grep -q e_plugin_lib_enable ${dir}/*.c; then
-	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
-	printf "gint e_plugin_lib_enable (EPlugin *ep, gint enable);\n" >> ${WRKSRC}/plugins/${i}
-	printf "gint\ne_plugin_lib_enable (EPlugin *ep, gint enable) {\n\treturn 0;\n}\n" >> ${WRKSRC}/plugins/${i}
-    fi
-    if ! grep -q e_plugin_lib_get_configure_widget ${dir}/*.c; then
-	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
-	printf "GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);\n" >> ${WRKSRC}/plugins/${i}
-	printf "GtkWidget *\ne_plugin_lib_get_configure_widget (EPlugin *plugin) {\n\treturn NULL;\n}" >> ${WRKSRC}/plugins/${i}
-    fi
-done
-
-for i in ${module_srcs}; do
-    if [ ! -f ${WRKSRC}/modules/${i} ]; then
-	echo "WARNING: Failed to find module source file ${WRKSRC}/modules/${i}"
-	continue
-    fi
-    cp ${WRKSRC}/modules/${i} ${WRKSRC}/modules/${i}.bak
-    dir=$(dirname ${WRKSRC}/modules/${i})
-    if ! grep -q g_module_check_init ${dir}/*.c; then
-        printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/modules/${i}
-        printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/modules/${i}
-    fi
-    if ! grep g_module_unload ${dir}/*.c; then
-        printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/modules/${i}
-        printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/modules/${i}
-    fi
-done
-
diff --git a/mail/evolution/files/patch-CMakeLists.txt b/mail/evolution/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..990927751b35
--- /dev/null
+++ b/mail/evolution/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2017-06-08 20:52:16.741243000 +0200
++++ CMakeLists.txt	2017-06-08 20:52:25.747544000 +0200
+@@ -329,6 +329,7 @@
+ # ******************************
+ 
+ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
++set(CMAKE_REQUIRED_FLAGS "-L/usr/local/lib")
+ CHECK_C_SOURCE_COMPILES("#include <iconv.h>
+ 			#include <stdlib.h>
+ 			int main(void) { iconv_t cd; cd = iconv_open (\"UTF-8\", \"ISO-8859-1\"); return 0; }" HAVE_LIBICONV)
diff --git a/mail/evolution/files/patch-configure b/mail/evolution/files/patch-configure
deleted file mode 100644
index 1c7bafc75817..000000000000
--- a/mail/evolution/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2011-01-26 18:09:29.000000000 +0000
-+++ configure	2011-01-26 18:11:16.000000000 +0000
-@@ -15450,6 +15450,16 @@
- 	CHAMPLAIN_REQUIREMENT=''
- 	GEOCLUE_REQUIREMENT=''
- 	;;
-+*freebsd*)
-+	os_win32=no
-+	NO_UNDEFINED=''
-+	SOCKET_LIBS=''
-+	SOEXT='.so'
-+	SA_JUNK_PLUGIN=sa-junk-plugin
-+	BF_JUNK_PLUGIN=bogo-junk-plugin
-+	DL_LIB=''
-+	SOFTOKN3_LIB='-lsoftokn3'
-+	;;
- *)
- 	os_win32=no
- 	NO_UNDEFINED='-no-undefined'
diff --git a/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
deleted file mode 100644
index 0df6bd970168..000000000000
--- a/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- modules/addressbook/evolution-module-addressbook.c.orig	2010-04-11 12:47:18.000000000 -0400
-+++ modules/addressbook/evolution-module-addressbook.c	2010-04-11 12:48:06.000000000 -0400
-@@ -47,3 +47,16 @@ G_MODULE_EXPORT void
- e_module_unload (GTypeModule *type_module)
- {
- }
-+
-+G_MODULE_EXPORT const gchar *
-+g_module_check_init (GModule *module)
-+{
-+	/* FIXME Until addressbook is split into a module library and a
-+	 *       reusable shared library, prevent the module from
-+	 *       being unloaded.  Unloading the module resets all
-+	 *       static variables, which screws up foo_get_type()
-+	 *       functions among other things. */
-+	g_module_make_resident (module);
-+
-+	return NULL;
-+}
diff --git a/mail/evolution/pkg-descr b/mail/evolution/pkg-descr
index 1a0085b96c29..fa9a3a656d02 100644
--- a/mail/evolution/pkg-descr
+++ b/mail/evolution/pkg-descr
@@ -6,4 +6,4 @@ comprehensive set of features that help keep work organized and projects
 on track.  The unique Ximian vFolders[tm] are virtual folders used to
 create and save powerful contextual views of email messages.
 
-WWW: http://www.gnome.org/projects/evolution/
+WWW: https://wiki.gnome.org/Apps/Evolution
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 65a9225c7714..d6aeb38737f5 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -6,6 +6,7 @@ include/evolution/calendar/gui/calendar-config.h
 include/evolution/calendar/gui/calendar-view.h
 include/evolution/calendar/gui/comp-util.h
 include/evolution/calendar/gui/e-alarm-list.h
+include/evolution/calendar/gui/e-cal-component-preview.h
 include/evolution/calendar/gui/e-cal-config.h
 include/evolution/calendar/gui/e-cal-data-model-subscriber.h
 include/evolution/calendar/gui/e-cal-data-model.h
@@ -13,6 +14,8 @@ include/evolution/calendar/gui/e-cal-dialogs.h
 include/evolution/calendar/gui/e-cal-event.h
 include/evolution/calendar/gui/e-cal-list-view.h
 include/evolution/calendar/gui/e-cal-model-calendar.h
+include/evolution/calendar/gui/e-cal-model-memos.h
+include/evolution/calendar/gui/e-cal-model-tasks.h
 include/evolution/calendar/gui/e-cal-model.h
 include/evolution/calendar/gui/e-cal-ops.h
 include/evolution/calendar/gui/e-calendar-view.h
@@ -29,7 +32,6 @@ include/evolution/calendar/gui/e-comp-editor-property-part.h
 include/evolution/calendar/gui/e-comp-editor-property-parts.h
 include/evolution/calendar/gui/e-comp-editor-task.h
 include/evolution/calendar/gui/e-comp-editor.h
-include/evolution/calendar/gui/e-send-options-utils.h
 include/evolution/calendar/gui/e-date-time-list.h
 include/evolution/calendar/gui/e-day-view-layout.h
 include/evolution/calendar/gui/e-day-view-main-item.h
@@ -43,8 +45,12 @@ include/evolution/calendar/gui/e-meeting-time-sel-item.h
 include/evolution/calendar/gui/e-meeting-time-sel.h
 include/evolution/calendar/gui/e-meeting-types.h
 include/evolution/calendar/gui/e-meeting-utils.h
+include/evolution/calendar/gui/e-memo-table.h
+include/evolution/calendar/gui/e-month-view.h
 include/evolution/calendar/gui/e-select-names-editable.h
 include/evolution/calendar/gui/e-select-names-renderer.h
+include/evolution/calendar/gui/e-send-options-utils.h
+include/evolution/calendar/gui/e-task-table.h
 include/evolution/calendar/gui/e-timezone-entry.h
 include/evolution/calendar/gui/e-week-view-event-item.h
 include/evolution/calendar/gui/e-week-view-layout.h
@@ -52,8 +58,20 @@ include/evolution/calendar/gui/e-week-view-main-item.h
 include/evolution/calendar/gui/e-week-view-titles-item.h
 include/evolution/calendar/gui/e-week-view.h
 include/evolution/calendar/gui/e-weekday-chooser.h
+include/evolution/calendar/gui/ea-cal-view-event.h
+include/evolution/calendar/gui/ea-cal-view.h
+include/evolution/calendar/gui/ea-calendar-helpers.h
+include/evolution/calendar/gui/ea-calendar.h
+include/evolution/calendar/gui/ea-day-view-cell.h
+include/evolution/calendar/gui/ea-day-view-main-item.h
+include/evolution/calendar/gui/ea-day-view.h
+include/evolution/calendar/gui/ea-jump-button.h
+include/evolution/calendar/gui/ea-week-view-cell.h
+include/evolution/calendar/gui/ea-week-view-main-item.h
+include/evolution/calendar/gui/ea-week-view.h
 include/evolution/calendar/gui/itip-utils.h
 include/evolution/calendar/gui/misc.h
+include/evolution/calendar/gui/print.h
 include/evolution/calendar/gui/tag-calendar.h
 include/evolution/composer/e-composer-actions.h
 include/evolution/composer/e-composer-common.h
@@ -432,9 +450,9 @@ include/evolution/mail/e-mail-message-pane.h
 include/evolution/mail/e-mail-migrate.h
 include/evolution/mail/e-mail-notes.h
 include/evolution/mail/e-mail-paned-view.h
-include/evolution/mail/e-mail-properties.h
 include/evolution/mail/e-mail-print-config-headers.h
 include/evolution/mail/e-mail-printer.h
+include/evolution/mail/e-mail-properties.h
 include/evolution/mail/e-mail-reader-utils.h
 include/evolution/mail/e-mail-reader.h
 include/evolution/mail/e-mail-remote-content.h
@@ -483,8 +501,11 @@ include/evolution/shell/e-shell-window-actions.h
 include/evolution/shell/e-shell-window.h
 include/evolution/shell/e-shell.h
 lib/evolution/libeabutil.so
+lib/evolution/libeabwidgets.so
 lib/evolution/libecontacteditor.so
 lib/evolution/libecontactlisteditor.so
+lib/evolution/libecontactprint.so
+lib/evolution/libedomutils.so
 lib/evolution/libemail-engine.so
 lib/evolution/libessmime.so
 lib/evolution/libevolution-addressbook-importers.so
@@ -513,6 +534,7 @@ lib/evolution/modules/module-cal-config-local.so
 lib/evolution/modules/module-cal-config-webcal.so
 lib/evolution/modules/module-calendar.so
 lib/evolution/modules/module-composer-autosave.so
+lib/evolution/modules/module-composer-to-meeting.so
 lib/evolution/modules/module-contact-photos.so
 lib/evolution/modules/module-gravatar.so
 lib/evolution/modules/module-itip-formatter.so
@@ -528,6 +550,7 @@ lib/evolution/modules/module-settings.so
 %%SPAMASSASSIN%%lib/evolution/modules/module-spamassassin.so
 lib/evolution/modules/module-startup-wizard.so
 lib/evolution/modules/module-text-highlight.so
+%%YTNEF%%lib/evolution/modules/module-tnef-attachment.so
 lib/evolution/modules/module-vcard-inline.so
 lib/evolution/modules/module-webkit-editor.so
 lib/evolution/modules/module-webkit-inspector.so
@@ -559,11 +582,9 @@ lib/evolution/plugins/org-gnome-prefer-plain.eplug
 lib/evolution/plugins/org-gnome-publish-calendar.eplug
 lib/evolution/plugins/org-gnome-save-calendar.eplug
 lib/evolution/plugins/org-gnome-templates.eplug
-lib/evolution/test-gio-modules/libevolutiontestsettings.so
-lib/evolution/web-extensions/libedomutils.so
 lib/evolution/web-extensions/libewebextension.so
-lib/evolution/web-extensions/libmoduleitipformatterwebextension.so
-lib/evolution/web-extensions/webkit-editor/libewebkiteditorwebextension.so
+lib/evolution/web-extensions/module-itip-formatter-webextension.so
+lib/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
 libdata/pkgconfig/evolution-calendar-3.0.pc
 libdata/pkgconfig/evolution-mail-3.0.pc
 libdata/pkgconfig/evolution-shell-3.0.pc
@@ -573,6 +594,7 @@ libexec/evolution/evolution-backup
 libexec/evolution/killev
 share/GConf/gsettings/evolution.convert
 %%BOGOFILTER%%share/appdata/evolution-bogofilter.metainfo.xml
+%%PST%%share/appdata/evolution-pst.metainfo.xml
 %%SPAMASSASSIN%%share/appdata/evolution-spamassassin.metainfo.xml
 share/appdata/evolution.appdata.xml
 share/applications/evolution.desktop
@@ -636,6 +658,7 @@ share/applications/evolution.desktop
 %%DATADIR%%/help/quickref/fr/quickref.pdf
 %%DATADIR%%/help/quickref/hu/quickref.pdf
 %%DATADIR%%/help/quickref/it/quickref.pdf
+%%DATADIR%%/help/quickref/oc/quickref.pdf
 %%DATADIR%%/help/quickref/pl/quickref.pdf
 %%DATADIR%%/help/quickref/pt/quickref.pdf
 %%DATADIR%%/help/quickref/sq/quickref.pdf
@@ -862,409 +885,6 @@ share/applications/evolution.desktop
 %%DATADIR%%/views/tasks/With_DueDate.galview
 %%DATADIR%%/views/tasks/With_Status.galview
 %%DATADIR%%/views/tasks/galview.xml
-share/gtk-doc/html/evolution-mail-composer/EComposerFromHeader.html
-share/gtk-doc/html/evolution-mail-composer/EComposerHeader.html
-share/gtk-doc/html/evolution-mail-composer/EComposerHeaderTable.html
-share/gtk-doc/html/evolution-mail-composer/EComposerNameHeader.html
-share/gtk-doc/html/evolution-mail-composer/EComposerPostHeader.html
-share/gtk-doc/html/evolution-mail-composer/EComposerSpellHeader.html
-share/gtk-doc/html/evolution-mail-composer/EComposerTextHeader.html
-share/gtk-doc/html/evolution-mail-composer/EMsgComposer.html
-share/gtk-doc/html/evolution-mail-composer/annotation-glossary.html
-share/gtk-doc/html/evolution-mail-composer/api-index-full.html
-share/gtk-doc/html/evolution-mail-composer/api-index-3.20.html
-share/gtk-doc/html/evolution-mail-composer/api-index-3.22.html
-share/gtk-doc/html/evolution-mail-composer/ch01.html
-share/gtk-doc/html/evolution-mail-composer/evolution-mail-composer.devhelp2
-share/gtk-doc/html/evolution-mail-composer/home.png
-share/gtk-doc/html/evolution-mail-composer/index.html
-share/gtk-doc/html/evolution-mail-composer/left-insensitive.png
-share/gtk-doc/html/evolution-mail-composer/left.png
-share/gtk-doc/html/evolution-mail-composer/object-tree.html
-share/gtk-doc/html/evolution-mail-composer/right-insensitive.png
-share/gtk-doc/html/evolution-mail-composer/right.png
-share/gtk-doc/html/evolution-mail-composer/style.css
-share/gtk-doc/html/evolution-mail-composer/up-insensitive.png
-share/gtk-doc/html/evolution-mail-composer/up.png
-share/gtk-doc/html/evolution-mail-engine/CamelNullStore.html
-share/gtk-doc/html/evolution-mail-engine/CamelSaslOAuth2Google.html
-share/gtk-doc/html/evolution-mail-engine/CamelSaslXOAuth2.html
-share/gtk-doc/html/evolution-mail-engine/EMFilterFolderElement.html
-share/gtk-doc/html/evolution-mail-engine/EMVFolderContext.html
-share/gtk-doc/html/evolution-mail-engine/EMVFolderRule.html
-share/gtk-doc/html/evolution-mail-engine/EMailJunkFilter.html
-share/gtk-doc/html/evolution-mail-engine/EMailSession.html
-share/gtk-doc/html/evolution-mail-engine/MailFolderCache.html
-share/gtk-doc/html/evolution-mail-engine/api-index-full.html
-share/gtk-doc/html/evolution-mail-engine/api-index-3.16.html
-share/gtk-doc/html/evolution-mail-engine/api-index-3.18.html
-share/gtk-doc/html/evolution-mail-engine/ch01.html
-share/gtk-doc/html/evolution-mail-engine/ch02.html
-share/gtk-doc/html/evolution-mail-engine/ch03.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-e-mail-engine-enums.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-e-mail-folder-utils.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-e-mail-session-utils.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-e-mail-store-utils.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-e-mail-utils.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-mail-config.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-mail-mt.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-mail-ops.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-mail-tools.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine-mail-vfolder.html
-share/gtk-doc/html/evolution-mail-engine/evolution-mail-engine.devhelp2
-share/gtk-doc/html/evolution-mail-engine/home.png
-share/gtk-doc/html/evolution-mail-engine/index.html
-share/gtk-doc/html/evolution-mail-engine/left-insensitive.png
-share/gtk-doc/html/evolution-mail-engine/left.png
-share/gtk-doc/html/evolution-mail-engine/object-tree.html
-share/gtk-doc/html/evolution-mail-engine/right-insensitive.png
-share/gtk-doc/html/evolution-mail-engine/right.png
-share/gtk-doc/html/evolution-mail-engine/style.css
-share/gtk-doc/html/evolution-mail-engine/up-insensitive.png
-share/gtk-doc/html/evolution-mail-engine/up.png
-share/gtk-doc/html/evolution-mail-formatter/EMailFormatter.html
-share/gtk-doc/html/evolution-mail-formatter/EMailFormatterExtension.html
-share/gtk-doc/html/evolution-mail-formatter/EMailFormatterExtensionRegistry.html
-share/gtk-doc/html/evolution-mail-formatter/EMailFormatterPrintExtension.html
-share/gtk-doc/html/evolution-mail-formatter/EMailFormatterQuoteExtension.html
-share/gtk-doc/html/evolution-mail-formatter/EMailInlineFilter.html
-share/gtk-doc/html/evolution-mail-formatter/EMailParser.html
-share/gtk-doc/html/evolution-mail-formatter/EMailParserExtension.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPart.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPartAttachment.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPartAudio.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPartHeaders.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPartImage.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPartList.html
-share/gtk-doc/html/evolution-mail-formatter/EMailPartSecureButton.html
-share/gtk-doc/html/evolution-mail-formatter/EMailStripSigFilter.html
-share/gtk-doc/html/evolution-mail-formatter/api-index-full.html
-share/gtk-doc/html/evolution-mail-formatter/api-index-3.8.html
-share/gtk-doc/html/evolution-mail-formatter/ch01.html
-share/gtk-doc/html/evolution-mail-formatter/ch02.html
-share/gtk-doc/html/evolution-mail-formatter/ch03.html
-share/gtk-doc/html/evolution-mail-formatter/evolution-mail-formatter-e-mail-formatter-enums.html
-share/gtk-doc/html/evolution-mail-formatter/evolution-mail-formatter-e-mail-formatter-utils.html
-share/gtk-doc/html/evolution-mail-formatter/evolution-mail-formatter-e-mail-part-utils.html
-share/gtk-doc/html/evolution-mail-formatter/evolution-mail-formatter.devhelp2
-share/gtk-doc/html/evolution-mail-formatter/home.png
-share/gtk-doc/html/evolution-mail-formatter/index.html
-share/gtk-doc/html/evolution-mail-formatter/left-insensitive.png
-share/gtk-doc/html/evolution-mail-formatter/left.png
-share/gtk-doc/html/evolution-mail-formatter/object-tree.html
-share/gtk-doc/html/evolution-mail-formatter/right-insensitive.png
-share/gtk-doc/html/evolution-mail-formatter/right.png
-share/gtk-doc/html/evolution-mail-formatter/style.css
-share/gtk-doc/html/evolution-mail-formatter/up-insensitive.png
-share/gtk-doc/html/evolution-mail-formatter/up.png
-share/gtk-doc/html/evolution-shell/EShell.html
-share/gtk-doc/html/evolution-shell/EShellBackend.html
-share/gtk-doc/html/evolution-shell/EShellContent.html
-share/gtk-doc/html/evolution-shell/EShellSearchbar.html
-share/gtk-doc/html/evolution-shell/EShellSidebar.html
-share/gtk-doc/html/evolution-shell/EShellSwitcher.html
-share/gtk-doc/html/evolution-shell/EShellTaskbar.html
-share/gtk-doc/html/evolution-shell/EShellView.html
-share/gtk-doc/html/evolution-shell/EShellWindow.html
-share/gtk-doc/html/evolution-shell/annotation-glossary.html
-share/gtk-doc/html/evolution-shell/api-index-3.10.html
-share/gtk-doc/html/evolution-shell/api-index-3.16.html
-share/gtk-doc/html/evolution-shell/api-index-3.4.html
-share/gtk-doc/html/evolution-shell/api-index-full.html
-share/gtk-doc/html/evolution-shell/ch01.html
-share/gtk-doc/html/evolution-shell/ch02.html
-share/gtk-doc/html/evolution-shell/ch03.html
-share/gtk-doc/html/evolution-shell/evolution-shell-e-shell-migrate.html
-share/gtk-doc/html/evolution-shell/evolution-shell-e-shell-utils.html
-share/gtk-doc/html/evolution-shell/evolution-shell-e-shell-window-actions.html
-share/gtk-doc/html/evolution-shell/evolution-shell.devhelp2
-share/gtk-doc/html/evolution-shell/home.png
-share/gtk-doc/html/evolution-shell/index.html
-share/gtk-doc/html/evolution-shell/left-insensitive.png
-share/gtk-doc/html/evolution-shell/left.png
-share/gtk-doc/html/evolution-shell/object-tree.html
-share/gtk-doc/html/evolution-shell/right-insensitive.png
-share/gtk-doc/html/evolution-shell/right.png
-share/gtk-doc/html/evolution-shell/style.css
-share/gtk-doc/html/evolution-shell/up-insensitive.png
-share/gtk-doc/html/evolution-shell/up.png
-share/gtk-doc/html/evolution-util/EActionComboBox.html
-share/gtk-doc/html/evolution-util/EActivity.html
-share/gtk-doc/html/evolution-util/EActivityBar.html
-share/gtk-doc/html/evolution-util/EActivityProxy.html
-share/gtk-doc/html/evolution-util/EAlarmSelector.html
-share/gtk-doc/html/evolution-util/EAlert.html
-share/gtk-doc/html/evolution-util/EAlertBar.html
-share/gtk-doc/html/evolution-util/EAlertDialog.html
-share/gtk-doc/html/evolution-util/EAlertSink.html
-share/gtk-doc/html/evolution-util/EAttachment.html
-share/gtk-doc/html/evolution-util/EAttachmentBar.html
-share/gtk-doc/html/evolution-util/EAttachmentDialog.html
-share/gtk-doc/html/evolution-util/EAttachmentHandler.html
-share/gtk-doc/html/evolution-util/EAttachmentHandlerImage.html
-share/gtk-doc/html/evolution-util/EAttachmentIconView.html
-share/gtk-doc/html/evolution-util/EAttachmentPaned.html
-share/gtk-doc/html/evolution-util/EAttachmentStore.html
-share/gtk-doc/html/evolution-util/EAttachmentTreeView.html
-share/gtk-doc/html/evolution-util/EAttachmentView.html
-share/gtk-doc/html/evolution-util/EAuthComboBox.html
-share/gtk-doc/html/evolution-util/EAutocompleteSelector.html
-share/gtk-doc/html/evolution-util/EBitArray.html
-share/gtk-doc/html/evolution-util/EBookSourceConfig.html
-share/gtk-doc/html/evolution-util/ECalSourceConfig.html
-share/gtk-doc/html/evolution-util/ECalendar.html
-share/gtk-doc/html/evolution-util/ECalendarItem.html
-share/gtk-doc/html/evolution-util/ECanvas.html
-share/gtk-doc/html/evolution-util/ECanvasBackground.html
-share/gtk-doc/html/evolution-util/ECanvasVbox.html
-share/gtk-doc/html/evolution-util/ECategoriesDialog.html
-share/gtk-doc/html/evolution-util/ECategoriesEditor.html
-share/gtk-doc/html/evolution-util/ECategoriesSelector.html
-share/gtk-doc/html/evolution-util/ECategoryCompletion.html
-share/gtk-doc/html/evolution-util/ECategoryEditor.html
-share/gtk-doc/html/evolution-util/ECell.html
-share/gtk-doc/html/evolution-util/ECellCheckbox.html
-share/gtk-doc/html/evolution-util/ECellCombo.html
-share/gtk-doc/html/evolution-util/ECellDate.html
-share/gtk-doc/html/evolution-util/ECellDateEdit.html
-share/gtk-doc/html/evolution-util/ECellDateInt.html
-share/gtk-doc/html/evolution-util/ECellHbox.html
-share/gtk-doc/html/evolution-util/ECellNumber.html
-share/gtk-doc/html/evolution-util/ECellPercent.html
-share/gtk-doc/html/evolution-util/ECellPixbuf.html
-share/gtk-doc/html/evolution-util/ECellPopup.html
-share/gtk-doc/html/evolution-util/ECellSize.html
-share/gtk-doc/html/evolution-util/ECellText.html
-share/gtk-doc/html/evolution-util/ECellToggle.html
-share/gtk-doc/html/evolution-util/ECellTree.html
-share/gtk-doc/html/evolution-util/ECellVbox.html
-share/gtk-doc/html/evolution-util/ECharsetComboBox.html
-share/gtk-doc/html/evolution-util/EClientCache.html
-share/gtk-doc/html/evolution-util/EClientComboBox.html
-share/gtk-doc/html/evolution-util/EClientSelector.html
-share/gtk-doc/html/evolution-util/EColorChooserWidget.html
-share/gtk-doc/html/evolution-util/EColorCombo.html
-share/gtk-doc/html/evolution-util/EConfigHook.html
-share/gtk-doc/html/evolution-util/EConflictSearchSelector.html
-share/gtk-doc/html/evolution-util/EContactStore.html
-share/gtk-doc/html/evolution-util/EContentEditor.html
-share/gtk-doc/html/evolution-util/EContentRequest.html
-share/gtk-doc/html/evolution-util/EDataCapture.html
-share/gtk-doc/html/evolution-util/EDateEdit.html
-share/gtk-doc/html/evolution-util/EDestinationStore.html
-share/gtk-doc/html/evolution-util/EEmoticonAction.html
-share/gtk-doc/html/evolution-util/EEmoticonChooser.html
-share/gtk-doc/html/evolution-util/EEmoticonChooserMenu.html
-share/gtk-doc/html/evolution-util/EEmoticonToolButton.html
-share/gtk-doc/html/evolution-util/EEventHook.html
-share/gtk-doc/html/evolution-util/EFileRequest.html
-share/gtk-doc/html/evolution-util/EFilterCode.html
-share/gtk-doc/html/evolution-util/EFilterColor.html
-share/gtk-doc/html/evolution-util/EFilterDatespec.html
-share/gtk-doc/html/evolution-util/EFilterElement.html
-share/gtk-doc/html/evolution-util/EFilterFile.html
-share/gtk-doc/html/evolution-util/EFilterInput.html
-share/gtk-doc/html/evolution-util/EFilterInt.html
-share/gtk-doc/html/evolution-util/EFilterOption.html
-share/gtk-doc/html/evolution-util/EFilterPart.html
-share/gtk-doc/html/evolution-util/EFilterRule.html
-share/gtk-doc/html/evolution-util/EFocusTracker.html
-share/gtk-doc/html/evolution-util/EHTMLEditor.html
-share/gtk-doc/html/evolution-util/EHTMLEditorCellDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorFindDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorHRuleDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorImageDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorLinkDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorPageDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorParagraphDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorReplaceDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorSpellCheckDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorTableDialog.html
-share/gtk-doc/html/evolution-util/EHTMLEditorTextDialog.html
-share/gtk-doc/html/evolution-util/EImageChooser.html
-share/gtk-doc/html/evolution-util/EImageChooserDialog.html
-share/gtk-doc/html/evolution-util/EImportAssistant.html
-share/gtk-doc/html/evolution-util/EImportHook.html
-share/gtk-doc/html/evolution-util/EIntervalChooser.html
-share/gtk-doc/html/evolution-util/EMailIdentityComboBox.html
-share/gtk-doc/html/evolution-util/EMailSignatureComboBox.html
-share/gtk-doc/html/evolution-util/EMailSignatureEditor.html
-share/gtk-doc/html/evolution-util/EMailSignatureManager.html
-share/gtk-doc/html/evolution-util/EMailSignaturePreview.html
-share/gtk-doc/html/evolution-util/EMailSignatureScriptDialog.html
-share/gtk-doc/html/evolution-util/EMailSignatureTreeView.html
-share/gtk-doc/html/evolution-util/EMap.html
-share/gtk-doc/html/evolution-util/EMenuToolAction.html
-share/gtk-doc/html/evolution-util/EMenuToolButton.html
-share/gtk-doc/html/evolution-util/ENameSelector.html
-share/gtk-doc/html/evolution-util/ENameSelectorDialog.html
-share/gtk-doc/html/evolution-util/ENameSelectorEntry.html
-share/gtk-doc/html/evolution-util/ENameSelectorList.html
-share/gtk-doc/html/evolution-util/ENameSelectorModel.html
-share/gtk-doc/html/evolution-util/EOnlineButton.html
-share/gtk-doc/html/evolution-util/EPaned.html
-share/gtk-doc/html/evolution-util/EPhotoCache.html
-share/gtk-doc/html/evolution-util/EPhotoSource.html
-share/gtk-doc/html/evolution-util/EPictureGallery.html
-share/gtk-doc/html/evolution-util/EPluginHook.html
-share/gtk-doc/html/evolution-util/EPluginUIHook.html
-share/gtk-doc/html/evolution-util/EPopupAction.html
-share/gtk-doc/html/evolution-util/EPortEntry.html
-share/gtk-doc/html/evolution-util/EPreferencesWindow.html
-share/gtk-doc/html/evolution-util/EPreviewPane.html
-share/gtk-doc/html/evolution-util/EPrintable.html
-share/gtk-doc/html/evolution-util/EProxyComboBox.html
-share/gtk-doc/html/evolution-util/EProxyEditor.html
-share/gtk-doc/html/evolution-util/EProxyLinkSelector.html
-share/gtk-doc/html/evolution-util/EProxyPreferences.html
-share/gtk-doc/html/evolution-util/EProxySelector.html
-share/gtk-doc/html/evolution-util/EReflow.html
-share/gtk-doc/html/evolution-util/EReflowModel.html
-share/gtk-doc/html/evolution-util/ERuleContext.html
-share/gtk-doc/html/evolution-util/ERuleEditor.html
-share/gtk-doc/html/evolution-util/ESearchBar.html
-share/gtk-doc/html/evolution-util/ESelectable.html
-share/gtk-doc/html/evolution-util/ESelectionModel.html
-share/gtk-doc/html/evolution-util/ESelectionModelArray.html
-share/gtk-doc/html/evolution-util/ESelectionModelSimple.html
-share/gtk-doc/html/evolution-util/ESendOptionsDialog.html
-share/gtk-doc/html/evolution-util/ESimpleAsyncResult.html
-share/gtk-doc/html/evolution-util/ESorter.html
-share/gtk-doc/html/evolution-util/ESorterArray.html
-share/gtk-doc/html/evolution-util/ESourceComboBox.html
-share/gtk-doc/html/evolution-util/ESourceConfig.html
-share/gtk-doc/html/evolution-util/ESourceConfigBackend.html
-share/gtk-doc/html/evolution-util/ESourceConfigDialog.html
-share/gtk-doc/html/evolution-util/ESourceConflictSearch.html
-share/gtk-doc/html/evolution-util/ESourceSelector.html
-share/gtk-doc/html/evolution-util/ESourceSelectorDialog.html
-share/gtk-doc/html/evolution-util/ESpellChecker.html
-share/gtk-doc/html/evolution-util/ESpellDictionary.html
-share/gtk-doc/html/evolution-util/ESpellEntry.html
-share/gtk-doc/html/evolution-util/ESpinner.html
-share/gtk-doc/html/evolution-util/EStockRequest.html
-share/gtk-doc/html/evolution-util/ETable.html
-share/gtk-doc/html/evolution-util/ETableClickToAdd.html
-share/gtk-doc/html/evolution-util/ETableCol.html
-share/gtk-doc/html/evolution-util/ETableColumnSelector.html
-share/gtk-doc/html/evolution-util/ETableColumnSpecification.html
-share/gtk-doc/html/evolution-util/ETableConfig.html
-share/gtk-doc/html/evolution-util/ETableExtras.html
-share/gtk-doc/html/evolution-util/ETableFieldChooser.html
-share/gtk-doc/html/evolution-util/ETableFieldChooserDialog.html
-share/gtk-doc/html/evolution-util/ETableFieldChooserItem.html
-share/gtk-doc/html/evolution-util/ETableGroup.html
-share/gtk-doc/html/evolution-util/ETableGroupContainer.html
-share/gtk-doc/html/evolution-util/ETableGroupLeaf.html
-share/gtk-doc/html/evolution-util/ETableHeader.html
-share/gtk-doc/html/evolution-util/ETableHeaderItem.html
-share/gtk-doc/html/evolution-util/ETableItem.html
-share/gtk-doc/html/evolution-util/ETableModel.html
-share/gtk-doc/html/evolution-util/ETableOne.html
-share/gtk-doc/html/evolution-util/ETableSearch.html
-share/gtk-doc/html/evolution-util/ETableSelectionModel.html
-share/gtk-doc/html/evolution-util/ETableSortInfo.html
-share/gtk-doc/html/evolution-util/ETableSorted.html
-share/gtk-doc/html/evolution-util/ETableSortedVariable.html
-share/gtk-doc/html/evolution-util/ETableSorter.html
-share/gtk-doc/html/evolution-util/ETableSpecification.html
-share/gtk-doc/html/evolution-util/ETableState.html
-share/gtk-doc/html/evolution-util/ETableSubset.html
-share/gtk-doc/html/evolution-util/ETableSubsetVariable.html
-share/gtk-doc/html/evolution-util/EText.html
-share/gtk-doc/html/evolution-util/ETextEventProcessor.html
-share/gtk-doc/html/evolution-util/ETextEventProcessorEmacsLike.html
-share/gtk-doc/html/evolution-util/ETextModel.html
-share/gtk-doc/html/evolution-util/ETimezoneDialog.html
-share/gtk-doc/html/evolution-util/ETree.html
-share/gtk-doc/html/evolution-util/ETreeModel.html
-share/gtk-doc/html/evolution-util/ETreeModelGenerator.html
-share/gtk-doc/html/evolution-util/ETreeSelectionModel.html
-share/gtk-doc/html/evolution-util/ETreeTableAdapter.html
-share/gtk-doc/html/evolution-util/ETreeViewFrame.html
-share/gtk-doc/html/evolution-util/EUrlEntry.html
-share/gtk-doc/html/evolution-util/EWebView.html
-share/gtk-doc/html/evolution-util/EWebViewPreview.html
-share/gtk-doc/html/evolution-util/GalView.html
-share/gtk-doc/html/evolution-util/GalViewCollection.html
-share/gtk-doc/html/evolution-util/GalViewEtable.html
-share/gtk-doc/html/evolution-util/GalViewInstance.html
-share/gtk-doc/html/evolution-util/GalViewInstanceSaveAsDialog.html
-share/gtk-doc/html/evolution-util/annotation-glossary.html
-share/gtk-doc/html/evolution-util/api-index-full.html
-share/gtk-doc/html/evolution-util/api-index-2.22.html
-share/gtk-doc/html/evolution-util/api-index-2.24.html
-share/gtk-doc/html/evolution-util/api-index-2.26.html
-share/gtk-doc/html/evolution-util/api-index-2.30.html
-share/gtk-doc/html/evolution-util/api-index-2.32.html
-share/gtk-doc/html/evolution-util/api-index-3.10.html
-share/gtk-doc/html/evolution-util/api-index-3.12.html
-share/gtk-doc/html/evolution-util/api-index-3.16.html
-share/gtk-doc/html/evolution-util/api-index-3.18.html
-share/gtk-doc/html/evolution-util/api-index-3.2.html
-share/gtk-doc/html/evolution-util/api-index-3.20.html
-share/gtk-doc/html/evolution-util/api-index-3.22.html
-share/gtk-doc/html/evolution-util/api-index-3.4.html
-share/gtk-doc/html/evolution-util/api-index-3.6.html
-share/gtk-doc/html/evolution-util/api-index-3.8.html
-share/gtk-doc/html/evolution-util/ch01.html
-share/gtk-doc/html/evolution-util/ch02.html
-share/gtk-doc/html/evolution-util/ch03.html
-share/gtk-doc/html/evolution-util/ch04.html
-share/gtk-doc/html/evolution-util/ch05.html
-share/gtk-doc/html/evolution-util/ch06.html
-share/gtk-doc/html/evolution-util/ch07.html
-share/gtk-doc/html/evolution-util/ch08.html
-share/gtk-doc/html/evolution-util/ch09.html
-share/gtk-doc/html/evolution-util/ch10.html
-share/gtk-doc/html/evolution-util/ch11.html
-share/gtk-doc/html/evolution-util/ch12.html
-share/gtk-doc/html/evolution-util/ch13.html
-share/gtk-doc/html/evolution-util/ch14.html
-share/gtk-doc/html/evolution-util/ch15.html
-share/gtk-doc/html/evolution-util/ch16.html
-share/gtk-doc/html/evolution-util/ch17.html
-share/gtk-doc/html/evolution-util/evolution-util-EContentEditorDialog.html
-share/gtk-doc/html/evolution-util/evolution-util-e-buffer-tagger.html
-share/gtk-doc/html/evolution-util/evolution-util-e-canvas-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-categories-config.html
-share/gtk-doc/html/evolution-util/evolution-util-e-charset.html
-share/gtk-doc/html/evolution-util/evolution-util-e-datetime-format.html
-share/gtk-doc/html/evolution-util/evolution-util-e-dialog-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-dialog-widgets.html
-share/gtk-doc/html/evolution-util/evolution-util-e-emoticon.html
-share/gtk-doc/html/evolution-util/evolution-util-e-file-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-html-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-icon-factory.html
-share/gtk-doc/html/evolution-util/evolution-util-e-misc-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-mktemp.html
-share/gtk-doc/html/evolution-util/evolution-util-e-passwords.html
-share/gtk-doc/html/evolution-util/evolution-util-e-poolv.html
-share/gtk-doc/html/evolution-util/evolution-util-e-popup-menu.html
-share/gtk-doc/html/evolution-util/evolution-util-e-print.html
-share/gtk-doc/html/evolution-util/evolution-util-e-selection.html
-share/gtk-doc/html/evolution-util/evolution-util-e-source-util.html
-share/gtk-doc/html/evolution-util/evolution-util-e-spell-text-view.html
-share/gtk-doc/html/evolution-util/evolution-util-e-table-header-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-table-sorting-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-table-utils.html
-share/gtk-doc/html/evolution-util/evolution-util-e-text-event-processor-types.html
-share/gtk-doc/html/evolution-util/evolution-util-e-text-model-repos.html
-share/gtk-doc/html/evolution-util/evolution-util-e-unicode.html
-share/gtk-doc/html/evolution-util/evolution-util-e-util-enums.html
-share/gtk-doc/html/evolution-util/evolution-util-e-widget-undo.html
-share/gtk-doc/html/evolution-util/evolution-util-e-xml-utils.html
-share/gtk-doc/html/evolution-util/evolution-util.devhelp2
-share/gtk-doc/html/evolution-util/home.png
-share/gtk-doc/html/evolution-util/index.html
-share/gtk-doc/html/evolution-util/left-insensitive.png
-share/gtk-doc/html/evolution-util/left.png
-share/gtk-doc/html/evolution-util/object-tree.html
-share/gtk-doc/html/evolution-util/right-insensitive.png
-share/gtk-doc/html/evolution-util/right.png
-share/gtk-doc/html/evolution-util/style.css
-share/gtk-doc/html/evolution-util/up-insensitive.png
-share/gtk-doc/html/evolution-util/up.png
 share/help/C/evolution/backup-restore.page
 share/help/C/evolution/calendar-alarms-and-reminders.page
 share/help/C/evolution/calendar-caldav.page