gentoo resync : 05.02.2020

29 files changed, 300 insertions, 209 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 24e0ef37e1c6..1721863b8042 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 144abdf32ed8..fa0c115d81e3 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,7 +1,7 @@
 AUX alpine-2.21.1-nopam.patch 704 BLAKE2B 2a388b75246de1282686d3b229ea2841a930eeef3c9080303e544c9430c34546c179e8a4b0f6b700f3f532a10a203929047922c5ad6e918537011df5c9bd1cdd SHA512 4c5690a96137c303350ef515f3f382160b4045612df8c1ad63a7b72de040f13e33c8aa21e34858d8b33124c4f58dd7a19edcd40c8f49b95e9bbb0746973bcf46
 DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1
 DIST alpine-843b2f1.tar.gz 7490140 BLAKE2B 13ac5ef43dd729a7cf21b44dcd6feace3e1813672aec537fd05d5ff90b67bec145ceef71cfcf35b0cb7e250bb307556f5dcf8ebb024bc6366fd0ace0a7c41161 SHA512 106caa7bfe86fd5e82554ba68b9ee579cd8495bcd0dfbf82d9d75da2df3bd292d42d67af8ec737091f2a820b2555c25bbf0058c9c7bb5de5f950b570ffc25c4d
-EBUILD alpine-2.21.1-r1.ebuild 2235 BLAKE2B 5dcc7a462c981e29b1d00d8df5d0c73b44fa18dfb8be9e75ca07d027dbcf5d78c839bcfb7809dfd4e2adf0c7c6a27d51bfda4adf74bd2f1b3ecb75658497d086 SHA512 e47d31105895b50b758fbd8d9888fd66b7db0ba2f5c564e04bf368caf5cc14c3e25d3f66d364bcfe731ec9158c0b2c28b24bd9fe7d49f466eb83660e1a7d7bf7
+EBUILD alpine-2.21.1-r1.ebuild 2236 BLAKE2B 819cc430006bb8f90dcc93c5e5c330f6bd83e444c0d008465b30953c42648fec29a611688971e5517a7f40d511ac46743a0f996d4045456c3a0d992433ab382b SHA512 a2df2446eb3bca350bbc3b79da978c422204b7c4c4da97dd29b3c370abc09fb880520562760c8e1796895ba37d726628bd48fa19baf1a3a427de3793cacea978
 EBUILD alpine-2.21.1-r2.ebuild 2218 BLAKE2B 4bcd38548dfec570422978a2b6ad3db07ad7f1738b066f03c8ea6fa265741971844dbf73a8630e2b5f70a88b00c305b77e985c1c8aa27bdcd984d142d27f7b86 SHA512 2a1d67cddee558988a19a16c2726101ebefc37b9f5287e45d4c7c8ea6d8f06ec862a37fb4806590b8b51d94fc30e0f6a6961fe88a768bf4ed7c867b618530ae9
 EBUILD alpine-2.22.ebuild 1958 BLAKE2B c42e7bfc13f865abbbd2ab8aa0568746acf1b7df06c422ee7346fae623a96f95d14d7f08994dbaa7ac5c551618b3e72c1910f5b5990248d3f0478e2f4f943ef8 SHA512 c894531026c73cdd8a1124711cf6fb8928c979aa793541ba18a7454596ad70cdae07cc20a111d3ef819d624ab5b45f0689d71fbb1f3261a3375c0c313f27a66b
 MISC metadata.xml 647 BLAKE2B 4086af8d509f84060de872fb72550c418d9b73883474ee873192540e0e05a2cc0fb9792c727137edcc08c3d16ed0af7964d5dc5dd82a58adcc85198e9862453c SHA512 d4a2cb5a4519c12cb75441e7418c34d96b320281d503f9ff2ce94050a88e2d5ac476ccb46c325ca35d459c0bf1c56932755cb7b919d27ea253c13f4b40d035ce
diff --git a/mail-client/alpine/alpine-2.21.1-r1.ebuild b/mail-client/alpine/alpine-2.21.1-r1.ebuild
index 9da32fd2f795..dc0e7d37e587 100644
--- a/mail-client/alpine/alpine-2.21.1-r1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND="sys-libs/pam
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 62152416668f..adbab5948778 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,7 @@
 AUX claws-mail-3.17.4-libetpan_pkgconfig.patch 4483 BLAKE2B b28520c658214e9f6ad4bd0d48835e29f8b37aa7b3915add2d71b8ee7dc3366c38db1de9272dfe8e48588cebf748e6c844f04bc721fe577f66288b849e5c7054 SHA512 39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
 DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
-EBUILD claws-mail-3.17.3-r1.ebuild 5892 BLAKE2B a9689bae73e1a659f434587aa0d48b62dc18f1204df3315bdfaab9993ee30445186d5627b9b55b6581293f1577796ffe2f65a03e0dbf7a75b5281e75b3288687 SHA512 6409b4b9a69b32aaa7ffe30ab35affa27331d9981673f119d000c2b6f46a5a865cea64c9daf9d2f024003b0720c4090ecf6184b57fd4ebecba14b7681f0119d6
+EBUILD claws-mail-3.17.3-r1.ebuild 5893 BLAKE2B 8394664dbc9a94c06dcc5d3865bd36509c34df39f776a9adde05a1e1c7c910381ffe3cb074ae91509bb229a2cd384661c8dd2f7292d2cf9d6276cc68c857eed3 SHA512 d9e78682807fafe6480944a7a3bdb544e685c70e9595581be2930ca1f378669b5e24e8b4cdef3bdc2f8bca8e54fb4edfadb08e3f8b1f2c38cc7f3bb996f7ec9f
 EBUILD claws-mail-3.17.4.ebuild 6127 BLAKE2B b33b8175dedba9349720b24c42b5be50a54b0669c0b6e1136de624f66c007390e215d01ef6e53dfc61696ebe5442fb9b1255af27068a0616982f12b4f1b6fb23 SHA512 f3b4cd871bcb28dd41f4cbb1af7c78c9f19ccb7d7299c5ffb4487beaa3fd5bbe562a14fce41991910d2471c346a58c325b39c702db4a5378fc49369c44fc3b4e
 EBUILD claws-mail-9999.ebuild 6062 BLAKE2B f18d83a542cd21c3be36fc30096f26b065502f9a8e9ed789735076104527a65878125c7b00a5d604bdf51e82b59c83482dbe8b3054e0994234ff857925656f12 SHA512 5785f50095538796aa4e654afbe9969f9d4fd5ea4b629303ebc0448887c9f41b370ff5d42e8e575ef3f83164cf82fc2ccf0f460a894ba93ed6a49b5fd0daf861
 MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051
diff --git a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
index 04873fb30472..ee4bcfdb5be9 100644
--- a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index edba0782729f..0f37264a728f 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -2,5 +2,6 @@ AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d1
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
 DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
-EBUILD evolution-3.32.5-r1.ebuild 4429 BLAKE2B 9352aa6ad32bfb84b2052e4cb30003dbed363fe8e23ab64a6d7f27ba00b9af7ce312484d8c2bf2608afca664ffc741012737079ea0ec7ec0632422ae1aee94c7 SHA512 5fbfb5524987fdf675c9a9604c8b5ce97fdf7cd387a68066a5a28df4e42653ed8b8a32d21ee222c81e8e6ef920b495df12ad80d6e5b83b6fe009135229e5be38
+EBUILD evolution-3.32.5-r1.ebuild 4471 BLAKE2B d9ec3757e463cb0d2412e810ef305f0907ca72da198c208f3cfc1329472066a56188861ead24fef14b56fe4ab96648ef31de14311cfb1f93b046278c5a5282ad SHA512 d5c2d74b707269fc66edaa9347d71995b39ed9c94d72f103c4eda4e92750cedae95e175761f09fea1a1afaeb01c4b7466f9b31518b655f343a7922f8af0f4902
+EBUILD evolution-3.32.5-r2.ebuild 4603 BLAKE2B fdb359c5f612f89f638520572e6ebbb91fc6092586805aafe4dafd5ee2c3ce3f4e9afd143fcc97d280bfbfa1d79008d6ed57ee28881105f33658ce5c7a7e6b75 SHA512 9359eb4a5a3762d7e095d55b89db4fd8dbdb3913bbb7be735dc08baba728fd83cf271e68a51d6b7009270e4f5fee5e53c974d359ed1e23615bb1508b090da968
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.32.5-r1.ebuild b/mail-client/evolution/evolution-3.32.5-r1.ebuild
index 6d1cc407d28c..46d736119bf8 100644
--- a/mail-client/evolution/evolution-3.32.5-r1.ebuild
+++ b/mail-client/evolution/evolution-3.32.5-r1.ebuild
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/libsoup-2.42:2.4
 	>=net-libs/webkit-gtk-2.16.0:4
+	<net-libs/webkit-gtk-2.26.3-r1:4
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gdk-pixbuf-2.24:2
 	>=x11-libs/gtk+-3.22:3
@@ -53,7 +54,7 @@ COMMON_DEPEND="
 		>=sci-geosciences/geocode-glib-3.10.0
 		x11-libs/mx:1.0 )
 	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( app-text/gtkspell:3 )
+	spell? ( <app-text/gtkspell-3.0.10:3 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
 		>=dev-libs/nss-3.11:= )
diff --git a/mail-client/evolution/evolution-3.32.5-r2.ebuild b/mail-client/evolution/evolution-3.32.5-r2.ebuild
new file mode 100644
index 000000000000..64521ed6d93b
--- /dev/null
+++ b/mail-client/evolution/evolution-3.32.5-r2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=webkit-gtk-2.26.3-r1 and >=gtkspell-3.0.10 to ensure all use enchant:2
+# TODO: Adjust webkit-gtk dep to actually be that once it's keyworder for needed arches
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-libs/glib-2.46:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.16.0:4
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	>=dev-libs/libical-3.0.2:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spell? ( >=app-text/gtkspell-3.0.10:3 )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+	ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
+	eapply "${FILESDIR}"/${PV}-webkitgtk-2.26-compat.patch # Don't use with 3.34, it should be compatible without this hack.
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GTKSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index dbe603c578b1..c39660fb0fcb 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,4 +1,5 @@
 AUX 3.34.2-fix-ytnef-automagic.patch 1049 BLAKE2B ae3de0dfeb13ddfb7fe73b72321bc374666edfe4dcf44e9a9f4338efff801137f6ba0f10d32c8532ed0c4d926bf8a8f0ee94bf2b5a53b903ec3f676baba8b4d0 SHA512 a14e61d0f0201074b3c476cdbfd4bf994f1660a2ca28147071fe84ad7ad36fa77cb003b30d6ebf03496bc5cb045f4dc5e4ec08341b13b0bf767d5f36212f5952
 DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
-EBUILD geary-3.34.2-r1.ebuild 2329 BLAKE2B 229aeae7885ced009ca956b36a29a03495c17723785964439c1e93520ad0e848b01917f71752c3a6636deeb036c6ad49930ddb03d2ce0d402cc6e5748cb4cc5a SHA512 693634244f721095be537eb30816ea77db41fe01ea69e493160deb2d793fad14ed0d07dbc7251cf899f4937e5df0e3eb85ba3e1d66198ceed1f719ea561706dc
+EBUILD geary-3.34.2-r1.ebuild 2333 BLAKE2B 7d60bddd03e418c11396f32e84dfad1f9c9809f3a357a4bdd0a3d7049e9cdb3c7f19c918df14f5cc93a6ad546aa16e13f64334fe80dc14f9c8220486190a2764 SHA512 64e44fe6213a13c0971cb22e2ceae0786e823bb3f1620d3c33a42a15b279aa4d48a8faa6f99b73c1a76fdb1ba7dfa9ea6b46a641ab5d7fb642aab22ae50f7216
+EBUILD geary-3.34.2-r3.ebuild 2457 BLAKE2B 1783570d31fc60f54069945faa3fdd2207002931fa6e0073e771da8f5fe2c12ddc2aa32f001e622263c99c43b0ea30f0bc2659febea2ffb665980ff4a505e7e8 SHA512 86811da7415705d0d42a991581d38d4abef5457cb0cd704ae24237bbb98412af7ff3b4de7a7c659ec5f016a575e4bea26170c581f14d09ad70167ecddadc65fd
 MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/geary-3.34.2-r1.ebuild b/mail-client/geary/geary-3.34.2-r1.ebuild
index bdeb8150e879..817ed0bc2e8c 100644
--- a/mail-client/geary/geary-3.34.2-r1.ebuild
+++ b/mail-client/geary/geary-3.34.2-r1.ebuild
@@ -30,12 +30,12 @@ DEPEND="
 	>=dev-db/sqlite-3.12:3
 
 	>=dev-libs/appstream-glib-0.7.10
-	app-text/enchant
+	app-text/enchant:=
 	>=dev-libs/folks-0.11:0
 	>=app-crypt/gcr-3.10.1:0=
 	>=dev-libs/libgee-0.8.5:0.8=
 	net-libs/gnome-online-accounts
-	app-text/gspell
+	app-text/gspell:=
 	app-text/iso-codes
 	>=dev-libs/json-glib-1.0
 	>=media-libs/libcanberra-0.28
diff --git a/mail-client/geary/geary-3.34.2-r3.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild
new file mode 100644
index 000000000000..dc4d077d3cdb
--- /dev/null
+++ b/mail-client/geary/geary-3.34.2-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+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"
+
+IUSE="ytnef"
+
+KEYWORDS="~amd64 ~x86"
+
+# for now both enchants work, but ensuring enchant:2
+# FIXME: add valadoc support
+
+# >=webkit-gtk-2.26.3-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
+# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it;
+# If not, it could be compiled against 2.24 and then webkit-gtk upgraded and
+# geary not rebuilt, ending up in geary issues #558 and #559 still.
+DEPEND="
+	>=dev-libs/glib-2.54:2
+	>=x11-libs/gtk+-3.24.7:3
+	>=net-libs/webkit-gtk-2.26.3-r1:4=
+	>=dev-libs/gmime-2.6.17:2.6
+	>=dev-db/sqlite-3.12:3
+
+	>=dev-libs/appstream-glib-0.7.10
+	app-text/enchant:2
+	>=dev-libs/folks-0.11:0
+	>=app-crypt/gcr-3.10.1:0=
+	>=dev-libs/libgee-0.8.5:0.8=
+	net-libs/gnome-online-accounts
+	>=app-text/gspell-1.7:=
+	app-text/iso-codes
+	>=dev-libs/json-glib-1.0
+	>=media-libs/libcanberra-0.28
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=app-crypt/libsecret-0.11
+	>=net-libs/libsoup-2.48:2.4
+	>=sys-libs/libunwind-1.1:7
+	>=dev-libs/libxml2-2.7.8:2
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	$(vala_depend)
+	x11-libs/gtk+:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	app-crypt/gcr:0[introspection,vala]
+	dev-libs/libgee:0.8[introspection]
+	app-text/gspell[vala]
+	app-crypt/libsecret[introspection,vala]
+	net-libs/libsoup:2.4[introspection,vala]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-ytnef-automagic.patch # https://gitlab.gnome.org/GNOME/geary/merge_requests/390
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dvaladoc=false
+		-Dcontractor=false
+		-Dpoodle=true
+		-Dlibunwind_optional=false # TODO: Automagical if optional=true
+		$(meson_use ytnef tnef-support)
+		-Dprofile=default
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/mail-client/hap/Manifest b/mail-client/hap/Manifest
index d0284926f530..30f2bdc1fd34 100644
--- a/mail-client/hap/Manifest
+++ b/mail-client/hap/Manifest
@@ -1,4 +1,4 @@
 AUX hap-3.7-ncurses.patch 499 BLAKE2B cda1478835ccddd84ee35b484a01020e09a2286195140859c24b52bb17a1abc161c388c19428b72b15f6d658a3b27fcbd9d1f680f9da0a4a3544f4587c84378a SHA512 0993d409e3202fa0bcbd81858f0baf0a56e8044b0ccbb368e2cd4c30c4fb566670557a3983c7fc5b213f5df89b6ef0c6968097339dba4d510de5e28ac56dd35a
 DIST hap-3.7.tar 194560 BLAKE2B bf043963ccc0407de0f989ee0d3a4342520603c02fd53d875e41890bfe961ee8d05e355862a00c3be687228d6a69be6c2817d231871e6d26b9c4b500d925cc0d SHA512 3a42b8ae5d4c96812190e0551df289ad748c11f93d7632de1698437246723fd159a3f1a0b6f06c925b31ce8e389b73bc0b3a68f978570ae5d9f283d1651fa42b
-EBUILD hap-3.7-r1.ebuild 844 BLAKE2B ae3d302149e98285560f9ccc8413e71eb9f6fdbfc83c625d5dc4db49aafec2560888e4009a87126748aeda299b6c23414c9cfd46e3932b6b24fcd128aea377c7 SHA512 93ff0b6939b5233687564097bdc804d891e5735c9c58e9355b2f77e0578dbae95548038a7d90574e4512d55f8822ae03d0fdfe881644079d6757a10bfa1f1b4d
+EBUILD hap-3.7-r1.ebuild 845 BLAKE2B 35c1d805c05aa4299835702669b4b7cc0e22f7600f331f952d1f9cb25adff6b6af1fda25fa21fdf95d06775c6f4eaebabd0ac86c61aa8776bbee809e75cd7e41 SHA512 c3d71f0751a47cf3e2d358de2b9330b24bdec5013cec2478983f100ecdbfeeb59304b3e19a83ac2366a37d79abc73b1e7ad1c0dcc610266f5aa3c45b74a551d1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/hap/hap-3.7-r1.ebuild b/mail-client/hap/hap-3.7-r1.ebuild
index fec815034875..54db510d8e8a 100644
--- a/mail-client/hap/hap-3.7-r1.ebuild
+++ b/mail-client/hap/hap-3.7-r1.ebuild
@@ -14,7 +14,7 @@ RDEPEND="${DEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86"
+KEYWORDS="~alpha ~amd64 ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
index b8ec5aed4ce4..47f0ed29b013 100644
--- a/mail-client/mailx-support/Manifest
+++ b/mail-client/mailx-support/Manifest
@@ -1,5 +1,5 @@
 AUX mailx-support-20060102-add-sys_file_h.patch 397 BLAKE2B c560eb7a53f2c318873f17c2a3543bd02912c7f635a864e987ac333eca8f4fbe33e5c39ae5bc6122607fdf4c1f73ac40618b6a050eec2d520a0fce32da626c46 SHA512 d2906ca15610090ab93d0f839a0687b67556dccc0cd8dcfe1c5ae52d23c45e74d008376d57d84eaa4272a56f209628819a60108eebaf645cc1c3106ae5a954d6
 AUX mailx-support-20060102-respect-ldflags.patch 537 BLAKE2B 34dbdd5f8a9b3537657f98f8ea274349e043618dfba3d20f004be3cb0fe58438b6c3dd9af91e921f776ee8b38bfe296718add6da217893dae001c904bcebf225 SHA512 cec6b2cf6a3f8b85ebdfcd3bdbbeac9ded468b7f34053ef6473aefd413292d9d7dc350782488481a3ae2db273ad9a7005193acc0e601c5556a2fdd49640dfe1f
 DIST mailx-support-20060102.tar.bz2 8822 BLAKE2B aee5141916f3d59f730e52f5e80fc465e7a3d961ff38e5e3d3feead4b772682c999925b7d900e2d3f87d178a6730994c2e0ec3d1625b5794bed5945a219aef81 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2
-EBUILD mailx-support-20060102-r2.ebuild 842 BLAKE2B ec25d7e92a37a9817279b6fa55107f1bd4268a19bca8cb6a24591d270b9b0bc3625db5236ca28e946638b093ecab8949d958fab665143b1a08afefe66a0b0fff SHA512 be7fb63cc71ebe96a208b1d5a889317f95f19aa5d8f76f7d3cd814f1ec0dfd8c82819b53065ba4632e6ca7bbfb28546da4a81c0f2ddda2c982f265314cdc6b23
+EBUILD mailx-support-20060102-r2.ebuild 843 BLAKE2B 4e1728caaf0cad8400e2a0f4ec2043b04a923ad18b597a32dee2ee0b72b20a90cf2e68f94b3cb7d02f7d60b797d515d4a2c1d7dddef69d957b1fcb81847a00fb SHA512 1befcf89128534cd047a7a7ce8a01334e052f6a680eb98208e77b289295ead1d94562b8e5f73c53e9ca8d7d3824cc1a92ba776e8574ef51d6aca79e356f7749c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
index fcad4903c028..0c641a98d6d8 100644
--- a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
+++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index eeb61c2b7b37..441b4e9c501d 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,5 +1,5 @@
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
 DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
 DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
-EBUILD mailx-8.1.2.20160123.ebuild 1241 BLAKE2B d2287923fe0806ae47a106e907c9572f252b74801dc073e29996480dd48b858b1bf5975f869b4809ece848213faa91bf76c139a578446e6cdfc2c8a7f26bb49b SHA512 ef93bbce03954a8dcb6ab801b6fccfc91fe48827fd0ceda87f7078384e0586ddff96d540acad13444f9fd8a4a39fab79269770b469b7a2efdaf46e9c5d4ab3e0
+EBUILD mailx-8.1.2.20160123.ebuild 1242 BLAKE2B 9054ed92143cfdf6e49fecafbbba8cd15c88669dd6c1118725799835d02f9d2071b65ae8f40c1c4864476acbebd860cc2d3b660c255c05e77900b4eeaa7801c4 SHA512 5be49ba625faed2db622f9bcda33cf25f2b46fb4876b478be6b12d3235720cf5cb06d3ff5e1752cf8218cccab8b919ea9ad7661a2e14180fc225020c79f71f52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx/mailx-8.1.2.20160123.ebuild b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
index 8977b946df7d..2a6d98641728 100644
--- a/mail-client/mailx/mailx-8.1.2.20160123.ebuild
+++ b/mail-client/mailx/mailx-8.1.2.20160123.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${DP/_/-}.orig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=net-libs/liblockfile-1.03
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 11cf1d5ed6fe..985e5fa5abee 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -10,10 +10,10 @@ DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc147
 DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
 DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
 DIST mutt-gentoo-1.13.1-patches-r1.tar.xz 36044 BLAKE2B 7caf7dc1e905bc09b72e69bf33819674dfcaf04fcc4db93955d0702559c85bcc886d7a5fd79dc59c7298771ac918ad78fa187ea3f7fbdadcd4e0af474952fdfb SHA512 ae4a078840aacff2ce5c5df03c7d3ebbfb1014816e7289776c446df3a693a76587aae670f567af0e824e603aeaa52eaff978f90c87bede8878fcc29a1995e7e6
-EBUILD mutt-1.10.1.ebuild 9155 BLAKE2B 49b5576d721a9ad68e947e904a6e464dd18282ed9077601fcb209f259da364324b03c031067966673f6999da42c6907b5d4221a241db2f377288ceca79499ec6 SHA512 777929da223e49ab2fde78024009015203ebdad6aff9d954a9930ef108eff1025306cba2ff4187bdbdbc13e670060c6771d29c463ad3af189e42fd0d2ce6f2a5
-EBUILD mutt-1.11.4.ebuild 9394 BLAKE2B c5ce202ae5350d5c86c4e45f3ab1c30a33c1451bf5bad16076799feea6160e26ca765617c0801102f224a4ff511ef28bae72108635a63b32461b44574aab504b SHA512 f826f54b9f508b20605689e306954c22b2928f4eba9b7b2aadab6ff362ffd79088f3ab076a7462004cace8b0def8a3ebbc2b59fe2b1e60200ec84f2734ec9294
-EBUILD mutt-1.12.1.ebuild 9432 BLAKE2B ed526a801f5dbe3aa4ccc18baec4acb897d94723601c203538c4ce2ed1a1a6e171203f84b8048fdd1cd9f1b6d9fd04a21b527025b6658d8799774d440e1055a9 SHA512 1c46e2ce78b6326a931f33ab01422713c5126d06bf3bb09912fb784ca4390d92d884d64db64396a5c87004a3da87bf90291c13ce2a374fcdda598e1ae41edfb3
-EBUILD mutt-1.12.2-r1.ebuild 9432 BLAKE2B ded23934158fc034c03c20537d7bcee864eb377ad1eeb207489be14cc3d9d002e06266905ca4b285359ceae237c47e3adae36540c5bf7c4bb79baf17f0203708 SHA512 bff57f1cc021db6870e34e4b73f6f9fbc52292ff85e0bf6cc6877d64b2d0752ea56b7f217c250373f1ea6043a4604e083d8f7b9e45093ffd883013a4a735910a
-EBUILD mutt-1.12.2-r2.ebuild 8682 BLAKE2B a7ed03d38f8c3de2ec00915906f3cce024801303fd0c83afa57cb62add7585198d706d519f5217f686c48d270ac5732d23b29daa27e5e87288f819471e2cde25 SHA512 c87a76711ba98e17b85c85cfed4b8ce87ae2a49f07b838d6f6e8c25509b10f15457b33d2a070ae29ec1997b07450c5736ca3a95c25d5b81e8aa3bbdf6b1d6e1d
-EBUILD mutt-1.13.1.ebuild 7936 BLAKE2B b36cb9a925ee418245c54d5390e002d3232fc04a2a0590cfe5f2d985823743b6358c9bd1eb85a4bd38eea60dcf419a6d396cf28ded63f066676d0cc96beb39f6 SHA512 51ea7b6e919fccf8e3135a9d8a90253ec1c6921b6c64674167d9e89a926d52b05661a8f974b7344ffb2f3485c8b0dd5c78429f8a03e59e91bd82057f19ec536b
+EBUILD mutt-1.10.1.ebuild 9142 BLAKE2B 5cc1e260ae5ed00ae00e9aeb5e0ed73c218d98e808bc7f959d1a1d10966e7599cfcebf796635c196492d3a53b57f1b88e60d34e5b3bd4bdfbcfd67942229362a SHA512 a2e8c9466856faf6d9c922ddbc474709adc8863ac311e4b31e0834898ed41b3202e722d22fc4a97f8d66af848834546508a1dce20c72be0a576d813cacfce19b
+EBUILD mutt-1.11.4.ebuild 9380 BLAKE2B 46776d7cc2ae77e6af0c2b6a57ae7ada29b6aef25a9171488d62d345321ec138c5d74326c8deae9f065b756c9ed06d144673a07c144860080806eb7f93f6bd4b SHA512 ba551c161b4bca3d25bcf7b7ff01eca0625667c3bc06914b2a73a54899f189a78401c32a2a1c690278cf4f45b1d2d721a372fbeb79b1afbf7d45c0647590e4eb
+EBUILD mutt-1.12.1.ebuild 9418 BLAKE2B 2887c3f6beaa6bcb28f1578d6895870ae7e97763d7c91389be2d40203f70b581e2c847a2c4d138bc3e35d4d6019e168e98475e4a7b8f47f9f9988b8bce286250 SHA512 d5bbb772a5e7240b3ee2d97a3ab7826a1962573f6b84f2f8df5e3ab47584412e2191859efcb0294eb68b44f74caaf9fc66811d6ece265b11b15cef1a06ace28e
+EBUILD mutt-1.12.2-r1.ebuild 9418 BLAKE2B 19471265ffc37414a5cba20ab9dcc04defde00babe2e994505b62a3757192befe681bbcdcc0433c19ad2b51ccecd6b2f57965385fffc4f8f825e5b97a11b4bac SHA512 ecda2cdab46346c2cc777643afae8d638c0a8673b4b4559f8e3d7991bb64f2f85a068f2aede7fb214e005b20d287bee6265fc1c5331abe20578148f425ad021e
+EBUILD mutt-1.12.2-r2.ebuild 8668 BLAKE2B 5498a8057b2e368de9c8af155e166c27fa2a4bda395f10be8c6e73f20e02f3952b6ea49fb3fdecc5e7bbd32f569d04ece0d7b5d833b2dd6c52371e7e220912c2 SHA512 b6080e77bc2a10e9a4664d019fe4255c6dc8ce43536b1c591aa529eb4b18ec8e6f606d3e4e6a89e1ec88ada28d91fb94b0e052d679f36e3dac7026896df03823
+EBUILD mutt-1.13.1.ebuild 7922 BLAKE2B f663b986b8befc7356310c729d8b543489c8c418a409e7f3e562a692cefe5643ea3dac4de1ec851656bc08be4311541cbba3373326aa300db80b2db6187def72 SHA512 d52cc63032c959a1923cd113539226b1e77b8a22dffd10dc0c5731616694dc15d62c50d76e76cfe323dca2f7fb26154fa64c016ad9cd130aeedb4dc482eae34d
 MISC metadata.xml 1633 BLAKE2B 86c5eea8025bff6323e0ac1f703839caf87e868dfb934f6d42e5265bc31da40fa55145ca474174163feba2863e65ea53e22c1de811703d262f195ad89b17648b SHA512 2248ee20a23502741fbd1b1cc9d7d9cc60f88864e70ccb5729fee6448297146599b073c5124ffe04653ef04faffae532ba5a7d906bb515e6f399be8e7ef06368
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index 291ba186831a..b61d695b1112 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ~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 ~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="
@@ -223,7 +223,7 @@ src_install() {
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild
index 9a75061ed7ca..0b9a1ff5ceb9 100644
--- a/mail-client/mutt/mutt-1.11.4.ebuild
+++ b/mail-client/mutt/mutt-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -225,7 +225,7 @@ src_install() {
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild
index c6dbb7693066..9520c1c482d9 100644
--- a/mail-client/mutt/mutt-1.12.1.ebuild
+++ b/mail-client/mutt/mutt-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -226,7 +226,7 @@ src_install() {
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
diff --git a/mail-client/mutt/mutt-1.12.2-r1.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild
index b246b32c07b2..cfee64ff6e1e 100644
--- a/mail-client/mutt/mutt-1.12.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -226,7 +226,7 @@ src_install() {
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild
index 77e569123721..71fedef1a7f8 100644
--- a/mail-client/mutt/mutt-1.12.2-r2.ebuild
+++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -220,7 +220,7 @@ src_install() {
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
diff --git a/mail-client/mutt/mutt-1.13.1.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
index cede0e80d77b..c22bedfc03de 100644
--- a/mail-client/mutt/mutt-1.13.1.ebuild
+++ b/mail-client/mutt/mutt-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -208,7 +208,7 @@ src_install() {
 
 	# A newer file is provided by app-misc/mime-types. So we link it.
 	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
 
 	# nuke manpages that should be provided by an MTA, bug #177605
 	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index eb7f0778badb..3201d557ed6a 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,5 +1,5 @@
 DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
 DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
-EBUILD sylpheed-3.6.0.ebuild 1608 BLAKE2B e979841baf5349efe1eb2bff04f332ffd75390aeab6cc4845b793919520805e773f81312e6a56b004e59724686598173cc97143014cb003c235a2fee7dfac952 SHA512 c5a75d7e16015fb3d766a8f55b11f79f51adefecbbf78ad8a829ae64662a63ce35cd3b3b082357e590a5768583eabeed6b573d71510fd9192f5156eec2c69e34
-EBUILD sylpheed-3.7.0.ebuild 1608 BLAKE2B e979841baf5349efe1eb2bff04f332ffd75390aeab6cc4845b793919520805e773f81312e6a56b004e59724686598173cc97143014cb003c235a2fee7dfac952 SHA512 c5a75d7e16015fb3d766a8f55b11f79f51adefecbbf78ad8a829ae64662a63ce35cd3b3b082357e590a5768583eabeed6b573d71510fd9192f5156eec2c69e34
+EBUILD sylpheed-3.6.0.ebuild 1609 BLAKE2B 3160b8329b1279523a5a5f7a6e48c106ef993c8221977a82cc074fa1add4f0c3ed1f4929e92bf8d0a86e0ebeb078b38d811cbcca9e6ef55a4d61d3b253b676da SHA512 b25ca2f6355c4a534d95ac23c6a86776f28b7351f940573fcbbec34a5adc4eca157b7745757b3790cfb08601568d7bce10ca7463cd96cd27de612019c550952f
+EBUILD sylpheed-3.7.0.ebuild 1609 BLAKE2B 3160b8329b1279523a5a5f7a6e48c106ef993c8221977a82cc074fa1add4f0c3ed1f4929e92bf8d0a86e0ebeb078b38d811cbcca9e6ef55a4d61d3b253b676da SHA512 b25ca2f6355c4a534d95ac23c6a86776f28b7351f940573fcbbec34a5adc4eca157b7745757b3790cfb08601568d7bce10ca7463cd96cd27de612019c550952f
 MISC metadata.xml 352 BLAKE2B 405cc3d3cb69bbfeb0efdaa63e29393c3e1792bf8ce5a5cfbb69c1bebd9746287e3ee11c30b59d92ac7072965baed99ef991c68553fb24a47ff972feece097e7 SHA512 3392043b42819ac3ed03543881fd1eafc56f253d47d424b8ba4b62346ac04c1e6ac8e925bfcada44320bb26283f4e777832c5349e32a77c1e7b14796c0b03ed8
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
index 68640e30c473..d4d6ec1c76e8 100644
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
 CDEPEND="net-libs/liblockfile
diff --git a/mail-client/sylpheed/sylpheed-3.7.0.ebuild b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
index 68640e30c473..d4d6ec1c76e8 100644
--- a/mail-client/sylpheed/sylpheed-3.7.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
 CDEPEND="net-libs/liblockfile
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index af5c9fa8f2c7..1e2996eaca2f 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -2,7 +2,6 @@ AUX 1000_fix_gentoo_preferences.patch 866 BLAKE2B 836e42f394db6233ec4ad8550fd68b
 AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
 AUX icon/thunderbird-unbranded.desktop 281 BLAKE2B e2d0eb949dee413112021cdd0b8f5f1428aef25750fcba1424da747478ffbba2ea5b70f9ed8c8eee0bec2cd4ae0ea962389a899cefd9c6ca1b7d3841b9932fbc SHA512 a96d276aeb995d8f082bdad692406247548fb261c4d91acd9dd6e15d83fe35aef8bdf595d6150cb9789da0e7af57fa9fb8cc99a5be9b7e1d46ab1131e0adf62a
 AUX icon/thunderbird.desktop 270 BLAKE2B 6598b4fcf7f898a2a9beff9304db1c25a9906253569a24e593391946d14910e2235b16735439d967831f601fcfafd783064cc5f2330ba38d4868320a86dce57e SHA512 caf020e8af0df7b51d67649889b04d3af481850c4355dd0bd17a17e8681790731458648576a3a2a6c9ef7d0ab6d149eb9dca54d1362ccfc796e8c36d87c41d3f
-AUX thunderbird-68.2.2-rust-1.39+.patch 15062 BLAKE2B fdb8b871a57581c092142d167803a68a67dc1b7c8ea04bf2120d531b2a770e12ca5b16778a93ac04a184ca05c515733ded2f55a046c0ccae10ba5c2850cf91c5 SHA512 b19291920587c1833215dea8e55a98bb02199ed471d19f8e16fd3ead74fceeb2a277e7f3d906141a6d2609415d2bff2afd887024671dbc35c93973e8756867ce
 AUX thunderbird-gentoo-default-prefs-1.js-1 426 BLAKE2B 2cade86c23902fe439018a79847ffef69f82041c35b4a473dbf62b59b17bfe3422abdae604026f8ed14dd1fddc525cb2c49516d2d003bfd3edc075021f24576d SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983
 AUX thunderbird-gentoo-default-prefs.js-2 461 BLAKE2B a18e1fdbab7ad81feb41af75e60f48adb960800849630a6f9253b7bebcd3e7db33b2517ad0be6302609545a5464b84bd5c5fc67a07fb2ceab0ca1ad98539bee0 SHA512 db115d89a094c395636e5c008307c7864cb084a0a4ebd024d4ce33cac12963cd4a9ff6833227adc6a098430dc3f7ca9e386e26b87400d46920f4ef15741aefa5
 DIST firefox-52.5-patches-02.tar.xz 15084 BLAKE2B 538dd61dbb7b290add4782b323a62f9ab4dbc57326a9a085710d207752118c504eb030a8741c1eed2e281c8d18e5453210b1905d71439250caa588137bbc37d0 SHA512 b80f9acaf49226cd5c2864714826c5b0e7e918e94c31ec81521b90c47edbb88ea85faa34fc22791efefbcd3867ddc413c563de58ca0f8ce21e10a3858899efce
diff --git a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch b/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch
deleted file mode 100644
index bfb71cbb7887..000000000000
--- a/mail-client/thunderbird/files/thunderbird-68.2.2-rust-1.39+.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Based on https://github.com/rust-lang/rust/issues/64710
-
---- a/third_party/rust/bindgen/.cargo-checksum.json
-+++ b/third_party/rust/bindgen/.cargo-checksum.json
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
-\ No newline at end of file
---- a/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
-+++ b/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
-@@ -9,17 +9,17 @@ use std::ops;
- use {HashMap, Entry};
- 
- /// The result of the `HasVtableAnalysis` for an individual item.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum HasVtableResult {
--    /// The item has a vtable, but the actual vtable pointer is in a base
--    /// member.
--    BaseHasVtable,
-+    /// The item does not have a vtable pointer.
-+    No,
- 
-     /// The item has a vtable and the actual vtable pointer is within this item.
-     SelfHasVtable,
- 
--    /// The item does not have a vtable pointer.
--    No
-+    /// The item has a vtable, but the actual vtable pointer is in a base
-+    /// member.
-+    BaseHasVtable,
- }
- 
- impl Default for HasVtableResult {
-@@ -28,21 +28,6 @@ impl Default for HasVtableResult {
-     }
- }
- 
--impl cmp::PartialOrd for HasVtableResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::HasVtableResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
--            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
--            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
--    }
--}
--
- impl HasVtableResult {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
---- a/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
-+++ b/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
-@@ -22,13 +22,14 @@ use {HashMap, Entry};
- ///
- /// We initially assume that all types are `ZeroSized` and then update our
- /// understanding as we learn more about each type.
--#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
-+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
- pub enum SizednessResult {
--    /// Has some size that is known to be greater than zero. That doesn't mean
--    /// it has a static size, but it is not zero sized for sure. In other words,
--    /// it might contain an incomplete array or some other dynamically sized
--    /// type.
--    NonZeroSized,
-+    /// The type is zero-sized.
-+    ///
-+    /// This means that if it is a C++ type, and is not being used as a base
-+    /// member, then we must add an `_address` byte to enforce the
-+    /// unique-address-per-distinct-object-instance rule.
-+    ZeroSized,
- 
-     /// Whether this type is zero-sized or not depends on whether a type
-     /// parameter is zero-sized or not.
-@@ -52,12 +53,11 @@ pub enum SizednessResult {
-     /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586
-     DependsOnTypeParam,
- 
--    /// The type is zero-sized.
--    ///
--    /// This means that if it is a C++ type, and is not being used as a base
--    /// member, then we must add an `_address` byte to enforce the
--    /// unique-address-per-distinct-object-instance rule.
--    ZeroSized,
-+    /// Has some size that is known to be greater than zero. That doesn't mean
-+    /// it has a static size, but it is not zero sized for sure. In other words,
-+    /// it might contain an incomplete array or some other dynamically sized
-+    /// type.
-+    NonZeroSized,
- }
- 
- impl Default for SizednessResult {
-@@ -66,21 +66,6 @@ impl Default for SizednessResult {
-     }
- }
- 
--impl cmp::PartialOrd for SizednessResult {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::SizednessResult::*;
--
--        match (*self, *rhs) {
--            (x, y) if x == y => Some(cmp::Ordering::Equal),
--            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
--            (_, NonZeroSized) => Some(cmp::Ordering::Less),
--            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
--            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
--            _ => unreachable!(),
--        }
--    }
--}
--
- impl SizednessResult {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {
---- a/third_party/rust/bindgen/src/ir/derive.rs
-+++ b/third_party/rust/bindgen/src/ir/derive.rs
-@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
- ///
- /// Initially we assume that we can derive trait for all types and then
- /// update our understanding as we learn more about each type.
--#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
-+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
- pub enum CanDerive {
--    /// No, we cannot.
--    No,
-+    /// Yes, we can derive automatically.
-+    Yes,
- 
-     /// The only thing that stops us from automatically deriving is that
-     /// array with more than maximum number of elements is used.
-@@ -103,8 +103,8 @@ pub enum CanDerive {
-     /// This means we probably can "manually" implement such trait.
-     Manually,
- 
--    /// Yes, we can derive automatically.
--    Yes,
-+    /// No, we cannot.
-+    No,
- }
- 
- impl Default for CanDerive {
-@@ -113,22 +113,6 @@ impl Default for CanDerive {
-     }
- }
- 
--impl cmp::PartialOrd for CanDerive {
--    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
--        use self::CanDerive::*;
--
--        let ordering = match (*self, *rhs) {
--            (x, y) if x == y => cmp::Ordering::Equal,
--            (No, _) => cmp::Ordering::Greater,
--            (_, No) => cmp::Ordering::Less,
--            (Manually, _) => cmp::Ordering::Greater,
--            (_, Manually) => cmp::Ordering::Less,
--            _ => unreachable!()
--        };
--        Some(ordering)
--    }
--}
--
- impl CanDerive {
-     /// Take the least upper bound of `self` and `rhs`.
-     pub fn join(self, rhs: Self) -> Self {