Update mail/evo, mail/evo-ews and databases/e-d-s to 3.12.4. Drop :keepla

from ews and evo and keep it in e-d-s because it is still needed by a
few ports that need testing.


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

3 files changed, 6 insertions, 67 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9900852d5..740d3a33f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	evolution
-PORTVERSION=	3.12.3
+PORTVERSION=	3.12.4
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss \
 		libnotify.so:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	highlight:${PORTSDIR}/textproc/highlight
 
-USES=		desktop-file-utils bison gettext gmake libtool:keepla \
+USES=		desktop-file-utils bison gettext gmake libtool \
 		pathfix perl5 pkgconfig tar:xz
 USE_GNOME=	evolutiondataserver3 gnomedesktop3 gnomeprefix gtkhtml4 \
 		intlhack
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index b1df3a62f..a2a19a11c 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-3.12.3.tar.xz) = 980988cf3d1f537102f4a3143a2c251ac812666b8f0936afd6bdde0fe5a96fea
-SIZE (gnome3/evolution-3.12.3.tar.xz) = 12123820
+SHA256 (gnome3/evolution-3.12.4.tar.xz) = 4e52f46038a859179a2a20c13d2bf9ad6ea240f03ec9e54661f813b0582905a2
+SIZE (gnome3/evolution-3.12.4.tar.xz) = 12135060
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 3fb3836ca..3a9debf28 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -225,6 +225,7 @@ include/evolution-%%VERSION%%/e-util/e-source-selector.h
 include/evolution-%%VERSION%%/e-util/e-source-util.h
 include/evolution-%%VERSION%%/e-util/e-spell-entry.h
 include/evolution-%%VERSION%%/e-util/e-spell-text-view.h
+include/evolution-%%VERSION%%/e-util/e-spinner.h
 include/evolution-%%VERSION%%/e-util/e-stock-request.h
 include/evolution-%%VERSION%%/e-util/e-table-click-to-add.h
 include/evolution-%%VERSION%%/e-util/e-table-col-dnd.h
@@ -458,131 +459,68 @@ include/evolution-%%VERSION%%/shell/e-shell-view.h
 include/evolution-%%VERSION%%/shell/e-shell-window-actions.h
 include/evolution-%%VERSION%%/shell/e-shell-window.h
 include/evolution-%%VERSION%%/shell/e-shell.h
-lib/evolution/%%VERSION%%/libeabutil.la
 lib/evolution/%%VERSION%%/libeabutil.so
-lib/evolution/%%VERSION%%/libecontacteditor.la
 lib/evolution/%%VERSION%%/libecontacteditor.so
-lib/evolution/%%VERSION%%/libecontactlisteditor.la
 lib/evolution/%%VERSION%%/libecontactlisteditor.so
-lib/evolution/%%VERSION%%/libemail-engine.la
 lib/evolution/%%VERSION%%/libemail-engine.so
-lib/evolution/%%VERSION%%/libessmime.la
 lib/evolution/%%VERSION%%/libessmime.so
-lib/evolution/%%VERSION%%/libevolution-addressbook-importers.la
 lib/evolution/%%VERSION%%/libevolution-addressbook-importers.so
-lib/evolution/%%VERSION%%/libevolution-calendar-importers.la
 lib/evolution/%%VERSION%%/libevolution-calendar-importers.so
-lib/evolution/%%VERSION%%/libevolution-calendar.la
 lib/evolution/%%VERSION%%/libevolution-calendar.so
-lib/evolution/%%VERSION%%/libevolution-mail-composer.la
 lib/evolution/%%VERSION%%/libevolution-mail-composer.so
-lib/evolution/%%VERSION%%/libevolution-mail-formatter.la
 lib/evolution/%%VERSION%%/libevolution-mail-formatter.so
-lib/evolution/%%VERSION%%/libevolution-mail-importers.la
 lib/evolution/%%VERSION%%/libevolution-mail-importers.so
-lib/evolution/%%VERSION%%/libevolution-mail.la
 lib/evolution/%%VERSION%%/libevolution-mail.so
-lib/evolution/%%VERSION%%/libevolution-shell.la
 lib/evolution/%%VERSION%%/libevolution-shell.so
-lib/evolution/%%VERSION%%/libevolution-smime.la
 lib/evolution/%%VERSION%%/libevolution-smime.so
-lib/evolution/%%VERSION%%/libevolution-util.la
 lib/evolution/%%VERSION%%/libevolution-util.so
-lib/evolution/%%VERSION%%/libgnomecanvas.la
 lib/evolution/%%VERSION%%/libgnomecanvas.so
-lib/evolution/%%VERSION%%/modules/module-addressbook.la
 lib/evolution/%%VERSION%%/modules/module-addressbook.so
-lib/evolution/%%VERSION%%/modules/module-backup-restore.la
 lib/evolution/%%VERSION%%/modules/module-backup-restore.so
-%%BOGOFILTER%%lib/evolution/%%VERSION%%/modules/module-bogofilter.la
 %%BOGOFILTER%%lib/evolution/%%VERSION%%/modules/module-bogofilter.so
-lib/evolution/%%VERSION%%/modules/module-book-config-google.la
 lib/evolution/%%VERSION%%/modules/module-book-config-google.so
-%%LDAP%%lib/evolution/%%VERSION%%/modules/module-book-config-ldap.la
 %%LDAP%%lib/evolution/%%VERSION%%/modules/module-book-config-ldap.so
-lib/evolution/%%VERSION%%/modules/module-book-config-local.la
 lib/evolution/%%VERSION%%/modules/module-book-config-local.so
-lib/evolution/%%VERSION%%/modules/module-book-config-webdav.la
 lib/evolution/%%VERSION%%/modules/module-book-config-webdav.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-caldav.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-caldav.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-contacts.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-contacts.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-google.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-google.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-local.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-local.so
-%%WEATHER%%lib/evolution/%%VERSION%%/modules/module-cal-config-weather.la
 %%WEATHER%%lib/evolution/%%VERSION%%/modules/module-cal-config-weather.so
-lib/evolution/%%VERSION%%/modules/module-cal-config-webcal.la
 lib/evolution/%%VERSION%%/modules/module-cal-config-webcal.so
-lib/evolution/%%VERSION%%/modules/module-calendar.la
 lib/evolution/%%VERSION%%/modules/module-calendar.so
-lib/evolution/%%VERSION%%/modules/module-composer-autosave.la
 lib/evolution/%%VERSION%%/modules/module-composer-autosave.so
-lib/evolution/%%VERSION%%/modules/module-contact-photos.la
 lib/evolution/%%VERSION%%/modules/module-contact-photos.so
-lib/evolution/%%VERSION%%/modules/module-gravatar.la
 lib/evolution/%%VERSION%%/modules/module-gravatar.so
-lib/evolution/%%VERSION%%/modules/module-itip-formatter.la
 lib/evolution/%%VERSION%%/modules/module-itip-formatter.so
-lib/evolution/%%VERSION%%/modules/module-mail-config.la
 lib/evolution/%%VERSION%%/modules/module-mail-config.so
-lib/evolution/%%VERSION%%/modules/module-mail.la
 lib/evolution/%%VERSION%%/modules/module-mail.so
-lib/evolution/%%VERSION%%/modules/module-mailto-handler.la
 lib/evolution/%%VERSION%%/modules/module-mailto-handler.so
-lib/evolution/%%VERSION%%/modules/module-mdn.la
 lib/evolution/%%VERSION%%/modules/module-mdn.so
-lib/evolution/%%VERSION%%/modules/module-offline-alert.la
 lib/evolution/%%VERSION%%/modules/module-offline-alert.so
-lib/evolution/%%VERSION%%/modules/module-plugin-lib.la
 lib/evolution/%%VERSION%%/modules/module-plugin-lib.so
-lib/evolution/%%VERSION%%/modules/module-plugin-manager.la
 lib/evolution/%%VERSION%%/modules/module-plugin-manager.so
-lib/evolution/%%VERSION%%/modules/module-prefer-plain.la
 lib/evolution/%%VERSION%%/modules/module-prefer-plain.so
-lib/evolution/%%VERSION%%/modules/module-settings.la
 lib/evolution/%%VERSION%%/modules/module-settings.so
-%%SPAMASSASSIN%%lib/evolution/%%VERSION%%/modules/module-spamassassin.la
 %%SPAMASSASSIN%%lib/evolution/%%VERSION%%/modules/module-spamassassin.so
-lib/evolution/%%VERSION%%/modules/module-startup-wizard.la
 lib/evolution/%%VERSION%%/modules/module-startup-wizard.so
-lib/evolution/%%VERSION%%/modules/module-text-highlight.la
 lib/evolution/%%VERSION%%/modules/module-text-highlight.so
-lib/evolution/%%VERSION%%/modules/module-vcard-inline.la
 lib/evolution/%%VERSION%%/modules/module-vcard-inline.so
-lib/evolution/%%VERSION%%/modules/module-web-inspector.la
 lib/evolution/%%VERSION%%/modules/module-web-inspector.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-dbx-import.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-email-custom-header.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-attachment-reminder.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-external-editor.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-external-editor.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-face.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-notification.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
-%%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.la
 %%PST%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-pst-import.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-publish-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.la
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-templates.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-dbx-import.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-email-custom-header.eplug
@@ -1156,6 +1094,7 @@ share/applications/evolution.desktop
 %%DATADIR%%/%%VERSION%%/icons/hicolor/scalable/apps/im-yahoo.svg
 %%DATADIR%%/%%VERSION%%/images/minus.png
 %%DATADIR%%/%%VERSION%%/images/plus.png
+%%DATADIR%%/%%VERSION%%/images/working.png
 %%DATADIR%%/%%VERSION%%/images/world_map-960.png
 %%DATADIR%%/%%VERSION%%/memotypes.xml
 %%DATADIR%%/%%VERSION%%/searchtypes.xml