Reset back to 2.30.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14369 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 39 insertions, 213 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index cc2a106fc..70c67f67e 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -2,12 +2,13 @@
 # Date created:				28th June 2000
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
-# $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.224 2010/06/07 14:21:48 kwm Exp $
+# $FreeBSD: ports/mail/evolution/Makefile,v 1.183 2010/06/08 19:40:54 makc Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.222 2010/04/27 12:12:48 kwm Exp $
 #
 
 PORTNAME=	evolution
-PORTVERSION=	2.31.3.1
+PORTVERSION=	2.30.1.2
+PORTREVISION=	3
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,10 +18,11 @@ COMMENT=	An integrated mail, calendar and address book distributed suite
 
 LIB_DEPENDS=	nss3.1:${PORTSDIR}/security/nss \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		notify.1:${PORTSDIR}/devel/libnotify \
 		gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview
 RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell
 
+CONFLICTS=	evolution-2.31.*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	build
@@ -32,8 +34,7 @@ USE_AUTOTOOLS=	libtool:22
 USE_GSTREAMER=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
+USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--enable-mono=no \
 		--disable-nm \
@@ -52,7 +53,7 @@ GCONF_SCHEMAS=	apps_evolution_addressbook.schemas \
 		bogo-junk-plugin.schemas \
 		evolution-mail.schemas
 
-EVO_VERSION=	3.0
+EVO_VERSION=	2.30
 PLIST_SUB=	VERSION=${EVO_VERSION} \
 		PORTVERSION=2.12
 
@@ -63,8 +64,6 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 
 .include <bsd.port.pre.mk>
 
-USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
-
 .if defined(WITH_PILOT)
 LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnome-pilot
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 81a31f129..0c6c453a9 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-2.31.3.1.tar.bz2) = 46a170e66d5f5c1a9cc8d1a6702007dc
-SHA256 (gnome2/evolution-2.31.3.1.tar.bz2) = eade60a400fe2d8d6f8a87626a782a2291c2af0c019800e2e9968b236ae1a1b0
-SIZE (gnome2/evolution-2.31.3.1.tar.bz2) = 31294547
+MD5 (gnome2/evolution-2.30.1.2.tar.bz2) = 833d2ccff2a34e595e09fc9d499de231
+SHA256 (gnome2/evolution-2.30.1.2.tar.bz2) = 8b946914e53135edf89f9ddb8667d0ca3d76d37d8c622888befd65b2c4d3ce24
+SIZE (gnome2/evolution-2.30.1.2.tar.bz2) = 30681129
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 569638d76..116deb3d3 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,4 +1,5 @@
 bin/evolution
+bin/evolution-alarm-notify
 bin/evolution-settings
 etc/xdg/autostart/evolution-alarm-notify.desktop
 include/evolution-%%VERSION%%/addressbook/gui/widgets/eab-config.h
@@ -91,6 +92,7 @@ include/evolution-%%VERSION%%/e-util/e-activity.h
 include/evolution-%%VERSION%%/e-util/e-alert-activity.h
 include/evolution-%%VERSION%%/e-util/e-alert-dialog.h
 include/evolution-%%VERSION%%/e-util/e-alert.h
+include/evolution-%%VERSION%%/e-util/e-bconf-map.h
 include/evolution-%%VERSION%%/e-util/e-binding.h
 include/evolution-%%VERSION%%/e-util/e-bit-array.h
 include/evolution-%%VERSION%%/e-util/e-categories-config.h
@@ -103,6 +105,7 @@ include/evolution-%%VERSION%%/e-util/e-event.h
 include/evolution-%%VERSION%%/e-util/e-extensible.h
 include/evolution-%%VERSION%%/e-util/e-extension.h
 include/evolution-%%VERSION%%/e-util/e-file-utils.h
+include/evolution-%%VERSION%%/e-util/e-folder-map.h
 include/evolution-%%VERSION%%/e-util/e-html-utils.h
 include/evolution-%%VERSION%%/e-util/e-icon-factory.h
 include/evolution-%%VERSION%%/e-util/e-io-activity.h
@@ -115,7 +118,6 @@ include/evolution-%%VERSION%%/e-util/e-non-intrusive-error-dialog.h
 include/evolution-%%VERSION%%/e-util/e-plugin-ui.h
 include/evolution-%%VERSION%%/e-util/e-plugin-util.h
 include/evolution-%%VERSION%%/e-util/e-plugin.h
-include/evolution-%%VERSION%%/e-util/e-poolv.h
 include/evolution-%%VERSION%%/e-util/e-print.h
 include/evolution-%%VERSION%%/e-util/e-profile-event.h
 include/evolution-%%VERSION%%/e-util/e-selection.h
@@ -269,8 +271,9 @@ include/evolution-%%VERSION%%/misc/e-signature-manager.h
 include/evolution-%%VERSION%%/misc/e-signature-preview.h
 include/evolution-%%VERSION%%/misc/e-signature-script-dialog.h
 include/evolution-%%VERSION%%/misc/e-signature-tree-view.h
+include/evolution-%%VERSION%%/misc/e-spinner.c
+include/evolution-%%VERSION%%/misc/e-spinner.h
 include/evolution-%%VERSION%%/misc/e-web-view.h
-include/evolution-%%VERSION%%/misc/e-web-view-preview.h
 include/evolution-%%VERSION%%/misc/e-url-entry.h
 include/evolution-%%VERSION%%/misc/ea-calendar-cell.h
 include/evolution-%%VERSION%%/misc/ea-calendar-item.h
@@ -478,9 +481,6 @@ lib/evolution/%%VERSION%%/libmenus.a
 lib/evolution/%%VERSION%%/libmenus.la
 lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
-lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.a
-lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.la
-lib/evolution/%%VERSION%%/modules/libevolution-module-mailto-handler.so
 lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-addressbook.so
@@ -493,9 +493,6 @@ lib/evolution/%%VERSION%%/modules/libevolution-module-mail.so
 lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.a
 lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.la
 lib/evolution/%%VERSION%%/modules/libevolution-module-plugin-lib.so
-lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.a
-lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.la
-lib/evolution/%%VERSION%%/modules/libevolution-module-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
@@ -517,6 +514,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-mailer.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so
@@ -535,6 +535,9 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-caldav.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-google.so
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.a
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.la
+lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.a
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-webdav.so
@@ -594,12 +597,14 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml
+lib/evolution/%%VERSION%%/plugins/org-gnome-default-mailer.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-attachment-reminder.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-caldav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-google.eplug
+lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-webdav.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-groupwise-features.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-image-inline.eplug
@@ -624,14 +629,10 @@ libdata/pkgconfig/evolution-shell.pc
 libexec/evolution/%%VERSION%%/csv2vcard
 libexec/evolution/%%VERSION%%/evolution-addressbook-clean
 libexec/evolution/%%VERSION%%/evolution-addressbook-export
-libexec/evolution/%%VERSION%%/evolution-alarm-notify
 libexec/evolution/%%VERSION%%/evolution-backup
 libexec/evolution/%%VERSION%%/killev
 share/applications/evolution.desktop
 share/applications/evolution-settings.desktop
-share/doc/eshell/EExtensible.html
-share/doc/eshell/EExtension.html
-share/doc/eshell/EModule.html
 share/doc/eshell/EShell.html
 share/doc/eshell/EShellBackend.html
 share/doc/eshell/EShellContent.html
@@ -646,17 +647,16 @@ share/doc/eshell/ch01.html
 share/doc/eshell/ch02.html
 share/doc/eshell/ch03.html
 share/doc/eshell/ch04.html
-share/doc/eshell/ch05.html
 share/doc/eshell/eshell-Action-Groups.html
 share/doc/eshell/eshell-Bit-Arrays-(Legacy).html
 share/doc/eshell/eshell-Categories.html
 share/doc/eshell/eshell-Container-for-Signatures.html
 share/doc/eshell/eshell-Date-and-Time-Formatting.html
 share/doc/eshell/eshell-Dialog-Utilities-(Legacy).html
-share/doc/eshell/eshell-EPoolv.html
 share/doc/eshell/eshell-Error-Logging.html
 share/doc/eshell/eshell-GConf-Bridge.html
 share/doc/eshell/eshell-GObject-Property-Bindings.html
+share/doc/eshell/eshell-Generic-Module-Loader.html
 share/doc/eshell/eshell-Icon-Utilities-(Legacy).html
 share/doc/eshell/eshell-Mail-Accounts.html
 share/doc/eshell/eshell-Miscellaneous-Utilities.html
@@ -713,6 +713,7 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/errors/mail.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-attachment-reminder.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-backup-restore.error
+%%DATADIR%%/%%VERSION%%/errors/org-gnome-default-mailer.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-itip-formatter.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mail-retract.error
 %%DATADIR%%/%%VERSION%%/errors/org-gnome-mailing-list-actions.error
@@ -753,8 +754,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_bell.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_contact-list.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-note.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-rule.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_insert-table.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-filters-apply.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup-done.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_mail-flag-for-followup.png
@@ -771,7 +770,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-assigned.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task-recurring.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_task.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_text-monospaced.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_timezone.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_todo.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/16x16/actions/stock_video-conferencing.png
@@ -800,8 +798,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/22x22/actions/view-calendar-workweek.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_contact-list.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-note.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-rule.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_insert-table.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-filters-apply.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-open-multiple.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_mail-unread-multiple.png
@@ -816,7 +812,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_task-assigned.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_task-recurring.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_task.png
-%%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_text-monospaced.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_timezone.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_todo.png
 %%DATADIR%%/%%VERSION%%/icons/hicolor/24x24/actions/stock_video-conferencing.png
@@ -874,185 +869,6 @@ share/doc/eshell/up.png
 %%DATADIR%%/%%VERSION%%/images/minus.png
 %%DATADIR%%/%%VERSION%%/images/plus.png
 %%DATADIR%%/%%VERSION%%/images/world_map-960.png
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/a.memail.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/abc.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/agate.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/amail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/amber.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/amethyst.broba.cc
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/aol.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/apost.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/aqua.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/arcor.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ballade.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/bay.gunmanet.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/bb-niigata.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/bc.iij4u.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/beige.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/blue.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/bmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/bolero.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/bpost.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/brown.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/camel.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cameo.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cc9.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cek.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/clio.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/co1.wind.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/co2.wind.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/co3.wind.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cocoa.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/coda.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/comcast.net
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/concerto.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/coral.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/courante.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cpost.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/cream.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/dan.gunmanet.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/dance.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/dmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/e23.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/earthlink.net
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ebony.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/email.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/fantasy.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/flamenco.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/fmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/free.fr
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/freenet.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/fuga.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmail.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmx.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/gmx.net
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/go.tvm.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/goo.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/googlemail.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/grape.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/gray.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hal.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hana.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.co.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.co.uk
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.fr
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/hotmail.it
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ic-net.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/iiyama-catv.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/imail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/inbox.lt
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/inbox.lv
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/indigo.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/inet-shibata.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ivory.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/iwafune.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/jade.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/janis.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/jet.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ji.jet.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/jmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/k1.wind.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/khaki.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/kmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/kokuyou.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/lapis.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/laposte.net
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/lemon.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/lilac.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/lime.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.co.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.co.uk
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.fr
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/live.it
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ma100.tiki.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/mac.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/mahoroba.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/mail.gunmanet.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/mail.iwafune.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/maroon.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/me.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/minuet.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ml.murakami.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ml.shibata.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/mnet.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/mopera.net
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/msn.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/navy.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/nifty.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/nsat.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/olive.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/online.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/opal.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/orange.fr
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/orange.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/orchid.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/pal.kijimadaira.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/palette.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/parabox.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/peach.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/peoplepc.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/plum.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/po.dcn.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/po.wind.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/polka.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/pop.shibata.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/purple.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/rainbow.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/red.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/rmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/rondo.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/rose.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/rouge.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ruby.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/sakunet.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/sea.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/sepia.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/serenade.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/silk.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/silver.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/sky.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/smail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/snow.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/so.wind.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/sonata.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/suite.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/symphony.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/t-online.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/taupe.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/tiki.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/tmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/toccata.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/topaz.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/trio.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/umail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/verizon.net
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/violet.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/vm.aikis.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/vmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/vp.tiki.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/waltz.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/wanadoo.fr
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/wave.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/web.de
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/white.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/wine.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/wmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/xmail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/xp.wind.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/xpost.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/xs4all.nl
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/yahoo.com
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ybb.ne.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/yellow.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ymail.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/ypost.plala.or.jp
-%%DATADIR%%/%%VERSION%%/mail-autoconfig/zmail.plala.or.jp
 %%DATADIR%%/%%VERSION%%/memotypes.xml
 %%DATADIR%%/%%VERSION%%/searchtypes.xml
 %%DATADIR%%/%%VERSION%%/sounds/default_alarm.wav
@@ -1155,6 +971,7 @@ share/gnome/help/evolution/C/figures/evo_label_a.png
 share/gnome/help/evolution/C/figures/evo_labels_a.png
 share/gnome/help/evolution/C/figures/evo_mail_a.png
 share/gnome/help/evolution/C/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/C/figures/evo_mail_notifier.png
 share/gnome/help/evolution/C/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/C/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/C/figures/evo_memo_a.png
@@ -1221,6 +1038,7 @@ share/gnome/help/evolution/cs/figures/evo_label_a.png
 share/gnome/help/evolution/cs/figures/evo_labels_a.png
 share/gnome/help/evolution/cs/figures/evo_mail_a.png
 share/gnome/help/evolution/cs/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/cs/figures/evo_mail_notifier.png
 share/gnome/help/evolution/cs/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/cs/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/cs/figures/evo_memo_a.png
@@ -1287,6 +1105,7 @@ share/gnome/help/evolution/de/figures/evo_label_a.png
 share/gnome/help/evolution/de/figures/evo_labels_a.png
 share/gnome/help/evolution/de/figures/evo_mail_a.png
 share/gnome/help/evolution/de/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/de/figures/evo_mail_notifier.png
 share/gnome/help/evolution/de/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/de/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/de/figures/evo_memo_a.png
@@ -1353,6 +1172,7 @@ share/gnome/help/evolution/el/figures/evo_label_a.png
 share/gnome/help/evolution/el/figures/evo_labels_a.png
 share/gnome/help/evolution/el/figures/evo_mail_a.png
 share/gnome/help/evolution/el/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/el/figures/evo_mail_notifier.png
 share/gnome/help/evolution/el/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/el/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/el/figures/evo_memo_a.png
@@ -1419,6 +1239,7 @@ share/gnome/help/evolution/en_GB/figures/evo_label_a.png
 share/gnome/help/evolution/en_GB/figures/evo_labels_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/en_GB/figures/evo_mail_notifier.png
 share/gnome/help/evolution/en_GB/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/en_GB/figures/evo_memo_a.png
@@ -1485,6 +1306,7 @@ share/gnome/help/evolution/es/figures/evo_label_a.png
 share/gnome/help/evolution/es/figures/evo_labels_a.png
 share/gnome/help/evolution/es/figures/evo_mail_a.png
 share/gnome/help/evolution/es/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/es/figures/evo_mail_notifier.png
 share/gnome/help/evolution/es/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/es/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/es/figures/evo_memo_a.png
@@ -1551,6 +1373,7 @@ share/gnome/help/evolution/eu/figures/evo_label_a.png
 share/gnome/help/evolution/eu/figures/evo_labels_a.png
 share/gnome/help/evolution/eu/figures/evo_mail_a.png
 share/gnome/help/evolution/eu/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/eu/figures/evo_mail_notifier.png
 share/gnome/help/evolution/eu/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/eu/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/eu/figures/evo_memo_a.png
@@ -1617,6 +1440,7 @@ share/gnome/help/evolution/fr/figures/evo_label_a.png
 share/gnome/help/evolution/fr/figures/evo_labels_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_a.png
 share/gnome/help/evolution/fr/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/fr/figures/evo_mail_notifier.png
 share/gnome/help/evolution/fr/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/fr/figures/evo_memo_a.png
@@ -1683,6 +1507,7 @@ share/gnome/help/evolution/mk/figures/evo_label_a.png
 share/gnome/help/evolution/mk/figures/evo_labels_a.png
 share/gnome/help/evolution/mk/figures/evo_mail_a.png
 share/gnome/help/evolution/mk/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/mk/figures/evo_mail_notifier.png
 share/gnome/help/evolution/mk/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/mk/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/mk/figures/evo_memo_a.png
@@ -1749,6 +1574,7 @@ share/gnome/help/evolution/oc/figures/evo_label_a.png
 share/gnome/help/evolution/oc/figures/evo_labels_a.png
 share/gnome/help/evolution/oc/figures/evo_mail_a.png
 share/gnome/help/evolution/oc/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/oc/figures/evo_mail_notifier.png
 share/gnome/help/evolution/oc/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/oc/figures/evo_memo_a.png
@@ -1815,6 +1641,7 @@ share/gnome/help/evolution/ru/figures/evo_label_a.png
 share/gnome/help/evolution/ru/figures/evo_labels_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_a.png
 share/gnome/help/evolution/ru/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/ru/figures/evo_mail_notifier.png
 share/gnome/help/evolution/ru/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/ru/figures/evo_memo_a.png
@@ -1881,6 +1708,7 @@ share/gnome/help/evolution/sv/figures/evo_label_a.png
 share/gnome/help/evolution/sv/figures/evo_labels_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_a.png
 share/gnome/help/evolution/sv/figures/evo_mail_callout_a.png
+share/gnome/help/evolution/sv/figures/evo_mail_notifier.png
 share/gnome/help/evolution/sv/figures/evo_maildirreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_mboxreceive_a.png
 share/gnome/help/evolution/sv/figures/evo_memo_a.png
@@ -1947,7 +1775,6 @@ share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/as/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/ast/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo
-share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/be@latin/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo
@@ -2028,6 +1855,7 @@ share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
+share/mime-info/evolution.keys
 share/mime-info/evolution.mime
 share/omf/evolution/evolution-C.omf
 share/omf/evolution/evolution-cs.omf
@@ -2075,7 +1903,6 @@ share/omf/evolution/evolution-sv.omf
 @dirrm %%DATADIR%%/%%VERSION%%/views
 @dirrm %%DATADIR%%/%%VERSION%%/ui
 @dirrm %%DATADIR%%/%%VERSION%%/sounds
-@dirrm %%DATADIR%%/%%VERSION%%/mail-autoconfig
 @dirrm %%DATADIR%%/%%VERSION%%/images
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/actions
 @dirrm %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable