gentoo resync : 08.01.2018

15 files changed, 553 insertions, 797 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 9550ec4cadf7..702501e04a0e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index e82ddba579c1..1a6ab79fdf25 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,5 +1,5 @@
 DIST balsa-2.5.2.tar.bz2 4049163 BLAKE2B 7435c7831d528b3ab6d2783211023e3686e94b266ed0804ecb2d9605add6c3826b029c679d137bb3e176b112b11bc68a7e9fd828bc18c2e5c5636b8ef8ec85e4 SHA512 f7a9127d87869d57acebaf33f9e3e4b82c5a5ba90aa5304ce40ba48a1a7f01eaf602555f8e97bce70b0baeb2ac8b5ac12941eaa8b85be1886bf22f7767dd75ba
 DIST balsa-2.5.3.tar.bz2 4333815 BLAKE2B ba8715108cf1122152c069130911275175d5c45ca12e85f1165cb7e86680015d6effd1ea5aaaebd5b154f67fc13002bd26ad0f0d7942253b2483896dd28a50fd SHA512 34e69be050f6c502fa6651029b7d93bf9b7842bbe8489669924563c086def4dbe72109ba5244e0cacf3ef69d3d9d8c5679f870acf564b5551920fa77012e1ff8
 EBUILD balsa-2.5.2-r1.ebuild 2573 BLAKE2B ee91a813897fb5865eb2407f131a6b193c78dd368bdc249fa471f0639d5022e7918da30a6db0da73b16e69ee9f4a48139c0c2972dfd50304ddde9c0610a08b77 SHA512 87414906f0a40d7ccf62ff76cefa2583bb99ea9f07a366f8964f4305424ae5f7034bc2c046a3181b11f4342cfac7eac6ffb9358b030ddb7dd8395bbccb37182b
-EBUILD balsa-2.5.3-r1.ebuild 2108 BLAKE2B 42fd1261248dd6cc57eadaaafac9f7614df5544957c3cc73e446c1ff4a14dddbd44091e4d62ed3bb29c5cefe0bf1f6a3c8b4e69e00edae288158775e4ccce311 SHA512 5011591778b6dec194cb38875dfb55b12bbdd6204dbb6c724ec015996454a569677589f2a22e94471d30442dbb67424d5e295fe5f0da82fce2979f98ee5bb166
+EBUILD balsa-2.5.3-r1.ebuild 2115 BLAKE2B 26c3bf7c82b1e28142592b0be6804e56ccd89efa7cf30614e80778bd776cc8d996162bd6ae984f3757e1849b02d25a61d6f1183495f2cf80588c22b6c1c43496 SHA512 c5001e1bb1ab9809d3f7dfcafecb0ba713bcb034744bd691f227149179996e8b935b61b23881497d0cd355be32c14b7e3d8a33bfe7aef18c46ea6af73d1b01ea
 MISC metadata.xml 525 BLAKE2B 3afe2cdc67ef1373e7f1db8421db62d12dab1288b8c46787e1adfdd8a6cf4cf3df7514222dd2a17c2ffcef88c6be10a77f35981c2a95c81d9ffc6631f62b9acb SHA512 2cff8f1968d1d1656b2eb01b1a373483a2168a4cdf2556c8cd7a4558f3e0821b816fc7cc2e1476ee8a8fe90622835c6b10e392b6ea7e64eba592c6f50922d4fe
diff --git a/mail-client/balsa/balsa-2.5.3-r1.ebuild b/mail-client/balsa/balsa-2.5.3-r1.ebuild
index a7c754fb84ea..233945aa427c 100644
--- a/mail-client/balsa/balsa-2.5.3-r1.ebuild
+++ b/mail-client/balsa/balsa-2.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface"
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 4e342e2b1afb..4aa9bcf7e3ff 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,7 +1,11 @@
+AUX 3.24.6-DESTDIR-honoring.patch 1948 BLAKE2B a8f90d369e3428c29ce9eaaf7e4043cfdba8bc5bc4160a83a2d53a1a46ced571dd809f59f176927b75dc21728c8bd37e9d9751ecb3b9cae66bebaae37a2efc0d SHA512 251cfc15c6dfc54235560cdf206c93038023f12dd505d94432b2a2a71fc0a119dab4485a05a15b51867028369386d79e08926563adba567ada1e2a0f4ead119d
+AUX 3.24.6-libical3-compat.patch 10788 BLAKE2B 414a007abf354309bf3c29b7df4dcc7c93ca47c4ffa41dc4d311390a64688b86f8f228502efb3b6999e3df0885af30be4b141ed12efb250364cc9c442f711e6e SHA512 02145b859ab4e559728c5437e0d584fb57273264fb812ce4cfe65eb16b4c7c444b1db96c7ad0c9dcb817a7e71928a3dec3583d08cf3d59df2d3d12f310867231
 DIST evolution-3.22.4.tar.xz 12272488 BLAKE2B 7740d1d6e734fb7212d2b36f0a64dca03360ab059f0ca716522312c490f2b071a8fc6b383c98b429a6cb22ea5afec0e7e6c05dcb63b3908053ee891aa4129cdb SHA512 dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f
 DIST evolution-3.22.6.tar.xz 12288232 BLAKE2B d9412ee86621fd87bbfdb5799de64a148c766642e62b6781a7a9111819ea9b3cd1aa94d95f71df2e46fdb347aedc8b28488a7ca6f7940f08644b00cdfc9f190d SHA512 c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f
 DIST evolution-3.24.5.tar.xz 12140736 BLAKE2B e144307693f6ae1824aafd3444b38e435414aa1e7900b3622b5f36098d1c8d073ff565896bea07ad9eca076482d98c3bcea70e7d08d37c5fdcd68226d8bc4588 SHA512 daba1ebd9407219b3abe959b27adb32eb0038a9c1653c360a19cf28f8849004a8cd4a652562d696045311c13d19030f93d3578e09d06fff01534ada28f883f2c
+DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861feec40dddc4411b1bdc6519e249de8db8b3319450808d7a31b80386f9830f351b7edacb3c6fcd28fe5fdfe343329f7 SHA512 da5c9062791996735e52575894763597cc957cb17bc0abe46a966f0e3e6706550ce534ae03b2c444d142547119f3a59aec6ee17e0302a002d8437da166ef7178
 EBUILD evolution-3.22.4.ebuild 4086 BLAKE2B 43e3c62a5c89f72a4539e92f4695db1fa8e890d4638c81045bf359f53d64d969fc958e20c1bb47885f4ea77895f651e2d023b613ca8ba2f45914947094531303 SHA512 6b419b6eba9a57551b889ca94fc18770789a24a7e8aeba1aa6c49186aa656b27d3045f571f05781aada1bcb18dfecaeff557fa28404a0e5380cbf1eb7b03e744
 EBUILD evolution-3.22.6.ebuild 4069 BLAKE2B 3b8cbaf03bfbe4883d67ff982481d6abb85f3edab97e9ec3ffee30ea4fe822e5803ac37e28310cb6da6b0a170f6de378a8b44044de254daa1958600c5420e074 SHA512 bf276e7f5c0d6936b5166e739ac7d5b1f3349684cbd940a629baf37b505a78ebbcaa1f79a5eb634db8d903db8e881dcf9f4bd14f94402e3904d3c9f074a6230d
 EBUILD evolution-3.24.5.ebuild 4374 BLAKE2B 9793bdc3cf4eb793a88b42bb3935fc0674182f88d8535c0f631654fb35301a3804654db620cb322cbb1c3d198a31a2d9b227f0626b6827511a37f01e0102d85c SHA512 18020872e0c355671307098d4dc36b2c800a253cbc51392494f9190fe45c4c5d17e4fdb7ccec4a70d1c04e76b1822d9d4897a02fbc7b33d4784540460012160b
-MISC metadata.xml 1094 BLAKE2B c8035390ccba51804ec6c46f7e23c4ef8b90d84fa65d1ceb9635c83e53f2a52137976e72141e36d0a074817737ce998fa81c7ebc00e9a78862ae6b7daa0d35d7 SHA512 1c6e41c34d90f2aa592d03fed093ccf694bc125cf988c101b662c114963b5c5c0a95d36906b1b48b3a598fc41e0c7913fa9be525ddecb267427918a25ffc3ea9
+EBUILD evolution-3.24.6.ebuild 4538 BLAKE2B bb42d86443dd12a4930172b6343f449cfedad32d74c1ae56f8af4def1b7885bef0ade6f78a43b82f86da61e59c5a06eae7f6a3ae4d7535aa6689f82f791821ce SHA512 c1707fafff2c04e1e980a9c0bdb65dbfc20a5851cd7e56a25c431fae287899ed4a77ece6af59df4a5245fb02a09b5df5c5c76828890c676b0ae2942f40142088
+MISC metadata.xml 1205 BLAKE2B 66e8fe4cec38cecf66a4a781c5d3498d8f11d72f1298a1df615a1b178b53cfd435bbbbcfbb6805662027be17be00082f429cc1e3c93fd5ce54cd2b88c873df8c SHA512 8713d5f9cbc7efdc7245cb7b18d30132c96095e396a1c8559e8f942c87157b6b5f3de03daade3b6d2ad9fc53067bc938b7af4369beeec70ca01291c198e438bd
diff --git a/mail-client/evolution/evolution-3.24.6.ebuild b/mail-client/evolution/evolution-3.24.6.ebuild
new file mode 100644
index 000000000000..a56a29bac8e7
--- /dev/null
+++ b/mail-client/evolution/evolution-3.24.6.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+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 crypt geolocation highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
+
+# 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
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-1.1.7
+	>=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.13.90:4
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.10: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:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	crypt? (
+		>=app-crypt/gnupg-1.4
+		${PINENTRY_DEPEND}
+		x11-libs/libcryptui )
+	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 )
+	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
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=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)."
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
+	"${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
+src_prepare() {
+	# Leave post-install actions to eclass
+	sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \
+		-i "${S}"/cmake/modules/IconCache.cmake || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=OFF
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_LIBCRYPTUI=$(usex crypt)
+		-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/evolution/files/3.24.6-DESTDIR-honoring.patch b/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch
new file mode 100644
index 000000000000..7e024c937e7c
--- /dev/null
+++ b/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch
@@ -0,0 +1,53 @@
+From cb845f462072d1d1e4045eac5f16b4db1f552309 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 2 Oct 2017 19:22:41 +0200
+Subject: [PATCH] Bug 781645 - Skip GSettings schema compile and icon cache
+ update when DESTDIR is set
+
+(cherry picked from commit b40001cac702a74f818afb3f38acf9521e9d7b62)
+---
+ cmake/modules/GLibTools.cmake | 8 +++++---
+ cmake/modules/IconCache.cmake | 8 +++++---
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
+index fc8eb827c8..f0be5586db 100644
+--- a/cmake/modules/GLibTools.cmake
++++ b/cmake/modules/GLibTools.cmake
+@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
+ 	if(_install_code)
+ 		# Compile gsettings schemas and ensure that all of them are in the place.
+ 		install(CODE
+-			"execute_process(${_install_code}
+-				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
+-			)")
++			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
++				execute_process(${_install_code}
++					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
++				)
++			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
+ 	endif(_install_code)
+ endmacro(add_gsettings_schemas)
+ 
+diff --git a/cmake/modules/IconCache.cmake b/cmake/modules/IconCache.cmake
+index 6f7f5f0f24..145b843f1d 100644
+--- a/cmake/modules/IconCache.cmake
++++ b/cmake/modules/IconCache.cmake
+@@ -60,9 +60,11 @@ macro(add_icon_cache_files _destdir _fileslistvar)
+ 
+ 	if(GTK_UPDATE_ICON_CACHE)
+ 		install(CODE
+-			"execute_process(${_install_code}
+-				COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
+-			)")
++			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
++				execute_process(${_install_code}
++					COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
++				)
++			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
+ 	endif(GTK_UPDATE_ICON_CACHE)
+ endmacro(add_icon_cache_files)
+ 
+-- 
+2.15.1
+
diff --git a/mail-client/evolution/files/3.24.6-libical3-compat.patch b/mail-client/evolution/files/3.24.6-libical3-compat.patch
new file mode 100644
index 000000000000..a7e5da268ee4
--- /dev/null
+++ b/mail-client/evolution/files/3.24.6-libical3-compat.patch
@@ -0,0 +1,265 @@
+From a1bfd863de7732d138a6cdd4c08c763f81560c34 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 23 Aug 2017 14:11:12 +0200
+Subject: [PATCH 1/2] Bug 786163 - [ECalModel] Do not convert UTC times to
+ local time zone
+
+(cherry picked from commit 7a3abddc2f0b12916a607da27cbd6817f28de737)
+---
+ src/calendar/gui/e-cal-model.c | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
+index 582fd7f3ea..75bf60fb2f 100644
+--- a/src/calendar/gui/e-cal-model.c
++++ b/src/calendar/gui/e-cal-model.c
+@@ -1943,32 +1943,6 @@ e_cal_model_get_component_index (ECalModel *model,
+ 	return -1;
+ }
+ 
+-/* We do this check since the calendar items are downloaded from the server
+- * in the open_method, since the default timezone might not be set there. */
+-static void
+-ensure_dates_are_in_default_zone (ECalModel *model,
+-                                  icalcomponent *icalcomp)
+-{
+-	icaltimetype dt;
+-	icaltimezone *zone;
+-
+-	zone = e_cal_model_get_timezone (model);
+-	if (!zone)
+-		return;
+-
+-	dt = icalcomponent_get_dtstart (icalcomp);
+-	if (dt.is_utc) {
+-		dt = icaltime_convert_to_zone (dt, zone);
+-		icalcomponent_set_dtstart (icalcomp, dt);
+-	}
+-
+-	dt = icalcomponent_get_dtend (icalcomp);
+-	if (dt.is_utc) {
+-		dt = icaltime_convert_to_zone (dt, zone);
+-		icalcomponent_set_dtend (icalcomp, dt);
+-	}
+-}
+-
+ static void
+ cal_model_data_subscriber_component_added_or_modified (ECalDataModelSubscriber *subscriber,
+ 						       ECalClient *client,
+@@ -1995,7 +1969,6 @@ cal_model_data_subscriber_component_added_or_modified (ECalDataModelSubscriber *
+ 
+ 	table_model = E_TABLE_MODEL (model);
+ 	icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
+-	ensure_dates_are_in_default_zone (model, icalcomp);
+ 
+ 	if (index < 0) {
+ 		e_table_model_pre_change (table_model);
+-- 
+2.15.1
+
+
+From f9d1eb89115b62bf6fd9d986856a4f4d26fc8e49 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 4 Oct 2017 11:57:56 +0200
+Subject: [PATCH 2/2] Use icaltime_is_utc() instead of icaltimetype::is_utc
+
+The structure member is going to be removed from libical in the next release
+and the function is available for a long time, thus it's safe to replace
+the usage in the code.
+
+(cherry picked from commit ec8468efd71e8c81ebd6933646486237c32dd2b0)
+---
+ src/calendar/gui/comp-util.c                     | 6 +++---
+ src/calendar/gui/e-cal-component-preview.c       | 2 +-
+ src/calendar/gui/e-comp-editor-event.c           | 8 +++-----
+ src/calendar/gui/e-comp-editor-page-recurrence.c | 1 -
+ src/calendar/gui/e-comp-editor-property-part.c   | 2 --
+ src/calendar/gui/e-comp-editor-task.c            | 2 +-
+ src/calendar/gui/e-meeting-store.c               | 4 ++--
+ src/calendar/gui/itip-utils.c                    | 2 +-
+ src/modules/itip-formatter/itip-view.c           | 8 ++++----
+ 9 files changed, 15 insertions(+), 20 deletions(-)
+
+diff --git a/src/calendar/gui/comp-util.c b/src/calendar/gui/comp-util.c
+index 6de47e8057..81d7b91b96 100644
+--- a/src/calendar/gui/comp-util.c
++++ b/src/calendar/gui/comp-util.c
+@@ -123,8 +123,8 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp,
+ 	/* If the event uses UTC for DTSTART & DTEND, return TRUE. Outlook
+ 	 * will send single events as UTC, so we don't want to mark all of
+ 	 * these. */
+-	if ((!start_datetime.value || start_datetime.value->is_utc)
+-	    && (!end_datetime.value || end_datetime.value->is_utc)) {
++	if ((!start_datetime.value || icaltime_is_utc (*start_datetime.value))
++	    && (!end_datetime.value || icaltime_is_utc (*end_datetime.value))) {
+ 		retval = TRUE;
+ 		goto out;
+ 	}
+@@ -1328,7 +1328,7 @@ cal_comp_util_update_tzid_parameter (icalproperty *prop,
+ 	if (tt.zone)
+ 		tzid = icaltimezone_get_tzid ((icaltimezone *) tt.zone);
+ 
+-	if (tt.zone && tzid && *tzid && !tt.is_utc && !tt.is_date) {
++	if (tt.zone && tzid && *tzid && !icaltime_is_utc (tt) && !tt.is_date) {
+ 		if (param) {
+ 			icalparameter_set_tzid (param, (gchar *) tzid);
+ 		} else {
+diff --git a/src/calendar/gui/e-cal-component-preview.c b/src/calendar/gui/e-cal-component-preview.c
+index 67e56906e2..5801f71fc2 100644
+--- a/src/calendar/gui/e-cal-component-preview.c
++++ b/src/calendar/gui/e-cal-component-preview.c
+@@ -168,7 +168,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
+ 	if (dt->tzid != NULL) {
+ 		e_cal_client_get_timezone_sync (
+ 			client, dt->tzid, &zone, NULL, NULL);
+-	} else if (dt->value->is_utc) {
++	} else if (icaltime_is_utc (*dt->value)) {
+ 		zone = icaltimezone_get_utc_timezone ();
+ 	}
+ 
+diff --git a/src/calendar/gui/e-comp-editor-event.c b/src/calendar/gui/e-comp-editor-event.c
+index d56c1c9e90..40546a90aa 100644
+--- a/src/calendar/gui/e-comp-editor-event.c
++++ b/src/calendar/gui/e-comp-editor-event.c
+@@ -286,7 +286,7 @@ ece_event_update_timezone (ECompEditorEvent *event_editor,
+ 	if (icalcomponent_get_first_property (component, ICAL_DTSTART_PROPERTY)) {
+ 		dtstart = icalcomponent_get_dtstart (component);
+ 		if (icaltime_is_valid_time (dtstart)) {
+-			if (dtstart.is_utc)
++			if (icaltime_is_utc (dtstart))
+ 				zone = icaltimezone_get_utc_timezone ();
+ 			else
+ 				zone = ece_event_get_timezone_from_property (comp_editor,
+@@ -297,7 +297,7 @@ ece_event_update_timezone (ECompEditorEvent *event_editor,
+ 	if (icalcomponent_get_first_property (component, ICAL_DTEND_PROPERTY)) {
+ 		dtend = icalcomponent_get_dtend (component);
+ 		if (!zone && icaltime_is_valid_time (dtend)) {
+-			if (dtend.is_utc)
++			if (icaltime_is_utc (dtend))
+ 				zone = icaltimezone_get_utc_timezone ();
+ 			else
+ 				zone = ece_event_get_timezone_from_property (comp_editor,
+@@ -310,7 +310,7 @@ ece_event_update_timezone (ECompEditorEvent *event_editor,
+ 
+ 		itt = icalcomponent_get_due (component);
+ 		if (icaltime_is_valid_time (itt)) {
+-			if (itt.is_utc)
++			if (icaltime_is_utc (itt))
+ 				zone = icaltimezone_get_utc_timezone ();
+ 			else
+ 				zone = ece_event_get_timezone_from_property (comp_editor,
+@@ -497,10 +497,8 @@ ece_event_fill_component (ECompEditor *comp_editor,
+ 				dtstart.zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (timezone_entry));
+ 				if (!dtstart.zone)
+ 					dtstart.zone = icaltimezone_get_utc_timezone ();
+-				dtstart.is_utc = dtstart.zone == icaltimezone_get_utc_timezone ();
+ 
+ 				dtend.zone = dtstart.zone;
+-				dtend.is_utc = dtstart.is_utc;
+ 
+ 				set_dtstart = TRUE;
+ 				set_dtend = TRUE;
+diff --git a/src/calendar/gui/e-comp-editor-page-recurrence.c b/src/calendar/gui/e-comp-editor-page-recurrence.c
+index 7f302dfc7f..139f07d1d3 100644
+--- a/src/calendar/gui/e-comp-editor-page-recurrence.c
++++ b/src/calendar/gui/e-comp-editor-page-recurrence.c
+@@ -1088,7 +1088,6 @@ ecep_recurrence_fill_ending_date (ECompEditorPageRecurrence *page_recurrence,
+ 				rrule->until.minute = 0;
+ 				rrule->until.second = 0;
+ 				rrule->until.is_date = TRUE;
+-				rrule->until.is_utc = FALSE;
+ 			}
+ 
+ 			page_recurrence->priv->ending_date_tt = rrule->until;
+diff --git a/src/calendar/gui/e-comp-editor-property-part.c b/src/calendar/gui/e-comp-editor-property-part.c
+index bc42ef15c1..bb3582a6b8 100644
+--- a/src/calendar/gui/e-comp-editor-property-part.c
++++ b/src/calendar/gui/e-comp-editor-property-part.c
+@@ -872,8 +872,6 @@ e_comp_editor_property_part_datetime_get_value (ECompEditorPropertyPartDatetime
+ 			value.zone = e_timezone_entry_get_timezone (timezone_entry);
+ 		if (!value.zone)
+ 			value.zone = icaltimezone_get_utc_timezone ();
+-
+-		value.is_utc = value.zone == icaltimezone_get_utc_timezone ();
+ 	}
+ 
+ 	g_clear_object (&timezone_entry);
+diff --git a/src/calendar/gui/e-comp-editor-task.c b/src/calendar/gui/e-comp-editor-task.c
+index 16f31d8d32..86c1dca9ae 100644
+--- a/src/calendar/gui/e-comp-editor-task.c
++++ b/src/calendar/gui/e-comp-editor-task.c
+@@ -120,7 +120,7 @@ ece_task_update_timezone (ECompEditorTask *task_editor,
+ 				if (force_allday && dt.is_date)
+ 					*force_allday = TRUE;
+ 
+-				if (dt.is_utc)
++				if (icaltime_is_utc (dt))
+ 					zone = icaltimezone_get_utc_timezone ();
+ 				else
+ 					zone = ece_task_get_timezone_from_property (comp_editor,
+diff --git a/src/calendar/gui/e-meeting-store.c b/src/calendar/gui/e-meeting-store.c
+index 13c2e8643b..ae5b1f5c0f 100644
+--- a/src/calendar/gui/e-meeting-store.c
++++ b/src/calendar/gui/e-meeting-store.c
+@@ -1347,7 +1347,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
+ 		icaltimezone *ds_zone;
+ 
+ 		dtstart = icalproperty_get_dtstart (ip);
+-		if (!dtstart.is_utc)
++		if (!icaltime_is_utc (dtstart))
+ 			ds_zone = find_zone (ip, tz_top_level);
+ 		else
+ 			ds_zone = icaltimezone_get_utc_timezone ();
+@@ -1367,7 +1367,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
+ 		icaltimezone *de_zone;
+ 
+ 		dtend = icalproperty_get_dtend (ip);
+-		if (!dtend.is_utc)
++		if (!icaltime_is_utc (dtend))
+ 			de_zone = find_zone (ip, tz_top_level);
+ 		else
+ 			de_zone = icaltimezone_get_utc_timezone ();
+diff --git a/src/calendar/gui/itip-utils.c b/src/calendar/gui/itip-utils.c
+index d808a3c7fc..2b85786f37 100644
+--- a/src/calendar/gui/itip-utils.c
++++ b/src/calendar/gui/itip-utils.c
+@@ -1607,7 +1607,7 @@ comp_compliant (ESourceRegistry *registry,
+ 			r->until.is_date = FALSE;
+ 
+ 			icaltimezone_convert_time (&r->until, from_zone, to_zone);
+-			r->until.is_utc = TRUE;
++			r->until.zone = to_zone;
+ 
+ 			e_cal_component_free_datetime (&dt);
+ 			e_cal_component_set_rrule_list (clone, rrule_list);
+diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
+index 62303b9b35..5be43ad091 100644
+--- a/src/modules/itip-formatter/itip-view.c
++++ b/src/modules/itip-formatter/itip-view.c
+@@ -6167,9 +6167,9 @@ itip_view_init_view (ItipView *view)
+ 
+                 /* If the timezone is not in the component, guess the local time */
+                 /* Should we guess if the timezone is an olsen name somehow? */
+-		if (datetime.value->is_utc)
++		if (icaltime_is_utc (*datetime.value))
+ 			from_zone = icaltimezone_get_utc_timezone ();
+-		else if (!datetime.value->is_utc && datetime.tzid) {
++		else if (!icaltime_is_utc (*datetime.value) && datetime.tzid) {
+ 			from_zone = icalcomponent_get_timezone (view->priv->top_level, datetime.tzid);
+ 
+ 			if (!from_zone)
+@@ -6206,9 +6206,9 @@ itip_view_init_view (ItipView *view)
+ 
+                 /* If the timezone is not in the component, guess the local time */
+                 /* Should we guess if the timezone is an olsen name somehow? */
+-		if (datetime.value->is_utc)
++		if (icaltime_is_utc (*datetime.value))
+ 			from_zone = icaltimezone_get_utc_timezone ();
+-		else if (!datetime.value->is_utc && datetime.tzid) {
++		else if (!icaltime_is_utc (*datetime.value) && datetime.tzid) {
+ 			from_zone = icalcomponent_get_timezone (view->priv->top_level, datetime.tzid);
+ 
+ 			if (!from_zone)
+-- 
+2.15.1
+
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
index b6c93561db34..885e9b3f3010 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.xml
@@ -20,5 +20,7 @@
 		<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
 			plugin</flag>
 		<flag name="weather">Enable optional weather calendar support</flag>
+		<flag name="ytnef">Enable optional TNEF attachments parser support using
+			<pkg>net-mail/ytnef</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 799d16ac79d3..d5e228a2876a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,5 +1,3 @@
-AUX 0001-Rename-mutt-to-neomutt-20170714.patch 17943 BLAKE2B 336885a87f48f313853250cf745e3bfaae6e4aeb20027d5e2ad8d1509346027b2d2b07644c83f230fff85c31ea8510ed61c5f7f66ca0e244f8597c352ce6115a SHA512 c9fa44781fab530a906707b2cd261720635c076ac67346dd40b8135f691690c540e31391e22b3f29c9a863731a4e2e1a47cdccc8f5625654113168dc3cdd2cfc
-AUX 0001-Rename-mutt-to-neomutt-20170912.patch 12034 BLAKE2B 5a152c16a3c732eb2b926314e8bdba89b0d26dab0bb43b6d677ad3c0ccc9b5c8c5bd379ba9650279088e79169641257b1be5a1fe3d595efcfbceac26bafd138b SHA512 2c1773b9123041e1eef634c0b479e984f8b4eee615b6f2aff841044a094f785bb6506eb026bb26dd910fa2e89e035b29d9030fb7911d1aa61be4ab6eed4077b4
 AUX 0001-Rename-mutt-to-neomutt-20171006.patch 752 BLAKE2B 11554d93bc31e5fd9aa40fe1458979b87a15c0929f558cacd1f5719740e00530518c820388b187dc0c13be86ea72747949669ab7bbb2d6241d4d0c04a1d4d7f1 SHA512 d6975449dc8405a1dde84665d94b3c5668a979de6082e1ffac539de755a9337a6f9e772d811ab2861b0f6675b27ae1e10aedde512e6a7a234a3af440d0384e4c
 DIST neomutt-20171006.tar.gz 2706019 BLAKE2B b16f065fd1c5b829c6b73614c42e5353b968fe9111d445319927a48ec2612e59ac23dd3e06948c7c5b6f34bdd1646773cf91ae21737adf67ff4019c9850895e2 SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d
 DIST neomutt-20171013.tar.gz 2706753 BLAKE2B d8801f4168ce978b8b2578a1fa28b8f29e98700c2b3c11dcce7b9cdf132a755403ed1b54216426736c1dde78c580320ebac4fbb6e3ca6f92abc1c1e6d1e4fd1b SHA512 9e4499b165f25091d73868c62b14f950bdfc032444c0cb3619e99a8299d29c3d1f24078e15537e693a3af69ae0681d59e25a73b857882cce2653be593231ffac
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch
deleted file mode 100644
index bb01dbf98013..000000000000
--- a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From bb4a3d41530619970d5c3c30be7e9424dd169de5 Mon Sep 17 00:00:00 2001
-From: Nicolas Bock <nicolasbock@gmail.com>
-Date: Tue, 8 Aug 2017 13:36:20 +0200
-Subject: [PATCH] Rename mutt to neomutt
-
----
- Makefile.am         | 30 ++++++++++++++++--------------
- configure.ac        |  8 ++++----
- contrib/gpg.rc      |  8 ++++----
- contrib/pgp2.rc     |  4 ++--
- contrib/pgp5.rc     |  8 ++++----
- contrib/pgp6.rc     |  4 ++--
- doc/Makefile.am     | 24 +++++++++++-------------
- doc/PGP-Notes.txt   |  8 ++++----
- doc/mutt.man        |  2 +-
- doc/pgpewrap.1      | 12 ++++++------
- doc/pgpring.1       | 10 +++++-----
- hcache/hcachever.sh |  2 +-
- 12 files changed, 60 insertions(+), 60 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 5b6494e8..d34d3e4c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,7 @@
- include $(top_srcdir)/flymake.am
- 
- AUTOMAKE_OPTIONS = 1.6 foreign
--EXTRA_PROGRAMS = mutt_md5 pgpewrap pgpring
-+EXTRA_PROGRAMS = neomutt_md5 neomutt_pgpewrap neomutt_pgpring
- 
- # Test the .tar file by building everything
- AM_DISTCHECK_CONFIGURE_FLAGS = \
-@@ -42,9 +42,9 @@ distdir = neo$(PACKAGE)-$(VERSION)
- 
- BUILT_SOURCES = conststrings.c git_ver.h keymap_alldefs.h keymap_defs.h
- 
--bin_PROGRAMS = mutt $(PGPAUX_TARGET)
-+bin_PROGRAMS = neomutt $(PGPAUX_TARGET)
- 
--mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \
-+neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \
- 	base64.c bcache.c body.h browser.c buffer.c buffy.c charset.c color.c \
- 	commands.c complete.c compose.c compress.c content.h context.h copy.c \
- 	curs_lib.c curs_main.c date.c edit.c editmsg.c enter.c enter_state.h \
-@@ -59,15 +59,15 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h ascii.c attach.c \
- 	smtp.c sort.c state.h status.c system.c thread.c thread.h url.c \
- 	version.c where.h
- 
--nodist_mutt_SOURCES = $(BUILT_SOURCES)
-+nodist_neomutt_SOURCES = $(BUILT_SOURCES)
- 
- LIBIMAP = -Limap -limap
- LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
- 
--mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
-+neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
- 	$(LIBIMAP) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
- 
--mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
-+neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
- 	$(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS)
- 
- DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-@@ -75,7 +75,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
- 
- AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
- 
--EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
-+EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
- 	mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \
- 	remailer.c remailer.h resize.c sha1.c url.h utf8.c wcwidth.c
- 
-@@ -95,13 +95,15 @@ EXTRA_DIST = account.h ascii.h attach.h bcache.h browser.h buffer.h buffy.h \
- 
- EXTRA_SCRIPTS =
- 
--pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c
--pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS)
--pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS)
-+neomutt_pgpewrap_SOURCES = pgpewrap.c
- 
--mutt_md5_SOURCES = md5.c
--mutt_md5_CFLAGS = -DMD5UTIL
--mutt_md5_LDADD =
-+neomutt_pgpring_SOURCES = ascii.c extlib.c lib.c md5.c pgppubring.c sha1.c
-+neomutt_pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS)
-+neomutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS)
-+
-+neomutt_md5_SOURCES = md5.c
-+neomutt_md5_CFLAGS = -DMD5UTIL
-+neomutt_md5_LDADD =
- 
- txt2c_SOURCES = txt2c.c
- txt2c_LDADD =
-@@ -141,7 +143,7 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.SIDEBAR $(srcdir)/OPS.NOTMUCH $(sr
- 		$(srcdir)/OPS.MIX $(srcdir)/OPS.PGP $(srcdir)/OPS.SMIME $(srcdir)/OPS.CRYPT \
- 		> $@
- 
--git_ver.h: $(mutt_SOURCES) $(SUBDIRS)
-+git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
- 	version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
- 	echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
- 	cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
-diff --git a/configure.ac b/configure.ac
-index bc88adc7..17796620 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@ dnl     autoreconf -i
- CFLAGS=$CFLAGS
- LDFLAGS=$LDFLAGS
- 
--AC_INIT([NeoMutt], [20170714], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
-+AC_INIT([NeoMutt], [20170714], [neomutt-devel@neomutt.org], [neomutt], [https://www.neomutt.org])
- AC_CONFIG_SRCDIR(mutt.h)
- AC_CONFIG_AUX_DIR([.build-aux])
- AM_INIT_AUTOMAKE
-@@ -192,7 +192,7 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [
- dnl --enable-pgp
- AS_IF([test x$use_pgp != "xno"], [
- 	AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.])
--	PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)"
-+	PGPAUX_TARGET="neomutt_pgpring\$(EXEEXT) neomutt_pgpewrap\$(EXEEXT)"
- 	build_ncrypt_pgp="yes"
- ])
- 
-@@ -449,7 +449,7 @@ AC_SUBST([datarootdir])
- AC_MSG_CHECKING(where to put the documentation)
- AC_ARG_WITH(docdir, AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]),
- 	[mutt_cv_docdir=$withval],
--	[mutt_cv_docdir='${datarootdir}/doc/mutt'])
-+	[mutt_cv_docdir='${datarootdir}/doc/neomutt'])
- AC_MSG_RESULT($mutt_cv_docdir)
- if test -z "$docdir" -o -n "$with_docdir"; then
- 	docdir=$mutt_cv_docdir
-@@ -825,7 +825,7 @@ AM_CONDITIONAL(BUILD_HC_QDBM, test "x$build_hc_qdbm" = "xyes")
- AM_CONDITIONAL(BUILD_HC_TC,   test "x$build_hc_tc"   = "xyes")
- dnl -- end cache --
- 
--MUTT_MD5="mutt_md5$EXEEXT"
-+MUTT_MD5="neomutt_md5$EXEEXT"
- 
- AC_SUBST(MUTT_MD5)
- AC_SUBST(MUTT_LIB_OBJECTS)
-diff --git a/contrib/gpg.rc b/contrib/gpg.rc
-index 3392038b..86dc23c7 100644
---- a/contrib/gpg.rc
-+++ b/contrib/gpg.rc
-@@ -46,12 +46,12 @@ set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphra
- set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
- 
- # create a pgp/mime encrypted attachment
--# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-+# set pgp_encrypt_only_command="neomutt_pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_only_command="neomutt_pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
- 
- # create a pgp/mime encrypted and signed attachment
--# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
--set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+# set pgp_encrypt_sign_command="neomutt_pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-+set pgp_encrypt_sign_command="neomutt_pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
- 
- # import a key into the public key ring
- set pgp_import_command="gpg --no-verbose --import %f"
-diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc
-index bd01e2d2..08b592dd 100644
---- a/contrib/pgp2.rc
-+++ b/contrib/pgp2.rc
-@@ -37,10 +37,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r"
- set pgp_verify_key_command="pgp -kcc +language=mutt %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="pgpring -2 %r"
-+set pgp_list_pubring_command="neomutt_pgpring -2 %r"
- 
- # read in the secret key ring
--set pgp_list_secring_command="pgpring -s -2 %r"
-+set pgp_list_secring_command="neomutt_pgpring -s -2 %r"
- 
- # pattern for good signature
- set pgp_good_sign="Good signature"
-diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc
-index 4440d6b7..aea3ae54 100644
---- a/contrib/pgp5.rc
-+++ b/contrib/pgp5.rc
-@@ -19,10 +19,10 @@ set pgp_decrypt_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpv +languag
- set pgp_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgps +language=mutt +verbose=0 +batchmode -abft %?a? -u %a?"
- 
- # create a pgp/mime encrypted attachment
--set pgp_encrypt_only_command="pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f"
-+set pgp_encrypt_only_command="neomutt_pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -aft -- -r %r < %f"
- 
- # create a pgp/mime encrypted and signed attachment
--set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r"
-+set pgp_encrypt_sign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | neomutt_pgpewrap pgpe +language=mutt +verbose=0 +batchmode +nobatchinvalidkeys=off -afts %?a? -u %a? -- -r %r"
- 
- # import a key into the public key ring
- set pgp_import_command="pgpk -a +language=mutt --OutputInformationFD=1 %f"
-@@ -34,9 +34,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r"
- set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="pgpring -5 %r"
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r"
- 
- # read in the secret key ring
--set pgp_list_secring_command="pgpring -5 -s %r"
-+set pgp_list_secring_command="neomutt_pgpring -5 -s %r"
- 
- 
-diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc
-index a8708042..6b1ef985 100644
---- a/contrib/pgp6.rc
-+++ b/contrib/pgp6.rc
-@@ -31,10 +31,10 @@ set pgp_export_command="pgp6 +compatible  -kxaf  %r"
- set pgp_verify_key_command="pgp6 +compatible  -kcc  %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="pgpring -5 %r"
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r"
- 
- # read in the secret key ring
--set pgp_list_secring_command="pgpring -s -5 %r"
-+set pgp_list_secring_command="neomutt_pgpring -s -5 %r"
- 
- # create a clearsigned message
- set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible   +verbose=0 +batchmode +clearsig -afst %?a? -u %a?"
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 6a6c711b..770dc16c 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -33,20 +33,18 @@ topsrcdir_DOCFILES = ChangeLog.md CODE_OF_CONDUCT.md COPYRIGHT INSTALL \
- 
- all: makedoc-all
- 
--makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt mutt.1 \
--	Muttrc muttrc.man neomutt-syntax.vim
-+makedoc-all: $(CHUNKED_DOCFILES) index.html manual.html manual.txt neomutt.1 \
-+	Muttrc neomuttrc.man neomutt-syntax.vim
- 
- install-data-local: makedoc-all
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/man5
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
--	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-+	$(INSTALL) -m 644 neomutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1
-+	$(INSTALL) -m 644 neomuttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5
- 	$(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
--	$(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
--	$(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
--	$(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5
--	$(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5
-+	$(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap.1
-+	$(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring.1
- 	$(MKDIR_P) $(DESTDIR)$(docdir)
- 	for f in $(topsrcdir_DOCFILES); do \
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir); \
-@@ -69,10 +67,10 @@ install-data-local: makedoc-all
- 	-$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
- 
- uninstall-local:
--	for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-+	for f in neomutt.1 smime_keys.1 neomutt_pgpewrap.1 neomutt_pgpring.1; do \
- 		rm -f $(DESTDIR)$(mandir)/man1/$$f; \
- 	done
--	for f in muttrc.5 mbox.5 mmdf.5; do \
-+	for f in neomuttrc.5; do \
- 		rm -f $(DESTDIR)$(mandir)/man5/$$f; \
- 	done
- 	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \
-@@ -120,11 +118,11 @@ sortcheck: manual.xml
- 	rm -rf vars.tmp.1 vars.tmp.2
- 
- clean-local:
--	rm -f *.html mutt.1 muttrc.man
-+	rm -f *.html neomutt.1 neomuttrc.man
- 
- DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc
- 
--muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
-+neomuttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
- 	$(MAKEDOC_CPP) $(top_srcdir)/init.h | \
- 		./makedoc$(EXEEXT) -m | \
- 		cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail > $@
-@@ -133,7 +131,7 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
- 	-e 's,@bindir\@,$(bindir),g' \
- 	-e 's,@docdir\@,$(docdir),g'
- 
--mutt.1: $(srcdir)/mutt.man
-+neomutt.1: $(srcdir)/mutt.man
- 	$(EDIT) $(srcdir)/mutt.man > $@
- 
- manual.xml: makedoc$(EXEEXT) ../config.h $(top_srcdir)/init.h \
-diff --git a/doc/PGP-Notes.txt b/doc/PGP-Notes.txt
-index 2215c410..a358f818 100644
---- a/doc/PGP-Notes.txt
-+++ b/doc/PGP-Notes.txt
-@@ -157,7 +157,7 @@ or exim.
- Auxiliary Programs
- ------------------
- 
--Mutt needs two auxiliary programs for its PGP support: pgpewrap and
-+Mutt needs two auxiliary programs for its PGP support: neomutt_pgpewrap and
- pgpring.
- 
- 
-@@ -186,17 +186,17 @@ Command line options:
- 
- 
- 
--2. pgpewrap
-+2. neomutt_pgpewrap
- 
- This is a little C program which does some command line munging: The
--first argument is a command to be executed.  When pgpewrap
-+first argument is a command to be executed.  When neomutt_pgpewrap
- encounters a "--" (dash-dash) argument, it will interpret the next
- argument as a prefix which is put in front of all following
- arguments.
- 
- Example:
- 
--        pgpewrap pgpe file -- -r a b c
-+        neomutt_pgpewrap pgpe file -- -r a b c
- 
- will execute:
- 
-diff --git a/doc/mutt.man b/doc/mutt.man
-index 8edee96e..9bc49a90 100644
---- a/doc/mutt.man
-+++ b/doc/mutt.man
-@@ -171,7 +171,7 @@ If this variable is set, mailcap are always used without prompting first.
- .IP "PGPPATH"
- Directory in which the user's PGP public keyring can be found.  When used with
- the original PGP program, mutt and
--.B pgpring (1)
-+.B neomutt_pgpring (1)
- rely on this being set.
- .IP "TMPDIR"
- Directory in which temporary files are created.
-diff --git a/doc/pgpewrap.1 b/doc/pgpewrap.1
-index 20327349..9ad7bff7 100644
---- a/doc/pgpewrap.1
-+++ b/doc/pgpewrap.1
-@@ -1,6 +1,6 @@
- .\" -*-nroff-*-
- .\"
--.\"     pgpewrap, a command line munging tool
-+.\"     neomutt_pgpewrap, a command line munging tool
- .\"     Manpage Copyright (c) 2013 Honza Horak
- .\"
- .\"     This program is free software; you can redistribute it and/or modify
-@@ -17,25 +17,25 @@
- .\"     along with this program; if not, write to the Free Software
- .\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- .\"
--.TH pgpewrap 1 "May 2013" Unix "User Manuals"
-+.TH neomutt_pgpewrap 1 "May 2013" Unix "User Manuals"
- .SH NAME
--pgpewrap \- Mutt command line munging tool
-+neomutt_pgpewrap \- Mutt command line munging tool
- 
- .SH SYNTAX
- .PP
--\fBpgpewrap\fP [ \fBflags\fP ] \-\- \fBprefix\fP [ \fBrecipients\fP ]
-+\fBneomutt_pgpewrap\fP [ \fBflags\fP ] \-\- \fBprefix\fP [ \fBrecipients\fP ]
- 
- .SH DESCRIPTION
- .PP
- This is a little C program which does some command line munging: The
--first argument is a command to be executed.  When \fBpgpewrap\fP
-+first argument is a command to be executed.  When \fBneomutt_pgpewrap\fP
- encounters a "\-\-" (dash\-dash) argument, it will interpret the next
- argument as a prefix which is put in front of all following
- arguments.
- 
- .SH EXAMPLE
- 
--        pgpewrap pgpe file \-\- \-r a b c
-+        neomutt_pgpewrap pgpe file \-\- \-r a b c
- 
- will execute:
- 
-diff --git a/doc/pgpring.1 b/doc/pgpring.1
-index 0009ad92..d23ebf55 100644
---- a/doc/pgpring.1
-+++ b/doc/pgpring.1
-@@ -1,6 +1,6 @@
- .\" -*-nroff-*-
- .\"
--.\"     pgpring, a key ring dumper
-+.\"     neomutt_pgpring, a key ring dumper
- .\"     Manpage Copyright (c) 2004-2013 Matthew Wilcox, Honza Horak
- .\"
- .\"     This program is free software; you can redistribute it and/or modify
-@@ -17,18 +17,18 @@
- .\"     along with this program; if not, write to the Free Software
- .\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- .\"
--.TH pgpring 1 "May 2013" Unix "User Manuals"
-+.TH neomutt_pgpring 1 "May 2013" Unix "User Manuals"
- .SH NAME
--pgpring \- Mutt key ring dumper
-+neomutt_pgpring \- Mutt key ring dumper
- 
- .SH SYNTAX
- .PP
--\fBpgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ]
-+\fBneomutt_pgpring\fP [ \fB\-k\fP \fIkeyring\fP ] [ \fB\-2\fP | \fB\-5\fP ]
- [ \fB\-s\fP ] [ \fB\-S\fP ] [ \fB\-f\fP ]
- 
- .SH DESCRIPTION
- .PP
--pgpring is a key ring dumper.  It extracts information from PGP's
-+neomutt_pgpring is a key ring dumper.  It extracts information from PGP's
- binary key ring and emits it in an (almost) readable output format
- understood by mutt's key selection routines.  This output format
- mimics the one used by the GNU Privacy Guard (GPG).
-diff --git a/hcache/hcachever.sh b/hcache/hcachever.sh
-index 733e6ca1..c35425d1 100755
---- a/hcache/hcachever.sh
-+++ b/hcache/hcachever.sh
-@@ -77,7 +77,7 @@ do
- done
- echo " */" >> $TMPD
- 
--MD5TEXT=`echo "$TEXT" | ../mutt_md5`
-+MD5TEXT=`echo "$TEXT" | ../neomutt_md5`
- echo "#define HCACHEVER 0x"`echo $MD5TEXT | cut -c-8` >> $TMPD
- 
- # TODO: validate we have all structs
--- 
-2.13.5
-
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch
deleted file mode 100644
index a8a0c8ad2726..000000000000
--- a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 457e54623ce8c5ef40647ebbc4a304417e353230 Mon Sep 17 00:00:00 2001
-From: Nicolas Bock <nicolasbock@gmail.com>
-Date: Mon, 2 Oct 2017 14:04:34 -0600
-Subject: [PATCH] Rename mutt to neomutt
-
----
- Makefile.am                                | 28 +++++++++++++++-------------
- configure.ac                               |  8 ++++----
- contrib/{smime_keys => neomutt_smime_keys} |  0
- contrib/pgp2.rc                            |  4 ++--
- contrib/pgp5.rc                            |  4 ++--
- contrib/pgp6.rc                            |  4 ++--
- contrib/smime.rc                           |  2 +-
- doc/Makefile.am                            | 30 +++++++++++++++---------------
- lib/Makefile.am                            |  4 ++--
- 9 files changed, 43 insertions(+), 41 deletions(-)
- rename contrib/{smime_keys => neomutt_smime_keys} (100%)
-
-diff --git a/Makefile.am b/Makefile.am
-index 97218b8f..859b2bcd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,7 @@
- include $(top_srcdir)/flymake.am
- 
- AUTOMAKE_OPTIONS = 1.6 foreign
--EXTRA_PROGRAMS = pgpewrap pgpring
-+EXTRA_PROGRAMS = neomutt_pgpewrap neomutt_pgpring
- 
- # Test the .tar file by building everything
- AM_DISTCHECK_CONFIGURE_FLAGS = \
-@@ -42,9 +42,9 @@ distdir = neo$(PACKAGE)-$(VERSION)
- 
- BUILT_SOURCES = conststrings.c git_ver.h
- 
--bin_PROGRAMS = mutt $(PGPAUX_TARGET)
-+bin_PROGRAMS = neomutt $(PGPAUX_TARGET)
- 
--mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
-+neomutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
- 	bcache.c body.c body.h browser.c buffy.c charset.c color.c \
- 	commands.c complete.c compose.c compress.c content.h context.h copy.c \
- 	curs_lib.c curs_main.c edit.c editmsg.c enter.c enter_state.h \
-@@ -59,18 +59,18 @@ mutt_SOURCES = account.c addrbook.c address.h alias.c alias.h attach.c \
- 	smtp.c sort.c state.c state.h status.c system.c thread.c thread.h url.c \
- 	version.c where.h
- 
--nodist_mutt_SOURCES = $(BUILT_SOURCES)
-+nodist_neomutt_SOURCES = $(BUILT_SOURCES)
- 
- LIBIMAP = -Limap -limap
- LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
- 
--LIBMUTT = -Llib -lmutt
--LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a
-+LIBMUTT = -Llib -lneomutt
-+LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libneomutt.a
- 
--mutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
-+neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
- 	$(LIBIMAP) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
- 
--mutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
-+neomutt_DEPENDENCIES = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(LIBIMAPDEPS) \
- 	$(LIBMUTTDEPS) $(HCACHE_DEPS) $(NCRYPT_DEPS) $(INTLDEPS)
- 
- DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-@@ -78,7 +78,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
- 
- AM_CPPFLAGS=-I. -I$(top_srcdir) $(GPGME_CFLAGS)
- 
--EXTRA_mutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
-+EXTRA_neomutt_SOURCES = browser.h mbyte.h mutt_idna.c mutt_idna.h \
- 	mutt_lua.c mutt_sasl.c mutt_notmuch.c mutt_ssl.c mutt_ssl_gnutls.c \
- 	remailer.c remailer.h resize.c url.h
- 
-@@ -94,11 +94,13 @@ EXTRA_DIST = account.h attach.h bcache.h browser.h buffy.h \
- 	rfc1524.h rfc2047.h rfc2231.h rfc3676.h rfc822.h sidebar.h \
- 	sort.h txt2c.c txt2c.sh version.h
- 
-+neomutt_pgpewrap_SOURCES = pgpewrap.c
-+
- EXTRA_SCRIPTS =
- 
--pgpring_SOURCES = pgppubring.c
--pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT)
--pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS)
-+neomutt_pgpring_SOURCES = pgppubring.c
-+neomutt_pgpring_LDADD = $(LIBOBJS) $(NCRYPT_LIBS) $(INTLLIBS) $(LIBMUTT)
-+neomutt_pgpring_DEPENDENCIES = $(LIBOBJS) $(NCRYPT_DEPS) $(INTLDEPS) $(LIBMUTTDEPS)
- 
- txt2c_SOURCES = txt2c.c
- txt2c_LDADD =
-@@ -130,7 +132,7 @@ LDADD = $(LIBOBJS) $(INTLLIBS)
- dist-hook:
- 	echo $(VERSION) > $(distdir)/.tarball-version
- 
--git_ver.h: $(mutt_SOURCES) $(SUBDIRS)
-+git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
- 	version=`git describe --dirty --abbrev=6 --match "neomutt-*" 2> /dev/null | sed -e 's/^neomutt-[0-9]\{8\}//' -e 's/g//'`; \
- 	echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \
- 	cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
-diff --git a/configure.ac b/configure.ac
-index 1e888e86..7898fa1b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@ dnl     autoreconf -i
- CFLAGS=$CFLAGS
- LDFLAGS=$LDFLAGS
- 
--AC_INIT([NeoMutt], [20170912], [neomutt-devel@neomutt.org], [mutt], [https://www.neomutt.org])
-+AC_INIT([NeoMutt], [20170912], [neomutt-devel@neomutt.org], [neomutt], [https://www.neomutt.org])
- AC_CONFIG_SRCDIR(mutt.h)
- AC_CONFIG_AUX_DIR([.build-aux])
- AM_INIT_AUTOMAKE
-@@ -186,7 +186,7 @@ AC_ARG_WITH(mailpath,
- AC_ARG_WITH(docdir,
- 	AS_HELP_STRING([--with-docdir=PATH],[Specify where to put the documentation]),
- 	[mutt_cv_docdir=$withval],
--	[mutt_cv_docdir='${datarootdir}/doc/mutt'])
-+	[mutt_cv_docdir='${datarootdir}/doc/neomutt'])
- 
- AC_ARG_WITH(domain,
- 	AS_HELP_STRING([--with-domain=DOMAIN],[Specify your DNS domain name]),
-@@ -213,14 +213,14 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [
- dnl --enable-pgp
- AS_IF([test x$use_pgp != "xno"], [
- 	AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.])
--	PGPAUX_TARGET="pgpring\$(EXEEXT) pgpewrap\$(EXEEXT)"
-+	PGPAUX_TARGET="neomutt_pgpring\$(EXEEXT) neomutt_pgpewrap\$(EXEEXT)"
- 	build_ncrypt_pgp="yes"
- ])
- 
- dnl --enable-smime
- AS_IF([test x$use_smime != "xno"], [
- 	AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME, 1, [Define if you want classic S/MIME support.])
--	SMIMEAUX_TARGET='$(top_srcdir)/contrib/smime_keys'
-+	SMIMEAUX_TARGET='$(top_srcdir)/contrib/neomutt_smime_keys'
- 	build_ncrypt_smime="yes"
- ])
- 
-diff --git a/contrib/smime_keys b/contrib/neomutt_smime_keys
-similarity index 100%
-rename from contrib/smime_keys
-rename to contrib/neomutt_smime_keys
-diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc
-index bd01e2d2..08b592dd 100644
---- a/contrib/pgp2.rc
-+++ b/contrib/pgp2.rc
-@@ -37,10 +37,10 @@ set pgp_export_command="pgp -kxaf +language=mutt %r"
- set pgp_verify_key_command="pgp -kcc +language=mutt %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="pgpring -2 %r"
-+set pgp_list_pubring_command="neomutt_pgpring -2 %r"
- 
- # read in the secret key ring
--set pgp_list_secring_command="pgpring -s -2 %r"
-+set pgp_list_secring_command="neomutt_pgpring -s -2 %r"
- 
- # pattern for good signature
- set pgp_good_sign="Good signature"
-diff --git a/contrib/pgp5.rc b/contrib/pgp5.rc
-index 4440d6b7..cdd85217 100644
---- a/contrib/pgp5.rc
-+++ b/contrib/pgp5.rc
-@@ -34,9 +34,9 @@ set pgp_export_command="pgpk -xa +language=mutt --OutputInformationFD=1 %r"
- set pgp_verify_key_command="pgpk -c +batchmode +language=mutt --OutputInformationFD=1 %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="pgpring -5 %r"
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r"
- 
- # read in the secret key ring
--set pgp_list_secring_command="pgpring -5 -s %r"
-+set pgp_list_secring_command="neomutt_pgpring -5 -s %r"
- 
- 
-diff --git a/contrib/pgp6.rc b/contrib/pgp6.rc
-index a8708042..6b1ef985 100644
---- a/contrib/pgp6.rc
-+++ b/contrib/pgp6.rc
-@@ -31,10 +31,10 @@ set pgp_export_command="pgp6 +compatible  -kxaf  %r"
- set pgp_verify_key_command="pgp6 +compatible  -kcc  %r"
- 
- # read in the public key ring
--set pgp_list_pubring_command="pgpring -5 %r"
-+set pgp_list_pubring_command="neomutt_pgpring -5 %r"
- 
- # read in the secret key ring
--set pgp_list_secring_command="pgpring -s -5 %r"
-+set pgp_list_secring_command="neomutt_pgpring -s -5 %r"
- 
- # create a clearsigned message
- set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible   +verbose=0 +batchmode +clearsig -afst %?a? -u %a?"
-diff --git a/contrib/smime.rc b/contrib/smime.rc
-index 532ac9ec..aa9897fb 100644
---- a/contrib/smime.rc
-+++ b/contrib/smime.rc
-@@ -52,7 +52,7 @@ set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signe
- set smime_get_cert_email_command="openssl x509 -in %f -noout -email"
- 
- # Add a certificate to the database using smime_keys.
--set smime_import_cert_command="smime_keys add_cert %f"
-+set smime_import_cert_command="neomutt_smime_keys add_cert %f"
- 
- 
- 
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 9bfe7ea6..dffbe5f6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -40,11 +40,11 @@ install-data-local: makedoc-all
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
- 	$(MKDIR_P) $(DESTDIR)$(mandir)/man5
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
--	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-+	$(INSTALL) -m 644 mutt.1 $(DESTDIR)$(mandir)/man1/neomutt.1
-+	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/neomuttrc.5
- 	$(INSTALL) -m 644 $(srcdir)/smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
--	$(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/pgpewrap.1
--	$(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/pgpring.1
-+	$(INSTALL) -m 644 $(srcdir)/pgpewrap.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpewrap.1
-+	$(INSTALL) -m 644 $(srcdir)/pgpring.1 $(DESTDIR)$(mandir)/man1/neomutt_pgpring.1
- 	$(INSTALL) -m 644 $(srcdir)/mbox.5 $(DESTDIR)$(mandir)/man5/mbox.5
- 	$(INSTALL) -m 644 $(srcdir)/mmdf.5 $(DESTDIR)$(mandir)/man5/mmdf.5
- 	$(MKDIR_P) $(DESTDIR)$(docdir)
-@@ -58,28 +58,28 @@ install-data-local: makedoc-all
- 	-for f in $(HTML_DOCFILES); do \
- 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \
- 	done
--	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
--	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ]; then \
--		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir); \
--	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ]; then \
--		mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir); \
--	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ]; then \
--		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir); \
-+	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/neoMuttrc.dist
-+	-if [ -f $(DESTDIR)$(pkgdatadir)/neoMuttrc ]; then \
-+		mv $(DESTDIR)$(pkgdatadir)/neoMuttrc* $(DESTDIR)$(sysconfdir); \
-+	elif [ -f $(DESTDIR)$(pkgdatadir)/../neoMuttrc ]; then \
-+		mv $(DESTDIR)$(pkgdatadir)/../neoMuttrc* $(DESTDIR)$(sysconfdir); \
-+	elif [ ! -f $(DESTDIR)$(sysconfdir)/neoMuttrc ]; then \
-+		$(INSTALL) -m 644 neoMuttrc $(DESTDIR)$(sysconfdir); \
- 	fi
- 	-$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)
- 
- uninstall-local:
--	for f in mutt.1 smime_keys.1 pgpewrap.1 pgpring.1; do \
-+	for f in neomutt.1 smime_keys.1 neomutt_pgpewrap.1 neomutt_pgpring.1; do \
- 		rm -f $(DESTDIR)$(mandir)/man1/$$f; \
- 	done
--	for f in muttrc.5 mbox.5 mmdf.5; do \
-+	for f in neomuttrc.5 mbox.5 mmdf.5; do \
- 		rm -f $(DESTDIR)$(mandir)/man5/$$f; \
- 	done
- 	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES); do \
- 		rm -f $(DESTDIR)$(docdir)/$$f; \
- 	done
- 	-rm -f $(DESTDIR)$(docdir)/manual.txt
--	for i in Muttrc; do \
-+	for i in neoMuttrc; do \
- 		if cmp -s $(DESTDIR)$(sysconfdir)/$$i.dist $(DESTDIR)$(sysconfdir)/$$i; then \
- 			rm $(DESTDIR)$(sysconfdir)/$$i; \
- 		fi; \
-@@ -122,7 +122,7 @@ sortcheck: manual.xml
- clean-local:
- 	rm -f *.html mutt.1 muttrc.man
- 
--DISTCLEANFILES = manual.txt manual.html manual.xml Muttrc
-+DISTCLEANFILES = manual.txt manual.html manual.xml neoMuttrc
- 
- muttrc.man: makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
- 	$(MAKEDOC_CPP) $(top_srcdir)/init.h | \
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ac7658a9..222cbc68 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -7,7 +7,7 @@ EXTRA_DIST = lib.h base64.h buffer.h date.h debug.h exit.h file.h hash.h mapping
- 
- AM_CPPFLAGS = -I$(top_srcdir)
- 
--noinst_LIBRARIES = libmutt.a
-+noinst_LIBRARIES = libneomutt.a
- 
--libmutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c
-+libneomutt_a_SOURCES = base64.c buffer.c date.c debug.c exit.c file.c hash.c mapping.c md5.c memory.c message.c sha1.c string.c
- 
--- 
-2.13.6
-
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 2f4230601ef9..b8245168571f 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -2,63 +2,63 @@ AUX 10thunderbird-bin 36 BLAKE2B 4a1c1d5ff170a7f3a15402e5f52761dacb02e9afc518c9a
 AUX icon/thunderbird-bin.desktop 229 BLAKE2B 2f9ec11f54483bb5c648a6fab4b95fd0c9b31a645c82f568263fd2b461b43921ea3a8261119ca210a531ca01955050f430fc881ab68a0c463d043953d9d0b02d SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd
 AUX thunderbird-gentoo-default-prefs.js 404 BLAKE2B 488c7fa7faea76726e01c459ef41629a946ecc23c4034ec9326be0f124c17d2f39b7e0d6f70a4639d60910035c8af744c169185b1dd04ee21c44ae599f8f949e SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81
 DIST lightning-5.4.5.tar.xz 1898160 BLAKE2B ed8c2f54140444610fdcc91e375636d53d7ede9e70e114e072a55867278130e09bf54bb4e04cec789efa47ed8e92586b2217b53663e6057d6556df1a5a25f48f SHA512 621d21c20bd74271f83ce9eb89b1f65cb43ab6182793bb7b9b3ca04799644f6700d15a59c6b312459d0471f5f243c3b9f534d1adf4bc72c36c2bd04f2937e3d3
-DIST thunderbird-52.5.0-ar.xpi 604235 BLAKE2B 88a5df7e0fdef432a556506c86cda2c92a938c0efbe240b21c215e23ca225beb3375600ca744c72fc83032114f8f99904838bb9ea596de4c2b079af11c9295ca SHA512 2d9b168f14fac07d66c7d889b3d28061f5f85eb6c60d1f8650382cbca3749bc3b77cae67ad707f6c4bbcb956eb2003abac5734040b289a50ed21fecd3d2ad12f
-DIST thunderbird-52.5.0-ast.xpi 541173 BLAKE2B 6b71fa1955c959708cd276322c2300df5bfa4a20d4f5481bb8ae970b075e49bbc5bf151ad4f2208e326901fe3231a595151f45e1de6e0a68e51e633141c447b8 SHA512 e4955ea38a41126f5304431f0eaaf06a01a7f186b9ac52867ce2df098b5ea761c97c8be4ebebd4cb6598bf7dd6aeded6b257dac1ce27dda8b719877a275e7ffb
-DIST thunderbird-52.5.0-be.xpi 570932 BLAKE2B d211681c14a3c7e7a84ad389b83a9bce40133adc873a2ccde25be32146c85835bb5cfe62621b1498c77ab55446680f15f0b895ad9e24c1904beef658a1a7cf6b SHA512 da8eb62a4a1704c0f14e8043fb4663db706292c15c3a89b770ac7cab7dff606faf285454ed49cbfdc3ca92c7b10f07a477fd7036d740ac2e18d35ce0e50dbf76
-DIST thunderbird-52.5.0-bg.xpi 634897 BLAKE2B 19aeb457e3aebc495dff1ed92824e0a3d10f3a10c0284fa1428f66597a337d6a21d312508801d9ebd0d5cbe82230fe87a75e5dea06acf951f7ca0c527899cb07 SHA512 019326e813f76d38504f9c327569302eac6b58117ad08075394e4bc12b5cf0f576fea9a0755c233ad27c3cc566670dbec9e70dafa6ae2c7d919741909494008e
-DIST thunderbird-52.5.0-bn-BD.xpi 676901 BLAKE2B a9180c4f2619767c35db63c5ef95b7476e714d5174d6159757e007450a21774d004731caa8a0ebcc6e4d4aff8b585cc5635af4e5674679d4d415b2a1c41ff711 SHA512 fc11e8b4519f05864690ea7315f13261e263277c656ef34b1c882fd66f9a3664c15cb2f26bc99eefa23ebce6e4052aa749072780e35b8163a0c4308145c8530d
-DIST thunderbird-52.5.0-br.xpi 559380 BLAKE2B e432329ebeb50d2ef8583ff24ea440d4e058c41be8542b872c3f3c0bcf0b25323d22c3bde5c4cb4aae2951b892b8012aa6159ec6dfd939dcb29c84bf3a462f20 SHA512 ffb5192d90927506c4c83669729b4e459c555f272881383a6f8f479b7285815bc11ee7dd7eb5fba8332e02ae8e4632a212832ebc183fc47258dfadf7bb5668fa
-DIST thunderbird-52.5.0-ca.xpi 569910 BLAKE2B 9b26e688bd60f0badf3485eb13ee7887393b8eb6a6414fd2e6c6fe133df45a83f92d6c5e89299df088302cfb1d6567b044b27c329a534d5a9de2f615828f0e03 SHA512 d9cb6e643eed8c110df555fc9e5b5b8b8b07d1dbd189fe4a9e5b82b2c0d334fe15e45000e321efa12571df440fc484587fe676d645081643b7a6d6e178db33bb
-DIST thunderbird-52.5.0-cs.xpi 579150 BLAKE2B d46023334829eaa3733c92bd9be3105dadd752a5bc528c0ca67a25663684d7f056ccbe641527ce908c02927ebc2bb4ca060f5cdadc351921f6aa1b19c3c34fae SHA512 954301323aa6c393c99bb92a1a220bc2045047c435b4a52fa5df437c8a6f3a679d1dc58f3550f727e2c3f917a447776d9bb39961254cc297bdc87be344a27c0d
-DIST thunderbird-52.5.0-cy.xpi 554858 BLAKE2B d791fec5e22706911074c700728603ee508d54fd54fafcdb00e971c3fd0dcd5dfa949a047929fe311cbe9396c1309b2655c68a5e6e1377efb6f6001204070f06 SHA512 2f5bcab1d3dc6d0eafd22b54970b3cf16a00210a15ec24d3044f7a60672b34e4d5e3a87c81054043f06d1b1b96db1f7a6622d373c1002f17dad20259bf934a25
-DIST thunderbird-52.5.0-da.xpi 543335 BLAKE2B 2b749174b253e501e8d274b1d19190ac97e63e869b4b1b88de351e3c56465a078221337af063b8fb572f2596a0e45165a50d8b5657064ffaf48a10ad696df29f SHA512 f1a1c53a74b015f6af4bc76036fd6f91da3623b134d9cdbc400af4eff89a1413e03875cb6f527e61715954f8aff7a0ccb70ebda9d87ccecf5e6ec156a7bb2226
-DIST thunderbird-52.5.0-de.xpi 555744 BLAKE2B 97984fb6eb5904ae74b78745d0e2b5f522541eb6df5321fdbb82a906cb22fcff05e3a78b3402497eebb846b15c66fb839ee47d08bf7118006789e17fa8dab4e4 SHA512 65cc8af943713e0131878226d3ebf0e5f27aea3a3305c3d48605522bf31ab091662838009db444671da4aab7c404c1ddf03326c5111e786bf30d8ce2aee230b0
-DIST thunderbird-52.5.0-el.xpi 662965 BLAKE2B aafe9fec27025928272b9dce295a1f5a9fbcb08a1fa3b19282912aab6d1491fb4a4bc5e58c6ffe69a7b21cfb0a1c39ed2d0b7b1efe491040d4fbb702e480d106 SHA512 67b0c8c3e3db77350c41150fb9ea0c9093949bbc6cdfe3a3e9091248b323cc9b727091f6448f822121fa37679b08332bcc254f92654876ebf587b9a0cbfc5190
-DIST thunderbird-52.5.0-en-GB.xpi 531234 BLAKE2B 04d28067331617f6b3d93341a1b98dad4b23ba72410069e416f9b0a40c52fd5bf8071900062b86753d3b373cc10c42bed5a0012f70040d75f3c220759c115153 SHA512 8174909a2a4f4a504663242120762b24598c8e2163f283c8552f9a605919aebe8a4fa44759d70a98701d2c5b09edaeba41974c0698dc0a04e2fe36f78a3c9a65
-DIST thunderbird-52.5.0-es-AR.xpi 565995 BLAKE2B 2d872654acf33db83bdf84c327eebf362e7ee7943528a68116eae385f39bc31dc9524430b5b8936ba74850b8a6b3e28fc30a3d9a36ab1853e12401aecdae8391 SHA512 c4a71393007c324f2af25a0f9d896373f4d0146e6e62a5e1a724a3f6318188fc3136c436d3271047469234a3c85367a8bb9d3814a040b828d0ef6598f87f24d6
-DIST thunderbird-52.5.0-es-ES.xpi 445464 BLAKE2B 61522b456af3ab6fd90e4d39440a7b5f89e825d299770cbe84c6ef3e2e6b7966538f56744a6bcf7a440d04287dcace0785908becff7e83127c455e4244c044a1 SHA512 dbd1f45f5d4bdf5dd2e43330bf75fdba5b7e30f20e55aa1755038a06be7c3a417aea15105b449f35a5283922c5e8af970af607a23563f1a81c98ad2402082b4c
-DIST thunderbird-52.5.0-et.xpi 551661 BLAKE2B b41932ac5fc5814799a0c1b05d6ac70132a9ead4f727ff6fa5eceaebb4ea4c8bd98745f09a0efbbde292cbf686cac6810e72328958cb5f23814a79ef97fad15c SHA512 ac4d5583068b2c5887e0bec86354c821153c57b56004e61654f6b6afdfad7fdde21ac01491b6f2afceaa347093ffdf6fa87e8954670210a070872121fbc3fadd
-DIST thunderbird-52.5.0-eu.xpi 555536 BLAKE2B c18fdeb9b783e2d28d2f611c7746780868450f0bf9fc491f51905e28c96ca3080bf5c949798232b387844da9cccb8c02f434db4359bd15d19868c0e682cc5d61 SHA512 6ad3f52d2c0bf10dc73c9d8eab08eb2a1df655e4061f0d27f8f8b7335c3c59041f2af3c90ad1bbac04491c1633a58e597b3754788905f82959467c74b6423f1c
-DIST thunderbird-52.5.0-fi.xpi 550669 BLAKE2B 41ae17c85a88a3a7aaeec287eee9b5333913b7b18d382f0a0dc7598c7a533cfc2d90ff39982aa288d2bac73afc7a2debb236469b72d00c5d28ef74066ffd5e3c SHA512 4de837d8651c302e0ad4f0243e791ed396d5ed9842128fc45d13b1fb128fc94bd070ed526c08781cca49a2f72d8b77f30a0caee82fc39c7fba56d4ee0f712fd6
-DIST thunderbird-52.5.0-fr.xpi 577560 BLAKE2B 9f19bafefe36de5336b7f51f7b1b693cf62ed9ef22cdf4f5d9dba0527bd25d3a380ac90bc90fbe8c9d6ce66137c5bec333ac71159a51c87b68d20dc895473551 SHA512 3d2df00ec8bc2ea92da1a2d820c15f34beecdb5a16aec9c8a3bae78e4c5e6d4ce50702f107eb626f83ec145df1387e4a2890b3de2e809a46299c566806ac9d63
-DIST thunderbird-52.5.0-fy-NL.xpi 563632 BLAKE2B 93c83a0e6d3fb96a1e82bea6e680add7bbebceb4fb9d68f2eeb7b889ff81c29bf4d4b0498175acafa527a245af0fe31ef8244bd907f7f0da21112ff18c2a76a1 SHA512 7831392bbb24a84cbe32e7f1142f0e4d5e880ff3a23110a48de97b4b121f02a141a6d5baaa4e13c40195703a47c49cf08a61490c10dc6a0b6da22e9e4955151c
-DIST thunderbird-52.5.0-ga-IE.xpi 583556 BLAKE2B 09a3ff06cde044ff565c5bbe926d3b4b5e545a2b697bd32604db168462857100ea597899da14b276945a98626dfdf7c567cec1a4dc98b9b652b4dfce05f6b2e5 SHA512 8186daf635e3a6afe3ba3986cf4b7bf12f8e8ddab399fdd14c4a2efa591e059cfeac529b8f4f67f2f4b93d4625705c4cad9abec99bfe6a4058dadd64cd350f76
-DIST thunderbird-52.5.0-gd.xpi 574065 BLAKE2B f7e751bbad43d103026108aa61d5c55a3ebf4cb3e5b98d406cbf49900cd762403cd6f1492cb47820f59e91f7833fcc42887cac61181ea872967becef1f067452 SHA512 dc9bd843f352e5915305a70767caefda7c6127316fe36bbd8af2c49262d05dfbb5b12f3d2b0c0e9b5421e858b467da0ef64e93814b020ee82507186e1124eefc
-DIST thunderbird-52.5.0-gl.xpi 575150 BLAKE2B c16c9cc8c9d19c4539870b890f887589a44ba74f296d5f9f216cd6837928254bc9aa98c6ad581104a7e2ae4a71d5eedd1503968de483ca477e1f242c77472f16 SHA512 f15f80d5119465fab34c2a316ac5d8f12430f30237d8fc0efedb27cce289ed4d4bd369bc741c9e5759633c2d8972477c5a74d0f07249460496aaec4b6ef8fc9e
-DIST thunderbird-52.5.0-he.xpi 592566 BLAKE2B 7c93e2513a57c94567fb457f72b1f6905c48faed19d2f75fda40568f715990345be474e66098e6a8d9836374f74bd16a50b72f37a5e0d6b27abda3d5f41b9a8d SHA512 1c20c22f5af002807a376ceb7ce0171889310c95c668c3258188d38d0800f2879295d9c02196f2e2d500b79a3e504b96f124b320bc9d8c39fbe1c7ca241cbab4
-DIST thunderbird-52.5.0-hr.xpi 564779 BLAKE2B 1a33eb1a4e3d9c3f00b16254496b66aea03017af48720426dfe3bca244c5c609fb9b073d4b764878aa0f4ce4e9d360fa8b5b6253263fff50c208d5e449e45de6 SHA512 67ce0be04b6def4fd8623ebbaa39ba52efdbed423656c2f0d701b93ea6f0460a3987454a4f964000a58af30f322f907bf552af50426cfbc9a4fd5c01c7261570
-DIST thunderbird-52.5.0-hsb.xpi 582241 BLAKE2B 431fc615e50dec9483042a6fb8f8c0a33c62902b86eaca57e84ab9e9ada73dc55281b37eca410c8cc8f37a6a1115f60a135e05efa8ac3578532141cbcfb6ebe6 SHA512 17a5f81d513cfd4f1884a2e44f3fc58eca57a631272bd3799ec120e2cca5090d04c7c851abc501f5b8c37beda0d23f1a5bd26e9f0c618bf0f5b75d67035d7103
-DIST thunderbird-52.5.0-hu.xpi 586446 BLAKE2B ff1ff98cfa9e2f7c3575f0514d6ee25684629743c4c6a01545f577f907c1a041e02b38d0ce76068f207e8888243c317ba4c07a7d22ea3512ee7a4bdbf5eab8d4 SHA512 68e9d71884e35668d96d858a3dc6182239858504107c3eb1fa0713fd131744f64fc5d6535b45e5c93dee38669d660d17007c5cf714fc8b929c5294c8d84ed68e
-DIST thunderbird-52.5.0-hy-AM.xpi 629879 BLAKE2B 4816013e9bbf5095791d49b246b01297ae32df502763be5830d7321cce7a1a4faad25a354d842112e95fe428ac5a187a69ed6e495ebc6d07b6dc0974472c6b5d SHA512 6d86a09a2ffd163d72e692563815210bd6fdbce1b9966f2747bb4e8c1c41fae148c6f281e3d0fbded28cc774e1a50fddbe6faf47be7cf8e66c622329c826fbd0
-DIST thunderbird-52.5.0-id.xpi 546526 BLAKE2B 43ca989f024ece6942d31d91599a45ff4683aa24ad72cbbd600a106dc0c7e189e1f229d0149baa89f80b75335dbc63036046a6b45d8f085fc71d050d807c50b6 SHA512 5a575ed2d2d16c3e3cd90b750f6d979549003af602ff42ae9bcb22a6a007fb9fbc4ec5bac8ce8c164c02c8468b4a6158901a25f906d9c3cae3a0c498c18d94a5
-DIST thunderbird-52.5.0-is.xpi 555712 BLAKE2B 8697b56ff12edbcbd5821f4a7eb04bfa411cc4c280e2d893cc8333b790bbac6ec15eb6b651038ab1eea477ba7787ac265f1abbec38a22a4e6f1642a53655d316 SHA512 5a956004611f04ca3206047c18dc0dbe7be718e14c6781de32274ec9535dfde049e9fa994b6820422af066057e0a5f7ed649957f79f77531f9f54f0503f9d0e6
-DIST thunderbird-52.5.0-it.xpi 455408 BLAKE2B 70551c76804a42b7ecf60208cd128f82d4426fbeb544c6af4e7a3696ecbfcf479d250e4e8cd505c0011744da5978680e0da192e3cda1214387fce16b157e61be SHA512 3dd6fffded6b28fbf604d8ee4ab30dddd1428d5656a50a16480de3bad7284a5035239ddf32373a319fbe7eb02086e16b767fb648148ecaa46bbe3f6f2bbe2677
-DIST thunderbird-52.5.0-ja.xpi 630053 BLAKE2B aac1a26e546020393aedb6d1c79e54e34bac01d54cc05f88a50a4e7d9ad8b49721ffd0d0a44f5695b74c209841329ce708379583554c1e44578de26b83083d34 SHA512 f70eb783c9a3271f89e009b60af7db1635e91225756034d85fef1887f3fcf1a4692526ba28ab6b5b6af2c297875251323746e86fe1ba2c76d8e9efc9105dd8c3
-DIST thunderbird-52.5.0-ko.xpi 595517 BLAKE2B f59263a41d570b2d644804d60fbbbe5ff12f5b12238e5be993bd1a875354cbb0bc446d6ce061a6dc41a9d414efb905bdf1028f8de4aa355ea2e38c784c2b153c SHA512 77403ecfb6b94449da8ed64605275bb22252f322b04d2be41359885a06c4ba2c8a45a441f4d8a5fc0abd1b1441830a54131f0cfa38828327f8ab3e162491a950
-DIST thunderbird-52.5.0-lt.xpi 580598 BLAKE2B 83ed2d57232adeebe35222fbf31950edfabbf6ec241f31e71da9563a2731fdb7dfcaa7dd97c8d5e4a09176b25f828c9eff5cea9d88df610b0943c33c9fe10b29 SHA512 e023acf509b5340bc5de83c02b9742d4035612092638ab707a9cf4a024478c6790e921bfa121d5c34a047384cb368a39424224459a070eae419c2337eb2c5de3
-DIST thunderbird-52.5.0-nb-NO.xpi 551104 BLAKE2B 2725e387fb7b55572c65e2b7167c658c92eb983e450fc593c3604811ea39ea44b7116debcb918f66faa32cdf9b1c765158facac2d06fff9a3f9294645d6bc86a SHA512 10c924c9d2e72857a6a6adb144603b0f93658bc17f4ed704f2e162ae9417ba29291ac3cdbfe7ab2f6e505057202fcdfff56e5162e1ef749ec36bd37eacf3420e
-DIST thunderbird-52.5.0-nl.xpi 557957 BLAKE2B 7ed32555605b5924a0f9b30afbc78169ae0d2dd665571fdf22f8a2cbc6fa6b3ae239feb0402a44c590680527962c2dcb3d743ab708db8fea160102de1307b6ff SHA512 f2a67dba86f3828ccb232429f5c4b0e32dad05b8c302d1350fd1a159d6a5772a46ea459a86f6c31b830e1a70eff7c2a6125aa389a66854e07fab8e90cc1a81c7
-DIST thunderbird-52.5.0-nn-NO.xpi 551891 BLAKE2B b468262bd05291ce7a0123dd96e1bc0aa8f385ce67062db5f9c0a8400acf54145006e04ff72a8968e44dd304785c15f56672ee85433fbde0b26f3f195ec2605b SHA512 7366eb30267d55de6a064d56013335e95d80aa59d11f4637d56332977b204f2ab5f11b0072d1eb8b8f25837b2dcd3638e8b8615d2cdb1abd6df073a739b7b654
-DIST thunderbird-52.5.0-pa-IN.xpi 646568 BLAKE2B 06f6a83f43ebb1bd00f4d4006c14820c6b4894e8886406ce6e40092a001166cf17e37d8934a10dc3ebb60f3015d47d91170414954aa78102d74dfc8bcecb5d62 SHA512 2889eefa4a415568277ef91ad83aeed37813647b4562a2b53c4ec3495a4fb9ee9eb71d91a1769ca2a989a8c81770109d69af7de588fa95d1f99b45c8e81bbf3a
-DIST thunderbird-52.5.0-pl.xpi 469901 BLAKE2B e8a76d7b6304a6d6097ba9b250413c39bb1cb3f3faeffa1ebeea80c87fb6d4774e1f6ea1fff3eab134af96b6e5630335e72fb912184d53ef4a1a5cb485ca4a3f SHA512 53f4286d772af127f9233885d02c9e893ec6429410a9d1a6a49180a67586a8ff7c2463b51f8fd8e8c73e5ec366a2212755e9499e5f902be3dd00c0d7d1458405
-DIST thunderbird-52.5.0-pt-BR.xpi 558224 BLAKE2B 08282d08815a858e2f0400f9ba6c48818d209b3bf094933c4312d755d28b6a445ce7d30838eb5359f08cc9346e14618a9bef5cbe983908cf85b778918878391c SHA512 83389cd51ba83640a5006aace0aaa42bab3b80fafbb35d78e04b214bd74761dd12611410e6427feab832977934d216fee9521c971bf63463d99a2042a73f69f5
-DIST thunderbird-52.5.0-pt-PT.xpi 565624 BLAKE2B 45cf9cc79546036d134837f335d4949f07f9a7eda0fc61f7b04636fe0826b6334bbfcb476861cfab3e79385889cf18b4a8d2fab68eb16ba19d3f35a2c84a3c79 SHA512 2814cfc4a2a931aaf0915e85423acf2cf9fb775d56c85c768d35861fdfb1a0c9e3487501956c701ea357c11f6fecf8e2e62553d886e92eb395a1ee2f585faccf
-DIST thunderbird-52.5.0-rm.xpi 557605 BLAKE2B 2e47d2ca7d4dfacb20ab278541fc03a5fc09fde8193e15317782c1218bfca3eaa44f9c2a556af1f5d576942761267a1f2c4fd2cfb87240eda372347a4b00d077 SHA512 a9156db559979faf61066c2ce86587ad9379150973604080833674186a68361db8ca0bd47226dd11533fa82a79339b39a169b07635d5518f3d78e8ed001b1e7a
-DIST thunderbird-52.5.0-ro.xpi 570529 BLAKE2B 0753d98efa390304971e527fbcfd35ce62252f2d7ce78830b6b26d53a617424ce841609c8e1bbade5bb5578bd47719c8e62b72fa03c2b1bc8e420160df05b5c7 SHA512 983f71665dc67a71eef5b18824234de16fca3ba9eb53dd646f81a85e75ff4669ee92e5204a757d9b128acb8672e79e1c9f29b00964d4cbcb786045577a2cad52
-DIST thunderbird-52.5.0-ru.xpi 530670 BLAKE2B b4501960d1ede8aef3098b31f1acc7104c16c73f03fa76d73a54f39f538446a9023a959125a7ffa36570788602db0ff2721852fbcfee8ac8a13777d159df9654 SHA512 aac29ddf8f0570107123625345ae2924e5b37a5b14bc03f36e97c19ef942c2ac363635109fd81fee5de6c26630d12626f6816bc6496b8a86aa8cff4553da9185
-DIST thunderbird-52.5.0-si.xpi 649010 BLAKE2B 678636c5b08ec3ddf95f9c98e0cc03dab7075f337b0ba5fc1b7b8bfee37de9c2b6ae4d61c8ecbf0c8d4500e001a231b56efb68624ab295ed9c491adc8d052de9 SHA512 a5f65bc7c54a4b364590085689da6c0ab726017fc00a5cebbbdf9e6396888dda8666823f371d7ff9850c571951acffba7d7a4d3583f350dd50ef739ef74777de
-DIST thunderbird-52.5.0-sk.xpi 583882 BLAKE2B 99f06187a8712597b589b5e6a24d3399eeae53545c429710c14194f3e32aef87bdf8660aa292356d1532d557509c2e5817733be792b3c7fbb35ca9528984c4a1 SHA512 1705819cff08feaa188d605d886e167c26a03599fc71929358e1a6b9b66fb48c27546541194691bbbbcdabc81238ba3f002448fe0e50bc1b50ce1173b8edeea8
-DIST thunderbird-52.5.0-sl.xpi 562834 BLAKE2B 4f9750554c983cb702a8f2bb3a978fad687f09e927ff05391caa657dd1531d142018ef5720f5079a065d78bb20170ee7b8c7a746cf9915bdec8b1abf05008889 SHA512 2e2700a1d926d353649c5e6edcceb722d8a5f4d1153f1d950390729565cf3e53539cfcd17793c3720c247ddd43d5f540a7cc3ecedacd15f7fd6e60a5b03c74d7
-DIST thunderbird-52.5.0-sq.xpi 570616 BLAKE2B 3b889bc815565a022858e02877c6905b5621fa804dd1dcbc926d80541651ae0217edfdb882702088b159e76e1741f43b47064398e3d7d891b74ade9835baebe8 SHA512 64c060517aae4a6cd7faecf682a1ddc44efbb5861aa32f215936e04e6f0338acd985b09166d2827844a6582b651dfb3f5a13981e702d19bca550064319259c15
-DIST thunderbird-52.5.0-sr.xpi 609020 BLAKE2B 831a41a1b4bb653d0c33f8fb54844de6590bc28c852179402ebcde8866f560dd5518dca69e27f1e59b5a39e8f49e33c40cbcb2eb19e31532d27fadd40197062c SHA512 0e440a6311024aecfd01b95a3fd0973e38e52784df18d8d7dbeccd447116d0f2b84c72152ee7d93083e2dbc5ee4acd9902d7a5ea00c1030552f14bccc10f337f
-DIST thunderbird-52.5.0-sv-SE.xpi 565777 BLAKE2B e8b7cffd686bc936c0c81ebd2eba025a898ed50c751969be49df2d2e877f80d9b4facdb142bd080d448e4169db9a20536735605bb4c6738bbf34f6dd65671ed7 SHA512 a1cbbb81b7802c540669d36f2899d486f99343172a52e3ea8519a7b701604309b232b696428284495cefbb97d9781ee5e39c0a45df8826d6e25e841c536025bc
-DIST thunderbird-52.5.0-ta-LK.xpi 675039 BLAKE2B d91be42b03a77be88739ebe3c0b512992721d50fc0f4f565b778221c57d76a2aec3d99ac1788cbd17e3dc5bf1b76f3825a9df786be83e0a3426b91d18d2badb7 SHA512 a2724e8f4bab87a5d0b183f7002121ed343902ad1b6bf0e2b2f11f4997db726858170ec231ae6c087437580c0cf21cd4bd36f2bbb66b2f61b5d152fa2e53a192
-DIST thunderbird-52.5.0-tr.xpi 569926 BLAKE2B 6c51c1266ee0820ab37e29a8e39b59c9de4f8ac8340ae107297acc42aa8934c045de52b7b19d39167cffe6f514563723ecb83ea47b88309367add23b26b38d4f SHA512 89ea2799d3b327287ea31f15ac2cd6296ce41096ae940648d248856dd77631a1f8a32c2df16800203191181f526f9f8c12311f722e16fe0daedb2efc03108a42
-DIST thunderbird-52.5.0-uk.xpi 652855 BLAKE2B 0ab13307cd983fe1bf4eec3370a30b8298011c7b6bed0f6d05d0b0c6ede28f8bf413dda7b90d305de1538cd48637172238b6d41974c9ff593a99f6d72c7bad5a SHA512 44a7b86ba202d70f69b874a7a76de0e68e13e1d9e40d82a3763032860f16494a74ba722186c881a71ed27334d32b03c0f1321e71520a7d4a1a208d09e2abc7db
-DIST thunderbird-52.5.0-vi.xpi 637164 BLAKE2B c02ed0be7662a6767fc92182805e91fb46cd6b2785db1a09f80172bb619746b02fe18ffa00a14fba99b5f32d297f21369c3d3644cf4766cbb9378d3d5c7de4a9 SHA512 b7d12eabd2cd1c722d5a906f361d695503571181bac1b26206da6c6464ad77e7eba5ff368944a48968fd1899957556a35103376854336d29230a670a15e07a36
-DIST thunderbird-52.5.0-zh-CN.xpi 593612 BLAKE2B 1664070f807fdc6682001bde160b1ecf5f495742e8e26ce60f1119b384f4c0121662783f220140b4af06def0c76d43914cbd68a84f64b859d257d8bcd30de085 SHA512 2d120f19d57f486228862f434e3aff63e2213547fcc4e5ff3ecccfc9bc18e6bd3aa223e999965923879d0d943360b17247ad94946afc7a962d37a6d380548673
-DIST thunderbird-52.5.0-zh-TW.xpi 595729 BLAKE2B d7f7dd63c3b6a621a60ddd2e613defa01bfe14ce708492f710f5e6b66515bcf2f63eb335eb7eccb67f0c1a643b1cdff960d7608735bd2f0aaa9f064070d00595 SHA512 19218e384e84fdf8cdc00fa8acce1a70f53b5c2ee6df58b9a1001bcfb2b77ceb031148c2b95063dca8a95157718de10c1315811f7b9b6bd36f4e7a24e548eba8
-DIST thunderbird-bin_i686-52.5.0.tar.bz2 51129629 BLAKE2B 4e3610daf0deaa63fb36fe06230e327e7713fea04a48e04b1c6717247fd968e6a98acfda89d85146894920e4539559d49609f2d1ff64f41a91e8435c905eda32 SHA512 9ffe74492c2fe29523a34b02ab869f9660aa1c33b16e45a026c4404e714b9cb6a5d2b24e73c7ac2f52e22f21e6e88e9a7686edbeb2c0876594054b17222d9ad5
-DIST thunderbird-bin_x86_64-52.5.0.tar.bz2 49832287 BLAKE2B b72e30800d0a8b1c98e76ec1916b68885586d863cf900079f9bea322c821cb13e30786b4f419b0306feb843e474dfadf193c3408bd80b14f1d5e6097783f5a11 SHA512 d4eb0d90d621b28cc706bca0f6884361b7fd53cb02dd9ecccfc3f6027634353cc8f4c911824ebe6bf1d7bbfb06318258daad32fd47687f2f3b930c90da4b8830
-EBUILD thunderbird-bin-52.5.0.ebuild 4742 BLAKE2B de11cb613d1cda0c9a0e33b6004ce22e925bcc9a92622e292aa98c672cc2b3bdefc182a5cb7c5952564899f05997e0d3f5a168bbb9aff4b40b12baff6a5f4f97 SHA512 63276c4c25fb13151d4c030b66c87de8e89976a4295767a1cd2e7723e4a088f95bacb969de6f3a8a8007f928a99e79ca5d445fe34234baa23409f532e047be1a
+DIST thunderbird-52.5.2-ar.xpi 604235 BLAKE2B e3f465394770c70093d9f55642c5686a07ab2ee9cb9ccc240cb62897cd3468e50e3eabf2fa61784c19cf1d30891fa474564ece3bfdf13e42648a375376b3f23a SHA512 02210011b262f75447f73ed31e584d5ca0774cf4f4a71621e7f0f118f1e5f8007ac362de51bcc1b246103171e5e17e2978b2fdb4b47dc2ffe298e74a6da06084
+DIST thunderbird-52.5.2-ast.xpi 541173 BLAKE2B 536340ece0791c11b67d6b4a23f7ade2fa4e1609a96652bcb7cfd6ee0f3ce3613f5095bf3ae964035cc9bca47ccf66413748a8e1bb53258371e054ea4defd720 SHA512 8dffec5aa3c0a20d7b85fef5160efc38f9296b9099eb3c085fca5528e9eb290a9226ab46097594c5e6799e3b67c13c2075f1ea7b39f039a87b80b1a29e0166bf
+DIST thunderbird-52.5.2-be.xpi 570931 BLAKE2B c21d79d4f2e7eb77710e59b459713e83204f44cfd19084a3a31801f55033ef7cd04448cbc220d33fd1e4a32931554df1ce460046a81d0929a421edde8b545ac0 SHA512 5fc0de75825b5fca44221a838354c74ac39dc72153d1646dfc5f9508fe2d0e54af351bb87cee1ce85b4551571311c223080fbc40a8d95e065e8e9beed08ca1ed
+DIST thunderbird-52.5.2-bg.xpi 634897 BLAKE2B 32cf339ed4c1f0ab6c48f24662682917a283235223f543e7790cd28a8892175d9fb5424a5987b1883f347bea173468103f9aec0f7227d85ce71f21d80c433f11 SHA512 211191e4b0f309e89573801ec74e18bc5fdea89df30ee2283b3a746ddd6a4909d5c8c2b81d222cdf69c36d64573d6f08c36992d1ccbfa6c897bdc538f077b154
+DIST thunderbird-52.5.2-bn-BD.xpi 676900 BLAKE2B 1d9d7a25f782d6f7e685c4521fd0c74730581a259cfb206086c4589d859e99c7f7c92432c5af5538cb2ef6c05f7c083cbb6cc6a0a0e63988ab72818c58e69f3e SHA512 18722a193c17873ff88e8abb206bc0e94868c7755173203489f6082603cfa23b39140665b3c3028dfcd288792fa631aa4baf58eb36ef59435f384a75ffac91b0
+DIST thunderbird-52.5.2-br.xpi 559380 BLAKE2B e34d0d44e6e1fb0199a7124acd785351beaf4e810f4bb77f38da012a35b729ac2eeda2ab4f6f63506a35e090c13760b22d5970476cdc1f33d06c0b4841bafdf7 SHA512 7dc1e29d4f49b7e649a2bdf1e4eeab6b59aa3683fb414beabe6f8ce771cca9f6647739d30f6742f20f8005b52bcf2ae3af2f98c4ef55670c88781d527f2c64e4
+DIST thunderbird-52.5.2-ca.xpi 569910 BLAKE2B d89970dc33faa486ec290bf7a968e6d3335e2c5cdbef38fbfd7486c76a87ef170930c1a4590d79b2eebf157181acea695cdd5fbb765153183aaab04c3281be38 SHA512 1e033db56d0e211bd3999c62fc53efddde70d5f9c7ed3adcee5782b71f06ac21cbef36785938875dba1ff2bff3670e81ced888bf0c4a8c10acecf672f2678623
+DIST thunderbird-52.5.2-cs.xpi 579149 BLAKE2B b252feb937865690a61d0f3395c9869cb013c72f5ae8162a3c37e9c8238d10163e478ee6e78b1b9c0fccccee8298334855b46298d7f84c1a4dd4c299c3892adf SHA512 13645959796cb9bdc90f5418884a9ddfe1c16ff449cc1408199163980eaef0a38c08717c0a63c4028f44677defa04c794a6c6713518720deb83be7314d4c870a
+DIST thunderbird-52.5.2-cy.xpi 554857 BLAKE2B a1dd0fb805a3c222faa3c128b5b392ce33ecfe1b41d723d56781b302c89aba2a61a4a56ee7b722d9cf425aa93c52678ce131164f0ce399ab2c3c58547e99ea77 SHA512 d66380cd6b98bc1ce8910ba35962e2f573b10ca809aba131efe15b3417a43eaf9398403e3ba11de276c66bf3ec65f62c49a2c2e1bd6b3d0df7b9e6ba89a6a172
+DIST thunderbird-52.5.2-da.xpi 543334 BLAKE2B 616af0c6d509a7342266e05286185b938e35c9b2ff427be2d755b22ef692a569605a81a147b6941f37ee3e2b2e5dc64ff2ca16a3be074cfc4dceedc0e92dbe34 SHA512 4e9490db2c1edf8e7e0c9aa7c8f11a348a1432585b07d8fbf072882e0f1f7a46acc9d79a3b0ad84016cf146c30336eded1645f4c390f120c89750ae2c8438725
+DIST thunderbird-52.5.2-de.xpi 555742 BLAKE2B e0ac00b1744dd58078d584ab2c1e4107a8224c217f80aaa559d99528d8b2692dac057c62c64b3dfe394d46ff5eefc2f96d50003d2c80abbc86d4c7d311e68196 SHA512 aff86f3d89004554e5d893548c48d11941ef46114aa513143237da2cc3206014d6769c9885d99e6448337aefcd7d5df57376d9515b268e0c459118493b6ac573
+DIST thunderbird-52.5.2-el.xpi 662964 BLAKE2B f81280db8e759117d4ad42fc50d39df24b3531e47e5b525ea478ac0c98a0ed570fc534dce695f3ad40b3d8484e77236a5040b28b9c0c1e8010814ef130e8a198 SHA512 d7a84df9711dc4b2efb8fea2e9e033558ff5357f1e1aea4096ec877fe75e72becfc535d1dbfa4678bddde7c5835e40e6296a4cb468272f1d475a50cc2148c654
+DIST thunderbird-52.5.2-en-GB.xpi 531234 BLAKE2B d38c668ff79f326fa7ed2cf9bb057f23112ee69e54959d8ec106884ed90c017ea2204bc6231d31ea7a59d8de3a8ffe261f1fdbf72aa3b2cbba352462a1522cf8 SHA512 e2da03639cbb65deed5b0a57cafe703f0c3f3afb6aee2f8f35474ff57b9db9479128b0d509e03684ba8d60739ad3a90288ebbc37a2b01b3ce1de49a407145e54
+DIST thunderbird-52.5.2-es-AR.xpi 565995 BLAKE2B 3c2c722521772f11699a87866e1ab7541711954d6d2f804b17bac482b5a0bb68bfde24f465473b3ca13db4926fddf9aa059f24d7a8f090b9cc9cec7c06dc4ab0 SHA512 541f2d475912e884bc3d8c4a10656154bfd928620020c230b2a39a0ff98dedce9a5c51f37b1513845dce6077051d1abd03cb39c9a9294146538f3c3fbf31773d
+DIST thunderbird-52.5.2-es-ES.xpi 445464 BLAKE2B 9d098011a2b335a21c8065ccc9d6991359936c6c015d52f9f9b2c4eacae30f7d104d3d23bdf811963af7219894bc62b4d6994bdcc380db23593f37f402a504ac SHA512 1860e065c3ecea2233bd100bb6aed98d4d3722135128ebf0b21d13ce8fc07f6e6401d54f3db9a787537f7213b99c466b22f64a3afd45a7d011c54d651a17f37c
+DIST thunderbird-52.5.2-et.xpi 551661 BLAKE2B f2ebf8057be9e80ec9deefee86e629d8f3de9f8663c25b9839917c41704f52e90213ff096377f599477115ec91df230cc1082236b76de0a3107452d30c18ff7d SHA512 8a0e68816d9a34f825e89bac58e4839b106d958a1345dcd88ebe32e2c3ca30c28d028143752b1464643aa3253b3cd4bb2eb19c0568ae81979ae2c15be0e32e51
+DIST thunderbird-52.5.2-eu.xpi 555536 BLAKE2B 230999784972e65eac87944abf95b2abbf04851f356f5d6defd6e9ee11d0d9fd4d4973c8fb912cf68cf1c52bf945639659de07c56e6e4367683c3ed4c5b346c9 SHA512 dd3f6fc78cc6af42d23047269f6ea1aac6a2d095a6143a32a4427aa541b9638b53be5e2c1fe3a9a953c25384079b68f0d490e17296297935f5acbbc756f2aa96
+DIST thunderbird-52.5.2-fi.xpi 550669 BLAKE2B 45907946f7787361142ff7c89260d295f72519c0f0f2fa1533a234cc9777975898a8cbc4ebd5f5454c744b058d066ad35a0ba94fbdf47317a27d48cdd8a852e5 SHA512 4766bffdb5598e9b63a0a3bae318dea0372ddaf1970e02227f1fc4f202c74ff1e614eb9f8a1ede467de73763539fe69a5d3123b5ff3a629d8dd344977f35236e
+DIST thunderbird-52.5.2-fr.xpi 577560 BLAKE2B 54b401165a255694841228c6443b247e44cd16209299346ba490a5c8f44527bc4db4284c081067d7d8e0e19cbb383330f93053dd9a1d35615c47abb2867fbd4c SHA512 01bf169dea44813fb5bbc54eb460b6a17f9e089cda630d0553802163d5f0ea0597b48e24a1252fb8e592ca8b731d9c9c1641065a704a109abbb248e34155692e
+DIST thunderbird-52.5.2-fy-NL.xpi 563631 BLAKE2B f8b20fe95103af8c1660037b489026998a05d6f99af2e1f715791725e64fcab7ddca96bdf74aa546c7cbef3f517c1f0b954d6efa98a012c2f64ec7cc2bcab563 SHA512 68fb685fe1c82b33a81793cba8ee4ff524df3e27be50952dcceabc8c169088b7cd325073f509f247c46980fc1f2ac9ca43ee3d5236340ec91d2c1ab31de68422
+DIST thunderbird-52.5.2-ga-IE.xpi 583555 BLAKE2B 2cd216291eb8a20db81006f23424d1bef4230f949fa9f5865a84e8426aa52aa53ae69ab58e9cde071f3628ba635bf71bfb4b0b13d2e1807f8942b9425314b4b5 SHA512 5c25d164ad4b887a80a320ae473ed8d8d5e5f19850877a991a3bd4e442d922e876cb51218fe49b4ebf02107758f448701047ec83cf2ceea3518c82e80a8561ae
+DIST thunderbird-52.5.2-gd.xpi 574065 BLAKE2B f58a87f1aa97980bee95f790adcdc412e4846730edbcdaa5a5fb1eb2c8325e4e6dd496a9505cff8920ff82320064e086ebe96705b525240284e8eb6d66289920 SHA512 809d86de1a2a02058b4d9a4e08edc02721b851de8bc5bb132f7675239a15a59f14678d203906f61e01c15dbc11d3f7aff948602ecfe0326d619cbff3214ef7ff
+DIST thunderbird-52.5.2-gl.xpi 575150 BLAKE2B a596b4d2a64b40e6ccbd84eed4996e28e98f985d46155930b2b665b796ea51853329f6b5d724c8c8ec051772f3217cbdc39dded961104e48f3cfc4db46851b15 SHA512 64f1e28cc6d32d1a68c70b944993f6511f85f58d2446d2097ce5f9b549a8bfb5fa068f958178c7537128f24479ad143213a0b5dbd252e276377e77a28b8b87a0
+DIST thunderbird-52.5.2-he.xpi 592565 BLAKE2B 438c022cab867aa02e4ea39b2917eae6fc82bcd314d3bec15fed0035b2ca44342228f5d405de263045c87fbf685a4cd5c8f3e919e2eafb45ed3505bbb33cec44 SHA512 b3780199848c5d3042c34addd5817e58145800f02adaf3229765a5eb6115a262e6cd577bb4c25550585f7d9098e7234be92cb9a0ddc0c055d103bfc36c18bda3
+DIST thunderbird-52.5.2-hr.xpi 564778 BLAKE2B ed9aafb9bc6afce3b4c98cc61ee74f6ad76025efd032242fb44fcd865b60321b693aa8e912ff3d3cb07acddb65440ffc40cf89e2795ec293b56eacd9bfb2bb67 SHA512 b806dccab5736cd08658e5e10749b7205d424ebfda361fbd0d103448ce6f54eeb21ad1ed508c57824aa15b62c96a1e1c99bed6b7cc1c7e67e6f4eb70d0209265
+DIST thunderbird-52.5.2-hsb.xpi 582241 BLAKE2B 97c615f22b438f64ad22f1da573e399ea198d3b6b1f42aecc3747966c63d78ebb02c7e61d675bcc4965030a86e7fbc2d6d5eb8381788bf089db52a9a41234089 SHA512 6aabaf035563dca0b44d74a9f058b193f946c4b71b659da97a435eb66b4d64a8fb83a40953225f9e475879aae10f2fa0d194f27ab2012d544896fa67e046ef0d
+DIST thunderbird-52.5.2-hu.xpi 586445 BLAKE2B c0acfa73b81d072f6e2161e58c8bb3c484ec36ea4b987f2e137190bff9183f3e3aca01f8e922bb0eab0069b60bd20cfe98344be4aeabd9e09458427cdd5f87f3 SHA512 c83fb8168856b928130faa7c6efbd36c0bc3a6bb3ca07eb82b41a8795ee2ca938a86ee391a4800d4d33ef66202ad1ec272bcb57359bc421661ea8f565f8fba99
+DIST thunderbird-52.5.2-hy-AM.xpi 629879 BLAKE2B 5d77cb479d03eb0b625624ef5a81f269376a67d046c4e0cabbba3106c10cdf666d0dd8eff2e0e15c842579bd82d51c267d3f8243ce81f7f106fad5f3b9976c9a SHA512 9626e7254717444e8e0415665f263b2c7ca55f6b192e709d5bcc24bd6359d029f3406b1c9b3aac0fe231fa566e2e02fcde596bce0a7668a0af665646f26cd94d
+DIST thunderbird-52.5.2-id.xpi 546525 BLAKE2B 548487d7f429624b9163a206676c2c9c163884057720a84bb4798cc948dcd4e04b8229a2db86edc52aae305df7c4a0c5d0f7f57b75546e03fb684933a6491fb4 SHA512 60583ec6808ed13e0063417686260d7cbccc83b527306b4a73177326ce4c2364bbdc5c109627d3bd3344bd41d94d6721916a5fb8d7b1583cae1cbe4c09b16b63
+DIST thunderbird-52.5.2-is.xpi 555712 BLAKE2B 54e5fa2b07a7d58e1b832541dc5c55f22711f4e665e9556a4e6e79f60254cc8200a376ea19c962cf55be72189b9aa90a19e1cc0df3d1313a5cf1dfd58328bbc6 SHA512 fed94fdc500fb5e4b3fdb9da85c2eb02bce45c4bd8ddaa52ef571562ef4430578156aaaaf89c1a854682232e49afc62787d8958ddec4d45d03f4104a373c371b
+DIST thunderbird-52.5.2-it.xpi 455407 BLAKE2B 2f7a95e3d3e79c78691757839096014cdcacea648bc6b0aa08ccc6a9147fd3a906fbe9c1c43065433c918e4866e5b00f50a3ff513571e7e73dedc4f9ca15d322 SHA512 ed94e588def3be4bcdbf85de073f86db0ddb7d035dd1a11f0f4f06895a9c70ac379b296619644648d626db438f870184f7f5e0d9a5b2899d045d0f4a00db3d3d
+DIST thunderbird-52.5.2-ja.xpi 630052 BLAKE2B 4b0187d7a60a30cb58cb326cced5d810e23db9768e7b2b683dafeb4c2501cdb94b96efef17a9b8d2571e295cf36d15ed67dba2247b428eefaae706a247fa2519 SHA512 15a1ced10c2b3a871ee7cfadb0df30c6e2e34a3cad1d71fdfac4d4f67c31ebae820b585dcd720cd142c0ae1455c25220e084360fbad754ee6f53777765256000
+DIST thunderbird-52.5.2-ko.xpi 595517 BLAKE2B c41a98cc7b2c796b42c4a9af1985f90b9de9d376aca70262e6f14c7a90f638761c3e7ac714ea9a7a494971fd0c50a11cdfa4db78d6ab7b4dc1707253cb18337e SHA512 9315c8806b26187eef91f2be2b0d3edfc2ea94dd93931c267cb38d7340bb4fd85282a67a316e1b1b7b8b1ddc129c21416a3ccc0b89c34a6eb6c0a4c57f7bca41
+DIST thunderbird-52.5.2-lt.xpi 580598 BLAKE2B f49badaf1dae0b2c67d4ad7342eb995e3af6f49f5e2233d2cd701d584fa275b742b3c03d361496642757a90596b18d97acedcffe0bc802d5c0d40b95084c278f SHA512 2f07bf92cda02556c79c219d81022fdf2395c6e3f817e0426a68dcf78e7d40a65072b16be113b65fd83e3dac23d234c4456578a8b2951dd68b03ebdf000502d9
+DIST thunderbird-52.5.2-nb-NO.xpi 551103 BLAKE2B cf7a1161e4b0716a4773711fffcd6125fdfa18b6910418c03641f23c9b04d6f63a86100bee2943060a8cee66c9338b8ef4bdafecc948098a016c7de19773ed94 SHA512 23b4d40c919ca9ff3d00d9cd3382fd8b6c0e6264b10a161ff160cfb817fab189cf62c441c6f721a77749352c388e832b9c13a8decf09277bf598d7c30ef197cf
+DIST thunderbird-52.5.2-nl.xpi 557956 BLAKE2B a8eae91281839eada490902fbb6e27f61f8a8c299b5ce063ffe7f128a2ff08f1431852ba218d1fdb0ad0e926f11585675cb3a58bac56a8fd398430c9b80a2502 SHA512 d2a88424aacee91a66e94eefb5082fd600e17987e173d40677451160acc9e574dad6101dcb9c8c732f2e62bf6972937e1e7386b43884c912aaeaf10611e7bf3a
+DIST thunderbird-52.5.2-nn-NO.xpi 551891 BLAKE2B 6da415512808c3f01600172389bc89000e4ece35bebe4e936b8992c29be084ea06943a39ec41b65d3adff856a1f93a62ef5caadb92be924d8f397b02b7123d56 SHA512 d9a7399bf306e7a016af94321a9078a366a0f6c563180555f4c347fe078a23d526dde7793e7517c9250a401023e4c8b3b5066f886c6965eb5fd461d1aafb6795
+DIST thunderbird-52.5.2-pa-IN.xpi 646568 BLAKE2B 39d82b07405f5d880d8a60a79598f47bba24da34e1bd8dc15f43d01996968b21a8dd43a002ddd70bde86a90cadb773547a45f219cdc8dd4bd15349035ebaf05d SHA512 ad300f12fe808f37a647add7d858b165baecb50714b170bb85255139d5aee291db245afd311855355c2e66e9c6fb7106673de016d99d88bf190b29b67982080e
+DIST thunderbird-52.5.2-pl.xpi 469901 BLAKE2B e364a6d95c3676f4ee67b4aef4bfa1ecb20950dc4b37e040a8877a077edba626b927520f0738f913f4daa670dd0ecea3e7afdef46fe77c6d24bd24b1bb44dc16 SHA512 1377713ff089fd97dbfbf19ce3130e734b7b1812c76f0923f7706d615de96c0ba99b6e0bc324173b640a3da4cfcbc7b4aaa5cbd5ae79b761d25a3cdb7dfa2ad9
+DIST thunderbird-52.5.2-pt-BR.xpi 558223 BLAKE2B 2c45f3793563ba04876506ea3a63bcc37a50f822bf3e7bd5498459b0ba1a329af7a47c4899b9382820197b9bef03897a99b94d24dd8494a12c5b7e185742f499 SHA512 cd8305e02f2da478b47039f755ef0ac2e26085e2c9ccc100ad74970b966729e40aaaf9ba6560c2bfbec65bd917688513a93fa9fdb465b0bb520fec74adc48048
+DIST thunderbird-52.5.2-pt-PT.xpi 565623 BLAKE2B 1daaaf86a36d108db95859b84d279ff01b01c37d61c5b9aaf04cbdcfff346b9f94c5f6f393eccbba293730a1b0a28b8b654291a56c4647e43c9f130a4ca74814 SHA512 9739bfa53e7dbef088efd339acb2f9179d11a45bcfb379a8c8866f7f5dbf0f0c2726d084ed1f1d767baf547bf1c9c87e232483c6b8181dc71ba42f3d7de33475
+DIST thunderbird-52.5.2-rm.xpi 557605 BLAKE2B 7718c6a00e3d2c9c6cdc675e19e79ce0401196edfd0633e6786f16aeba50ab1acc3fda19c6765e840d9f817ef250cbf834ae6f25347cd64706b132044410597e SHA512 33e674f8a06c63c2da1587de36d7382549d6a87e7b16c1d19b158bc4ef7360882d2ba88f09021ba9c0088b63571f753838a437036d761442e193e224c0004671
+DIST thunderbird-52.5.2-ro.xpi 570529 BLAKE2B 2433724d4f0cda267ebc013477385b01e1fe1a726dd250cd690da5163779e27e617b5b995ec8d1b8ff2a4a7005898df50a1c54012f9e99d4dd82bb3522cdb722 SHA512 23748b39d7e713eb0a76186c4a4c7f9a2e91ffb4e79a9de689661dcc7155f768469846ae13622cd0706b29da549e2db0ab405c627859e99d6fd0818210ebd9e6
+DIST thunderbird-52.5.2-ru.xpi 530669 BLAKE2B ec40d7499c9bf239cd532674fddedc7d6597f603265f53343e13a9d861f933de52bf01d05ebe574cb22db7bae9e7d334ecd6690a7dc20513800133ef35fd5d04 SHA512 f62fca78fe5496ee4b5f717f6605084a6c15cf419e05ad36dd3ab85b18ba966f016bb4c28c745c6a6216a38a09078a22bbb65eb23127dec07cabe5fc4381b51a
+DIST thunderbird-52.5.2-si.xpi 649010 BLAKE2B 2cab25eb8ee2ea5fa55d3a900ab9dbebc36bf713c342424cc4868e2ec12a33e1e5341386442b241e11bc5100e017a1acb84907f3ce276cbc7af6ad8508862e1f SHA512 256ff4325008600b2e7dd8eb5292bd29d97a4651d6269cab9cde313086f1743a6c3f4bcbef9b9c9ae3dc33337be7b38f3cbe74438a4c8ce179b2e5a5409140a5
+DIST thunderbird-52.5.2-sk.xpi 583881 BLAKE2B 7bd2fc714eba8de432b163c1fd0b3447e4787eccd3fd1b9626aa50b12c55a52ae066b3c923dd453e7ab6813c21ec9e1f000d2f4aa8232a7f0a0626003dae2e88 SHA512 0df3d8b5bfc76f16f3bdbbb91395b79bb8e75f2e52c5951a797b076b32854e471af826c76a40118108a4cc12a02ae671a639d713c85a79aa5bd570d71750341d
+DIST thunderbird-52.5.2-sl.xpi 562830 BLAKE2B ed615db6d82943508797243bbbb0f9971f22746f6163a55f9bbb1639121b1f92550ddd4103a927a2fb98fbb8c6748ec9b9c60ea7ea7c39343bd87b50392824af SHA512 e12545d9ac9e11c70ba46830f0f3eb5310e8eb79243eabe4c6e37c98a686f5dcbd87a1b8ccc82a84b1632c0f69acd21eb089dbb1fad9a977d11efabed4592052
+DIST thunderbird-52.5.2-sq.xpi 570616 BLAKE2B a76eb0a920dc66049a9bf738b744f23441820b4ebcc924f85c0d2e2b0ce89779602d2e661f744e4be6a5c09e26734b8371b4b216be55b7c5545281225dfff3c0 SHA512 36318b44315136e710ab0f9e8cdfc9fc8b01cc1c572ab1824f220553822d9ecb88bafe4bf542c22af719a3514b7aa3df3614d1c9b24a1ca65f1dba93950fdfde
+DIST thunderbird-52.5.2-sr.xpi 609019 BLAKE2B ebf75d134f5c1068b0af85832189044e276b2d810e8bf04e2b8e88fa2847367ba85039bedd19f023531c03eb6e55ce9440e468d546c693828efd6780658cfeec SHA512 1a363ed44fa7e5fcc45de715b4c2a49b8969232df8fca0e788e1da70a383a3592e248c1a0a86fe008f2a61862b707cccca7780d244920535b78f53ec60cabe72
+DIST thunderbird-52.5.2-sv-SE.xpi 565777 BLAKE2B 5aad813df062ae91a9f5620669596a57f2cb6f4a93bf1c38cbfa20fcf439fad10982198ba03adeff3ab19b92d6d1656493dba8cbb52a2791982ff94b39758b16 SHA512 989c41dc501a110282eeaefb565f77dfbcda431cdf4fc9450a0ffb84b592a66571439a0e3b2f8b7e1b42da4bd974a444217d19ef9d9bc9b01ed64ed5ff33e65a
+DIST thunderbird-52.5.2-ta-LK.xpi 675039 BLAKE2B 7ed5685af0acc38428a20138aaa71ea27ec530b7e747770c0617d5df214a3b5e3a067e041d8d769360e2166074acbf3c28f161e1469ffaf1a0c62a149525d91e SHA512 4d39ee85518d1d31b4976597ea6d639fa0372820fe4c42969855d85b6913bc4c316ae7f1eae53d48c1f9e5219afd3357ed9755533cc57fe37ad3b12e835db641
+DIST thunderbird-52.5.2-tr.xpi 569926 BLAKE2B b5652ee98df2299e0a6349ed83d3cc3cf460bee5555a1dd9331dcde258906f620e76cc29db6e7d109df764992b44439d467dcc881a2dc9258c6168a9c8ec92db SHA512 e5730cd99ea5ec4eff39bb1b3a7a0f65dc44dee0109cbc47f18303371c965733cd9b90d43698e16ed5ccaeceddc1507306f8994e1bc482a71dd07b26d2eb4cdc
+DIST thunderbird-52.5.2-uk.xpi 652854 BLAKE2B 251940a9f696d7b72fcd0171f8f0046c0f7810892b02a987e44b84205757ca32c5f427c4fbade383c8b7a22693d0d4e29710ee7acf7ebe2c1dc0e42e356e0a84 SHA512 c5e52078f06ec77b148d11992bdbab993b6c2cee3dabb66d52a376365960267b2ed29fdce2bc6ee4e1e526d56b97122c242e20f556b79ed93451bcc3d80c9912
+DIST thunderbird-52.5.2-vi.xpi 637163 BLAKE2B 500b5ead1dfee91cb5978ee4d0b30050461ee6d3e35fa5850f677f92a7ede3bebd9922fe03eec40c5fa5d02d5d34ae61b1038f5b4e068ae656e2b2feb8eb4e15 SHA512 c23260b7bd64769b61ff8bd86a8d0d0b5484d6abdc588e1c5b24df4276f0ccccc5e3d78e2a280cba7022ceab578e76ff6808461fecf04280188ece97a0319692
+DIST thunderbird-52.5.2-zh-CN.xpi 593611 BLAKE2B 20f22074684477f55a65b55e19f1d0c619b33dac325eb23bad3e2d57669d92e7a04c96d5fbe45876bd78ee1164df5e45e6bb47cf6497d11e6437c8e5fbaeda8f SHA512 49f429b4fedac5179a5529e8eecfdb1f1872778382ff887c51a57deae2cb8a34680a0d7f7f7dd7684f640d12bbfaefe0d52f4fde272a9cbb9bb7664e3e14f7fc
+DIST thunderbird-52.5.2-zh-TW.xpi 595728 BLAKE2B 65ba2aa3945820cb2fce6a16e7f21cb023da2a867dc414100dfe0f33ba230407495c596b63c96c14fe4976a516a34634b058d42e4d7697d98b871517a93d7249 SHA512 e2dc77c43bdc4c7e8dbf43618c0a526825eda4bf630ae60438878b376b9ac2c36c71dcba7a68f3ac6b41d9fc4fc6e7e79679a53c3f3765fa0ebe4ae6d6b4b73b
+DIST thunderbird-bin_i686-52.5.2.tar.bz2 51130541 BLAKE2B 8b0587c7633cee9d72a985a4a7253517873134e207a48705d29a2784a63daab4e2b8d46fe58c16447e8926969945a8710fbacb1071ccd64eb02952bfc1f83822 SHA512 b20aeac366bbfe257e709133fafa59bc8fd784d33926a167adf24d2c90d2cf5adfb68815e2000de4837be7cf73258d890cef555be82112aaeaef2bcc244f634f
+DIST thunderbird-bin_x86_64-52.5.2.tar.bz2 49837524 BLAKE2B 218656c9a11b295f5e6e3b4b34735636c675f85ab01f2a1111e461bd46651d4a7b694b2b6cff562f837e79ce0b979e9a51a932894aa620efd81a2c5ef3c83c2f SHA512 73e15c04a11190e8968bc64226ae4c677fa00ab460fe3497aab861c92c07ff6a3814673a7773ffc4e735491ac338e9d190e0c7cd626416c2508826000e1df002
+EBUILD thunderbird-bin-52.5.2.ebuild 4742 BLAKE2B 09cf322050e3564ef6f2969b651db2f000f3ed23cae73ad1904f2d4065eee0f78cd86ce8638d908bfb8e827c06e9ba7f6d1361792f734877882411396f1dcb34 SHA512 b9ffb328592f8ccd8c5a7b6de292158fc8fe71768738af4a2be150c22ff513c6927e6e109c0e167a16cd6308b0bba4a255eb4a4f49fe9cb65aa9fe9e9605b0f3
 MISC metadata.xml 329 BLAKE2B 429b3afed246e9243db4ca334139ee4a5cdf8f34c89fd724a718a1d53e88ec3afc96adfa194c4b8f31da7934f1a59348af3bb94882e95b6e9a23ab14cbeeaf42 SHA512 8710fdb1dc3db7de4980029b8c0e2e1b3b449505c3878c955e519b50715a5c82ed16a120e6e259a1e4a56e7e39162e7b009d5db8ef4d96e607e89d48161d1e7f
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.5.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.5.2.ebuild
index b4496c16f87d..a0a280b27aa3 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-52.5.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 0a497255a35f..88a457a066d8 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -183,5 +183,5 @@ DIST thunderbird-52.5.2-zh-TW.xpi 595728 BLAKE2B 65ba2aa3945820cb2fce6a16e7f21cb
 DIST thunderbird-52.5.2.source.tar.xz 230369636 BLAKE2B b1fe2dab986298de590cf7beab9845459ac7582119179599842a4577de7e402d7cdc569dd6b36db017690245df576f96066bf3dfa77be24a35b700559ce56942 SHA512 d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff
 EBUILD thunderbird-45.8.0.ebuild 11916 BLAKE2B b3df04866643d34f0da1c03cbd8e98479d768f1e0fc1813d11171b2b7da8c257af0201b3fc7cd24f43f6850579d4d17673c04fdc6b9c64f6dd3af344c2e51cde SHA512 9b736276b57f7e1d08684c1dfec43669e65dd31bcfa9c83f2283845ab616b3777817e57413e80fcc2ef47a4aebff51dd71be9ceee4d71d0947b99546a68136db
 EBUILD thunderbird-52.5.0.ebuild 10429 BLAKE2B a46af8bbbad6a1e27e16b3f8f529088f6d24bc7d1f65c07f17e988379b3e7fe5b10d44752f9197b5a76a90b6ee8ee16a3f9c98e4fe30c9b42c6c973f1fa40454 SHA512 a3544a136c2e0045bfa536682030b0129c060b3abc237d208cf95d257f8781be97bac79b28f23b3d153a8d32395e18825b6a29441a1b1966a5fa638790ddfcdf
-EBUILD thunderbird-52.5.2.ebuild 10433 BLAKE2B fc121e0b9c54f2a2b033e028f9f68075f79d3bbb9e78b25ce3fce8d39f93069937b7e1d648cdc8dc4c3c415041b616d08821fe35b81e24b2964186ace40b3665 SHA512 9ab4aefe9704aea128fe78d1c1597f777946bdc21e6f2d4ff42b02aa25d029c62051206ca183300f15ab9039504cafa52356bc4e7b24737c1b5cf486b8f09a0b
+EBUILD thunderbird-52.5.2.ebuild 10432 BLAKE2B 369938b77bbdca1a4fb053d1f1bde6b4ddf3fb121711fb0c300f2803e366fd28de6b7d14dccc01c79a26ce3bf20090560cbe0b09240e8ca050f27367f6f06ac2 SHA512 7717495ec5fe95089a164782781a0da697da477d5bf32a8e8cc8fb7aeaba72cd410e9db3df8ad34f074c7488d9749c413f6b29982f92384c90c2f2262123d5b4
 MISC metadata.xml 2018 BLAKE2B 992a35d8bcd4492c85a2ab2566c63b070f46ddbb7adb4a87ffabcfd64dda0a183337a60bf9fb23b0513972f50e4214af2ee0316f53c9eb18705f83d9843f9fda SHA512 274dd1f5aeb1db04a5a0d0414ee35cb3b656d7864f78f349de9e535150d34b42d950d67e9029de5648725a1ab53b51e5d6054f0b5325bdfcae5f1171689df7d7
diff --git a/mail-client/thunderbird/thunderbird-52.5.2.ebuild b/mail-client/thunderbird/thunderbird-52.5.2.ebuild
index 71743f4d6de5..19666cc56ee0 100644
--- a/mail-client/thunderbird/thunderbird-52.5.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-52.5.2.ebuild
@@ -35,7 +35,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v6.52 makeedit autotools pax-util
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"