gentoo resync : 21.07.2018

11 files changed, 368 insertions, 113 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 6b00c82646da..aa7003604568 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 1a6ab79fdf25..e4eec92db213 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,5 +1,7 @@
-DIST balsa-2.5.2.tar.bz2 4049163 BLAKE2B 7435c7831d528b3ab6d2783211023e3686e94b266ed0804ecb2d9605add6c3826b029c679d137bb3e176b112b11bc68a7e9fd828bc18c2e5c5636b8ef8ec85e4 SHA512 f7a9127d87869d57acebaf33f9e3e4b82c5a5ba90aa5304ce40ba48a1a7f01eaf602555f8e97bce70b0baeb2ac8b5ac12941eaa8b85be1886bf22f7767dd75ba
+AUX balsa-2.5.6-fix-older-webkit1.patch 5887 BLAKE2B 50f168661e61ceebefebf75eb710575747835d4000bb6d3a699408842833aa34778a6f4686f2f84b9dcbf46355b74c1148b58e4bf4655656f0db6080e1ade0b5 SHA512 b70824443d91aaeba035de9615c7699d73e78e4f5293ad9b9e8d62e1ba3488f355071e519c2c988b5ed944debbd978f3e7ea74f286b4225761bc9c54cb5545af
+AUX balsa-2.5.6-fix-older-webkit2.patch 1601 BLAKE2B a07266737af3a755e9b2113be0d3d5352b548ef73a41d4af62ca8298c2e86540e34686c7c45a683c6152e89c41655cd5e134209803c9601f1ba4d26b2da07a07 SHA512 45c47ca20818dd46a916c57135a5617006bbc055c343705b5596845b31a7df02ee30a21ee83edb73b85a12f5c0705541fd77c45c30ab64c4c1a07102ac0fe722
 DIST balsa-2.5.3.tar.bz2 4333815 BLAKE2B ba8715108cf1122152c069130911275175d5c45ca12e85f1165cb7e86680015d6effd1ea5aaaebd5b154f67fc13002bd26ad0f0d7942253b2483896dd28a50fd SHA512 34e69be050f6c502fa6651029b7d93bf9b7842bbe8489669924563c086def4dbe72109ba5244e0cacf3ef69d3d9d8c5679f870acf564b5551920fa77012e1ff8
-EBUILD balsa-2.5.2-r1.ebuild 2573 BLAKE2B ee91a813897fb5865eb2407f131a6b193c78dd368bdc249fa471f0639d5022e7918da30a6db0da73b16e69ee9f4a48139c0c2972dfd50304ddde9c0610a08b77 SHA512 87414906f0a40d7ccf62ff76cefa2583bb99ea9f07a366f8964f4305424ae5f7034bc2c046a3181b11f4342cfac7eac6ffb9358b030ddb7dd8395bbccb37182b
+DIST balsa-2.5.6.tar.bz2 4468877 BLAKE2B 1e7f678c69121fe3472bbba8dc3d2a62680e1969934580a8a85725e84676531f1efb8432380c2d537ca584001c5cecd5c76cd033a1c1e68a292fc765bbc15f8d SHA512 a9c8094ac48b9b1a0971fe45a4658b728f93ad170ad7884c9554420a4696a7b6f5b3661bde8ab070f6a5c14a80f67551745e1d40905881429ae1d8e5874e9a68
 EBUILD balsa-2.5.3-r1.ebuild 2115 BLAKE2B 26c3bf7c82b1e28142592b0be6804e56ccd89efa7cf30614e80778bd776cc8d996162bd6ae984f3757e1849b02d25a61d6f1183495f2cf80588c22b6c1c43496 SHA512 c5001e1bb1ab9809d3f7dfcafecb0ba713bcb034744bd691f227149179996e8b935b61b23881497d0cd355be32c14b7e3d8a33bfe7aef18c46ea6af73d1b01ea
-MISC metadata.xml 525 BLAKE2B 3afe2cdc67ef1373e7f1db8421db62d12dab1288b8c46787e1adfdd8a6cf4cf3df7514222dd2a17c2ffcef88c6be10a77f35981c2a95c81d9ffc6631f62b9acb SHA512 2cff8f1968d1d1656b2eb01b1a373483a2168a4cdf2556c8cd7a4558f3e0821b816fc7cc2e1476ee8a8fe90622835c6b10e392b6ea7e64eba592c6f50922d4fe
+EBUILD balsa-2.5.6-r1.ebuild 1967 BLAKE2B f228287f032aff01d0f6755459a474ab84d0fc5c80d7fea79f70ed747cf51e71e77d38a2551e87a395a5b16c5a66e28b4c99d45ab267cd60df2439ed72b2b8fe SHA512 0694ed959126fec8e94212c79b68a1a1ad9c1696d8102591954696612d0f75f6ea62e99fc920b319604855964c950709bddc874bde771b537634c23ad65eca83
+MISC metadata.xml 397 BLAKE2B a3e92ebea646f1e37ad27a49e5550d95a0182109ecc3d7c3f448382c28281fbbb8fe71d74789544035b249f663b4803cd711c91635e5f8e4aee616c64a0868cd SHA512 4516e80231827cefbd4f6bdeac5fb7d1281c2c630bc5929cdf016d4887bfb80aec610addad886224dfd229189daa515c9d259176ed69cef62e97e799b9ceda4c
diff --git a/mail-client/balsa/balsa-2.5.2-r1.ebuild b/mail-client/balsa/balsa-2.5.2-r1.ebuild
deleted file mode 100644
index 7cfc68bf4b5c..000000000000
--- a/mail-client/balsa/balsa-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Email client for GNOME"
-HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
-SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-
-IUSE="crypt gnome gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify libressl rubrica sqlite ssl webkit xface"
-REQUIRED_USE="gtkhtml? ( !webkit )"
-
-# TODO: esmtp can be optional, do we want it?
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.4.0:3
-	dev-libs/gmime:2.6
-	>=net-libs/libesmtp-1.0.3:=
-	net-mail/mailbase
-	media-libs/libcanberra:=[gtk3]
-	x11-themes/hicolor-icon-theme
-	x11-themes/adwaita-icon-theme
-	crypt? ( >=app-crypt/gpgme-1.0:= )
-	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gtkhtml? ( gnome-extra/gtkhtml:4.0 )
-	sqlite? ( >=dev-db/sqlite-2.8:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	gtkspell? ( >=app-text/gtkspell-3.0.3:3 )
-	!gtkspell? ( app-text/enchant )
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	rubrica? ( dev-libs/libxml2:2 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	webkit? ( net-libs/webkit-gtk:4 )
-	xface? ( >=media-libs/compface-1.5.1:= )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750516
-	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750515
-	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	if use crypt ; then
-		myconf+=" --with-gpgme=gpgme-config"
-	else
-		myconf+=" --without-gpgme"
-	fi
-
-	if use webkit || use gtkhtml; then
-		if use gtkhtml ; then
-			myconf+=" --with-html-widget=gtkhtml4"
-		else
-			myconf+=" --with-html-widget=webkit2"
-		fi
-	else
-		myconf+=" --with-html-widget=no"
-	fi
-
-	gnome2_src_configure \
-		--disable-pcre \
-		--enable-gregex \
-		--enable-threads \
-		--with-gmime=2.6 \
-		--with-canberra \
-		$(use_with gnome) \
-		$(use_with gnome gtksourceview) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with gtkspell) \
-		$(use_with kerberos gss) \
-		$(use_with ldap) \
-		$(use_with libnotify) \
-		$(use_with rubrica) \
-		$(use_with sqlite) \
-		$(use_with ssl) \
-		$(use_with xface compface) \
-		${myconf}
-}
diff --git a/mail-client/balsa/balsa-2.5.6-r1.ebuild b/mail-client/balsa/balsa-2.5.6-r1.ebuild
new file mode 100644
index 000000000000..0a890dc87df1
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface"
+
+# TODO: internal spell checking via enchant-2 instead of gtkspell/gspell?
+RDEPEND="
+	>=app-text/gspell-1.2:0=
+	>=dev-libs/glib-2.40.0:2
+	net-libs/gnutls:=
+	>=x11-libs/gtk+-3.10.0:3
+	dev-libs/gmime:2.6
+	net-mail/mailbase
+	media-libs/libcanberra:=[gtk3]
+	x11-themes/hicolor-icon-theme
+	x11-themes/adwaita-icon-theme
+	crypt? ( >=app-crypt/gpgme-1.5.0:= )
+	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	rubrica? ( dev-libs/libxml2:2 )
+	webkit? (
+		net-libs/webkit-gtk:4
+		app-text/html2text
+	)
+	xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-update-icon-cache
+	app-text/yelp-tools
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-libs/libxml2:2
+"
+
+PATCHES=( "$FILESDIR"/${P}-fix-older-webkit{1,2}.patch )
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-canberra \
+		--with-spell-checker=gspell \
+		$(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
+		$(use_with gnome) \
+		$(use_with gnome gtksourceview) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with kerberos gss) \
+		$(use_with ldap) \
+		$(use_with libnotify) \
+		$(use_with rubrica) \
+		$(use_with sqlite) \
+		$(use_with xface compface) \
+		$(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
+}
diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
new file mode 100644
index 000000000000..227e2ac04b4f
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit1.patch
@@ -0,0 +1,156 @@
+From ea37ea940dfbcc4e6bcf8327194857a7b306a278 Mon Sep 17 00:00:00 2001
+From: Peter Bloomfield
+Date: Sat, 7 Jul 2018 14:44:26 -0400
+Subject: [PATCH] Use g_debug() instead of conditional compilation
+
+* libbalsa/html.c (lbh_navigation_policy_decision),
+  (lbh_new_window_policy_decision), (lbh_response_policy_decision),
+  (lbh_resource_notify_response_cb), (lbh_web_process_crashed_cb),
+  (lbh_cid_cb), (libbalsa_html_new): Use g_debug() instead of
+  conditionally compiled printing.
+---
+ libbalsa/html.c | 52 ++++++++++++++++++++++++-------------------------
+ 2 files changed, 25 insertions(+), 27 deletions(-)
+
+diff --git a/libbalsa/html.c b/libbalsa/html.c
+index 17f62789e..1e5e2f500 100644
+--- a/libbalsa/html.c
++++ b/libbalsa/html.c
+@@ -44,6 +44,11 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ 
++#ifdef G_LOG_DOMAIN
++#  undef G_LOG_DOMAIN
++#endif
++#define G_LOG_DOMAIN "html"
++
+ #ifdef HAVE_HTML_WIDGET
+ 
+ /*
+@@ -141,13 +146,6 @@ html2text(gchar ** text, gsize len)
+  * Experimental support for WebKit2.
+  */
+ 
+-#define DEBUG_WEBKIT2 FALSE
+-#if DEBUG_WEBKIT2
+-#define d(x) x
+-#else
+-#define d(x)
+-#endif
+-
+ /* WebKitContextMenuItem uses GtkAction, which is deprecated.
+  * We don't use it, but it breaks the git-tree build, so we just mangle
+  * it: */
+@@ -280,10 +278,10 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision,
+ 
+     switch (navigation_type) {
+     case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED:
+-        d(g_print("%s clicked %s\n", __func__, uri));
++        g_debug("%s clicked %s", __func__, uri);
+         (*info->clicked_cb) (uri);
+     default:
+-        d(g_print("%s uri %s, type %d, ignored\n", __func__, uri, navigation_type));
++        g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
+         webkit_policy_decision_ignore(decision);
+     }
+ }
+@@ -305,13 +303,13 @@ lbh_new_window_policy_decision(WebKitPolicyDecision * decision,
+             (navigation_action)) {
+     case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED:
+         request = webkit_navigation_action_get_request(navigation_action);
+-        d(g_print("%s clicked %s\n", __func__,
+-                  webkit_uri_request_get_uri(request)));
++        g_debug("%s clicked %s", __func__,
++                webkit_uri_request_get_uri(request));
+         (*info->clicked_cb) (webkit_uri_request_get_uri(request));
+     default:
+-        d(g_print("%s type %d, ignored\n", __func__,
+-                  webkit_navigation_action_get_navigation_type
+-                  (navigation_action)));
++        g_debug("%s type %d, ignored", __func__,
++                webkit_navigation_action_get_navigation_type
++                (navigation_action));
+ 
+         webkit_policy_decision_ignore(decision);
+     }
+@@ -321,10 +319,10 @@ static void
+ lbh_response_policy_decision(WebKitPolicyDecision * decision,
+                              gpointer               data)
+ {
+-    d(g_print("%s uri %s, ignored\n", __func__,
+-              webkit_uri_request_get_uri
+-              (webkit_response_policy_decision_get_request
+-               (WEBKIT_RESPONSE_POLICY_DECISION(decision)))));
++    g_debug("%s uri %s, ignored", __func__,
++            webkit_uri_request_get_uri
++            (webkit_response_policy_decision_get_request
++             (WEBKIT_RESPONSE_POLICY_DECISION(decision))));
+     webkit_policy_decision_ignore(decision);
+ }
+ 
+@@ -453,20 +451,20 @@ lbh_resource_notify_response_cb(WebKitWebResource * resource,
+ 
+     response = webkit_web_resource_get_response(resource);
+     mime_type = webkit_uri_response_get_mime_type(response);
+-    d(g_print("%s mime-type %s\n", __func__, mime_type));
++    g_debug("%s mime-type %s", __func__, mime_type);
+     if (g_ascii_strncasecmp(mime_type, "image/", 6) != 0)
+         return;
+ 
+     if (info->info_bar) {
+-        d(g_print("%s %s destroy info_bar\n", __func__,
+-                  webkit_web_resource_get_uri(resource)));
++        g_debug("%s %s destroy info_bar", __func__,
++                webkit_web_resource_get_uri(resource));
+         /* web_view is loading an image from its cache, so we do not
+          * need to ask the user for permission to download */
+         gtk_widget_destroy(info->info_bar);
+         info->info_bar = NULL;
+     } else {
+-        d(g_print("%s %s null info_bar\n", __func__,
+-                  webkit_web_resource_get_uri(resource)));
++        g_debug("%s %s null info_bar", __func__,
++                webkit_web_resource_get_uri(resource));
+     }
+ }
+ 
+@@ -493,7 +491,7 @@ static gboolean
+ lbh_web_process_crashed_cb(WebKitWebView * web_view,
+                            gpointer        data)
+ {
+-    d(g_print("%s\n", __func__));
++    g_debug("%s", __func__);
+     return FALSE;
+ }
+ 
+@@ -509,7 +507,7 @@ lbh_cid_cb(WebKitURISchemeRequest * request,
+     LibBalsaMessageBody *body;
+ 
+     path = webkit_uri_scheme_request_get_path(request);
+-    d(g_print("%s path %s\n", __func__, path));
++    g_debug("%s path %s", __func__, path);
+ 
+     if ((body =
+          libbalsa_message_get_part_by_id(info->body->message, path))) {
+@@ -616,7 +614,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
+         webkit_web_context_register_uri_scheme(context, "cid", lbh_cid_cb,
+                                                &info, NULL);
+         have_registered_cid = TRUE;
+-        d(g_print("%s registered cid: scheme\n", __func__));
++        g_debug("%s registered cid: scheme", __func__);
+     }
+ 
+     settings = webkit_web_view_get_settings(web_view);
+@@ -647,7 +645,7 @@ libbalsa_html_new(LibBalsaMessageBody * body,
+     if (g_regex_match_simple(src_regex, text, G_REGEX_CASELESS, 0)) {
+         info->info_bar = lbh_info_bar(info);
+         gtk_box_pack_start(GTK_BOX(vbox), info->info_bar, FALSE, FALSE, 0);
+-        d(g_print("%s shows info_bar\n", __func__));
++        g_debug("%s shows info_bar", __func__);
+     }
+ 
+     webkit_web_view_load_html(web_view, text, NULL);
+-- 
+2.17.1
+
diff --git a/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch
new file mode 100644
index 000000000000..d7b5eb74ba1c
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.5.6-fix-older-webkit2.patch
@@ -0,0 +1,53 @@
+From 3423ca9bf48e675007b7fb1bd61b50aa97d14890 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Albrecht=20Dre=C3=9F?=
+Date: Sat, 7 Jul 2018 16:36:49 -0400
+Subject: [PATCH] html: Fix HTML rendering with webkit2gtk-4.0 < 2.20
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* README: document use of G_MESSAGES_DEBUG=…
+* libbalsa/html.c (lbh_navigation_policy_decision):
+  allow the rendering of “about:blank”.
+---
+ libbalsa/html.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+leio: trimmed out the G_MESSAGES_DEBUG doc changes
+diff --git a/libbalsa/html.c b/libbalsa/html.c
+index 1e5e2f500..307194e0a 100644
+--- a/libbalsa/html.c
++++ b/libbalsa/html.c
+@@ -44,13 +44,13 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ 
++#ifdef HAVE_HTML_WIDGET
++
+ #ifdef G_LOG_DOMAIN
+ #  undef G_LOG_DOMAIN
+ #endif
+ #define G_LOG_DOMAIN "html"
+ 
+-#ifdef HAVE_HTML_WIDGET
+-
+ /*
+  * Used by all HTML widgets
+  *
+@@ -281,8 +281,12 @@ lbh_navigation_policy_decision(WebKitPolicyDecision * decision,
+         g_debug("%s clicked %s", __func__, uri);
+         (*info->clicked_cb) (uri);
+     default:
+-        g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
+-        webkit_policy_decision_ignore(decision);
++        if (g_ascii_strcasecmp(uri, "about:blank") != 0) {
++            g_debug("%s uri %s, type %d, ignored", __func__, uri, navigation_type);
++        	webkit_policy_decision_ignore(decision);
++        } else {
++        	g_debug("%s uri %s, type %d loaded", __func__, uri, navigation_type);
++        }
+     }
+ }
+ 
+-- 
+2.17.1
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 4c043cdb299a..3f5668996d9a 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="crypt">Adds support for GnuPG encryption</flag>
-		<flag name="gtkhtml">Use gtkhtml for HTML rendering</flag>
-		<flag name="gtkspell">Use gtkspell for dictionary support</flag>
 		<flag name="rubrica">Adds support for rubrica addressbook</flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 903490ee20b0..786a1297fb01 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1,5 @@
 DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52
+DIST geary-0.12.3.tar.xz 1069444 BLAKE2B 73f4382cd97813fcb3921daeab4338f4797bef2b5dcb1f7df1afeb75be48877109dcb15317f9bbe595326ee38f9ea3359a7d062c39ea3d83e1d36c34b680e707 SHA512 0e22b7ad8b79d17e55f6ab75a13883db04b21b1be9c2b06b08009e48fe433de323e23414ae8e47543bcb7785d6aa90bea582a2e20eaed1ce7bcb02687a69b9b6
 EBUILD geary-0.12.0.ebuild 1696 BLAKE2B e09db7ec9f677f5cd287be3a5a14852e443db1679c29e32c88cd72efefa911978e22fd4fd23c2c09dad6947746b4e2799eb2ec0d1b41094ec3cd091dd9c775cd SHA512 c70ced94dd34b205bf1ecd86b642856582cb4c44a14bfb83d316e1c816f520e5fdd4929afc14a23a1e08d982b2e6f52286f8be1c1da8b53a78372377adb17011
+EBUILD geary-0.12.3.ebuild 1971 BLAKE2B 70f8d301bc48a2a448cd32a1e0cfd8b7f260f22d0f559ce9d8dd9f76fe6799aed1b78a87d25dce3f47d68b5ecf0f2e6cd88e0ba121181d9789d38791ffcc275e SHA512 d67227a25b5b9c67bb2ca2f3508efc0a2f1cb1e74c7919fde37702b60898a4b895438c68d6d1e17d43adf4ef4244864c3c319448cff314b2f017fce1020ddf1a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/mail-client/geary/geary-0.12.3.ebuild b/mail-client/geary/geary-0.12.3.ebuild
new file mode 100644
index 000000000000..6ed3152f6cc8
--- /dev/null
+++ b/mail-client/geary/geary-0.12.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# Keep cmake-utils at the end
+inherit gnome2 vala cmake-utils
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
+
+LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.42:2
+	>=x11-libs/gtk+-3.14.0:3[introspection]
+	>=net-libs/webkit-gtk-2.10.0:4=[introspection]
+	app-text/iso-codes
+	>=dev-db/sqlite-3.12:3
+
+	>=net-libs/libsoup-2.48:2.4[introspection]
+	>=dev-libs/libgee-0.8.5:0.8=[introspection]
+	>=x11-libs/libnotify-0.7.5[introspection]
+	>=media-libs/libcanberra-0.28
+	>=dev-libs/gmime-2.6.17:2.6
+	>=app-crypt/libsecret-0.11[introspection,vala]
+	>=dev-libs/libxml2-2.7.8:2
+	>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
+	>=app-text/enchant-1.6:0
+"
+RDEPEND="${DEPEND}
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+" # org.gnome.desktop.interface clock-format global setting usage
+# gnome-doc-utils for xml2po for TRANSLATE_HELP option
+DEPEND="${DEPEND}
+	sys-devel/gettext
+	app-text/gnome-doc-utils
+	dev-util/desktop-file-utils
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
+	sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die
+
+	local i
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd po ; echo *.po) ; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
+			fi
+		done
+	fi
+
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICON_UPDATE=OFF
+		-DDESKTOP_UPDATE=OFF
+		-DDESKTOP_VALIDATE=OFF
+		-DTRANSLATE_HELP=ON
+
+		-DNO_FATAL_WARNINGS=ON
+		-DGSETTINGS_COMPILE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DVAPIGEN="${VAPIGEN}"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 300bd00cd82b..7443aa1ef81c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,14 +1,14 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
-DIST mutt-1.10.0.tar.gz 4249980 BLAKE2B eed788b0d0105d232cd0fbc50320fe4a3ef36635131e03cc477f0cf003c299b5d78994cb6467fcb6d45ca46a073c8997fdc42a669a3fa7662ac21ae70ae082c2 SHA512 4cade7f17e157c8c2184c96d596d9dbfab704d300074eca66c567f2dab055caa9b828080cce92e2616176000219288630c33542ab83a98db0160cd085b937530
+DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
 DIST mutt-1.7.2.tar.gz 4025880 BLAKE2B ab0430ffb10d03e3e904d54540db6c0aecb4590daa8a1d1add710a9e485b2e7e80f707e6649ff0674d53d3578eb75e4ed5c39f1036b3fa43c00bb5c4f2d15cc5 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e
 DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8e0b348c2444cfb8563636ceff52e5a0981e8279bb2d6e48814493ffdbb1122ba6d3e78a9904e8cc2e407398 SHA512 b8266af8b487f5be238d03f717ddd69b3dc2eeb4e3ada2c2651c9ad7e0558b92f2c256361a4f688cf80c500c490d47c0e3ef5972bdf1208693da7868a58aca6b
 DIST mutt-1.9.5.tar.gz 4207937 BLAKE2B 0ea5473995e48bbe957506a1e66eb4be234ab9b79c94aee53dbe261baf4b396096648448662ecc17a926ab16369505beda3dd93d2df35397d445d542f53be663 SHA512 08ceeb7b212f74e4e2b18fedfe15c5ac46a22449f4e75038485748a742727ad6a2d00c1cfee99e1e195e720d83a6320ae38a3f4f94cd92667f22270f3cf6637b
-DIST mutt-gentoo-1.10.0-patches-r0.tar.xz 108556 BLAKE2B 9e8176816525c26922a6a8c0aa6efe9ce818e5a1fec8955ad5ac055fa7300d17401b41e56aa9b1366405c5ad13d2aa2e958bd48e9c6d0fc5ced40c162ae14818 SHA512 52d58aa50b289711487655cbf691b15f76e03d69fcfc655202126d94c57b574d643a3293408e930989a42c3b1e56ef398a32049e10a9ffc0331cffb57fde98e3
+DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
 DIST mutt-gentoo-1.9.5-patches-r0.tar.xz 113924 BLAKE2B d04ef58a310b913eef783814d608dc495d449baf8efcc43ab3203ef9fc136d26afcfa9261e8ba74d20a9abaa8f672a93aadd7e197478fecb970745a8cc610f65 SHA512 3740c66cffa356501538b16be51575391146c8bb2d0a04fa1f391e781fae52d8fc97d096a543fff3237da83c83b7c219319c7902a91af1d89d3515d5debc3a5f
-EBUILD mutt-1.10.0.ebuild 9194 BLAKE2B 28db1a529867bccf2493aa8f9290df78abc25697553caaf0a5759e44fb51eea7c9a4a04e1d339f23c4c2df61e01bac29ad977cfeb3dd6f74eab753dfadc80a16 SHA512 74a21faabf171916386c8e1862e6478848304290b39d47032f180e4ac9501ab4034b182330d5d853961c7edb98abc208439a6ae1edd494ece44ea44e5316f9b6
+EBUILD mutt-1.10.1.ebuild 9189 BLAKE2B b6294603e9e91df2c57b58ee984017027c8288e9eb6dfec8ba10ba73dad7c0e076ffa18345151f527737c771394207684b03739bc481ec6549ab507982e6df0e SHA512 a12d6a5f5b38e188952a88c5b53acf01e78c957e097683f4cd19efad4c983c621ba34b6f7d31e1364ff8ceca29df98762207c58ae1ab8a9061f28b4ee1ae2994
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
 EBUILD mutt-1.9.4-r1.ebuild 9167 BLAKE2B 6a4d5caea9682471e41f4fc66d63486b5110e1677048b7e6db8e0c622ba76f9f9d85de2aecb7d60c0fb0633b70937a20938e9531537e23ca9b311a6944c7f155 SHA512 d4699a67185750447df9fd1d3b02abba60abf5a41323c27bd056020237c567fc729e4b65ad10a4cc7c4461b127d9eb2360f87b9a84c7e0fdee640856f352a92f
 EBUILD mutt-1.9.5.ebuild 9187 BLAKE2B 87fb00b9b056b6bc4d36f243221468d3e70867cc7e41bd29ad18d7597f166ba78dcc51b958fe1a66c24127f7f564e72f6496f8fda16b893c3e93e4637d020c8c SHA512 496b3a025566ea72335baead232f1af785797389937e79d3cf4b3b4325ca1b65e48b060b5ca2828ce22ab9858be63eb24b3622d23cf03323abd0e2f6b6ebbc64
diff --git a/mail-client/mutt/mutt-1.10.0.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index ad7fa6ac20cf..9aaba6d4d0fe 100644
--- a/mail-client/mutt/mutt-1.10.0.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="