gentoo resync : 24.02.2018

13 files changed, 261 insertions, 361 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 28065d62cb4e..b5cf26508996 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index a505908f8514..9d238df6333b 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -2,7 +2,9 @@ AUX 0.5.1-0001-Don-t-install-test-suite.patch 907 BLAKE2B 8da05928083e7878aabd08
 DIST alot-0.3.7.tar.gz 1475759 BLAKE2B d14ba03f86dfb04f16644f27286e6a7314d0559b345d0430226d45430e99f5ed72eb35cad9c576bf88cdccbc83c5265eb09a30efb2254b79d6b85e5a30ef5a49 SHA512 a0b7e5a7b77f8cdee38c273eec2822bee2e7c409ab4b8803817a49d679dd53ff29750ba7f8a9214368cc7b0b17bd76a40b0263b4701b2ef695c7669316b1b116
 DIST alot-0.5.1.tar.gz 1490645 BLAKE2B fd63ff7191fba3ee7fa3cf362cad9d684513fd6180263a2b888ee2cc00d55ca5442e273ed1b4e4012106db67404715eff4302ea25b89343ca0f467953402de33 SHA512 0194f163724fc5485aa89fe5354d16bdfdd3f539f6f3cfdb715e61835f3e632b8ac0daed44983a95c20eb0244c44c1d7801d262a5fd16ad63c3efd046e05b787
 DIST alot-0.6.tar.gz 1527183 BLAKE2B 60e06d806bf5bfacdec485c3bcde6a5473bce2093abcc20d5e105b40f6d78bf93773c3b54311fdbbb632abe724a410d8941cfb0018842ee445ccea64c73a5033 SHA512 300b99d4919dd59d569de49195e33a3224bc28fbddf0b2aa6e3b419e030a22ec2d9acf389d67eb062cad9f2cd85f019cd6dff23e724491718e246397e70ed059
+DIST alot-0.7.tar.gz 1539283 BLAKE2B 33e77f815c4f83fc08f1834a89a984309c1d4b89454d9bb0df625d00725c64769ce4989fa8df8f38d40d1c35fb78202880fedc0a0a5e7134f1938a03c79e7721 SHA512 542827c94e6cfc57699613b352527582dc2e365d957ba6b7e835584e8b83d0704452acd5ab8e4e1e408c283ec3400a8bbe465b2a8fad9f95fb330328c4fe81f8
 EBUILD alot-0.3.7-r1.ebuild 1824 BLAKE2B 30ff26b9847099731b551c48da9e0c47f73168628ab156c0d596ecb11a4f1b672013c988e6a291e68647f7a7dd6c1bcbc89f5126c9f252457b8b76bb10189201 SHA512 b422278386cdfdc4ad1c4e853945ed680428b1cce9ca11ac251733aa86269515cf66320feedb1dcc8afb3b85145c45f9c2325e94b8968cb184df2ff4161961ae
 EBUILD alot-0.5.1.ebuild 1966 BLAKE2B f4dd9063838c3d31fff83943c86d1f1e926b87e1f3163fb4ff8df6dc5de13693267391b2101aaaca69092fb9cb6f953ac50a42d967411eb5ab89b45bfbf623b3 SHA512 6ff16a9eed4fdf2c713bd249b969d3e8f70b4821d81224f1f2b910abceb2b899d6ac1a75c9dbfaefb6ff863a2500ef7b3ae3a64f16c04ece5433894f3b0039e5
 EBUILD alot-0.6.ebuild 2438 BLAKE2B 9f69b9206b295f58d37e4501688256e05cd7a1475cb99a7421a73bd21189fa009db9c69906184ce8cf144eea15d2afc1e542489d072552f819c0eb70b8175058 SHA512 2f88e6e868ffeeed30f3ddc03998d24931c60ff6a64944b3baca132169db7b57cbca945215f167d6d7ce9aa3320eaa23db1378379eb59705d755a93ecf9b7855
+EBUILD alot-0.7.ebuild 2438 BLAKE2B 6206adf16196557e1ffd817bfed0e846f544e4eb21272f7aac3fed4fd1c184da38851f44f4b62d9de0d6a472d2eab3a7540795be242e5cb0bb5869b6ae466719 SHA512 f84b6e2fa31aa8ce916995248c8b04971fc5c0bbdf20242a84ddf33f3e2a5fb7ed9a87ffa31883263a70dcb5668c947fcb94dc3c0b463a1877c205af1e2fa242
 MISC metadata.xml 595 BLAKE2B 3224d20978831a7a42fd43f4feba8970d2faa44de4b956e3a893759df9b9425fc0dc788928650e868d224b2319fd1df222c8e2c7eb8c1662cbb5af53d4291dee SHA512 a4017c9bec2be65464948cff90cfd9fd658337abd527dc86d59c08128d373626b34d583f038693c7ca5f39997f34bda26d890cdd129891a96cc88d3ee953aca7
diff --git a/mail-client/alot/alot-0.7.ebuild b/mail-client/alot/alot-0.7.ebuild
new file mode 100644
index 000000000000..3432cecd6bcf
--- /dev/null
+++ b/mail-client/alot/alot-0.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
+SRC_URI="https://github.com/pazz/alot/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
+	>=app-crypt/gpgme-1.9.0[python,${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-10.2.0[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	>=net-mail/notmuch-0.13[crypt,python]
+	"
+
+python_prepare_all() {
+	find "${S}" -name '*.py' -exec sed -e '1i# -*- coding: utf-8 -*-' -i '{}' +
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/alot
+	doins -r extra
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to Alot you may want to take a look at"
+		elog "the user manual:"
+		elog "   https://alot.readthedocs.io/en/latest/"
+		echo
+	else
+		local rv
+		for rv in ${REPLACING_VERSIONS} ; do
+			if [[ "0.3.2" == "${rv}" ]]; then
+				ewarn ""
+				ewarn "The syntax of theme-files and custom tags-sections of the config"
+				ewarn "has been changed.  You have to revise your config.  There are"
+				ewarn "converter scripts in /usr/share/alot/extra to help you out with"
+				ewarn "this:"
+				ewarn ""
+				ewarn "  * tagsections_convert.py for your ~/.config/alot/config"
+				ewarn "  * theme_convert.py to update your custom theme files"
+				break;
+			fi
+			if [[ "0.5.1" == "${rv}" ]]; then
+				ewarn ""
+				ewarn "Since 0.6 version the GPG engine has switched to app-crypt/gpgme"
+				ewarn "to use GPG signing operations, you can pass the key id has arg"
+				ewarn "or setup the gpg_key value in your config file, see"
+				ewarn "  https://alot.readthedocs.io/en/latest/usage/crypto.html?highlight=gpg"
+				ewarn ""
+				break;
+			fi
+		done
+	fi
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index afb005289ab1..b2b3b7c9fa04 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,15 +1,11 @@
 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
-DIST neomutt-20171027.tar.gz 2682699 BLAKE2B 4e3eda453a8c19d2ec1460c0813e030ef8209e8761d1ef768698cf624c11a2d3b22b941da78fb2d39ef44d6f39c7b30786248448910e59170f50b6d6e010a331 SHA512 e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894
 DIST neomutt-20171208.tar.gz 2703917 BLAKE2B 709cdb7b00e887f01bf6b1e805b25938ceca1a25d77c8674150e32ae4ac28aad10479ab54f172e2b07cab98b903973190faa138de1061ebbf4fcbe09d544ecf9 SHA512 e4f8a5f01d96d6f82959fe583634585deee28cf146c768e5049281b273c5b76b91ee01c9d9382a26f72a092c14341905129e73bf5c6ba19baae7823bc6680671
 DIST neomutt-20171215.tar.gz 2680191 BLAKE2B 9826537ed985cf56e4a52e0938967645ca607fcd57f455e1a521a67875bacc397e1706099291fe5a7a350542d0bc07b7835a908c64d84067fb12e39f973af545 SHA512 8098f537e8ef7d3f7aa87fc875c0dc079b996285b786fe6fc6bdf18154c1282b03a4e19dd6902a110616443ca2b23008c8c1f5c4a615c53b620b537c50dfb658
-EBUILD neomutt-20171006.ebuild 2785 BLAKE2B 2bfd22e3165a509db8ac7620388cfdd18fd254461da69838ab52dba127ef999f2a8ac90dd4b8cbcf8f4827b1fe4ed81f500bb6957ed57d297d3236fdfeb14d03 SHA512 c7576ab061c3b6726f06dbb584145751a573c5ff19a3e6157d96a7a22d54980fbe70682a37d00003e872b854b658b284a37bb7bda7913023cd8bb7fc3387a4e4
-EBUILD neomutt-20171013.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
-EBUILD neomutt-20171027.ebuild 2709 BLAKE2B 03ef87a76af095aa61d2b0630979ef74d2bab16b00cf023c18bef7276fe56565021390a200f29544089b9111f025f32f8c9b8f3dd4ec3e62d9651e346f43515a SHA512 e4ba14fc7d2415419c91cfff4b6f5d633179e53d8dcb43b71786c8b63b97832f45fd0506debbfc763b77496ca075d13d3f941cd20e029f28a505cb28b4dfc78e
+DIST neomutt-20180223.tar.gz 2695087 BLAKE2B ebe19022dd23914dd3c529b49fac1b58cb965e8974b8cf2f7fd1f417cb9a3f0fcded951d5506092f90ad03b8fd209392143240b1d48560f9772242652a347817 SHA512 6fbbea9e182d087d8fe90094dfcbadaaca2878fa71e024e504999d1a54d853dcd346ea7aa32f421ed9dfdf90c42307f2796518dc43748805c4e36fd5755d4adc
 EBUILD neomutt-20171208.ebuild 3274 BLAKE2B 231f9bff37d1cb6bd6f6dde94e9943adf7835301f917baf95d1ca5d399337719d677cd7dc187cc373b24d92b5f1fd58cf12b9ae87088d94675079567552a8f29 SHA512 fc039a384d5815d5e8b19d66a2236dd2cd006ce09f32d6dfaaebdea4c22c0294e1cb877c9fdc7657fbd7ef243e8c3387b30a178fb13c953b8f60486e6a76d97f
 EBUILD neomutt-20171215-r1.ebuild 3960 BLAKE2B 1e47347a16c8c0f31c2c89f2173e106dfc78f369564bcd4dac1850649dbeb5ebc71afb9094a5a4f8e52c1c8a8ad1bedf0af5839ee4eaaa55b89df52fc22a5dc6 SHA512 5cc4e2c11e859a1d17f96091ffa97bc0ca3843e6debe2dc4dbba05ab71950f47852404bfb89244e7ec2e4b2d60bdf9c4ff6bbc25ce5262637201189bca571a3c
 EBUILD neomutt-20171215-r2.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-20171215.ebuild 3470 BLAKE2B 0612a05bd1f2250b350a02b8868fecf1a8711ea246531352012c8894ef118fe50834a16800f464d31e9b30ebed427980c214e1c38f83cb68fe34d15512af4fc9 SHA512 96ef8e7f5e8e2a674ece11e400943545f07d71b7b694a25f41b31bf36cb52080f2c9509954fc8b83f1dd4a8b1c3ae935a1101c0e52b75e2acc649a000b5dfa4f
+EBUILD neomutt-20180223.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 EBUILD neomutt-9999.ebuild 4032 BLAKE2B 16d3abd69e3c9f8257b84c04409c94726a2644575021492cb7cc8d6831ab9a6233cbd54e537d8207b6832b45266c62a8b5b974d015f63df8a6d012d2a71459c2 SHA512 88463b0ff97a1c9c14742072b8cfdfda81fceb5bee2c9251a09f6b9959de5a575f6eed7a54f9d00026dd33b52d0e8912e15c841451de7dd22ffe8121014f14d9
 MISC metadata.xml 1430 BLAKE2B cde0fee81787af5d8401b456deafc66ac9427a88b25866abbecbf874c30a6acc69375f4c7705916985b79e052ca2c07e2a0c7ab853dbc562e53230ec11c15e28 SHA512 e19508e8851160c14d2bab48f54b3cf959411b3b0ccfe3555414bc563e8300daf03cf328379569fc516576d0065fb440f3f6426509b599d70555282426163cc3
diff --git a/mail-client/neomutt/neomutt-20171006.ebuild b/mail-client/neomutt/neomutt-20171006.ebuild
deleted file mode 100644
index ca3bddeaefaa..000000000000
--- a/mail-client/neomutt/neomutt-20171006.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
-	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
-	eapply_user
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(use_with idn)"
-		"$(use_with kerberos gss)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
-		"$(use_with kyotocabinet)"
-		"$(use_with qdbm)"
-		"$(use_with gdbm)"
-		"$(use_with berkdb bdb)"
-		"$(use_with lmdb)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
diff --git a/mail-client/neomutt/neomutt-20171013.ebuild b/mail-client/neomutt/neomutt-20171013.ebuild
deleted file mode 100644
index 128092189076..000000000000
--- a/mail-client/neomutt/neomutt-20171013.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
-	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(use_with idn)"
-		"$(use_with kerberos gss)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
-		"$(use_with kyotocabinet)"
-		"$(use_with qdbm)"
-		"$(use_with gdbm)"
-		"$(use_with berkdb bdb)"
-		"$(use_with lmdb)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
diff --git a/mail-client/neomutt/neomutt-20171027.ebuild b/mail-client/neomutt/neomutt-20171027.ebuild
deleted file mode 100644
index 128092189076..000000000000
--- a/mail-client/neomutt/neomutt-20171027.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils flag-o-matic
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="https://www.neomutt.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn kerberos kyotocabinet
-	libressl lmdb nls notmuch qdbm sasl selinux slang smime ssl tokyocabinet"
-
-CDEPEND="
-	app-misc/mime-types
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm )
-	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
-	nls? ( virtual/libintl )
-	qdbm? ( dev-db/qdbm )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpg? ( >=app-crypt/gpgme-0.9.0 )
-	idn? ( net-dns/libidn )
-	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
-	slang? ( sys-libs/slang )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		"$(use_enable crypt pgp)"
-		"$(use_enable debug)"
-		"$(use_enable doc)"
-		"$(use_enable gpg gpgme)"
-		"$(use_enable nls)"
-		"$(use_enable smime)"
-		"$(use_enable notmuch)"
-		"$(use_with idn)"
-		"$(use_with kerberos gss)"
-		"$(use_with sasl)"
-		"$(use_with tokyocabinet)"
-		"$(use_with kyotocabinet)"
-		"$(use_with qdbm)"
-		"$(use_with gdbm)"
-		"$(use_with berkdb bdb)"
-		"$(use_with lmdb)"
-		"--with-$(usex slang slang curses)"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	if use gnutls; then
-		myconf+=( "--with-gnutls" )
-	elif use ssl; then
-		myconf+=( "--with-ssl" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc neomuttrc.man
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-			-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/neomutt.man > neomutt.1 || die
-		cp doc/neomuttrc.man neomuttrc.5 || die
-		doman neomutt.1 neomuttrc.5
-	fi
-
-	dodoc COPYRIGHT LICENSE* ChangeLog* README*
-}
diff --git a/mail-client/neomutt/neomutt-20180223.ebuild b/mail-client/neomutt/neomutt-20180223.ebuild
new file mode 100644
index 000000000000..f90289f77c00
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20180223.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 9999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://www.neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet
+	libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime
+	smime_classic ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpg? ( >=app-crypt/gpgme-0.9.0 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		# During the transition of the crypto USE flags we need to support
+		# both sets of flags. We do not want to emit a configuration setting
+		# twice, since the second flag overrides the first, potentially
+		# leading to unwanted settings. See https://bugs.gentoo.org/640824 for
+		# details.
+		"$(if use gpg || use gpgme; then echo "--enable"; else echo "--disable"; fi)-gpgme"
+		"$(if use crypt || use pgp_classic; then echo "--enable"; else echo "--disable"; fi)-pgp"
+		"$(if use smime || use smime_classic; then echo "--enable"; else echo "--disable"; fi)-smime"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n '/^\(SRCDIR\|EXEEXT\|CC_FOR_BUILD\)\s*=/p;$a\\n' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n '/^\(MAKEDOC_CPP\s*=\|doc\/\(makedoc$(EXEEXT)\|neomuttrc.man\):\)/,/^[[:blank:]]*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.man
+		cp doc/neomuttrc.man doc/neomuttrc.5 || die
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use crypt || use gpg || use smime; then
+		ewarn "Pleae note that the crypto related USE flags of neomutt have changed."
+		ewarn "(https://bugs.gentoo.org/637176)"
+		ewarn "crypt -> pgp_classic"
+		ewarn "gpg -> gpgme"
+		ewarn "smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release."
+		if use gpg && ( use crypt || use smime ); then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+}
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index f43fce30a8e3..8b231ee6556b 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,7 +1,7 @@
-DIST sylpheed-3.4.2.tar.bz2 3474176 BLAKE2B a76498e29900c9a13f48111a462045f1dae935edc1d8fd1cd8dd880ceeceef6e234ce5d066d398976bdc42139bb33033dba78d76d5aa63fe000ffd64ec15c8f2 SHA512 1bfaf5636facb6ca55173e914904be7f9fb9ca98eb440f5b548fbbbe03f5dfb5428801e878f3275d3683e715d0b4bd33f63f69f5f98578ce1a25cef695406b5e
 DIST sylpheed-3.5.1.tar.bz2 3561816 BLAKE2B 811d433a2930d32dd6d2a5aa3010c4cfe54e514a7705624dc7ae067b3e5db1a3aa745e980c0e240b1b6515535c8ee38988aa8410ea07369f77d53bade561b462 SHA512 264aafb40eaa163405074480b2deb7eefe0d2158a107d9b26bc35d5506dcf5a52cf5712b81bd4c06b4c76e48c6e372c74473e5371bbdc80f230267f3b211c7f5
 DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
-EBUILD sylpheed-3.4.2.ebuild 1505 BLAKE2B b43c8ab916fbb8b98864dba74cb2fba630dfae328b92d0029b88d865da37e2fa38ee9311ad139d08090b7384388802ae279de1ee25e7a61c38b4ce9625818a2b SHA512 5fd43e3e5dd1a9bd6f059a252ea894a6562db7c2eabcb063a912de7e68777ad0dafc136ee657a0f5b7c855abb896faa1714c1be2b607d28aa8fd3db0a0ed101a
+DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
 EBUILD sylpheed-3.5.1.ebuild 1562 BLAKE2B de18e090c09ad9df8e8ff26fdd2af1499e7f7c273891cd6b74f2852209f42b8713ce320b20fc6f0a4dc4fd0f684de720215b2cf0c06b946aa765d566bcce87bf SHA512 d7660a0451164cea86d5c52a19ec3823a1ee6dec6a9aeb67155c447efc9db47735b0eddd2e4703d39bb15c71168933b75701ab0a138d17cc8a4852f8909b72ca
-EBUILD sylpheed-3.6.0.ebuild 1623 BLAKE2B 8344a9e62ae9f0d63fc7e71345693c2a15059f7714e6500564dc7d60b69e96c50f4bffbb2d695af33a64c7c929e42f9801beb63946402b5e21871d118b6c2ffc SHA512 16136243562090dd74302c0bdcaf7ea0a0f39329315ae304bc91defcb105af6ee7fabaddbd2630d6b4d14a5ac347bbc88da0c1a6a84043c9aedc9c19f5a2c112
+EBUILD sylpheed-3.6.0.ebuild 1621 BLAKE2B c495b8988f315c31d751dda5c41e946f6b69b5f3341f05ab9d78e77e77735c92ac3642b5189cef4a98722998734455783821618916f7506d7242f799c07eb441 SHA512 ff2ca08dd551effe172121b7520a49ef162f2695f02ebc3a0454cf54135a043e81c7ea05914eff2ad2d71dc37252d8b984d90f5fd84e9411f04e46af9985355f
+EBUILD sylpheed-3.7.0.ebuild 1623 BLAKE2B 8f6bcfdb9684cb2091803a3125eaccacb3b980e21a324a60f5becae76a360582ecd8a63b64200774f26731a46995beb0184327e2463321690cde42df0d77ed86 SHA512 9ca225e89923b4eeda0439377c362519a06eac6696cbfe72a262390103e77ebeb17f9b40e85e9ad1b3a2070111fb8a5edde371863e71beca28e954b5ebad342d
 MISC metadata.xml 440 BLAKE2B efcb9ca3d9130ca42ba924b3466975f87869800e50cd286d892331a0bf97b21dfacd3fdf02704091341a391e60052ee2b3322f2e90dfe66b076ff4f1db51fb31 SHA512 69ac2f825b9dd04550e139906f492e50eceb5e8922a95b2a44196c664215095dbc0809f9677d403dcb7deb5093dc0c8723b56ad840b3a93ea9101b55ac38de84
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
index 5ff58b054cba..45eb5b5d4b15 100644
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.6.0.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"
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
 CDEPEND="net-libs/liblockfile
diff --git a/mail-client/sylpheed/sylpheed-3.4.2.ebuild b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
index c601b0683782..b7859679adca 100644
--- a/mail-client/sylpheed/sylpheed-3.4.2.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit eutils multilib
+inherit eutils
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
@@ -11,17 +11,24 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
-CDEPEND="x11-libs/gtk+:2
+CDEPEND="net-libs/liblockfile
+	x11-libs/gtk+:2
 	crypt? ( app-crypt/gpgme )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
 	oniguruma? ( dev-libs/oniguruma:= )
 	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell:2 )
-	ssl? ( dev-libs/openssl:0 )"
+	spell? (
+		app-text/gtkspell:2
+		dev-libs/dbus-glib
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
 RDEPEND="${CDEPEND}
 	app-misc/mime-types
 	net-misc/curl"
@@ -29,8 +36,10 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	xface? ( media-libs/compface )"
 
+DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*"
+
 src_configure() {
-	local htmldir=/usr/share/doc/${PF}/html
+	local htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 	econf \
 		$(use_enable crypt gpgme) \
 		$(use_enable ipv6) \
@@ -40,15 +49,14 @@ src_configure() {
 		$(use_enable spell gtkspell) \
 		$(use_enable ssl) \
 		$(use_enable xface compface) \
-		--with-plugindir=/usr/$(get_libdir)/${PN}/plugins \
-		--with-manualdir=${htmldir}/manual \
-		--with-faqdir=${htmldir}/faq \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins \
+		--with-manualdir="${htmldir}"/manual \
+		--with-faqdir="${htmldir}"/faq \
 		--disable-updatecheck
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
+	default
 
 	doicon *.png
 	domenu *.desktop
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index b62d617f8665..3a758ea75770 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -242,6 +242,6 @@ DIST thunderbird-52.6.0.source.tar.xz 230376180 BLAKE2B cbf1b39f504beb2a862e79ed
 EBUILD thunderbird-45.8.0.ebuild 11907 BLAKE2B 9c59384a0af373242f9c0178ce2d9ecfa47d462d35b937ba6f7822db31ab1f7ac0f6c74039f8ac616d10461e7d6a343ecb1e3c17e1f8648b45200d4b6d04a9ee SHA512 fdd92606748e698b21b6f8c3a37aad0e107de5326a5e20cb53b48878b153e7a77c01e30aea3a9e60a187da3265efc36bbbc2783d5edcda921ca3d172b801f1e3
 EBUILD thunderbird-52.5.0.ebuild 10420 BLAKE2B 6a1d4ba86ade0225606939fe943e02ce24bd0054454d357016a03e6007bbd9a2902205506396d0ec58f4c9ac9d47e7448da1ef9fe898c93e0ff19d43094c929e SHA512 29c528e024664dd2639159a441bda89da3ab8858bbcd63ddfaa7fe7472260fff586b2a92fa7558ddb2b5cb01a2834e9f6b536db5d8165d55e3712720a11bf017
 EBUILD thunderbird-52.5.2.ebuild 10422 BLAKE2B 550c8e45529d2b8a7ae590624d30fdfca04779bf35e48438224beca671be9cf4b192c5d3182425a71ea61d1b11aadacbccabaa8991f18a08f9a1370c13cc4bbc SHA512 c8361c7ca93cb4ed1811a42335b6b4283c0642bc9aa7d14d424ac38a5e34edfc4f08bdfab45c51f05d2a7c5b8bcb029524ae57bef29485a7d1f658f239e9816b
-EBUILD thunderbird-52.6.0-r1.ebuild 10491 BLAKE2B 263ecb44797ae637b43711a402d42abcaaf2af9343a7e2e46dfb66858f30c36f7c185dec1e999ca9056dd255a1bc985651bbe7d281cd3f7b7845a9e9db0d1ed7 SHA512 b537ff9fd113c23b5caf177aefa054a89233f8e6a864fef9f9f8791c49cae59dba13cde405e1d23c9f25d68019b605f0514a2a3ace798fe2c281125209f2e5dd
+EBUILD thunderbird-52.6.0-r1.ebuild 10489 BLAKE2B 3e76ba3894f8715ffbfaa0c4a9cd16e9a288e63c45d2e194991073e784fa7fae89f87dbcd7b83cd1d0ca0a3bbd45bb2b773ffcfc2678ef63ea21cb8d3ea3c246 SHA512 9f605505758d73e79c574ac52a2a3fc6b2ab2d6113b3e9a5c598df3991e8c22d058dbf732b6a8f77f4b2f3f420a39df16bdadf129b03c28a30a09ca6bd1a6849
 EBUILD thunderbird-52.6.0.ebuild 10488 BLAKE2B 34f8496e0bc52749cc871b5f910886e26800f4d9f6fb3d3c9a2078b90fcf9ea84cebdcef51fe16b8fb56433433bbdb11cc2d9fbe6901165227ab797625df827a SHA512 77d9f45527b17dd00a5c528865565072d322fc5168436d4b3b0817769f8a32e5cef5b9190232869e0c11065f53575f3d676cc6c20784deb168431a2d3aea648b
 MISC metadata.xml 2018 BLAKE2B 992a35d8bcd4492c85a2ab2566c63b070f46ddbb7adb4a87ffabcfd64dda0a183337a60bf9fb23b0513972f50e4214af2ee0316f53c9eb18705f83d9843f9fda SHA512 274dd1f5aeb1db04a5a0d0414ee35cb3b656d7864f78f349de9e535150d34b42d950d67e9029de5648725a1ab53b51e5d6054f0b5325bdfcae5f1171689df7d7
diff --git a/mail-client/thunderbird/thunderbird-52.6.0-r1.ebuild b/mail-client/thunderbird/thunderbird-52.6.0-r1.ebuild
index 4d7fb31337cd..31b0bbf45463 100644
--- a/mail-client/thunderbird/thunderbird-52.6.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-52.6.0-r1.ebuild
@@ -35,7 +35,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v6.52 autotools pax-utils check-r
 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"