reinit the tree, so we can have metadata

157 files changed, 11265 insertions, 0 deletions

diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
new file mode 100644
index 000000000000..4802ba892d3d
--- /dev/null
+++ b/mail-client/alot/Manifest
@@ -0,0 +1,8 @@
+AUX 0.5.1-0001-Don-t-install-test-suite.patch 907 SHA256 a284cd0eb492b921647adf47698eea3e4e013685da60e69488747226232c7ac8 SHA512 1f3940927e4a7edb43e8b96a9c105deb75d47bd4dd643c80b422be028c53d4bc77a27c435a10ac07f6e062a27d704c5ffc6abc28b490a1b767efac4e50100ceb WHIRLPOOL 6d30e1f1a6cb73a64e19542493a66cc318344b058b85f42a6c78603b48a47dae1cde00ba0ce8e2d64c6643cb352c96be4bf7f82c3dcd00467a4c4112d0015530
+DIST alot-0.3.7.tar.gz 1475759 SHA256 fe281f6b5fbfcd371a1810c8f59084e8cbc3f69068269e3f787adb1df6f977b5 SHA512 a0b7e5a7b77f8cdee38c273eec2822bee2e7c409ab4b8803817a49d679dd53ff29750ba7f8a9214368cc7b0b17bd76a40b0263b4701b2ef695c7669316b1b116 WHIRLPOOL 3c37a037fc5543ff569f6a5364302462f71f5599c14d17661707cd4beb0e2a8597098dd4f4a42aec27793ace7095bba4eb80c35ed5fd8e470f6b7b9dbbecc46e
+DIST alot-0.5.1.tar.gz 1490645 SHA256 e8404db01bfe41030f7df9f559ac6c61edc473bfc1ae86bcb58c4018703352c7 SHA512 0194f163724fc5485aa89fe5354d16bdfdd3f539f6f3cfdb715e61835f3e632b8ac0daed44983a95c20eb0244c44c1d7801d262a5fd16ad63c3efd046e05b787 WHIRLPOOL 2539956ab4f286c0db27837f5897f3dd8868c07422aca2845df76da8d0c2aa3b5915ec8de0b35d78f8f296406adb6d31c4d47b00c2c74a7453630e936d4aee98
+EBUILD alot-0.3.7-r1.ebuild 1824 SHA256 69deec272f82098a9cff6575eaa3fda41cb0e4c4aabb1e85e44c13cb1b4302cc SHA512 b422278386cdfdc4ad1c4e853945ed680428b1cce9ca11ac251733aa86269515cf66320feedb1dcc8afb3b85145c45f9c2325e94b8968cb184df2ff4161961ae WHIRLPOOL 440ee5927938fcaf9732602be476c344ce0ddff8d599a6eb578fc55758e69c421a65d3b57a5779cbe2508752e15a0667274f236a27639aa934fe178c5930f143
+EBUILD alot-0.5.1.ebuild 1966 SHA256 301200d58ca548436ec7cd2157bb533d7f79c90e16f33b79d72ca4b9540475b6 SHA512 6ff16a9eed4fdf2c713bd249b969d3e8f70b4821d81224f1f2b910abceb2b899d6ac1a75c9dbfaefb6ff863a2500ef7b3ae3a64f16c04ece5433894f3b0039e5 WHIRLPOOL 668dbc27c7a02bb64fdca57b65f9d09c6ccfb6c0e19d0e580c75fdddfadbe096fb98f49ead64891910c185d6bfe9fce7d6be2310524bc957d275c6b3a53b79f6
+MISC ChangeLog 3130 SHA256 2172a168fa3873aa187d47a9c392e426a091da2819d9451cc343e93f94ea9550 SHA512 2a16e5a88a9090f545ef81d10512505bc8bfc05e552f211c2f8830efaf2be9934ae3efb441b7474443a21bc1b37933bdd1ddcf2c0955c80271407d6a9223e6c2 WHIRLPOOL 1fe5cf7576b02267ed2f90bd5decff4293e5ef07c64a26bb6b651f00a986c03089321d7bef0bfd06cc5bd3ab5663de8a35aaa99931fa405e41de4ad208aba2ed
+MISC ChangeLog-2015 8600 SHA256 03b198141f56c2e2db8d961cb9ed468b38b1e5c31a426d97134f43bd434cbf7e SHA512 0667ef8cebdd95d23df9a00d747a678e6ad8848cdab361628ccb9787c2f70167e7270cee46f0a4fde454d8494dfab551f68145722bb01bb5c2fe9adc6999f849 WHIRLPOOL 1399558fbcf79954e927e543712a7d8f0ac663113ccb69ce7a915115f48462ee15eab3c804490e5dacdff1170c31402bcee312304c97949243d716f11b1cfd30
+MISC metadata.xml 595 SHA256 b36f897b77e88e1c5a2bc01074657fdfba093a9aeb6e1091627e7913b7ad753a SHA512 a4017c9bec2be65464948cff90cfd9fd658337abd527dc86d59c08128d373626b34d583f038693c7ca5f39997f34bda26d890cdd129891a96cc88d3ee953aca7 WHIRLPOOL 89d2c3ca4fe7447894c8e41233af6de78dad4f81c39ee8bca5c9f10b6d6638d1bbbcc193ce2a1720fec33c3994badc77a2b908ac69a75f05da9d113247da3936
diff --git a/mail-client/alot/alot-0.3.7-r1.ebuild b/mail-client/alot/alot-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..e5de9377b0a5
--- /dev/null
+++ b/mail-client/alot/alot-0.3.7-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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="${HOMEPAGE}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	>=dev-python/configobj-4.6.0[${PYTHON_USEDEP}]
+	dev-python/pygpgme[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	>=dev-python/twisted-core-10.2.0
+	>=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]
+	"
+
+ALOT_UPDATE=""
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-0.3.2"; then
+		ALOT_UPDATE="yes"
+	fi
+}
+
+src_prepare() {
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
+		-e '1i# -*- coding: utf-8 -*-' -i || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}"
+	done
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		pushd docs || die
+		emake html
+		popd || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodir /usr/share/alot
+	insinto /usr/share/alot
+	doins -r extra
+
+	if use doc; then
+		dohtml -r docs/build/html/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ALOT_UPDATE} = yes ]]; then
+		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"
+	fi
+}
diff --git a/mail-client/alot/alot-0.5.1.ebuild b/mail-client/alot/alot-0.5.1.ebuild
new file mode 100644
index 000000000000..868e96638b99
--- /dev/null
+++ b/mail-client/alot/alot-0.5.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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="${HOMEPAGE}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	"
+RDEPEND="
+	>=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pygpgme-0.2[${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]
+	"
+PATCHES=( "${FILESDIR}"/0.5.1-0001-Don-t-install-test-suite.patch )
+
+ALOT_UPDATE=""
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-0.3.2"; then
+		ALOT_UPDATE="yes"
+	fi
+}
+
+src_prepare() {
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
+		-e '1i# -*- coding: utf-8 -*-' -i || die
+
+	distutils-r1_src_prepare
+
+	local md
+	for md in *.md; do
+		mv "${md}" "${md%.md}"
+	done
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		pushd docs || die
+		emake html
+		popd || die
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	dodir /usr/share/alot
+	insinto /usr/share/alot
+	doins -r extra
+
+	if use doc; then
+		dohtml -r docs/build/html/*
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ALOT_UPDATE} = yes ]]; then
+		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"
+	fi
+}
diff --git a/mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch b/mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch
new file mode 100644
index 000000000000..cbe0bedb4be5
--- /dev/null
+++ b/mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch
@@ -0,0 +1,28 @@
+From 8af6cea015eeea61a3421b4f98ee4ba12f6c9b17 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Mon, 29 May 2017 12:10:15 +0100
+Subject: [PATCH] Don't install test suite
+
+See
+<http://setuptools.readthedocs.io/en/latest/setuptools.html?highlight=find_packages#using-find-packages>
+for example patterns.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a3f6f90..b4533f7 100755
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ setup(name='alot',
+       author_email=alot.__author_email__,
+       url=alot.__url__,
+       license=alot.__copyright__,
+-      packages=find_packages(),
++      packages=find_packages(exclude=["tests.*", "tests"]),
+       package_data={'alot': [
+                              'defaults/alot.rc.spec',
+                              'defaults/notmuch.rc.spec',
+-- 
+2.12.2
+
diff --git a/mail-client/alot/metadata.xml b/mail-client/alot/metadata.xml
new file mode 100644
index 000000000000..349e9488ef0e
--- /dev/null
+++ b/mail-client/alot/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<use>
+		<flag name="doc">Install user manual and API documentation</flag>
+	</use>
+	<longdescription lang="en">
+		Alot is a terminal interface for <pkg>net-mail/notmuch</pkg> mail
+		written in Python using the <pkg>dev-python/urwid</pkg> toolkit.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pazz/alot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
new file mode 100644
index 000000000000..04c288d902a0
--- /dev/null
+++ b/mail-client/alpine/Manifest
@@ -0,0 +1,11 @@
+AUX 2.00-c-client.patch 6320 SHA256 e68df15127a68147304fa097c524b891d78fb02666b76800f82756f0f12ec506 SHA512 123eb7d6310cba4908b90393e56bd9cc398ee40289fd328a3bc6b9ae37059cf73540cd9cdd2b16b0210555a696d501016b8e6b201e2c13738088a1d3728f5fb7 WHIRLPOOL 871633f9103eb6baec260e2af97e8f085cf39f6feb5789439c4a4650640fded533338ae20187ffcecd5542247fb36d02d84481e274c11be58639c2d52bff2ea0
+AUX 2.00-lcrypto.patch 496 SHA256 856c3623f9b6092730a6f550e7a3d4bd68d89b20e3eb6d637d339415a5c7692b SHA512 1d90950a3066f29cedf225283e58ac007deb0db4507000e05fc3ccf5ebbfcef6af076f04d4e0da5ec0f47cea823e651eae3ab1315efec5373245515cf1e640ea WHIRLPOOL 4642efdab4209d13e859573d6f0b6726e1bb8bdb711aab4e8c383b50e633ef56be14c54446f01a06a09abd94ba5b2ecbee13cbe38385d6b0f96505e8cacb18c8
+AUX 2.00-lpam.patch 295 SHA256 22c354937019693cfc03a8864a36c30579fd98475b729e089f83ec125e4225ad SHA512 5705c7736797b38c80a2b1bd96f283b00a06ea7b00868c0470cd4a33408aa00a49c5cbba986bf6f3d4d0d84d220f4ae0191003914b0e0651fead785068140d5a WHIRLPOOL 2d7655b9df96e9fd81d38f487a23c2dc078aa49bce9be5212cb2ce94f66f93e736d35847c3c056ae424c25f019f95ee8b1b972d55cd4018d8bc3adda7aae60cb
+AUX 2.00-qa-chappa-115.patch 1312 SHA256 00a899711354f9b854a80c1e650c07bb98faa1a60b6696c221d8c88a75032a90 SHA512 ec6720bffdba5b853f696720ef9a74b13901ec918648c97170dce3ae8be4c2f1dc6de124662b1a9d9e08f7c626688aae81456f5afb6131594a427edc9de7c56b WHIRLPOOL 683266dae55235ea6258f84bc99c1692fc31c38891d3bd0b0e64268228fe4765bddb8f40c9a337653984d45b066e3652934b4e8f9755ff7133bc35e36f64f628
+AUX 2.00-qa.patch 409 SHA256 3c1c89588f85950b5d67f26ce5a5832648f0b923260c4ba168af7d1a818dfdb4 SHA512 4c9107fe2db7688f925054b31748fc10db5c445fda5177babbee2fe543c834658f4b65ea3b4e18259acb809755bf4fa2408f47ee379d6006554ee7556b334a26 WHIRLPOOL f33d9e4e0e703796a3dadb8f5cffabfe646e1cbe8f6f17c45c997476e0e204395728828954d392d18213ad99775c669f2f666d9b12b9bab275005027afca2f56
+DIST alpine-2.00-chappa-115-all.patch.gz 212705 SHA256 1503ae09b6a4a74828e3472c4987b48a310f817e7fd93ca385724660aa234d7f SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7 WHIRLPOOL d9fef2fb0a07acfb8ba4e5bedbc0140a09020967e52b16853907db47b1a7e35286022c2a03b1670fe377015393d22b27bfa9f12780de05bac1f3458a81f75527
+DIST alpine-2.00.tar.bz2 5222673 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2 WHIRLPOOL 6c1fed63e826c12c6e39e8f79e2b33f3b85545e54c32fdbe918636086c0aaaa26073883946061a6b52df50af711b7d6bb6647a177f051afccccdbd0cf473bbc3
+EBUILD alpine-2.00-r7.ebuild 2693 SHA256 5061710793354bb08cc8a448269b116f559218ae4a84b5c53e442c95927f4c68 SHA512 5135df89b3afe2df2af18a0f30908150065bc783431444b48ea19e9671ca4c52a409dd6977b47e5e8a6d60bd9a770693c0cc554ba2eccfc8cb1ae72820f2c574 WHIRLPOOL be021b0c86154aea03c356a61fee52b2a08be859bdbacdd3821cff29c58118f77bb87c2d4d024334067e8db97edf61c823d4f8cacecfcec9163710ca132c55d7
+MISC ChangeLog 3547 SHA256 c989af4de071be653ffab8c08b9b0e84b7671789eae599c10efe04a6b661b717 SHA512 765bde124fa470133857d078efe41f66daba6eb1f54f3a9a6a842b97dc0e954c56985ca1b6a573919c5221577fde7723f8c99c680d0fe816de261065f5c49dd1 WHIRLPOOL d0cca4d4d70fe543c74b0dc6c17b2c2f671a572ded543cc03fb18a904b4423f7923cf8371345f93a6f6d6682c7af69efdf3b66c652170807ebc325fe3a3f05ec
+MISC ChangeLog-2015 3566 SHA256 6a335bec622e10faedb555c2973e6e06cd336eaf7f2592e87a15b42a933df6c4 SHA512 d25b4c63977c13425fd59a0cbcc10e2d98b378fad814fc97155437cd0a99528c8cdba5737eea4921750a72bb705215db7e5d2d5d5d82aee4fe2a1a6ac51eca59 WHIRLPOOL ed39708174a9d370e12be0d5648b5b00de27e9a49a7afd12f691e75dcc9ffb2ae7fd61f552b609e1549bc75dd0a446e00d882640cffc1c828053aa4195711292
+MISC metadata.xml 609 SHA256 703ceaf4566342c945e1f7abb4a3a39ef81166bfb2b62ccd202b159fa564d472 SHA512 c8ffdb3b2f3382ad862afbfc8e8d73540fa88acf8ab3d6a61e96a0e6165a13d2dca9ba6b891e3873032daa6f98cbd66b0a00860aa5fbea864d7f280901cca020 WHIRLPOOL dd6e9cf3305be35ce1ca19f54d7d2dbc8c8d26325baf285bb0807ab06985d947b88feaf96546d2e09c745ac0732b30c97d24d8e22c1b80e9b4262f255e375e9a
diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild
new file mode 100644
index 000000000000..51635f64db95
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r7.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools multilib toolchain-funcs
+
+CHAPPA_PL=115
+DESCRIPTION="alpine is an easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://alpine.freeiz.com/alpine/"
+SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
+	chappa? ( http://alpine.freeiz.com/alpine/patches/${P}/all.patch.gz
+	-> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads +chappa"
+
+DEPEND="virtual/pam
+	>=net-libs/c-client-2007f-r4[chappa=]
+	>=sys-libs/ncurses-5.1:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )
+	spell? ( app-text/aspell )
+"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	!onlyalpine? ( !mail-client/pine )
+	!<=net-mail/uw-imap-2004g
+"
+
+src_prepare() {
+	default
+	use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+
+	# do not use the bundled c-client
+	ebegin "Unbundling the c-client library"
+	rm -rf "${S}"/imap
+	local f
+	while read f ; do
+	sed -i -e \
+		's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include <imap/\1>~g' "$f"
+	done < <(find "${S}" -name "*.c" -o -name "*.h")
+	eend $?
+
+	epatch "${FILESDIR}"/2.00-lpam.patch
+	epatch "${FILESDIR}"/2.00-lcrypto.patch
+	epatch "${FILESDIR}"/2.00-c-client.patch
+	epatch "${FILESDIR}"/2.00-qa.patch
+	use chappa && epatch "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--without-tcl
+		--with-system-pinerc=/etc/pine.conf
+		--with-system-fixed-pinerc=/etc/pine.conf.fixed"
+		#--disable-debug"
+		# fixme
+		#   --with-system-mail-directory=DIR?
+
+	if use ssl; then
+		myconf+=" --with-ssl
+			--with-ssl-include-dir=/usr
+			--with-ssl-lib-dir=/usr/$(get_libdir)
+			--with-ssl-certs-dir=/etc/ssl/certs"
+	else
+		myconf+="--without-ssl"
+	fi
+	econf \
+		$(use_with ldap) \
+		$(use_with passfile passfile .pinepwd) \
+		$(use_with kerberos krb5) \
+		$(use_with threads pthread) \
+		$(use_with spell interactive-spellcheck /usr/bin/aspell) \
+		$(use_enable nls) \
+		$(use_with ipv6) \
+		$(use_with smime) \
+		${myconf}
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine
+		doman doc/alpine.1
+	else
+		emake DESTDIR="${D}" install
+		doman doc/rpdump.1 doc/rpload.1
+	fi
+
+	dodoc NOTICE README*
+
+	if use doc ; then
+		dodoc doc/brochure.txt doc/tech-notes.txt
+
+		docinto html/tech-notes
+		dohtml -r doc/tech-notes/
+	fi
+}
diff --git a/mail-client/alpine/files/2.00-c-client.patch b/mail-client/alpine/files/2.00-c-client.patch
new file mode 100644
index 000000000000..b3b33bcc455e
--- /dev/null
+++ b/mail-client/alpine/files/2.00-c-client.patch
@@ -0,0 +1,251 @@
+--- Makefile.am	2012-10-10 12:30:39.442107211 +0000
++++ Makefile.am	2012-10-10 12:31:17.235528699 +0000
+@@ -16,7 +16,7 @@
+ 
+ SUBDIRS = m4 po $(REGEX_BUILD) pith pico alpine $(WEB_PUBCOOKIE_BUILD) $(WEB_BUILD)
+ 
+-BUILT_SOURCES = c-client.d c-client $(WEB_PUBCOOKIE_LINK)
++BUILT_SOURCES = $(WEB_PUBCOOKIE_LINK)
+ 
+ CLEANFILES = c-client
+ 
+@@ -38,3 +38,4 @@
+ man_MANS = doc/alpine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+ 
+ ACLOCAL_AMFLAGS = -I m4
++AM_LDFLAGS = -lc-client
+--- pico/Makefile.am	2012-10-10 13:01:06.851900583 +0000
++++ pico/Makefile.am	2012-10-10 13:07:40.960017458 +0000
+@@ -24,8 +24,9 @@
+ 
+ pilot_LDADD = $(LDADD) $(INTLLIBS)
+ 
+-LDADD = ../c-client/utf8.o libpico.a osdep/libpicoosd.a \
++LDADD = libpico.a osdep/libpicoosd.a \
+ 	../pith/osdep/libpithosd.a ../pith/charconv/libpithcc.a
++AM_LDFLAGS = -lc-client
+ 
+ noinst_LIBRARIES = libpico.a
+ 
+diff --git a/alpine/callbacks.c b/alpine/callbacks.c
+new file mode 100644
+index 0000000..e92beb5
+--- /dev/null
++++ alpine/callbacks.c
+@@ -0,0 +1,184 @@
++/* ========================================================================
++ * Copyright 1988-2007 University of Washington
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * 
++ * ========================================================================
++ */
++
++#include <stdio.h>
++#include <signal.h>
++#include <imap/c-client.h>
++
++/* Excellent reasons to hate ifdefs, and why my real code never uses them */
++
++#ifndef unix
++# define unix 0
++#endif
++
++#if unix
++# define UNIXLIKE 1
++# define MACOS 0
++# include <pwd.h>
++#else
++# define UNIXLIKE 0
++# ifdef noErr
++#  define MACOS 1
++#  include <Memory.h>
++# else
++#  define MACOS 0
++# endif
++#endif
++
++char *curhst = NIL;             /* currently connected host */
++char *curusr = NIL;             /* current login user */
++
++
++/* Interfaces to C-client */
++
++
++void mm_searched (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_exists (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_expunged (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_flags (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_notify (MAILSTREAM *stream,char *string,long errflg)
++{
++  mm_log (string,errflg);
++}
++
++
++void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
++{
++  putchar (' ');
++  if (delimiter) putchar (delimiter);
++  else fputs ("NIL",stdout);
++  putchar (' ');
++  fputs (mailbox,stdout);
++  if (attributes & LATT_NOINFERIORS) fputs (", no inferiors",stdout);
++  if (attributes & LATT_NOSELECT) fputs (", no select",stdout);
++  if (attributes & LATT_MARKED) fputs (", marked",stdout);
++  if (attributes & LATT_UNMARKED) fputs (", unmarked",stdout);
++  putchar ('\n');
++}
++
++
++void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
++{
++  putchar (' ');
++  if (delimiter) putchar (delimiter);
++  else fputs ("NIL",stdout);
++  putchar (' ');
++  fputs (mailbox,stdout);
++  if (attributes & LATT_NOINFERIORS) fputs (", no inferiors",stdout);
++  if (attributes & LATT_NOSELECT) fputs (", no select",stdout);
++  if (attributes & LATT_MARKED) fputs (", marked",stdout);
++  if (attributes & LATT_UNMARKED) fputs (", unmarked",stdout);
++  putchar ('\n');
++}
++
++
++void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
++{
++  printf (" Mailbox %s",mailbox);
++  if (status->flags & SA_MESSAGES) printf (", %lu messages",status->messages);
++  if (status->flags & SA_RECENT) printf (", %lu recent",status->recent);
++  if (status->flags & SA_UNSEEN) printf (", %lu unseen",status->unseen);
++  if (status->flags & SA_UIDVALIDITY) printf (", %lu UID validity",
++					      status->uidvalidity);
++  if (status->flags & SA_UIDNEXT) printf (", %lu next UID",status->uidnext);
++  printf ("\n");
++}
++
++
++void mm_log (char *string,long errflg)
++{
++  switch ((short) errflg) {
++  case NIL:
++    printf ("[%s]\n",string);
++    break;
++  case PARSE:
++  case WARN:
++    printf ("%%%s\n",string);
++    break;
++  case ERROR:
++    printf ("?%s\n",string);
++    break;
++  }
++}
++
++
++void mm_dlog (char *string)
++{
++  puts (string);
++}
++
++
++void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
++{
++  char *s,tmp[MAILTMPLEN];
++  if (curhst) fs_give ((void **) &curhst);
++  curhst = (char *) fs_get (1+strlen (mb->host));
++  strcpy (curhst,mb->host);
++  sprintf (s = tmp,"{%s/%s",mb->host,mb->service);
++  if (*mb->user) sprintf (tmp+strlen (tmp),"/user=%s",strcpy (user,mb->user));
++  if (*mb->authuser) sprintf (tmp+strlen (tmp),"/authuser=%s",mb->authuser);
++  if (*mb->user) strcat (s = tmp,"} password:");
++  else {
++    printf ("%s} username: ",tmp);
++    fgets (user,NETMAXUSER-1,stdin);
++    user[NETMAXUSER-1] = '\0';
++    if (s = strchr (user,'\n')) *s = '\0';
++    s = "password: ";
++  }
++  if (curusr) fs_give ((void **) &curusr);
++  curusr = cpystr (user);
++  strcpy (pwd,getpass (s));
++}
++
++
++void mm_critical (MAILSTREAM *stream)
++{
++}
++
++
++void mm_nocritical (MAILSTREAM *stream)
++{
++}
++
++
++long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
++{
++#if UNIXLIKE
++  kill (getpid (),SIGSTOP);
++#else
++  abort ();
++#endif
++  return NIL;
++}
++
++
++void mm_fatal (char *string)
++{
++  printf ("?%s\n",string);
++}
+diff --git a/pico/Makefile.am b/pico/Makefile.am
+index f5f694b..e782324 100644
+--- pico/Makefile.am
++++ pico/Makefile.am
+@@ -16,9 +16,9 @@ SUBDIRS = osdep
+ 
+ bin_PROGRAMS = pico pilot
+ 
+-pico_SOURCES = main.c utf8stub.c
++pico_SOURCES = main.c utf8stub.c ../alpine/callbacks.c
+ 
+-pilot_SOURCES = pilot.c utf8stub.c
++pilot_SOURCES = pilot.c utf8stub.c ../alpine/callbacks.c
+ 
+ pico_LDADD = $(LDADD) $(INTLLIBS)
+ 
+--- alpine/Makefile.am	2012-10-11 07:53:35.749024355 +0000
++++ alpine/Makefile.am	2012-10-11 07:54:15.931528157 +0000
+@@ -35,11 +35,11 @@
+ LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
+ 	../pith/libpith.a ../pith/osdep/libpithosd.a  \
+ 	../pith/charconv/libpithcc.a \
+-	osdep/libpineosd.a ../c-client/c-client.a
++	osdep/libpineosd.a
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -DLOCALEDIR=\"$(localedir)\"
+ 
+-AM_LDFLAGS = `cat $(top_srcdir)/c-client/LDFLAGS`
++AM_LDFLAGS = -lc-client
+ 
+ CLEANFILES = date.c
+ 
diff --git a/mail-client/alpine/files/2.00-lcrypto.patch b/mail-client/alpine/files/2.00-lcrypto.patch
new file mode 100644
index 000000000000..b0601503fece
--- /dev/null
+++ b/mail-client/alpine/files/2.00-lcrypto.patch
@@ -0,0 +1,12 @@
+diff -urp alpine-2.00.org/configure.ac alpine-2.00/configure.ac
+--- alpine-2.00.org/configure.ac	2008-08-08 19:11:31.000000000 +0200
++++ alpine-2.00/configure.ac	2011-11-24 12:01:47.741607522 +0100
+@@ -954,7 +954,7 @@ dnl provide SSL support?
+ if test "x$alpine_SSLTYPE" != "xnone" ; then
+   AC_SEARCH_LIBS(SSL_library_init,ssl,
+     [
+-      LIBS="$LIBS -lssl"
++      LIBS="$LIBS -lcrypto"
+     ])
+   if test "x$alpine_SSLTYPE" = "xnone" ; then
+     AC_MSG_NOTICE([OpenSSL libraries NOT found])
diff --git a/mail-client/alpine/files/2.00-lpam.patch b/mail-client/alpine/files/2.00-lpam.patch
new file mode 100644
index 000000000000..69e66d7efa07
--- /dev/null
+++ b/mail-client/alpine/files/2.00-lpam.patch
@@ -0,0 +1,13 @@
+--- alpine-2.00.orig/alpine/Makefile.in
++++ alpine-2.00/alpine/Makefile.in
+@@ -169,7 +169,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lpam
+ LIBTOOL = @LIBTOOL@
+ LN = @LN@
+ LN_S = @LN_S@
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBINTL = @LTLIBINTL@
diff --git a/mail-client/alpine/files/2.00-qa-chappa-115.patch b/mail-client/alpine/files/2.00-qa-chappa-115.patch
new file mode 100644
index 000000000000..e13b80864730
--- /dev/null
+++ b/mail-client/alpine/files/2.00-qa-chappa-115.patch
@@ -0,0 +1,40 @@
+--- pith/send.c	2012-10-11 11:21:43.027665295 +0000
++++ pith/send.c	2012-10-11 11:42:37.659237275 +0000
+@@ -48,6 +48,7 @@
+ #include <imap/smtp.h>
+ #include <imap/nntp.h>
+ 
++int maildir_file_path(char *name, char *tmp);
+ 
+ /* this is used in pine_send and pine_simple_send */
+ /* name::type::canedit::writehdr::localcopy::rcptto */
+--- pith/pattern.c	2012-10-11 11:21:48.069603095 +0000
++++ pith/pattern.c	2012-10-11 11:44:19.868974380 +0000
+@@ -91,6 +91,7 @@
+ ACTION_S   *combine_inherited_role_guts(ACTION_S *);
+ int	    move_filtered_msgs(MAILSTREAM *, MSGNO_S *, char *, int, char *);
+ void        set_some_flags(MAILSTREAM *, MSGNO_S *, long, char **, char **, int, char *);
++int         maildir_file_path(char *name, char *tmp);
+ 
+ 
+ /*
+--- pith/folder.c	2012-10-15 08:19:22.933383126 +0000
++++ pith/folder.c	2012-10-15 08:19:06.314585696 +0000
+@@ -28,6 +28,7 @@
+ #include "../pith/status.h"
+ #include "../pith/busy.h"
+ #include "../pith/mailindx.h"
++#include <imap/utf8aux.h>
+ 
+ 
+ typedef struct _build_folder_list_data {
+--- pith/state.c	2012-10-15 08:31:20.378623246 +0000
++++ pith/state.c	2012-10-15 08:38:07.089630169 +0000
+@@ -38,6 +38,7 @@
+  * Globals referenced throughout pine...
+  */
+ struct pine *ps_global;				/* THE global variable! */
++extern void free_allowed_qstr(void);
+ 
+ #ifdef	DEBUG
+ /*
diff --git a/mail-client/alpine/files/2.00-qa.patch b/mail-client/alpine/files/2.00-qa.patch
new file mode 100644
index 000000000000..da2535ef15cd
--- /dev/null
+++ b/mail-client/alpine/files/2.00-qa.patch
@@ -0,0 +1,19 @@
+--- pith/charconv/utf8.c	2012-10-11 07:57:38.022062458 +0000
++++ pith/charconv/utf8.c	2012-10-11 08:59:56.205068504 +0000
+@@ -16,6 +16,8 @@
+  */
+ 
+ 
++#define _XOPEN_SOURCE
++
+ /* includable WITHOUT dependency on c-client */
+ #include <imap/mail.h>
+ #include <imap/utf8.h>
+@@ -38,6 +40,7 @@
+ #include "utf8.h"
+ 
+ #include <stdarg.h>
++#include <wchar.h>
+ 
+ 
+ unsigned single_width_chars_a_to_b(UCS *, int, int);
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
new file mode 100644
index 000000000000..a2485d48e63f
--- /dev/null
+++ b/mail-client/alpine/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<use>
+		<flag name="chappa">enhance alpine by applying Eduardo Chappa's
+			patches</flag>
+		<flag name="onlyalpine">installs only the alpine binary, so it does
+			not collied with pico and/or pine</flag>
+		<flag name="passfile">Adds support for caching passwords into a file
+			between sessions</flag>
+		<flag name="smime">Enable support for S/MIME</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
new file mode 100644
index 000000000000..d32c03f65dad
--- /dev/null
+++ b/mail-client/balsa/Manifest
@@ -0,0 +1,8 @@
+DIST balsa-2.5.2.tar.bz2 4049163 SHA256 01218dd8cb2c052c2d221d96e4ef5e277271befb2b50bbf4913223913214d21d SHA512 f7a9127d87869d57acebaf33f9e3e4b82c5a5ba90aa5304ce40ba48a1a7f01eaf602555f8e97bce70b0baeb2ac8b5ac12941eaa8b85be1886bf22f7767dd75ba WHIRLPOOL 7b7d96cda21b50a4acb068e5989696acd02ebb1fa70563f47230a8c0a04da51cf3af4422c23d13c5dbff27d89cce6e7516a6eeaa6464c9dedd6d2d326587fc65
+DIST balsa-2.5.3.tar.bz2 4333815 SHA256 b896ea6b16b31725e0d81ba4eac398b39ad5c33f2337a260448d2feac7e55396 SHA512 34e69be050f6c502fa6651029b7d93bf9b7842bbe8489669924563c086def4dbe72109ba5244e0cacf3ef69d3d9d8c5679f870acf564b5551920fa77012e1ff8 WHIRLPOOL 549b452f16de7f56f3026c992add38177e9cedf4baa8ec7d13d47449e50542045f1b77c84fc9e21796feb648730e65716e66628cb17a28e899669cf14e03613c
+EBUILD balsa-2.5.2-r1.ebuild 2573 SHA256 5ffc927779ac3eb592a630f836e8125ea6154501bbf4fc904e46325853ecd215 SHA512 87414906f0a40d7ccf62ff76cefa2583bb99ea9f07a366f8964f4305424ae5f7034bc2c046a3181b11f4342cfac7eac6ffb9358b030ddb7dd8395bbccb37182b WHIRLPOOL a309a37fbbe099f759dff9876aeff2e77b4dd93db42bd8441aea5948b403c8fd25d7c3e9c66ac3f0e511aeec2446546a244a6cfdc08ad0b82f3e1e705c00376e
+EBUILD balsa-2.5.3-r1.ebuild 2110 SHA256 8b5b4a91c27899fcb455613f17cdb5c61c3a976b89f2b294e4cb602a5cea8c65 SHA512 6e48de2aed1159bc26c8f1b17069098fb0d6ba123cf89ed2be1ff9427ac3ae708afe1083e7b925187863e752c10a41add6f744c211720e99f69a21a0c2f13f80 WHIRLPOOL 3712e2657561be65b8e3b4830a1455233379ace71f1297f4d383b9cefcb50bd59270799b7a8c789354b92b0ceec0a0f22dbf3019c90d8f5504e6cd7a7ae48e9e
+EBUILD balsa-2.5.3.ebuild 2157 SHA256 3116d17e380385a5925dfcf10b9ff6b55c4e7d27e3cea89d1814a81e09c82ed1 SHA512 177ed626dc49744ed2fea8656e1449e018689414f93be52e7a5e32cddf9c5d2301e43bda23297b3ad6261453eb53da7ce9b561639847675ad2e5b2b3a881908c WHIRLPOOL 7cce6b1cef15e94a46be46848b691a461e2d6511ee254312e6e6965055623510539207257bdf404810237ffb92c910514d1064167a89691c9443dc2bb9a80e24
+MISC ChangeLog 4081 SHA256 ab4a4b9112e6ccdaf87df04aaa6a7f7128ca0d7ea08dcd48f3e6bb88043dac73 SHA512 d9a1b8bcb15305a99a085fa398f92ffca72960e83535199e2ea55acf7f17060a5e615cbecc5c4635da1517eb9a5cdae55040683c7ad033be0a6bd4bbbf589a9e WHIRLPOOL d5e0db4bfa2f3a7043555da76b331d29dffd0dd6d6fa0b63b610eb5d7215ae7d5113cf8b341f1f1125491176e34c99b51a394cffb59100319b899c96268c7177
+MISC ChangeLog-2015 28036 SHA256 a1d633e378faf4f2ae1c5ffc2cd5682869586731dc32d99f69f212d9d4bc24c2 SHA512 03c0f5b16a8ab3da14cd75a1dd301c506ec5366fc78619643def84992ee1d82849bbf59f13d57ee524a7522e38ae7f9b58435982419851c5f47415fd5caa182f WHIRLPOOL 0c1c9f2c2be73569ae7b6c6d6e367289333ec0e1439cb4acb501808bec936aa8b4d8568b83d79ce8fbf91b6cda0be18df740eb2509dfbe334d1400f0d2cc02af
+MISC metadata.xml 525 SHA256 c2c768ae1bb0c03a8d031fa5e6a1af0fd4ae7b2ced25b66af0320e319737af74 SHA512 2cff8f1968d1d1656b2eb01b1a373483a2168a4cdf2556c8cd7a4558f3e0821b816fc7cc2e1476ee8a8fe90622835c6b10e392b6ea7e64eba592c6f50922d4fe WHIRLPOOL 32bfc4d734e1466a7e13d76ccc4b88f51b573598c566d31ce014b83e80b415672e86c1304c0d8529ab4ca8d48e0f303d8320bc0ab2634f6eccacf458c2163770
diff --git a/mail-client/balsa/balsa-2.5.2-r1.ebuild b/mail-client/balsa/balsa-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..7cfc68bf4b5c
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+
+IUSE="crypt gnome gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify libressl rubrica sqlite ssl webkit xface"
+REQUIRED_USE="gtkhtml? ( !webkit )"
+
+# TODO: esmtp can be optional, do we want it?
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.4.0:3
+	dev-libs/gmime:2.6
+	>=net-libs/libesmtp-1.0.3:=
+	net-mail/mailbase
+	media-libs/libcanberra:=[gtk3]
+	x11-themes/hicolor-icon-theme
+	x11-themes/adwaita-icon-theme
+	crypt? ( >=app-crypt/gpgme-1.0:= )
+	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtkhtml? ( gnome-extra/gtkhtml:4.0 )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	gtkspell? ( >=app-text/gtkspell-3.0.3:3 )
+	!gtkspell? ( app-text/enchant )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	rubrica? ( dev-libs/libxml2:2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	webkit? ( net-libs/webkit-gtk:4 )
+	xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750516
+	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750515
+	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+
+	if use crypt ; then
+		myconf+=" --with-gpgme=gpgme-config"
+	else
+		myconf+=" --without-gpgme"
+	fi
+
+	if use webkit || use gtkhtml; then
+		if use gtkhtml ; then
+			myconf+=" --with-html-widget=gtkhtml4"
+		else
+			myconf+=" --with-html-widget=webkit2"
+		fi
+	else
+		myconf+=" --with-html-widget=no"
+	fi
+
+	gnome2_src_configure \
+		--disable-pcre \
+		--enable-gregex \
+		--enable-threads \
+		--with-gmime=2.6 \
+		--with-canberra \
+		$(use_with gnome) \
+		$(use_with gnome gtksourceview) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with gtkspell) \
+		$(use_with kerberos gss) \
+		$(use_with ldap) \
+		$(use_with libnotify) \
+		$(use_with rubrica) \
+		$(use_with sqlite) \
+		$(use_with ssl) \
+		$(use_with xface compface) \
+		${myconf}
+}
diff --git a/mail-client/balsa/balsa-2.5.3-r1.ebuild b/mail-client/balsa/balsa-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..287a15573240
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.3-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica sqlite webkit xface"
+
+# TODO: esmtp can be optional, do we want it?
+RDEPEND="
+	>=app-text/gspell-1.2:0=
+	>=dev-libs/glib-2.40.0:2
+	>=x11-libs/gtk+-3.10.0:3
+	dev-libs/gmime:2.6
+	>=net-libs/libesmtp-1.0.3:=
+	net-mail/mailbase
+	media-libs/libcanberra:=[gtk3]
+	x11-themes/hicolor-icon-theme
+	x11-themes/adwaita-icon-theme
+	crypt? ( >=app-crypt/gpgme-1.2.0:= )
+	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	rubrica? ( dev-libs/libxml2:2 )
+	webkit? ( net-libs/webkit-gtk:4 )
+	xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-python/html2text
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750516
+	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750515
+	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-canberra \
+		--with-spell-checker=gspell \
+		$(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
+		$(use_with gnome) \
+		$(use_with gnome gtksourceview) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with kerberos gss) \
+		$(use_with ldap) \
+		$(use_with libnotify) \
+		$(use_with rubrica) \
+		$(use_with sqlite) \
+		$(use_with xface compface) \
+		$(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
+}
diff --git a/mail-client/balsa/balsa-2.5.3.ebuild b/mail-client/balsa/balsa-2.5.3.ebuild
new file mode 100644
index 000000000000..c2af66a84eb7
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica spell sqlite webkit xface"
+
+# TODO: esmtp can be optional, do we want it?
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=x11-libs/gtk+-3.10.0:3
+	dev-libs/gmime:2.6
+	>=net-libs/libesmtp-1.0.3:=
+	net-mail/mailbase
+	media-libs/libcanberra:=[gtk3]
+	x11-themes/hicolor-icon-theme
+	x11-themes/adwaita-icon-theme
+	crypt? ( >=app-crypt/gpgme-1.2.0:= )
+	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	rubrica? ( dev-libs/libxml2:2 )
+	spell? ( app-text/gspell:0= )
+	webkit? ( net-libs/webkit-gtk:4 )
+	xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-python/html2text
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750516
+	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=750515
+	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-canberra \
+		$(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
+		$(use_with gnome) \
+		$(use_with gnome gtksourceview) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with kerberos gss) \
+		$(use_with ldap) \
+		$(use_with libnotify) \
+		$(use_with rubrica) \
+		$(usex spell --with-spell-checker=gspell --with-spell-checker=no) \
+		$(use_with sqlite) \
+		$(use_with xface compface) \
+		$(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
+}
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
new file mode 100644
index 000000000000..4c043cdb299a
--- /dev/null
+++ b/mail-client/balsa/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="crypt">Adds support for GnuPG encryption</flag>
+		<flag name="gtkhtml">Use gtkhtml for HTML rendering</flag>
+		<flag name="gtkspell">Use gtkspell for dictionary support</flag>
+		<flag name="rubrica">Adds support for rubrica addressbook</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/biabam/Manifest b/mail-client/biabam/Manifest
new file mode 100644
index 000000000000..28924f50f346
--- /dev/null
+++ b/mail-client/biabam/Manifest
@@ -0,0 +1,5 @@
+DIST biabam-0.9.7.tar.bz2 8334 SHA256 3db74189e3af2eca922dc4a2e0310bc92461acdf5cfb4d51241fc0bba89b5a2d SHA512 c1745ef0c44967e48d2fe368fb2f1d5e9f3ce7d80577e95979480f917040e53d7b83fde70089ea8fd886e4fe027413283113cb02757aafc3e5fbe2adc8a19d84 WHIRLPOOL 88287d161a6bfde10689c122bd04f42630af37418475919a9d8820b2af3405ee72b3a2a5236ff20c6beaf65556bf9d10e786e0de80f9952681b6f90c8798310b
+EBUILD biabam-0.9.7.ebuild 458 SHA256 0f51b0c81ecdd692653f710e8b10e031d8a0c70627bf53ead3c703979b2e27a8 SHA512 00e3cb891233610370992e8f60c89d7e155c1affd51dbb659d5a9301f477c5dc84aac69f1dbf7127ffafc379572fe3a5e413f030111fe48f1f70154e8e89073c WHIRLPOOL 4a0b4b23b97621767c34e82aa45a71a404f417bcd6215f53e03c9b223995d09659886231868c529dc05ba3bf74b680e39732cc64c2e4f6ecf5ad3c9c7081f621
+MISC ChangeLog 2427 SHA256 542585c003a588d27b3bbe09b2289ce90219803ea90d66637589dd4582ae0489 SHA512 f58c393b57f8d6ab8065971978b47022a405666bc5fa8cd2f7b1e2366165d6d52fa6f8e54617ca0f2e2acc2005e4f30a3e224442a24ef3e0c185dcecb4a4a723 WHIRLPOOL 1cce6fc7af3314d63afafa258ea7df0b6d1ca1cbed8c55552244567bc5f435511fb590aae906244f1380c8d5d1288cb3f84177f99bb687c8789e3880f761497b
+MISC ChangeLog-2015 642 SHA256 765d8ee21508a063b85ee846aa72a53902a909f2f5c3cb03506818329dc42e45 SHA512 74091f64235dc4633cebc24c546d2ae1eab492ae28cc770155b678445dc3e3d7b9fb6bf89a622e97e3d06250598b4c77f1e9708905ac6ac087087bf3982c5216 WHIRLPOOL fd09815d6247ed09d456b4452e55a8df43d925c1a7299702a5e144c8ef099098ec313c84676535757c9b875aec3e2df07a8c80589327ee23e1e54006277db3f6
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
diff --git a/mail-client/biabam/biabam-0.9.7.ebuild b/mail-client/biabam/biabam-0.9.7.ebuild
new file mode 100644
index 000000000000..a31a3b02dccb
--- /dev/null
+++ b/mail-client/biabam/biabam-0.9.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Biabam is a small commandline tool for sending mail attachments"
+HOMEPAGE="http://www.mmj.dk/biabam/"
+SRC_URI="http://www.mmj.dk/biabam/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/sharutils
+	app-shells/bash
+	sys-apps/file
+	virtual/mta"
+
+src_install() {
+	dodoc COPYING README
+	dobin biabam
+}
diff --git a/mail-client/biabam/metadata.xml b/mail-client/biabam/metadata.xml
new file mode 100644
index 000000000000..9a6d80e5da48
--- /dev/null
+++ b/mail-client/biabam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
new file mode 100644
index 000000000000..1a7ef696c706
--- /dev/null
+++ b/mail-client/claws-mail/Manifest
@@ -0,0 +1,12 @@
+AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 SHA256 e577983238042a04fc0c874b3885e3d9ac01f19c756539747e89f1a47d25236d SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b WHIRLPOOL 09b6ac2a3b6959163a94d1981ed93d4542923cfd4305cc458f20190848d02422b70a22de6b67ee061525f7cec00f1a43f1a645142ca62ff6d268f7fb886f4424
+DIST claws-mail-3.13.2.tar.xz 5582600 SHA256 6a731052814b3284abeca1662d47817a86e018bc7123ab428f015f0cfab40ad1 SHA512 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3 WHIRLPOOL ec64d157fffd7be2849c92209cf3a5cc29935fa60a9061577c1b0bbcdac28b51f800c731ebf5f9598bc34f56ee9815adddfb5691f5faa81c92252bd182ab5120
+DIST claws-mail-3.14.1.tar.xz 5812444 SHA256 b79a1dc04f0b3d1f693e84d7fa7282f140fb5280179281445a8b954ce423c335 SHA512 ee1653ebd14b8aee76e97ce81ec203e0beeea7074eba0aa34c69bceb0a80135cdb16e508009cb479047d5112abd7eaa4bdb7e46722f33a88419fb24eeb75ac30 WHIRLPOOL ae5f6296f6f56c7dd8683efa68f3d688d806a5f5da576147ad4e685d16def294c6a5f2e1bca18e137995bed2dffad1e2fd2fcfb990a96d68950eb38c96640e13
+DIST claws-mail-3.15.0.tar.xz 5665648 SHA256 4e4d2d0d43f8ae3d4623408612f5979e9a697ccbc12038b80dd27802e868dc2e SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8 WHIRLPOOL 18c041a770a14c9f5c87d086965b302e2ced8aee8954ed6e3d7934ce011053b7dca8ee13958dc4485172344d70fc0facbf10cc7e62ea8f8feadbd12ba4980cb4
+DIST claws-mail-3.15.1.tar.xz 5665468 SHA256 8d093c2f32db863c1141d56e35424c04ee48fe5d6adf4c7f349f647fa3149542 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c WHIRLPOOL 85f96c421954f7b1e28a301dcfd074b316be2e221936d04c11552eec2897e7f46389df29bbca04f68c052f8ce971b5ff85e2882b9372d838e429724f9dee51be
+EBUILD claws-mail-3.13.2.ebuild 5610 SHA256 b68560eddbc52c0f9921c3ca64ff9c29db927012a2a2193eb470466a76841381 SHA512 3e51d2f66fed531e77b498210026bc23362e092f775a60cf24695490e405880c7a45c99ba48b31679acdd57bfe613db1f850b7f645e244b341ee66ebbc7b398d WHIRLPOOL 5b1c7e75bc412e6057198f2ca9906f02b68b880a92491768c03665adbf89a7bd3abf160476c5d704ef1bb512f0155d27aad57245ed0ee122fa74a864bb6e464f
+EBUILD claws-mail-3.14.1-r1.ebuild 5570 SHA256 a5c2afc6ffabfbda645fc21db0e8ad206055b9703d184d2c9514301985c222c3 SHA512 6b3913627ae1c11ede1f9c07b44206445ff0713cd725c6b02c86eeb856264e5a00f5080ca29dd871401b6041aae82af0b9b3a7b23c9c06d2ef12f63d8d582a76 WHIRLPOOL 4455d43bced627d5ad0cb1f47ab56b38e953cbabb5e52200f9cad0c8d5522bebc50ba634d021b5a9dfb4c7f8037f52e69fa9d0cbe857fef8e179e4af12c99bb3
+EBUILD claws-mail-3.15.0-r2.ebuild 5774 SHA256 4b06e611a2f667e9e0bf8175514ecd05cd89839d747204269eeeae1395a0a9c0 SHA512 26efa33e724fd19cb10ea41c80874e2c6b9790ab5cb2a4b858a97a53c16a733eb865ea5b15f9e3c1d0a25c56da3c4c32464237a6a87a4edef898e658526af28a WHIRLPOOL bc31d93ebb27dc95c7e250134fcb991dfd161f27c41c71a7fedd8d3baeaca5c0b04bcfc7ab1ee02d52e64930e555f67beff932e6b0f7a37fba190296fa71695f
+EBUILD claws-mail-3.15.1.ebuild 5715 SHA256 201f8016a3c7e1785d7712c6a26472263241bc2fc8b39410d354e018e2ff151b SHA512 a27fbf82daa240cb27975ebc254ae9a7cf4b04d6cb6750276a91b7746579a5bb561172c73b7a8e384adc0c7eca419e198cd5241c5350399c5d19ece1bb9aa396 WHIRLPOOL 366b35cd1a5d2f5eea41076de0d660c1b03550b85c908361aa338c93f676a5a4fbb1fce981dd641843698fd86018042fe4cae7961fa4f3b294ba4bd1397dc11e
+MISC ChangeLog 8489 SHA256 1656b342b82c6a9f9dd8cfa353f60f6a11bf1fd29c51ed1821d957d1f13cf97e SHA512 f31e2d09853af298f76bb9f5453cc6993e8e9d308e5cdca421ce0874c03959800c4f631d0cbbf7fd0e4e5479459bacec824e99f2ccc044cd7f23087ea3ea7007 WHIRLPOOL df5da309a0869529e8e841be184f35373bc49dbcb30679eaaba84b71638772728e0ba772f19fa2438adfffade69f1a761578b6b02e060e138825ea78ddb6da55
+MISC ChangeLog-2015 50783 SHA256 4bf54aba1e1bf20eec4b422e06c92ecc437f153ae2b15362f6d5a88a53a69765 SHA512 3110b46314c57ec1889880e0b5c3ec8e64f7cb153a0099b083d0967bde4eda5f8fc171affdf06b83a9b54500dc0d65ed5912f9c0b9bec682be5c4eca8760e508 WHIRLPOOL e2a1f3a651d2927b6f72770f4b5f824d1870323e88d3daf00a66c2f8f9ce200d340d107aff94de8e16470caba1945fb72dd86b34c7555ede2a56b1beea6809a5
+MISC metadata.xml 1716 SHA256 03affd8bce08eb15ad9ac63fc054ccf16a439e7592bf7e117c93601eec7c71b7 SHA512 2246148a5fe3ecd1b097a1037ba08ef2c175b7d93ceaeb7e9b2a49b9397a47e9f98e4a510f3f2224e94a3aa7982af2b77df2c917496a01c44602e866924b3a5b WHIRLPOOL 51d87dcec02ddb09e05a409d7d5723c1e92d7b9d26b304ef0986c73c83d9ad636d76976034be80e85eb7f8ba89b4f9b481ce3ca7491d892b3a8d3acc784bb0d0
diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
new file mode 100644
index 000000000000..3f0fc0bfdde9
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib gnome2-utils eutils python-single-r1
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.17.1 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
+	pda? ( >=app-pda/jpilot-0.99 )
+	gnutls? ( >=net-libs/gnutls-2.2.0 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	pgp? ( >=app-crypt/gpgme-0.4.5 )
+	valgrind? ( dev-util/valgrind )
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	spell? ( >=app-text/enchant-1.0.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	startup-notification? ( x11-libs/startup-notification )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	archive? ( app-arch/libarchive
+		>=net-misc/curl-7.9.7 )
+	bogofilter? ( mail-filter/bogofilter )
+	notification? (
+		libnotify? ( x11-libs/libnotify )
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		dev-libs/glib:2
+	)
+	smime? ( >=app-crypt/gpgme-0.4.5 )
+	calendar? ( >=net-misc/curl-7.9.7 )
+	pdf? ( app-text/poppler[cairo] )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	webkit? ( >=net-libs/webkit-gtk-1.0:2 )
+"
+
+DEPEND="${COMMONDEPEND}
+	app-arch/xz-utils
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/ghostscript-gpl )
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3 )
+	rss? ( net-misc/curl
+		dev-libs/libxml2 )
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		$(use_enable debug crash-dialog)
+		$(use_enable valgrind valgrind)
+		$(use_enable doc manual)
+		$(use_enable gtk3)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable dbus dbus)
+		$(use_enable networkmanager)
+		$(use_enable pda jpilot)
+		$(use_enable session libsm)
+		$(use_enable spell enchant)
+		$(use_enable gnutls)
+		$(use_enable startup-notification)
+		$(use_enable xface compface)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable notification notification-plugin)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-alternate-addressbook
+		--enable-nls
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--disable-generic-umpc
+		--disable-bsfilter-plugin
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	autotools-utils_src_install
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild
new file mode 100644
index 000000000000..8a2efc8f690f
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools gnome2-utils eutils python-single-r1
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification valgrind xface"
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND="
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? ( >=net-misc/curl-7.9.7 )
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	gdata? ( >=dev-libs/libgdata-0.17.1 )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pda? ( >=app-pda/jpilot-0.99 )
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-1.0.0 )
+	startup-notification? ( x11-libs/startup-notification )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	xface? ( >=media-libs/compface-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3
+	)
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable gtk3)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pda jpilot)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
new file mode 100644
index 000000000000..9a2e968f8fdf
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.15.0-r2.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND="
+	net-mail/ytnef
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0
+		>=net-misc/curl-7.9.7
+	)
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pda? ( >=app-pda/jpilot-0.99 )
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-1.0.0 )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	xface? ( >=media-libs/compface-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3
+	)
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-old_profile_segfault.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable gtk3)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pda jpilot)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/mail-client/claws-mail/claws-mail-3.15.1.ebuild b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
new file mode 100644
index 000000000000..69f04ac6397a
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND="
+	net-mail/ytnef
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0
+		>=net-misc/curl-7.9.7
+	)
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pda? ( >=app-pda/jpilot-0.99 )
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-1.0.0 )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	xface? ( >=media-libs/compface-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3
+	)
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable gtk3)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pda jpilot)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
new file mode 100644
index 000000000000..b19bf8f39d67
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
@@ -0,0 +1,80 @@
+From: Ricardo Mones <ricardo@mones.org>
+Date: Wed, 9 Aug 2017 14:48:38 +0000 (+0200)
+Subject: Fix bug #3855: segfault at startup with old profile and IMAP account
+X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=667c9d3eaf0487193cc7873e6d3a63959a03d7f9;hp=63677adb68c57479f6bc7534cfbf2f234b1f4fb1
+
+Fix bug #3855: segfault at startup with old profile and IMAP account
+
+Revert "Remove duplicated code and include".
+
+This reverts commit 300f811f3bbf10455ca55d9b01da6705dd1e07bb.
+---
+
+diff --git a/src/imap.c b/src/imap.c
+index 0e1e777..25bb283 100644
+--- a/src/imap.c
++++ b/src/imap.c
+@@ -77,6 +77,8 @@ typedef struct _IMAPSession	IMAPSession;
+ typedef struct _IMAPNameSpace	IMAPNameSpace;
+ typedef struct _IMAPFolderItem	IMAPFolderItem;
+ 
++#include "prefs_account.h"
++
+ #define IMAP_FOLDER(obj)	((IMAPFolder *)obj)
+ #define IMAP_FOLDER_ITEM(obj)	((IMAPFolderItem *)obj)
+ #define IMAP_SESSION(obj)	((IMAPSession *)obj)
+@@ -425,6 +427,7 @@ static gint imap_get_flags			(Folder 	*folder,
+ 						 FolderItem 	*item,
+                     				 MsgInfoList 	*msglist,
+ 						 GHashTable 	*msgflags);
++static gchar *imap_folder_get_path		(Folder		*folder);
+ static gchar *imap_item_get_path		(Folder		*folder,
+ 						 FolderItem	*item);
+ static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
+@@ -3042,6 +3045,35 @@ static FolderItem *imap_create_special_folder(Folder *folder,
+ 	return new_item;
+ }
+ 
++static gchar *imap_folder_get_path(Folder *folder)
++{
++	gchar *folder_path;
++
++	g_return_val_if_fail(folder != NULL, NULL);
++        g_return_val_if_fail(folder->account != NULL, NULL);
++
++#ifdef G_OS_WIN32
++	gchar *sanitized_dirname = g_strdup(folder->account->recv_server);
++	g_strdelimit(sanitized_dirname, ":", ',');
++#endif
++
++        folder_path = g_strconcat(get_imap_cache_dir(),
++                                  G_DIR_SEPARATOR_S,
++#ifdef G_OS_WIN32
++																	sanitized_dirname,
++#else
++                                  folder->account->recv_server,
++#endif
++                                  G_DIR_SEPARATOR_S,
++                                  folder->account->userid,
++                                  NULL);
++
++#ifdef G_OS_WIN32
++	g_free(sanitized_dirname);
++#endif
++	return folder_path;
++}
++
+ #ifdef G_OS_WIN32
+ static gchar *imap_encode_unsafe_chars(const gchar *str)
+ {
+@@ -3078,9 +3110,8 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item)
+ 	gchar *item_path = NULL;
+ 	
+ 	g_return_val_if_fail(folder != NULL, NULL);
+-	g_return_val_if_fail(folder->account != NULL, NULL);
+ 	g_return_val_if_fail(item != NULL, NULL);
+-	folder_path = prefs_account_cache_dir(folder->account, FALSE);
++	folder_path = imap_folder_get_path(folder);
+ 
+ 	g_return_val_if_fail(folder_path != NULL, NULL);
+ 
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
new file mode 100644
index 000000000000..dd8c6462dc0e
--- /dev/null
+++ b/mail-client/claws-mail/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<use>
+		<flag name="archive">Enable archiving plugin</flag>
+		<flag name="gdata">Enable plugin for access to Google
+		data providers</flag>
+		<flag name="gtk3">Build support for GTK+3</flag>
+		<flag name="pgp">Enable PGP support</flag>
+		<flag name="spam-report">Enable plugin for spam
+		reporting to various services</flag>
+		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg>
+			plugin</flag>
+		<flag name="libcanberra">Enable sound notification in connection
+		with USE=notification</flag>
+		<flag name="libindicate">Enable notification through
+		DBUS in connection with USE=notification</flag>
+		<flag name="libnotify">Enable notification on the
+		desktop in connection with USE=notification</flag>
+		<flag name="notification">Notification for new mail in
+		different way, see also USE flags libcanberra,
+		libindicate and libnotify</flag>
+		<flag name="sieve">Build plugin for sieve filter support</flag>
+		<flag name="smime">Build plugin for S/MIME support</flag>
+		<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
+			plugin</flag>
+		<flag name="valgrind">Add support for memory debugging
+			using valgrind</flag>
+		<flag name="webkit">Enables HTML e-mail rendering by using
+			the <pkg>net-libs/webkit-gtk</pkg> library.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sylpheed-claws</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
new file mode 100644
index 000000000000..265f6b46fb4c
--- /dev/null
+++ b/mail-client/clawsker/Manifest
@@ -0,0 +1,7 @@
+DIST clawsker-0.7.10.tar.gz 67488 SHA256 c044f9a7469c828abcb397b42fd2215845b9d655aa82917b51eeb2c41c274594 SHA512 1b7b3638485af509e4b32be5cdb6ffa2e56b7ddb661dbde291ac4cb7804c98363ddcaa46d36ffba0699c77d0a66e84ff5b58be29ddb3d7d9f9ec0e6567a9075f WHIRLPOOL d9b822bd1a4e6f91d8386f85313a4b1d35905aada17da97bafc97c830f22202e193e736cc7710711ca8ca14e7c34243424e8e6364b1f8f3617cc3a49e7e6e336
+DIST clawsker-0.7.8.tar.gz 66210 SHA256 133f89db736f77979603ebf02eea4fbcb654fb69cfcf2301c3598ff52ac61155 SHA512 2dd1cccc45641aeb58769630f095d23f68b0bdc8276711cea1d25597c2c3fd94ef5b318bafc5332f4c3880715052949f07e3a2b8ad554baa4b871434547abdca WHIRLPOOL cf65547430ab6ceec335e58e312b5bae7116381b87e957273a7d3594f95479958a8cfd7349fe50b68c89e0b0a03a6a14d453761c134c381253579b46bea00350
+EBUILD clawsker-0.7.10.ebuild 550 SHA256 5ac474db52120b0a31f1253a86a1dc31d79ee840c7320546a9b81220016344e2 SHA512 d24e8026cc223510ebdb725f776ce1a18a3315fd2051053d1d8d7d79d1a193f23da6c9e1feea55d6a1d99f706bf2e33b5e2704ddfa126131b746582e5b185530 WHIRLPOOL ee7e4a0daaeda75e315a4ae4286d2f81f84e8492fe06999a90ba0c2288995feee9f16b4eb6095a4fee8e66b2f048e577665aae8b5bd46ebf26e7c88c0b882358
+EBUILD clawsker-0.7.8.ebuild 548 SHA256 ce98c7738b4cb39f811c75ba0e11aeec08c595fee03ccf5cbd90601218e3815e SHA512 d17f085cd8c117cd4d66d5a095a2b24cf18cc2e334d55b03d31d5c4775c74ab75599951805d29651c0287b0678a947f99877e36a67ece6f7f54c30e0e976d62a WHIRLPOOL 578f2656b05a9117cb2d448a40024b90f27c500091006d1fc8ee65de28889c10a348f2822e1df14b8c898f6962079b2c8c1068d8fb4e1113ce0965aecd239312
+MISC ChangeLog 2836 SHA256 ac63ee92170b8b7293c21322b737172cb78be7087d637e0a477dab5391e8d6fe SHA512 0810c9f32d27407d1ad04bafceee85d44182efeb39643c94362ec2bb2b83b2a7754f07fc0ae4ada5b52fd8376c75280f0735b2295fb0ab646915240909455101 WHIRLPOOL 815bfc99a6ac33b047ea4f62ed9f4be1d95bf3ded1cd37ccaed0ac00c367e9ca8670d7ba629cc1e6b40cbed2ad4fcc44a5a3b3b2c0933b1e14fd78b60688e0ed
+MISC ChangeLog-2015 3674 SHA256 fd10cb376fc9501117cc043e16ec4aabef398acc32f91c8f03c36f2f19e35074 SHA512 0c061c7d55faa20cd7e41cd271d2e21daf3f07c176ede539ff2ed4d0ed2c7f0130c89ad373228dcbb8721c353071b9e61f5ec636b89e904dd506cdf7f899328b WHIRLPOOL 2aba3c825cfb856feeac65437376cc2662cd41f4650bd7bf06fa8886f83fbf9a492ef8b6695b12e039aae2bc5beabd13e03cf8d4be1844b0a8db8e633510c30e
+MISC metadata.xml 245 SHA256 eeba2d43c3b18d224c8d294443aec5fda8fbc0155423e324c58dd66ec6e662d5 SHA512 5455e993e99d642269224e34fffba515f7375bee9e8dad756c171bd2eb36623af81e485d3dbfde291b451c8ae5086efd0b378a935282966d2f851538a9ac8163 WHIRLPOOL 25951f32131f21df530547bb640c22f40bef6f7bd713f3fa67529dfd11b7c03f42e2d4c1214dde1694d569b0e15709863980d280bd180106b3b1ec95c5a6987f
diff --git a/mail-client/clawsker/clawsker-0.7.10.ebuild b/mail-client/clawsker/clawsker-0.7.10.ebuild
new file mode 100644
index 000000000000..7023d5a0c375
--- /dev/null
+++ b/mail-client/clawsker/clawsker-0.7.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="http://www.claws-mail.org/clawsker.php"
+SRC_URI="http://www.claws-mail.org/tools/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	>=dev-perl/Gtk2-1.200
+	>=dev-perl/Locale-gettext-1.05
+	>=mail-client/claws-mail-3.5.0"
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr || die
+}
diff --git a/mail-client/clawsker/clawsker-0.7.8.ebuild b/mail-client/clawsker/clawsker-0.7.8.ebuild
new file mode 100644
index 000000000000..9e38381337fc
--- /dev/null
+++ b/mail-client/clawsker/clawsker-0.7.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="http://www.claws-mail.org/clawsker.php"
+SRC_URI="http://www.claws-mail.org/tools/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	>=dev-perl/Gtk2-1.200
+	>=dev-perl/Locale-gettext-1.05
+	>=mail-client/claws-mail-3.5.0"
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr || die
+}
diff --git a/mail-client/clawsker/metadata.xml b/mail-client/clawsker/metadata.xml
new file mode 100644
index 000000000000..bbceac2e8e2f
--- /dev/null
+++ b/mail-client/clawsker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	  <email>net-mail@gentoo.org</email>
+	  <name>Net-Mail</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
new file mode 100644
index 000000000000..2b034c0e9d6e
--- /dev/null
+++ b/mail-client/cone/Manifest
@@ -0,0 +1,9 @@
+DIST cone-0.92.tar.bz2 3774451 SHA256 bfc1170565d931ac9b8a674410f44cb2472c7b755b5bb97e9915d37fdfe9d631 SHA512 8d764ed3cb2a22caff21d11beff74131fdbbe0f66dbf1a40293f62862e9af7a472840ff00a069df10143f7154c2db85ac5421999476516f27b8f090e5c1232fc WHIRLPOOL 8520d2b07aaf4d03b4055672fbc8c29b0e50ab2053672187853b9b2f3dfd261cd9e858543b62644aae16504ade70b782d1d85e47f5dd562b754d2be62bc7bc06
+DIST cone-0.95.tar.bz2 3748331 SHA256 ae31dddd4f64c50397cae2706ae4505a2df8aafdde2a73bffe08c2362615c89b SHA512 545d17286b937eb33b5fa14c36a480eea0146802f6c8a36e55987206b125bac55b25ab79a4c833ffa1fdcdbe56b2949acd5c8bdfd27c900bf64d5e738677ef4a WHIRLPOOL 6acd7f53d6e749864362096c5ce2703bea617be1a6dcb955979188d13674ac345b58e56cd4836b3d345f79a80e9a1777553b7d405899aa6256b04d58bd1a4882
+DIST cone-0.96.tar.bz2 3752115 SHA256 657b16002deae701d5a9ca5572bfe9c05ba40c0da523ecebb8171f48863f6a8e SHA512 6bdc8ac1a8ae8345bb09eb03857cf5db2c55ac57e3f76726a7371fd763a4265f02dbda7bcbf03090d3004bc800a5bb42a328ead900ff71609246aaa4a314609e WHIRLPOOL a96a281c6c46b41707cdd2a6dc64cfc5bdb81a830eee681a89f04806cad7cb7c7ff0e8e7f4cf6941210aee1299125936b5235dffeacb6ca4d33d5f991e9e502e
+EBUILD cone-0.92.ebuild 1204 SHA256 282067a882ef666192f0ec8164f951c36fb331561ce89b88ed60214b1788d522 SHA512 36969524dfce8c9db756a4c71ca32ed12d8452d12fc5c0f60a858d104db0b151466929c9508e07c933bfc6f8e9f95a5c20b6545e6d7e09862dab6f07b3ebb354 WHIRLPOOL ae66d2b2b1cd56e8b743486457d46db15de8c17487c092e59619b5ff08adc7dba87932a4943378f216eeef602f782382bfdbd746ee947caf10ced8a071d84b87
+EBUILD cone-0.95.ebuild 1220 SHA256 15c05449181ddc1e86976a84cf012cd117e49e7deba80fb78994284ec9941076 SHA512 b189801319c1c10422ec5dc9334499421a5b346901ae0b4bbf650ed8d1a1061e7768016675c6f095eb4b6f23f00fbc4c4c4d6d33e2ad968f0673d67e13175715 WHIRLPOOL 406884391fa80ad3bbd8e59c3ef7f96dd1ce9d86e847985d08bb9be0c65581ea040c4295ba4028dc56c3532b8e5ffcc5a4ff234f724c33b168283ebfacffab28
+EBUILD cone-0.96.ebuild 1218 SHA256 8757c95d2e814c8405065ede8763abfa3f3ffdcd97dc7fe5c4bb213f9dd98b97 SHA512 107f06c03ce2afc5d006ff0e064dd28b2b7456924018121bd7313a344d306390c7ac479bbef1a3afbdcc98563047172048508bf27ae14455f9f07c216d7787dc WHIRLPOOL 89a497081e5b238f85deaf3dde556ec1dd93967df84fd91295bef3d6b9870527c5f1c32f8b1c6bf0b915711afa4e70f2c5244a0ca168dce302cc335c67ba4925
+MISC ChangeLog 2805 SHA256 8e8bc4871bc3e1234511da76e0853feb74d1b8b00b3a92cadcbd9eca326f55af SHA512 6ee395b802dfb9f9aba3bfcba4f1ea2f142eefa237fcc6d67df33f2616f21073c0bb951daf735d03c9d4a13dd855f5e5f2fc4dfae7a68e44fa0ce966613f525f WHIRLPOOL 0741ff0c568973163b4c74fc8949b6eac894681e2ff9741ab324845a44c93539fc84923ba1ae81ae970055e2b01bb5efbb245a23d0d00cf5d16c8904a369eae3
+MISC ChangeLog-2015 7982 SHA256 06588879ca2d57c264e39a31918adb628f8a8d6e7590ff92ee0c580722b41d86 SHA512 6adf4c91ecd9c04fe483d2750082d701fb5db1807a3c619712dbd8f51b1cf1849bdac59f5c8b72e184bb1717af03dba8ecabf4141f66ee460a5db0b68ed616ec WHIRLPOOL a3f1033cc8572d3a16b6a3de262f964e915c189577af949f69a218b7c62a297f7bbf8ed96638272afb5ca573fce8c978d84486bc7ad262605e1e3fcf22b64d7f
+MISC metadata.xml 321 SHA256 85f462881ce1574cca0cbedf5d7e8cb67b41cfd03b86783368ed6ad2ab43951a SHA512 fd5c4e74049cbed26f1c75602a0e7f1e42654c5e179bd90d311f745ce93eecaec21682d77b3fc560cd8876298893a72df195e1b90a20cda3dc2538622d110b6d WHIRLPOOL e90384442146c3616f110e9135c1a62c5e8db519de65957f5fce99c158dc172f7db2a77acbf8029cc33723724b7a0db9a3e34e7a9f3fab96bf0dd8dee176a179
diff --git a/mail-client/cone/cone-0.92.ebuild b/mail-client/cone/cone-0.92.ebuild
new file mode 100644
index 000000000000..fdedc7525235
--- /dev/null
+++ b/mail-client/cone/cone-0.92.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="CONE: COnsole News reader and Emailer"
+HOMEPAGE="http://www.courier-mta.org/cone/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="crypt fam gnutls idn ipv6 ldap"
+
+RDEPEND=">=dev-libs/openssl-0.9.6:*
+	dev-libs/libxml2
+	sys-libs/ncurses
+	>=net-libs/courier-unicode-1.2
+	app-text/aspell
+	crypt? ( >=app-crypt/gnupg-1.0.4 )
+	fam? ( virtual/fam )
+	gnutls? ( net-libs/gnutls )
+	idn? ( net-dns/libidn )
+	ipv6? ( net-dns/libidn )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	# move local macro to m4 and run eautoreconf
+	mkdir "${S}/m4"
+	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+		m4/sysconftool.m4 || die
+	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-spellcheck=aspell \
+		$(use_with ldap ldapaddressbook) \
+		$(use_with gnutls) \
+		$(use_with idn libidn) \
+		$(use_with ipv6)
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install-configure
+}
diff --git a/mail-client/cone/cone-0.95.ebuild b/mail-client/cone/cone-0.95.ebuild
new file mode 100644
index 000000000000..ab7e7f1c86fa
--- /dev/null
+++ b/mail-client/cone/cone-0.95.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="CONE: COnsole News reader and Emailer"
+HOMEPAGE="http://www.courier-mta.org/cone/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crypt fam gnutls idn ipv6 ldap"
+
+RDEPEND=">=dev-libs/openssl-0.9.6:*
+	dev-libs/libxml2
+	sys-libs/ncurses:=
+	>=net-libs/courier-unicode-1.2
+	app-text/aspell
+	crypt? ( >=app-crypt/gnupg-1.0.4 )
+	fam? ( virtual/fam )
+	gnutls? ( net-libs/gnutls )
+	idn? ( net-dns/libidn )
+	ipv6? ( net-dns/libidn )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	default
+
+	# move local macro to m4 and run eautoreconf
+	mkdir "${S}/m4"
+	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+		m4/sysconftool.m4 || die
+	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-spellcheck=aspell \
+		$(use_with ldap ldapaddressbook) \
+		$(use_with gnutls) \
+		$(use_with idn libidn) \
+		$(use_with ipv6)
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install-configure
+}
diff --git a/mail-client/cone/cone-0.96.ebuild b/mail-client/cone/cone-0.96.ebuild
new file mode 100644
index 000000000000..c88faa34c377
--- /dev/null
+++ b/mail-client/cone/cone-0.96.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="CONE: COnsole News reader and Emailer"
+HOMEPAGE="http://www.courier-mta.org/cone/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crypt fam gnutls idn ipv6 ldap"
+
+RDEPEND=">=dev-libs/openssl-0.9.6:*
+	dev-libs/libxml2
+	sys-libs/ncurses:=
+	>=net-libs/courier-unicode-2
+	app-text/aspell
+	crypt? ( >=app-crypt/gnupg-1.0.4 )
+	fam? ( virtual/fam )
+	gnutls? ( net-libs/gnutls )
+	idn? ( net-dns/libidn )
+	ipv6? ( net-dns/libidn )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	default
+
+	# move local macro to m4 and run eautoreconf
+	mkdir "${S}/m4"
+	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
+		m4/sysconftool.m4 || die
+	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-spellcheck=aspell \
+		$(use_with ldap ldapaddressbook) \
+		$(use_with gnutls) \
+		$(use_with idn libidn) \
+		$(use_with ipv6)
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install-configure
+}
diff --git a/mail-client/cone/metadata.xml b/mail-client/cone/metadata.xml
new file mode 100644
index 000000000000..608a6be4262b
--- /dev/null
+++ b/mail-client/cone/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">courier</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/drac/Manifest b/mail-client/drac/Manifest
new file mode 100644
index 000000000000..be7beb407eff
--- /dev/null
+++ b/mail-client/drac/Manifest
@@ -0,0 +1,7 @@
+AUX drac_rotate 2540 SHA256 d24a580354e6775c9050f6430b7324d99e03c1b45b4aaa314533141f401476e7 SHA512 ea7b36ba661d1e85254cd7125ad33006a4e0c378254a05f2de6e7a2121483d16b499f8ca8025e9b01e836a04ad9fa6a2ce3c8752e256c2d0fa4952e50387dcfc WHIRLPOOL 861235cdae2b577360e1422681b78b6fbbdf6e7fa94c8961681450c03ea684e704d1905eea9f34f106cabfda5be830ad8ab5a454a754159ae6b037d46df8db48
+AUX dracd.rc6 403 SHA256 a5212b328b53b7ef8218427be055dd1bc4ba714405f092ed2d7a8fdfc5722331 SHA512 04011ae461fdfaa751507fd5b59721fcbc5d624c52b6c7007431ae2e331d2ebe9111e75bd2273809ca3e26f1aff438751f994a3b1243ea85045625e45f4a6ed5 WHIRLPOOL cbddcb95d31b6a5dbe3eec4028c96a811dad0cf858707bb40f7862131464dc736e568972351e7f61d0be9c4458a73a05896b03a92bcfd182d1bb895b6e9407c7
+DIST drac.tar.Z 20705 SHA256 2c184de422ae4b347464de5083c38cb8d3ab4d53b6584514c7a5bd67870729db SHA512 09f14c5e72f9ca68b12039c16215d29f7d8e8940046b79dc9bb8f2363188b6fdd253af7ca41e42369ed67d5e4f5d6c20b3d3bf9f27cd194c53a7fc6e619b29fc WHIRLPOOL 74375945b1aed33e95b9b19ba4ba3c992db95f58e071a1f7582dac491fafb78a84ba81513aa66956db0880966469e8462c5ae3b23d3d55c9f9719fbe2e2103fd
+EBUILD drac-1.12-r1.ebuild 1844 SHA256 afc46e9fdf69ac73a402eb1e69dd799a3e244314899b4c9a982cb6c2e7ede331 SHA512 d87f9e5dc6e0b1c09ee5635eedba83b20be6498c3ade6d8468081568ea7362d19df4a210efe48ee38a1fb259b95685eac3e72d0081eeba1f6f0faee629ee56ac WHIRLPOOL 9f639ff713b3a0cba6d02899fe2ecd276c768036c1b7a9a96ed79da5d80130f0c32e27cdf7f706461d5f711707021cf9033e780f6f69554ff85cbac1b2ac65d4
+MISC ChangeLog 2589 SHA256 5a344390bda06f38e5edae64d4b6dcfe42ff53a471b0aa605e39f9a331e2deac SHA512 840d54b0401d4259e52c3082f7ad19442dbd51fe8886362a26ec9055d4c7270cb13babfba623eeff608adc8695616bc3aebee8b86ae52a41b0d916f8f6b5a0b5 WHIRLPOOL 8e0cd76a21d6cb79ad802cc50cc97692b8238b6f4eeee7d515a0c4aa85ed2e754772b637913f6a9c41cb5e3936f7367f411e6b8ad6858d25b16d78cef95dabc2
+MISC ChangeLog-2015 3372 SHA256 dad4a950448f39ac93a79064058b2eabc35bca494fa9f779e44141bbed0e9564 SHA512 54c73a4e53759a9132a3cfe97dcb48f2ec31153a486f12803749f5a206810061cdab72808d633c1baf5e5707fc16cd3313f4eb0d1a6f3723b906cd1ab0d41847 WHIRLPOOL dd6904cdb56b2699fe53f7cc7d5912556d0888240a8406d18f5596c925522fa199c6c4ccbbba29fe3144ef602fbdd88c07d8976c467681cc30c716140d0adb02
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
diff --git a/mail-client/drac/drac-1.12-r1.ebuild b/mail-client/drac/drac-1.12-r1.ebuild
new file mode 100644
index 000000000000..faabd717caab
--- /dev/null
+++ b/mail-client/drac/drac-1.12-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="A robust implementation of POP-before-SMTP"
+HOMEPAGE="http://mail.cc.umanitoba.ca/drac/"
+SRC_URI="ftp://ftp.cc.umanitoba.ca/src/${PN}.tar.Z"
+
+LICENSE="rc"
+SLOT="0"
+KEYWORDS="x86 sparc ppc hppa ~amd64 ppc64"
+IUSE="debug"
+
+DEPEND="virtual/mta
+	>=sys-libs/db-3.2.9
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+	>=net-nds/portmap-5b-r6"
+
+S="${WORKDIR}"
+
+src_compile() {
+	local mysed
+	if use debug ; then
+		mysed="s:^CFLAGS.*:CFLAGS = \$(DEFS) -g ${CFLAGS}:"
+	else
+		mysed="s:^CFLAGS.*:CFLAGS = \$(DEFS) ${CFLAGS}:"
+	fi
+
+	sed -e "s:^INSTALL = .*:INSTALL = /usr/bin/install:" \
+		-e "s:^EBIN = .*:EBIN = /usr/sbin:" \
+		-e "s:^MAN = .*:MAN = /usr/share/man/man:" \
+		-e "s:^DEFS = .*:DEFS = -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C:" \
+		-e "s:^CC = .*:CC = $(tc-getCC):" \
+		-e "s:^LDLIBS = .*:LDLIBS = -ldb:" \
+		-e "s:^TSTLIBS = .*:TSTLIBS = -L. -ldrac:" \
+		-e "s:^RPCGENFLAGS = .*:RPCGENFLAGS = -C -I:" \
+		-e "s:^MANADM = .*:MANADM = 8:" \
+		-e "${mysed}" \
+		-i Makefile || die "sed failed"
+
+	# Parallel build does not work.
+	emake -j1 || die "compile problem"
+}
+
+src_install() {
+	newsbin rpc.dracd dracd
+	dosbin "${FILESDIR}/drac_rotate"
+
+	dolib.a libdrac.a
+
+	newinitd "${FILESDIR}/dracd.rc6" dracd
+
+	dodoc Changes COPYRIGHT INSTALL PORTING README
+	newman rpc.dracd.1m dracd.8
+	doman dracauth.3
+
+	keepdir /var/lib/drac
+	fowners mail:mail /var/lib/drac
+	fperms 750 /var/lib/drac
+}
+
+pkg_postinst() {
+	elog "After configuring your IMAP/POP server for DRAC, and starting the"
+	elog "dracd server (e.g. by running /etc/init.d/dracd start) you can"
+	elog "set up your MTA to check for authenticated hosts in:"
+	elog "   /var/lib/drac/drac"
+	elog "Please see the MTA documentation for more details."
+	echo
+}
diff --git a/mail-client/drac/files/drac_rotate b/mail-client/drac/files/drac_rotate
new file mode 100644
index 000000000000..45cce3a4dc4d
--- /dev/null
+++ b/mail-client/drac/files/drac_rotate
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+usage="[/path/to/real_file.db [/path/to/link_file.db]] [--debug] [--verbose]"
+help="
+A DRAC-enabled MTA performs better by using a seldomly, instead of
+constantly changing, access database.  This script creates a link
+to a snapshotted database which the MTA can use.  It is designed
+to run every minute from cron.  Here is an example cron configuration:
+
+  *  *  *  *  *   $(basename "$0")
+"
+
+for i in $* ; do
+	case "${i}" in
+	  --verbose | -verbose | -v | --debug | -debug | -d)
+		debug=1
+		;;
+	  --usage | -usage | -u )
+		echo "usage: $(basename "$0") ${usage}"
+		exit 1
+		;;
+	  --help | -help | -h)
+		echo "${help}"
+		echo "usage: $(basename "$0") ${usage}"
+		echo
+		exit 1
+		;;
+	  *)
+		args[${#args}]="${i}"
+		;;
+	esac
+done
+			
+debug_print() {
+	if [ -n "${debug}" ] ; then
+		if [ -n "$2" ] ; then
+			echo -n "$1 ... "
+		else
+			echo "$1"
+		fi
+	fi
+}
+
+check_result() {
+	if [ "$?" -ne 0 ] ; then
+		debug_print
+		if [ -n "$1" ] ; then
+			echo "$(basename "$0"): $1, exiting ..."
+		else
+			echo "$(basename "$0"): exiting ..."
+		fi
+		exit 1
+	fi
+}
+
+debug_print "finding current minute" "1"
+min="$(date '+%-M')" && \
+[ -n "${min}" ]
+check_result "can't determine current minute"
+debug_print "success! (${min})"
+
+debug_print "finding drac database file" "1"
+real="${args[0]:-/var/lib/drac/drac.db}" && \
+[ -n "${real}" -a -f "${real}" ]
+check_result "can't find drac database file"
+debug_print "success! (${real})"
+
+debug_print "setting drac link file" "1"
+link="${args[1]:-/var/lib/drac/drac_link.db}" && \
+[ -n "${link}" -a -d "$(dirname "${link}")" ]
+check_result "can't set drac link file"
+debug_print "success! (${link})"
+
+debug_print "finding new drac database" "1"
+new="${real}$(( ${min} % 3 ))" && \
+[ "${new}" != "${real}" ]
+check_result "can't set new drac database"
+debug_print "success! (${new})"
+
+debug_print "finding old drac database" "1"
+old="${real}$(( (${min} + 1) % 3 ))" && \
+[ "${old}" != "${real}" -a "${old}" != "${new}" ]
+check_result "can't set old drac database"
+debug_print "success! (${old})"
+
+debug_print "creating new drac database" "1"
+cp "${real}" "${new}"
+check_result "can't create new drac database"
+debug_print "success! ($(basename "${real}") -> $(basename "${new}"))"
+
+debug_print "linking new drac database" "1"
+ln -sf "${new}" "${link}"
+check_result "can't link new drac database"
+debug_print "success! ($(basename "${new}") -> $(basename "${link}"))"
+
+debug_print "removing old drac database" "1"
+rm -f "${old}"
+check_result "can't remove old drac database"
+debug_print "success! (${old})"
diff --git a/mail-client/drac/files/dracd.rc6 b/mail-client/drac/files/dracd.rc6
new file mode 100644
index 000000000000..fb8e2f109d53
--- /dev/null
+++ b/mail-client/drac/files/dracd.rc6
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net portmap
+}
+
+start() {
+	ebegin "Starting dracd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/dracd \
+		-- -i -e 5 /var/lib/drac/drac.db
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dracd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dracd
+	eend $?
+}
diff --git a/mail-client/drac/metadata.xml b/mail-client/drac/metadata.xml
new file mode 100644
index 000000000000..9a6d80e5da48
--- /dev/null
+++ b/mail-client/drac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/etpan-ng/Manifest b/mail-client/etpan-ng/Manifest
new file mode 100644
index 000000000000..db2959cb9b4c
--- /dev/null
+++ b/mail-client/etpan-ng/Manifest
@@ -0,0 +1,6 @@
+AUX etpan-ng-0.7.1-as-needed.patch 2032 SHA256 b11dcb23a9949db3ef12e991013095ea06d14634e84119bd7b1aa33f79059879 SHA512 5dbbfb54704f3cac4197a243bd90f273bd6417e7c6129394f4d769db7ea4dec97a33e0bcec81101928fca2c1a8b24efb1b65bd4b744836b93a4c6215cf01b664 WHIRLPOOL 6fbb59fab8bb44975b0712d699ec7f9fc4a6a8b8cf4d5381104bf0a8d85cf074b3ee65ede7294275405b867baa578445c9f8e1d9d2e779dd3d4531e2e9c0e6fa
+DIST etpan-ng-0.7.1.tar.gz 364394 SHA256 085b030e6ddebd816600b5fc9ca92eae1b6301e60691cfaf36e38140934d5dc3 SHA512 e56ca50030516a0a35d2471505ce2c2ef94abb8f640a896bac0bc2cdaac65af38f69efd5f52219576df0a50d8bea92716c6dae5f4cf06fbd2a722bf768681493 WHIRLPOOL 70184064cc00c56aae89ef41dfcee0ca1f8007d8ff8c4622dd1b164616be3bf0ae15f194fdf726a464a76943dbb182a5816620579a3aa52e5e9e9ab7da6e18b3
+EBUILD etpan-ng-0.7.1-r1.ebuild 861 SHA256 516e75fb76fae1d7f2b22b14f1db4480b09ddec19b61ee5b9c89435ca8cd0328 SHA512 9eb5658df116ca68e04f0a3ef26d14c34942d2af09b43b3c7c77b1c54c5fe187f829298aeb10b9c121e75bb7096262cbf4a2e28b181710be03c9c718dec1891e WHIRLPOOL 59219b64ff3c32cde294995127e34a986922bf1ea048a3e03c773e2fa5252b34e0c72b0fc6b131bbe8ec3c7a72c91629e74b4889a32e6a8dacd46a824d9bfc48
+MISC ChangeLog 2480 SHA256 815991389d15b017a97bbb5ed6d564468b927b9e631e055623a3df73402a0cb4 SHA512 b0b1c7e62ac813eb2ac5f31d7d92630c7e890220622a5eb3b81805411888bb17ee8bd139c88588ddb8eb43e9e219c1ad3ec9b46312b9c5b517bf389e91f4a4c0 WHIRLPOOL 1a6adb4e37fab62c66932dbf53cef6a2a9bb1d18bd7b5b1e74aec863b97a089bcb99fd61f6066e1ec4035f49d8a4a39bfae26e3d90718c92bba472f9f7af6835
+MISC ChangeLog-2015 2174 SHA256 11fc3c7acbb6a4f14c9c42a35e0c67ed0dcb4991f7676b6cee27277ebd63e67c SHA512 ac61fdaed88db504c7409445845d5110e0838912cfae4e3ac11a3610632720248f35c2d5b24aa2d4ae2fc24f0a667e69adc11458c52151b52e2c4480208d8f29 WHIRLPOOL 0ad70201ff8ff0b98cf44071b1918d95b878b610bf9baabf1840fc73bd976fbfa4d649fbfba1ac81f3612fea4d4135ff4b203cd9e8fa7007f6088d0bdec3e8b4
+MISC metadata.xml 416 SHA256 1b0b61c5a7419b8a4f8b4796443e88fe612663cf06f5a5bc5e89ae3a376c43c8 SHA512 2dfc8c728e2614d743beb01d9b691365803e77baa50f8bb3e5c2a34fb8e2ba8a2e463c772926a17338b515f7b9a4bacc458a27c52fec52198a712a0b5136d1fc WHIRLPOOL acdef8d50f7714b820f9626e41b95017c70b8fac2e70d8da3160371e9faeb45a77655aa421a7899d4cdfac8ce8ff6815f27241d074b3209a2841d0c3bc075a10
diff --git a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..5dfd3fa457d6
--- /dev/null
+++ b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+DESCRIPTION="etPan is a console mail client that is based on libEtPan"
+HOMEPAGE="http://www.etpan.org/other.html"
+SRC_URI="mirror://sourceforge/libetpan/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="debug ldap"
+
+RDEPEND=">=net-libs/libetpan-0.35
+	sys-libs/ncurses
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	eautoreconf
+}
+
+src_compile() {
+	sed -i -e "s:@bindir@:${D}/@bindir@:" src/Makefile.in
+
+	econf \
+		`use_enable debug` \
+			|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc Changelog NEWS README TODO contrib/etpan-make-vtree.pl doc/*
+}
diff --git a/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch b/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
new file mode 100644
index 000000000000..146f25e678fa
--- /dev/null
+++ b/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
@@ -0,0 +1,58 @@
+--- etpan-ng-0.7.1.orig/configure.in	2006-01-09 11:44:20.000000000 +0100
++++ etpan-ng-0.7.1/configure.in	2010-01-10 14:51:40.788046570 +0100
+@@ -11,18 +11,25 @@
+ libetpan_major_required=0
+ libetpan_minor_required=42
+ 
+-debug=no
++AC_MSG_CHECKING(whether debug flag was used)
+ AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
+-debug=yes
+-CFLAGS="$CFLAGS -O2 -W -Wall -g"
+-LDFLAGS="$LDFLAGS",)
++	[enable_debug=$enableval],[enable_debug="no"])
++AC_MSG_RESULT($enable_debug)
++if test "$enable_debug" = "yes"; then
++	CFLAGS="$CFLAGS -O2 -W -Wall -g"
++	LDFLAGS="$LDFLAGS"
++fi
++
+ AC_ARG_ENABLE(optim,   [  --enable-optim          setup flags (gcc) for optimizations (default=no)],
+-if test "x$enable_debug" != "xyes" ; then
+-  CFLAGS="$CFLAGS -O3 -g0"
+-  LDFLAGS="$LDFLAGS -s"
++	[enable_optim=$enableval],[enable_debug="no"])
++if test "$enable_debug" != "yes"; then 
++  if test "$enable_optim" = "yes"; then
++    CFLAGS="$CFLAGS -O3 -g0"
++    LDFLAGS="$LDFLAGS -s"
++  fi
+ else
+   AC_MSG_WARN([enable-optim and enable-debug are incompatible -- disabling optimizations])
+-fi,)
++fi
+ 
+ AC_CONFIG_HEADER(config.h)
+ 
+@@ -67,10 +74,10 @@
+   if test "x$checkpthread" = "xyes"; then
+     AC_MSG_CHECKING([for pthread_create with -$flag])
+     OLDFLAGS="$LDFLAGS"
+-    LDFLAGS="-$flag $LDFLAGS"
++    LDFLAGS="$LDFLAGS -$flag"
+     AC_TRY_LINK([], [pthread_create();], 
+                     [pthflag=yes; checkpthread=no], 
+-                    [pthflag=no; LDFLAGS="$OLDCFLAGS"])
++                    [pthflag=no; LDFLAGS="$OLDFLAGS"])
+     AC_MSG_RESULT($pthflag)
+   fi
+ done
+@@ -127,7 +134,7 @@
+   AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan=yes])
+   if test "x$libetpan" = "xyes"; then
+     AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
+-    LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
++    LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
+     AC_TRY_LINK([], [db_mailstorage_init();], [libetpan=yes], [libetpan=no])
+     AC_MSG_RESULT([$libetpan])
+   fi
diff --git a/mail-client/etpan-ng/metadata.xml b/mail-client/etpan-ng/metadata.xml
new file mode 100644
index 000000000000..3be488010b87
--- /dev/null
+++ b/mail-client/etpan-ng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<longdescription>etPan is a console mail client that is based on libEtPan!</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">libetpan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
new file mode 100644
index 000000000000..ec75b8ec6511
--- /dev/null
+++ b/mail-client/evolution/Manifest
@@ -0,0 +1,9 @@
+DIST evolution-3.22.4.tar.xz 12272488 SHA256 522209f022a468c9031fd393fe4ba6c655dedfa06dd6ae59d2d693d1485c690a SHA512 dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f WHIRLPOOL 6aadef7a735cd351abbcdaacd086641b656ac7d94d78ab278ef0270725f487a5cd0eb6b859530611f41049024e12945368e6616fe2a3afd4481cce6654ee6279
+DIST evolution-3.22.6.tar.xz 12288232 SHA256 9f4be4a1d5ee4d5eb9b132cf751ba3afc833025aa6dc7baa1f9483489d8a943e SHA512 c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f WHIRLPOOL df9fde3db1b6ebf11551d81694a99e07822ab184cc4d14e7d54777eab348de60c5180bd73e0795a3c190509b97f0d948b4e0f4b6d32816e46d967a555746ae98
+DIST evolution-3.24.5.tar.xz 12140736 SHA256 5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189 SHA512 daba1ebd9407219b3abe959b27adb32eb0038a9c1653c360a19cf28f8849004a8cd4a652562d696045311c13d19030f93d3578e09d06fff01534ada28f883f2c WHIRLPOOL e8321a793fd0a34ffaa47a4ce749ac380cd6ad373b7f31ad1823433750922848442a71bfac285684c18cb642216443b7c12f408656ec4707f73bec53118b0ae5
+EBUILD evolution-3.22.4.ebuild 4086 SHA256 85a102147eb692bb22a6abb3c90eb56797db654469508c3c08df7a2c60da5a25 SHA512 6b419b6eba9a57551b889ca94fc18770789a24a7e8aeba1aa6c49186aa656b27d3045f571f05781aada1bcb18dfecaeff557fa28404a0e5380cbf1eb7b03e744 WHIRLPOOL 9d10f3dc8d660d9ca1d3410751e514ee02486ee5d2e8c8e9f8eacfa99381fb9353eb69a90450b04ccc223c90856d8d670b84acf5d7a06092f59d2028d5e06d3a
+EBUILD evolution-3.22.6.ebuild 4069 SHA256 01d180915c37931db8584f17898a4c250afe5bc24e665d8bf927ee0207504f63 SHA512 bf276e7f5c0d6936b5166e739ac7d5b1f3349684cbd940a629baf37b505a78ebbcaa1f79a5eb634db8d903db8e881dcf9f4bd14f94402e3904d3c9f074a6230d WHIRLPOOL 19d4e90cf0c3b1003b323b01731a7fdd963395f96e8946e135b206a46aec5a0a2bad88a4f63418d1a433e6158c4eb90190152ddfc0ee51f04613a5c3b8315631
+EBUILD evolution-3.24.5.ebuild 4374 SHA256 d7328f1fc71c4db913887adf41ee6a7ca3b1ab6271b08f88cf8a4833a1895806 SHA512 18020872e0c355671307098d4dc36b2c800a253cbc51392494f9190fe45c4c5d17e4fdb7ccec4a70d1c04e76b1822d9d4897a02fbc7b33d4784540460012160b WHIRLPOOL ac14cf54d3fd3cb4e96bc3335349f2571d3e5fafdb3a21da864eaa297bcb3f732cd26f2696cb3dd5a2c353446b6f15b8b87d6d24c37e2bc1e756acb43e50e35e
+MISC ChangeLog 8686 SHA256 0ffdce08efb742d29b83767fd554b1f9f6a0941caeff4f00b2d20da822674c4e SHA512 40a9783aa8d6fe1ee7538bc1eef6ee52cb4649bd40212c13726ca4fd757aa30e6d8d1b962c184e18bcf6309ca0e7c68a8e8604b49956e216d45a4c0ac3f2b659 WHIRLPOOL 53b7ccd1542b32cf899d4db1e1cf7b7b23fe24e8a27a10c571e96b36897f38397d208121d39e060280119ad5cfa10432ef91be7245950fbe137eff2bc4772ee2
+MISC ChangeLog-2015 95848 SHA256 48ac7d0e28c6d9967396e841a534156875cbb3a307cfee1a9404119736fbde15 SHA512 43e8c8e466158e7ee2f70b3ffe38a68a964d4e6c2fb94e0f69d1fd6f55f0986cc5ec70c13c73a6958bf4847a805ed075279d5f27a8b8b2648316f4dd19108946 WHIRLPOOL a66f4efa447bee894cbdc9146cca08452db88ca020d1a23e7b2aeec0033f2bbe176d71bc23e0fd33f7717fbcd693b3dfbe89c739eed35564373e7c91eaa4b1be
+MISC metadata.xml 1094 SHA256 2785d57f0bd1f792b974417dce34019cae4b27438dd76bc08cd422e7046686ac SHA512 1c6e41c34d90f2aa592d03fed093ccf694bc125cf988c101b662c114963b5c5c0a95d36906b1b48b3a598fc41e0c7913fa9be525ddecb267427918a25ffc3ea9 WHIRLPOOL 8e2fc456ee6e440d6b7f619f6eb6127a1afec2ae8fee5d68164f3d023f520d71bdafa49b0d90e9d22312db7e049af9dc1e7c4cd127d8773e9e6abe31c39ee634
diff --git a/mail-client/evolution/evolution-3.22.4.ebuild b/mail-client/evolution/evolution-3.22.4.ebuild
new file mode 100644
index 000000000000..bd260f6ac721
--- /dev/null
+++ b/mail-client/evolution/evolution-3.22.4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit 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="+bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# 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
+# gnome-autoar (currently disabled because no release has been made)
+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
+
+	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= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=gnome-base/gnome-common-2.12
+	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)."
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-autoar \
+		--disable-code-coverage \
+		--disable-installed-tests \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable crypt libcryptui) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable geolocation contact-maps) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with bogofilter) \
+		$(use_with ldap openldap) \
+		$(use_with spamassassin) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather)
+}
+
+src_install() {
+	gnome2_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/evolution-3.22.6.ebuild b/mail-client/evolution/evolution-3.22.6.ebuild
new file mode 100644
index 000000000000..a4d426c68304
--- /dev/null
+++ b/mail-client/evolution/evolution-3.22.6.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit 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"
+
+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= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=gnome-base/gnome-common-2.12
+	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)."
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-code-coverage \
+		--disable-installed-tests \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable archive autoar) \
+		$(use_enable crypt libcryptui) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable geolocation contact-maps) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with bogofilter) \
+		$(use_with ldap openldap) \
+		$(use_with spamassassin) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather)
+}
+
+src_install() {
+	gnome2_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/evolution-3.24.5.ebuild b/mail-client/evolution/evolution-3.24.5.ebuild
new file mode 100644
index 000000000000..bc07cd120c04
--- /dev/null
+++ b/mail-client/evolution/evolution-3.24.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2017 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"
+
+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= )
+"
+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)."
+
+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_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/metadata.xml b/mail-client/evolution/metadata.xml
new file mode 100644
index 000000000000..b6c93561db34
--- /dev/null
+++ b/mail-client/evolution/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="archive">Enable archives support in attachments via
+			<pkg>app-arch/gnome-autoar</pkg></flag>
+		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
+		<flag name="crypt">Enable GPG encryption support using
+			<pkg>app-crypt/gnupg</pkg> and <pkg>app-crypt/pinentry</pkg></flag>
+		<flag name="geolocation">Enable support for displaying contacts on a map
+			inside evolution using <pkg>media-libs/libchamplain</pkg></flag>
+		<flag name="highlight">Enable text highlighting
+			plugin</flag>
+		<flag name="ldap">Enable support for fetching contacts from an LDAP or
+			Active Directory server using <pkg>net-nds/openldap</pkg></flag>
+		<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
+			plugin</flag>
+		<flag name="weather">Enable optional weather calendar support</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
new file mode 100644
index 000000000000..4e988803c41d
--- /dev/null
+++ b/mail-client/geary/Manifest
@@ -0,0 +1,8 @@
+AUX geary-0.5.3-vapigen.patch 1210 SHA256 3a7904f5fdbcc8d8e5350820d692205dc955ccce105cacf8e099cb44f43a619f SHA512 16cb96080230390aa645faeae015cb996c6f48822c817b5540e65eea83a40738f18e5690b54140646800e494f1dd58b862708efe9566ef076ae51fb5dba5ac3f WHIRLPOOL 0f5c5c469c4b8708f7265338d2abf3130fb0c962e523da5170c426699fe211647f536e758d75c65c56381a0c70e347c8c524836e896fd4de2cb16fb9eaad2044
+AUX geary-0.6.0-desktopfile.patch 291 SHA256 421e461d09e706a4c1fd0eb77b9a964c9869f6908c15ee4ca5da1384a038025a SHA512 d7454a32822e2b19878bede717e707373646dc87ba5ed2fb0c972607f907b1ae57fecc7803e4eefeed1921fae3733fe73f593b6c0afec46e7da7efe561878b7c WHIRLPOOL 0d62ad643fb39dc744bccbe2f2a9133e2cc0c0675a9bb3a8a78cf1495fe799678a862da7a80eed8f4e68f6596f929556dd2ed2b411f6b1cbf75ef89a2156872d
+AUX geary-0.7.2-cflags.patch 659 SHA256 ddc9c29883b3e3e428f725e3b240ab4b618de96b29e1aed9ba7457048f0a8de3 SHA512 b227930bc9977f126d15f78fcc1ce77bec4b7155e5b6af87af14bf3fb09f7f00c01ad9d860475ac56b1227b554deac0e8da41f3911ff06f1e54c46ae2d740ff7 WHIRLPOOL 1bb0134d12b2382054778e38b6991ae14738f0031d492ea7e527c7912314bcfb014b4600617da950cecb8cc6400568309a8cc3557eec2133010cd91eb33a0273
+DIST geary-0.11.3.tar.xz 964024 SHA256 419e9875c81d00e990aab61d419e64ca925928f046af88362d9029a7ba8c82e4 SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b WHIRLPOOL 3314a7f4b87c5d9e52d9abaefb7b26f1b0713afaadb05f396da92f5dc842745e223f84f1aedad00eafe20e95def6836058175acdb1a5a96d3628f664a29be3ae
+EBUILD geary-0.11.3.ebuild 1892 SHA256 f54f47cd780e88d3fb1da88a61568587b5bca6e7f8e06ccac3e52ca16f8e103f SHA512 3693ccd3b21d527f76f440dc546fab9e04b0e3b444816fa39ff73ae170b6dc6ba127894d4c07998f140cad442a3a54390eaec1220fc3d2aeb356d36d7c768c05 WHIRLPOOL 585878a67b427d2aab5965debf05d556b0da50da8bd6347f12c8a515cd255a8d435b5f41e8762ff3b801ddd17ad501bcc48c90b7ba3cc23d43dff8e9d18b521e
+MISC ChangeLog 5341 SHA256 10cede72cd6a83def8fed929664c0676806bd37138ece61e106def0fac53fe76 SHA512 d7e58442960e212a9f461b8243ed8dfc6a623fe3e2a8c9c5eb926cfc43c3b4a82841b0890758dafcaac1c7f28d6bf9812a0a85c4a8456066be69d1f808dbfc45 WHIRLPOOL 1e0b4a8d239d1b3d4e42b598c87fe1c395e245ff8a8b376c7bd288dcc748e074437a60126b8aee4505062070e754a8dab7d020155c1fd4f02e8d7cf51d9ca3b6
+MISC ChangeLog-2015 6455 SHA256 8e740872017d5286283768d0afc8ff64e8ac4dce5d591d3d88ba70cf5229a223 SHA512 f929234f1af1ac8b744c9dfb532de82a3e2f90f743ae3016073a674329e0074a10f88fbeed8fade41ae5b81f6e1e2f28d6b6e76305b9a25021553563398ace6e WHIRLPOOL e8e6e9513fed8f8b27e93fcba1f51774dc9de0f24983e032d9c66b8e18db72fffd338c6db40e25b46ae61d17da4d824f5d301e7239e1834b39bcc4ce40633815
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch
new file mode 100644
index 000000000000..18b3c8049b4b
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.3-vapigen.patch
@@ -0,0 +1,29 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Feb  2 00:17:18 UTC 2014
+Subject: gentoo specific
+
+--- geary-0.5.1.tar.xz/src/CMakeLists.txt
++++ geary-0.5.1.tar.xz/src/CMakeLists.txt
+@@ -399,12 +399,7 @@
+ include(ValaPrecompile)
+ 
+ # Vapigen
+-find_program(VAPIGEN vapigen)
+-if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
+-    message(FATAL_ERROR "vapigen must be installed to build Geary.")
+-else ()
+-    message(STATUS "Found vapigen: " ${VAPIGEN})
+-endif ()
++set(VAPIGEN $ENV{VAPIGEN})
+ 
+ # Packages
+ if (LIBMESSAGINGMENU_FOUND)
+@@ -615,7 +610,7 @@
+     WORKING_DIRECTORY
+         ${CMAKE_SOURCE_DIR}/bindings/metadata
+     COMMAND
+-        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
++	$ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
+ )
+ 
+ # Geary client app
diff --git a/mail-client/geary/files/geary-0.6.0-desktopfile.patch b/mail-client/geary/files/geary-0.6.0-desktopfile.patch
new file mode 100644
index 000000000000..3ba892f0bb3d
--- /dev/null
+++ b/mail-client/geary/files/geary-0.6.0-desktopfile.patch
@@ -0,0 +1,12 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Mar 23 22:56:46 UTC 2014
+Subject: fix desktop file
+
+--- a/desktop/geary.desktop.in
++++ b/desktop/geary.desktop.in
+@@ -17,5 +17,3 @@
+ [Desktop Action Compose]
+ _Name=Compose Message
+ Exec=geary mailto:
+-OnlyShowIn=X-Messaging Menu;Unity;
+-
diff --git a/mail-client/geary/files/geary-0.7.2-cflags.patch b/mail-client/geary/files/geary-0.7.2-cflags.patch
new file mode 100644
index 000000000000..959ae4b1f34d
--- /dev/null
+++ b/mail-client/geary/files/geary-0.7.2-cflags.patch
@@ -0,0 +1,27 @@
+commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:58 2013 +0200
+
+    respect system CFLAGS
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5202b99..949d494 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -471,16 +471,8 @@ set(CFLAGS
+     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
+     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
+     -DGCR_API_SUBJECT_TO_CHANGE
+-    -g
+ )
+ 
+-if (NOT DEBUG)
+-    set(CFLAGS
+-        ${CFLAGS}
+-        -O2
+-    )    
+-endif ()
+-
+ if (REF_TRACKING)
+     message(STATUS "Reference tracking: ON")
+     set(EXTRA_VALA_OPTIONS
diff --git a/mail-client/geary/geary-0.11.3.ebuild b/mail-client/geary/geary-0.11.3.ebuild
new file mode 100644
index 000000000000..3a15736c9595
--- /dev/null
+++ b/mail-client/geary/geary-0.11.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# Keep cmake-utils at the end
+inherit gnome2 vala cmake-utils
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+DEPEND="
+	>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	dev-libs/glib:2[dbus]
+	>=dev-libs/libgee-0.8.5:0.8=
+	dev-libs/libxml2:2
+	dev-libs/gmime:2.6
+	media-libs/libcanberra
+	>=net-libs/webkit-gtk-1.10.0:3=[introspection]
+	>=x11-libs/gtk+-3.10.0:3[introspection]
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	nls? ( virtual/libintl )
+"
+DEPEND="${DEPEND}
+	app-text/gnome-doc-utils
+	dev-util/desktop-file-utils
+	nls? ( sys-devel/gettext )
+	$(vala_depend)
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751556
+	# https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in
+	# 0.12)
+	eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
+	eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751558
+	eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
+
+	local i
+	if use nls ; then
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in $(cd po ; echo *.po) ; do
+				if ! has ${i%.po} ${LINGUAS} ; then
+					sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
+				fi
+			done
+		fi
+	else
+		sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDESKTOP_UPDATE=OFF
+		-DNO_FATAL_WARNINGS=ON
+		-DGSETTINGS_COMPILE=OFF
+		-DICON_UPDATE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DWITH_UNITY=OFF
+		-DDESKTOP_VALIDATE=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/mail-client/geary/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/hap/Manifest b/mail-client/hap/Manifest
new file mode 100644
index 000000000000..deda70bb0fe7
--- /dev/null
+++ b/mail-client/hap/Manifest
@@ -0,0 +1,6 @@
+AUX hap-3.7-ncurses.patch 499 SHA256 70d9bd2b58cd4e4e6bd08373c558592a7294dd9b429fc0fad7f72350671394a0 SHA512 0993d409e3202fa0bcbd81858f0baf0a56e8044b0ccbb368e2cd4c30c4fb566670557a3983c7fc5b213f5df89b6ef0c6968097339dba4d510de5e28ac56dd35a WHIRLPOOL 8015783f6cfd492c35b6557327a996189dcd46d29d55f8c1d5904653659d77b654e67b1cca356f18e48ed4a7dc495427654f1db71bd61441c7eb920aedbb7e04
+DIST hap-3.7.tar 194560 SHA256 ae2aa6fbc2d95bcdc0a58cb8e51e458eff868241bd6576123bc291a55d8c4de2 SHA512 3a42b8ae5d4c96812190e0551df289ad748c11f93d7632de1698437246723fd159a3f1a0b6f06c925b31ce8e389b73bc0b3a68f978570ae5d9f283d1651fa42b WHIRLPOOL a250c94dde3af898f4df81eef458735a08daf0c33c914abea4fb521c0088164078224322768256cb7ec58e7e7288094ec3770651394dc05dd376aa95de6ce918
+EBUILD hap-3.7-r1.ebuild 844 SHA256 09b0de2b19e26e76c8982d6f93468fc68c0540b6dd487f5d79d6ad12712dd97d SHA512 93ff0b6939b5233687564097bdc804d891e5735c9c58e9355b2f77e0578dbae95548038a7d90574e4512d55f8822ae03d0fdfe881644079d6757a10bfa1f1b4d WHIRLPOOL 00dd774469a76c4955c3ff9d911e7275a483c7cdd58b0a2a48cba589f7453e81418cfe53c1d85d157c3810be67c60f48cc01af5c1ea23db974e0113409e0b9a8
+MISC ChangeLog 2450 SHA256 0874aff905d90bcb79ad9299d6c1b3ddcb7e376cbd362eb2d481dc24186ed996 SHA512 a608fdf1881106a9eadac5e53b601387280e486e644c1e1352346088908bd45e9bae711c81d4971ae40a27484c0db04825f19405deb2ac2408306b1f150bb53d WHIRLPOOL 0b10f5759a2749ca822947be8fadd9b574e261abad13561b089ef381bc13591ddc7a1178267f54382295400d5ff19d7b407e8bda01c1a347043913370f6e0196
+MISC ChangeLog-2015 1877 SHA256 aff0f1b30f46dcd31561191ac8d77c674e12ab787cc0cca5bb22dbcf95b1c72c SHA512 19d78a5fb25949fb53138ccfffe920aebccfa47acf46479de384bdd344797af68e56a5958134de4d287ff0399b25ea4ce872b33526bc4e4053be5c51bf19378e WHIRLPOOL b7fb63f9ed6db992dd9823b236c9727eada833d3735edc7a585823b2e9bd31f59df9b9a3d808775635afa5f0aff25d9c8f1302088e493b9fa25d5b6d0919f9c5
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
diff --git a/mail-client/hap/files/hap-3.7-ncurses.patch b/mail-client/hap/files/hap-3.7-ncurses.patch
new file mode 100644
index 000000000000..1ae79b9e9810
--- /dev/null
+++ b/mail-client/hap/files/hap-3.7-ncurses.patch
@@ -0,0 +1,14 @@
+--- configure.in	1996-07-17 00:50:03.000000000 +0300
++++ configure.in	2013-03-06 15:09:29.579148360 +0200
+@@ -6,8 +6,9 @@
+ AC_PROG_INSTALL
+ 
+ dnl Checks for libraries.
+-dnl Replace `main' with a function in -ltermcap:
+-AC_CHECK_LIB(termcap, tputs)
++dnl Replace `main' with a function in -lncurses or -ltinfo
++AC_CHECK_LIB(ncurses, tputs,,
++    [AC_CHECK_LIB(tinfo, tputs)])
+ 
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(sgtty.h unistd.h libc.h termcap.h strings.h string.h dirent.h sys/ioctl.h)
diff --git a/mail-client/hap/hap-3.7-r1.ebuild b/mail-client/hap/hap-3.7-r1.ebuild
new file mode 100644
index 000000000000..fec815034875
--- /dev/null
+++ b/mail-client/hap/hap-3.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A terminal mail notification program (replacement for biff)"
+HOMEPAGE="http://www.transbay.net/~enf/sw.html"
+SRC_URI="http://www.transbay.net/~enf/${P}.tar"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ppc x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# Fix configure to use ncurses instead of termcap (bug #103105)
+	epatch "${FILESDIR}/${P}-ncurses.patch"
+
+	# Fix Makefile.in to use our CFLAGS and LDFLAGS
+	sed -i -e "s/^CFLAGS=-O/CFLAGS=${CFLAGS}/" \
+		-e "s/^LDFLAGS=.*/LDFLAGS=${LDFLAGS}/" Makefile.in || die
+
+	# Rebuild the compilation framework
+	eautoreconf
+}
+
+src_install() {
+	dobin hap
+	doman hap.1
+	dodoc README HISTORY
+}
diff --git a/mail-client/hap/metadata.xml b/mail-client/hap/metadata.xml
new file mode 100644
index 000000000000..9a6d80e5da48
--- /dev/null
+++ b/mail-client/hap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
new file mode 100644
index 000000000000..76da274c3fd5
--- /dev/null
+++ b/mail-client/kube/Manifest
@@ -0,0 +1,3 @@
+DIST kube-0.3.1.tar.xz 525956 SHA256 ac1058cb702d0ee3b929b9f522cfddd982dc3e36c6d2416078264cbbcf347723 SHA512 d87eb4ece50be3471f3a80e90de9cceb3a51447dbf7f845f36334e3dcc1c78c6a3af5e2dd4a8e459dbf884f7f2f19cd60edc4fbdf85a9b97a231c15c7780230a WHIRLPOOL fff0a9ec5837796f5c7df1c0723b1fb1f445758efbec315ce58f6a328c64748e6b323ff549b4288ab688740a301412751aea22528c2f39337962f5cf9754084b
+EBUILD kube-0.3.1.ebuild 845 SHA256 e61813e8521e04950b9d776bec3646331de2fd689c97e100ad637da1225502ad SHA512 f42e99a2b2f7264a9d1b8ba7264d4e728579e13fece4327932977c658668636e57268a0f0f60b6a3b8acf02dc83c4df195b44f79b7ae4308022ea412b4768af6 WHIRLPOOL 6707d8affb498bbba1cca40151cf9edcedb6c4a6a2b038f85a81613ea732751bdb1a299e52206879e6715e5c4288f2f144f5be7d632d089610caa3727547189e
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/mail-client/kube/kube-0.3.1.ebuild b/mail-client/kube/kube-0.3.1.ebuild
new file mode 100644
index 000000000000..55f2bbf28bbd
--- /dev/null
+++ b/mail-client/kube/kube-0.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+inherit kde5
+
+DESCRIPTION="A mail client by KDE"
+HOMEPAGE="https://kube.kde.org/"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	$(add_frameworks_dep breeze-icons)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kpackage)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwebengine)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
+	dev-libs/kasync
+	>=dev-libs/sink-0.3.0
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
diff --git a/mail-client/kube/metadata.xml b/mail-client/kube/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/mail-client/kube/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
new file mode 100644
index 000000000000..8929f0834216
--- /dev/null
+++ b/mail-client/mail-notification/Manifest
@@ -0,0 +1,9 @@
+AUX mail-notification-5.4-remove-ubuntu-special-case.patch 952 SHA256 6f92890767eca1ff347585c5331e154e799c0eea464458fa0153a6b1624892a1 SHA512 b1e50d55e432fe7b134210e3a890b5b9ce368464ce00e620622368916b716c6f8b9bdaae5bb478194c4f29383d6b099bc404e837d27120cd5d592b9b3478abd3 WHIRLPOOL 6cff46df6c15ec66525bb53b8cd7696f62f24232dcfd3cd664ebfc5a5b11108760cbaf24ea6f693eb8712d8df774236d40a2c1b3e48ac0b9da0765d3071bcc54
+AUX mail-notification-aarch64.patch 49364 SHA256 1276a61769121008f72381c6f6471999270364c8a86f9de3f04457e7f4fda9cc SHA512 fd70e55be488642ccaeaf79304f7c3bd77b07c12c0ae3a72cf609b22198db8c2de16efbfe224b13d742c97b7a9c42cd629630e94e40c292fbdfc7848907fd904 WHIRLPOOL 9eeea2cd58f640c0dd36fbe1b3ed84c5686c3333e247334f5767dfb968167cb4b4acb6b3a4e38ac5de1ce2f417cb5ff127cc08982f4d1ea2bd9169b990cb94a2
+AUX mail-notification-dont-link-against-bsd-compat.patch 477 SHA256 dc92955eb3463f1bae9474846b6ff6c15a124a7dfa0fa1215305efc5d17b404a SHA512 cb8ae9570b8dc83d843bafec6abac07cb78bcb1f2dc9ef7e849b939105707e09fc6346d16a87b3cf07f672ba95c99f1092aa0ee6c531d8ce5a2cb27d74ea0b57 WHIRLPOOL 9d015728142cab429452fefe06cf256f3df13bdee516531ba12940230323ee02ebe3c70dbc0874f779d96eb78abbef91fb3c560fd5dd431dbb779d0f21bb13fb
+AUX mail-notification-jb-gcc-format.patch 668 SHA256 a7646259ca72b58165e4e1c8cf12b197e32807459c4291867479ef3520d39732 SHA512 40bde5e2dbc5e2416bd36aaac2197d135bc2265dc0f24d7ac96ec34326c1a01caad740d88264a04d201d937f0d7590abf943ab5c4915bb0e81e2f484dfbca283 WHIRLPOOL b24a8e30d2cdb11938b942cb1b7ae51b9794be5fec411a6e3247c7b9c54da54299fea0716383e98c226791a758e3c10ccc499c0696a77876c8b886ab66506347
+DIST mail-notification-9ae8768.tar.gz 573948 SHA256 632c0b696f3f3878b497d65d944b1778ea379abcb4536fb6285c0035ae984db3 SHA512 57ddeb63816dd1db1b732dd13fedeb366e1d82f070feb3f9cf854a85a0e66ab2a60a92126fa57cdc338df699e304007dd84593ea1d6185b08c21a018e441629b WHIRLPOOL 3e11a7094bcb62c5384a13671e5bd96c27d230de20c130463520c6ac1b105b86e875dc9feb1b23dafd5579d9576483347a7bad5c18108efe3cccebdb68caaf87
+EBUILD mail-notification-5.4-r10.ebuild 3183 SHA256 588306310dcc1c736797778bfdfd65a788f0dafc1bd1cd895b6efd5911b28140 SHA512 6b79fbd43f53b444e2ded04bb1ae7d8bcf683adb943edbe41849b78f277b2f94c1ab22ebb7f56c589a540b8fcfde69421e481f83733b1e4596fb101b84b4be01 WHIRLPOOL 164b9681558d901153c8e26bd213b8338a41f928c3df2b6ddea8fde1f65eb9e7f56c937fae3d400801bff4ad8ffa33dc3dbf81144ba156f941ddfb4f7f35319b
+MISC ChangeLog 4233 SHA256 a461e90de763edfea8c37548acbb9038377f76f30f80ba12ffb282e4feae32c0 SHA512 e298c915f54529cd6ecddb1fdea1bfcc37ab9fcbf40ca20d4c7838186918eaa1da8e068381b2ac3df6024cc9c974ab7cbac506ed037041c6a28c59121b256c0b WHIRLPOOL 0bd831ead3d2064eb5a35fe298469d17f0367f7489c6ea8a314f19b429b7537201e09b078a9eb377bda674b45601ebc140c47f8a4c37079fd03080b308a7560a
+MISC ChangeLog-2015 24089 SHA256 2ec344402605e2024c2e732165bd82877d8d885846ed0741adaf9aeea29ee042 SHA512 f84eb69f7ee26a45d969a7a421d0581cb5c4e5a6f454a32be6c41cda0ac09f11cd285cb2f7fd0c1e711a80662688c64bcc92e463d806f00c14a604296c5ff95e WHIRLPOOL eba708ee76cba8b3cb84ca22c153c41daf952c239f9d6f8df6354d054888a8793cb620e2830ebc35a987ebe0d24d8539bdc123a8bff74a96f16d5e1556e4ce01
+MISC metadata.xml 566 SHA256 30559d07aa0ffdd86e50914b0fc48a4ba1207318601c57a27f41055dacbd3a9c SHA512 dcaefe0f36ab078b2c26d0b4caace768d44a61305e5d3f8356f404cddfb99de7605addfd79e92dd7f9c235b27e201ea1869599328d26e1ce896b92a9920e7440 WHIRLPOOL 02d28d7e20840890f69618e68e81fab9c0f7274ec5d9ce0312dfc90993c051f716d438f79dbb9219210c8cba45a305c10a91cc0bc38a64f937f5e49ed3db87e7
diff --git a/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch b/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch
new file mode 100644
index 000000000000..b3501c863625
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch
@@ -0,0 +1,33 @@
+--- a/jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
++++ b/jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
+@@ -164,8 +164,6 @@
+ static void
+ gconf_configure (void)
+ {
+-  JBVariable *variable;
+-
+   jb_require_program("gconftool-2");
+ 
+   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
+@@ -178,21 +176,6 @@
+       jb_variable_set_string("gconf-config-source", config_source);
+       g_free(config_source);
+     }
+-
+-  /* fix the default schemas dir on Ubuntu */
+-  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
+-  if (! variable->user_set)
+-    {
+-      static const char *ubuntu_dir = "$datadir/gconf/schemas";
+-      char *expanded;
+-
+-      expanded = jb_variable_expand(ubuntu_dir, NULL);
+-
+-      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
+-	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
+-
+-      g_free(expanded);
+-    }
+ }
+ 
+ static void
diff --git a/mail-client/mail-notification/files/mail-notification-aarch64.patch b/mail-client/mail-notification/files/mail-notification-aarch64.patch
new file mode 100644
index 000000000000..e0957715b4b2
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-aarch64.patch
@@ -0,0 +1,1629 @@
+diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess
+--- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.guess	2012-11-21 12:57:35.000000000 -0600
++++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.guess	2013-03-08 02:14:30.621645440 -0600
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2007-07-22'
++timestamp='2012-09-25'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -27,16 +25,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,7 +54,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -144,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -170,7 +169,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -180,7 +179,7 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -201,6 +200,10 @@
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -223,7 +226,7 @@
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -269,7 +272,10 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+@@ -295,12 +301,12 @@
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -324,14 +330,33 @@
+ 	case `/usr/bin/uname -p` in
+ 	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -375,23 +400,23 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+@@ -461,8 +486,8 @@
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -475,7 +500,7 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+@@ -532,7 +557,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[45])
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -575,52 +600,52 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
++
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -640,7 +665,7 @@
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -711,22 +736,22 @@
+ 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+@@ -750,14 +775,14 @@
+ 	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -769,40 +794,51 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	case ${UNAME_MACHINE} in
+-	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
+ 	    amd64)
+ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     i*:windows32*:*)
+-    	# uname -m includes "-pc" on this system.
+-    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
+ 	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
+-    	case ${UNAME_MACHINE} in
++    *:Interix*:*)
++	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd)
++	    authenticamd | genuineintel | EM64T)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
+ 	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+ 	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -832,20 +868,68 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
+-    arm*:Linux:*:*)
++    aarch64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
++    arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
++	fi
++	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -856,74 +940,33 @@
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    mips:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips
+-	#undef mipsel
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips64
+-	#undef mips64el
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
+-	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
+ 	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+@@ -933,14 +976,17 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -948,78 +994,18 @@
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     vax:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-dec-linux-gnu
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    xtensa:Linux:*:*)
+-    	echo xtensa-unknown-linux-gnu
++    xtensa*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit ;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1027,11 +1013,11 @@
+ 	echo i386-sequent-sysv4
+ 	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit ;;
+     i*86:OS/2:*:*)
+@@ -1048,7 +1034,7 @@
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1063,7 +1049,7 @@
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+@@ -1091,10 +1077,13 @@
+ 	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit ;;
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
++	# Note: whatever this is, it MUST be the same as what config.sub
++	# prints for the "djgpp" host, or else GDB configury will decide that
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit ;;
+@@ -1129,8 +1118,18 @@
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+@@ -1143,7 +1142,7 @@
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+@@ -1163,10 +1162,10 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+@@ -1192,11 +1191,11 @@
+ 	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit ;;
+@@ -1206,6 +1205,12 @@
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+ 	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1233,6 +1238,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1248,7 +1263,10 @@
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1293,13 +1311,13 @@
+ 	echo pdp10-unknown-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+@@ -1314,11 +1332,14 @@
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
+ 	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1336,11 +1357,11 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++	"4"
+ #else
+-	  ""
++	""
+ #endif
+-         ); exit (0);
++	); exit (0);
+ #endif
+ #endif
+ 
+@@ -1474,9 +1495,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -urN epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub
+--- epienbroek-mail-notification-eab5c13/jbsrc/tools/config.sub	2012-11-21 12:57:35.000000000 -0600
++++ epienbroek-mail-notification-eab5c13-aarch64/jbsrc/tools/config.sub	2013-03-08 02:14:30.629644517 -0600
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-#   Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2007-06-28'
++timestamp='2012-10-10'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -32,13 +30,16 @@
+ 
+ 
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,7 +73,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -120,12 +122,18 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+@@ -148,10 +156,13 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze*)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++	-bluegene*)
++		os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -166,10 +177,10 @@
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
++		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+@@ -214,6 +225,12 @@
+ 	-isc*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+@@ -238,24 +255,32 @@
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
++	| epiphany \
+ 	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| le32 | le64 \
++	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore | mep \
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+-	| mips64vr | mips64vrel \
++	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
++	| mips64r5900 | mips64r5900el \
++	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+@@ -268,29 +293,42 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
++	| moxie \
+ 	| mt \
+ 	| msp430 \
++	| nds32 | nds32le | nds32be \
+ 	| nios | nios2 \
+ 	| ns16k | ns32k \
++	| open8 \
+ 	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
++	| rl78 | rx \
+ 	| score \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+-	| spu | strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
+-	| v850 | v850e \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++	| ubicom32 \
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ 	| we32k \
+-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+-	| z8k)
++	| x86 | xc16x | xstormy16 | xtensa \
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
+-		# Motorola 68HC11/12.
++	c54x)
++		basic_machine=tic54x-unknown
++		;;
++	c55x)
++		basic_machine=tic55x-unknown
++		;;
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+@@ -300,6 +338,21 @@
+ 		basic_machine=mt-unknown
+ 		;;
+ 
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++	xgate)
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
++
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+@@ -314,29 +367,37 @@
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
++	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
++	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| le32-* | le64-* \
++	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| microblaze-* | microblazeel-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+-	| mips64vr-* | mips64vrel-* \
++	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
++	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+@@ -351,27 +412,36 @@
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
++	| nds32-* | nds32le-* | nds32be-* \
+ 	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| rl78-* | romp-* | rs6000-* | rx-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile*-* \
+ 	| tron-* \
+-	| v850-* | v850e-* | vax-* \
++	| ubicom32-* \
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++	| vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+-	| xstormy16-* | xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
++	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
++		;;
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -389,7 +459,7 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+-    	abacus)
++	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
+ 	adobe68k)
+@@ -435,6 +505,10 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -443,10 +517,35 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
++	cegcc)
++		basic_machine=arm-unknown
++		os=-cegcc
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -475,7 +574,7 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16)
++	cr16 | cr16-*)
+ 		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+@@ -514,6 +613,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
+ 	djgpp)
+ 		basic_machine=i586-pc
+ 		os=-msdosdjgpp
+@@ -629,7 +732,6 @@
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+@@ -668,6 +770,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -679,6 +789,13 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	microblaze*)
++		basic_machine=microblaze-xilinx
++		;;
++	mingw64)
++		basic_machine=x86_64-pc
++		os=-mingw64
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+@@ -715,10 +832,18 @@
+ 	ms1-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
++	msys)
++		basic_machine=i386-pc
++		os=-msys
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
++	nacl)
++		basic_machine=le32-unknown
++		os=-nacl
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+@@ -783,6 +908,12 @@
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+@@ -813,6 +944,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -857,9 +996,10 @@
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+@@ -953,6 +1093,9 @@
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -1009,17 +1152,9 @@
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
++	tile*)
++		basic_machine=$basic_machine-unknown
++		os=-linux-gnu
+ 		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+@@ -1088,6 +1223,9 @@
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+@@ -1096,6 +1234,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1134,7 +1276,7 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1181,9 +1323,12 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+-        # First match some system type aliases
+-        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++	-auroraux)
++		os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1204,21 +1349,23 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* \
++	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -openbsd* | -solidbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+@@ -1226,7 +1373,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1265,7 +1412,7 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+-        -os400*)
++	-os400*)
+ 		os=-os400
+ 		;;
+ 	-wince*)
+@@ -1314,7 +1461,7 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+-        -tpf*)
++	-tpf*)
+ 		os=-tpf
+ 		;;
+ 	-triton*)
+@@ -1356,6 +1503,11 @@
+ 	-zvmoe)
+ 		os=-zvmoe
+ 		;;
++	-dicos*)
++		os=-dicos
++		;;
++	-nacl*)
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1378,10 +1530,10 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+-        score-*)
++	score-*)
+ 		os=-elf
+ 		;;
+-        spu-*)
++	spu-*)
+ 		os=-elf
+ 		;;
+ 	*-acorn)
+@@ -1393,8 +1545,20 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-        c4x-* | tic4x-*)
+-        	os=-coff
++	c4x-* | tic4x-*)
++		os=-coff
++		;;
++	hexagon-*)
++		os=-elf
++		;;
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+@@ -1414,14 +1578,11 @@
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+-		# This also exists in the configure program, but was not the
+-		# default.
+-		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+-        mep-*)
++	mep-*)
+ 		os=-elf
+ 		;;
+ 	mips*-cisco)
+@@ -1448,7 +1609,7 @@
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+-    	*-knuth)
++	*-knuth)
+ 		os=-mmixware
+ 		;;
+ 	*-wec)
+@@ -1553,7 +1714,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
diff --git a/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch
new file mode 100644
index 000000000000..4f203c0179cd
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch
@@ -0,0 +1,10 @@
+--- a/jbsrc/jb.c.orig	2014-01-19 20:06:48.525462981 +0100
++++ b/jbsrc/jb.c	2014-01-19 20:07:36.087934897 +0100
+@@ -425,7 +425,6 @@
+        */
+       jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+       jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
+-      jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+     }
+ 
+   jb_compile_options_add_string_defines(object->compile_options,
diff --git a/mail-client/mail-notification/files/mail-notification-jb-gcc-format.patch b/mail-client/mail-notification/files/mail-notification-jb-gcc-format.patch
new file mode 100644
index 000000000000..c99b01eda48f
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-jb-gcc-format.patch
@@ -0,0 +1,15 @@
+Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+===================================================================
+--- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c
++++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+@@ -208,6 +208,10 @@ jb_message_result_string_format (const c
+   g_free(message);
+ }
+ 
++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
++static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0)));
++#endif
++
+ static void
+ print_warning_or_error (const char *prefix, const char *format, va_list args)
+ {
diff --git a/mail-client/mail-notification/mail-notification-5.4-r10.ebuild b/mail-client/mail-notification/mail-notification-5.4-r10.ebuild
new file mode 100644
index 000000000000..7e08e2efc540
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r10.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Status icon informing about new mail"
+HOMEPAGE="http://www.nongnu.org/mailnotify/ https://github.com/epienbroek/mail-notification"
+
+GIT_REVISION="9ae8768" # Same as Fedora
+SRC_URI="https://github.com/epienbroek/${PN}/tarball/${GIT_REVISION} -> ${PN}-${GIT_REVISION}.tar.gz"
+S="${WORKDIR}/epienbroek-${PN}-${GIT_REVISION}"
+
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-linux"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="+gnome-keyring libressl sasl ssl sylpheed"
+
+LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv"
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+# gmime is actually optional, but it's used by so much of the package
+# it's pointless making it optional. gnome-keyring is required for
+# several specific access methods, and thus linked to those USE flags
+# instead of adding a keyring USE flag.
+RDEPEND="
+	x11-libs/gtk+:3
+	>=dev-libs/glib-2.14:2
+	>=gnome-base/gconf-2.6
+	>=gnome-base/libgnomeui-2.14
+	dev-libs/dbus-glib
+	dev-libs/gmime:2.6
+	>=x11-libs/libnotify-0.4.1
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	sylpheed? ( mail-client/sylpheed )
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/gob
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35.0
+"
+# this now uses JB (the Jean-Yves Lefort's Build System) as a build system
+# instead of autotools, this is a little helper function that basically does
+# the same thing as use_enable
+use_var() {
+	echo "${2:-$1}=$(usex $1)"
+}
+
+src_prepare() {
+	sed -i	-e '/jb_rule_set_install_message/d' \
+		-e '/jb_rule_add_install_command/d' \
+		jbsrc/jb.c || die
+
+	# Ensure we never append -Werror
+	sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
+
+	# We are not Ubuntu, and this could be the cause of #215281
+	eapply "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
+
+	# Apply Fedora patches
+	# Fix gcc warning
+	eapply "${FILESDIR}/${PN}-jb-gcc-format.patch"
+	# Support aarch64
+	eapply "${FILESDIR}/${PN}-aarch64.patch"
+	# Fix build with latest libc
+	eapply "${FILESDIR}/${PN}-dont-link-against-bsd-compat.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	set -- \
+	./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
+		sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \
+		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
+		scrollkeeper-dir="${EPREFIX}/var/lib/scrollkeeper" \
+		$(use_var gnome-keyring gmail) \
+		$(use_var gnome-keyring imap) \
+		$(use_var gnome-keyring pop3) \
+		$(use_var sasl) \
+		$(use_var ssl) \
+		$(use_var sylpheed)
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	./jb build || die
+}
+
+src_install() {
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die
+	einstalldocs
+	rm -rf "${ED}/var/lib/scrollkeeper"
+
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		use "linguas_${lang}" && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+	done
+}
diff --git a/mail-client/mail-notification/metadata.xml b/mail-client/mail-notification/metadata.xml
new file mode 100644
index 000000000000..7065e3c706b0
--- /dev/null
+++ b/mail-client/mail-notification/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+A GNOME trayicon which checks for email. Supports mbox, MH,
+Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via
+apop, ssl, sasl.
+</longdescription>
+	<use>
+		<flag name="sylpheed">Enable support for MH mailboxes used by
+		<pkg>mail-client/sylpheed</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">epienbroek/mail-notification</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/mailx-support/Manifest b/mail-client/mailx-support/Manifest
new file mode 100644
index 000000000000..488d401e127a
--- /dev/null
+++ b/mail-client/mailx-support/Manifest
@@ -0,0 +1,8 @@
+AUX mailx-support-20060102-add-sys_file_h.patch 397 SHA256 2a9ffe62b22f86417c43ac66cd45f56790079f08c12e62b28328f179f05ff179 SHA512 d2906ca15610090ab93d0f839a0687b67556dccc0cd8dcfe1c5ae52d23c45e74d008376d57d84eaa4272a56f209628819a60108eebaf645cc1c3106ae5a954d6 WHIRLPOOL 03a6e51a09797ec714a4102ab3dd016043968b4f5abfa5c3948b6682bf8747e02625222731952064cfb1c4924d6528e5c9f55224d35c1b4f521dc5a69283fe8b
+AUX mailx-support-20060102-respect-ldflags.patch 537 SHA256 2c7b5c8d4031d836b0ffd38814ec4643cf2c7d330c4142c4fd9ce041b2711eb2 SHA512 cec6b2cf6a3f8b85ebdfcd3bdbbeac9ded468b7f34053ef6473aefd413292d9d7dc350782488481a3ae2db273ad9a7005193acc0e601c5556a2fdd49640dfe1f WHIRLPOOL db8794216190984dedf6eda06e20e321c02a472e5e897bb275c7b9a309ece8248fd285ee92cfcf9351bccfa3aa9fbc35196d221f0ab4bb2a87bb9231827760b0
+DIST mailx-support-20060102.tar.bz2 8822 SHA256 e962d12116a99ab72cc04304cc0f9b86dce2ab84c5028599e052c21930fc4d62 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2 WHIRLPOOL b009fc0405a9610c9ac8cd66024dc237dbc5910f9a7e9b13440a167be8a1bc751d9ce2e318008ca83d6ad5c6d8cd32a1433bb1647ab1f271da5ffe334318331a
+EBUILD mailx-support-20060102-r1.ebuild 839 SHA256 cedee1b3a127b16ef2f7e0b925013ff96e17758d4f0d3df1390b826d8185bad3 SHA512 e4e0749a0e93bb2e43c239ba611fd2f2a394647ef8584c64acde75a0ebaaa9d14c04462f9d828d8c589f5459834d3abd5c45018460cc9e660dc8961b621f4376 WHIRLPOOL fd98777bf908f173c15f797e851435c49b3bcb72d9d6103d7d5fa7ef36e292ed4e9f0f8283f5fbadd05cd4d25e8d7b499575bc68bdc4f68e8312a86c6528069f
+EBUILD mailx-support-20060102-r2.ebuild 875 SHA256 0478f2c86c658714df25410f98c3f2616d7d0a8fa9cdf15cc069893d5d889233 SHA512 fc635527b9fd6fa8e29cd81c3b5c04e16d5f84cc732b4970eb0cb9b49ab33f697dddf10e3d2c15e9967d04b1f2db52d4ef29bd7ada487c0253b03b4cf0390d8b WHIRLPOOL a8077e5639d28ed7a5dc44c7d497cfde011be4d3b107bae0b99b1c143b2c0ce9cb7fc9ba602e966f37c96a05bc6a4b6fa0834c1788b0251bd2ab75445fbadc14
+MISC ChangeLog 2844 SHA256 e764b95526b60763de92286e24fa48fd4775536ecf438968cf13511a5e31a989 SHA512 579154de76e6348aad37b4bf681404a7063c8242cef1feb5d29848b7882ef2600cb28bd459febea4b3ae7685d04145325376492399ece849c0b2f37b43424590 WHIRLPOOL 6d1857a9752bf9792584a60b430f97f43133e559e5b5fb328b33b0e32efa80f02836bff3858e6fb4f0bc71ffd07200f7bce927afd04cee5f29b9440e4f41ac8a
+MISC ChangeLog-2015 5724 SHA256 9b32a5eb285e7c30629041c26b4511b541db47072717032baf9263e1d3f980a0 SHA512 da8bb253b73dec94752b63d934e534c3f46b13288b88094a285e1727c35ecc38b25dd4b64e0fa723764cabda2bd0cebae94c2391e21575c709daf9cb43a16811 WHIRLPOOL cf5738794c82ca224e9ea20802a7f7738ad03ce4310432a7602e394c7334772111ffe268fc123cb90dfb9132b54eaf71b62f1a4575997f162a3ffe92c202a433
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
diff --git a/mail-client/mailx-support/files/mailx-support-20060102-add-sys_file_h.patch b/mail-client/mailx-support/files/mailx-support-20060102-add-sys_file_h.patch
new file mode 100644
index 000000000000..b3b871b43a51
--- /dev/null
+++ b/mail-client/mailx-support/files/mailx-support-20060102-add-sys_file_h.patch
@@ -0,0 +1,9 @@
+diff -Naur mailx-support-20060102.orig/open_with_exlock.c mailx-support-20060102/open_with_exlock.c
+--- mailx-support-20060102.orig/open_with_exlock.c	2003-06-09 19:01:08.000000000 +0000
++++ mailx-support-20060102/open_with_exlock.c	2014-04-01 12:17:31.830213927 +0000
+@@ -1,4 +1,5 @@
+ #include <fcntl.h>
++#include <sys/file.h>
+ 
+ int open_with_exlock(const char *path, int flags, mode_t mode)
+ {
diff --git a/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch b/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch
new file mode 100644
index 000000000000..42aa56948c7a
--- /dev/null
+++ b/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch
@@ -0,0 +1,18 @@
+Index: mailx-support-20060102/Makefile
+===================================================================
+--- mailx-support-20060102.orig/Makefile
++++ mailx-support-20060102/Makefile
+@@ -17,10 +17,10 @@ clean:
+ 	${RM} -f ${PRODUCTS} *.o
+ 
+ mail.local: mail.local.o locking.o open_with_exlock.o
+-	${CC} ${CFLAGS} -o $@ $^
++	${CC} ${LDFLAGS} ${CFLAGS} -o $@ $^
+ 
+ lockspool: lockspool.o locking.o open_with_exlock.o
+-	${CC} ${CFLAGS} -o $@ $^
++	${CC} ${LDFLAGS} ${BINDNOW_FLAGS} ${CFLAGS} -o $@ $^
+ 
+ .c.o:
+ 	${CC} ${CFLAGS} -c -o $@ $^
+
diff --git a/mail-client/mailx-support/mailx-support-20060102-r1.ebuild b/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
new file mode 100644
index 000000000000..66f906bc438c
--- /dev/null
+++ b/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Provides lockspool utility"
+HOMEPAGE="http://www.openbsd.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
+
+	# This code should only be ran with Gentoo Prefix profiles
+	if use prefix; then
+		ebegin "Allowing unprivileged install"
+		sed -i -e "s|-g 0 -o 0||g" Makefile
+		eend $?
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" BINDNOW_FLAGS="" || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+}
diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
new file mode 100644
index 000000000000..af46a2765d7c
--- /dev/null
+++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Provides lockspool utility"
+HOMEPAGE="http://www.openbsd.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
+	epatch "${FILESDIR}"/${P}-add-sys_file_h.patch
+
+	# This code should only be ran with Gentoo Prefix profiles
+	if use prefix; then
+		ebegin "Allowing unprivileged install"
+		sed -i -e "s|-g 0 -o 0||g" Makefile
+		eend $?
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" BINDNOW_FLAGS="" || die "emake failed"
+}
+
+src_install() {
+	emake prefix="${ED}/usr" install
+}
diff --git a/mail-client/mailx-support/metadata.xml b/mail-client/mailx-support/metadata.xml
new file mode 100644
index 000000000000..9a6d80e5da48
--- /dev/null
+++ b/mail-client/mailx-support/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
new file mode 100644
index 000000000000..12bd5e7e0441
--- /dev/null
+++ b/mail-client/mailx/Manifest
@@ -0,0 +1,10 @@
+AUX mailx-8.1.2.20050715-musl.patch 527 SHA256 0513653f67da517efd22859fb58b5a836048773a645a45b906c25325d8cbaa91 SHA512 58896bfdcb7a358dd92fa57e1b67ec79a950a2c852a189bc073e47c2c166a5f4f5b56e77899752e3c670f7605af38a51ed890cb93dbb6dac68eb221528fc6ff4 WHIRLPOOL a3e84a6ab6a54fa112889fd95b7df279df9a476be42716e858c1fe684a297db591daf5b3e59270b7ad671963e241f5c712259dce8bd92c2590025057db693c10
+AUX mailx-8.1.2.20050715-nostrip.patch 668 SHA256 0636586473c198918e8db1d1ebfc006d3312935959532f8c2742b882da5e391e SHA512 abdf016ed925c8f8388eb03cba64a601b2b72e3c53fcdadefa5c220bf7008325f38004d1ed3fe0a938ea82f8a9167352c235ff2536c7b5b100f63ac36f25db2c WHIRLPOOL 768f187dc859bb5409452859f114df6881c32cee1ab98df622db66636bdc9982e63e99d7c1955a114afb3019974b2478ad6502d841ba384434e2c4b439e9618e
+AUX mailx-8.1.2.20050715-offsetof.patch 1566 SHA256 be6bf29554e6f695492e2c9dd3a8e6d6e19a4e375982c7478941c61f992dfe4b SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea WHIRLPOOL 3589532bf8a43f95c6ca3c94338e1227e3462754b748e9333a21ccd3b40ca1785befc770aa84bcd84f343701a5aa63009bf68f8d909fa08012745f7a87c32749
+DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 SHA256 2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe WHIRLPOOL f265880c7b318b4353b182f3e7923315bca5b42d1d1770232cba39d6e92b362acb13c6ca05330c43523ed9c8e55d5602ad71cef579d08f506476c5b107ecaab3
+DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 SHA256 5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3 SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68 WHIRLPOOL d21dcdfa16a8d5ac8a750618b1319688781542d348397b7616d4efef660c2bc25dd0cd923fddadc772dc08a25dabc114179014e659ce3fe6cf4afc1a98fe2048
+EBUILD mailx-8.1.2.20050715-r6.ebuild 1611 SHA256 6f684efce624eb34e9c55f7574705279546ed292b12a4e029e75fae6829f3b4c SHA512 08097bbdade032ffd4ec92527b56ff4aaaaf356e7c6ea990fca3a8210567abf9f5e0c31c46beaf9fb803306fd83642b600a0dc16ef80b4f6bca7ff59eb9cb711 WHIRLPOOL 91ce70fc64b75ccfc1299dba44b8bbac9675666de486aa7ea0011c7226bb34ea994584572ec00c372433df7cc1398532c5cdfada17cfb8d62232fdb3f151909c
+EBUILD mailx-8.1.2.20050715-r7.ebuild 1349 SHA256 ec4dc521bfcfdfaf1d7788e4c218311222c18696fbc054948a63e4ef5e87f765 SHA512 76bdc8b2e5142837f066ba8d3677cadc067f0985de9c76c5609fd2a9961626640131fbb9b0b7faee61bfc09805135f6403ce5a6f51a92652f46cc31d01359e76 WHIRLPOOL d5c0914e12d1793f8382978b1ab48eabe92e1e2bfda1958da3d1a68f18ef95f67a5b6e96581e868e8e990523de1b9693ac76ebc8f036aaf38872fc25c4916a49
+MISC ChangeLog 2949 SHA256 09f1877c32ad1e2f4049ee70d02d032f1c0547d843c77e29cbeaee7f6747b070 SHA512 d089f551b4f3da5ffa49deaff94886f2c6014883ff73f854646872123d79df034b4f334a2dd72e9e0746590a7d4c118c23f11fbb3a3093a2fac6c4d7de9b94ba WHIRLPOOL 9e594d6d4b1015583ac50203b61850a9df39d58e6dbe0aeb78cc3df1cdf1327c9521fd9c7a538f29498d63435768fcf35fce8e350eee3ab443c41bea7ae63d3e
+MISC ChangeLog-2015 13699 SHA256 061248cfdfdfa0f69fd7a6dadb9cd007ac255f6a2f3d4bb0c0675b14a1251b5f SHA512 0043df5e46f84e6966ea857b7907c5379ce91655b2b1da5817b968d44dc19a73e207040828545b23a605d079ed88a12fdbe9016393edf78bf7c9be3a0ae31523 WHIRLPOOL f800840dde05292e625a1c6589e77fe5a1bd9ced9c0053832c5f21ad2d32afee07fbf2608417850e9b67320676f874c75ef5d64c21c0a023a811719b0453d674
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
new file mode 100644
index 000000000000..a2e03ec9753f
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20050715-musl.patch
@@ -0,0 +1,19 @@
+--- a/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
++++ b/mailx-8.1.2-0.20050715cvs.orig/EXT/vis.h
+@@ -70,9 +70,6 @@
+  */
+ #define	UNVIS_END	1	/* no more characters */
+ 
+-#include <sys/cdefs.h>
+-
+-__BEGIN_DECLS
+ char	*vis(char *, int, int, int);
+ int	strvis(char *, const char *, int);
+ int	strnvis(char *, const char *, size_t, int)
+@@ -84,6 +81,4 @@ int	unvis(char *, char, int *, int);
+ ssize_t strnunvis(char *, const char *, size_t)
+ /*		__attribute__ ((__bounded__(__string__,1,3)))*/;
+ 
+-__END_DECLS
+-
+ #endif /* !_VIS_H_ */
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
new file mode 100644
index 000000000000..14a05ba4d6dc
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20050715-nostrip.patch
@@ -0,0 +1,22 @@
+Index: mailx-8.1.2-0.20050715cvs.orig/Makefile
+===================================================================
+--- mailx-8.1.2-0.20050715cvs.orig.orig/Makefile
++++ mailx-8.1.2-0.20050715cvs.orig/Makefile
+@@ -3,16 +3,7 @@
+ PROG=mail
+ CC=gcc
+ 
+-CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT
+-
+-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+-  CFLAGS += -O0
+-else
+-  CFLAGS += -O2
+-endif
+-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+-  LDFLAGS += -s
+-endif
++CFLAGS=-D_BSD_SOURCE -DDEBIAN -g -Wall -IEXT ${EXTRAFLAGS}
+ 
+ SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
+ 	edit.c fio.c getname.c head.c v7.local.c lex.c list.c main.c names.c \
diff --git a/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
new file mode 100644
index 000000000000..7af81285d33c
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20050715-offsetof.patch
@@ -0,0 +1,36 @@
+diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/def.h mailx-8.1.2-0.20050715cvs.orig/def.h
+--- mailx-8.1.2-0.20050715cvs.orig.orig/def.h	2003-10-14 21:50:20.000000000 +0900
++++ mailx-8.1.2-0.20050715cvs.orig/def.h	2010-03-31 10:29:37.000000000 +0900
+@@ -97,7 +97,7 @@
+  * Given a file address, determine the block number it represents.
+  */
+ #define blockof(off)			((int) ((off) / 4096))
+-#define offsetof(off)			((int) ((off) % 4096))
++#define offsetofmailx(off)			((int) ((off) % 4096))
+ #define positionof(block, offset)	((off_t)(block) * 4096 + (offset))
+ 
+ /*
+diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/edit.c mailx-8.1.2-0.20050715cvs.orig/edit.c
+--- mailx-8.1.2-0.20050715cvs.orig.orig/edit.c	2004-05-25 01:34:32.000000000 +0900
++++ mailx-8.1.2-0.20050715cvs.orig/edit.c	2010-03-31 10:41:28.000000000 +0900
+@@ -111,7 +111,7 @@
+ 			(void)fseek(otf, 0L, 2);
+ 			size = ftell(otf);
+ 			mp->m_block = blockof(size);
+-			mp->m_offset = offsetof(size);
++			mp->m_offset = offsetofmailx(size);
+ 			mp->m_size = fsize(fp);
+ 			mp->m_lines = 0;
+ 			mp->m_flag |= MODIFY;
+diff -r -u mailx-8.1.2-0.20050715cvs.orig.orig/fio.c mailx-8.1.2-0.20050715cvs.orig/fio.c
+--- mailx-8.1.2-0.20050715cvs.orig.orig/fio.c	2004-05-25 01:34:32.000000000 +0900
++++ mailx-8.1.2-0.20050715cvs.orig/fio.c	2010-03-31 10:29:28.000000000 +0900
+@@ -139,7 +139,7 @@
+ 			this.m_size = 0;
+ 			this.m_lines = 0;
+ 			this.m_block = blockof(offset);
+-			this.m_offset = offsetof(offset);
++			this.m_offset = offsetofmailx(offset);
+ 			inhead = 1;
+ 		} else if (linebuf[0] == 0) {
+ 			inhead = 0;
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
new file mode 100644
index 000000000000..9c54aeba8a5c
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MX_MAJ_VER=${PV%.*}
+MX_MIN_VER=${PV##*.}
+MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
+S=${WORKDIR}/${PN}-${MY_PV}.orig/
+debian_patch=${PN}_${MY_PV}-1.diff.gz
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
+	mirror://gentoo/${debian_patch}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=net-libs/liblockfile-1.03
+	virtual/mta
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}/${debian_patch}"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
+	epatch "${FILESDIR}/${P}-offsetof.patch"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/bin /bin /usr/share/man/man1 /etc
+
+	insinto /usr/bin
+	insopts -m 755
+	doins mail || die
+
+	doman mail.1
+
+	dosym mail /usr/bin/Mail
+	dosym mail /usr/bin/mailx
+	dosym mail.1 /usr/share/man/man1/Mail.1
+
+	insinto /usr/share/mailx/
+	doins misc/mail.help misc/mail.tildehelp || die
+	insinto /etc
+	insopts -m 644
+	doins misc/mail.rc || die
+
+	# compatibility link
+	dosym /usr/bin/mail /bin/mail || die
+}
+
+pkg_postinst() {
+	elog "mail command now lives in /usr/bin."
+	elog "Please adjust your scripts."
+}
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
new file mode 100644
index 000000000000..073036d05b61
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MX_MAJ_VER=${PV%.*}
+MX_MIN_VER=${PV##*.}
+MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
+S=${WORKDIR}/${PN}-${MY_PV}.orig
+debian_patch=${PN}_${MY_PV}-1.diff.gz
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
+	mirror://gentoo/${debian_patch}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=net-libs/liblockfile-1.03
+	virtual/mta
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
+
+src_prepare() {
+	epatch "${DISTDIR}/${debian_patch}"
+	epatch "${FILESDIR}/${P}-musl.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile || die
+	epatch "${FILESDIR}/${P}-offsetof.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin mail
+
+	doman mail.1
+
+	dosym mail /usr/bin/Mail
+	dosym mail /usr/bin/mailx
+	dosym mail.1 /usr/share/man/man1/Mail.1
+
+	insinto /usr/share/mailx/
+	doins misc/mail.help misc/mail.tildehelp
+	insinto /etc
+	doins misc/mail.rc
+}
diff --git a/mail-client/mailx/metadata.xml b/mail-client/mailx/metadata.xml
new file mode 100644
index 000000000000..9a6d80e5da48
--- /dev/null
+++ b/mail-client/mailx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/metadata.xml b/mail-client/metadata.xml
new file mode 100644
index 000000000000..6256e3267ca1
--- /dev/null
+++ b/mail-client/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The mail-client category contains email clients.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie mail-client enthält Email-Clients.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría mail-client contiene clientes de correo electrónico.
+	</longdescription>
+	<longdescription lang="ja">
+		mail-clientカテゴリーにはメールクライアントが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De mail-client categorie bevat email-clients.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória mail-client obsahuje klientské programy pre elektronickú poštu.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm mail-client chứa các ứng dụng đọc email.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria mail-client contiene client per la posta elettronica.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria mail-client contém clientes de correio eletrônico.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria mail-client zawiera programy pocztowe.
+	</longdescription>
+</catmetadata>
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
new file mode 100644
index 000000000000..3c7abb9183a8
--- /dev/null
+++ b/mail-client/mutt/Manifest
@@ -0,0 +1,14 @@
+AUX Muttrc 667 SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 WHIRLPOOL 91275eb31729bf72bcc29eaa61f72c88f8a75bc5e8bf2220b7d9aaf1eb9211335b1cbc481f906325dc36d30853c94330a8b59b3d4707d269f2c075c2332166bb
+AUX Muttrc.mbox 486 SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 WHIRLPOOL 0bb72d4f1c6d33ececd928dcbbc517be048414beabf2bc488dd3b534633c5b8e30cf3ebe6bc86d76abd84f63657c4fbae05ea61680c4d1b9323ccefaa8b74b89
+DIST mutt-1.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4
+DIST mutt-1.9.0.tar.gz 4191932 SHA256 ec6d7595d3a1f26ae9f565b5ba5ffee94f9b2dc0683b0014684f2dc874f9e2d4 SHA512 d68b256ba73d19e1fa4594c2f30c5e89f6ce98b34701498cb7179f7f70a9bda4f08eb063e476ef01a7ad9d61cfc12c2528fa3605047dab5ffadd98b955de8b03 WHIRLPOOL d38647d3c7afb4cf1f5e1aab2a03fd6ec6812da9580932301e12e68d71fed9b4de1ba60b15ba5dbeddd1306584615d8aeaae859fb6a34dc34c1d335c616ef1b6
+DIST mutt-1.9.1.tar.gz 4193868 SHA256 749b83a96373c6e2101ebe8c4b9a651735e02c478edb750750a5146a15d91bb1 SHA512 1a6871eb8499c60ae18b03d56b81e64de1643c68f8fbe05bbe114085b20098be58175e5bd6d2515e8332a824cbed75640744a261d4f10654c56625f903224095 WHIRLPOOL 8333c27b4271c9536329cef56c4a3e7af039c099f12dae06b269c7c0a99714fe70a33c9868150a7fcdb55bd22d029d434d225fe07a748011fce2a0ef56e81bd8
+DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c
+DIST mutt-gentoo-1.9.0-patches-r3.tar.xz 114568 SHA256 ed0cad43735ea0e952b207806204c4c517fc62974f418ef479fd37203bf4e79d SHA512 9ea5979e54237a9e11cfc8b62119329fdff217f54ec0b75b9ee84d6db891638219855c2408a8a65fae2f8b6c6d19333d009364ced22d2a6de6e93df09bd2ef69 WHIRLPOOL 4b91d264d89501ee271988b91157e10313985d697807af0a8cff442280ef1e52cce3de869f5bd4c724371f322be20c2807b4ea802ffe2d3e4d3e05577977b467
+DIST mutt-gentoo-1.9.1-patches-r0.tar.xz 112300 SHA256 9d3c18ae5602c2e6881faf02eeffd87233589ed85eed99624834858768d3480f SHA512 c8686042e570c9411e7c36a539068a95e9a2d691a7b88226b2ab0875fdcea7aeadbe549858374221ea40844301aa592c244e5fe3aeeeddf8dcf88ecc88129b3a WHIRLPOOL 3665504c548c8439e475b70f672df8db3e56295db94354b6e45f4deab8a7bf23e1933df90a93228d9053bb451df7869e39cb048e8eb310ee06fbb90f950568a5
+EBUILD mutt-1.7.2.ebuild 7597 SHA256 a24a9623b1fc5dc59ca20778380e563199566c82a45de076ee6d131a9d4aad68 SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef WHIRLPOOL b4b743b4f06d7fd951fd29ff4eef6e40bbe0343d4a2db2da37586ddc793444b663a185ba3c059269e5f832c6355695bbc2c653da7a37e655d50f1f92d9b6f566
+EBUILD mutt-1.9.0-r2.ebuild 7396 SHA256 8b5bf8a1e7083229887344423f65a2a7e42965eb135d613b0b13d7b3197ecf69 SHA512 f3461caf42987f63db8e26194788b733aac89c9230c1d02c41058f0af8559367cbacde1adacab01b0bd7ccec6f7eeed24bc781b0a04829426394a9e7aa107135 WHIRLPOOL be768b251612990e4fcc2ac7b280dda0b0ead5e1e934ccec58f40a4a4afaaaadd800238781ad865ba2ab19d0b0353d2966bf2786d22f1fe3bb06bb5da589b7e6
+EBUILD mutt-1.9.1.ebuild 7396 SHA256 6bad26fd13ae5f54ad0a47f6d7d7774ae08628ca97189860d631bd252bc46f5d SHA512 20f24120f070f6d4870c62144bab61ac35b7e39bd18db7f5ebb10ce7858325c755ccdedc16f192abb18655c32fbbad69e09b97953ef3b4e62913eb286bea9088 WHIRLPOOL 5a48c614b77a7d68481f3947337c29fe7704fbb0ab852b7856f50e5944b18ae41c5e63120f06c268dcbfc0a80430d215e443818f4abc0d87a6581af7806876b0
+MISC ChangeLog 13817 SHA256 79ad633f2ac7a70baea9683a9d4bc70b8187b2c6f18885b4f1e89a607208ae0d SHA512 267495d31125195ece5538275cd80eddd6e09033c03adbbb372116e4cdb6241db196e32d8b472e478aa8a4cf5dec20ac44534bd3a9de11c5561305af8021ebc3 WHIRLPOOL 49c82e68f05eab4f90f89b57506dc1c827c39216ed10d11d2a3c20899f685fbe174f51fd95ff419117048b8ff004ba46b2f31a87f0dcb093e3018699cfc81bc4
+MISC ChangeLog-2015 60129 SHA256 ecb2c69a63d7a8269287a90e8a2c17cfa3c9577e0bb08562641b26e8df365848 SHA512 4a1d1508df545f92987f9394ba15c62feca444031543ac1c1c4c1a0e63441dbd6c6d475f8516eb48f3d1f0b6b6ab3f8ae7f5a8e3454f429f6b8c4c1dc7f1d1fd WHIRLPOOL 4758a77eec65fe76a6254e084354a0682f04450fe6d8bb299b715b8057429473437268e7d70bb77217e8ab5f04412d9350cb185630ec2f2ab9560fb6dfadb7de
+MISC metadata.xml 1124 SHA256 8a8290a02318abf1c5cf5a15e92838fac93e60aeebae0f4102b6123ac561718d SHA512 3ad86b12f300334aef5b794f1156a529641c0f65d8cfc15372d396f4b9e696cf770aff002cfcc81d1b749071260b39668ae26fde0a2fc1f07268f1cecd0e66ab WHIRLPOOL ba124ee8a0d600151929c306b925eb4f6c153b3e6a7de5b443dfd2efc4b08778909c4247df1b30d9ad6b950e174514e8521cada6e5bce957044678c681e4f3e2
diff --git a/mail-client/mutt/files/Muttrc b/mail-client/mutt/files/Muttrc
new file mode 100644
index 000000000000..6f0d63e3b527
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc
@@ -0,0 +1,19 @@
+# Some minimal Mutt settings, Gentoo-style.  These reflect the Gentoo
+# predilection for maildir folders.
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
+
+set mbox_type=Maildir
+set folder=~/.maildir
+set spoolfile=~/.maildir/
+set record=~/.maildir-sent/
+set move=no
+
+# Maybe we shouldn't set index_format here, but this is a recommended
+# one for maildir-style folders.
+
+set index_format="%4C %Z %{%b %d} %-16.16L  %s"
diff --git a/mail-client/mutt/files/Muttrc.mbox b/mail-client/mutt/files/Muttrc.mbox
new file mode 100644
index 000000000000..1382a374ea68
--- /dev/null
+++ b/mail-client/mutt/files/Muttrc.mbox
@@ -0,0 +1,9 @@
+# Some minimal Mutt settings, Gentoo-style.  Since mutt was installed
+# with USE=mbox, this file doesn't have any changes from the default
+# mutt settings, making it very minimal indeed...
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
new file mode 100644
index 000000000000..0e7f081573f6
--- /dev/null
+++ b/mail-client/mutt/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grobian@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
+  <use>
+    <flag name="hcache">Enable header cache</flag>
+    <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+    <flag name="pop">Enable support for POP3</flag>
+    <flag name="lmdb">Enable <pkg>dev-db/lmdb</pkg> database backend for
+      header caching</flag>
+    <flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+    <flag name="sidebar">Enable the sidebar feature</flag>
+    <flag name="smime">Enable support for S/MIME</flag>
+    <flag name="smtp">Enable support for smtp</flag>
+    <flag name="tokyocabinet">Enable <pkg>dev-db/tokyocabinet</pkg>
+      database backend for header caching</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mutt</remote-id>
+    <remote-id type="bitbucket">mutt/mutt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild
new file mode 100644
index 000000000000..d56830813aa9
--- /dev/null
+++ b/mail-client/mutt/mutt-1.7.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r1"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+	app-misc/mime-types
+	nls? ( virtual/libintl )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+	!tokyocabinet? (
+		qdbm?  ( dev-db/qdbm )
+		!qdbm? (
+			gdbm?  ( sys-libs/gdbm )
+			!gdbm? ( berkdb? ( >=sys-libs/db-4:= ) )
+		)
+	)
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			ssl? (
+				!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+				libressl? ( dev-libs/libressl:= )
+			)
+		)
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	kerberos? ( virtual/krb5 )
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			ssl? (
+				!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+				libressl? ( dev-libs/libressl:= )
+			)
+		)
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			ssl? (
+				!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+				libressl? ( dev-libs/libressl:= )
+			)
+		)
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?     ( >=app-crypt/gpgme-0.9.0:= )
+	smime?   (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	notmuch? ( net-mail/notmuch:= )
+	slang? ( sys-libs/slang )
+	!slang? ( >=sys-libs/ncurses-5.2:0= )
+"
+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 )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/gentoo-mutt-${PV}-patches
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			einfo "Applying ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable crypt pgp)"
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable imap)"
+		"$(use_enable nls)"
+		"$(use_enable nntp)"
+		"$(use_enable pop)"
+		"$(use_enable sidebar)"
+		"$(use_enable smime)"
+		"$(use_enable smtp)"
+		"$(use_enable notmuch)"
+		"$(use_with idn)"
+		"$(use_with kerberos gss)"
+		"--with-$(use slang && echo slang || echo curses)=${EPREFIX}/usr"
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-nfs-fix"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# arrows in index view do not show when using wchar_t
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	local hcaches=(
+		"tokyocabinet"
+		"qdbm"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	# there's no need for gnutls, ssl or sasl without socket support
+	if use pop || use imap || use smtp ; then
+		if use gnutls; then
+			myconf+=( "--with-gnutls" )
+		elif use ssl; then
+			myconf+=( "--with-ssl" )
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf+=( "$(use_with sasl)" )
+	else
+		myconf+=(
+			"--without-gnutls"
+			"--without-ssl"
+			"--without-sasl"
+		)
+	fi
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		local ver
+		local preconddate=
+		for ver in ${REPLACING_VERSIONS} ; do
+			[[ ${ver} == "1.5"* || ${ver} == "1.6"* ]] && preconddate=true
+		done
+		if [[ -n ${preconddate} ]] ; then
+			echo
+			elog "The SmartTime functionality has been replaced with"
+			elog "CondDate feature.  To mimic SmartTime, use this CondDate formatter:"
+			elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>"
+			echo
+		fi
+	fi
+}
diff --git a/mail-client/mutt/mutt-1.9.0-r2.ebuild b/mail-client/mutt/mutt-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..65775739fc45
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.0-r2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r3"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix"
+REQUIRED_USE="
+	hcache?   ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?     ( ssl )
+	pop?      ( ssl )
+	nntp?     ( ssl )
+	smime?    ( ssl !gnutls )
+	smtp?     ( ssl )
+	sasl?     ( || ( imap pop smtp nntp ) )
+	kerberos? ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+	app-misc/mime-types
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+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 )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Applying ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable crypt pgp)"
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+		"$(use_enable sidebar)"
+		"$(use_enable smime)"
+
+		"$(use_enable imap)"
+		"$(use_enable pop)"
+		"$(use_enable nntp)"
+		"$(use_enable smtp)"
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		"$(use_with idn)"
+		"$(use_with kerberos gss)"
+		"$(use_with sasl)"
+		"$(use slang && echo --with-slang=${EPREFIX}/usr)"
+		"$(use_with !slang curses ${EPREFIX}/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-nfs-fix"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# arrows in index view do not show when using wchar_t
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# REQUIRED_USE should have selected only one of these
+	local hcaches=(
+		"berkdb:bdb"
+		"gdbm"
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		local ver
+		local preconddate=
+		for ver in ${REPLACING_VERSIONS} ; do
+			[[ ${ver} == "1.5"* || ${ver} == "1.6"* ]] && preconddate=true
+		done
+		if [[ -n ${preconddate} ]] ; then
+			echo
+			elog "The SmartTime functionality has been replaced with"
+			elog "CondDate feature.  To mimic SmartTime, use this CondDate formatter:"
+			elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>"
+			echo
+		fi
+	fi
+}
diff --git a/mail-client/mutt/mutt-1.9.1.ebuild b/mail-client/mutt/mutt-1.9.1.ebuild
new file mode 100644
index 000000000000..f7385cf01944
--- /dev/null
+++ b/mail-client/mutt/mutt-1.9.1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla prefix"
+REQUIRED_USE="
+	hcache?   ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?     ( ssl )
+	pop?      ( ssl )
+	nntp?     ( ssl )
+	smime?    ( ssl !gnutls )
+	smtp?     ( ssl )
+	sasl?     ( || ( imap pop smtp nntp ) )
+	kerberos? ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+	app-misc/mime-types
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+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 )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Applying ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		"$(use_enable crypt pgp)"
+		"$(use_enable debug)"
+		"$(use_enable doc)"
+		"$(use_enable gpg gpgme)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+		"$(use_enable sidebar)"
+		"$(use_enable smime)"
+
+		"$(use_enable imap)"
+		"$(use_enable pop)"
+		"$(use_enable nntp)"
+		"$(use_enable smtp)"
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		"$(use_with idn)"
+		"$(use_with kerberos gss)"
+		"$(use_with sasl)"
+		"$(use slang && echo --with-slang=${EPREFIX}/usr)"
+		"$(use_with !slang curses ${EPREFIX}/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-nfs-fix"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# arrows in index view do not show when using wchar_t
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# REQUIRED_USE should have selected only one of these
+	local hcaches=(
+		"berkdb:bdb"
+		"gdbm"
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		local ver
+		local preconddate=
+		for ver in ${REPLACING_VERSIONS} ; do
+			[[ ${ver} == "1.5"* || ${ver} == "1.6"* ]] && preconddate=true
+		done
+		if [[ -n ${preconddate} ]] ; then
+			echo
+			elog "The SmartTime functionality has been replaced with"
+			elog "CondDate feature.  To mimic SmartTime, use this CondDate formatter:"
+			elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>"
+			echo
+		fi
+	fi
+}
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
new file mode 100644
index 000000000000..b77e87f70de5
--- /dev/null
+++ b/mail-client/nail/Manifest
@@ -0,0 +1,9 @@
+AUX nail-12.4-debian.patch 1060 SHA256 57d6259bb0de14e8583fc77dbff4329ac6a9ebcd002fcc38d435d7d94db4efb8 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513 WHIRLPOOL 0f3dbb5d67d73f866087f219542818d77419a85bf3de9a009a4d634e741e7ef71ab9c9b554738155d55d1d10183a57ee2a52257563c7b76f6a332076d4e5b470
+AUX nail-12.4-openssl-1.patch 1860 SHA256 0c3fbb7f23f0000a40addf20d3d41d0a8e62ec8f93172118fa8798eb45dfa2e1 SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca WHIRLPOOL 99b9cb4505d8ce7773087d38f59d4fda4bbba44ca6a98c22b2904cfff2e711c7cbc0066a382bda36b7509ce3996ddcc683864d0b63d9daff1c4233f6da36eff0
+DIST mailx-12.4.tar.bz2 271482 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8 WHIRLPOOL 05884e1fe21b49dfdec298a7ba1e812d471686c744073b766cffb9f5f7bc62573f82ca59a0bd9e6fabc4625dedff97a1401167a1c8fbc92c24b47ce9d56c259e
+EBUILD nail-12.4-r2.ebuild 2370 SHA256 326df11ab083556f415015338201626c300310f0f8ecb67812bac7c7cd003e32 SHA512 026e36fffa7fe7386aa72fe1ad7fb498d37be430ed31937491edaa0b591d8963aa59597a770f0e0c7042bccf2ae9fbb96ea00d3e4143d1d543801e4c01e69dc2 WHIRLPOOL be46c11663fed250149dc881f5dd36751e5574dd1c603df9e59c96391555bb8b29670a3ba57067ec3cd82d1c71cf35fa8e3d82f936ab6b4e12467a12548b056c
+EBUILD nail-12.4-r3.ebuild 2438 SHA256 33b156ba2bf374506592a692f73d19b6fe8b6731eba45b8936e9ac8bd7aaabce SHA512 31cd2c8bab65af9ca5b1fc76e81321fe96e47017d394f4f5d7ff8b74cd94e67ac59449f200f97b77fb0d0ef55b5fd6cd9493cbfa362d9f08fb27c0c6e7212d36 WHIRLPOOL 874c8e716f3753ad53d2c8f7459f9117e8d85fbcfb85c2e1f1887592ecd2a2eb890dad3efcbe9c56d3e277db5e1ecca615d813de037b25794a51200b3a1c794e
+EBUILD nail-12.4.ebuild 2177 SHA256 294f5ffe40bc0b2152182bbd5df80e6622547595d307943988746cc9edd69c91 SHA512 e8697a8be27325b82aa4ff17b80878bbf0ea9bafa2c5bfa473789538efbb397b1e27c2aaa755f9ccddded1e7daef8262e36d7e2ab561ad78b35fa3a438a24762 WHIRLPOOL c94b1062006d0c41ccadb876d75fdfb49e58ae6f453c169adafe20b36728955ac4d526211d31a62c615459c7ec81cd6eed9ec4151033a92398dd7f9de89b531b
+MISC ChangeLog 2842 SHA256 1d5ff48e925524ea05837250619d8172add57b81ffcd0a0ebe02c6ecefdb9aa6 SHA512 92fcbac9b961dc867be4dd208c489ccaca4c4c4106df0b8f9537d643bacfbd792643985f0cfe50a0024974d79acef706ea747c6a92961e5a6362dd41784d2f86 WHIRLPOOL 0397c7bdf84e240020118a59fabbfc64b714feaeedd9d271da6079def7ba12130e3e5e918659a6819f8e868d0b0f42543a14ded5217d5a9084d14c0a899e891c
+MISC ChangeLog-2015 10869 SHA256 b72ca19cb77510a2a75250c2a8d8889db71e6ecea5e6acd9b299ee80f08afddc SHA512 64dc5ee686c2306f57ad838492bb76a7b9083420eb68762fdceb53c74344f2b5448bc923aa718947169fa79518a9570a2ae22be22e636062084153cf2b68ae80 WHIRLPOOL 21e927dd8ff0bd029b12a1bb979079d44aa0b61b19e1606e04bed5c67a39714d61cf68cc6f7b1e0886606a8a9e55a27546456e4a46cda2ecf68ed8100c987f14
+MISC metadata.xml 907 SHA256 09c18a17087d88ad42999dd19618570a44217631cc57daa5282332d04ef5ebac SHA512 7f03613e2f7f8621b996d59a63505882925e755bbc8567a2c3dce3db0304e19ee007df2633fde5232877b71161eb51d037cf205a42b926d36d3aad111a9636d3 WHIRLPOOL 7f6bb80430b5e420c4a8e5d9d2ec8bb20be624e976b358a72f12897ecf20aa1c4c6adb7b00883d666a94d5824f3c885fbfb3daa6b5f09e4553928ed090b2aa79
diff --git a/mail-client/nail/files/nail-12.4-debian.patch b/mail-client/nail/files/nail-12.4-debian.patch
new file mode 100644
index 000000000000..2fea0b190d29
--- /dev/null
+++ b/mail-client/nail/files/nail-12.4-debian.patch
@@ -0,0 +1,56 @@
+--- heirloom-mailx-12.4.orig/getopt.c
++++ heirloom-mailx-12.4/getopt.c
+@@ -43,7 +43,7 @@
+ char	*optarg;
+ int	optind = 1;
+ int	opterr = 1;
+-int	optopt;
++int	optoptc;
+ 
+ static void
+ error(const char *s, int c)
+@@ -69,7 +69,7 @@
+ 		*bp++ = *s++;
+ 	while (*msg)
+ 		*bp++ = *msg++;
+-	*bp++ = optopt;
++	*bp++ = optoptc;
+ 	*bp++ = '\n';
+ 	write(2, buf, bp - buf);
+ 	ac_free(buf);
+@@ -101,13 +101,13 @@
+ 		}
+ 		curp = &argv[optind][1];
+ 	}
+-	optopt = curp[0] & 0377;
++	optoptc = curp[0] & 0377;
+ 	while (optstring[0]) {
+ 		if (optstring[0] == ':') {
+ 			optstring++;
+ 			continue;
+ 		}
+-		if ((optstring[0] & 0377) == optopt) {
++		if ((optstring[0] & 0377) == optoptc) {
+ 			if (optstring[1] == ':') {
+ 				if (curp[1] != '\0') {
+ 					optarg = (char *)&curp[1];
+@@ -127,7 +127,7 @@
+ 					optind++;
+ 				optarg = 0;
+ 			}
+-			return optopt;
++			return optoptc;
+ 		}
+ 		optstring++;
+ 	}
+--- heirloom-mailx-12.4.orig/mailx.1
++++ heirloom-mailx-12.4/mailx.1
+@@ -3766,7 +3766,7 @@
+ .sp
+ .fi
+ which might cause
+-.N mailx
++.B mailx
+ to respond with, for example:
+ .nf
+ .sp
diff --git a/mail-client/nail/files/nail-12.4-openssl-1.patch b/mail-client/nail/files/nail-12.4-openssl-1.patch
new file mode 100644
index 000000000000..376c4d668e36
--- /dev/null
+++ b/mail-client/nail/files/nail-12.4-openssl-1.patch
@@ -0,0 +1,72 @@
+http://bugs.gentoo.org/328363
+http://repos.archlinux.org/wsvn/community/mailx-heirloom/trunk/mailx-heirloom-openssl-1.0.patch
+
+--- openssl.c
++++ openssl.c
+@@ -105,7 +105,7 @@
+ static void ssl_load_verifications(struct sock *sp);
+ static void ssl_certificate(struct sock *sp, const char *uhp);
+ static enum okay ssl_check_host(const char *server, struct sock *sp);
+-static int smime_verify(struct message *m, int n, STACK *chain,
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
+ 		X509_STORE *store);
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+@@ -308,7 +308,7 @@
+ 	X509 *cert;
+ 	X509_NAME *subj;
+ 	char data[256];
+-	/*GENERAL_NAMES*/STACK	*gens;
++	/*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES)	*gens;
+ 	GENERAL_NAME	*gen;
+ 	int	i;
+ 
+@@ -496,7 +496,7 @@
+ }
+ 
+ static int
+-smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
+ {
+ 	struct message	*x;
+ 	char	*cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +505,8 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
+-	STACK	*certs, *gens;
++	STACK_OF(X509)	*certs;
++	STACK_OF(GENERAL_NAMES) *gens;
+ 	X509	*cert;
+ 	X509_NAME	*subj;
+ 	char	data[LINESIZE];
+@@ -614,7 +615,7 @@
+ {
+ 	int	*msgvec = vp, *ip;
+ 	int	ec = 0;
+-	STACK	*chain = NULL;
++	STACK_OF(X509)	*chain = NULL;
+ 	X509_STORE	*store;
+ 	char	*ca_dir, *ca_file;
+ 
+@@ -687,7 +688,7 @@
+ 	X509	*cert;
+ 	PKCS7	*pkcs7;
+ 	BIO	*bb, *yb;
+-	STACK	*certs;
++	STACK_OF(X509)	*certs;
+ 	EVP_CIPHER	*cipher;
+ 
+ 	certfile = expand((char *)certfile);
+@@ -950,9 +951,9 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
+-	STACK	*certs;
++	STACK_OF(X509)	*certs;
+ 	X509	*cert;
+-	STACK	*chain = NULL;
++	STACK_OF(X509)	*chain = NULL;
+ 	enum okay	ok = OKAY;
+ 
+ 	message_number = n;
diff --git a/mail-client/nail/metadata.xml b/mail-client/nail/metadata.xml
new file mode 100644
index 000000000000..c2674f0bafba
--- /dev/null
+++ b/mail-client/nail/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
+  <use>
+    <flag name="net">
+      Enable support for network protocols (POP, IMAP and SMTP). If you
+      only need to send mail with the local Transport Agent, disabling
+      this will get you support for only /usr/sbin/sendmail call.
+    </flag>
+    <flag name="ssl">
+      If network is enabled, this adds support for S/MIME and
+      SSL/TLS-powered protocols through <pkg>dev-libs/openssl</pkg>.
+    </flag>
+    <flag name="kerberos">
+      If network is enabled, this adds support for GSSAPI login on IMAP
+      through <pkg>virtual/krb5</pkg>.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">heirloom</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
new file mode 100644
index 000000000000..ca0cec9d82f5
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ssl net kerberos"
+
+RDEPEND="
+	net? (
+		ssl? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+	)
+	!mail-client/mailx
+	!net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+	sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+	sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	# use -j1 because it will produce bogus output otherwise
+	emake -j1 config.h LIBS || die
+
+	# Logic to 'configure' the package
+
+	if ! use ssl || ! use net ; then
+		undef 'USE_\(OPEN\)\?SSL'
+		droplib -lssl
+	fi
+
+	if ! use kerberos || ! use net ; then
+		undef 'USE_GSSAPI'
+		droplib -lgssapi_krb5
+	fi
+
+	if ! use net ; then
+		undef 'HAVE_SOCKETS'
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
+		MAILSPOOL='/var/spool/mail' \
+		|| die "emake failed"
+}
+
+src_install () {
+	# Use /usr/sbin/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+
+		# Ask for CC: list too.
+		set askcc
+	EOSMTP
+
+	emake DESTDIR="${D}" \
+		UCBINSTALL=$(type -p install) \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+
+	dodoc AUTHORS README || die
+
+	dodir /bin
+	dosym ../usr/bin/mailx /bin/mail || die
+	dosym mailx /usr/bin/mail || die
+	dosym mailx /usr/bin/Mail || die
+
+	dosym mailx.1 /usr/share/man/man1/mail.1 || die
+	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
+}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
new file mode 100644
index 000000000000..5100ada3c923
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="libressl ssl net kerberos"
+
+RDEPEND="
+	net? (
+		ssl? (
+			!libressl? ( dev-libs/openssl:0 )
+			libressl? ( dev-libs/libressl )
+		)
+		kerberos? ( virtual/krb5 )
+	)
+	!mail-client/mailx
+	!net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+	sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+	sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	# use -j1 because it will produce bogus output otherwise
+	emake -j1 config.h LIBS || die
+
+	# Logic to 'configure' the package
+
+	if ! use ssl || ! use net ; then
+		undef 'USE_\(OPEN\)\?SSL'
+		droplib -lssl
+	fi
+
+	if ! use kerberos || ! use net ; then
+		undef 'USE_GSSAPI'
+		droplib -lgssapi_krb5
+	fi
+
+	if ! use net ; then
+		undef 'HAVE_SOCKETS'
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
+		MAILSPOOL='/var/spool/mail' \
+		|| die "emake failed"
+}
+
+src_install () {
+	# Use /usr/sbin/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+
+		# Ask for CC: list too.
+		set askcc
+	EOSMTP
+
+	emake DESTDIR="${D}" \
+		UCBINSTALL=$(type -p install) \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+
+	dodoc AUTHORS README || die
+
+	dodir /bin
+	dosym ../usr/bin/mailx /bin/mail || die
+	dosym mailx /usr/bin/mail || die
+	dosym mailx /usr/bin/Mail || die
+
+	dosym mailx.1 /usr/share/man/man1/mail.1 || die
+	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
+}
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
new file mode 100644
index 000000000000..00e9a0fd8c72
--- /dev/null
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="ssl net kerberos"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	!mail-client/mailx
+	!net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+remove_ssl() {
+	elog "Disabling SSL support"
+	sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
+	sed -i -e 's~-ssl~~' -e 's~-lcrypto~~' LIBS
+}
+
+remove_sockets() {
+	elog "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
+	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
+	# Do not strip the binary
+	sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+	# Build config.h and LIBS, neccesary to tweak the config
+	make config.h LIBS
+
+	# Logic to 'configure' the package
+	if use net && ! use ssl ; then
+		remove_ssl
+	elif ! use net ; then
+		# Linking to ssl without net support is pointless
+		remove_ssl
+		remove_sockets
+	fi
+}
+
+src_compile() {
+	# No configure script to check for and set this
+	tc-export CC
+
+	emake \
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+		MAILSPOOL='/var/spool/mail' \
+		|| die "emake failed"
+}
+
+src_install () {
+	# Use /usr/lib/sendmail by default and provide an example
+	cat <<- EOSMTP >> nail.rc
+
+		# Use the local sendmail (/usr/lib/sendmail) binary by default.
+		# (Uncomment the following line to use a SMTP server)
+		#set smtp=localhost
+	EOSMTP
+
+	make DESTDIR="${D}" \
+		UCBINSTALL=$(type -p install) \
+		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+		|| die
+	dodoc AUTHORS README
+	dodir /bin
+	dosym /usr/bin/mailx /bin/mail
+	dosym /usr/bin/mailx /usr/bin/mail
+	dosym /usr/bin/mailx /usr/bin/Mail
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
new file mode 100644
index 000000000000..6115e555496d
--- /dev/null
+++ b/mail-client/neomutt/Manifest
@@ -0,0 +1,13 @@
+AUX 0001-Rename-mutt-to-neomutt-20170714.patch 17943 SHA256 2b93b080faf8e646ce3bf377ea76551bdd557160e3bebf752336781d79e94901 SHA512 c9fa44781fab530a906707b2cd261720635c076ac67346dd40b8135f691690c540e31391e22b3f29c9a863731a4e2e1a47cdccc8f5625654113168dc3cdd2cfc WHIRLPOOL c360343b345911670c0642505be0c9dfe5f8c79222e9b4666e8703a4cbf9d666559106d955f130bc04bf5bdf0ce878cb6361b7a8361dcb429f73f5f5acae71c1
+AUX 0001-Rename-mutt-to-neomutt-20170912.patch 12034 SHA256 a8d5545c8d032253583d5dab2ac9fbb2a95f614b2c5366a2639c7407176b8f98 SHA512 2c1773b9123041e1eef634c0b479e984f8b4eee615b6f2aff841044a094f785bb6506eb026bb26dd910fa2e89e035b29d9030fb7911d1aa61be4ab6eed4077b4 WHIRLPOOL b91d3102ec71f58fdf487b3f0f78884fd15098587597a844604f354765f20b7b20a60228a5d0f215f54e12aacce9b651036c048775a3b82c359a62480dc74620
+AUX 0001-Rename-mutt-to-neomutt-20171006.patch 752 SHA256 d94edd1e1a3d302e0175f64532f90d033e15a67e0020942819bbbe9923b9b170 SHA512 d6975449dc8405a1dde84665d94b3c5668a979de6082e1ffac539de755a9337a6f9e772d811ab2861b0f6675b27ae1e10aedde512e6a7a234a3af440d0384e4c WHIRLPOOL d7c55f1d9eae5b51f48a049a06bc3610a12f4c6c93a51e568d5a742bf84ade065ee094350f9539f583f48450b5a8f6db8db04fd078cb4016d02f1d73ceab3f05
+AUX Muttrc 667 SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 WHIRLPOOL 91275eb31729bf72bcc29eaa61f72c88f8a75bc5e8bf2220b7d9aaf1eb9211335b1cbc481f906325dc36d30853c94330a8b59b3d4707d269f2c075c2332166bb
+AUX Muttrc.mbox 486 SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 WHIRLPOOL 0bb72d4f1c6d33ececd928dcbbc517be048414beabf2bc488dd3b534633c5b8e30cf3ebe6bc86d76abd84f63657c4fbae05ea61680c4d1b9323ccefaa8b74b89
+DIST neomutt-20170714.tar.gz 2509160 SHA256 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512 eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0 WHIRLPOOL 455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
+DIST neomutt-20170912.tar.gz 2533245 SHA256 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6 WHIRLPOOL 0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
+DIST neomutt-20171006.tar.gz 2706019 SHA256 86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512 adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d WHIRLPOOL 75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
+EBUILD neomutt-20170714.ebuild 2886 SHA256 9c5ff863ac720202d144e49b4d56d279c1156f330c13b3cb4e42dc053fc708ef SHA512 3c39242e27f38cfa7f3a491ea168b23512aa10a01d95c1d84bdb2034e5096d5e8cca5db13c8bf338e2bf39df4e953bd7ddf512d22954c2206186ab0bee3b0b8e WHIRLPOOL 511a7be9e55fde867abe4c294e861f1569d4e13267cceb712b3d3bcaf164a7d9a8d351cc4cc38f49f11439ad7047b5b45eeead3d620b477f73d4d6e4b37cf689
+EBUILD neomutt-20170912.ebuild 2883 SHA256 62f2e3c7bc4adcfe4c1f48b3b1968def7985ede762c30f2b8170df51831cdcc1 SHA512 aabd31f6bb102f174a1f076dae060decc8f01c11afce8d732ff0666d77a746d78ef96480a0f5c42eb0be73e194e07087d23e8bc418d625dad0a6d98627cff1c5 WHIRLPOOL 908a8c3c732c3ccf499e9868b183514443d9a52db2659ae7b520ca945aa5b0fb2a3dec584a69514c1f9d062d68c7bba7d856288e6bd217df5530274093640147
+EBUILD neomutt-20171006.ebuild 2795 SHA256 50e22a6219807aed7c5cc9824bc51e1c39fc8b83d84df42221bd97574f4aee29 SHA512 8d3919c88ff971891c1c49c8a56bea2a802ba07dc556d85779e13f8a6b67bc4788fbcfbcc0fd287c04e952a110ecee9b0d2420fccf79f1735e98834b037fe9e1 WHIRLPOOL a5094c1458ae6f025f0ad8b5798ca35d45a4ca39cb5f2aec00327cb2f6e2ffb335b20f915f8ea71d098f1c7eee1c2fea38f61b1b885d2da785a39b18ba0d6193
+EBUILD neomutt-9999.ebuild 2852 SHA256 4cbafe4b788a717c3ccb9dd80967b15ea5aac05c90d1d50bf55f943285e2c2d7 SHA512 c3266f72a083abed04c9abd05794c9d8c89c1422fdfa51352d8da09657142fa2901d75800157560c217042a408578437b627689711e5310c8084153cb6e34251 WHIRLPOOL 7ae660414d6e5d9736dcd94558c5161a116313ba0ed008d76559cd986bcc031b71ac88b1f2fbd99b39e79d47ac5500a7a067736b87f537385e709046ebcc2235
+MISC metadata.xml 721 SHA256 5122d3087be519e71debbfb6c796335ad7e40bf099b0058379bc63dbfc28ea72 SHA512 2fbf2b5d1b13b0845b2545ba99c0bbc15faa0f000f69dba3c307244c1a6aeb74e2d34ee7052527856335e5d8bf665738d4d8bd0e7e9ca53c28b1d92a851e8747 WHIRLPOOL c6c717387be4bef13c38fd86594966e33c2f10fdbfe899335ecc36f01c7d42fdfc991465da1c6a4ec2de1dd68ad7048e8bf11012d26241c724fd189d3a38ffbc
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
new file mode 100644
index 000000000000..bb01dbf98013
--- /dev/null
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170714.patch
@@ -0,0 +1,436 @@
+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
new file mode 100644
index 000000000000..a8a0c8ad2726
--- /dev/null
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch
@@ -0,0 +1,293 @@
+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/neomutt/files/0001-Rename-mutt-to-neomutt-20171006.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20171006.patch
new file mode 100644
index 000000000000..6b591e329080
--- /dev/null
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20171006.patch
@@ -0,0 +1,25 @@
+From dd318718302850408319e36766329bed29b2c1c1 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
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7a3cfad9..4e2968fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -184,7 +184,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]),
+-- 
+2.13.6
+
diff --git a/mail-client/neomutt/files/Muttrc b/mail-client/neomutt/files/Muttrc
new file mode 100644
index 000000000000..6f0d63e3b527
--- /dev/null
+++ b/mail-client/neomutt/files/Muttrc
@@ -0,0 +1,19 @@
+# Some minimal Mutt settings, Gentoo-style.  These reflect the Gentoo
+# predilection for maildir folders.
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
+
+set mbox_type=Maildir
+set folder=~/.maildir
+set spoolfile=~/.maildir/
+set record=~/.maildir-sent/
+set move=no
+
+# Maybe we shouldn't set index_format here, but this is a recommended
+# one for maildir-style folders.
+
+set index_format="%4C %Z %{%b %d} %-16.16L  %s"
diff --git a/mail-client/neomutt/files/Muttrc.mbox b/mail-client/neomutt/files/Muttrc.mbox
new file mode 100644
index 000000000000..1382a374ea68
--- /dev/null
+++ b/mail-client/neomutt/files/Muttrc.mbox
@@ -0,0 +1,9 @@
+# Some minimal Mutt settings, Gentoo-style.  Since mutt was installed
+# with USE=mbox, this file doesn't have any changes from the default
+# mutt settings, making it very minimal indeed...
+#
+# Please don't add settings to this file to change other user
+# preferences (such as colors), since those can be hard for a user to
+# undo if their preference doesn't match yours!  For example, it is
+# *impossible* currently in mutt to remove color settings from objects
+# other than the index.
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
new file mode 100644
index 000000000000..2a3defe32d49
--- /dev/null
+++ b/mail-client/neomutt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
+	<use>
+		<flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="notmuch">Enable support for <pkg>net-mail/notmuch</pkg></flag>
+		<flag name="smime">Enable support for smime</flag>
+		<flag name="tokyocabinet">Enable tokyocabinet database backend for header
+			caching</flag>
+		<flag name="kyotocabinet">Enable kyotocabinet database backend for header
+			caching</flag>
+		<flag name="lmdb">Enable LMDB backend for header caching</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/neomutt/neomutt-20170714.ebuild b/mail-client/neomutt/neomutt-20170714.ebuild
new file mode 100644
index 000000000000..db298e091290
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20170714.ebuild
@@ -0,0 +1,115 @@
+# 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 +symlink
+	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.
+	rm "${ED}"/etc/${PN}/mime.types || die
+	dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
+
+	## 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/mutt.man > neomutt.1 || die
+		cp doc/neomuttrc.man neomuttrc.5 || die
+		doman neomutt.1 neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT ChangeLog* OPS* README*
+}
diff --git a/mail-client/neomutt/neomutt-20170912.ebuild b/mail-client/neomutt/neomutt-20170912.ebuild
new file mode 100644
index 000000000000..af1e426e2d5b
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20170912.ebuild
@@ -0,0 +1,115 @@
+# 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 +symlink
+	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.
+	rm "${ED}"/etc/${PN}/mime.types || die
+	dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc muttrc.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/mutt.man > neomutt.1 || die
+		cp doc/muttrc.man neomuttrc.5 || die
+		doman neomutt.1 neomuttrc.5
+	fi
+
+	dodoc COPYRIGHT LICENSE* ChangeLog* README*
+}
diff --git a/mail-client/neomutt/neomutt-20171006.ebuild b/mail-client/neomutt/neomutt-20171006.ebuild
new file mode 100644
index 000000000000..1adc070a0981
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20171006.ebuild
@@ -0,0 +1,113 @@
+# 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 +symlink
+	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-9999.ebuild b/mail-client/neomutt/neomutt-9999.ebuild
new file mode 100644
index 000000000000..590236b4e3e5
--- /dev/null
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic git-r3
+
+EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+KEYWORDS=""
+
+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 +symlink
+	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.
+	#rm "${ED}"/etc/${PN}/mime.types || die
+	#dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
+
+	# 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/nmh/Manifest b/mail-client/nmh/Manifest
new file mode 100644
index 000000000000..1a2284e3845b
--- /dev/null
+++ b/mail-client/nmh/Manifest
@@ -0,0 +1,10 @@
+AUX nmh-1.3-db5.patch 568 SHA256 b139def59d1c5371bec1a3b5067698bbb7c320771f66a703c7b8c9eb2f1bdf78 SHA512 512838c9838124f29e5f3bf0f9ea6956d1fb0a231fd4301f78268b36f9d69dcfec2cdf5d798569b191752a654934acd68b8a8fa095385daa2daf127718fdf376 WHIRLPOOL 84b5b3edd09298342ac601584a6459054eb4921c5891671ad189d5e8f3704cdff4133b76eabd8666e2e2d5341771b2e853c0776a09b2f0c90f65a317c343a801
+AUX nmh-1.3-inc-login.patch 602 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf58fc2d194094897ff16f9dd2 SHA512 8554224b102b9a849f8f49d26895153ed96a236a1c93ddeb6241552c4e074a70540cc421a2d4f341fc717eeb973999e3de9888dd62da9c247d3635c14c45ae0e WHIRLPOOL 02364670461307556a0728069c30e087531a9178f52cd0e407bc67d2fd5ad84e0e04c0a4a3b8ac8a21cbdae005ab98c156c29a16befb88a1252318dc9ee1e341
+AUX nmh-1.3-install.patch 482 SHA256 b5f5ba018b71ee02ebc0618df1d1eb47a74214e7ff210975040a4f51619b0cfa SHA512 40f9530cdff47b89e9c186942a2bbb2c302c5a45e98f3f082686ffff21b9f1d0deed7b2406240656289eb9e04d799d21687b0690943481d37ccc6d0024aee179 WHIRLPOOL e4fef2339350665ae55acc660cbef0b51e1dd2f2fb37bfafd97253d9e4c094d12dc50d2b96085276097f09084812b98d0052685dd605bdc978cc7453096d6c39
+AUX nmh-1.3-m_getfld.patch 624 SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5 SHA512 85b088a4c7470d498e9c6ab5c39fb1d7752acf91db3dec77ebe176bae78dce2758752027af7f9024c81b422627559ca18df6dc4ce55a2c31b3df09d3fddf9a47 WHIRLPOOL 79ea44333ba14f4abbf10f9d9cfee5beb05c6d8477964666066b8d7105a52af3e71bbd0e22e2fa2bb7a1eb8914276ece1507e11d570e201f9457319f1e3468de
+AUX nmh-1.3-parallelmake.patch 3121 SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c SHA512 cd84d2dceca9b66ecd50afe5bc08aa48b825b054ac2367bb762d4fe34ab42d1a0d2715f7f9459656874f209dc397d5e12969217154cb2b6c9a55b68354fd9132 WHIRLPOOL cdd1964772244e870a6b40323d8834307af6e0b196516d2a30556e68f2630381ce3bbe9e8f21821e142ca257f69913634f5aba83143c0ede3b4ff496c732fc9d
+DIST nmh-1.3.tar.gz 847614 SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47 SHA512 f7ab227813a7fb1c45cb1c91ca5c020c22be28193152d80d008cf962856138a2fdfe7dc5a9fae5e3702c1a7020b9609826ebffd843241d9b09b7b136d901e77a WHIRLPOOL d38bc6353a288e28b07cdd1df5bd9785f06a0b96607ef3a1cf72c7bded99d9d81da9f9015629927cc033d90a83caec438656df05d2056735e8480915617b8905
+EBUILD nmh-1.3-r4.ebuild 1921 SHA256 57878ce0d11278e7c1ca061d02bad85d728ab2f0eda908d96c65906cace78b53 SHA512 68f69901b22dffb37b53b38666f62d1bb2093f642430652387bec9a24717f37ce10a81ea65578f9e1239fd541a3d5f7ffd3a892988340dc17295c41709614056 WHIRLPOOL 855420481a24f3f5a28b8e63864374ba6b87c0d2a7aab8f92abd9f296c5bfedd20faa2c257fbe67da09ecd322c52913a8aeeb0853e7b06fd2bf6e84e0711d143
+MISC ChangeLog 3074 SHA256 4b641caa747366107d2d62f195a04334d634abb591aa0419f5c8d1db2e38812d SHA512 261be639d0e6e5e0fb6919355f9c7e3486edeb73d2c23fba0e69ef57a5f6195d3781c540fb8a86da9bd06a4384d47b30b3f6d683b0f5c70b0dbfeaf51aba5028 WHIRLPOOL aa1169e089b89ceaf33ae5055c13ceea09341aae5ee90b12ef39108a4bdccdb84b91450e295661f26c98a3923fb269206ff71fbd6e9c08893e95fd92a0a91a6b
+MISC ChangeLog-2015 1473 SHA256 ef22e09da70249ba52ed5c6fd8cbf169654954c519578cc7dc6b89061e80831c SHA512 ce151c46aa512f9ac1afcd7952575ecfe21f32f3cb03f6fc7d54801e7c2e4c1dee563c05d46b9cf4109673c073db53ac74265ff750c9d7d5e5b301b778fc2368 WHIRLPOOL f4899cdd87e7dae7df935eef3b39eba716fc262f193a6d53afa790b2070bdcd5c8cf295f722ac3caab6587c7133262f4a4f037628caace1d9d7a9e65a435311e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/mail-client/nmh/files/nmh-1.3-db5.patch b/mail-client/nmh/files/nmh-1.3-db5.patch
new file mode 100644
index 000000000000..473e2b609aeb
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-db5.patch
@@ -0,0 +1,17 @@
+diff --git a/uip/slocal.c b/uip/slocal.c
+index 9697d84..d38a020 100644
+--- a/uip/slocal.c
++++ b/uip/slocal.c
+@@ -46,6 +46,12 @@
+ extern int  initgroups(char*, int);
+ #endif
+ 
++/* This define is needed for Berkeley db v5 and above to
++ * make the header file expose the 'historical' ndbm APIs.
++ * We define it unconditionally because this is simple and
++ * harmless.
++ */
++#define HAVE_DBM
+ /* This define is needed for Berkeley db v2 and above to
+  * make the header file expose the 'historical' ndbm APIs.
+  * We define it unconditionally because this is simple and
diff --git a/mail-client/nmh/files/nmh-1.3-inc-login.patch b/mail-client/nmh/files/nmh-1.3-inc-login.patch
new file mode 100644
index 000000000000..631a03f3e35a
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-inc-login.patch
@@ -0,0 +1,27 @@
+diff --git a/uip/inc.c b/uip/inc.c
+index cf12ab8..b8384cd 100644
+--- a/uip/inc.c
++++ b/uip/inc.c
+@@ -496,8 +496,7 @@ main (int argc, char **argv)
+      * a POP server?
+      */
+     if (inc_type == INC_POP) {
+-	if (user == NULL)
+-	    user = getusername ();
++
+ 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
+ 	    kpop = 1;
+ 	}
+@@ -506,6 +505,12 @@ main (int argc, char **argv)
+ 	else
+ 	    ruserpass (host, &user, &pass);
+ 
++	/* 
++	 * Do this _after_ ruserpass, otherwise the login field will be unusable
++	 */
++	if (user == NULL)
++	    user = getusername ();
++
+ 	/*
+ 	 * initialize POP connection
+ 	 */
diff --git a/mail-client/nmh/files/nmh-1.3-install.patch b/mail-client/nmh/files/nmh-1.3-install.patch
new file mode 100644
index 000000000000..25dc321fd180
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-install.patch
@@ -0,0 +1,12 @@
+diff --git a/uip/Makefile.in b/uip/Makefile.in
+index b3c6717..5ed34f8 100644
+--- a/uip/Makefile.in
++++ b/uip/Makefile.in
+@@ -267,7 +267,6 @@ install-lcmds:
+ 	rm -f $(DESTDIR)$(bindir)/folders
+ 	rm -f $(DESTDIR)$(bindir)/prev
+ 	rm -f $(DESTDIR)$(bindir)/next
+-	rm -f $(DESTDIR)$(libdir)/install-mh
+ 	$(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
+ 	$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+ 	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
diff --git a/mail-client/nmh/files/nmh-1.3-m_getfld.patch b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
new file mode 100644
index 000000000000..6e0104c3d4c9
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
@@ -0,0 +1,29 @@
+diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
+index caf9519..13c2c3d 100644
+--- a/sbr/m_getfld.c
++++ b/sbr/m_getfld.c
+@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, char *str)
+ 	register char *ep = pat + patln;
+ 	register char pc = *pat++;
+ 
+-	for(;;) {
+-		while (pc != *str++)
+-			if (str > es)
+-				return 0;
++	for(;str <= es; str++) {
++		if (pc != *str)
++			continue;
+ 		if (str > es+1)
+ 			return 0;
+-		sp = str; pp = pat;
++		sp = str+1; pp = pat;
+ 		while (pp < ep && *sp++ == *pp)
+ 			pp++;
+ 		if (pp >= ep) 
+-			return ((unsigned char *)--str);
++			return ((unsigned char *)str);
+ 	}
++	return 0;
+ }
+ 
+ 
diff --git a/mail-client/nmh/files/nmh-1.3-parallelmake.patch b/mail-client/nmh/files/nmh-1.3-parallelmake.patch
new file mode 100644
index 000000000000..1ac2415e9845
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-parallelmake.patch
@@ -0,0 +1,99 @@
+diff --git a/etc/Makefile.in b/etc/Makefile.in
+index f1412b1..9af408d 100644
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -86,13 +86,13 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
+ install: install-bin-files install-etc-files
+ 
+ install-bin-files:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	mkdir -p $(DESTDIR)$(bindir)
+ 	for script in $(GENERATED_BIN_FILES); do \
+ 	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
+ 	done
+ 
+ install-etc-files:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
++	mkdir -p $(DESTDIR)$(etcdir)
+ 	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+ 	for file in $(STATIC_FILES); do \
+ 	  INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
+diff --git a/man/Makefile.in b/man/Makefile.in
+index 2ac26f3..7c613bf 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -130,14 +130,14 @@ install: install-man1 install-man5 install-man8
+ 
+ # install the man pages in man1
+ install-man1:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
++	mkdir -p $(DESTDIR)$(mandir)/man$(manext1)
+ 	for file in $(MAN1); do \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
+ 	done
+ 
+ # install the man pages in man5
+ install-man5:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
++	mkdir -p $(DESTDIR)$(mandir)/man$(manext5)
+ 	for file in $(MAN5); do \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
+ 	done
+@@ -148,7 +148,7 @@ install-man5:
+ 
+ # install the man pages in man8
+ install-man8:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
++	mkdir -p $(DESTDIR)$(mandir)/man$(manext8)
+ 	for file in $(MAN8); do \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
+ 	done
+diff --git a/mts/Makefile.in b/mts/Makefile.in
+index f739e30..f606fef 100644
+--- a/mts/Makefile.in
++++ b/mts/Makefile.in
+@@ -43,7 +43,7 @@ SUBDIRS = smtp
+ 
+ all: all-recursive libmts.a
+ 
+-all-recursive:
++all-recursive $(OBJS):
+ 	for subdir in $(SUBDIRS); do \
+ 	  (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
+ 	done
+diff --git a/uip/Makefile.in b/uip/Makefile.in
+index 5ed34f8..c9239b1 100644
+--- a/uip/Makefile.in
++++ b/uip/Makefile.in
+@@ -256,13 +256,13 @@ install: install-cmds install-misc install-lcmds install-scmds
+ 
+ # install commands
+ install-cmds:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	mkdir -p $(DESTDIR)$(bindir)
+ 	for cmd in $(CMDS); do \
+ 	  $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
+ 	done
+ 
+ # install links
+-install-lcmds:
++install-lcmds: install-cmds
+ 	rm -f $(DESTDIR)$(bindir)/flists
+ 	rm -f $(DESTDIR)$(bindir)/folders
+ 	rm -f $(DESTDIR)$(bindir)/prev
+@@ -274,13 +274,13 @@ install-lcmds:
+ 
+ # install misc support binaries
+ install-misc:
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	mkdir -p $(DESTDIR)$(libdir)
+ 	for misc in $(MISC); do \
+ 	  $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
+ 	done
+ 
+ # install commands with special installation needs (thus no $(SCMDS) use here)
+-install-scmds:
++install-scmds: install-cmds
+ 	if test x$(SETGID_MAIL) != x; then \
+ 	  $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
+ 	else \
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/mail-client/nmh/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/mail-client/nmh/nmh-1.3-r4.ebuild b/mail-client/nmh/nmh-1.3-r4.ebuild
new file mode 100644
index 000000000000..c4260f041840
--- /dev/null
+++ b/mail-client/nmh/nmh-1.3-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="New MH mail reader"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+SRC_URI="https://savannah.nongnu.org/download/nmh/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm"
+
+DEPEND="gdbm? ( sys-libs/gdbm )
+	!gdbm? ( sys-libs/db:= )
+	>=sys-libs/ncurses-5.2:0=
+	net-libs/liblockfile
+	>=app-misc/editor-wrapper-3
+	!!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog DATE MACHINES README )
+
+# Patches from bug #22173.
+# bug #57886
+# bug #319937
+# Allow parallel compiles/installs
+
+PATCHES=( "${FILESDIR}"/${P}-inc-login.patch
+	  "${FILESDIR}"/${P}-install.patch
+	  "${FILESDIR}"/${P}-m_getfld.patch
+	  "${FILESDIR}"/${P}-db5.patch
+	  "${FILESDIR}"/${P}-parallelmake.patch )
+
+src_configure() {
+	# Bug 348816 & Bug 341741: The previous ebuild default of
+	# /usr/bin caused unnecessary conflicts with other
+	# packages. However, the default nmh libdir location causes
+	# problems with cross-compiling, so we use, eg., /usr/lib64.
+	# Users may use /usr/lib/nmh in scripts needing these support
+	# programs in normal environments.
+	local myconf="--libdir=/usr/$(get_libdir)/nmh"
+
+	# Have gdbm use flag actually control which version of db in use
+	if use gdbm; then
+		myconf="${myconf} --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat"
+	else
+		if has_version ">=sys-libs/db-2"; then
+			myconf="${myconf} --with-ndbmheader=db.h --with-ndbm=db"
+		else
+			myconf="${myconf} --with-ndbmheader=db1/ndbm.h --with-ndbm=db1"
+		fi
+	fi
+
+	# use wrapper scripts to avoid implicit dependencies (Bug #294762)
+	EDITOR=/usr/libexec/editor
+	PAGER=/usr/libexec/pager
+
+	econf \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-editor="${EDITOR}" \
+		--with-pager="${PAGER}" \
+		--enable-nmh-pop \
+		--sysconfdir=/etc/nmh \
+		${myconf}
+}
diff --git a/mail-client/novell-groupwise-client/Manifest b/mail-client/novell-groupwise-client/Manifest
new file mode 100644
index 000000000000..e4a374a57df5
--- /dev/null
+++ b/mail-client/novell-groupwise-client/Manifest
@@ -0,0 +1,5 @@
+DIST gw802_hp3_client_linux_multi.tar.gz 209918505 SHA256 f9be044980dd00703aaf2a1b2b93468e526a308cfe91769a61c7079ec3e08f98 SHA512 3a03ac02954f86c2e797404128441bff980f82cdc9936668fb528aef0190240891f92e4094fe53d58a0684ef8e94ebac7c73fbfa262e72bc450fab8ea9872efd WHIRLPOOL a07c30b18f6902521fe07d60b1ead302dc669a19c3d31e1af5acf91185b581924bd2ccfc07216a00ac06e7451aa981ac88958719d59a51b5a9053a445f455ad5
+EBUILD novell-groupwise-client-8.0.2.96933.ebuild 2205 SHA256 64686ff8b5cf15429e17509d76601242fffe6af62ecaa460f98dfc359f538ca8 SHA512 121b147bf3e7836c1ed4491316f6f2cf13b776f7d5805b94d48fa0ee868f73fdc01e1a97e7456cda2720496df8aca33957baa23727cd81fb6a59b152d0fb2f97 WHIRLPOOL dfc52c0172e3f00c11a0eaa8ce65ce3112f1c6fb9f0cc61d4b80758e5474637e1c782bd6ca660710df2182cb046e280a98782855a11b817a71995440de4c501f
+MISC ChangeLog 2239 SHA256 9dc641071f2e4d4302d66bf8adc8f24cb492ca84caad56710ed1ef16a9d868d6 SHA512 076684b0b806f772b47232e2f1dcb6a6a7c2092220a9d85df252813de2cdafbee2a35afacc996f773ac8fd679ec984be1b986fe2fecc300fc2c79104e87374a0 WHIRLPOOL d250764013fad44085cc645bae12a8e237f4cbf2bd146768f2b98193cf92e1a8aa142a76185ab3bdec9f4094c39a850d82210deffa2e983558036814e12b7333
+MISC ChangeLog-2015 1704 SHA256 5e61d51b3509609b8dc0c5b185a929a15ab680735ca7f7bfd494b4c6cb0f0cc6 SHA512 62ddbc0e3753d25f292405457b0b871e1e47238b3363f553f87e979911675b524fa05d9b2f21681a934b0e259c311b695c9db0e25e848ceea1952e545685a4a1 WHIRLPOOL 6a2b43eec0d8c10533033399915b70b0dd6a914ab8b782b66b686dbb0f9ba868668d0b25fc9611265db2e81815a8925478bb22d227ba3ea33a10bc246835ffe9
+MISC metadata.xml 224 SHA256 693019b5f5fced79b70703e682b5d55113bfe12f4ac54e30ba556dba3a99ac82 SHA512 8793a074cebd46dcb7e9813eb09462292ca552d1e457c8ed5b714217f397cd8f95696f1f92d98ac179876bf39574d20ae4fbd9a5a67548f375a89c7dcd2a6309 WHIRLPOOL 38c2eb306f4f507133fcd2d3462221e5b1eceaa00c98cfdbc6c5e3aa9865adc32e2087815efda375abe3592f3212dfd388367645adba4c429e14996ff6984a12
diff --git a/mail-client/novell-groupwise-client/metadata.xml b/mail-client/novell-groupwise-client/metadata.xml
new file mode 100644
index 000000000000..713432f97051
--- /dev/null
+++ b/mail-client/novell-groupwise-client/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
new file mode 100644
index 000000000000..0b039c8f996c
--- /dev/null
+++ b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils rpm multilib versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_P="${P/_p/-}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Novell Groupwise Client for Linux"
+HOMEPAGE="http://www.novell.com/products/groupwise/"
+SRC_URI="gw802_hp3_client_linux_multi.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	sys-libs/libstdc++-v3
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.8[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.3[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.4[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXtst-1.2.2[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.11-r1[abi_x86_32(-)]
+	x11-libs/motif:2.2[abi_x86_32(-)]
+	>=media-libs/alsa-lib-1.0.28[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+"
+
+RESTRICT="binchecks fetch mirror strip"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV} || die
+	cd ${PN}-${MY_PV} || die
+	rpm_unpack ./../gw${MY_PV}_client_linux_multi/${PN}-${MY_PV}.i586.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+	JRE_DIR="${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/java;
+
+	# Undo Sun's funny-business with packed .jar's
+	for i in $JRE_DIR/lib/*.pack; do
+		i_b=`echo $i | sed 's/\.pack$//'`;
+		einfo "Unpacking `basename $i` -> `basename $i_b.jar`";
+		$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";
+	done;
+
+	domenu "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/gwclient.desktop
+
+	mv "${WORKDIR}"/${PN}-${MY_PV}/opt "${D}"/ || die "mv opt failed"
+
+	dodir /opt/bin
+	dosym /opt/novell/groupwise/client/bin/groupwise /opt/bin/groupwise
+}
+
+pkg_nofetch() {
+	einfo "You can obtain an evaluation version of the Groupwise client at"
+	einfo "${HOMEPAGE} - please download ${SRC_URI}"
+	einfo "and place it in ${DISTDIR}. Alternatively request the file"
+	einfo "from the Groupwise server provider of your organization."
+	einfo "Note that the client is useless without a server account."
+}
diff --git a/mail-client/pinepgp/Manifest b/mail-client/pinepgp/Manifest
new file mode 100644
index 000000000000..c58dd94b42b0
--- /dev/null
+++ b/mail-client/pinepgp/Manifest
@@ -0,0 +1,6 @@
+AUX pinepgp-0.18.0-makefile-sed-fix.patch 3349 SHA256 22b60805085efdd6c2a327d4cf3d5deeb6ecd12eaf0c31fae9d449dc5426d42d SHA512 5c2c87ea5ab1e8cc64b7223f5f56d5211d1c024f84ab8ed6ba15d0b221010a080a6843133d0b29e72b15db08028175073fbb7dd883584da87e3a753e362c9b31 WHIRLPOOL f1104d3530f3218f4043f6efcda54a106e076191bdff9cd5885cdb99c9b1bf2a183f966f9335ce9770390a556ead09eeb8137c111737761fe83cc5a590a17ff5
+DIST pinepgp-0.18.0.tar.gz 38103 SHA256 2917ed5734b2c2e70cd8d944537cb0280f7cdfa34fcd64121f41bb4c37c7d6d9 SHA512 b28b71d4d5132b451ff4a2a9489f830cedade300d18ad05a0aa443bffa6fe5ece7be4f166e7428fc999b2d1b550cf8dccf7982314868db8597117d0f8d74686e WHIRLPOOL 88b411b721eeab280c22aa2f2d41f78a14d28511d221be0fa89a50183a202dac66524500fa78e061b9964cc95097929c97559609a9558ea6cb6f98445b4bc9ce
+EBUILD pinepgp-0.18.0-r1.ebuild 593 SHA256 879d15f7c01b7d7bf249d0bbee8344c90391688f83aba25348985826f75a352e SHA512 219ad80e89a959f38f1eef93eeebd3390ed56c62eb957a1cf64b0a25f2f83bd5332afe1badee06a52beaee03ef04b717c494e9b9286084c3816ad2238e3ee90e WHIRLPOOL 8f1ad2acca04712ba9c90f58e1bbafc60b3bdf679060cd7124e2ee7ce4744a54dd10642469462a85ef978568d57f88d77491459ac69c95420d6aff279f2f7c9b
+MISC ChangeLog 2486 SHA256 54f292f012cac1004469adc61b915b0e39389f5cff1c665cd2f173f03af88ff3 SHA512 c28bc22b07aae75aec18754f60ca0d540c952112b56f4a8c67fb78602071ef92cde7a7880315259e57d1deffe25644af7ac1c4f271ba9be2366c51b739be9a11 WHIRLPOOL ee540a477ebfa98fb54ecfb886ea3634190f349642b047b350578e923f273f49468bb65aafb7f8bae69aea0740960356c52c885146f1b41e3e1f0658f1ce2806
+MISC ChangeLog-2015 1982 SHA256 17382b5cf33c1fd07460f9bfc04e4b9cb0b34dea65e547425c1656c317bc909e SHA512 77076752aac8df35006b23aa7943a595095529453e9e45a7a4658a3c1b0c9c6197087a307d28dad09014ff74057287eda6fa5bf1565d57b732b8c82dacae974e WHIRLPOOL c344c89473364e8677757cb6804f53e0ac4349711aa2871660f1078f708cbcb53d4e08f4b8593dd113600390165eff2d15d0f969886e5f7f29bb1be04e5182e4
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357
diff --git a/mail-client/pinepgp/files/pinepgp-0.18.0-makefile-sed-fix.patch b/mail-client/pinepgp/files/pinepgp-0.18.0-makefile-sed-fix.patch
new file mode 100644
index 000000000000..fe9f8d55a0dc
--- /dev/null
+++ b/mail-client/pinepgp/files/pinepgp-0.18.0-makefile-sed-fix.patch
@@ -0,0 +1,87 @@
+diff -Naur pinepgp-0.18.0-orig/Makefile.in pinepgp-0.18.0/Makefile.in
+--- pinepgp-0.18.0-orig/Makefile.in	2002-05-03 15:30:07.000000000 +0200
++++ pinepgp-0.18.0/Makefile.in	2006-11-16 00:30:27.000000000 +0100
+@@ -44,52 +44,52 @@
+ all:	$(SOURCES) $(BUILD_FILTERS)
+ 
+ $(SOURCES):	$(SOURCES:%=%.in)
+-	$(CAT) $(@).in | $(SED) -e 's%\@SED\@%$(SED)%;\
+-		s%\@CAT\@%$(CAT)%;\
+-		s%\@RM\@%$(RM)%;\
+-		s%\@MKTEMP\@%$(MKTEMP)%;\
+-		s%\@BASH\@%$(BASH)%;\
+-		s%\@bindir\@%$(bindir)%;\
+-		s%\@tmpdir\@%$(tmpdir)%' > $(@)
++	$(CAT) $(@).in | $(SED) -e 's%\@SED\@%$(SED)%'\
++		-e 's%\@CAT\@%$(CAT)%'\
++		-e 's%\@RM\@%$(RM)%'\
++		-e 's%\@MKTEMP\@%$(MKTEMP)%'\
++		-e 's%\@BASH\@%$(BASH)%'\
++		-e 's%\@bindir\@%$(bindir)%'\
++		-e 's%\@tmpdir\@%$(tmpdir)%' > $(@)
+ 	chmod 755 $(@)
+ 
+ pinegpg:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename=GnuPG%;\
+-		s%^ces=.*%ces="$(GPG) -at -s"%;\
+-		s%^cee=.*%cee="$(GPG) -at -e"%;\
+-		s%^cese=.*%cese="$(GPG) -at -se"%;\
+-		s%^cec=.*%cec="\$(GPG)"%;\
+-		s%^cefp=.*%cefp=gpg%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename=GnuPG%'\
++		-e 's%^ces=.*%ces="$(GPG) -at -s"%'\
++		-e 's%^cee=.*%cee="$(GPG) -at -e"%'\
++		-e 's%^cese=.*%cese="$(GPG) -at -se"%'\
++		-e 's%^cec=.*%cec="\$(GPG)"%'\
++		-e 's%^cefp=.*%cefp=gpg%' > $(@).c
+ 	$(CPP) -DGPG $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp26x:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 2.6.x"%;\
+-		s%^ces=.*%ces="\$(PGP) -fat -s"%;\
+-		s%^cee=.*%cee="\$(PGP) -fat -e"%;\
+-		s%^cese=.*%cese="\$(PGP) -fat -se"%;\
+-		s%^cec=.*%cec="\$(PGP) -f"%;\
+-		s%^cefp=.*%cefp=pgp26x%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 2.6.x"%'\
++		-e 's%^ces=.*%ces="\$(PGP) -fat -s"%'\
++		-e 's%^cee=.*%cee="\$(PGP) -fat -e"%'\
++		-e 's%^cese=.*%cese="\$(PGP) -fat -se"%'\
++		-e 's%^cec=.*%cec="\$(PGP) -f"%'\
++		-e 's%^cefp=.*%cefp=pgp26x%' > $(@).c
+ 	$(CPP) -DPGP26X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp5x:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 5.x"%;\
+-		s%^ces=.*%ces="$(PGP5S) -fat"%;\
+-		s%^cee=.*%cee="$(PGP5E) -fat"%;\
+-		s%^cese=.*%cese="$(PGP5E) -fat -s"%;\
+-		s%^cec=.*%cec="$(PGP5V) -f"%;\
+-		s%^cefp=.*%cefp=pgp26x%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 5.x"%'\
++		-e 's%^ces=.*%ces="$(PGP5S) -fat"%'\
++		-e 's%^cee=.*%cee="$(PGP5E) -fat"%'\
++		-e 's%^cese=.*%cese="$(PGP5E) -fat -s"%'\
++		-e 's%^cec=.*%cec="$(PGP5V) -f"%'\
++		-e 's%^cefp=.*%cefp=pgp26x%' > $(@).c
+ 	$(CPP) -DPGP5X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp65x:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 6.5.x"%;\
+-		s%^ces=.*%ces="\$(PGP6) -fat -s -u $$USER"%;\
+-		s%^cee=.*%cee="\$(PGP6) -fat -e -u $$USER"%;\
+-		s%^cese=.*%cese="\$(PGP6) -fat -se -u $$USER"%;\
+-		s%^cec=.*%cec="\$(PGP6) -f -u $$USER"%;\
+-		s%^cefp=.*%cefp=pgp65x%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 6.5.x"%'\
++		-e 's%^ces=.*%ces="\$(PGP6) -fat -s -u $$USER"%'\
++		-e 's%^cee=.*%cee="\$(PGP6) -fat -e -u $$USER"%'\
++		-e 's%^cese=.*%cese="\$(PGP6) -fat -se -u $$USER"%'\
++		-e 's%^cec=.*%cec="\$(PGP6) -f -u $$USER"%'\
++		-e 's%^cefp=.*%cefp=pgp65x%' > $(@).c
+ 	$(CPP) -DPGP65X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
diff --git a/mail-client/pinepgp/metadata.xml b/mail-client/pinepgp/metadata.xml
new file mode 100644
index 000000000000..9a6d80e5da48
--- /dev/null
+++ b/mail-client/pinepgp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
+</pkgmetadata>
diff --git a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..95a81a524881
--- /dev/null
+++ b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Use GPG/PGP with Pine"
+HOMEPAGE="http://hany.sk/~hany/software/pinepgp/"
+SRC_URI="http://terminus.sk/~hany/_data/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+DEPEND="|| ( mail-client/alpine mail-client/pine )
+	app-crypt/gnupg"
+
+src_unpack()	{
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile-sed-fix.patch
+}
+
+src_install()	{
+	make DESTDIR="${D}" install || die "install problem"
+	dodoc ChangeLog README
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
new file mode 100644
index 000000000000..b4d6cb5a5f5a
--- /dev/null
+++ b/mail-client/roundcube/Manifest
@@ -0,0 +1,8 @@
+AUX POST-UPGRADE.txt 1101 SHA256 d0bb6c23cdd86aa2451abe5296ca1a42cb86689ce27fce41822287cb606f8ce8 SHA512 715c6c377b9816f0f836acace019c39cf22d536d1a0ae5538cbf3dcf3fec12ae584450881264dab792c941627f1af649f776bca6d5015b13c08648fde726b948 WHIRLPOOL cf4e05936f9e95a2b0208d7ba743a7a36d384c6b61e3718f31086225707829f0918ee9178b3b14ea0ccb25507668d82bdf50582b1d765c286eabab3dc44bddcb
+DIST roundcubemail-1.2.5.tar.gz 3602701 SHA256 9c4d65951cc636d0e2e2296bfdf55fb53e23a4611fa96f17fb5d354db91bec38 SHA512 8f17c8222a59123e438a3683e5f2fbfef28c966899a271a2a11c25535e7188ff57846847108190a4d20ff53eccd10a2a7e88e8a5f958e9bc38c69e53824e7928 WHIRLPOOL 48bfc729da9e9ceb88a5125e7d713016b48986eb8debb21a2d92404011361ceddc536871b21acbe1094d4be365727a6f15a0c66433736fb34879a55aba009528
+DIST roundcubemail-1.3.0.tar.gz 3104348 SHA256 a37e55a3b5f83420930ae20ef3ac6dbedb499c920bbcf3fc93a8f784f7773d21 SHA512 f3ab39cc3eec9bbcaf3d8f5d9004b0da92fe5d35b71687acc234fab5772abb92d970855716288cba10c8609532d42ddc6e791a1f7bca13de555174a37deca9c4 WHIRLPOOL a2fb856fa060a3e904cc528b73474fa64ebe4af1de6f1b2bb1c82f426143bf762d380f121902cea60ff7d00d73058786b7bb4f27ddd6f00cf798b15a0e8e8d38
+EBUILD roundcube-1.2.5.ebuild 2287 SHA256 41056ddd036b465d50514e45ffa633de8bf2ec1cba0530d4b187ef98c3224922 SHA512 466f244cb0ca5331d2efbb2405a62ccec2d72500863abaf84885f5aa9d0b1f3ee827158cb029d2e9c34f9ffac0e4d962064401a07f1337f7d056c488eeaead19 WHIRLPOOL 3c5326f3d6b77b878fc518dca2e3b8add06ab79234496d903436347f3488b57e0fdf47261b55f85067f4e470a551f6219ca0bca2cae520de93f0d1faefd1aefa
+EBUILD roundcube-1.3.0.ebuild 2600 SHA256 5dbc0c66c8acc5c5814976dbec60d1b81a4a3d9ee11aaa9a55eae729155bd0c1 SHA512 093d8b9632f499a9ab6cb6492abd8934f96c2f5ca7c5f141d143463b89c0cec441e5b36f808bce2e4cbef8f847463768cc75cfee3837b61d590ac3dda9ed16ca WHIRLPOOL da0185de1bef9a67d5a06bbf655ac81eae45798363d466ac79cc880ea1e27725c9706ac85b62ae1977d0cbd9fde7e59de4d92444ab217d956fa665f1d9867e69
+MISC ChangeLog 10637 SHA256 0f15322c2374e16f0cc89589fd771d12bf7f4e4af09ae8734ed9f331a9e813f2 SHA512 0be78b95a103a5a3d5830de73d8af9b0f555e7ed2cf00925b3c0349ed8044f1902993a125b4511e2820b3d6fa80d2a6ba8448666dbf90bd9f7036e0b735cc3d4 WHIRLPOOL ef508e9ce14cecf2feb69cc628300563a1864780ebecc5b8798e40f926c6bbc48969c4670dd93d7f82ea1f9ed2a458f86adb78674ccda0aa5122bc19c345d6b7
+MISC ChangeLog-2015 19881 SHA256 6827f823359e94a25464c284ff14ab01f03743211bdc1e3ff54254bbca2564b4 SHA512 e4e5604ada016e85cdadba95df0b5d887fea92775c5b6fdcec3dbafaee5c50ebb5fe6d9a3411806aad83f2027eb3f95daaee4e46d7f073c4aa7711f6a9c84868 WHIRLPOOL ee3713718b80a484062448c837e2d9a41e0ea8f1b4d2ae5122ac8d6a19ad02c9590fa68184a291514b7bb0d8e344ed40908e85e2fc260bf97a192289fb5e9644
+MISC metadata.xml 860 SHA256 54e63aef76033d143a1195f12028bd036e045949393f4b3048698c2ce25f766f SHA512 b17b6d05898493d08d52f08b333f762518442ae519b23e8f2811fb6a369c6b26688a380656e8e95d7da706834547d6fe7d52db6992ebf0bf5b9a30ad0d21c56f WHIRLPOOL d212163d52e034f8d0322562b1479d87a7fc3227d7a311daf1779a03a08554d1f7d73cbf7881f4d0b0452d20e89bb00b90c84a6dfdcb33d62b3db12ebf50638e
diff --git a/mail-client/roundcube/files/POST-UPGRADE.txt b/mail-client/roundcube/files/POST-UPGRADE.txt
new file mode 100644
index 000000000000..785b8319a6cc
--- /dev/null
+++ b/mail-client/roundcube/files/POST-UPGRADE.txt
@@ -0,0 +1,25 @@
+Post-Upgrade Activities
+-----------------------
+1. Check .htaccess settings (some php settings could become required)
+2. If you're using the built-in addressbook, run indexing script:
+   ./bin/indexcontacts.sh.
+3. When upgrading from version older than 0.6-beta you should make sure your
+   folder settings contain a namespace prefix if necessary. For example Courier
+   users should add “INBOX.” prefix to folder names in main configuration file.
+4. Check system requirements in INSTALL file.
+5. If you previously installed plugins through composer, update dependencies by
+   running:
+   php composer.phar self-update
+   php composer.phar update --no-dev
+6. Update your database and configurations by running:
+   ./bin/update.sh
+7. Update the cached javascript libraries by running:
+   ./bin/install-jsdeps.sh
+
+SQLite database upgrade
+-----------------------
+Versions older than 0.9 were supporting SQLite v2 only. Newer versions require
+database in v3 format. The best what you can do is to convert database file
+to the new format using command line tools:
+
+sqlite OLD.DB .dump | sqlite3 NEW.DB
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
new file mode 100644
index 000000000000..3426ba6898d2
--- /dev/null
+++ b/mail-client/roundcube/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">roundcubemail</remote-id>
+		<remote-id type="github">roundcube/roundcubemail</remote-id>
+	</upstream>
+	<use>
+		<flag name="enigma">
+			Add dependencies to support server-side GnuPG signing
+			and/or encryption through the enigma plugin
+		</flag>
+		<flag name="managesieve">
+			Add dependencies to support the sieverules plugin
+		</flag>
+		<flag name="ldap">
+			Add dependencies to support connecting to an LDAP address
+			book server
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/roundcube/roundcube-1.2.5.ebuild b/mail-client/roundcube/roundcube-1.2.5.ebuild
new file mode 100644
index 000000000000..4ce1abb11e78
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.2.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV/_/-}/${MY_P}.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+
+IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.3.7[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.0.6
+	>=dev-php/PEAR-Mail_Mime-1.8.9
+	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
+	>=dev-php/PEAR-Net_IDNA2-0.1.1
+	>=dev-php/PEAR-Net_SMTP-1.6.2
+	virtual/httpd-php
+	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.4.0 app-crypt/gnupg )
+	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.0.12 dev-php/PEAR-Net_LDAP3 )
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.3.2 )
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	webapp_src_preinst
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	ewarn
+	ewarn "When upgrading from <= 0.9, note that the old configuration files"
+	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
+	ewarn "replaced with one single config.inc.php file."
+	ewarn
+	ewarn "Run the ./bin/update.sh script to convert those"
+	ewarn "or manually merge the files."
+	ewarn
+	ewarn "The new config.inc.php should only contain options that"
+	ewarn "differ from the ones listed in defaults.inc.php."
+	ewarn
+}
diff --git a/mail-client/roundcube/roundcube-1.3.0.ebuild b/mail-client/roundcube/roundcube-1.3.0.ebuild
new file mode 100644
index 000000000000..63c9997645d9
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_P=${MY_PN}-${PV/_/-}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV/_/-}/${MY_P}.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+# :TODO: Support "endriod/qrcode: ~1.6.5" dep (ebuild needed)
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,sqlite?,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.1.0
+	>=dev-php/PEAR-Mail_Mime-1.10.0
+	>=dev-php/PEAR-Mail_mimeDecode-1.5.5
+	>=dev-php/PEAR-Net_IDNA2-0.2.0
+	>=dev-php/PEAR-Net_SMTP-1.7.1
+	>=dev-php/PEAR-Net_Socket-1.2.1
+	virtual/httpd-php
+	enigma? ( >=dev-php/PEAR-Crypt_GPG-1.6.0 app-crypt/gnupg )
+	ldap? ( >=dev-php/PEAR-Net_LDAP2-2.2.0 dev-php/PEAR-Net_LDAP3 )
+	managesieve? ( >=dev-php/PEAR-Net_Sieve-1.4.0 )
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	webapp_src_preinst
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	ewarn
+	ewarn "When upgrading from <= 0.9, note that the old configuration files"
+	ewarn "named main.inc.php and db.inc.php are deprecated and should be"
+	ewarn "replaced with one single config.inc.php file."
+	ewarn
+	ewarn "Run the ./bin/update.sh script to convert those"
+	ewarn "or manually merge the files."
+	ewarn
+	ewarn "The new config.inc.php should only contain options that"
+	ewarn "differ from the ones listed in defaults.inc.php."
+	ewarn
+	ewarn
+	ewarn "When installing for the first time or upgrading from <= 1.2.5,"
+	ewarn "run the ./bin/install-jsdeps.sh script to download required"
+	ewarn "javascript files into the ./temp/js_cache/ folder."
+	ewarn
+}
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
new file mode 100644
index 000000000000..b64d7f2681ee
--- /dev/null
+++ b/mail-client/sylpheed/Manifest
@@ -0,0 +1,9 @@
+DIST sylpheed-3.4.2.tar.bz2 3474176 SHA256 198de08d01a5c150adae6b6612da80674bbc7ed59b58bbd7508124b869322ba3 SHA512 1bfaf5636facb6ca55173e914904be7f9fb9ca98eb440f5b548fbbbe03f5dfb5428801e878f3275d3683e715d0b4bd33f63f69f5f98578ce1a25cef695406b5e WHIRLPOOL a7dda342adb598027765c5ab6d14ae3e850bf39ff63d90a79927fa2aec1bf539454357cb6dea8664d21f68deeccf78fada264d04b0a14ff311ff5827717c4aa8
+DIST sylpheed-3.5.1.tar.bz2 3561816 SHA256 3a5a04a13a0e2f32cdbc6e09d92b5143ca96df5fef23425cd81d96b8bd5b1087 SHA512 264aafb40eaa163405074480b2deb7eefe0d2158a107d9b26bc35d5506dcf5a52cf5712b81bd4c06b4c76e48c6e372c74473e5371bbdc80f230267f3b211c7f5 WHIRLPOOL 500978315913b99148d83df1f46991144ec467625837d422ed5ec9f4ce8a344f48e4ca6da7c25ca8ae5ed950c1464551de5e7da90ab27a9a7f2b1998ee4846b7
+DIST sylpheed-3.6.0.tar.bz2 3568998 SHA256 eba4a70b43b49dbf419934796677a69a71d069b71b0dd697a0008836be4db345 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591 WHIRLPOOL 6b27d42e9ad2a27988ebe1aa37354ed95e48ba5a1be20626294f605b8bd3010d26addf11f2971adf86b563c7dd23d5c3da3851bf5137516097ff253217e01ed4
+EBUILD sylpheed-3.4.2.ebuild 1505 SHA256 64d6ff8acd44ed89a1008110738f0535b05eaf5dae88188662319a481474a820 SHA512 5fd43e3e5dd1a9bd6f059a252ea894a6562db7c2eabcb063a912de7e68777ad0dafc136ee657a0f5b7c855abb896faa1714c1be2b607d28aa8fd3db0a0ed101a WHIRLPOOL 8163b05852c79fedd7120cd6a5d517d7bcaae94c4bdf5af571856f36858faaebea7b2a747d75e72cf8dd8946de68f7ebf6b67dab3f447c7b9fd4fc1f5e372c19
+EBUILD sylpheed-3.5.1.ebuild 1563 SHA256 0af954b98294df715a8e6e8530e877d6a0c451b11127856328fb6d35aceafe36 SHA512 d62633de628f2f7d437016fc57d34fd2194eb1968b45757ad5b49d3103c53b6dcb06f8959150b222a1835e40fa1b1177a01acd749715b4f6aac6076593c6a8b0 WHIRLPOOL 515e9e627de36772447c8c19a4a6439c666be1b32f01cc3972bbdbf5b37742b8001ad6492902662f7b69177b4ff1d77da3bb88f74e67d735900d41a549836d5c
+EBUILD sylpheed-3.6.0.ebuild 1623 SHA256 2bc29a3b4bb1d9e54084b4a2639653e2db993b88d5b782bd1c724ccc3cde8023 SHA512 16136243562090dd74302c0bdcaf7ea0a0f39329315ae304bc91defcb105af6ee7fabaddbd2630d6b4d14a5ac347bbc88da0c1a6a84043c9aedc9c19f5a2c112 WHIRLPOOL cd0fd6a94fe85c4be48d599029f1dbd9d7adea293e9fe3fbb739886c6a336e26ac5e2873439b3adb9c49a236accf9a39a404579640c27251d261be588f3f8e79
+MISC ChangeLog 3831 SHA256 515bd12eef312d1c50034a9fc6607381743f2d748f099b3ecdd53bf4db92627f SHA512 45f301ed24042f4767e8112a064a164e893c94b06529074bd2e2a5c0ec7ab4a039300091f122297c6d968bea87e1b799c3413fc3ddae64a6a361488f45ff5181 WHIRLPOOL 5573f799656b76b22f957d5c8a1f0af3eaddc587c60e756f7857648b64e33693a6ce1f685be4b521dd7b804af539145e7b3f5703b95b507e6b19d82eae2dd846
+MISC ChangeLog-2015 52822 SHA256 19fe2505ee910a518e81d7fdb04abde79c1f3474be8013b8de57add11c5083c3 SHA512 37ca923ebc2bd11bf3b7f9f94d1b86dac2344f4a8526326713d94488cfc69b915d700dc8dc268abcb96758b1b83b5a90fb26513f3a04521fa89dbb9d0e4d48e1 WHIRLPOOL 359109aef0fc843aa9b68db6535e1d0da4d8fff1355138833d00ecdad2656bcfe2fb0bcb3677698128f9c0c688ad0b36be02bf1a86d129b190f87f76e43e4319
+MISC metadata.xml 440 SHA256 82014b1dacad56b6af4e42ab4a87dc42ac982686bb2cc77e7f0724aa8d2830b8 SHA512 69ac2f825b9dd04550e139906f492e50eceb5e8922a95b2a44196c664215095dbc0809f9677d403dcb7deb5093dc0c8723b56ad840b3a93ea9101b55ac38de84 WHIRLPOOL 5f7abc6278db3336acbc3da1162d3ed1946afd62fad32a0ed72b4357af783acd5cb4cfbd5f56e44ff94779560277f6cc7ee18846f9dca802f1ecc3825deaf7c4
diff --git a/mail-client/sylpheed/metadata.xml b/mail-client/sylpheed/metadata.xml
new file mode 100644
index 000000000000..2ab17e94c001
--- /dev/null
+++ b/mail-client/sylpheed/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hattya@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
+  <use>
+    <flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
+  </use>
+</pkgmetadata>
diff --git a/mail-client/sylpheed/sylpheed-3.4.2.ebuild b/mail-client/sylpheed/sylpheed-3.4.2.ebuild
new file mode 100644
index 000000000000..c601b0683782
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils multilib
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+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"
+
+CDEPEND="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 )"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types
+	net-misc/curl"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	xface? ( media-libs/compface )"
+
+src_configure() {
+	local htmldir=/usr/share/doc/${PF}/html
+	econf \
+		$(use_enable crypt gpgme) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable oniguruma) \
+		$(use_enable pda jpilot) \
+		$(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 \
+		--disable-updatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
+
+	doicon *.png
+	domenu *.desktop
+
+	cd plugin/attachment_tool
+	emake DESTDIR="${D}" install-plugin
+	docinto plugin/attachment_tool
+	dodoc README
+}
diff --git a/mail-client/sylpheed/sylpheed-3.5.1.ebuild b/mail-client/sylpheed/sylpheed-3.5.1.ebuild
new file mode 100644
index 000000000000..ebc3862a11b1
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.5.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+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"
+IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
+
+CDEPEND="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? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types
+	net-misc/curl"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	xface? ( media-libs/compface )"
+
+src_configure() {
+	local htmldir=/usr/share/doc/${PF}/html
+	econf \
+		$(use_enable crypt gpgme) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable oniguruma) \
+		$(use_enable pda jpilot) \
+		$(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 \
+		--disable-updatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
+
+	doicon *.png
+	domenu *.desktop
+
+	cd plugin/attachment_tool
+	emake DESTDIR="${D}" install-plugin
+	docinto plugin/attachment_tool
+	dodoc README
+}
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
new file mode 100644
index 000000000000..5ff58b054cba
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+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"
+IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
+
+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
+		dev-libs/dbus-glib
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+RDEPEND="${CDEPEND}
+	app-misc/mime-types
+	net-misc/curl"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	xface? ( media-libs/compface )"
+
+DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*"
+
+src_configure() {
+	local htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+	econf \
+		$(use_enable crypt gpgme) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable oniguruma) \
+		$(use_enable pda jpilot) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl) \
+		$(use_enable xface compface) \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins \
+		--with-manualdir="${htmldir}"/manual \
+		--with-faqdir="${htmldir}"/faq \
+		--disable-updatecheck
+}
+
+src_install() {
+	default
+
+	doicon *.png
+	domenu *.desktop
+
+	cd plugin/attachment_tool
+	emake DESTDIR="${D}" install-plugin
+	docinto plugin/attachment_tool
+	dodoc README
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
new file mode 100644
index 000000000000..3b4f509c0467
--- /dev/null
+++ b/mail-client/thunderbird-bin/Manifest
@@ -0,0 +1,66 @@
+AUX 10thunderbird-bin 36 SHA256 6e49ce8f02cd128d353625d04c74103ae83c25baf41c76323c61465acb6ca116 SHA512 d65275c671277af884c5de99131dd785754fc68d222029fe2e863f08e821afb98e4b614ae0509b9b0aa7501ef72c52ae469f98806024ec661e09a684e2796d0f WHIRLPOOL f06c35b7ce6399fd09e69d23bd71fc7a82c047492f993b2b9e761b94e404e777e6d5ac85e977b06b8da67f8155538df271b8ca946c337aab742390a4cd428402
+AUX icon/thunderbird-bin.desktop 229 SHA256 dc8084e9de919c2cc9a3d86da0248c007a2183e07f50fbc8646940d711e9391c SHA512 12906325b92fc3c336dc5d083f0b3ff56fd9892dd234abb9fa1a98ff51b718816b1ad50eb4063e718a86341e710e5410bc216bb398feff163eefff434ecaeccd WHIRLPOOL 39f339c045c67980610cd7f7fc87ef308d00071b4e85038926c0e32fc725994eff949439f8a2d13c3fe96aa9fcb48b99cc8c0b96e13e4430970662eafd94c97d
+AUX thunderbird-gentoo-default-prefs.js 404 SHA256 cf676a8454d625e9cb4bd908adc51c0452cf50ae90edcf555dc3a1bbfc59e4a8 SHA512 7163d09a6e5760327b4fad5e5ef8402640a1b1bbb173a78101275a245248c2c406a5e5e0ca675b7e7281f07d6d272a8586f007bec39c73621f3261862da93d81 WHIRLPOOL e2d515d8cabdd92f323d5f681003cb9ae0dbff999f32409332aac74b5cbdfa9d9221d0beab98cde93678be8eafae03a333f352008f26265e28870817a233ba6a
+DIST lightning-5.4.1.tar.xz 1891296 SHA256 2c7eb418eeb54919542cb097c76af8c61ada1738b30562a54dfdc1091a416e7f SHA512 d5e6197f53443f7baf2c8487293e59ce825bd835870c2b38c64feefcf3a20ee46a41e9c2320f55157bed1a647ef51e97b74efc1d1ad41be34caefc943bfdaaca WHIRLPOOL 5e046c862e4fe9ac47a7be4d7fc3342ccb67b8f76c1f8b542f75a8b81816ef7edff9b478525e2fe0efb7d21eb0fe8cec3ee28185a73338ba59e84de3dd622c4a
+DIST thunderbird-52.4.0-ar.xpi 604235 SHA256 5b17a53001f7605f9e12a9881573f93940dd5756bd54788546201c97fc323c3f SHA512 bfadc747f3b73796cc5822c81567aadd3d34a420ddd104d042d47041b03b7e62b9e1d95e117d5b9ee14897187dbee776896a2bb0c7dc62ca70cc1e1e5f33fd89 WHIRLPOOL 7ff63921c6452ffca21cba430ad45e7953083a821801d259ae987c67cc7a0113d4df8608bd787aef39392744e661d04b5fd64d3c1b14d9b3586938b9fcf27027
+DIST thunderbird-52.4.0-ast.xpi 541173 SHA256 e3f5a29ee9258e49306cd1580d603b635a5ac7c8840c838504606143c141562a SHA512 1653f6ea89fcd4bead7a06badd7ea025dc2daf6a450dfb944e7b45e7d7da9818b660bfc02218ed79246b8231e42f6678beced2f78df668cbedc3676a088d2dfa WHIRLPOOL 0f70d593e6ce37ade889e04b5e868c31cfdeea9a0cddc04eb768244651e987a07ed2af40346d01a3f483a34c3a0394fdb01de6ce8b0002cc33ca820b05d13270
+DIST thunderbird-52.4.0-be.xpi 570932 SHA256 1d5e536ebe848d9a9ac773c6e15ef895601c1754a9f0ee69a7ab229ec931dc32 SHA512 c15aab335806ab81745841b4fb2035be33bf700b86edd39fcfd49891e32b68ee91cb0e71c0cd3813e43a3ba45a912876501c97560f7f1e2568729cec5082d478 WHIRLPOOL 1578e1de28fa4704c70eefac548b5551dbaf244245059dac2088b8c49328ba7c279eb7ea8fc58bb19b6a2fd830046c44f2ba0fa8fce4be94ee0d4d52369c434f
+DIST thunderbird-52.4.0-bg.xpi 634897 SHA256 18063549c65ddcfb1c438b5be60ebf27f2b6ed2b926e52ba2b9fd078510bb42d SHA512 494b6a30de08858b7fe5003c8333192c0a393ca188defd075cc75438f9885a7fc5b746e392a411eb06eee242bab27bbbbaa52bb153d66fb996f4f2db434517c5 WHIRLPOOL 5112e4b75e2d6faed09c786d8573c14ead5b34b843755c6bd592131d64b046901992cf15b9f5c9636bb9f9398abc08d7657b1dbb927c1fd7e69d7339f6912632
+DIST thunderbird-52.4.0-bn-BD.xpi 676901 SHA256 cd6a5a1c7b9ee0f688815ed2d6ebffcb5300fd1ebca9f0bc0d26c0f8d8530d12 SHA512 a8a74fdfc2d97c61eb5b09fae2cf05be9af0411ef79296ddca3c26b503c1c017c0ced7bad5e6ec1c235c1198c5793ec041c7b48b6aba90a63d09e128e1aee024 WHIRLPOOL 4842ebc2e27fd7c82008f8131e87412395d6fb835b44a1cc73a6483c65bb7581c2dc9c24573dd18ba11fc6d815714184f6f926dc6cfb5539e0c7ffee4ea8c0ff
+DIST thunderbird-52.4.0-br.xpi 559380 SHA256 8ee2714cf3efc9477059047d70d3429601e2451e32d823ad48ecfacbad802edc SHA512 8c4e41295c063d5b2f5dfa0d20a202bd0b4e3577eaba2d139bca8575849a3c4387fdb0d2282b6360050c615ec336615ea04cd4304b31a5b00fa3be61f61ee45e WHIRLPOOL 31093cec2c2c102c3990a0a7c8c21eea9cf094c52884667664c8baadf138432cad2dd6a3d34684c0dc94e9a7fceefa21372ef6b5888353a6ed0e36740b2d4102
+DIST thunderbird-52.4.0-ca.xpi 569910 SHA256 8b4929329075581266bc18189660c6200f6084153530d45ca6ce2865572a392b SHA512 5dc899065913907ee8e1416ab95e9c240b856e96fbf51c1ca06344de48e96687b2901cf90e98a49f1064b000bc78c9f43e54f194c908de3f97340c5d7201de38 WHIRLPOOL 47170ab8f02db1606e859e4e46bba39dcbd973ba2c06a6dbdd33bc0eaa4e0b7727b1af426f020d36b0c08b47804cf7ccf257e6b2bedb3810d8fa735f383deedc
+DIST thunderbird-52.4.0-cs.xpi 579150 SHA256 d3898778cd4aceea175c46ddc386b47cbe134a1b89322cee285e5925042032d1 SHA512 2e1973047891240f39d89c19e5f6767e735c9d7998e566c4b7e0e3243c61d887d2307ffa6c5d709e2e49639bf20b08f41d644230152150a9694b02ce6fe6d394 WHIRLPOOL 2307e556c6f7fb4dc3cddc733505e07e736bb5eb13b295e676feb32e2a3a7d13dfb53de76b3e8ef92753f016603b42550a17aad223d42a4fb00f2d78f4c5c020
+DIST thunderbird-52.4.0-cy.xpi 554858 SHA256 c95bcfee29f32aaf12dba7e835f35311eb71dc923c71dfc063b8150165e552dd SHA512 bed9d8907f4a613b0355cf4f4487359275631511a4ff8550abcc22c95699d1d513a70f90ed657e9f608c7d99667b27208909532858bd2ddda4ee47541fa26af6 WHIRLPOOL 48d79a57164c9a8f500dce18c22f32878e2b7921b638f1dfb1e8ba96ac1104c5a0f9573811a853c3d2a9554fc5d0432082cb9febe4396c6877b691c16417678b
+DIST thunderbird-52.4.0-da.xpi 543336 SHA256 cf1efa5a056dbb9b98324b1b959a61467af15ea82ad586369b4b46856d89d990 SHA512 39169bac23dffdac006e4d019f5c9ac99bf1ab7c55f7b85ad9ed5f05296afc3fdfb4ff0bb48180f38ef2b968016c753c8473b10d4b6552d3783d35e84208b473 WHIRLPOOL 2c5ea8b898779d59aa152da2317950605ceaffa1d81c52ff9085ba0c2a3fd9a99873ce84ac0c27cb88e8cf0d775a373ad1026d5b533f2d8f788e63324d0cf742
+DIST thunderbird-52.4.0-de.xpi 555744 SHA256 6d8bc484a1edcdbff75d39dea9f33b85b92514058f505f2915810609796e8a1a SHA512 8ad1ff725a7a75cd691af9360e872e173b33ceb2f95c705c2cf6594b3a1fcdafa94c8892b79b1c9e694dad441482734211840cbd46522f7d284dea7a4ce7c7b9 WHIRLPOOL ee4052866ea7bab87706ea3c1f3ec4458ef15b30656b7bf7818f9d7a9e51a8a25ac6e138d05cb4a83ef251930c1d030813839c1b4f4c8020701cf4f2b0c4b86d
+DIST thunderbird-52.4.0-el.xpi 662965 SHA256 c5201686e88cde81222817b006957bbee08df0745fdbfeeea067b558f9131872 SHA512 7416e98eeed2d97cff1303fab8bc1ae595bf6779c4990c59ceee8da8b00234db0f4e6b03392962d8e482da29755bfde3f655005c9346cf05446c8be654135844 WHIRLPOOL 21dabce2863d54435ed287548fbc96e740565d75333fc0bc617f9a42fea20251d61065199f449c9455267232b1cbc9c36324f1b9af2c43f16dbb7fb7f0159310
+DIST thunderbird-52.4.0-en-GB.xpi 531234 SHA256 45905f12c6053324c1ed880837fbb6b00afd631d83907d6274fc4aa53a4861a3 SHA512 e4b918bac6500b62755b13ff002de440025cf2f5a9b4d9a65c35006d0e42bb3b79ad7106935c45f7afe9d445dbefdbf539a87377b354ac2b0a813e75e84d89e0 WHIRLPOOL 4f1231af63da0fa1aba5dac46e761a735d87b424a9bfa82619f383e019921cda822618e650a5e595354c2dd36b3ffca4489eb6d61ac853c96bd9d069628c5ba0
+DIST thunderbird-52.4.0-es-AR.xpi 565995 SHA256 f6bb96a72a3a8271b9796d9516908de2b885028d7e3cf00913fa74415b7a9ce3 SHA512 3770c63f71c7b35b79797778279c7dec5240427e529da4fc6976628ce05204681da489acaa22f8c27355f7b7872ac3656261b486da62af53dcc1da0cfee4a808 WHIRLPOOL 903465f16b6715ddf8aa77f78001c72f4292d411b07e2299ed0199cbb35e97c505642e98626b26c1409cadffed8b1932a19ffd77b4bfad3ebdb5d7ffb5b62bd4
+DIST thunderbird-52.4.0-es-ES.xpi 445464 SHA256 2d49b3b67e7b0c8f99871906e65d5e3a6cd684ad3dde05a730dfc8d328205005 SHA512 165decda1107e3c48cccb68f857d606d4bb06125214088ce9ff348d53e45023a28f7a196722371e6b18f58fce51314c8277ab6b6dbc0323a32c70bd5147865a7 WHIRLPOOL 92ef0df7ceefc94f0375bd5697e4799eda952730b3fe9a39ce04fc80806ce3a0504ec495a44bd072294c16c1c2f68ab227711c9cb414017a539ae97b89eb7613
+DIST thunderbird-52.4.0-et.xpi 551661 SHA256 eee8043f3300c1fbef18d87c783de89a11e69a75e7185e0fe0ce5a73a0feca0c SHA512 507ccd9f8b9d8e8b1c43b8189d32afbece0b47340fbf14577ee4c888b883ca135b83f62f2b6ce8ed1962ba030daad3dac42b60ac26a01132578c1023c07a1b79 WHIRLPOOL f2dd79fcf3a588d5f1ebb600cfe50fb2495339bc2e1fe99c850fa751e02b9ec66311ecba1ddad987f72fcac1b1d08f24d6fd4943df4f772f31f961ee7fd2c53d
+DIST thunderbird-52.4.0-eu.xpi 555536 SHA256 448a3d9d8f4babd98872e2f91c2837342e4c01fc6bbeb0bed3a4f4e14ea381b6 SHA512 3450490dd16f9bfc550fe33a4e31f7679b644e358b09b1b8ef275290d17255f8dce1c8a665b6ca8cfaa91365ce3a98bea7e3cbfbec8800aacc75ee3dcb920f23 WHIRLPOOL 914342afbe0b5291587b4866151b193b3e20c79760ee6e1d55130cf45f1923f13528b09bdf50099760f0f52905a3b899572fe4934d48678f29af6638b70565ad
+DIST thunderbird-52.4.0-fi.xpi 550670 SHA256 fde89077936d1ef35642d6b451926e885f69b9636b66314c4d1d182a9b753ee0 SHA512 b40fe8131eb3be646cd8314fc664ebb4099d327ef78c8058b4054ce0266fd98c5f72bfccd8483ae950312e9310b21f4ff9bd7dbd0ab28ec3c79195436d505786 WHIRLPOOL f6da2ef24f646fbb70e9cde7be14f507413b8f0530f0dae21a27000a5e7754a2afe31e3bb7df69b3af32e3e5831b1d70a89548bef50b5e8850091eaf1322e6bd
+DIST thunderbird-52.4.0-fr.xpi 577561 SHA256 98c758ebd8c286bb93a1b9b75a5af1939944c520164a5b38f1f39936529fd7bb SHA512 ac4261ecb136c0ed4b9b45caa18f796e85e8cedf374464ab425b4f4ef41cdcdb5756c509114f306d6ef027f70313aa43a498711beb7ce4462a24bb5c18628406 WHIRLPOOL 74244bec44f137ef4d26fc451988605f8ba3211dfba852fd1fc8f9dfebd974e5ed52a35cc6825e0087a20b9dbfc2a12d0c25a7414483c4870cfed29e91239722
+DIST thunderbird-52.4.0-fy-NL.xpi 563632 SHA256 1225accf01b15e7e3132ef51d9275ce573a3615360f16647c91bc078134f5002 SHA512 ba926a525a308b704733af586ec33d071961a1cd93c8090be12be844516714b419344f98d71af0a6d2d607eb3b76e64fa25ebb90ebb4657fef3960d5f2dde6e7 WHIRLPOOL 1af45abb1ed00b3948bb4a84984b82cb6884767a0081abd4927a3946e405ffa7368f82ac5ea3bf89112d8316c8c1ecc8c3dada4eb8322736008321e53781c3fb
+DIST thunderbird-52.4.0-ga-IE.xpi 583556 SHA256 22d847437c25ff7aa94b9f5ca1147277c87bccb5b38afa4f0ef7fa5124a59cdf SHA512 9b081dcacfeb150e92f87577499d5716cc176ac1aedfb4aef880d2484224afeb2bf7c197e3b09ace37854a176538770b4f6afa8bf793899df0a21ee31eeb9d1c WHIRLPOOL b90b8614bfdbb834cafb1ecdc34385aab306474da96198f24ccde288a3459893e3639da0b5676415a80c74b956b30e7a88be7214c9e2c89378f4374c0c82c9e3
+DIST thunderbird-52.4.0-gd.xpi 574065 SHA256 d184019e5989bd88b8bdb7a27788535b0a3a487921d85339ad0a1bb81cf46a40 SHA512 aba8d493f75aeaadf093e1666e85f1ff794346492d91099f6a2680b95f4d8e981dfb3509b190db0e1b6e4b74a381bca38b61c7bef3f67bef2b631eac8fb49f67 WHIRLPOOL 6d511df4252ba4ccea608f10b7a84fef5d9bbe05b3daad83e25841832d42208de39ef1b06e8d38db5934ee12c973b2ca7a151a2abb387dc426fc50e6811d8425
+DIST thunderbird-52.4.0-gl.xpi 575150 SHA256 a35d8e9441219196eb90a31d1f65f08493ded91fc1ebb1b712c417827451ff13 SHA512 6f57c57825a0f3e7eb530933ff82d4c31c73cde2d5d58edd57267d1712f0606fb8511ebdab409dc0c967b1319c3ffbb8158bb6dbea308d7ae7a56af4b94650f0 WHIRLPOOL 8426c9c10ab8118933d2f09fd775727d099573633cee1c3671aad70cad56b1c084bc5f905d7eb8a7d9386909996d68cf93229168e352ce7233aad780cf9f3c5c
+DIST thunderbird-52.4.0-he.xpi 592566 SHA256 8d46ec38430a1939cde04141c9f5bcfe22b81a154bebb89dc112ff199042203f SHA512 fb2ddbb62f31071b07eb6f33f7f6015c8ffee96a5a78504adf6b9a2fda3c589bfeabf263fde638eab9e103750a06eead1a6465a56e10bc3034a5b8e0cd79be3e WHIRLPOOL ccc8e56770e7a0f9a488c070379658feb8b2a94f8377ba562643d47b6acdefc56862d90c9528c361fd7b4ed30d869e6bb785f79563fbb9f3f945b617d6ac7592
+DIST thunderbird-52.4.0-hr.xpi 564780 SHA256 119c5055305b8f16b02a822b70044ff2410cc79f32a456d59c71c455002b8523 SHA512 da59389943b6427f1c1056b7712db105fcd38b5979fa47e1a62b8ff03e345f4a9d1b3dbc23c356d906b741847de274bf3a7e53c12f9935d5a749508d750f9f11 WHIRLPOOL 77e83f4917edc6aba551198c4045a8a2d25ed8e30cc83e7e951a99ad0aff599ac30312ff788d8f3c72dfeb4f8f2df6508228b4cb2b1401106361dff8b2e4d445
+DIST thunderbird-52.4.0-hsb.xpi 582242 SHA256 1444e2582233eb0ed7abc8566ea951d6938f75bc069a20b47d6f5cd8608a740c SHA512 ee03cb954bbcf507a2b8cd0ebe99242b0f7d232f46fc90725ae70089be3dfa1413584feaa5320c8ce9a4e453d3c3d932905849cf57b51aa2e2a4a164a228e710 WHIRLPOOL 8fa2aa3a4d60b9014bcd66a1ba03511cf045728126523c0cf7dfdbd930a74f478e2cb8414cc8385d67d723f1be65f03d91ca25d1941e6277f895eec989298a9c
+DIST thunderbird-52.4.0-hu.xpi 586446 SHA256 b98796554589eb7ff3e30bd8fbbb27c8d2ad31bc74d96d4070df1f0eeba40544 SHA512 b9f7b628f7cc112e79eb5a7e382ada35fb6ba3d0197db33bc370a807fffc0a69cdf4187b87e9b13e460dc84e2b9663d995cb8ca831518b209efe428c32f97ead WHIRLPOOL b5a8e0a2737c1a6f6271ff353b603a6f377b1d19b954f9cf7dd368b7c8300800562563eb41e14d28fd88b20d658706c3c2ef71443d71028f3ed3185c3ca2743a
+DIST thunderbird-52.4.0-hy-AM.xpi 629879 SHA256 ed1d4f05c0d4d2c8f4dc4227c43a4f08be01ec6aed92a3ede2ca83550543bbe6 SHA512 3a069934b02de31645925fb51efe16b137357571ab5376cd321d0263ec5bfac891851429deb216b78fb2c357486cb840b4aad943c0ccee690fad5bae6d39012e WHIRLPOOL 132616d303916a3b192d51bca4de9070b1ee4595cc91e70ba3d09c12fc9a55f701bab58acf44dc49046b6d1bd99a21c8d9ec035ca8a5e83f62033f00f2c5e3fa
+DIST thunderbird-52.4.0-id.xpi 546527 SHA256 5bd33fd191ed602e3ab0c47e9d8106328e73dcb07e3ae10062470d1de138aec0 SHA512 3dda07d74bc47ac1d20e294c1dacaf16805113aed31ac1246647f95c2e758672154ac427ec3915b577810a8df66cce83d3984f34539ecc01375a6b347d0140f4 WHIRLPOOL 9d9f4ab5d504479ae5b347ef4162789a14ea34f5ecdf14ecbac93416f2f5098508b269cf6c003334bfc3518fb9ce6aec6b3eb6299874cdd1216168e4f8f36598
+DIST thunderbird-52.4.0-is.xpi 555712 SHA256 eed6b20e25e34b0ee1498948c8baed0060abe1b3a25f9188b123c81fd044771b SHA512 ff9e52667baeccfd829e210822355a3d995046fb807bacdb9d52e6f2c7145f96a8bda6e0ef5fadaa442cfa7985de36b09a8349cd860d55c1a131b04e4cb44d79 WHIRLPOOL ceefc490c5580fffa310241d67a389f6fea7fac443779f57243af7c2bd3745d243f57ac62b0c5fc3a21c300d82a687a3edf62fb16d310ad05ba7048b4d78ffbf
+DIST thunderbird-52.4.0-it.xpi 455408 SHA256 5800130bfd912f58e6335791afde9718a59dd3428a589581fca160394a3f4b75 SHA512 a82683e66c379f84492f6b65e6ec068e472f3e9d56db5b9c393d69966a873f2ebd626d3d30ee6a5a2c47a5f82c0ac39abc39da2dd9c67a58505e4b83dab08503 WHIRLPOOL 20282abd7e95b57df459a005132f7ab056b698115f349fc22ccf7ed978c6bc3e38a4867bbd399cd0691159908cf5da6a4f997de2fd57df577cdd5ac7bc71bae3
+DIST thunderbird-52.4.0-ja.xpi 630053 SHA256 8846bd908fa6481e2ed0a2e7fa1cfbd7bbfe02a78b1cca75e9b2a1ddaffe1084 SHA512 d297d4a86e2f7f31adaf27915eb4e6ae34edadd7fa3cc903e8d64ea6aa01b449d076be5deac803d1d39c74d9c5d09818fa0e2fd670005bafd41c83028ff117c4 WHIRLPOOL eabe0b103085f42212568e02b946cf7db2385bf91d5b9cc22c0b1fe440fce1bf4431e43eaa0e39f6e25a231631c52633eac3855e11774a91634e726113ac322b
+DIST thunderbird-52.4.0-ko.xpi 595517 SHA256 89192fe23dbce157aeec48168b45ac94cc47bd6d83907b3ab7dbaeabe5b7b7ef SHA512 87f663896776abdf1608a28e905cd38cf935e8ab8a8cdd7482db1ac627e95695e1d15e9e3d9b3017e30e6534154e80fcd6cd70ededbdc2ccff12b200269771a3 WHIRLPOOL c886f74a2c2d07c27b8444011808e18d46c1d5e39a68d14b97c99f39bda8b8a0db4b2aad09ae69cb7913290711beb0e24b394e3ec80fc9b3da3045c8bfcd6f6e
+DIST thunderbird-52.4.0-lt.xpi 580598 SHA256 90bc80f8742b35525af3e1f4fad4c5e6fb3442423b6be7ddb8c4a5be76bcf564 SHA512 ad913ca637e7acf04255ad48d63ad7acfc317e6e55cae3f54b1338c98caf04b0aabfa18463e83d77f4aff211d21c496e98ba0ab473a57f79775f7efd8ecbed0d WHIRLPOOL dbebc4177edd3987aa3a84ee4c45e510c419c193ce9b6dc6a8e149eb7965c89fde8939b5488303caecc493eb31b33fbf0e9992462ef34a8571b219feeba5424b
+DIST thunderbird-52.4.0-nb-NO.xpi 551104 SHA256 24cd76bbfab1f20c5f916bdaff001759d75bee16e6a15f56b5e66d8a8d730d0c SHA512 82b38db24f7d06cd763c3613e3ad43bd6c5070409d822b450473992e157a4f6ac72998b0beb0abe524b06de58c2f8537924a455b506fe0aa7229082588265c97 WHIRLPOOL 6fcc3b73306d81a65c2cbb9162cb4130c12a2f9a77a1a8df3776e77cad5d2cba285d0c17b898efcdb7a153b2040a1a9b6a77695100d3e3413fc93d5108f86ba1
+DIST thunderbird-52.4.0-nl.xpi 557957 SHA256 a9523e8f9cd9e653b645c1b7b8105d98f3c33c6723f07d9e6a2a1e4b9e6abdaa SHA512 fa9708def12178686e42ae96732977a0090a1765a71ee591160a634a68acb1e7da3655085bfa4b18ca1ef380d5a35600bd1c7e64bcc4d30060740b6787c93aad WHIRLPOOL 5d7a768b8fb062a6b3db4d64491d7ac7c8d14454405e50181aba26450c2a4582c8ccd8e4763bedc22d866f5c5db2aa1e4c1fe9739835da67005ea2e4fd27eebe
+DIST thunderbird-52.4.0-nn-NO.xpi 551891 SHA256 22961936b2e19e95838777b24e29d3f43eab296a75958036b20c21471301f96d SHA512 e3c2691cdbfbf52045a6b41fb7f70ec8abe399399b23045438b98d1b7505c6ec7f0ea25ec70a0ad5bd189ea6f1bf1aa2a50d6e9963ce9a69e5fc2e15d2bd0765 WHIRLPOOL a5019612078a86b962bc3f0cc2d33b030db7bc0962366b65f35d1d816c197ca10614317337e6bd13fcf78cec9df262a6de817d90d40328c5489318cda6c74e30
+DIST thunderbird-52.4.0-pa-IN.xpi 646569 SHA256 c806abe05b9614690c9c8466a3b3c8e15fab6bbe6fa166e23f0dbb64f5e70be6 SHA512 673f9e7ffe4109f6bde302e01679511c4b64572c74e3e19d51b1050a979e6d417f120d5662d19155af0be9635ea85ae8f745a788547ba3519e9e3837cd48b4d9 WHIRLPOOL 1060a126616dc8fb15c352706318dd1eb5d39c3596a58f0afed50edb1dedc3eb0f10399acfe07d3cd3fbbe55833cdb411cea675a89ccf3a239e79475de2c48be
+DIST thunderbird-52.4.0-pl.xpi 469901 SHA256 46cd992cd75c2216af075f5d1080f3620e1e6ead488de2e14ed56f7698669d25 SHA512 09c020644beb4dcb90d433fd61eb2e30e8333110476e2e9887e81be09d8cb9d678b65f0eb31d1c612dd8ef72203f13f7cc0500b1a3b2c2da48b4583c01c67c74 WHIRLPOOL 9bf2dac45bddad34bad4552e9930ea3eb3d8a6b83c7a280916ec1f1cbc62048fc497a6f0c023cca3ccb0468a876484b3ccb2601560781b402ab996eeaecf8ce1
+DIST thunderbird-52.4.0-pt-BR.xpi 558224 SHA256 273539724246f023b0afdf79a9dd517ab0e71606381900ca26b0844a5e30e9c9 SHA512 0e223e693de23ea02b4aef01e2d34dc1cef727864309ffb5c045a84e7a938ab88e7609e8817afd9e3fd6e5c8b66402334ab17fb10d25a87858db982e2a507a9d WHIRLPOOL 6c69cd6d8d42dde8c967291745a0ec758e971b1cc9ff710c45c910665a83c95e541d37fb6db600ff2cd0e9cb8f2e25e45e19986abc51361ed1375abcde8119f6
+DIST thunderbird-52.4.0-pt-PT.xpi 565624 SHA256 7923394ff64a094d4da561b962b694011e79c8e586c8d125cb450878d3cb53f1 SHA512 1efb35004dc9869f266abe39754940da1690d44fde574e250c1298ddce0e050c0a861c6dbd28b00d22aca2abc16acda2369d290667e305fb371a6dbe0360ce60 WHIRLPOOL 3e4629264324110ab902728f6c086aa687b958326e8c74cabfefa23e46c369404e0ae93ae49345895ce19e0b5b19b7856a42d2b268ebd339a1bc461d2e342a96
+DIST thunderbird-52.4.0-rm.xpi 557605 SHA256 91afce6ed4b6e4a52b03a83db4610685cc272e829a5da10db79c371ef9b00e2f SHA512 bdb2f713890d65a219f4081a1d4025ec3f5fbab7697ca0cea116e423a6f90aafb80f7f0e88a468d575dd1ca7168f7c90d24fb1b79397dcd85622400843a86c16 WHIRLPOOL 4f2bbb09d41e98314da1cb740b325aa68b65e81660c801e56349ece024ff1b4c8d71f57c847f97c99c285d36e8e6107a8b518c229d9b9223a24940390abcb57f
+DIST thunderbird-52.4.0-ro.xpi 570529 SHA256 0972682e3c8b1767dd45efd8dfc1d5fe664731d4a7786a12104452ba29b449c9 SHA512 7dd9b5797357c8fcdd78cc215c9ba875e31974681043552b7ab2e35adf8e4b991e12e0668afbd6a5887801cfb7e5fa868b40470f3a60d7bcabbd72df482b8488 WHIRLPOOL e5071e44a1ab3f3ce78e73f67c0de62fa44e3af31ba41f83612612d2204b52cb9e6d93834607e66fa92863e5a01e61aab3d5f824f31bcc88c52ffa33342b59a7
+DIST thunderbird-52.4.0-ru.xpi 530669 SHA256 662fdebfb7b71ac6136e1ce707234440672a9b019f2a4b3337bf24338349b7a5 SHA512 866934f8fe86bc53965d8da845bd06f5c07fece1704d4012a652457f06094466f7cb32a36643f9d720fd11fb1c1915eaffb794f68a565387dca80dd0388a5135 WHIRLPOOL dda85fc58ce8cf59bef0f9a949c498e108a5f273eec05c02b073712aa5acf5dbef527fb706841da599f18a605dd8d691d02ee8093ab375ea5b9ce7496e264ad1
+DIST thunderbird-52.4.0-si.xpi 649010 SHA256 027776f83ce747dac6bf7bc939a6c53495022131bdb283496e0bff9deaa2a0b4 SHA512 d2fb213774b235bfee38f99263f67fc41ab8083b721762ee500b5f3c964713422436a53c1f3072a33bb3fc1259207bbf7cacabe0652ebd97c71889265a230fd4 WHIRLPOOL 0433db5af229f92d44cc4d96ccc52236a8cd9f17da88401a52f831f4718dba0d818069f7a115340de7662f5baabe439c156db298660d517bbd3117b4bc0f3bb8
+DIST thunderbird-52.4.0-sk.xpi 583882 SHA256 ddeb2172f620877f95b69cfbe8d1bda1dc77b1829ad491189e9cf5f5ddbdd8de SHA512 579777c8f776d86602c3b5eff112c5df1fe009462e2477577dd13c28435144b180165b4c6eef2b94997f4a3153730d8a8527b2656f84ef5d4f8545c3b8f550f6 WHIRLPOOL 322035c6fd5a21b0958e3a8a31dc32d6164712381bcf86c565452ff0909440b3cd43b7eb6e496d354a137d0e68ebe5fd11b180213358853efea81adb5fe108e7
+DIST thunderbird-52.4.0-sl.xpi 562834 SHA256 e36184d7264bcdd4bf7dbd9e8e547ccce50d2eb057cddd8589752f03df1a1f06 SHA512 636a7eef7caebc7598bc224ed3516e9b6a799d3806515196832012cefb85dbfa97a59bc2c76dd34835014045f8dc42c9943b1a1f885c5fe6595eafc5417314f8 WHIRLPOOL 7309ee52ac09a390a9c3f501d6b4e57516d51d521cf876a963e3015180412d76663ddeedd91b1bcd22bfd80717fe80577d42d683c31966a7d9cae8db0f6351ee
+DIST thunderbird-52.4.0-sq.xpi 570617 SHA256 e721f6e1ba3818c5ef258dddf19d5d7cdd635c485d620d4fda2107bcb0fb67c8 SHA512 580cf48c5a22c1701ea2b7a28805bd1749c1a3d6aaa8dc9838b51bb13d4d5982967d090c84766c1945f3d9c0818f52234286f5767b6dc46dd24c0322b93a02ee WHIRLPOOL 48db0e8845b68704f198ccde4d2fc466c2023f56d7189824f77f1ce0e479db2316d651fc9d802f43c7aca18a5dfa3f7ceaa799d38407e0355e09f859589827ad
+DIST thunderbird-52.4.0-sr.xpi 609020 SHA256 d17e021710ecb696ec97a339e579ecf67d0397b26ac2a7b578358a40fbcea3f8 SHA512 c5a64856d1eaf132fcd67f43589a2c0facffe43fc9fa9942935cb52a076ea266cf78348093118dc2e5afe7b0030dfde6fd0f04b875a801f3d75173c73904dfb3 WHIRLPOOL 5d49355a858bb1b2c43e878a2bd5934477dafe1580182bf3134ec739359fc4c64b00a9ee9e0acaf3f462b6438d55bf90576b5f5d69023bbbe4d8c96f4cd4540c
+DIST thunderbird-52.4.0-sv-SE.xpi 565777 SHA256 708c1093cf817a0502cb65014e73c0881f94dabead931c71beb4b563e948575e SHA512 5c983dbdc349482f4822abdd9c5870bb4838970cb24003c4aee328188bffff279124b299057566bc061b98aadf25e4078e52e888e30beeba9a437d07b4cc8a25 WHIRLPOOL 7845e9d47c5512e2bf6efa1a91de79d2d3ff1dd01ab1665a54304a73d6de23d11c4e5664b8313003db7e6c31f0a493941881194670593aa143d25d9ad7e527a2
+DIST thunderbird-52.4.0-ta-LK.xpi 675039 SHA256 875114b08adbe2783dcefbc56334bc4bc4c3da8c8b3300f37f2cf67ebc04df7a SHA512 34476582251c95ff6a1cb190b4dd26c9167b5232d5d6e4a48256ffecf126e9a75ebdd723ca8ed578274c54f428a7ed5f9c5bb00444c12da5f0e40e7fc9c03021 WHIRLPOOL 2e952d15e51e5e04f3f946bb9c3eb730cae08a422096dab737a0ccf048436230ea64708e75a8fb18af39c098130813172db248d0ea4c0389cca7f7f754b84c69
+DIST thunderbird-52.4.0-tr.xpi 569926 SHA256 9824c64701faa3f24c69e19801cc98b313b26582eda0ad46c8c78a3452f7ba33 SHA512 fd8dd034d17fc4d1a6628bbf2889d15f22b5a8beed256e901ad27af1a870efa1c92a307c85bb07fef29708e72b5cb48dfe8838e5e49161e464982768c259b443 WHIRLPOOL 647819d003859ecfe9ae8a651c69b35962170cb5aa99ee676993546fb0303e1fef8f4d779bf042bdd3f2cc74c667c2af825db3a86b8e71101b8c5d195aa8bec6
+DIST thunderbird-52.4.0-uk.xpi 652855 SHA256 d3e3a3cb60e7f6fba14759590df00e85456c17cf071cebcc358744abcd2b1ac3 SHA512 72550a7d2e8d639308172b7cbaf9487f909d22d86673d7900a3b2874cbb7b8bb882fcef27d2f79b1e5ebec7f7a5e24496e4b6837681a11d5b425b56baa195557 WHIRLPOOL 228111dec1a9c3b3531cb18aac21f02a378b3eb85f42ac3bc32c2c860fa1f78ba8f7b44635a24388daaf51f9d4378af68dea8cb4e719e7d15edc4de15813b53d
+DIST thunderbird-52.4.0-vi.xpi 637164 SHA256 7541bfec6716ae705afc51f66578100662aacdd92f8c1d8e9a33c82ad33c2872 SHA512 df5aa6f5af5b1178d66b078a06a919b2b5234505c97eb1916e82b59c9ab1287dbeaeb5a4f776a345430c36f128023241e157889c5669b76c28f60751da615eda WHIRLPOOL 580866f3e140730c683947fef305cc3d8573a1b832c5ebc7c945d90ff066d3c37817859236a0c6865fa05a089d0a692dc7dd4d8207a8d3839ea73917af231314
+DIST thunderbird-52.4.0-zh-CN.xpi 593612 SHA256 c1ef258d0b0b3ec1016c7878ec20c7af8a1d1cdfdad785389172b30739b674d6 SHA512 90611cca3af7e142a1800749e368ab9974aa470963b6c2f5f53937efc6b0e06cc29ec3f86922eee82e3603f7084ee1fdd146926fc972e722e160c2696df3f413 WHIRLPOOL 5b6755bf1ad8d5dfa5b93f7f74c3e97c09b9caf8ef0f63dd0888d0c00e482abf74e355e2ede4c578c0111eaccfc2d6933aa7eb93e6151441b46dbeda2ee6244f
+DIST thunderbird-52.4.0-zh-TW.xpi 595729 SHA256 7a1dc6483c83b43852c892f5b26b29fbdb0794c81bca4ecb5d1080e8cc371da4 SHA512 0dc359b4cc57972425c175175c257134da68a207f96f127c38758e3fb6f5d8797db9ab14cbc87518b2f855a09215d96eeec6cfe0213b1d1e548798c2d5d6449b WHIRLPOOL d1d7f515bc799f3f3456517479935322b34650025caef473ffb8e6fde347f4c977ae30d10f71862c53b32d6ed7d2ffab8d4153ccfc5cd0ce2a4d83af1be91440
+DIST thunderbird-bin_i686-52.4.0.tar.bz2 51097421 SHA256 674e49996a122eb9815f72be8bdbab685b7b430a014481ede8da25fb71a20370 SHA512 1f3a640d140fa305e115158d98aadf95d180b396aa3935de4505f0f94f510d206ae6e45adf36572cb160175383d0aaad11c3244003e4a99dae613e1a749430cf WHIRLPOOL 9e4bdf1a3e365e5a9f6f3065671bb0cd0a0ffc50ed4cd23951bd5bbe5c3b8029c3016b75353c5a091ff1333546d8be6fd4f11e8d01317a6d55dd1d60415f95fe
+DIST thunderbird-bin_x86_64-52.4.0.tar.bz2 49797823 SHA256 0f2ba37a577012d0acce76f915cf003fc5f987e4ee1a857606eb1a1c022b334b SHA512 edf130b3b061f15137e6eb83c9674642f0f475de56b293d4acde60f1e7ebcf0d262085fa2a513787ac201ceec5552c029167cec5ad0556baa7b0dd3b52ae4c3f WHIRLPOOL 259c97444162dec76d91ec2a9342950d995435a188e2dc7cf61fd968b2869cf642d74d74ecaebead8770b1db90f6d629cf372830bc9e1111599dae6c23932b15
+EBUILD thunderbird-bin-52.4.0.ebuild 4802 SHA256 0cede8adcb74bd91487dd805570050351e559ace4c736035611169990315937a SHA512 a3c1b9e1ced89a0787015fde0b7839a1590d127d17d599ef93ce420444d230cd0712cbed57295bdad28307e7b4794cbc754229b8fced0809113b1023218ca8da WHIRLPOOL 47bdd4ca6f600badac19adc052dc3f286e8db7ad91c4b96b6c70a79cc1b146b648779321693b58276aa3a8e12f419750dc97426c002e1cab42ba593aa8e0622f
+MISC ChangeLog 9656 SHA256 131da62dba9256df594f8a4f192e56171d4cd8accbfd60362ba9c61ecfe75c6c SHA512 c6e26deab8187af454577e247ff86068fe2a26d33f673502660eceb75acf1564f0e57b3b6d5482d7490e51754259e169fb0fac49bd7ee71ea6f53fc1d9ec2db7 WHIRLPOOL 980476e890b7eb6f2dbc983fd12b432065f96905f5dacecbf315f55902f798e17ba1d95f7ccf82b4e2bb7baef3711b995a3ae38232f73e0b8b2211ae097c9209
+MISC ChangeLog-2015 54731 SHA256 2dcf282507c8ea56836e60f55394c3c7452b66885b0c041ad42fad9e6a0170cf SHA512 01d7294295e536adfcd7e2e1b70a0daa7462fd81b20f4516808776b99c8675c2db7808f616d66080cc9799b6ca6aa0df23f0f4dca62e9025866952bb41fffbd6 WHIRLPOOL 4189df72a809ce1af228d7c0983eb06f311395d55bc8acc705ba94f3ff3f0c816c2f5e778667f6fd7b244cf5fa19242dab88171678b554f4fe536733a86ce437
+MISC metadata.xml 329 SHA256 072cf40f15f8d311aaa7c8b89ef67cc29f76de26c5ca58ef1c57e8a0ef8b953c SHA512 8710fdb1dc3db7de4980029b8c0e2e1b3b449505c3878c955e519b50715a5c82ed16a120e6e259a1e4a56e7e39162e7b009d5db8ef4d96e607e89d48161d1e7f WHIRLPOOL 5712c6f23a5ab408891e26e76692fccea7c08fd01c014f5e5474b1660f32c7af4fdc30509b75217cdebd4ee77c6e64f148678bf7f7cb880057735a98953854b5
diff --git a/mail-client/thunderbird-bin/files/10thunderbird-bin b/mail-client/thunderbird-bin/files/10thunderbird-bin
new file mode 100644
index 000000000000..f1338b82757c
--- /dev/null
+++ b/mail-client/thunderbird-bin/files/10thunderbird-bin
@@ -0,0 +1 @@
+SEARCH_DIRS_MASK="/opt/thunderbird"
diff --git a/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop b/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop
new file mode 100644
index 000000000000..481a9b7507bd
--- /dev/null
+++ b/mail-client/thunderbird-bin/files/icon/thunderbird-bin.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mozilla Thunderbird (bin)
+Comment=Mail & News Reader
+Exec=/usr/bin/thunderbird-bin
+Icon=thunderbird-bin-icon
+Terminal=false
+Type=Application
+Categories=Office;Network;Email;
+MimeType=x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js b/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
new file mode 100644
index 000000000000..5d26710a4f43
--- /dev/null
+++ b/mail-client/thunderbird-bin/files/thunderbird-gentoo-default-prefs.js
@@ -0,0 +1,11 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.display.use_system_colors",   true);
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1")
diff --git a/mail-client/thunderbird-bin/metadata.xml b/mail-client/thunderbird-bin/metadata.xml
new file mode 100644
index 000000000000..f4f7fd73825e
--- /dev/null
+++ b/mail-client/thunderbird-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
+<use>
+	<flag name="crashreporter">Enable crash reporter for bugs</flag>
+</use>
+</pkgmetadata>
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-52.4.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-52.4.0.ebuild
new file mode 100644
index 000000000000..99ff57ae770f
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-52.4.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.1"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils gnome2-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="http://www.mozilla.com/thunderbird"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 256"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/bundles" \
+	mozlinguas_src_install
+
+	# Install language packs for calendar
+	mozlinguas_xpistage_langpacks \
+		"${ED%/}/${MOZILLA_FIVE_HOME%/}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}" \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
new file mode 100644
index 000000000000..4fc2c8b2eb11
--- /dev/null
+++ b/mail-client/thunderbird/Manifest
@@ -0,0 +1,250 @@
+AUX 1000_fix_gentoo_preferences.patch 866 SHA256 8987ddbede1877bb4f7fa1e02b2e22af9e97431b3b4181e49bc251c06f4ba6f5 SHA512 60693c96667dc6bf34bf0b58e4e06a50041b69656c1ea3b945521866a1ae86887169d7afb1afbe54e6b5b6ebb87eb6138fcba716509627966374a933b8a00016 WHIRLPOOL a9769ca2b394cbaf4d1a19761e173ae3096d02fdce2d29fda161e2d1648e4dcf6dc332ac1ab19db30c61862cf5264eceb703a2359993dc58169dd312fca845e3
+AUX icon/thunderbird-unbranded.desktop 228 SHA256 6d6857476dc288d2470211869b3ad13241f938f2995ae273831fefefdeb64fe9 SHA512 c118873cd701f3582d18ebf5c9622b4c593bd9bae51079ec3daf9fd54aceb4b1406f2de20cc08499ced752cc7b4b2183de6777693c5e6853e47714a4df2a6e4a WHIRLPOOL 2df96beec8c941dddeb5e60d6c811f2456453e050e94e3552bcddddd0e951bfa589b64980bd9756e55a2d98611565d092d26d1d2d171b5651a7431ac077c5bca
+AUX icon/thunderbird.desktop 218 SHA256 9e801b52b5f22086d38c3609dec28fc709708a5be1101809c68d17762bd596d6 SHA512 0cbe132759012c0da6f81f37d4ede62d2f4138f0d95e590da6259d7593ad858de28467b393e5d6129a6d37d61afa9b078df0f5a8b6a259189860653c44350a72 WHIRLPOOL 96425123ccc3cbf656c841dbd58812a76802a76b4acf4409ba171792ab0b1c120dc75dea8541a1cd6a2db1ab7ef32bf29477ef7670bf97adacd2e353bef042fd
+AUX thunderbird-gentoo-default-prefs-1.js-1 426 SHA256 b5aba51045c700ae4d465e079f3e776600d4950806212f7c2fe1841fa25cf9d6 SHA512 b40e7b4789b7f43c382589f7d0eaa6043072bce86ab79fb3dda4800e9ab6a43af11f43b0cb3b6ab1c71d887aa1cf9356ac858f0a81dad013cef5b8a4b2107983 WHIRLPOOL cc3535e9a710d55c5386db51d7bd6ca24f6b36685a54e42d049a806fe99fd0b08afe7998d1478036bfa306129616778b8ac1386e14649646fc0a7ae4d37b830d
+DIST firefox-45.0-patches-12.tar.xz 22040 SHA256 563d7bbe67aa4379ab0a9b460aa397aa2a8e9d1cadcf776490beb7349230c6c1 SHA512 be9981818e549d79f8557427dd506b9c473922c0043384563c1fd92e4c6c96c91afb8bb01d4499a3a61b463ecf2875bc776fef0f279c0f2fc3625602cb47880b WHIRLPOOL 4f100eadb5aae49731344d526ba482c97dfecebfd20de533e4986e3a0463ebe31853bf1f9faf914a6fcfab82936a52cbda2add84c019fd6ab15ea086115e5bef
+DIST firefox-52.2-patches-01.tar.xz 10400 SHA256 18dbd0d6bbab50918ef3341b739710d45a45efb4aa6cee86b4b8a620cc590b93 SHA512 85cc57e27c46c3243deedcc21d248babbd9ac6c144332ac70dd6e00161fb46584d090683bc1e066c0e9136d6ede5a4e30ccb68d83cad448f6b0d8223c726dafc WHIRLPOOL 65d351f5919b897af516754df0df57b65789d8030280a35d9ab1c2e7790b2713aaac8ad1caaa1ee42007aed17f971355d7f478d134930d0e1a6148a254dd9bba
+DIST firefox-52.2-patches-03.tar.xz 13148 SHA256 e2ab0acf173ef06874c6204a7ea77d11404dc70deca5d9edcee2e3a092ff4e60 SHA512 420dbeded3ff2f81250554416115a674ece1847db4449af9d09fa3ea5861037da9bd8525ce5bceede2abab1b58e06485e95417644c0ba8332eb076fbfed7cecd WHIRLPOOL be22652ab1fad0c55d3f3876d50f624d18b6472e7c292e96b5cb1f0e3672ef58fd41afbffd5ead912be1c15031595563eeacc2bea19673785fdde039f799e968
+DIST firefox-52.4-patches-02.tar.xz 14412 SHA256 28e63a625cb22cec73fe5efd952566d6bd965dc453f205b0c00b2fb3b580dcdc SHA512 6befeaefc118bc161ad05eed619142814e5cf31aaeede3fb5618b1f5ace887e9e1fa6914320b513404380a426cfb0f45107435f92b2d7e95d95cd7c44e03ad96 WHIRLPOOL 40323ecada75c7ee05ae19cd98bb262937a0d70f5fd7a25ec9454227f33ce81f363b602222b8f0bea879224e9f7c0132de982b2c551e40a0c7c63b8106efca69
+DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
+DIST gdata-provider-3.3.tar.xz 85628 SHA256 1a1751a5dd3d941bb28051c1d3af5d96c6c06b00c1b2d6b2442e312ec14644bd SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b WHIRLPOOL 2b77c9343437633dc8b26365b6f172999364b81b4928744e0eba0d0de50179fbd845085cc4fbf95a0c068a9b76bd2280db8f9f349ded680686ab6cac949bbcc6
+DIST lightning-4.7.8.tar.xz 1951252 SHA256 b31acd34aa38eff8b8043922794f9ef6e2dc67740e7689462991bf9517f15756 SHA512 37decaf4010e48cf242e76c5d73caf96f7b1e34c67fd465fb8b33055a6986d5fa7b1557862526224ab4ac421df3441e974d297ec4a9454dd63a039683ec46fe6 WHIRLPOOL 7494f30e08e74097179de6f44502b91efb2b65cd9bad4f3961678496c1fa376e0f5a77dbff670d66225e49a7ad11f24d8097498678fb128409e9295fc9323292
+DIST lightning-5.4.1.tar.xz 1891296 SHA256 2c7eb418eeb54919542cb097c76af8c61ada1738b30562a54dfdc1091a416e7f SHA512 d5e6197f53443f7baf2c8487293e59ce825bd835870c2b38c64feefcf3a20ee46a41e9c2320f55157bed1a647ef51e97b74efc1d1ad41be34caefc943bfdaaca WHIRLPOOL 5e046c862e4fe9ac47a7be4d7fc3342ccb67b8f76c1f8b542f75a8b81816ef7edff9b478525e2fe0efb7d21eb0fe8cec3ee28185a73338ba59e84de3dd622c4a
+DIST lightning-5.4.3.tar.xz 1891484 SHA256 77185d29bddefa121e27cdd061f0cc227b1da1097b59493ee4138ba573a527d1 SHA512 e7903ffbe729c9608647c883202e668bb0a502ad55bd5330d073a92f336a2be427e364829a609912a32432c9a6eaa2390f6b8bfff4e61e87d03f72a4ac2aad03 WHIRLPOOL 9c7765221196080ffc69a3b0a8f1d77f59a3c9a742151049ff121c9f99adfe134165f3fafa6fa950196a809fa5103d5ef6527ca23f51af3394e74b87f95bc50d
+DIST lightning-5.4.4.tar.xz 1872584 SHA256 8f330202f348734228ad5fc599a7a626506a3517393cc35708129084cd70262a SHA512 2168766a1fb3c4c77a3d13552518ac9b3e78f23a016a37a439b885b6eb56de369de85d2ba4fdbd201b54dc210493e94cdfd8d7dbe0573ae6d9d145ad97771ddd WHIRLPOOL b802126524d6aad3cd2399f2631c9898557a7b8491172ae29aef5f23d9f9f3e271de07accecd3bc1cf992e1a9c1944d02bc9091b8de94cde7fcebd3f7266bf18
+DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
+DIST thunderbird-45.8.0-ar.xpi 490775 SHA256 4b8787643041672aad90d1297eacad510ec88d04461d19680d38e004add14f21 SHA512 95adc2355a27d916f96c43bee0d4527990a1eba8cee9e4f85cd6da9202ea0ff4fb89fde127abce03962e185b272f5bbd1d8cfb032f6f32c7895bf3dde8d35a2c WHIRLPOOL 76ce6c4ff429fe4cc51f87f297ebead9962503ca1fd68c8e0783c43d9898bf370b00a222b7b17f1ed191f30557f9181b56019dc6ac3757fc08fdd53544039864
+DIST thunderbird-45.8.0-ast.xpi 428059 SHA256 0ead56ad0cd11503a60d5f75cd181c0c85eb7ccbc42fa69c76d3cd64f29a0cd9 SHA512 eccf877f29099445ef59c833929a50df7424aa475b1ceb432d6c10b28c71b4e25d840a4fedb1afb3106896da0afeb47a3af1b763553dc6ae40f7bda5b0d65040 WHIRLPOOL a370c261f19a1f1ef3da37abc7665d8f1fb0ba1bdc75e5f11dc923e08a0c7a0b891e166cf99273222d0aee92a4d8a06f38ebc5168c121c391b53909cd6e79690
+DIST thunderbird-45.8.0-be.xpi 469096 SHA256 2836d2485234e541fe2d227af8f8c477173051d6bd6a9db5bab6c64a74fefd04 SHA512 76c758a68685f974d174f5787b72e5f1955ba9be00c305e2e1b1adaeb17e4e7bc765d1263d6395cb89656112c936618d84cb80a7dc860684d49a4677638eef56 WHIRLPOOL 6413aa5fb12931034ebde044f747213bf4da53036b5af9184ffb1c61d6822810669561e8290ec02c016b2add1e25a4a57469dbe42b91384eda6980edb70c9a2d
+DIST thunderbird-45.8.0-bg.xpi 524300 SHA256 b0cb9a7684809eb71e3d79ffab9b6422c97a4dcf4cb8cbff14a403c79a425980 SHA512 519c1b0555c0bc8e53e28f50fe14c7b5ecd563ab6b6cd1c30886f9d3d7982fe3fd1712c9ea8ca34d2d59dc63ef62fe69bbaf4610c2d25987e4545d82fa611f50 WHIRLPOOL 870a9a9d8648e47bce395eea957a57ecdb6c1b1c1cb5832ce9c594dc4255e276e841e0a1e63e510bb0ac17792882cd89eaaf70c938379369f4c4039370fa095f
+DIST thunderbird-45.8.0-bn-BD.xpi 581440 SHA256 2c34a6f9a28605551953d40ec868ed42eb605d85ea6012bb868adc2251f18158 SHA512 de6f8090ebe80131e0d5aeef66287290a6292a12abaa00138d6c7683b8b7d3f619f0b731bc7f45ccabbb670c699404c2c1d606adc6b307c70370224fdd214aeb WHIRLPOOL 348d6e7d5f380cb2a5ca478360011daa487663ed544031e6ebd820354366eb382d63adf503819c8b39240f617ac866b07de70fc7601143473933ba81b207ffdf
+DIST thunderbird-45.8.0-br.xpi 466000 SHA256 058d05618dd1c83dd854203e043c328ec1f6937f5b85f9ff50245f7e428b3c01 SHA512 8914cb4869e984ee1207165b5a8ec7fffb822312714dff20e6d1084fad81f596eb310643a34b166dca84739d69a3e8b86ccee2ec0b9dcefe1d6ae39f45ca4f99 WHIRLPOOL 4729b1e8067b398676adb8cb7b625f58037cbeb366911514e9c5f344f7867f8c24a7431531395fd23a30934309d63716920c28969324647e1d77d2a0c471c94f
+DIST thunderbird-45.8.0-ca.xpi 467980 SHA256 89e8c63dfeeb9a8a68f28278302143c2f1b71193bfefacbbbcdf70cb47357046 SHA512 44382e8fb0070dceffeaeff0b78b415da5ff092f3ed50a6a7af67b847ba83245bfa3a37dbbeccaf856fa42de36887b02cf0e2628933e5819e65b8a3d8c856e29 WHIRLPOOL 3644b6abf6448ae181ab89f83c15ce0c5982229e8cd235f48303a359b07d7efdd9c577793f738f2b6b92bfb7f7f64c8efbcab2f037d51321d5de4333ecd909ba
+DIST thunderbird-45.8.0-cs.xpi 474327 SHA256 50e02729a1a4740a3964b085572b8d17c551cf71438d24e8d1845073d5048ad2 SHA512 3c5df605e47145db9687e23fc4b455ce8b8d0e50eb16a8b96e3acd47e7d483721f425cb496e32a211b34d982b4932469da4b4b7cb0ba0a53865aaa5deacacb12 WHIRLPOOL 60cbbec26155bd3299a2b65b62b864e2bc89f4453a94e13339f23bbb9aa4b2a4ae29c8d951e76486e76d756c6837022da2c9724038baf155532fe331743b1663
+DIST thunderbird-45.8.0-cy.xpi 456120 SHA256 46f2549f8568db23e734fb95bc3836335e104867b1467086058f062f2471552f SHA512 9a4ac0048e78ae5e3c0a1305e4f36ea1e1dddb22bc371de77481127273ccd906765dd6add6a7b2ecc8e476a0a9f2caba85c4ce823e5de4e2f211afc17873640d WHIRLPOOL 8f981a3752ae0695d7b556c52bd0b7c68c6d29c9edae26346a6b9d1cf4eb9926d9153c96614ce7326385eb82c18c6d85663b1057c033e489e8100a7b3ebc6c99
+DIST thunderbird-45.8.0-da.xpi 445595 SHA256 b7fdb27246d5bd78d3ffccd83bdf437fe791f820ca5ba38cad19f5286c7380c8 SHA512 876953576532dd644a1b649c317d29fe9ac89113d9d7ecd8b1ad990f762806e9d90a6b1165041b66b71af288240e7ba7c580b8c3e61572bcb88f7e87810b8a96 WHIRLPOOL 45df42811b73d2e1a37499273e9c84e3d8a6313279110455ed66f83b2401495f3be9dd17651110376754d833d45893e6170bcf3f2cf08669171a36adca821924
+DIST thunderbird-45.8.0-de.xpi 451956 SHA256 41814028f2aad3d30ab245935095d5f7c2ffc97f79d731eed9977f1cf03b0018 SHA512 73416783898e78d25b716ea36f3d1ae00145eeaf29373fe0c54f1286c229dc791b0d2fad0841049275fa6e078e5ec483fa8ec6acf0ff64f08a54af8cd4d54e23 WHIRLPOOL 9ffb7e9776c99adaf5c040480023630ae9ec04659b372932576b76b4cf810f8f8a82be6811818b0af602c9558c81847d263d5013c0d9acde01f565fdf7b7b144
+DIST thunderbird-45.8.0-el.xpi 514358 SHA256 1daf788364a9d738fb2a8324814076d8a058cff96884ccb0a24cb440fdb9f42e SHA512 152191eb7008afbd1f7e0c7440643a02d9ff2e1c8fd129322fd928e38acc48e675e0859baa22d53ea36264104e34192ee5533f81ffbd49493b4c1da14b408e97 WHIRLPOOL c4d1e0252689b6f1c35f530d1261c63fca01a47689650afde9d76c71f717a522ca327c60e567d4cf7a6d77315d019bc0d97d44ce68e8973d7603d105361734f9
+DIST thunderbird-45.8.0-en-GB.xpi 437603 SHA256 cf1fce9ed3442c4eb2e669968757077f79c68499ad12bebedae86259c8b83153 SHA512 44438fef8e21c2ab6e1e2ca2558172bb6c30b254f78955e148b5f9d28ef52189573f54a89cecae2cf547606b12497bd36ca007312722069324dc1d9cbe05c1b0 WHIRLPOOL 9b6a572cb4c6496ed714894b97cc4ce3f4db45a2bd6c188b553a3471873362982236e6177ba2e5eb4c43b103ed56ae3b63a6f770baf1a0f18a2f30cab5d1cf32
+DIST thunderbird-45.8.0-es-AR.xpi 464684 SHA256 20a757a4ee8f349e5578a0da2daa94b0ecd4c5b06315aa928ed429d9bab03d89 SHA512 60ca7f034f06fda50f90dbbfa7c3d27f54d4eb03cfb570a45e0b3fa2fe59ecb9fbc085ac76fe869f6405538ab28ab0fced785887e190f490f961be60d71fb9b2 WHIRLPOOL 65ff895ed3ccf2a906736bab3780f06c892e9c6eba917e93439595985f91b4c1f8a78c8e5b132784e42e2385bf5581f46fd2499d5f39ceedf22cf2423c7d2eed
+DIST thunderbird-45.8.0-es-ES.xpi 388000 SHA256 2f4872efacab2e2ffa9c561f882eb6f6e323f02a7e3606efda0d0aef7af38516 SHA512 08163aefe5686aac1b6b628e5c887d9113a7dcfe8aececbb1861c8c334421816426d234821df34ad6b0e5c79f2b029414b73701c762b0b0b1d272e7ac427c880 WHIRLPOOL ca478285e6e49613d0bdf8e7a68f8d1797c386be947c5a84c9a8bf6073905c3adf8e80d9ec980a69df005b74a7e130b2ae8edd96d7734719d2f37dc1756a51c9
+DIST thunderbird-45.8.0-et.xpi 458418 SHA256 44a8c625290a5a306c9d1946c1084a307b83595dec6cc75cfe809428f490fca7 SHA512 60f69efc44018896f608d11c781a9cd45ab340157d2209ac7741fc0f6346df45fea94a5df0617153cb85fbbd44cd13dfe55adc49a095e0518445fa0ee8dca101 WHIRLPOOL dd372aa204bf7dcf31def62837bbc0119f8ef067afe480dbcc776c09db6c5d94ab417c46dca8a339d3781d7a81db4da2601753745945e431de19476693dd7809
+DIST thunderbird-45.8.0-eu.xpi 456708 SHA256 a5d9f300bb05cf0c3e5eddff963ee790a28ba7706530697eb7464f202434923a SHA512 b33276a681c4c668c5b177ae2d06f47f4e2d92f46d0b878bd16b66ffe941fd777b42291d218040822056c107978a8695e1ba8d901dd5372f4a6dd8cbd0b3e284 WHIRLPOOL a912c504aa946ea58ccaeffec4b08bb459078e8566d546ba7843693e374ff6bb947a59b459cda656f8eceab11bc2a28690977512943464dbdd31e511f2977719
+DIST thunderbird-45.8.0-fi.xpi 458335 SHA256 5c0ea0d794d4fc35d1281f5ab14d6725d8c42180b242da9d65005bfd036467db SHA512 ecec81fe3b2ca83951e7e464cbc06519b812dc0e6baf7896bc7c89166f839f41a1a707ab16509307141beeeca875522e46d7e97543e5a39f2b42163da0f9ef81 WHIRLPOOL 9457cb008504a46ebfcae99843d9a65d7f8f43d40d81199a3fafd6750e2705f006e2c193618ceba1559ab204dd524100f57c140cd9e9b21dd7b9b085af26d5c6
+DIST thunderbird-45.8.0-fr.xpi 475466 SHA256 b0cc458c6e5605cdd3ec237cfd679c14550b3a7c1397637602cf273a600a013f SHA512 380aa558c6d248928b7f8cd4d045f6f0e2aeb09700db0a9061a233a935a56f809a14402be561f5d8363c934a4fbbb457c82182a2807da9cf348dc2eb38b60f75 WHIRLPOOL 74fd35e6dae4f7d11321387cc8c18a1589624b1b404bdc73f6146a51f33d45d384f121b0cd347c170f16aed5b8a7631781800c46beaeb07501b1745232ba87ae
+DIST thunderbird-45.8.0-fy-NL.xpi 464757 SHA256 6a2f11240be608e90938c61fad09c460490f7c4418da71326ec3cc8a57ce01cb SHA512 9789b24e38aa03240f2e4c3330ec201467b87552fdb94ac1d931d9e3dccba61bf899bf12bbb8a8dc251a787b220056e424597933ca0e9b84e20f40d3dc7422d6 WHIRLPOOL c51fccb77b4f356621916a39d40c0ccb802dd25d462b8092608d51ebd3c97a474d290045227912afd3899f23ea9ec6f7aa0242120393af90e6996f61da117ed6
+DIST thunderbird-45.8.0-ga-IE.xpi 480317 SHA256 4725d113908caad379a0a360b55ceb94c192e9b5475b497778ab39b8e8124c4c SHA512 e3bfe8e7a7dd016a017340d390a8f6f3b62da749995c282da5b0d410b379cc5e2c28e1ed521ad83244c1c75d06839d2d4a1fc88a1d645b40855bdf193392eb68 WHIRLPOOL bdcd452fb8b685bacbcabb0fb55e144ed836bfc1eee7db5ab189fc4c4667d291712fbbbfb0e15098f87330bbe7739a957633bfd5facb82c96fb3651b59045bdf
+DIST thunderbird-45.8.0-gd.xpi 478297 SHA256 a9958f7c2383923e317c9cfa52fd2a853f8acb2673425206a1a6ec5e9172796b SHA512 143e3d210684d35af8bd544259d379a312b9d1c8f06c08021620b1d7d5c929b7e2a90dc16b6248c7162e43e7f86de03530bf357dedd693a0309e3264ab37afde WHIRLPOOL 406df015630156d0a72d53ea955606f8388c7b85a91d2996949c043e1f8fc5051945cd85083b3eb81a4532456da1c27bb18c585947451470658148a2885b0c67
+DIST thunderbird-45.8.0-gl.xpi 478580 SHA256 9ebedd43676f8b2d4a5de96e092b01642f5a325da872d7881b2515bc7dfa09b4 SHA512 fa533ab715c01d0a4913d09c49db1c95aa1a228bfe260ae7c8d2bb152988719e1b7693f09fac73afe146a726ef5d390b1fa4d194038ae4fa1d0e551d848cbd8d WHIRLPOOL a6946bbc076274bcc4637da86aecc99d32c7f7b7a0e2914f650709f38a02cb83e64857295a3aa284af39364fb7354891de274323fa0db6b2d41e967520ddbaa1
+DIST thunderbird-45.8.0-he.xpi 497962 SHA256 a476c22a63fda28330c4e03957cf1abe407f9ac7041f73a9c157185441e7e5e3 SHA512 e634831c0d51e82eeafc2e7234da5a3b62b66b2ff17585565ad1a0549b04f334375b05e04a5540723eb2754dd0032ea7f33b15c288600d1587e0bfd699256030 WHIRLPOOL a9f9c8fcaae6d42e12e95bb9d5e10d5f698d7dedc5755422caedd69c56aa42be777acdf02f77e9ca285c74171bdaff1ccdb980a76de9085f13e6137e884c2b7c
+DIST thunderbird-45.8.0-hr.xpi 463959 SHA256 a434724f0977c9caea5abf63ce8f5587d0b8496aabd18403ee26deac0dabdf1b SHA512 56161baa7dedd371337b9f49eaafcc72f8ce7f46d72ab1984e27fa8f1ecd442806680752c6d6932a192ac8ac989f514821772c4c5f2db7f55b10bfd14c3f6839 WHIRLPOOL 0ff0151993bad54f0642558f76d0cf00a9fabea10099c9173c5c4ebd2cf3952ada7aaae34f74f630178233ac8c3bf6d45e94cb9b91192aee6ccec4a047d1142e
+DIST thunderbird-45.8.0-hsb.xpi 479414 SHA256 e806a0b1a6652fbe48e7a8bb9eba60194c94188931a5ca03e50d6fbc4fbbca92 SHA512 18dd3e88a046075c8f10fe96246e322f1adcefaaf0967f119d9ad5f9e3144218c07b13f785041f503ad22eb7e15276e9dbd75dae93c2853771601e2451ccdc7d WHIRLPOOL 13da0bce68c405426035552652296c75d694d579ef1037f9444d95d38b9aa9617c2f6e6d3748f325c01a8e4cc1b460b52792f2af067c7c760dcf8aba8ac7214f
+DIST thunderbird-45.8.0-hu.xpi 479583 SHA256 1cf236e60fb7097842d27d2f791821c63eee3e62323e73d9a288a9b888ad5fa5 SHA512 13deed772fc4ed049342a8ef0be185c28a4b18fed9f145badc8d2c619ba316bdba5bcb10e700aad178b7dcc7f223a62c65489b6001b122667e2ac272b43e6994 WHIRLPOOL 3f074026e22decb682c949e4044a211464f04301c91839e3759dd715c6a558ba7d097f806e15a1dcc50a167083c986c7699c216645f73afffae06f80507f4b6f
+DIST thunderbird-45.8.0-hy-AM.xpi 518883 SHA256 52d988c204b8e0cb421f9fdfac1ec4a21c18cd6a40b43e8573494396d516a652 SHA512 6444329ff8c906a55b3d2f085a0d8480278761469523225af5f2b02bd167c6ddf6d157aa6d3269ac3a828cc78e6202297cd26e80bce07fd8f87a9fa78e1ff50f WHIRLPOOL 8e7f8236644585b29fb22e037ac7cbe3a7197b89a398f1aad8ff3abc636dcf1b394a1122a6eca19c64b01dc1cb9967c77eda19310645227ecd50bfaf152f6027
+DIST thunderbird-45.8.0-id.xpi 499982 SHA256 2ca9d5d178c1dbb5559e93702b4b0d7049f3f35dac01e616a79316b825251360 SHA512 1453f13ae056524bdbfc08d67b44c615d394225d9786b53814b033ce51b8aa4f743e383bb7c754cf12ca61652fbb201670636b2ef324386f47437474074f32a8 WHIRLPOOL ad078d73375d56c5c14ef9ce8ef8100c96a796d96fecfce15d760dd411abe3a3d439301c22ceac72aa7045fa0afbfb81a5f17a92485f0956e031715e3ee6f87b
+DIST thunderbird-45.8.0-is.xpi 462191 SHA256 e5692f833bcee4cd1abccc0a5e9d64dc0f51f30b515c9e4e821bbc2e87549209 SHA512 f87a537337c651c45f3a9eda2278288ed591539adb1ffe291d8406007502011c5c043e44664b3c93c12036224d3a182c6d0204af06966d32e963db147c64e78f WHIRLPOOL 4fa2deb51751aace911915962c0f913ce9861b8828397973ec7d67c864ca9972b003726a6395b07a0be18e581b1ca39e22025b0af5b7b8393f8c6032c5aa5718
+DIST thunderbird-45.8.0-it.xpi 376889 SHA256 7a551f3c72330531723f97c1d94aa9ec21ba2191f68f172134c95a830d8cd19d SHA512 a2d055136a1c455ba9abfae7dd9d50295ab67e9983f99829652083087bcac14d61e239e92bdaefba3ed4023f51bc1c2e81ebc19d22f90868ec9e11315e8f14d1 WHIRLPOOL 394b436e19637170ea26a78b141ebe145e8741784e8ee7ea9c6104153dc9fa8bad56af57ece0b4107c0f92be3be618d4588eb69b9f828e4b364e99f30d76ef23
+DIST thunderbird-45.8.0-ja.xpi 519552 SHA256 2f2bc3f468490efc0443743c05c41ce37058ab4c6d8b5c515f068990134336c2 SHA512 45150b526c159cf7d968fd800e552be4c9df2e735ea023ebbb08457d50cebfa5c8f611db0bfe8f43aeb4b1b3d671b4ae20b2722669f6798b4d6d7db4e25cfc9a WHIRLPOOL 33e440935801c7b73dcc86b41ca4f3194bf53ef958363e4ab1d11283cf165fba75a6ab008f238886acbb663180b26bd5d958cff1cc4500d6ad5efeeb87e5c0c1
+DIST thunderbird-45.8.0-ko.xpi 487418 SHA256 397dd7ef1002f3a861757a49abaf77ed4b5809c5370c85031ccdf0465b4504b8 SHA512 244d7bdc081992362eabb550cd4e1b592d491368ab52b76c0fee6996d52c69b48c3f832dbd3a1f32096e335f8cc7d9bbfeb1c118dba95a9e42502b0d4967dcd3 WHIRLPOOL e173b5e5fa0711a7e624d1aa219d6cdb14ec1ffa9527b7a592a19f8f6e800e65a5e34be85945bf1f568ead7301cd53d4d83331fa3d1dc6554dc813a9cf945afb
+DIST thunderbird-45.8.0-lt.xpi 477736 SHA256 b3cbf1f89527f6e4ab642843bddb85abfd650d0e1318664d9d899dfb0eeb071e SHA512 6d91630b764291191506059019583c07512b1e9182dd9707f6bf8d2b98aba76bb25568699e76c96ddadb969e5312a78635ff0069e75c2d900ede70e71a1c8190 WHIRLPOOL 0692c824c2d243343afb9e6f8549174f8aded052023586bec05b9c22366e4d51d55cc198203d7f46631789e9cb474fb6b1c37a3d0321733143266db91e8274d6
+DIST thunderbird-45.8.0-nb-NO.xpi 460011 SHA256 4063b519f2e61dcca7d8f121f0664dbbd4f70afe3cbf6b2c9e5c4d95baaaa94d SHA512 00747dc8fca7ddae2d2fee76c1f0bbd6285063f673a3a71c825d86b34d5491f5937e70eee5e9aaa35a9a6b90ff148acfbb34227811f87697ad959601775bb612 WHIRLPOOL d7d3a337dc2795c9589c2a40ff89ea9f6f29eddce79c1e3a231d01bf6df30f8c07c9df5f10bfac65f249ec296659559c9a85e8f93c1f055148ddb6463afab0c2
+DIST thunderbird-45.8.0-nl.xpi 456664 SHA256 1297c46ba1690567bccc33d085f2deb0871447ce664959f3ee9dafa028d80688 SHA512 3f6a9c793f263b5cfb00587e42bba85f330fb39b5021ad80471b959280e32513e7f232cbf80366259dfe7119ac7098585c7d213ae62d74a23e84b8f81718a7c5 WHIRLPOOL 647e5f9beca17f4b5d24dc45152efcc44e10ce305d37f156ae42196c8d80f5d50de8ddaa2ba8d004b953b8c3afe0e0afb9df2a0bd65379f748f566e54fc272ba
+DIST thunderbird-45.8.0-nn-NO.xpi 460880 SHA256 2e3b52591317080d5e0296eb18f4ebe78166eff1c5c8f7466ee483a0b9cfad16 SHA512 df073f95c78beb20778082edeb05b9e741e7bda12085b239e8108a6f02e5e453306e016c9f82bd9c866ef4bb3a9decd4697e52f0ed2a1591471da16de8129d56 WHIRLPOOL be5ded4d94fa3e692f3e24c61a0c89004aead629bdefe0758b141442868d13eb5b6db9b6a62f312689c0a0ab12912592c8157d94a73874ea0709ce57ebfb1788
+DIST thunderbird-45.8.0-pa-IN.xpi 551068 SHA256 9f114808ab6733d9c2299153a1e361cb98617b97e286a12579e09abf3f9d2975 SHA512 9e3bb9ee4d43de1ac1635b646db460562d4c243ee62770edb162d029b7bc0ad02d5ce8d72398bd679375c4116a9f3ed2983558521443b433ec69cf3865207393 WHIRLPOOL 9d412d2fa081eda87defd55e9a615f7c2d2b75f816bc2cc56e8786a4febbf313933322285df2d606bbd7da564cfcdab230309848b16af4c1d28a933daff64daa
+DIST thunderbird-45.8.0-pl.xpi 423867 SHA256 52e1fa5935e439a7845c947e3ae9ba0b883da02bb6976e66aad9677c103aab17 SHA512 779542856f803d0a1873187bee0e60be263300b99aa7b68f081bbd5e269403b90e573f344b3e3a4797b13b796ed8c77e862159e112a6c7bf27f74339d991acfb WHIRLPOOL ddb4137a3ec3f349b0987b672e0e2bb779e996d76d422e9d97054fef2b2f0bea9a2d3360706c26e89810cb7eb97de5b01ba5e2a5d43f71258c5a49bfe1575780
+DIST thunderbird-45.8.0-pt-BR.xpi 464682 SHA256 c0b2966560a53b11355d241d50337772bd000ccbe518bc2ba7b2942107057744 SHA512 c94a56740e41d6aab5bfaec4003ff929b0792193a30107bc60c5a333ef6a07d02f728f6310ccafc88e32735d6d9214ef41041492831f4b16c491d5b8d009b7f9 WHIRLPOOL 9b61e250d168ca73b349bdedb1f5516f019201d576ca4afdd072704b010fa181314f0cd59cc4c02aaf241800afe8f6d957aa395f07dbbb67013993f2bd08f04e
+DIST thunderbird-45.8.0-pt-PT.xpi 463751 SHA256 8c69f5a3911917284a715625acc4cfb9dd18884de3cfb841271a957dbd9a54aa SHA512 17655a5c35757cbc073253b70114c0b724be62df88158dd2e06455ef62d25d54a96bfb4cfa0616548d6c0d4889c28f1e83de5fb29f068fb0c5de068db78368d1 WHIRLPOOL 0195038bf388875e0457363a7e0aa0f5ec64a6fb464c657992ac8d7a2a0b6c4ab2e01c3bdbdd68e7ccb422a780d938fe3c9933b669874701b92710812ef1c4e6
+DIST thunderbird-45.8.0-rm.xpi 462651 SHA256 d948b70df148a6f220ae1a92ea3126c4246c2f4c5edaf1eaa7876142a61ac6b2 SHA512 e2434f123d5cb49b9654bae9951d75ce9b08d2666299d0e8a89c0d3c64746136c6ea4c6a45b18b637c3ab7c4d38a9256794d532b3173074918b486d2e38f1b9d WHIRLPOOL 6c63858d25bbf74a8db5b3789c5a62b44f5168659cf53830d7de9e5814f30a632fec0e7bd3787f15db14fcbe302150d48697f741961f7497327daac84acbb92e
+DIST thunderbird-45.8.0-ro.xpi 468518 SHA256 cdf68888750bc9c5a87c0424a60e33afc075a09f9ef68b5fadd24d9ae2cad48b SHA512 d2243647e029c79151de4457c054a1bbb956eac1701a9ef005a1e64a7126ae4f954d09457c28e9d97321675f4d85bac2164210fb14ca8035f9a986ab9e40f206 WHIRLPOOL a7d07b4d35b32076e2a3875e27c7a212153f9c935812e3b83fc86f4941b0702965b30f597deec60b723eef5172bb60d4019afeeacb79cf166d3fc60ab63ad243
+DIST thunderbird-45.8.0-ru.xpi 463891 SHA256 cc6f6236f43e22b101296a4b67879ef6c1c58ea6c78f69fcf4e6d17e5d1439d8 SHA512 1186beffbfab301e97a232861e6d38bb772a26642eea1b9b7362eb51df661d1963784023fd7c22b70c858280769f268024dad5aa51a70763bc28854ed1af73a2 WHIRLPOOL 684679205195408db3f41752d8289f9f142529c95b122af1ab3e619d496a155e9cdbf9786ef324acf79ac838585afb4e67f17323b0582337916040192420c633
+DIST thunderbird-45.8.0-si.xpi 555996 SHA256 a7c66be4bcb3220101f6b234f2e6ae1f468c0894ec5391896be20caf17f8cc45 SHA512 92096b1d049ba69b0b03de843479b4cd4574f2d1a64582d109329d787d59b6bac97817098a4b1c91e82b55066f761978e1145685b307ebc122ea3db756757756 WHIRLPOOL ba1991323925010d2aa4213adfcd1022bbd7f9df01a960c70f38dc9985661a8956ef3aee01927a8aea4f389ac91e5c15c4ce2ecb1ea47d3abbc72581f181a3af
+DIST thunderbird-45.8.0-sk.xpi 481492 SHA256 c8dee9828ad164f3deb3dbb42a003ef3cc97ba2fb509289a9f10277fa9827495 SHA512 7b91748d06716f3a4baab8d2f2f28d71bd8c878143848d89238559e8a1301c0af8deebeb0158b53da2fcda8fa6a6afc9c58061912a0170ea8de475d25e7b3391 WHIRLPOOL f35b3e3c458503e6ddbdc022df78a8ff5bd7d30d3828cc0ed451f31942ae360b9d29d97c7e6919cc7f5f234071714262a7bba765b68e7bb7d58cf594a166ffa4
+DIST thunderbird-45.8.0-sl.xpi 462781 SHA256 45c6d8f89d1f83e37890a1dd915579ac3cd4cc28d57bc2ab6d31e63a63411d29 SHA512 54f97cddca0d5674ff3338f098fab1f2f5fea07c25acb906fb8c850eb102c8e4205b834c48f1711fe8b658d3980634159b3280d9e6912393b568a81c3f676865 WHIRLPOOL 7790e6bda30f1025c789438ee1e00edc606242760824c9606863fafe98fdca278f7d0401d6530b416ce122a70f3329e976eeb5ac762561483bbdb964bb371598
+DIST thunderbird-45.8.0-sq.xpi 469535 SHA256 1cbf09a27eeb122b00992ad9cadd4a2bd74fcdf6a4dacc33e89b99a3558d66d6 SHA512 dfc9b4da397f7c3a95ec3abdd0632ceaa75de12caf1bdfb5201e4067cb249ab58531f1ab641470d08f3372068cb46734d2a55ab4cccc69706ea439139c07de2b WHIRLPOOL e80aa99c91bf78691ecb5fbff41be5513d91fa9dae40fae9925a9eb590b8801e03ac4fbba5f461a5ceb5e74ee7fb82cf9cc7058c34ed895ff8025c751b517c23
+DIST thunderbird-45.8.0-sr.xpi 565466 SHA256 1374da12111a405d4c366d3bbdf71ddc8a5baeeb580ae12bde50867829e628f1 SHA512 e58e73f3e3143144e48a4431fb4d0089b5232a78b6d2dd50711ed681379522c72d93f005d5bf1c428c99c43f697b22886e351e32faff61a56f27caaa6ac6f955 WHIRLPOOL 64ca49ee1f1ba5c1eb024545c3d6e55643a2add419ce265abe715476e92316132a776cd0fa32b241f46df9bb18c382fe217eef1dade45a245027cbe0fbb630c6
+DIST thunderbird-45.8.0-sv-SE.xpi 465434 SHA256 1980c0e617df8d91a525e1df378d49cea5a0c09fd74bca0e3e57e90c891d52ac SHA512 c35417bf7149cb943f438273fa8b1ba4cbc6399022f7575613318e8440feb4d2fc48eb9fe4d0d3d5fbb52982147f776133aebdcf31ebc9d4bce5d1690da62930 WHIRLPOOL 27b6baf2d41dd8fb9c370c4ba438c3679e3652b0dd5f6a35b4de057bfba78b9c653ea57e7c7bcfbd34aaf1baa7c71e554371f23f5a6138db303c8eed35127f79
+DIST thunderbird-45.8.0-ta-LK.xpi 579219 SHA256 66d949eb3fb687e71a019c558ea45de24932d6b7b04937ed0b32e4f82e6f0b6d SHA512 cc4d57b0f2eeae5a6da6389e95f570a4b1ab0259c4784fff6ef6c371c5527459d0c3703bc75427fae593c60eda92e8c20854bacfc87d0b7d7eb81b0ab1e1f5f8 WHIRLPOOL 2e7e8199529d7f06755e0ba27ace6107b71d19a08464fdd814b83c235b40349679491ee96aadbc97c3b026e0fc8c1948b523f249fb724a6d8f725ec63c16d59e
+DIST thunderbird-45.8.0-tr.xpi 467621 SHA256 8e116a53f97624e3e9f27705a2a37efa8d7f2d25dad3dcf58a9d9fb1c3019472 SHA512 5a09443dd76e6d46e495a29205131971791e099dab2edbf62104d851efe9adf403e1a69da10804302a858d1b70dfc7c6e8ede36bb3587a550065fe4244a7a306 WHIRLPOOL df4f9672c95c5f70497fe1caf13db4b5484719435f421292cbbed950b9dcd01d1f6e488ceadec70b24e6e7bef5b7bdbd246e4478668755bcb1d63213267ffe51
+DIST thunderbird-45.8.0-uk.xpi 536438 SHA256 168d7efd879e77f7ad7c3e4b736e486110f1a8225f487a440e63df412e013df1 SHA512 0ab41507494de563e9c1acac7dd97efb566393b1a8cbbddc4e9f473a0d85b816d46bfb24d5c85f6943df7bf59c49d3715baa9209f4e9338407d2d765d1293da0 WHIRLPOOL 1ba6a5cd776a204ab697f607171ac38aad50c3096213560d5c24c6190bdf0084c088a467ae3ed0eff3ce763502deafd7386c205eb7e2e29f1076ee17bec528e2
+DIST thunderbird-45.8.0-vi.xpi 540498 SHA256 39f64a6acdc7c916ab73c279db67f0f51db77d756f2154ca22420695e8e5f95c SHA512 8b25e83624ea59a231af846e4d9baa6d7640c26d70b6e259731f7871af594435d18dd55da1341045b81fc53eb4e9427b5b968d12d6699816911e687a16dcc51e WHIRLPOOL 2b826048ef8188f5e39ccecddf6970787ffec4b663c41744424267a213c89fac8f3fe323ac00197fcced814b34a88b815f9e6fc5f03ebb4ba2585d1ec3990feb
+DIST thunderbird-45.8.0-zh-CN.xpi 489209 SHA256 05f2e3d25501ef42422e9e2624f15ea61f48a355148d867c29626af1b09a769d SHA512 346e15d8bec51831c2205a653e84735abfdbc6db1266a8545d138ed11f492d58f3529fc15870eac3c7c28cc60300de2fde85b6927338a2c8fb03ca90449f8a81 WHIRLPOOL e00e1628bfc9f260f40f554ddef9da7a10f16ec7eff86f9d9602f2915c265174009e2c45e8fb862454aafb3073f4ab88fb3a2079acf62c3c36bdf42272cc9968
+DIST thunderbird-45.8.0-zh-TW.xpi 490850 SHA256 7de83d5ec93a97bfebe8a692313998c02479c8bef705983d3f976360a4a02094 SHA512 0b473f3eadbcc63225c5f2b90d6be26d79a139aa72120d45dcfad4a22a20309f11c4565e72bbe9281f0ea0fe508173e046d3f747975f1619f6717835361ab70f WHIRLPOOL 20e7590e8dae3ae07e4823ff855964cefeb479143e7761974c715a214f2b48f9f957a536fc2f300cd3da61d8464c073b0015ffd9576b6e3e6998ad7cfe8112f3
+DIST thunderbird-45.8.0.source.tar.xz 201199348 SHA256 743cbf4856ad460a791f6b17bff175053fccec2af1edd8e8295ac6fda2634c28 SHA512 f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb WHIRLPOOL 63345a36e14334ae33848773b48d19b8416c1df52bb21c36408bb1f34d7fff3a0eb60ac1d00d8019f5af6a915b08bfb7d40989e16e8c07ed9d94de86ace5a043
+DIST thunderbird-52.2.0-ar.xpi 604235 SHA256 424ae192efaaa942346ef3d65fd119bbb94f9a30b584266bfb2a0b7e34c5b143 SHA512 09a02ef659b8bda73b8ead897c4486a83af514a1d304805bc8220c39b3af375798d93ba711bcf5507c133c612fef57cab9c87226ef542b6309e13f8e75b7ee4c WHIRLPOOL a2a6e7838a4f92e5dd457f9315f6ecc6da7303be9fe2e3acc8d18ac585306445f2dda321498f08aea5ddd7e5eef9149bd985f7f3f46c4498862b488f42cb978b
+DIST thunderbird-52.2.0-ast.xpi 541173 SHA256 d58912dca0dcf5e9d4c9b057e8016ea671d5b13111456e7e727f69aa99a94834 SHA512 65f55004c8debca434bb19a6cc89b1961a75d763afb6f7cb32aa7015e61141ea0942330be76c6c072801e92903222c9ce912bbc9248b3fd4a670a44bfbd8d9c5 WHIRLPOOL 44d9f4b89702a870f257cc18c585ce2064ea3e39a0dac5b49810166e1d066693f389deb202cad44228d736d46b2feba0b8674bacce661d9ae101d433128605d7
+DIST thunderbird-52.2.0-be.xpi 570932 SHA256 edb307b8958f14b099dc7d03c7abbcfb16a0a1bfc626c765319b08c57400d4c5 SHA512 1ff7f6eeb3f32f4d0718a15b2d188ae04d26c67746a6bf974992fa7b964832610a3c3cc62bbd4f89cda2e3fb4cf15f958b5871b61b7a4e0c496269a798750a9f WHIRLPOOL 20f549c6ec5544ad8f62a104c3493db1544ec4e67d81a3385ac7bd9975a0ef500e6ade327b24f3789fe90fcd435c3b67678503ac37d570b73087b847369f701d
+DIST thunderbird-52.2.0-bg.xpi 634897 SHA256 3d62c2ab75e5390603d0f72033cbc38a9777d0b4c0c7681a125886ff4fd9afcd SHA512 b86c23f51fa0d1a304ee8fded82e5dc18c93c3fb4fb544bdd1d2ea2a0a56234f4d447d9de9f2701223ffbba9f91d4bf009870e92ce3fc8e18d636e55a06518ab WHIRLPOOL d7943c7f5a3c182683dc58425f5e5773d72eeb8e2435fa851cb897f37a2d56bbe4cdb39e8b976924c6835083cafb19f9fadcddfde1256f28e4d6ace2b5570bc4
+DIST thunderbird-52.2.0-bn-BD.xpi 676901 SHA256 3a511eb3f6d901271cd2f7af84a8df19d06f8aad126a5bcddd4defc82a23767f SHA512 a309172f6f0984f753df30b9790449981876f07a959a949d67e87573f1a62b63ad9e5d5c8859486cd43fbef6a2be3966b19fd9c1f182f73c43f60e64e1d3ea3b WHIRLPOOL cf3c1a533935e021cd575b319a561e0cfce4b8b988c9f2b80c69bda510c790b7cb1940dc2a87093a99d1706f5d379b80f3d91be640d169aaa43540674b0febb4
+DIST thunderbird-52.2.0-br.xpi 559380 SHA256 3d29b1736d106c66742f65fb9230d7898cb3b12c1d8cf529ae42830fd595f31c SHA512 4ddbe4e8d5c886a291afee82992f4e8ef1c62d209e49c683c1c1cb8592f74e56d502b1968237a98e366b3a4623cadce63ac992a409759602c5ed18da8742f68b WHIRLPOOL d75903041a96cd8548e8dfd6ec009e466b9d4fe13ac13f193803d98163173f05a495ea36d846d5e2be18a11df2a2a782b26f20ec15e09bf68dfefaad48c3bc6f
+DIST thunderbird-52.2.0-ca.xpi 569910 SHA256 682cb5a232a63c02ff158954573dab18619d4af9897d080a121a9e30d8611c4c SHA512 210e6af2dd6fa89148dae25f157b27f125f61f2a1b999afc4f155023cdf860be828b98a979037bae94858cc1cfaf130e9570460bd9180b4ba720efecb9c93b68 WHIRLPOOL 7b62cbcfddf920004844d6dcee242b4441896714522af74354cd15b4d61d89d9840a4f28e1fdf36db08d2b9a1202851efc4da9e94caef5d3f412accdd2b9f267
+DIST thunderbird-52.2.0-cs.xpi 579150 SHA256 9a5cef39952d952060f3df64703afc5f21bee94f3dabc50b2a5b01ad02baebb8 SHA512 a42ee84170798dc6df51edea15915aa5480012a91a58428b6acf7fedae18ac166bef4a3ec5c40c1fdfc8df9ded725e475d7eb4eb9addd3b7a6082cf443badbbc WHIRLPOOL abaad702338ffce039ea1922955eccfb6d815b569ab713d3e3568bdf639ac9fa49ffa7418617c138d2bc7fe28bfa0ca597b031cb255bd92d8d871b33595ce4b0
+DIST thunderbird-52.2.0-cy.xpi 554858 SHA256 741b41bf185a6abe7f3ef8f59828b40bc8e5404e50c4f52323bdb0db9b49c192 SHA512 d384d8342b4979d726be02bbc0982b07289dc865b7895a421cb1d23ead9d594cb6e294f11b1c8eb5bf9c54874f974ba6a8037ed0b06642f4d831fad75c7cc9bd WHIRLPOOL c8760317b941a91f4baa0b030e3c042d2d8ad59b0fdffe87cbef272e6ceb950a1160d293d8e14ed612f7b8c141de24c6d3bc88c55591b253e75dd723df08f1f3
+DIST thunderbird-52.2.0-da.xpi 543335 SHA256 0125524c59d726a24ff9ffa158f1adfaf04f9f3adb71f544cdabeea009a82660 SHA512 758071e2a56bcaac0202f37332792d6e6d0380e9771bbfc343926edac7855de0a3337256e6c906e6465cefac560275bd47848d583ce12e0c5fca255c85e5a782 WHIRLPOOL faf45b733f769ab9e709967d8b11c5a14c6588ecf407cf3b24667d7c0a72813097de9aff98af53a7fdd8a5d78e219742ea9f18c641d582e2a9d6bcd3fcab69b0
+DIST thunderbird-52.2.0-de.xpi 555744 SHA256 92afd27c3b937122d4d3e81ffcb436fd2bbb7a4fdaeaea0a79974afd39638565 SHA512 4f7f2f7c75aec17ad66c2328e0d03de2fc85f74c49a7703800f86cff32b78f0d45a152d3cee9d75b26583cb0f552f02cb64f0a24186c1c50ce950813db5f4e16 WHIRLPOOL e31b2adb1959199c629ad61bfb2158448f3f391b1a721a83c0cefca7e51185bed6ceb6ad1d2779d342a5dbec176e745b19967da6474f68896591ba6ce6b5305a
+DIST thunderbird-52.2.0-el.xpi 662965 SHA256 fd78564a39aa1e820c1dfa359d4ae051461c6b5f814e0a6d3c7d5c1601f681f3 SHA512 4af0b69ac700bf2f5f859206a4309d4fd1f34d849b43605b45bf89bebfb5ad764fe986dcbdc5bec8a64c8e9b912df8fa78209cf13aa452b44ecb677cd3920167 WHIRLPOOL d71ac12f2351681147733e5079dca1cbceb082e9282df212a34ad52d9d7d42daa0248ce636e2ff5850259e4d51fee914b42e56c926d9182ac375b34a7fc10b6b
+DIST thunderbird-52.2.0-en-GB.xpi 531234 SHA256 42be03f5fc0f55300f3d60c6d98698af476d0a37dc66ef000a090539d29a6cea SHA512 01bd0aa54530eda4841d0d1766d0869fd2457caf5e1537968e06f2e84d112cc0bdb91fa51d2623f5b43e767b7d44d208881d6de0d256728e64bae6808de19797 WHIRLPOOL b993290fcc7e60bda563053dbdac30d4968100850b556f4110c95a51bf22c72fc18554908f6fad2892a51ec72fae4a48513ab3f56466ec6c0782523a32b84d99
+DIST thunderbird-52.2.0-es-AR.xpi 565995 SHA256 a3edfb99fa29a576f4af13d57d24d79292b38c5318018bcd6d0c6374e2264dd9 SHA512 26a8e4e554581b815789f91d743533731339c8ba749b4564b689152d0eb30bcac7592f26750a7cadeef1da448dfd8e706e73c415a9de5bc34e0de83536f9fb50 WHIRLPOOL 47e70c0d23d6cdbaf323b4bd33d7193f8e48e6b6e7e55cb28c7c1ce385605ce951d3c99de8436b672ea50d4891674e53a6231c4c1a1d067db774cb6734651a1a
+DIST thunderbird-52.2.0-es-ES.xpi 445464 SHA256 9919e006e770d92187e673945dba931a5c77c3c6c90e0b1b921768bf526da5d2 SHA512 80f127cb505b816a0e617215932ce2ba632be0b0f291f0d93a5faaa6c9096ebd8e3a0e6e2b5bba4c98373338454ecf252e64c7ac9cbd2485db92bb72e072afeb WHIRLPOOL 7bc70e325587c57af4ef10a881ebf627664328460bcca038b1feda20efdd6ef049c59cd968051d1dd5bc157395e1a410850b178acbc3b02ad28a7df90a73486f
+DIST thunderbird-52.2.0-et.xpi 551661 SHA256 fab144866c573324e8b6170486bd983e1a97c79087c42686fd0194a8673c9a02 SHA512 9374e8a5aab5e1742dc1eecec748c103c5b822277ef64aec6ecf438f1251989bf2929911f5376f79695a1e493fa1bbf13404aacc7931be60c26c106e29d59df1 WHIRLPOOL 7ecbc3d57e3e772449ff0d31252d87be80385f378d2c653e626f668a7bb27dec1362e2067fb71aa8c912cd302eb841274c008e770dd91682c10694baee5eba7b
+DIST thunderbird-52.2.0-eu.xpi 555536 SHA256 5191fae127cd551df43037bdd3433a14e3acb414d740c5449faec01dc105643c SHA512 f0559b09d4bb97163c457215107e048ff3cc52c1c95615eb67bcd45e6f27751701f5527f90916273cab873944957698b7bca27700a96419a4993a35b24526814 WHIRLPOOL d055c12db71c8eebc72673cd72b73095a9c611878b1f0d4d009eff1e4c2ce7d76fc5abd046ac63606702de2009d2114824e7a22e8d7789e3796d091aa1c20d80
+DIST thunderbird-52.2.0-fi.xpi 550669 SHA256 b4fc72d824cb2f568a46fd1b6ab9f936199555685b931efd08179a7c7b8222b9 SHA512 25a6e45640681ef78fba01148ec6382f19a9118a88ecc177847232020fa30f7fc72d435d7c7cd3ee59ade4c3e5ebd29ce64e2109828dc4ca5df1c171526f7188 WHIRLPOOL a49f02a0c2fa4d62c56b8545962d2afe89fee8fb718f8a88a9b308da9e8491c8aa02c9145da0087c2278f2c18d39555ed74e94fd41176ab8ffe9550427f694af
+DIST thunderbird-52.2.0-fr.xpi 577560 SHA256 e37fee38ee14ad875904c784e1d8930d3c7dd5b06dce0950eccf89ed8120080b SHA512 2d35e7ae40a816c129b75a69f38aba73fd6ada80f6edba083577bce979143609056e1e0a9063b3dd03711957d561b034d6fb7724c36d9e901efddce643bfc87c WHIRLPOOL 9e05d987f77dc426de53628f7f216425944e52061d7af36ea7227b2774722c83d2e8db31146bf3a1ec66968433c5976c05d9c5f7060450d58d91f7ff50dc547f
+DIST thunderbird-52.2.0-fy-NL.xpi 563632 SHA256 ee3cfd21ffcf456db4dddd46100f2c4fc9b05ee07b289c21b1f8f5ebbe3979f5 SHA512 e114bd53414c95f62518af2b5b7b3bafcecc5bb622996e849d7ae22447d47d834b9f5ffcd1311cbe39f6139c645ce097574733997dffa6c2de4fbd8a7f6ac483 WHIRLPOOL 5411465416a18ac300415b0a1c66e0c98f24aca80a31134d0582f7a5572413f745b74ae2410088ddfb47bada3f76c2b6c5753954bd63d4f4734dce5657e3b662
+DIST thunderbird-52.2.0-ga-IE.xpi 583556 SHA256 a1f2d24f299f0fb9a36211556a2aac2fe83938966d6181897b7b615375472600 SHA512 22068c9eed3a10baf8c7da19d5943c652d44bf924f55ff5f45d7405322bd22d659e4752b3ed0e3ad08c5ac1709a8a111202a4a78ac6c0d2509021ff6ce47a3a3 WHIRLPOOL 6c2698ef30e691ecf283c0e5170e6098675ce4a80795513d97a36cad0715cfdec2fda9392fdc53f0731fa38c10e66c5ba8baf962204856f1c2b322c3df487956
+DIST thunderbird-52.2.0-gd.xpi 574065 SHA256 bb432374ccc2a2d2d2fe2974c9f216f6c766c52b4849507302ad4c5a3f4e801d SHA512 be5d3e590cd48a7342abb7d8b8adf074e692dc2ee99575dcd48408493c7fccb7d1fddf650d1f2f40aa0fb8406937deab5f3302839459cd48b6558ca7a1b27ea7 WHIRLPOOL bdadf128753e6d857a1564df6e58a76f016d8c91137ef73967a3ee5fd5477ca8ff272f240ae5c3b46b3c25cc25fbd11ba15520d00a6f4177d78370fac4de5613
+DIST thunderbird-52.2.0-gl.xpi 575150 SHA256 607885c5f322a236b9c49a52f2ef5a425b27652688313f181e999d5737291183 SHA512 c85b878c74132c899eee4504fe0026c420ea812e1e3b4ccfba57cbdf700462591daa2f66d751860cbbe1a8bcd4b1494fb533a1d77261f94f1f59a2eb5ac055b6 WHIRLPOOL 8a2c2ba121de153f74d1bd8e112da9325fd6a2551ecb6da7739eb8f7c712ce9326ee552c1f1ea91e7b08c1fb24eb98d1bf0540aa0706793729755b9c351dadca
+DIST thunderbird-52.2.0-he.xpi 592566 SHA256 1687ca74aac1b3a6c18e7d81faf4586ce54b5bda52884523ee7063a6caef6537 SHA512 5bc0da1e8ffcc544b30763025f9087b6158e2a903bbfcf1ee8f379cfb61987b76872ea2e217f630d8cde117abb6717b1f4bcdd63cf3618296295a9beb5aee210 WHIRLPOOL 6b62aeb9d36fc30dd5e0e5cf7062c6bea6ad973a9e125a229a3a9b9e3acef2a72f100cd75836e9641c7803f85fe5c3bd10c54869d3b63acb9e3a8bd3f2d75c0c
+DIST thunderbird-52.2.0-hr.xpi 564779 SHA256 2a5cc0f419bd5ce12c87e014a4e5320ee8d382e8433a578ec5c31b7edd686b1c SHA512 2f319ea12e77e9351a52ad05a065d5ec3aeb54cfe9a60602d59fe39dbad1f1ab7a1a13bfe4de50faf616a2e332e2469cfc15e2fcc7e19f0edfc6b9075b198ab4 WHIRLPOOL f75d6a2b63f4897a70b1468e13ee89896a1940e2a27196ff0252321d1bd348d91182c4a6afd3f4b513aa7e23598e0db7762cd574a709bc1e7201e186c9c598d4
+DIST thunderbird-52.2.0-hsb.xpi 582241 SHA256 1b9f58f1769d99bcd9c0d94b1d6666814ac3d45c621913b954c025ce68898dfd SHA512 517e6d27f7082ae84e678ad8d3674a9d938246533f84617bb2269868ae828bcf6d3de9a578c558a225dd8a08ff19c18237caa5efe012e5500a0b8e4396cbc19f WHIRLPOOL 07efdff9efe744877b76989db8c2695569a4fc35a5df1c083736669cda47a950c5ee220b804b552f1c447de99439e583f90e791f833b343f62c7f33f7c34648f
+DIST thunderbird-52.2.0-hu.xpi 586446 SHA256 f839e809a1000559aadb8415440a7ccfabcb22061e211c99b3f72891391116a3 SHA512 a84ab304bf00f924bb45c8312a00c064e481542eac334d93eb81cd1bfef881a8bd2f96ca41f41770c1ca0e9bb56378e8bbcc1c99c50d920912695888b9ed7723 WHIRLPOOL 33ad80dd60765f00917afacddb11f9a1fb340e09d2829aa1b393246c9b65298dc5821e2dc30240cfe939a7e5674ffebb59c54ead26cf1db9f7cb4a1cf41a7f35
+DIST thunderbird-52.2.0-hy-AM.xpi 629879 SHA256 ec00dd1926387dd993b4353e12e14c16eb7d65a14ec0ccf5ba13b075664d14e2 SHA512 2ca91023549e26f383f3bbcd30b4cf35ff5d88aed2e4b1dbf285b36942d42be8cf4c3eb37b8b4c2f91ae8b68bace21958006743c51748c650ed1a6910e8b1fed WHIRLPOOL ee7594fd65fe74703cd7fe8cd781c3a54a92a8c4b9570a572b91f975023cccbc88a4f000d21a85abeef17221d0ef769e0798b2ef8f7d1324826aba027ed94127
+DIST thunderbird-52.2.0-id.xpi 546526 SHA256 5daa6be12a764c1066c2f44d850bc03a43651375e5d7ceb870414c88a8dd0db7 SHA512 a7fbc76b7bd5594cdd96b64c01e09d4e436ef7f727cf5a7084f44717c72c9a4808f758dcbb6d182ba92721e93c93c8b9211f0b5580d7352127feb84592cf71e4 WHIRLPOOL 3e7d65522d83067bb8aa3da719cee48acd7de6aa01cc929ddb4d746e1b1ceb6fc8cffdabc9e3ed986082cabd9f465c6e6165732c665a462545261044755a0e92
+DIST thunderbird-52.2.0-is.xpi 555712 SHA256 0eaa42ef9166e6026b8cf5afc4817347158e56a4675a3f4c0154f089af14b1e1 SHA512 18333b098425e66c7d83b12162753c3d9af2e1b45e85585f2bc95386516607d3ab6d97210cc5e920fe80f4a95590b3930abc81bc67837c80e6a7fa750442e982 WHIRLPOOL b13a7a5acd085ac2f6d2f8c4948c8e3e356fe22fee8a6382d65a002c13e85dd05490e77ca61d9e1326d1ce5b45eaa041ecbc089902cf6e0c04ee62bb1b6b0cca
+DIST thunderbird-52.2.0-it.xpi 455408 SHA256 e87b9d2c7bfa1cd67e7cede067477b7df53c77d3a303e2b238194091c63ac9ca SHA512 40458b1691fb43bb30f58dc835b7e1888680bcad4b024bd44ce5d8726dbeddf42912961c6a3954b24703c41ed456514af99ca70efabf451d445a8ee96228b905 WHIRLPOOL 406f2e0e27283835ce9b517393abec87a0440d269ed69e7ae9143fa4a747014d3287290a17fcabd6a49a9ff4266d91d5d7dbad9e625bd14c06aabdc6c6557b37
+DIST thunderbird-52.2.0-ja.xpi 630052 SHA256 b9814223eadf18de6d89c197e0f1ba047c2da4574dfad7fde04c8b446f9c677b SHA512 c6628c01d3232a2ecd25f6003a3e26379fe89dfa202e28d145a1dcc4907b6612633db6ddd46f01163021f1aafeb555f04b3b5c16c8d65b8d725e7e3d91b6d08a WHIRLPOOL 99330f95560bba6a81f53bf661176a870dda56c623968e91b59299b3412d0eeddbdf191ec226332eca92008e310b939ca8a099579094cd2d14db716a3ecf3aee
+DIST thunderbird-52.2.0-ko.xpi 595517 SHA256 73c05dab4e8cbec972873f92a2342a63c1995055c3f729704e49414edc45972f SHA512 dbe9e28bb4cfca4a52a6be1cfda1a7fefc07d44a753db9e984d1f274d372c166f1d4f99cf5b1c3465b3fd2d69439ba37d8e84f55e4dc0b3ba5dd8e53eca68573 WHIRLPOOL dea7a12e747f921834269aa4effc09e332104273b21814a0d3c4c41bcce6a2d83404dcba682830d426b061d36b98dcb8b176bc3ed26fa5559673c3005fb1d593
+DIST thunderbird-52.2.0-lt.xpi 580598 SHA256 c927d1b68a82024d6e4cab14c56b87b9adf4a961181267983a5d9653f7647940 SHA512 0e4ba216bb7b4a1dd12d1de488a30ae2b5559875c4bd844b670f37caf039eb292ea00d0889ab4b34373c10879a47f3965f3181ac3ea6f68f404872632c9c6f20 WHIRLPOOL 14646196e34f55d5e9fdfaad29eb07a566912ef19a3d66541bcc457494c0690b01a451c3eff3351ef64b5f729cd7af594f5c0994742aa155796ce7c8acbf1b53
+DIST thunderbird-52.2.0-nb-NO.xpi 551104 SHA256 aa33839d0f42a614f3e8f23fa63e8bf1ce44bd9705c708ecc4b55395e4ca5f0f SHA512 c1a81d4ca4ebc97cd6cc80055a6164b9e11256d7f0ccdacc5507007837d814bd078a5c794ab2ad1985824328537787f748d074d210d7149f6d3cd8c842ad8269 WHIRLPOOL c294ff22c29c3e56dcbde8d89b45284dbc524d4cc6b3f7279873aa2918e5929b72535b0175a3574bf339ab5cd2ba4c53e3706dded3626ed5503b5baba46e6766
+DIST thunderbird-52.2.0-nl.xpi 557957 SHA256 c395b6e16088d300514ea1302945cc7f1f3639bce8e6b7d42046c0944ae3caeb SHA512 0059bd6b887f54d74c3193f30c0a77921ee21c127e35c38bcff9f0bb04ab2efa09e2337c23de4fe753b87b8e4aaa2e65ca8ce318b05aa0f65b1d1dd0cf03541e WHIRLPOOL 0c36b88afbd429b98c59bf695ae6aa33f6babb7fcbf340f95e8b720bed06f9c5701bb3d198f5accc0a60359ffe92ee33b054451c058c1933b6ead9deaa0929c8
+DIST thunderbird-52.2.0-nn-NO.xpi 551891 SHA256 057fb42f2b851534defb0c36084a937138dd59742181b4d0efa16dcd93c05a8b SHA512 2ee6c05bd9dbb7f58bfdbd662d15b93ca1b001df39f3a960a92445bbb13ac7ca1760fd1143d38f7c356c191f1515d8ed0faa91b56e5bda6ddfba17e43c12da15 WHIRLPOOL 662286b713c5be4d89090a0d2a161fa58af2b4b8f62d03840a4737f659896175e51ad3646a1915032b6d78652fb0f550ec592f8282c16736bc7841e621598c00
+DIST thunderbird-52.2.0-pa-IN.xpi 646568 SHA256 49f3ac1e27563c477dd7ad42f778379aaf071e96cf872058fbf17ecceacb98e3 SHA512 200f10414438755c5a5c8d0451bcc650af656d0b6c51badfe83acd7329fb344637b4bf51192b823f23637ae5437fa58360882ab93cf9218230b73f2a278cf7a6 WHIRLPOOL cc62fabcfcf69a3b0e53946e308217c917bac89fe8c1f49ca610e8277438bace9fc4ed44c87098e6491d1d5be5a90ed95d985dcb18933e8b2d89c24997a57851
+DIST thunderbird-52.2.0-pl.xpi 469901 SHA256 a7ed41198a0bba2adf92954ff178928961dc432597229e75d75daa5a9f706231 SHA512 98099e7d84a6cc5f12bd4748345f75c79bc37562e27d8e555882c61d9c14e3fd6e8fe94fd34fb7d9dcc2cc0acc630ef5577d90ce926cd95423d3b2cfedb2b496 WHIRLPOOL 894fbeba6ccdf8d05cc1e6a26c3b5a6bbd4972754e9fbe3b645a7d8789be7d46a47fecb7915e1ceb9e71ad3d8c8e02b6f9cb877a94353b60a3402d0804a078d5
+DIST thunderbird-52.2.0-pt-BR.xpi 558224 SHA256 da8365a51a18c6ace1ac5a58ba8fe5edb2d32a64118a1d938eb615a841655a75 SHA512 912b41981c2482dfe477cada344d20811d7948d28fb39552cf695dd3e5abfd68564fd866a1cb6fe669a58743e92d4a02da91ebc326beb5b23ce2dada8d6b528d WHIRLPOOL 8fc69e63c70943963dcd35e0039b40dbd2cbe3450b5b5fb5bae4356399793e17d592dca5e111da8902f6a34a1cf7091c7a006559bdb854e3c6d4e3ce0e50f91a
+DIST thunderbird-52.2.0-pt-PT.xpi 565624 SHA256 4e247a47dd56d544e5240a5f792a38a8a44de633cc025e5af5e3bcffeca70132 SHA512 65c2d39d656fc29fa99f0d9a26f53cb2524c0c4df19b3ed5a444cd28e134c82d6406433d38489efe8dad0083ff9cf09ef9c8826c9a5f5275b242639a143d99fc WHIRLPOOL 5221ff671bde5bd0cf9481fcad9cbcfbd9087d5776385195b563a492f3ef4f026b66b6e2390ec15cf7a61d774935ef286ee13b6129bc1416d2f9ff54cc4fee6d
+DIST thunderbird-52.2.0-rm.xpi 557605 SHA256 9a782add50588415e96aee0b17a75370383a64a2e84145730c0b3396f1aa1b73 SHA512 5f18c2c12d9a381468be5b791f3787554944cc6e6896a9394f776e54beb728415c8bc625f2f895c98c55810646b8208129367265e16a9d78d6a12ad68ce4c64d WHIRLPOOL 5b2fcf68e631cde969e5c9e1d63d77c341a1dbe2665845c4dde8c72faf600d417a92ca3127688561f5f957aa997dd3eb5f32b029fd0d89390447f651f2f0b595
+DIST thunderbird-52.2.0-ro.xpi 570529 SHA256 bb9a6a73ceb544a35f6c0ebb98935623f0c43805e0365c4ce97db6aeaa25ef61 SHA512 b41a34475cbef8dc4b0b7cc220ae7baaf8c155984fa6880f1874bde7f545a17c085d4dd855d84b82db055e35be723045f99a588afa4dada678c00e42250880ae WHIRLPOOL 10fdc8f544c7adf2bb29658ba9a2ff6522371012ffd635622948098406f4fe4c9f76c36b53391e795e1317f4f8e8b95ea9e6469d80bbf822d1d18a4dc18489b9
+DIST thunderbird-52.2.0-ru.xpi 530670 SHA256 37f5b424f061c8b4eab8fa16f2f586e8522afc6eb9dd073b50264012e9608908 SHA512 30059b50d0dda443ecc1ecfa566392d73dc1794dcfdfb9bb302ff88adeccdbdfe4173d7faa4535b03437d196efeed5ed627b8d96a2145e0cc798c17462abc08d WHIRLPOOL 6170a7813220203508c761516db32232605d95d35066f69430fe034406cb2056abf6211e94c9524329f1546386169b48667b67de3642bb1f4deb8ee8d6795db9
+DIST thunderbird-52.2.0-si.xpi 649010 SHA256 bfc5dd5e9689385875536db910bebd30d8a969abb55e6127434a0677214dc650 SHA512 aa49eae0ccdf8ff6ff6f4a459b7b98f41a0631de34e4b24b7eb564d61e41cf9bdfe0fbb1ef53f9e6232d8745c594bc4a858b6829134830cba8be9bdf944d594a WHIRLPOOL 651166e593f43bef316e379279554143f0c727a931ff70a0cb646583ad3a1a544373b3b2cc38d80271e4ce0fd91f2ad6622e2a302c65c23d995621557b0e934c
+DIST thunderbird-52.2.0-sk.xpi 583882 SHA256 c6e942a5c37dc99221d5689d7261b60bb8b5781b20f1b9d2b5877f5f9678fee7 SHA512 10c61e35e77c2f1cb71619aebe7e5fd1d573fffa0f978b5d04ac6270dc69358e6f3975c64695ddc204a69dabe090433c666f6d64d859d987b6933dc863a998b5 WHIRLPOOL 6d7722c5bda4cea0b78e5223be5b75753d1a28bd6fff9ccf61b47a88965c833623dd3ee2cb2aea2310386b28b962bc76edb7a05ebc082b356c04592b7984799b
+DIST thunderbird-52.2.0-sl.xpi 562834 SHA256 c9bd345ad38dafd2df16c02781de2fac5d56365042e55cff2f8fb31fc324b1c0 SHA512 e374544f96df75b060d21321f21dbc40b277b172d16e1633e838c0c252c3d50b1ab57e0ba23d0eea357327dcd4dfae6d18a0d9b2058272752d82f23c3e1f328e WHIRLPOOL cb0c429863fd24f7e9e7b84e5f9753b1cf30e6c668b32ea3d63bcd3555f8fa080e362b2ef46d79cfdec146548f133f784f9c385e274bb519232ee0e29f7a99c9
+DIST thunderbird-52.2.0-sq.xpi 570616 SHA256 6a7fb8cf069e584e52f59565d65828dde8a0eed4d1607c1dec254a09fd10d9cf SHA512 f4c26dcef08bdcf493fbb7609bbff034b437312896805cb18deaee6014bb2f17b5393c36c8b9c9859c25f5179ea9ab3bfeb6787bb71d2e0222abbe8a2995ffc1 WHIRLPOOL e95594eeefa407f19b0560afe39dbe14796dc1cb69cbeda9d512f37b009b38362e852a660ef23740788e4f7aabdead245755ac7b67a4318b7e8e5e8fc010508c
+DIST thunderbird-52.2.0-sr.xpi 609020 SHA256 be0e3d1e7ecda68a188cf65a28c7bbd5395d42c46b0dab54b30a3e1f7cdbcbf7 SHA512 89cacf96d959c06e20dbdff8925054ad649017c2b5ce37a275a545d8e9915686a210401786c83d38c3394bf7e32f530df109a7e4be98887ed89ca8ba12ba906b WHIRLPOOL 80346953b877f064e62fe8bd57eeb2fe4d7fa63a3e64d19a784c902eb9d10294084e14ce3465e34417205ed7068a274176be2e32f87988aab7012a59a5776eec
+DIST thunderbird-52.2.0-sv-SE.xpi 565777 SHA256 5b0b4396a82c82024d1e99bc27634466c5435fe176c900256db94a682786f574 SHA512 9438dd655bbf28dd2460c344f75535afdab4e8bc7b8d4487c8a37d51f54f2df2291a5fe59371b960ebc1c5c309c1736b0558ce16c03223dfc19ca7f712fd48d9 WHIRLPOOL 2deeb08c046d17e9fb5c6b42ba95f1a1a4d37cac6b5dcc44ad488f8274b40ff76ebea28e156b205406fe0248081e160df765a1d8f654907d580dcc0d5ae397de
+DIST thunderbird-52.2.0-ta-LK.xpi 675039 SHA256 e35af1a970fca8f866c899697af58fd5ea45baf963d31e817f88e48333fcc52f SHA512 9d6f1fbb48eee1408c746add706563fd54c42b2846405ed37a7f605240c0618668139b58a06f9faa3efec26966ad30ef293c7d3929c94d8d8b3aa5bf914d8f94 WHIRLPOOL 8b20eb0a3827587e97e977d81956db04f19d5ef9b0fa1ca59339890f2d238620ca061127dce89e59b1d80ab1695f2123158234e854991fe5399ac6f11a9646a0
+DIST thunderbird-52.2.0-tr.xpi 569926 SHA256 39385fb150adb928c7cfd1179f89ddf2509ab7f61bd0c9390bd276212d99c1c4 SHA512 7459748a7b08324c377457e1eb585c7cb9a49c7efb9ff39270d0dd4afad1fc223083eadaa7d2a4efba9ba8d3e52febfa62564505e2586ad94a28b86cd39fcf7c WHIRLPOOL e88f8c6a489af568e449947d245c33ce1a87b1a47fe5c4a63312f6be71ff86bab2ebd6104bba606895cd87987a9fa12396f66304541f5823808bb6ce6cc5444a
+DIST thunderbird-52.2.0-uk.xpi 652855 SHA256 7a506c7cba0b727e88c84281b41e934b02d6b2839cf24e88aff15aa1074eae5f SHA512 7e4a13f2a8c71dfb277663d84fb74f23da8faa5104d758bd828ae5b79a8128674efcac0e34e6191c65ad0ddf4b5e62ce3fd3293183dc0ee7b5b26bdafb9ca06f WHIRLPOOL bfb255e71defbb475ebf6bd2f42bfc271377bd1b36724d60c9a914d49de13910e13a822b6eb74c255f3cc1eed47b44b0c18c909fa90379ab1e50378749216ac0
+DIST thunderbird-52.2.0-vi.xpi 637164 SHA256 087e715b010a13cc69f984f70ed399f56ffb8307b80c6ffa4391f259891671eb SHA512 1f611c17d9ea4d0f39ad888365f2b5d6f85db96110c20afb376c0031283a53084fc68461b7b5849026d24bdf40b50bdc2d34d625f6b23b52d9135a78049947a9 WHIRLPOOL dd65ac2a428cc277a38593cbbfd054836c049279d1372aa5fda3aaad822c5781187c6c280dee0fce10a79acf2c7b3ed11fe6d7b0cc51f4e35585e243e5dd5f2b
+DIST thunderbird-52.2.0-zh-CN.xpi 593612 SHA256 f6739274b662ceaa55ffa1779a2ea45d5b8932ee43c60ae1dd69a33c43ea2071 SHA512 ce4bf6f280b6dac98b904347d180af3c1a97faf447c6d8e4ac237e9a8cbc3af5fa966af10b4edc8e851c7f8a91f071e35f44b9abb3fce83b57a838de742a5565 WHIRLPOOL aaa4192bd646d50088819ad4b51c6f2ba48e975e29fcc9257fb7032394f94046b1d8029427eafc9ac4844e7e4a49bc1cc611367bd2e1b6547a24f902464e2780
+DIST thunderbird-52.2.0-zh-TW.xpi 595729 SHA256 4c74964975ed98997c09c00597ff3093d6b904b373259cb7499fb51b1e45d7ec SHA512 8e00f57f4132278d5fcee22cbc0df8fed8b5c3a34b3c711f461b4b6f708aaec4f5d87a68490aefb40255789b69d5a0dbbaae54ac30e472bf6802ef6c56dd007b WHIRLPOOL c88713cd135349e340b085f10ee16fda6dda59c630b0c302153f1b24e76b1d7642d0aad7f731905029bf6673f404cdf22f8a571a2984ed86924f51dc1f529302
+DIST thunderbird-52.2.0.source.tar.xz 228453944 SHA256 c65c66244ac113996002bcfa9e387f14291163cfb7009a9126e3a8d4a970e72d SHA512 e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89 WHIRLPOOL 54fb8bb90613a8debe3d5710e4d62acac20ed64c430de28b2910629d81dad1cfe894e6768065bf4a10e321ed2ab8d31fa7bcba775512414b2bb50c4939c304c6
+DIST thunderbird-52.3.0-ar.xpi 604235 SHA256 a96dbaed8c14e113c2e2295422c4346ed97cbba349f6464532d4585ab6a5be88 SHA512 c8a4c362499f9f4c2babe878c67e85675d65a88b8d57cae2c1c11ea0a36afa8f21ba200c848f883ad46d1c94a468395e2aa3f9c23a68f6360e9ece73fb9ecea8 WHIRLPOOL 81c02925d19fc8cae32b7469431805eec80a8fba360a21ce2a1283ce97caaf33cdf5ab94f87002173477dcb779b5ac168047f2fd02c41b9c3c16efd348d89f7f
+DIST thunderbird-52.3.0-ast.xpi 541173 SHA256 eb2614092cebafb0d326ac318bbd76d5e35a6865fe4f0be72bad871bc703584f SHA512 fa42be4913a6a27c94a7c8cb2c2c53dbc8bec8d0de8410883f16cfdd26cf51321dc58494abf1ce2d3c7b9c6b84eb2911c475c0ca7a5d5bd0f7e36a7995f8a1b4 WHIRLPOOL bff8aa8a9e5a4d268754d771fe72d08a27e18d68b09d109adcb1f8d0d8e26f5dc02e29a2a1842ed1d429f7a107c64f60fa5a9d10708e88b461d6875a632d4d78
+DIST thunderbird-52.3.0-be.xpi 570932 SHA256 b412a5cb7f2752d1d72325356b9d0fa124af03f29e45ceeafe3b0b9fc0c7e28b SHA512 afa4232ac6ce70d896f87a267234fdecbba8a037064b7a603264ca5e4e5098da906328568c5002ef1c05053a8470b04118a23ac6cb2b0335de85a29bc8c7429d WHIRLPOOL 624daab5d0e26dca644eef7a72c4e1345a7d532a6ba8663c36afce986d0a970f2eab69533462692dd1e94c5adcc9a52dfeade616ff41438b35bb7a842a4511c5
+DIST thunderbird-52.3.0-bg.xpi 634897 SHA256 ff093e353378ae63727aca8b95578d89d369c6b86e48a030d893a9cd8ad77922 SHA512 6685e2152a06b171de0866ccf9f5eb4c5f8d6cc300075d85f9dbc2ca8116ff94325390f9e4ad96c8953d8c9cce66d4db55a5b61427f1fc7dc841a35d2d225ea6 WHIRLPOOL 868eafaecde6e95f007492ef9f1f913deef92c40d39d35023830d41d18ae0df0a26b33ad856baaa999db299d9eda0d7fdf94d4463ac2ffcd6c283a4e6e377253
+DIST thunderbird-52.3.0-bn-BD.xpi 676900 SHA256 eaebfde95c33aafa0c7aa649fca093a25ed93db58e8fed3485589b9326806270 SHA512 908376496df97922a31ec60d6ac25ad6db0abca098737d581914148ae21b924027502ca71230d0b4d208dae61d37df90c1bd14f1d12b02dfcd3aed9d95f7783f WHIRLPOOL 20d056edb28f183ef821a60b099798577b4a84bf6c730a80e298f11cd0984b3d177e3c4fa7424dcd7d8cd15b054da2f4096196576f777fe28e28cc93b1d055bb
+DIST thunderbird-52.3.0-br.xpi 559380 SHA256 87819d6762d57ce02564ec3cdb195158eed635ba27a3165dfc862553f53f188a SHA512 62d9b9ebcc3fdbad653a227a612278ada74927f37f737f15272142eb62888792f2808eebef436418f301c4e9d45eaaf7ec74c4de408a05f2bb96859af09336db WHIRLPOOL a29d9b3508c920c60aaf66df0d87c8a905528a5d65c72c5dc741d7d498a90d6603cdc0ec2f3ad955286e43f8ed2293beb0a9e364e706d8c738c1295afead2f8d
+DIST thunderbird-52.3.0-ca.xpi 569910 SHA256 9dffc936fd1dda855d19eb464ce01b22bfb667585b983b3c7b0a74ea10e298ce SHA512 3f2e3a07af1e02c5e3b8e2cec63bdcaaa6158dd983b4611fa0628c87ce4dd5b6f6e9b74e2b065611edd616279fc652950143242b1d1608dd10e6667105b75f4b WHIRLPOOL 567880a1147707c8708a34a50318a9271525e7c3e0c0bb9cb46cd2987cdf89bff47958a14e376a2eaa5e8b6c01c3d81c0268ddf0182fbfaac065a558fe409458
+DIST thunderbird-52.3.0-cs.xpi 579150 SHA256 eb0412f1fcf7a7c96e434d114d5763c56322317633bb8790dfa3362df03be870 SHA512 718b33a338d262aaf680f4ec9cc98ae43aed7fb24d56d05a376ff66a6d4d436244176383d81158153169ee2bb992aa35ab1891befd80ebd88686825bf3dffbb2 WHIRLPOOL 34e093f48e31c8884cfeb08474545c276fd6807fd74bed1615c49fd3621e32924c11a624e9f66be00e52cfc382b0d3da062816b29c6640361115487f8d8fc3dd
+DIST thunderbird-52.3.0-cy.xpi 554858 SHA256 1a000f677941f4c28186d4e58bf6df79f4d8a47e2a7a338005bad91604e8c388 SHA512 0a2d4ccdc25ef6b189eb134c92288aec62cba40197170c02449df4f78d16718cd56952b1806936e391daaf764e42260c1318f76a7b99e2bda54701ff3b606eca WHIRLPOOL d6efc909390b1677c5f457a6fe0dcd93fe82bf01d50b55a9920601be30916640097ef45e4ac28351e9a39128d691e819013a22e4a5ea57dd5f16d32b474da235
+DIST thunderbird-52.3.0-da.xpi 543335 SHA256 583fd8b1d6034739477cc5d935a766242b7d1e4bdb869545645f893d4d80cd70 SHA512 547eb6c99b95e8736e2ad70933d8a1ff9653ae2c08bd4602259c2e545c17a0f36b2486dbc7150a0412f4d887c737ad4f65cb6fe08212aa0068e118b1f60fb8e9 WHIRLPOOL 7e127270795167710b8c1c26c40ba3d49c6cec73a3a67352ceb8de74138afb23e2d3a54541edb4bb904a8fb8f28c6cf9984f7569040a656bcc9b68146e5bd439
+DIST thunderbird-52.3.0-de.xpi 555744 SHA256 48cf4ae0856b286f4f5788abcfec66b8817dbd836102236907e826cb2ed555b3 SHA512 fb18c7eb492cb573ee61cdea3270905936e1503c550f9e50e26a404aa2122a4993faf1df58cd4d31973e6271d88ec621c5a93b0004f879d902761ae0059ccc68 WHIRLPOOL 587de0c23e355f02b74a556978de5f873a536d245ae410b8b44e9e12c362797b9b889db2e561aaf925e8b1dd14e858a33c97fb9883fbe3ec4b59c02fa7555060
+DIST thunderbird-52.3.0-el.xpi 662964 SHA256 554a62ec5d5ae4cca3d093273b8df7357b649f0b853a05714a7990667d1e8e7c SHA512 ab44992c012e47e388ccb4e54476e7d260de8b206ed920ef48a30b7ccdf4543ac194fc8a29a050001f1717258f17bdf69be2f84be38ef845e3ed920376edfcc5 WHIRLPOOL 253d20854c879b2482f50782d218d7983d37f67bf1474ddc2d46abea3203df62ccd9195a60e666b2f9f90401873d14e64355f55b73ebb8961d3fdbdd8d542524
+DIST thunderbird-52.3.0-en-GB.xpi 531234 SHA256 2cf73f099a49cba6301ac60da05e6bafa495e9363d6c0bf84caecc1a928bde8e SHA512 336712bd9c40ca8390ddfded8c4d48bc830505a8b943456253c140a38e75603eaa5e2a3750d555a03771539cf4eecbd2114743d3be81253ed32c040f388a229e WHIRLPOOL afe1506b6d69af0d2afe5e0b8df2456c0e26334a0f1198d5f2a061db760962393bd7dc9200ef92c20bb4b26c6283e551b3ade0a599b14128855115f62f803e38
+DIST thunderbird-52.3.0-es-AR.xpi 565995 SHA256 f4b32effba6b458346067eb3ccf1c0de6d30cc4170d0918b013e43cac476037f SHA512 d11d344463851d64056e1177981895cf2427d038d08e5b59b7b9f167df3047cfeb8325d7a328f19041872a4857ca1fd70949b6cdd92028f56b18b40d03da55bd WHIRLPOOL d98dfd480f0b359c3cdcbe0e213578d662fd68860155d9ce1ecfcc20f31ac8cefa61f618c3340e13652edcdcefeda0f3aba1e3d00b21afc8f06b25e4fb53d3cb
+DIST thunderbird-52.3.0-es-ES.xpi 445464 SHA256 ba01837ab8f6e520fab791c65b9897e7194e2297a073c9c1388e45f02f2cd9a4 SHA512 85eb8c006fa2d75c2318413ff50c58b472e8cf58252731feabf5f8502164798ce3c1881e5d5f6a84a587c182bc0fd362c011c03d21c013a0a435777fe5650a6d WHIRLPOOL 3d824cc55ca17c79d868f14831f37ef19b49033807fde16f55d028e306ea0572b1e2d6272edddd9d03a518294375b599c6169993f0613a05e9adb9dc815879a3
+DIST thunderbird-52.3.0-et.xpi 551661 SHA256 1fab98e403dae9cc5a890b5f36759e6c9c10c88d150f5c0d1fa97dc5f822b0df SHA512 2fd382735b401bee7fe40e0c5d9bb3b837b2a01b8692e03e5fcd6924be4cc18b26080d2ff117930616bf43d474b300f89bb9924232a4831a9f2043f8cc24bbe9 WHIRLPOOL 601d82995ce3ea23fbf683f268322cf5e34e964efd6f6fb7696af6b90f46f4b15bd6a2e8fb1f877f91e333a85456aa9bbbb5f2fecad8e014884a52d9994249d9
+DIST thunderbird-52.3.0-eu.xpi 555537 SHA256 891ca411246628ac63e41cc5e1316afcf9ace1c62eaf69e2a23777f24f4b2c29 SHA512 eaa05855ee668f01f0e99184a4d1be728e94409caae376e7ea6af38386f4c9e786f31d6ca48247a934f99c525cf4315e53682b5d6dc2c65fdf624b84e9c3db0b WHIRLPOOL c6c4c69250b50e018e3abe78c6a00906fee09aabed30f0d58949f53167ef758f9d0dd46286b38945e131d800de3991e0b36ec90e76cc49fd9b3c107d2f5d2473
+DIST thunderbird-52.3.0-fi.xpi 550669 SHA256 83944d311d4230f8e17682f1a1248cab3713e7825b87ab0511d5293772c053bf SHA512 c3fbf8c1ba80911e35c5e943fca845afa77135809d42bdd25308d6926c166f6c5a2fe910ab7acb77080743429b4e9b5025f23eb41935bdb7fa373f91774144e2 WHIRLPOOL 9ce4465b202fc28fd596c3dae92a392cbb98f667a763fa306b2b3ac5e94182cd57dbb41c708c8fc5ea8514e7de66d36d8dfa900a09c7a8c7ece70bd7d6e0bfa0
+DIST thunderbird-52.3.0-fr.xpi 577561 SHA256 e9a81424c9af8e0fe21abc94deb53a20f83d6ec7f4484ae4ab2816cd4aa9022f SHA512 4ef32439dfddaf0f8a73466c28568b8447b38326b552bc8c539f484b8a734315d73fa5a972d66864fd0e7fd46607d40107f1d2157df5c500884c32fbab77506e WHIRLPOOL 276d181065e5ec9be64b3e489050e3a62840b3f02a7bf4104d1349b94db33c501f9596f4c72e302737a0cf808523991609533434496a24b47c88190871cd1bac
+DIST thunderbird-52.3.0-fy-NL.xpi 563632 SHA256 671f0d00c544b500b420375c385e8232354fe364f4e78dbf027ba319745ed61b SHA512 2bd3d931c073f4aa490afc44c941fa901c5d2055a03dd9ec41919b384cbb0153494cbdb79808d7e55da1db59b6833e8cc9bdd40f6a498774ae813ae8c1c9b75e WHIRLPOOL f2fb5b0cde62d989b638f47e4266d9eaf06552cf1b887c44bc6a683764d61b93b5262813953788f131da8d5de7e498ddebf71882ea43216e61ef3d022929b2b0
+DIST thunderbird-52.3.0-ga-IE.xpi 583556 SHA256 5fbc249bff62b9cd732fd3ed26af3308ac25bb7ca71e5522e1b9213e22ff8e21 SHA512 197c743ceef1da05673a82b91640488300b8cb034a89ef9332e586e25d35b1d799eb44b14a526d283656ad798f4eed2a4ab3373e885b398d6809c0298d33d3b6 WHIRLPOOL a4fac472f6aa702a91a0814eaa4fc99a2b1e7cc6b81d9ee12029d4a9b755c6024f3e3d1a43206b20c1e79bb1bccfb8a71c08e7a0684d3b0ca0fb9d2e72325495
+DIST thunderbird-52.3.0-gd.xpi 574065 SHA256 fc384ea05422569d075e13c8e4063fc613f37cec50e99a63deb8c0b88c12af8a SHA512 ff1ba740c3ef11d001c651515749e1c6bedb4f1f43f455315178f51b356c0b45bfc45073f8225b1396d9aac1658247d2e3e6be58eb8576d69b87c0ac789215da WHIRLPOOL cee1f77736fd0496f471255880fd799e405224a4602f34114db2fedbb4d9c38b52ca11e757af17eb14cbaf46661fa3c849ab772f65140848385ed896a15d2e50
+DIST thunderbird-52.3.0-gl.xpi 575150 SHA256 c4d9c4c7ab51985e265b7f4aaa9af7f7f798923dc9cc2796409cd912a437526e SHA512 9c968dc170c1da3e8e8f11b0f0e86764b97e6aea6739f64b2748b2e24a7974b8d0272392dd0902b0430cfd4ce7964031ee887684f48b7ec1f57efaaca26ec925 WHIRLPOOL ebe3890a5538813aaa1deaf6e42b7bbe2c44777448bdbeed0b1dc4e4fbf38b85bb8e3ce6e4ff038615dc6a2153e26a44edb15eb34d27b41f2d6f467b30a888fa
+DIST thunderbird-52.3.0-he.xpi 592566 SHA256 d9d6cc59c40257d7b4f47ffec7e0f8b7025f219ac08a45e5b30f645c68ebce9e SHA512 22f589ce62c5ab0ad579f3853bd8f953be319751b5e1e732e2e241a421ef535599553654d396675b695535558b9bbac8bec5b86079672e5112fee6aecc896681 WHIRLPOOL 56435d4ba1559ba607cf36e829060a83c150aa07c091d83bbffd169004e0fc58a5fb4e3af70635d5e681a94a02bad278db5a23ee361a856c56d9967398798219
+DIST thunderbird-52.3.0-hr.xpi 564779 SHA256 a72bfb410e1a492a1f43cfa44b851b659d275a49ea930063c977501799f3367e SHA512 4a2154da3c9f45b898fcac0928e1f968d78a0b85a44652ee4e4c957cf9fc78b2dda558be31322f1ca2483b0e81c9874155ef16562d8d401a771267f62466e273 WHIRLPOOL a7823f87322829e13a85672886ba99a2e9b831829254d9470778187ab7ba1b6c4df115835c94b3280bdaddee5077e11a33a40c43513d060c647cd6212dab4dca
+DIST thunderbird-52.3.0-hsb.xpi 582241 SHA256 d9972fe797d7b30b642ef8950dbccc81f8ef4f7230df6d9f49983528edbcac84 SHA512 93e8960ef06cbdac849d09bdc95ad122238cb8736a31c0f95f21da863e01c9b20d5795acb55714c3b12a5c7dbd8c15c7ed484ac9fb89d9ca006302bc86c38bf9 WHIRLPOOL a0358c87ba45ede5a7eca551a927468c1f4d05a5dd25a437327eff4e8613d9e2e5c333415dfc56eef865455d4ff2ca32ffaa571a19d4800189a07292859ff379
+DIST thunderbird-52.3.0-hu.xpi 586446 SHA256 a10bb179def63b0795e871268396e8091583adaff141b06ae1ea84caf014814d SHA512 3f3eb8ab6f592c0a4154d180f5e6135135d4e648637e6d4a2dc617e3d9a1221a902e4efd8e1e549a54f4757fb369d04316746ba30eef5fe1daa7e41fb661f327 WHIRLPOOL 6d7d2b3df2bb1960a892fad9245b24ce07c8bb109f6736566880d9418fd4e85697ea13c0a70ed3f86f17683033ce4bd554d20b2e0a2be4c32d84bee200efb0ef
+DIST thunderbird-52.3.0-hy-AM.xpi 629879 SHA256 b78d7432de20a474bcdbb847a35c60622ec48af5a9d17692b3d5d4b06514b9b5 SHA512 9719aaeb48bac752c9a1309e2b81fc69e1c7c374ddd21078c9e8ea0ea0320cff7c2b53f674e6e7b1aab21e466a3f487a9fa61160bcb3e01c914733def0949824 WHIRLPOOL b9fa6d59050755cee9feffd5499c4d895ad8fa6112bd07506a80d8bdc5c6f69e853f146298040f6a81796a69a2d822796928c934b78212c371b3c928806fe097
+DIST thunderbird-52.3.0-id.xpi 546526 SHA256 06de6a7000509f8f1a9aaf1438a5ff1133a00b513a6ef868c861256463e7fff2 SHA512 43d1a9524714171da0aed28de8d22474ff2d5d3e164729b2236ef5a6d3fa44c844580db62fa7750c5c91febb0b7ec797006df7f5c26dfc95b43f44897a80274a WHIRLPOOL 6d114d068e437b64377ee5bc643e52f4cd11ea5a982715d8f9c51827d1e43a1d87382eda2ac7e7dceee4d4a713bb95769a31fa7ebbf0f9bdced99f22f01f03c4
+DIST thunderbird-52.3.0-is.xpi 555712 SHA256 8dafb8e5fd1c967ce613893c12e553aca11d82a5880822e010941f7d02e3e457 SHA512 90f25970e26530b7a14bac27ce6c49765ec074feb94decd44d2c13d3dc849ea052b9c8a07331755731fcd679e7c075425c6d73c15d1d68a5c7b84aa641f97a68 WHIRLPOOL d5d658e8d8682dd0a0bdfb8c7cf853e44d68f4a737318876372d7c3fc4ea6eb9a3d4bd648995136e90d5d06c251d15e00e2e172f26bfae2716400a73bb3ac981
+DIST thunderbird-52.3.0-it.xpi 455408 SHA256 3987ec1092b72806eddad880b5ee25d1fd930be2ade91c8277fca50de21f8322 SHA512 854a2b9d7764b73a7b3a6a47ff3fce0bc3510ab03b52b0300bd7d503057ec39dfc21178551250ec3cf9dcf662bc6eb6c10ff6bf2506335e6014ced82a45a175a WHIRLPOOL c962d2887be5e9e63cd087d010e4ccb1607dd3454083b94c3e113b85074f5bbefe352060414572e06ef3bd0188727c46b7d213d70a6b8392e87516e18a804913
+DIST thunderbird-52.3.0-ja.xpi 630053 SHA256 7024ed0f72065e103dc72c388162f4dba5102bcb96b2fb6384b46503fdc28057 SHA512 6e2ada747a817c7c07b29133cce292dfdfadc7bf4ff3e2574ac06085ebca2b08e39f62b713548fa6fa966988d3ed8129ec1cf6d54a4b26d6f3cc837da1d95296 WHIRLPOOL 60e0bfa970c18443fb7535b92ceb4e31dc2f722f3ee203d2e28865eef6832933c49a0d96ef3d0bab725295d8dd153b547805b178142f20971302a5fa63eb239c
+DIST thunderbird-52.3.0-ko.xpi 595516 SHA256 816fbb26a0a21a88633b1ffd236a73c5fb31da5a21a28d3bfb9d4cb5f9c2b7c8 SHA512 7a48d56c29f6207f5d7f53968978eebcf07d17b8ad9de7940eaf3a78850d9ce6ffb7d6c30ccd3b0cd92bcce25c5edec80de54aa68244606e1840b4fe1c604fa4 WHIRLPOOL d1dab1b505e76adddfc1de24f814614c2d9e9479c0edeac3bb5dddf420286875757cd3302d88502e1f5e5b2e51cea6c6fc0381a42d57eafe3f5b7eddb3583cb8
+DIST thunderbird-52.3.0-lt.xpi 580598 SHA256 a8505ea9138478c30e839fffe1949d63e536f2a812c2777a315a59f30bd1ddb2 SHA512 d8fd427b5f25de5eb557a445ad61a6fe13a396f0cdb8af7f49444da10f1c524ea1b8a0e893cb9c21ef72594f33a2a3fc4e15423345c4fd188457d3e4fd42ddbe WHIRLPOOL 14697db9472cf39db3dc778abf1af68dba780cb2b23859008aba51bc8352530ce2b10ac7867c7c1c530fa016a59daf74c81f321fcadf41567ee829ab980eaa56
+DIST thunderbird-52.3.0-nb-NO.xpi 551104 SHA256 c1c15dc37d85a4912ab467e9bf9aef814ae432eff338032b41c1fd49eae13010 SHA512 9ddd7240500133b84f003432f0650fd2562c50e4b3b2099b2597186e137b4d579e8dbbe70cf11c5080fa2c51c36bb9290df8da16d6589229448cafc31ec7d4fb WHIRLPOOL f1c72c9ac573ea99a61cc58b4610ab6be42cbe9c97a241fe5911c7d42a661ba6650ee6654217d97cc2b8cdd1fa57b3574d4d2c5487dddc5a9c465ad38952752f
+DIST thunderbird-52.3.0-nl.xpi 557957 SHA256 c713a6dbeebb1c8dd77634dfba6b7dda3b422fb28a55329e2d8afa8ce60484ce SHA512 2f65d52b63f14883cb71d31076d14eea8db61d134cd14afb6247da45d62b7c4a53161b3ccdb2e08bf8909db373d95ad56b92c3ffe9c962630bfd370ee704502d WHIRLPOOL e25f3d204080b1518e4297e2d0c94a2cb1dbd03beadd1e79215ee9c88faf1a5c45e9592e03a1f3a5aa540043a9db275ba1441479d2fd9374115181ca6f436da9
+DIST thunderbird-52.3.0-nn-NO.xpi 551891 SHA256 a0b5cc0aa1c7017e8030fbc8c4b6573ddd3db4d6f15c97e9aa2eeeacba9c95e5 SHA512 b5f41f7ecfbde3ee95015f8da0f92cccfba2bc91c4f9278c5d1bda3372e0570b7363d47e366903692c7fce1ae3962cc1218eaeaa7dcc89667f9ca05cc2923b57 WHIRLPOOL 3b9a95917c7e670459c88f0988600e344000eb1e8429dfcdb3ece7b0726c98cae06488f0869c100a51659097bc43addc3d6332fd8501472a09240f0cb47bcb84
+DIST thunderbird-52.3.0-pa-IN.xpi 646568 SHA256 bcb38080fe3aed04631029947050f12a5c5abf3a9a8710d36ef10f2186108c52 SHA512 c853bbcf73288c702f1734cf04c2917cc0e0c6fcf6c3a2532d39bab8d707cda475d516a653fdbb3bb981e01e1b47e5f615e27de576fc2a3ac73bf4cbfcb86a83 WHIRLPOOL baa4c04d647aa0eb06101b3b95fe47ef6ea06f52ea1566bcd536706bee86f413c579f0c3847b962dc18a7285c71f7381220a751e660f17f5214443fb29a96a5a
+DIST thunderbird-52.3.0-pl.xpi 469901 SHA256 b67d804febd8b5c2ac18fd1eb16e958113b8b240d69ce4b80bcd14f9b3afd220 SHA512 8da5f44b3f0f5ea5ccd3d4478d49b326daeb11388e827eee28527270129d5da973a2193d4ce26dc80b923874b6da222c25ebf88ae1f670d6e1281569c2f4a2e2 WHIRLPOOL de3dd6bddb2336b2d907d24873e240a4c9837bdeb88b43494d9082bd531cb1b4816669a9ef3493ae65391db564a4ef0da86b3cfc0c8e6ff6cd12ea57929293d3
+DIST thunderbird-52.3.0-pt-BR.xpi 558224 SHA256 01e6248cfd1939ef66a8f7f1ad682a5735392b6ee41fdefe92e7cfa5aafed5a6 SHA512 ecb7f6ca8a3c7c4558768ec9f476bd4cbbbc15ef49079204c1df1ab0780fdf49ab8d424f64f82b33c40408d8ca0b1e10f9045b50b216280f358be62041e96414 WHIRLPOOL ec28523a90abbeae16294fab1f687a7ba5fdbe31e718a02c3d2ebac52fba4f499818b12597caaae7c5da7a9244ecc069a0b7cea362432ab3034c51a86863edfe
+DIST thunderbird-52.3.0-pt-PT.xpi 565623 SHA256 f02da1da4e3d5edc7b1f903470c7bf02f06026d0acfce6d064a15233a21c0e00 SHA512 3852a4c739b05112111c64a82be6666d140ae437334b14b01a001964cf1eb0bf0309c2317783ec636facc51d15a991c87ea5c580f01db6ab877b9452e3c1f6af WHIRLPOOL b5d7539be2df1d8fdac1b5da9bdc74997ec647552057b0271f1a224131c8e018b020a5fc3a880770c1f3e92b0b4bc180ab467a896d1f1a56725e419cd040a151
+DIST thunderbird-52.3.0-rm.xpi 557605 SHA256 3df2eb933ed20ccd66c8da61bdb74670e7b5e5a2def1c8a9a45fc2a25c55a03c SHA512 fa0925f39afb7da0f1499c676cd579a4e6ca18def306b00281ef82b349ec3e3b483431527adb07391d832f1ae39d0d228552b11f18b2f1c0927aa4fd0d3bc421 WHIRLPOOL e89a68c5402b167a6c0e3a7503300e6ddc2a246102d4ecf149ab64d862a65b972c1016e07d10fd36f331d98036459abe56cc358a0b1a79eac37f62c6fed5e0a3
+DIST thunderbird-52.3.0-ro.xpi 570530 SHA256 4bbeb7ea8eedfc8e0a5bf2517d38fdd9aab6a29a7d88cb68c454e3fdf80d3413 SHA512 268a509b92cb97dd513c139e180de9038344d1e486e42a2227d919124d5e5dac1ca59d503e8cd549c9d0b13198e5ffba73b34b1e8fe3b217a66c6d23dfab5d93 WHIRLPOOL 0c5d401311f4e2d955825c5a2a97d9e938d3229bfca7656ceb27ca27aa6c8514fc5d0f1f2048c1d1c2f333c6fe9c9b6d392490b67eeeb11e59ce5be24a577e87
+DIST thunderbird-52.3.0-ru.xpi 530670 SHA256 0692791c71ff37b7b1c141f68ffb985d2a565edd4085b2dc3456ef3a3c45e2e3 SHA512 7a8b797edc9f95c2bdf64e0d7449a37126113ea9a649a66844c01cbab8cd7f569f26782f1efbb34a5fc275cb38239602ce276aa9533a02b1d52e9bee9f66c7a1 WHIRLPOOL 58ebf20a5f9b5776ef3c1180f2400ff4ffbc6206a3e4d567510274c6b328231c7add432e4227a325d3d90e1af8634084ef1a6dd9d314ec73ef7570c95d55afb0
+DIST thunderbird-52.3.0-si.xpi 649011 SHA256 09af36243360b498a6352f10eb28c78f855d87ce0ef5fbfbc11f13bb45465462 SHA512 ff2fbaa5d1e798d76be650d5e3f175405b85dbe51a52e9ac34cbc0dd2ccfc5f2a3789722e63665f2fa790c900227e228219e827b28174cfd2334cdc896c255ca WHIRLPOOL e047f207f4c2a6de50524814bcaef1932dbe6ef64391b3758799855d88b31cf6266247075d947dc19be86383a4ed6f522ea3f5ab24a06945fe2a819213b6454a
+DIST thunderbird-52.3.0-sk.xpi 583882 SHA256 6450c19ddad79bab8b059a992b844fd362d4e6cdd58e31d63bafe25f7e73ab31 SHA512 766d32d27ef7193e6cee548edb89e46b2969c9f108a1d291201949dc784e8a56fcfa8608b67f077698c32706de3164fb9b457d2573f4f0235d5d08ff601860dc WHIRLPOOL de269a4ed70953dd60386f16cd46c054d5f11f25677f1102865225bef73de39857c861c7f7305982f70dbea1c10af579bca77a913b11e90914b57ec980c0dc50
+DIST thunderbird-52.3.0-sl.xpi 562831 SHA256 190ed15658855a1438b46614209d723bf27fb90864ca64dc21482fb52f5718b4 SHA512 09a28933b062cf72a4c0a6ec8baa278a36b18c132abbab0381ca39b63489c3d40ab319bb9613fd78ec43deab5b05d1bd5a47699d74cf4c789035d12e300388d9 WHIRLPOOL 410e1c36e5620967afd50342e15f7cccc91145ad0d62abbe031fb80cc0e35f03a55f8ee926cf6f6ee05eb5f0d3f6babea2021052dbaeb7f73fafee2728add1c2
+DIST thunderbird-52.3.0-sq.xpi 570616 SHA256 a68c843f7d755ab2b03a8c23018f17be1664279659f9fa9bcbae207ad27d309c SHA512 10b7f73219b51f47a6873abd5b8f55eaa0282b6c705efdfa90f121a22bcf43fed015b12c26ba1bf9a4f3b5ab5d52a017c2dd978432fbd8355656724159847dca WHIRLPOOL 6ffc97cc586234674c6d269cb43bdf1636bbd92ac1bd97e7cbfb1579b793f495cc74aaa07418fbc08e9d00cb97e8a0d7a6467832ed9b7e6aa6761290394cd76e
+DIST thunderbird-52.3.0-sr.xpi 609019 SHA256 194e63cc0eac946214adeb1a45b046a07ce5f7dbe3d16c1dc960dae07f3215ef SHA512 58a1d8bb3f4cf253f5e581b226d8d2fd15cd9526a16d175636841b2f3b7fd1461300640d2946b965eb9c3216f263a522214ed26bd0ab979753efd20339564f8b WHIRLPOOL 22e451493565107caa381fb0d2e70c485eeab74ca771850a2b4a3f9bcfd43bf3975707ab5b5f0e722bc720f5492e2f6c03ff1220de2d4a5dddbf556cbcc23a98
+DIST thunderbird-52.3.0-sv-SE.xpi 565777 SHA256 ab9811adb9abf588119d7854ba79a6fb6204eeef3724a0a615a3815fbe8ebfd8 SHA512 68c64309337e45bce8e20802ed33d4979303927d53e610e917226d698afc88f14608986318b912cd5ffed88329a509d49245554c8d567d80dc34f4b7a39077cb WHIRLPOOL 8c18899ee104963e60281508fbf9811b2155598ddcf23593f3484d475e34201527ef50739380b54591685d80da905d4acb3846cc09375ab984a3d1202d74a9a6
+DIST thunderbird-52.3.0-ta-LK.xpi 675039 SHA256 62d4a70fc6b8c93a44e9de6d810a3c62561eead83b8abfb545b0bb22f500fec3 SHA512 ad535a7db2e22a94c1a58cf270732e37a120b1655c19b9a45c6d030bf797acf354ba77f70bb151e85091e0afaae7433decab9a4c2876755b51b7ef7bcb233447 WHIRLPOOL 68ebffca78f6f88804a37564bba71e2786fa38520593f15c9c3fd140be5832605bc2754c27b2e1fce481b76a187ff4b1ab33c2094f160a3faa17aaad6d86b2ad
+DIST thunderbird-52.3.0-tr.xpi 569926 SHA256 4ef6bcf07c756a4da0c3aabe41c8d32962b72fb224ff93ea475d2f1270ceb061 SHA512 4c240056a169cf332b730b8d660c56098c7604048f8939b533e18db76b40b3a8d184107de8245fc3de59a14c6d75f7f06ff5ce13190ca89418aff9c024202a43 WHIRLPOOL 594b1a9e8aaa9db0a2c4e67036c1c97375433d3d2e147fa0d5b0cbe4314c2eada3e488dc03e291f1ea23a7959b3f07d0d9bdf1a5e352fa4941f66da8352e8362
+DIST thunderbird-52.3.0-uk.xpi 652855 SHA256 b6eaa27d994bb265b621f5df1b288d4d97e0f543e1806d9fd988c7a563f683a1 SHA512 766a80174e60e39aaba39f1147485013265ff00daa945a9f8ecfb185d3ee03600fc0fc5027b24d5482e5c204dd71c181ffdf8bdf1d01e597e91d1a6ea960782e WHIRLPOOL f4b52b6f1f475e27fa3054021a01d5ffe19c07cafc05c550a299e2a4ae676a5146d4d1cfbcc60a2aa75d5f4f7188dd90a99e77726d62ceddd0c75b994badc6b1
+DIST thunderbird-52.3.0-vi.xpi 637163 SHA256 98fa9c475af8c5a4dfe132ef5f27bf3ae0b550cce46c6bf7125608beb965aa06 SHA512 2578680cadde87ca2aa6b295a20a5e7274508aba2d1ada716707a414314e3bb504042cb956fbc0f0883a47550aabee83dbb01ccda73fcef4e0f115aeaf464920 WHIRLPOOL ad21b2e6858de7df1b9eb9dffc0a5ddd07272bf13b8fc3a9a9180d282d9f06fb5c6dbae06f64d387e54ae419f0f2290ec6205e6ac6c6b1cb90b138405369e71d
+DIST thunderbird-52.3.0-zh-CN.xpi 593612 SHA256 2c5beb3ba1bebc339ae4124fcee79fad375ebba7d97251dac83ff1eed1042bad SHA512 9db62fce3fec7e4b243c8d8998da6222251e12cd8325df1e56a5ffd9609da03f451923d2be26e47020763b8547a828b679921972e59a653a19fbd7d8ad9d1648 WHIRLPOOL f1a97bed845afb1f734caafaa7b32e4810cfe2f9082befb72d762c3ef2c801e4b65e7768c902820654215866c907c7924017e6ec6ca848729ac9baeb8f66cf6b
+DIST thunderbird-52.3.0-zh-TW.xpi 595729 SHA256 2279205d7288313d59be7c2eadcc572988e063fbb570e76802cb681bdc262e0e SHA512 cff5e45a221790a081dbbda711d8706c70970d96149e63a157b5efaf720b008966572a6a21e9d4435248e20efd6c9b0ce9eb374fd4691e875f3ef9e048f0d7c6 WHIRLPOOL da26721eb2880a4d6d05f96ba2005bbb463c1951bd77e805f0bf84b397d36ef2904dd36e81f3c26e3a02a202907175e7395c11fd54d233fff3102faf53340874
+DIST thunderbird-52.3.0.source.tar.xz 228532004 SHA256 050acc320a9c50365a53e4faa6538a0ad7f9a302d5f2cfb6edf0c6fe1b573b18 SHA512 10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66 WHIRLPOOL cd097157eb99a9b98aca63b259b77edcd1ceea5c150869fe485ab1219c1c84bcfbc7d70ecedca4b8733e8adf015ad0d5503db985b098207cd3b18497602c4223
+DIST thunderbird-52.4.0-ar.xpi 604235 SHA256 5b17a53001f7605f9e12a9881573f93940dd5756bd54788546201c97fc323c3f SHA512 bfadc747f3b73796cc5822c81567aadd3d34a420ddd104d042d47041b03b7e62b9e1d95e117d5b9ee14897187dbee776896a2bb0c7dc62ca70cc1e1e5f33fd89 WHIRLPOOL 7ff63921c6452ffca21cba430ad45e7953083a821801d259ae987c67cc7a0113d4df8608bd787aef39392744e661d04b5fd64d3c1b14d9b3586938b9fcf27027
+DIST thunderbird-52.4.0-ast.xpi 541173 SHA256 e3f5a29ee9258e49306cd1580d603b635a5ac7c8840c838504606143c141562a SHA512 1653f6ea89fcd4bead7a06badd7ea025dc2daf6a450dfb944e7b45e7d7da9818b660bfc02218ed79246b8231e42f6678beced2f78df668cbedc3676a088d2dfa WHIRLPOOL 0f70d593e6ce37ade889e04b5e868c31cfdeea9a0cddc04eb768244651e987a07ed2af40346d01a3f483a34c3a0394fdb01de6ce8b0002cc33ca820b05d13270
+DIST thunderbird-52.4.0-be.xpi 570932 SHA256 1d5e536ebe848d9a9ac773c6e15ef895601c1754a9f0ee69a7ab229ec931dc32 SHA512 c15aab335806ab81745841b4fb2035be33bf700b86edd39fcfd49891e32b68ee91cb0e71c0cd3813e43a3ba45a912876501c97560f7f1e2568729cec5082d478 WHIRLPOOL 1578e1de28fa4704c70eefac548b5551dbaf244245059dac2088b8c49328ba7c279eb7ea8fc58bb19b6a2fd830046c44f2ba0fa8fce4be94ee0d4d52369c434f
+DIST thunderbird-52.4.0-bg.xpi 634897 SHA256 18063549c65ddcfb1c438b5be60ebf27f2b6ed2b926e52ba2b9fd078510bb42d SHA512 494b6a30de08858b7fe5003c8333192c0a393ca188defd075cc75438f9885a7fc5b746e392a411eb06eee242bab27bbbbaa52bb153d66fb996f4f2db434517c5 WHIRLPOOL 5112e4b75e2d6faed09c786d8573c14ead5b34b843755c6bd592131d64b046901992cf15b9f5c9636bb9f9398abc08d7657b1dbb927c1fd7e69d7339f6912632
+DIST thunderbird-52.4.0-bn-BD.xpi 676901 SHA256 cd6a5a1c7b9ee0f688815ed2d6ebffcb5300fd1ebca9f0bc0d26c0f8d8530d12 SHA512 a8a74fdfc2d97c61eb5b09fae2cf05be9af0411ef79296ddca3c26b503c1c017c0ced7bad5e6ec1c235c1198c5793ec041c7b48b6aba90a63d09e128e1aee024 WHIRLPOOL 4842ebc2e27fd7c82008f8131e87412395d6fb835b44a1cc73a6483c65bb7581c2dc9c24573dd18ba11fc6d815714184f6f926dc6cfb5539e0c7ffee4ea8c0ff
+DIST thunderbird-52.4.0-br.xpi 559380 SHA256 8ee2714cf3efc9477059047d70d3429601e2451e32d823ad48ecfacbad802edc SHA512 8c4e41295c063d5b2f5dfa0d20a202bd0b4e3577eaba2d139bca8575849a3c4387fdb0d2282b6360050c615ec336615ea04cd4304b31a5b00fa3be61f61ee45e WHIRLPOOL 31093cec2c2c102c3990a0a7c8c21eea9cf094c52884667664c8baadf138432cad2dd6a3d34684c0dc94e9a7fceefa21372ef6b5888353a6ed0e36740b2d4102
+DIST thunderbird-52.4.0-ca.xpi 569910 SHA256 8b4929329075581266bc18189660c6200f6084153530d45ca6ce2865572a392b SHA512 5dc899065913907ee8e1416ab95e9c240b856e96fbf51c1ca06344de48e96687b2901cf90e98a49f1064b000bc78c9f43e54f194c908de3f97340c5d7201de38 WHIRLPOOL 47170ab8f02db1606e859e4e46bba39dcbd973ba2c06a6dbdd33bc0eaa4e0b7727b1af426f020d36b0c08b47804cf7ccf257e6b2bedb3810d8fa735f383deedc
+DIST thunderbird-52.4.0-cs.xpi 579150 SHA256 d3898778cd4aceea175c46ddc386b47cbe134a1b89322cee285e5925042032d1 SHA512 2e1973047891240f39d89c19e5f6767e735c9d7998e566c4b7e0e3243c61d887d2307ffa6c5d709e2e49639bf20b08f41d644230152150a9694b02ce6fe6d394 WHIRLPOOL 2307e556c6f7fb4dc3cddc733505e07e736bb5eb13b295e676feb32e2a3a7d13dfb53de76b3e8ef92753f016603b42550a17aad223d42a4fb00f2d78f4c5c020
+DIST thunderbird-52.4.0-cy.xpi 554858 SHA256 c95bcfee29f32aaf12dba7e835f35311eb71dc923c71dfc063b8150165e552dd SHA512 bed9d8907f4a613b0355cf4f4487359275631511a4ff8550abcc22c95699d1d513a70f90ed657e9f608c7d99667b27208909532858bd2ddda4ee47541fa26af6 WHIRLPOOL 48d79a57164c9a8f500dce18c22f32878e2b7921b638f1dfb1e8ba96ac1104c5a0f9573811a853c3d2a9554fc5d0432082cb9febe4396c6877b691c16417678b
+DIST thunderbird-52.4.0-da.xpi 543336 SHA256 cf1efa5a056dbb9b98324b1b959a61467af15ea82ad586369b4b46856d89d990 SHA512 39169bac23dffdac006e4d019f5c9ac99bf1ab7c55f7b85ad9ed5f05296afc3fdfb4ff0bb48180f38ef2b968016c753c8473b10d4b6552d3783d35e84208b473 WHIRLPOOL 2c5ea8b898779d59aa152da2317950605ceaffa1d81c52ff9085ba0c2a3fd9a99873ce84ac0c27cb88e8cf0d775a373ad1026d5b533f2d8f788e63324d0cf742
+DIST thunderbird-52.4.0-de.xpi 555744 SHA256 6d8bc484a1edcdbff75d39dea9f33b85b92514058f505f2915810609796e8a1a SHA512 8ad1ff725a7a75cd691af9360e872e173b33ceb2f95c705c2cf6594b3a1fcdafa94c8892b79b1c9e694dad441482734211840cbd46522f7d284dea7a4ce7c7b9 WHIRLPOOL ee4052866ea7bab87706ea3c1f3ec4458ef15b30656b7bf7818f9d7a9e51a8a25ac6e138d05cb4a83ef251930c1d030813839c1b4f4c8020701cf4f2b0c4b86d
+DIST thunderbird-52.4.0-el.xpi 662965 SHA256 c5201686e88cde81222817b006957bbee08df0745fdbfeeea067b558f9131872 SHA512 7416e98eeed2d97cff1303fab8bc1ae595bf6779c4990c59ceee8da8b00234db0f4e6b03392962d8e482da29755bfde3f655005c9346cf05446c8be654135844 WHIRLPOOL 21dabce2863d54435ed287548fbc96e740565d75333fc0bc617f9a42fea20251d61065199f449c9455267232b1cbc9c36324f1b9af2c43f16dbb7fb7f0159310
+DIST thunderbird-52.4.0-en-GB.xpi 531234 SHA256 45905f12c6053324c1ed880837fbb6b00afd631d83907d6274fc4aa53a4861a3 SHA512 e4b918bac6500b62755b13ff002de440025cf2f5a9b4d9a65c35006d0e42bb3b79ad7106935c45f7afe9d445dbefdbf539a87377b354ac2b0a813e75e84d89e0 WHIRLPOOL 4f1231af63da0fa1aba5dac46e761a735d87b424a9bfa82619f383e019921cda822618e650a5e595354c2dd36b3ffca4489eb6d61ac853c96bd9d069628c5ba0
+DIST thunderbird-52.4.0-es-AR.xpi 565995 SHA256 f6bb96a72a3a8271b9796d9516908de2b885028d7e3cf00913fa74415b7a9ce3 SHA512 3770c63f71c7b35b79797778279c7dec5240427e529da4fc6976628ce05204681da489acaa22f8c27355f7b7872ac3656261b486da62af53dcc1da0cfee4a808 WHIRLPOOL 903465f16b6715ddf8aa77f78001c72f4292d411b07e2299ed0199cbb35e97c505642e98626b26c1409cadffed8b1932a19ffd77b4bfad3ebdb5d7ffb5b62bd4
+DIST thunderbird-52.4.0-es-ES.xpi 445464 SHA256 2d49b3b67e7b0c8f99871906e65d5e3a6cd684ad3dde05a730dfc8d328205005 SHA512 165decda1107e3c48cccb68f857d606d4bb06125214088ce9ff348d53e45023a28f7a196722371e6b18f58fce51314c8277ab6b6dbc0323a32c70bd5147865a7 WHIRLPOOL 92ef0df7ceefc94f0375bd5697e4799eda952730b3fe9a39ce04fc80806ce3a0504ec495a44bd072294c16c1c2f68ab227711c9cb414017a539ae97b89eb7613
+DIST thunderbird-52.4.0-et.xpi 551661 SHA256 eee8043f3300c1fbef18d87c783de89a11e69a75e7185e0fe0ce5a73a0feca0c SHA512 507ccd9f8b9d8e8b1c43b8189d32afbece0b47340fbf14577ee4c888b883ca135b83f62f2b6ce8ed1962ba030daad3dac42b60ac26a01132578c1023c07a1b79 WHIRLPOOL f2dd79fcf3a588d5f1ebb600cfe50fb2495339bc2e1fe99c850fa751e02b9ec66311ecba1ddad987f72fcac1b1d08f24d6fd4943df4f772f31f961ee7fd2c53d
+DIST thunderbird-52.4.0-eu.xpi 555536 SHA256 448a3d9d8f4babd98872e2f91c2837342e4c01fc6bbeb0bed3a4f4e14ea381b6 SHA512 3450490dd16f9bfc550fe33a4e31f7679b644e358b09b1b8ef275290d17255f8dce1c8a665b6ca8cfaa91365ce3a98bea7e3cbfbec8800aacc75ee3dcb920f23 WHIRLPOOL 914342afbe0b5291587b4866151b193b3e20c79760ee6e1d55130cf45f1923f13528b09bdf50099760f0f52905a3b899572fe4934d48678f29af6638b70565ad
+DIST thunderbird-52.4.0-fi.xpi 550670 SHA256 fde89077936d1ef35642d6b451926e885f69b9636b66314c4d1d182a9b753ee0 SHA512 b40fe8131eb3be646cd8314fc664ebb4099d327ef78c8058b4054ce0266fd98c5f72bfccd8483ae950312e9310b21f4ff9bd7dbd0ab28ec3c79195436d505786 WHIRLPOOL f6da2ef24f646fbb70e9cde7be14f507413b8f0530f0dae21a27000a5e7754a2afe31e3bb7df69b3af32e3e5831b1d70a89548bef50b5e8850091eaf1322e6bd
+DIST thunderbird-52.4.0-fr.xpi 577561 SHA256 98c758ebd8c286bb93a1b9b75a5af1939944c520164a5b38f1f39936529fd7bb SHA512 ac4261ecb136c0ed4b9b45caa18f796e85e8cedf374464ab425b4f4ef41cdcdb5756c509114f306d6ef027f70313aa43a498711beb7ce4462a24bb5c18628406 WHIRLPOOL 74244bec44f137ef4d26fc451988605f8ba3211dfba852fd1fc8f9dfebd974e5ed52a35cc6825e0087a20b9dbfc2a12d0c25a7414483c4870cfed29e91239722
+DIST thunderbird-52.4.0-fy-NL.xpi 563632 SHA256 1225accf01b15e7e3132ef51d9275ce573a3615360f16647c91bc078134f5002 SHA512 ba926a525a308b704733af586ec33d071961a1cd93c8090be12be844516714b419344f98d71af0a6d2d607eb3b76e64fa25ebb90ebb4657fef3960d5f2dde6e7 WHIRLPOOL 1af45abb1ed00b3948bb4a84984b82cb6884767a0081abd4927a3946e405ffa7368f82ac5ea3bf89112d8316c8c1ecc8c3dada4eb8322736008321e53781c3fb
+DIST thunderbird-52.4.0-ga-IE.xpi 583556 SHA256 22d847437c25ff7aa94b9f5ca1147277c87bccb5b38afa4f0ef7fa5124a59cdf SHA512 9b081dcacfeb150e92f87577499d5716cc176ac1aedfb4aef880d2484224afeb2bf7c197e3b09ace37854a176538770b4f6afa8bf793899df0a21ee31eeb9d1c WHIRLPOOL b90b8614bfdbb834cafb1ecdc34385aab306474da96198f24ccde288a3459893e3639da0b5676415a80c74b956b30e7a88be7214c9e2c89378f4374c0c82c9e3
+DIST thunderbird-52.4.0-gd.xpi 574065 SHA256 d184019e5989bd88b8bdb7a27788535b0a3a487921d85339ad0a1bb81cf46a40 SHA512 aba8d493f75aeaadf093e1666e85f1ff794346492d91099f6a2680b95f4d8e981dfb3509b190db0e1b6e4b74a381bca38b61c7bef3f67bef2b631eac8fb49f67 WHIRLPOOL 6d511df4252ba4ccea608f10b7a84fef5d9bbe05b3daad83e25841832d42208de39ef1b06e8d38db5934ee12c973b2ca7a151a2abb387dc426fc50e6811d8425
+DIST thunderbird-52.4.0-gl.xpi 575150 SHA256 a35d8e9441219196eb90a31d1f65f08493ded91fc1ebb1b712c417827451ff13 SHA512 6f57c57825a0f3e7eb530933ff82d4c31c73cde2d5d58edd57267d1712f0606fb8511ebdab409dc0c967b1319c3ffbb8158bb6dbea308d7ae7a56af4b94650f0 WHIRLPOOL 8426c9c10ab8118933d2f09fd775727d099573633cee1c3671aad70cad56b1c084bc5f905d7eb8a7d9386909996d68cf93229168e352ce7233aad780cf9f3c5c
+DIST thunderbird-52.4.0-he.xpi 592566 SHA256 8d46ec38430a1939cde04141c9f5bcfe22b81a154bebb89dc112ff199042203f SHA512 fb2ddbb62f31071b07eb6f33f7f6015c8ffee96a5a78504adf6b9a2fda3c589bfeabf263fde638eab9e103750a06eead1a6465a56e10bc3034a5b8e0cd79be3e WHIRLPOOL ccc8e56770e7a0f9a488c070379658feb8b2a94f8377ba562643d47b6acdefc56862d90c9528c361fd7b4ed30d869e6bb785f79563fbb9f3f945b617d6ac7592
+DIST thunderbird-52.4.0-hr.xpi 564780 SHA256 119c5055305b8f16b02a822b70044ff2410cc79f32a456d59c71c455002b8523 SHA512 da59389943b6427f1c1056b7712db105fcd38b5979fa47e1a62b8ff03e345f4a9d1b3dbc23c356d906b741847de274bf3a7e53c12f9935d5a749508d750f9f11 WHIRLPOOL 77e83f4917edc6aba551198c4045a8a2d25ed8e30cc83e7e951a99ad0aff599ac30312ff788d8f3c72dfeb4f8f2df6508228b4cb2b1401106361dff8b2e4d445
+DIST thunderbird-52.4.0-hsb.xpi 582242 SHA256 1444e2582233eb0ed7abc8566ea951d6938f75bc069a20b47d6f5cd8608a740c SHA512 ee03cb954bbcf507a2b8cd0ebe99242b0f7d232f46fc90725ae70089be3dfa1413584feaa5320c8ce9a4e453d3c3d932905849cf57b51aa2e2a4a164a228e710 WHIRLPOOL 8fa2aa3a4d60b9014bcd66a1ba03511cf045728126523c0cf7dfdbd930a74f478e2cb8414cc8385d67d723f1be65f03d91ca25d1941e6277f895eec989298a9c
+DIST thunderbird-52.4.0-hu.xpi 586446 SHA256 b98796554589eb7ff3e30bd8fbbb27c8d2ad31bc74d96d4070df1f0eeba40544 SHA512 b9f7b628f7cc112e79eb5a7e382ada35fb6ba3d0197db33bc370a807fffc0a69cdf4187b87e9b13e460dc84e2b9663d995cb8ca831518b209efe428c32f97ead WHIRLPOOL b5a8e0a2737c1a6f6271ff353b603a6f377b1d19b954f9cf7dd368b7c8300800562563eb41e14d28fd88b20d658706c3c2ef71443d71028f3ed3185c3ca2743a
+DIST thunderbird-52.4.0-hy-AM.xpi 629879 SHA256 ed1d4f05c0d4d2c8f4dc4227c43a4f08be01ec6aed92a3ede2ca83550543bbe6 SHA512 3a069934b02de31645925fb51efe16b137357571ab5376cd321d0263ec5bfac891851429deb216b78fb2c357486cb840b4aad943c0ccee690fad5bae6d39012e WHIRLPOOL 132616d303916a3b192d51bca4de9070b1ee4595cc91e70ba3d09c12fc9a55f701bab58acf44dc49046b6d1bd99a21c8d9ec035ca8a5e83f62033f00f2c5e3fa
+DIST thunderbird-52.4.0-id.xpi 546527 SHA256 5bd33fd191ed602e3ab0c47e9d8106328e73dcb07e3ae10062470d1de138aec0 SHA512 3dda07d74bc47ac1d20e294c1dacaf16805113aed31ac1246647f95c2e758672154ac427ec3915b577810a8df66cce83d3984f34539ecc01375a6b347d0140f4 WHIRLPOOL 9d9f4ab5d504479ae5b347ef4162789a14ea34f5ecdf14ecbac93416f2f5098508b269cf6c003334bfc3518fb9ce6aec6b3eb6299874cdd1216168e4f8f36598
+DIST thunderbird-52.4.0-is.xpi 555712 SHA256 eed6b20e25e34b0ee1498948c8baed0060abe1b3a25f9188b123c81fd044771b SHA512 ff9e52667baeccfd829e210822355a3d995046fb807bacdb9d52e6f2c7145f96a8bda6e0ef5fadaa442cfa7985de36b09a8349cd860d55c1a131b04e4cb44d79 WHIRLPOOL ceefc490c5580fffa310241d67a389f6fea7fac443779f57243af7c2bd3745d243f57ac62b0c5fc3a21c300d82a687a3edf62fb16d310ad05ba7048b4d78ffbf
+DIST thunderbird-52.4.0-it.xpi 455408 SHA256 5800130bfd912f58e6335791afde9718a59dd3428a589581fca160394a3f4b75 SHA512 a82683e66c379f84492f6b65e6ec068e472f3e9d56db5b9c393d69966a873f2ebd626d3d30ee6a5a2c47a5f82c0ac39abc39da2dd9c67a58505e4b83dab08503 WHIRLPOOL 20282abd7e95b57df459a005132f7ab056b698115f349fc22ccf7ed978c6bc3e38a4867bbd399cd0691159908cf5da6a4f997de2fd57df577cdd5ac7bc71bae3
+DIST thunderbird-52.4.0-ja.xpi 630053 SHA256 8846bd908fa6481e2ed0a2e7fa1cfbd7bbfe02a78b1cca75e9b2a1ddaffe1084 SHA512 d297d4a86e2f7f31adaf27915eb4e6ae34edadd7fa3cc903e8d64ea6aa01b449d076be5deac803d1d39c74d9c5d09818fa0e2fd670005bafd41c83028ff117c4 WHIRLPOOL eabe0b103085f42212568e02b946cf7db2385bf91d5b9cc22c0b1fe440fce1bf4431e43eaa0e39f6e25a231631c52633eac3855e11774a91634e726113ac322b
+DIST thunderbird-52.4.0-ko.xpi 595517 SHA256 89192fe23dbce157aeec48168b45ac94cc47bd6d83907b3ab7dbaeabe5b7b7ef SHA512 87f663896776abdf1608a28e905cd38cf935e8ab8a8cdd7482db1ac627e95695e1d15e9e3d9b3017e30e6534154e80fcd6cd70ededbdc2ccff12b200269771a3 WHIRLPOOL c886f74a2c2d07c27b8444011808e18d46c1d5e39a68d14b97c99f39bda8b8a0db4b2aad09ae69cb7913290711beb0e24b394e3ec80fc9b3da3045c8bfcd6f6e
+DIST thunderbird-52.4.0-lt.xpi 580598 SHA256 90bc80f8742b35525af3e1f4fad4c5e6fb3442423b6be7ddb8c4a5be76bcf564 SHA512 ad913ca637e7acf04255ad48d63ad7acfc317e6e55cae3f54b1338c98caf04b0aabfa18463e83d77f4aff211d21c496e98ba0ab473a57f79775f7efd8ecbed0d WHIRLPOOL dbebc4177edd3987aa3a84ee4c45e510c419c193ce9b6dc6a8e149eb7965c89fde8939b5488303caecc493eb31b33fbf0e9992462ef34a8571b219feeba5424b
+DIST thunderbird-52.4.0-nb-NO.xpi 551104 SHA256 24cd76bbfab1f20c5f916bdaff001759d75bee16e6a15f56b5e66d8a8d730d0c SHA512 82b38db24f7d06cd763c3613e3ad43bd6c5070409d822b450473992e157a4f6ac72998b0beb0abe524b06de58c2f8537924a455b506fe0aa7229082588265c97 WHIRLPOOL 6fcc3b73306d81a65c2cbb9162cb4130c12a2f9a77a1a8df3776e77cad5d2cba285d0c17b898efcdb7a153b2040a1a9b6a77695100d3e3413fc93d5108f86ba1
+DIST thunderbird-52.4.0-nl.xpi 557957 SHA256 a9523e8f9cd9e653b645c1b7b8105d98f3c33c6723f07d9e6a2a1e4b9e6abdaa SHA512 fa9708def12178686e42ae96732977a0090a1765a71ee591160a634a68acb1e7da3655085bfa4b18ca1ef380d5a35600bd1c7e64bcc4d30060740b6787c93aad WHIRLPOOL 5d7a768b8fb062a6b3db4d64491d7ac7c8d14454405e50181aba26450c2a4582c8ccd8e4763bedc22d866f5c5db2aa1e4c1fe9739835da67005ea2e4fd27eebe
+DIST thunderbird-52.4.0-nn-NO.xpi 551891 SHA256 22961936b2e19e95838777b24e29d3f43eab296a75958036b20c21471301f96d SHA512 e3c2691cdbfbf52045a6b41fb7f70ec8abe399399b23045438b98d1b7505c6ec7f0ea25ec70a0ad5bd189ea6f1bf1aa2a50d6e9963ce9a69e5fc2e15d2bd0765 WHIRLPOOL a5019612078a86b962bc3f0cc2d33b030db7bc0962366b65f35d1d816c197ca10614317337e6bd13fcf78cec9df262a6de817d90d40328c5489318cda6c74e30
+DIST thunderbird-52.4.0-pa-IN.xpi 646569 SHA256 c806abe05b9614690c9c8466a3b3c8e15fab6bbe6fa166e23f0dbb64f5e70be6 SHA512 673f9e7ffe4109f6bde302e01679511c4b64572c74e3e19d51b1050a979e6d417f120d5662d19155af0be9635ea85ae8f745a788547ba3519e9e3837cd48b4d9 WHIRLPOOL 1060a126616dc8fb15c352706318dd1eb5d39c3596a58f0afed50edb1dedc3eb0f10399acfe07d3cd3fbbe55833cdb411cea675a89ccf3a239e79475de2c48be
+DIST thunderbird-52.4.0-pl.xpi 469901 SHA256 46cd992cd75c2216af075f5d1080f3620e1e6ead488de2e14ed56f7698669d25 SHA512 09c020644beb4dcb90d433fd61eb2e30e8333110476e2e9887e81be09d8cb9d678b65f0eb31d1c612dd8ef72203f13f7cc0500b1a3b2c2da48b4583c01c67c74 WHIRLPOOL 9bf2dac45bddad34bad4552e9930ea3eb3d8a6b83c7a280916ec1f1cbc62048fc497a6f0c023cca3ccb0468a876484b3ccb2601560781b402ab996eeaecf8ce1
+DIST thunderbird-52.4.0-pt-BR.xpi 558224 SHA256 273539724246f023b0afdf79a9dd517ab0e71606381900ca26b0844a5e30e9c9 SHA512 0e223e693de23ea02b4aef01e2d34dc1cef727864309ffb5c045a84e7a938ab88e7609e8817afd9e3fd6e5c8b66402334ab17fb10d25a87858db982e2a507a9d WHIRLPOOL 6c69cd6d8d42dde8c967291745a0ec758e971b1cc9ff710c45c910665a83c95e541d37fb6db600ff2cd0e9cb8f2e25e45e19986abc51361ed1375abcde8119f6
+DIST thunderbird-52.4.0-pt-PT.xpi 565624 SHA256 7923394ff64a094d4da561b962b694011e79c8e586c8d125cb450878d3cb53f1 SHA512 1efb35004dc9869f266abe39754940da1690d44fde574e250c1298ddce0e050c0a861c6dbd28b00d22aca2abc16acda2369d290667e305fb371a6dbe0360ce60 WHIRLPOOL 3e4629264324110ab902728f6c086aa687b958326e8c74cabfefa23e46c369404e0ae93ae49345895ce19e0b5b19b7856a42d2b268ebd339a1bc461d2e342a96
+DIST thunderbird-52.4.0-rm.xpi 557605 SHA256 91afce6ed4b6e4a52b03a83db4610685cc272e829a5da10db79c371ef9b00e2f SHA512 bdb2f713890d65a219f4081a1d4025ec3f5fbab7697ca0cea116e423a6f90aafb80f7f0e88a468d575dd1ca7168f7c90d24fb1b79397dcd85622400843a86c16 WHIRLPOOL 4f2bbb09d41e98314da1cb740b325aa68b65e81660c801e56349ece024ff1b4c8d71f57c847f97c99c285d36e8e6107a8b518c229d9b9223a24940390abcb57f
+DIST thunderbird-52.4.0-ro.xpi 570529 SHA256 0972682e3c8b1767dd45efd8dfc1d5fe664731d4a7786a12104452ba29b449c9 SHA512 7dd9b5797357c8fcdd78cc215c9ba875e31974681043552b7ab2e35adf8e4b991e12e0668afbd6a5887801cfb7e5fa868b40470f3a60d7bcabbd72df482b8488 WHIRLPOOL e5071e44a1ab3f3ce78e73f67c0de62fa44e3af31ba41f83612612d2204b52cb9e6d93834607e66fa92863e5a01e61aab3d5f824f31bcc88c52ffa33342b59a7
+DIST thunderbird-52.4.0-ru.xpi 530669 SHA256 662fdebfb7b71ac6136e1ce707234440672a9b019f2a4b3337bf24338349b7a5 SHA512 866934f8fe86bc53965d8da845bd06f5c07fece1704d4012a652457f06094466f7cb32a36643f9d720fd11fb1c1915eaffb794f68a565387dca80dd0388a5135 WHIRLPOOL dda85fc58ce8cf59bef0f9a949c498e108a5f273eec05c02b073712aa5acf5dbef527fb706841da599f18a605dd8d691d02ee8093ab375ea5b9ce7496e264ad1
+DIST thunderbird-52.4.0-si.xpi 649010 SHA256 027776f83ce747dac6bf7bc939a6c53495022131bdb283496e0bff9deaa2a0b4 SHA512 d2fb213774b235bfee38f99263f67fc41ab8083b721762ee500b5f3c964713422436a53c1f3072a33bb3fc1259207bbf7cacabe0652ebd97c71889265a230fd4 WHIRLPOOL 0433db5af229f92d44cc4d96ccc52236a8cd9f17da88401a52f831f4718dba0d818069f7a115340de7662f5baabe439c156db298660d517bbd3117b4bc0f3bb8
+DIST thunderbird-52.4.0-sk.xpi 583882 SHA256 ddeb2172f620877f95b69cfbe8d1bda1dc77b1829ad491189e9cf5f5ddbdd8de SHA512 579777c8f776d86602c3b5eff112c5df1fe009462e2477577dd13c28435144b180165b4c6eef2b94997f4a3153730d8a8527b2656f84ef5d4f8545c3b8f550f6 WHIRLPOOL 322035c6fd5a21b0958e3a8a31dc32d6164712381bcf86c565452ff0909440b3cd43b7eb6e496d354a137d0e68ebe5fd11b180213358853efea81adb5fe108e7
+DIST thunderbird-52.4.0-sl.xpi 562834 SHA256 e36184d7264bcdd4bf7dbd9e8e547ccce50d2eb057cddd8589752f03df1a1f06 SHA512 636a7eef7caebc7598bc224ed3516e9b6a799d3806515196832012cefb85dbfa97a59bc2c76dd34835014045f8dc42c9943b1a1f885c5fe6595eafc5417314f8 WHIRLPOOL 7309ee52ac09a390a9c3f501d6b4e57516d51d521cf876a963e3015180412d76663ddeedd91b1bcd22bfd80717fe80577d42d683c31966a7d9cae8db0f6351ee
+DIST thunderbird-52.4.0-sq.xpi 570617 SHA256 e721f6e1ba3818c5ef258dddf19d5d7cdd635c485d620d4fda2107bcb0fb67c8 SHA512 580cf48c5a22c1701ea2b7a28805bd1749c1a3d6aaa8dc9838b51bb13d4d5982967d090c84766c1945f3d9c0818f52234286f5767b6dc46dd24c0322b93a02ee WHIRLPOOL 48db0e8845b68704f198ccde4d2fc466c2023f56d7189824f77f1ce0e479db2316d651fc9d802f43c7aca18a5dfa3f7ceaa799d38407e0355e09f859589827ad
+DIST thunderbird-52.4.0-sr.xpi 609020 SHA256 d17e021710ecb696ec97a339e579ecf67d0397b26ac2a7b578358a40fbcea3f8 SHA512 c5a64856d1eaf132fcd67f43589a2c0facffe43fc9fa9942935cb52a076ea266cf78348093118dc2e5afe7b0030dfde6fd0f04b875a801f3d75173c73904dfb3 WHIRLPOOL 5d49355a858bb1b2c43e878a2bd5934477dafe1580182bf3134ec739359fc4c64b00a9ee9e0acaf3f462b6438d55bf90576b5f5d69023bbbe4d8c96f4cd4540c
+DIST thunderbird-52.4.0-sv-SE.xpi 565777 SHA256 708c1093cf817a0502cb65014e73c0881f94dabead931c71beb4b563e948575e SHA512 5c983dbdc349482f4822abdd9c5870bb4838970cb24003c4aee328188bffff279124b299057566bc061b98aadf25e4078e52e888e30beeba9a437d07b4cc8a25 WHIRLPOOL 7845e9d47c5512e2bf6efa1a91de79d2d3ff1dd01ab1665a54304a73d6de23d11c4e5664b8313003db7e6c31f0a493941881194670593aa143d25d9ad7e527a2
+DIST thunderbird-52.4.0-ta-LK.xpi 675039 SHA256 875114b08adbe2783dcefbc56334bc4bc4c3da8c8b3300f37f2cf67ebc04df7a SHA512 34476582251c95ff6a1cb190b4dd26c9167b5232d5d6e4a48256ffecf126e9a75ebdd723ca8ed578274c54f428a7ed5f9c5bb00444c12da5f0e40e7fc9c03021 WHIRLPOOL 2e952d15e51e5e04f3f946bb9c3eb730cae08a422096dab737a0ccf048436230ea64708e75a8fb18af39c098130813172db248d0ea4c0389cca7f7f754b84c69
+DIST thunderbird-52.4.0-tr.xpi 569926 SHA256 9824c64701faa3f24c69e19801cc98b313b26582eda0ad46c8c78a3452f7ba33 SHA512 fd8dd034d17fc4d1a6628bbf2889d15f22b5a8beed256e901ad27af1a870efa1c92a307c85bb07fef29708e72b5cb48dfe8838e5e49161e464982768c259b443 WHIRLPOOL 647819d003859ecfe9ae8a651c69b35962170cb5aa99ee676993546fb0303e1fef8f4d779bf042bdd3f2cc74c667c2af825db3a86b8e71101b8c5d195aa8bec6
+DIST thunderbird-52.4.0-uk.xpi 652855 SHA256 d3e3a3cb60e7f6fba14759590df00e85456c17cf071cebcc358744abcd2b1ac3 SHA512 72550a7d2e8d639308172b7cbaf9487f909d22d86673d7900a3b2874cbb7b8bb882fcef27d2f79b1e5ebec7f7a5e24496e4b6837681a11d5b425b56baa195557 WHIRLPOOL 228111dec1a9c3b3531cb18aac21f02a378b3eb85f42ac3bc32c2c860fa1f78ba8f7b44635a24388daaf51f9d4378af68dea8cb4e719e7d15edc4de15813b53d
+DIST thunderbird-52.4.0-vi.xpi 637164 SHA256 7541bfec6716ae705afc51f66578100662aacdd92f8c1d8e9a33c82ad33c2872 SHA512 df5aa6f5af5b1178d66b078a06a919b2b5234505c97eb1916e82b59c9ab1287dbeaeb5a4f776a345430c36f128023241e157889c5669b76c28f60751da615eda WHIRLPOOL 580866f3e140730c683947fef305cc3d8573a1b832c5ebc7c945d90ff066d3c37817859236a0c6865fa05a089d0a692dc7dd4d8207a8d3839ea73917af231314
+DIST thunderbird-52.4.0-zh-CN.xpi 593612 SHA256 c1ef258d0b0b3ec1016c7878ec20c7af8a1d1cdfdad785389172b30739b674d6 SHA512 90611cca3af7e142a1800749e368ab9974aa470963b6c2f5f53937efc6b0e06cc29ec3f86922eee82e3603f7084ee1fdd146926fc972e722e160c2696df3f413 WHIRLPOOL 5b6755bf1ad8d5dfa5b93f7f74c3e97c09b9caf8ef0f63dd0888d0c00e482abf74e355e2ede4c578c0111eaccfc2d6933aa7eb93e6151441b46dbeda2ee6244f
+DIST thunderbird-52.4.0-zh-TW.xpi 595729 SHA256 7a1dc6483c83b43852c892f5b26b29fbdb0794c81bca4ecb5d1080e8cc371da4 SHA512 0dc359b4cc57972425c175175c257134da68a207f96f127c38758e3fb6f5d8797db9ab14cbc87518b2f855a09215d96eeec6cfe0213b1d1e548798c2d5d6449b WHIRLPOOL d1d7f515bc799f3f3456517479935322b34650025caef473ffb8e6fde347f4c977ae30d10f71862c53b32d6ed7d2ffab8d4153ccfc5cd0ce2a4d83af1be91440
+DIST thunderbird-52.4.0.source.tar.xz 228561704 SHA256 7f57b5b4d4ec42b04afcff8327abc2d3c6185c0bcc1ad138825d021a2d3f578c SHA512 6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78 WHIRLPOOL 54a51c417bdb7cd8fa89643741ebd1d15e589bbf1aed5a87dbe366657287f33496014e82caa220d55477dcca6c99784811b7effb1e1d4ee60b89c4485709b93f
+EBUILD thunderbird-45.8.0.ebuild 11916 SHA256 8226f6bba2ec05febe0bf3a4026779a8a305ded5957b36cea02fcf6c6a0fe569 SHA512 9b736276b57f7e1d08684c1dfec43669e65dd31bcfa9c83f2283845ab616b3777817e57413e80fcc2ef47a4aebff51dd71be9ceee4d71d0947b99546a68136db WHIRLPOOL 9557ca676318238366d2d20fb1426d2046d1b49404cd23b1f23827427d7c8f61ceb0f38fe2b2f093a9b2107fc77ed6d123616d1dfb558a5effbe77abc03c21f6
+EBUILD thunderbird-52.2.0.ebuild 11334 SHA256 154b6c015d65a28e013499c8c3969db42dd55eb42cc25a83b24e4c270e6102d8 SHA512 076f8f389ce89f3f8a2ff8bbd1878a645eb4f18a18b13e95b3c3548e0511542d521f56d185972091ede00043298cbf00f6e78572a56cf7e70db37d89cecc9855 WHIRLPOOL 0a3556c6a36de5c5b53c950ae6519151357db627609515805549073287372e6fe482a2dec2c715c023b1fcafa5ff2f3c8f22beed8ad9693773fae2b09397a8a9
+EBUILD thunderbird-52.3.0.ebuild 11333 SHA256 d5ef2f2886fce6064b3191ac50149c38251cfb55c83fc8cad2da1c680aa5e6e8 SHA512 ad96161038aef7bb84b398ffd026066fb636ecda68b1c32865d3946e3dbe1b49a235c788be91150b13d4835c4e20089428617cc6eb7110032705d2a2f66d39fa WHIRLPOOL 8ceeaebabb9fc4e598a17bf67137e43ef9fdf7d9268ddabd8b7b949bfe38083c18f373b909c7b80eeccb045dea95769cbc15bd2a1880bf48edebd29b0d507f9b
+EBUILD thunderbird-52.4.0.ebuild 11354 SHA256 680382f929708bf342ee04d59fb0645f6a69be4af350b4ff8117cb3d19450fa9 SHA512 5094bc4a12ffa6d5a993d3dbe28b2aaed378e7c02982584f663f687a6a91ca2a06780db84045e2dd05adea98f14e0785edd7de776a8a01768b69ad2354368ffe WHIRLPOOL 2cf55f38ef3da95eac0b6ad653b22b094920649d1004cc8ae580a5b1efe2769a62fe24df90ac2adae0513a3a603a2a0ec17bcd0249e085a5036a8e76cf886cb7
+MISC ChangeLog 20379 SHA256 bf7beaf7db2d557598ca0fa0429034c950be8529c9b31f6807d170571da47ebc SHA512 46f7acc77a37239c4ce460f8bf285e0b146fae2a07f9c1dc9b88bb9734cc1524204b0a3fb5e6c5dec4272e43bf4de765fc5943283663b59d1c6e375334e44897 WHIRLPOOL 0e380c3ab88fd4d5865303b7654b41664b5efe5e896b44e9decfa911f4359cc03358adecb00b5cef0f8ab3fa1679f5a90eabcfe1e1fb118609c1662255d6e6bc
+MISC ChangeLog-2015 102428 SHA256 8a02e5c190b40b8d867ceec3483b738d5baf31fe4f05f9a890fbc933e5a0cfcd SHA512 170122003f990f808a18ad96053ff32082ea66269aef64282f2ef3321592b7f276786742d791b825d965860659198a2152dc000d08711b5e218385a72b617107 WHIRLPOOL ab2de99ba5df3a8d606a10302c19b017ca2cb7c2a59506db15736ca678458d4f4eaf7239827c5a5f9174a2b6d72d7d2e07b8c87c65f93cc06b99f6c20181f5b3
+MISC metadata.xml 2018 SHA256 7441413dcd5055d72ef8e7a78d3d6cbc71f06cddf9edf5b455c6024a47727491 SHA512 274dd1f5aeb1db04a5a0d0414ee35cb3b656d7864f78f349de9e535150d34b42d950d67e9029de5648725a1ab53b51e5d6054f0b5325bdfcae5f1171689df7d7 WHIRLPOOL 89b6e4d280b353ad50dd96da924fec92ae6e203b9de17779cf72aab7b97ae45ee152752450193b492b378c275ad723acf794b4334bc2ae2fe4991956a17e7bc1
diff --git a/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
new file mode 100644
index 000000000000..01542105e64d
--- /dev/null
+++ b/mail-client/thunderbird/files/1000_fix_gentoo_preferences.patch
@@ -0,0 +1,25 @@
+From: Jory A. Pratt <anarchy@gentoo.org>
+
+Add the gentoo preferences for the omni.jar creation
+
+diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in
+--- a/mail/installer/package-manifest.in
++++ b/mail/installer/package-manifest.in
+@@ -313,16 +313,17 @@
+ @RESPATH@/components/devtools-startup.manifest
+ @RESPATH@/components/devtools-startup.js
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ; Default Profile Settings
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; default pref files
++@RESPATH@/defaults/pref/all-gentoo.js
+ @RESPATH@/defaults/pref/all-thunderbird.js
+ @RESPATH@/defaults/pref/channel-prefs.js
+ @RESPATH@/defaults/pref/composer.js
+ @RESPATH@/defaults/pref/mailnews.js
+ @RESPATH@/defaults/pref/mdn.js
+ @RESPATH@/defaults/pref/smime.js
+ @RESPATH@/defaults/pref/thunderbird-branding.js
+ @RESPATH@/greprefs.js
diff --git a/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
new file mode 100644
index 000000000000..f9d87bef2ffd
--- /dev/null
+++ b/mail-client/thunderbird/files/icon/thunderbird-unbranded.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mozilla Thunderbird
+Comment=Mail & News Reader
+Exec=/usr/bin/thunderbird %u
+Icon=thunderbird-icon-unbranded
+Terminal=false
+Type=Application
+Categories=Office;Network;Email;
+MimeType=x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/icon/thunderbird.desktop b/mail-client/thunderbird/files/icon/thunderbird.desktop
new file mode 100644
index 000000000000..f9c31eba37b2
--- /dev/null
+++ b/mail-client/thunderbird/files/icon/thunderbird.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mozilla Thunderbird
+Comment=Mail & News Reader
+Exec=/usr/bin/thunderbird %u
+Icon=thunderbird-icon
+Terminal=false
+Type=Application
+Categories=Office;Network;Email;
+MimeType=x-scheme-handler/mailto;
diff --git a/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1 b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1
new file mode 100644
index 000000000000..97c5fd09b8a6
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-gentoo-default-prefs-1.js-1
@@ -0,0 +1,9 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("browser.display.use_system_colors",   true);
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("mail.shell.checkDefaultClient", false);
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1");
+pref("extensions.autoDisableScopes", 0);
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
new file mode 100644
index 000000000000..9b3685ecc048
--- /dev/null
+++ b/mail-client/thunderbird/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>mozilla@gentoo.org</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
+<use>
+	<flag name="bindist">Disable official Thunderbird branding (icons, name) which 
+		are not binary-redistributable according to upstream.</flag>
+	<flag name="crypt"> Enable encryption support with enigmail</flag>
+	<flag name="mozdom">Enable Mozilla's DOM inspector</flag>
+	<flag name="lightning">Enable app-global calendar support
+		(note 38.0 and above bundles calendar support when this flag is off)</flag>
+	<flag name="custom-optimization">Build with user-specified compiler optimizations
+		(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
+	<flag name="gtk2">Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3</flag>
+	<flag name="jemalloc">Enable or disable jemalloc</flag>
+	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
+	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
+	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
+		instead of bundled.</flag>
+	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
+		and <pkg>media-gfx/graphite2</pkg> instead of bundled.</flag>
+	<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
+		instead of bundled.</flag>
+	<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
+		instead of bundled.</flag>
+	<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg>
+		instead of bundled.</flag>
+	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
+		instead of bundled.</flag>
+	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
+		installation with secure-delete enabled</flag>
+	<flag name="minimal">Remove the software development kit and headers</flag>
+</use>
+</pkgmetadata>
diff --git a/mail-client/thunderbird/thunderbird-45.8.0.ebuild b/mail-client/thunderbird/thunderbird-45.8.0.ebuild
new file mode 100644
index 000000000000..1d60a04de05f
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-45.8.0.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="4.7.8"
+MOZ_LIGHTNING_GDATA_VER="2.6"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCH="thunderbird-38.0-patches-0.1"
+PATCHFF="firefox-45.0-patches-12"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit flag-o-matic toolchain-funcs mozconfig-v6.45 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
+
+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"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}-r1.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.21.1
+	>=dev-libs/nspr-4.12
+	crypt? ( >=x11-plugins/enigmail-1.9.6.1-r1 )
+	"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+S="${WORKDIR}/${MOZ_P}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+
+	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
+		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
+		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
+		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
+		ewarn "emerging the package with USE=-jit"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	rm -f "${WORKDIR}"/thunderbird/2001_ldap_respect_cflags.patch
+	eapply "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	eapply "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+}
+
+src_compile() {
+	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake -f "${S}"/client.mk
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if in_iuse system-sqlite && use system-sqlite ; then
+		echo "lockPref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/other-licenses/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/mail/branding/aurora"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/mailicon48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt ; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EPREFIX}"/usr/share/enigmail/install.rdf)
+		if [[ -n ${emid} ]]; then
+			dosym "${EPREFIX}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		else
+			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "<EM:ID> tag for installed enigmail could not be found!"
+		fi
+	fi
+
+	# Required in order for jit to work on hardened, for mozilla-31 and above
+	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# Because PM's dont seem to properly merge a symlink replacing a directory
+	if use crypt ; then
+		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EPREFIX}"/usr/share/enigmail/install.rdf)
+		if [[ -z ${emid} ]]; then
+			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "Could not find enigmail on disk during pkg_preinst()"
+		fi
+		if [[ ! -h "${EPREFIX}${MOZILLA_FIVE_HOME}/extensions/${emid}" ]] && \
+		   [[ -d "${EPREFIX}${MOZILLA_FIVE_HOME}/extensions/${emid}" ]]; then
+			rm -Rf "${EPREFIX}${MOZILLA_FIVE_HOME}/extensions/${emid}" || (
+			eerror "Could not remove enigmail directory from previous installation,"
+			eerror "You must remove this by hand and rename the symbolic link yourself:"
+			eerror
+			eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions"
+			eerror "\t rm -Rf ${emid}"
+			eerror "\t mv ${emid}.backup* ${emid}" )
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/thunderbird-52.2.0.ebuild b/mail-client/thunderbird/thunderbird-52.2.0.ebuild
new file mode 100644
index 000000000000..1b9d0cf57930
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-52.2.0.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.1"
+MOZ_LIGHTNING_GDATA_VER="3.3"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHFF="firefox-52.2-patches-01"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit flag-o-matic toolchain-funcs mozconfig-v6.52 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
+
+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"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	crypt? ( >=x11-plugins/enigmail-1.9.7 )
+	"
+
+DEPEND="rust? ( dev-lang/rust )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+S="${WORKDIR}/${MOZ_P}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	eapply "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+	mozconfig_use_enable rust
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if in_iuse system-sqlite && use system-sqlite ; then
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/other-licenses/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/mail/branding/aurora"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/mailicon48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT}"usr/share/enigmail/install.rdf)
+		if [[ -n ${emid} ]]; then
+			dosym "${EPREFIX}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		else
+			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
+		fi
+	fi
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# Because PM's dont seem to properly merge a symlink replacing a directory
+	if use crypt ; then
+		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT}"usr/share/enigmail/install.rdf)
+		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		if [[ -z ${emid} ]]; then
+			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "Could not find enigmail on disk during pkg_preinst()"
+		fi
+		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
+			rm -Rf "${emidpath}" || (
+			eerror "Could not remove enigmail directory from previous installation,"
+			eerror "You must remove this by hand and rename the symbolic link yourself:"
+			eerror
+			eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions"
+			eerror "\t rm -Rf ${emid}"
+			eerror "\t mv ${emid}.backup* ${emid}" )
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/thunderbird-52.3.0.ebuild b/mail-client/thunderbird/thunderbird-52.3.0.ebuild
new file mode 100644
index 000000000000..589cf030f750
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-52.3.0.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.3"
+MOZ_LIGHTNING_GDATA_VER="3.3"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHFF="firefox-52.2-patches-03"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit flag-o-matic toolchain-funcs mozconfig-v6.53 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
+
+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"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	crypt? ( >=x11-plugins/enigmail-1.9.7 )
+	"
+
+DEPEND="rust? ( dev-lang/rust )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+S="${WORKDIR}/${MOZ_P}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	eapply "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+	mozconfig_use_enable rust
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if in_iuse system-sqlite && use system-sqlite ; then
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/other-licenses/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/mail/branding/aurora"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/mailicon48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT}"usr/share/enigmail/install.rdf)
+		if [[ -n ${emid} ]]; then
+			dosym "${EPREFIX}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		else
+			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
+		fi
+	fi
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# Because PM's dont seem to properly merge a symlink replacing a directory
+	if use crypt ; then
+		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT}"usr/share/enigmail/install.rdf)
+		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		if [[ -z ${emid} ]]; then
+			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "Could not find enigmail on disk during pkg_preinst()"
+		fi
+		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
+			rm -Rf "${emidpath}" || (
+			eerror "Could not remove enigmail directory from previous installation,"
+			eerror "You must remove this by hand and rename the symbolic link yourself:"
+			eerror
+			eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions"
+			eerror "\t rm -Rf ${emid}"
+			eerror "\t mv ${emid}.backup* ${emid}" )
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/thunderbird-52.4.0.ebuild b/mail-client/thunderbird/thunderbird-52.4.0.ebuild
new file mode 100644
index 000000000000..a63acd0bc2d7
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-52.4.0.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="5.4.4"
+MOZ_LIGHTNING_GDATA_VER="3.3"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHFF="firefox-52.4-patches-02"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
+MOZCONFIG_OPTIONAL_WIFI=1
+
+inherit flag-o-matic toolchain-funcs mozconfig-v6.52 makeedit autotools pax-utils check-reqs nsplugins mozlinguas-v2 xdg-utils gnome2-utils
+
+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"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom rust selinux"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.28.3
+	>=dev-libs/nspr-4.13.1
+	crypt? ( >=x11-plugins/enigmail-1.9.7 )
+	"
+
+DEPEND="rust? ( dev-lang/rust )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+S="${WORKDIR}/${MOZ_P}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	epatch "${FILESDIR}"/1000_fix_gentoo_preferences.patch
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	eapply "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+	mozconfig_use_enable rust
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+	emake V=1 -f client.mk
+}
+
+src_install() {
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	mozconfig_install_prefs \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js"
+
+	# dev-db/sqlite does not have FTS3_TOKENIZER support.
+	# gloda needs it to function, and bad crashes happen when its enabled and doesn't work
+	if in_iuse system-sqlite && use system-sqlite ; then
+		echo "sticky_pref(\"mailnews.database.global.indexer.enabled\", false);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/other-licenses/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/mail/branding/aurora"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/mailicon48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/mailicon${size}.png" "${icon}.png"
+	done
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT}"usr/share/enigmail/install.rdf)
+		if [[ -n ${emid} ]]; then
+			dosym "${EPREFIX}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		else
+			eerror "${EPREFIX}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
+		fi
+	fi
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin,plugin-container}
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# Because PM's dont seem to properly merge a symlink replacing a directory
+	if use crypt ; then
+		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT}"usr/share/enigmail/install.rdf)
+		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		if [[ -z ${emid} ]]; then
+			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "Could not find enigmail on disk during pkg_preinst()"
+		fi
+		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
+			rm -Rf "${emidpath}" || (
+			eerror "Could not remove enigmail directory from previous installation,"
+			eerror "You must remove this by hand and rename the symbolic link yourself:"
+			eerror
+			eerror "\t cd ${EPREFIX}${MOZILLA_FIVE_HOME}/extensions"
+			eerror "\t rm -Rf ${emid}"
+			eerror "\t mv ${emid}.backup* ${emid}" )
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
new file mode 100644
index 000000000000..90371d7c656d
--- /dev/null
+++ b/mail-client/trojita/Manifest
@@ -0,0 +1,8 @@
+AUX trojita-0.7-gpg-tests.patch 1465 SHA256 34115ea4e6f3a273035fa36efe509faab9ea8723aaafa73e39e5ccc800c866e3 SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb WHIRLPOOL 8146f357e9c795b2bcc2053ee11ed20658d5f433ae567d873e9c57b55974347e1557573c1b9e6141a41bc8052d4d4b1dcca61650e7b7c3ba29fe7e0547df1a21
+AUX trojita-0.7-gpgme.patch 1416 SHA256 2c68152b3b96f7472472f9d2501b79c3b55633b88fac7bb12d149660f22b4ab4 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1 WHIRLPOOL 1c134ee5e4c895cd3d7e3b83f7427ee4be1e2a0cd4006fabd3f28c5b8f01b4647a0074a5cd751c7eed907cbdbedad41e5018b8cc6e3cbe6c593d9a5ffc721cfb
+DIST trojita-0.7.tar.xz 1038212 SHA256 e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 WHIRLPOOL 2df7c34566bfdfff3a66566888ad8a9f9390af9a72eeb4a26dd96b96e46d07597441e8b9d56d7f18e2412f4a2e3b855e17a161ec88f0a9791e4db39117471e20
+EBUILD trojita-0.7-r2.ebuild 1849 SHA256 7a1770bd2ad340d1d84bff6abb0b61355b46099b31df6c7f0f4dbc028deb585f SHA512 54c1095763d5b3b4a97d84f996ab0c316bdd0c35271f4715de2f024e2e4506efa29e28e4b50dffa464eaad7fb7e4136aa63e6142c46fca7dbc2e14ffb6951b32 WHIRLPOOL 4aa7d792bcfb6a9139b0a2ba2f82cc76983af74f63dcc472af2e5f6581c17a3a0d77a489b17e15dceff4e3cccad519e35d28e9490687281fb8342689658a4089
+EBUILD trojita-9999.ebuild 1769 SHA256 ea304f98efce8eb60cd5a830c205a55e72de2dcc843ba0250e06349072de82f0 SHA512 01280ad986a648dc5cde48f195b5a32610c7fd8b787c439e6ae3d631162676159688e2e40f03aab519a7c29d0888619b11a533eadb6a622964e86b39ea836b1f WHIRLPOOL a115ad45d39f7db8142b241ddb1649c1c4e055f4f14648dd67f736f216cf63eaac07deb8531e93d50bb8d4c56c4452a0b65f3cc5a2e126acfd599cebcfe56d3a
+MISC ChangeLog 5309 SHA256 f01bf4531b6c8ad523b0dd0e200c895fa5b163e7fcb9d8c8ef798a71e1969a0a SHA512 e0d7773746a3bde207857a2e08423cbeb6694b0f9a2c79cbf4ceea7a1267cbd1a249ffeb8e32e4636bf8801adc52dfd0308dedb27d29e7af5da21d58faf74267 WHIRLPOOL d762e9779f111b947d0dc91fc20440548deb6413e7a17644aef93d94044136fd43ea9cbc61c2738a772f6d5950e3d3bc2e0230edd8455d8b4531da2a91a0aece
+MISC ChangeLog-2015 6418 SHA256 56c38e4b8cde5a3e19204e91d4af692cda3b8a627a89d20c90578118c760396d SHA512 2e0892f84ac6bf9630253407a1085f884c379d4500aaca3f8eebe26e21025dd37ee60e94ebb5fbf8511ee84252485bdfadbfb6779fccd56cc5dc5bfe0f5be1ad WHIRLPOOL 86ba786003eb9331da737fd936daedeb16f1c18054a06b8688b4e69c710a3b241236c5625fb58df400f5ceb903e9ef3495fe974289f82a0bc4f2403d47fa7549
+MISC metadata.xml 643 SHA256 74bfbd3b3a2b9080dfdfd7e17d35a49a1ffc65d39c8c1520af7d379b14aef66c SHA512 8a9fe47d6bc7f566e8bb896526d76bdc05171f034c48eda9c2d67e770d0eb9e98e7dbd30d98d6674ae7d8c6f9f3551013365356bc2dd2c0088bef5a17488236e WHIRLPOOL 76fcf44aa077fa94627a8b9e54cc63af353f8e4b1a6a59677216414918389de8b10a112a5034ba292ce6ceacf360913cc73c25f38a471f64a0b7a414df5f73dd
diff --git a/mail-client/trojita/files/trojita-0.7-gpg-tests.patch b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch
new file mode 100644
index 000000000000..db41ee577e82
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch
@@ -0,0 +1,27 @@
+commit be8fd5831afa0a04f14cd6206e6576f03ee59558
+Author: Amaury Pouly <amaury.pouly@gmail.com>
+Date:   Sat Sep 17 16:40:46 2016 +0100
+
+    Fix GPG test
+    
+    At least GnuPG, when run with both --fingerprint and --with-colons will output
+    the fingerprint of the public key and the subkey. The command below will thus
+    output two fingerprints and the delete command will fail because it cannot
+    find the second fingerprint (which is a subkey and not a public key). It seems
+    that a safe approach is to consider only the first fingerprint line.
+    
+    Change-Id: I4c6aa79e4473bca146aa087728a5652d91586a81
+
+diff --git a/tests/Cryptography/keygen.sh b/tests/Cryptography/keygen.sh
+index c94c0ab..98c69ca 100755
+--- a/tests/Cryptography/keygen.sh
++++ b/tests/Cryptography/keygen.sh
+@@ -115,7 +115,7 @@ $TAIL" > crypto_test_data.h
+ echo -n "key *\nexpire\nseconds=1\nsave\n" | ${GPG} --no-tty --quiet --command-fd 0 --edit-key "expired@test.trojita.flaska.net"
+ 
+ # extract fingerprint of key to be deleted
+-FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | cut -d : -f 10)"
++FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | head -n 1 | cut -d : -f 10)"
+ 
+ # delete key
+ yes | DISPLAY="" ${GPG} --quiet --batch --no-tty --delete-secret-and-public-key --yes --command-fd 0 --passphrase-fd 0 "${FINGERPRINT}"
diff --git a/mail-client/trojita/files/trojita-0.7-gpgme.patch b/mail-client/trojita/files/trojita-0.7-gpgme.patch
new file mode 100644
index 000000000000..2a7a6d5e7085
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpgme.patch
@@ -0,0 +1,34 @@
+commit 1978d0a12d2cb4886c5612d6a50b145f409d815c
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Wed Oct 26 22:42:47 2016 +0200
+
+    Switch from KF5Gpgmepp to Gpgmepp
+    
+    Gpgmepp is part of GpgME since 1.7.0.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index edf3e79..6993d2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qtkeychain password plugin"
+ trojita_find_package(Git "" "" "" "")
+ 
+ trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html" "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC)
+-trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git" "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP)
++trojita_find_package(QGpgme 1.8.0 "http://www.gnupg.org" "Qt5/C++ bindings for GpgME" "Needed for encrypted/signed e-mails" WITH_GPGMEPP)
+ trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP")
+ 
+ if(WIN32)
+@@ -615,11 +615,7 @@ if(WITH_MIMETIC)
+ endif()
+ if(WITH_CRYPTO_MESSAGES)
+   if(WITH_GPGMEPP)
+-    if (WIN32)
+-      target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme)
+-    else()
+-      target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme)
+-    endif()
++    target_link_libraries(Cryptography QGpgme)
+   endif()
+ endif()
+ 
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
new file mode 100644
index 000000000000..7cf4bb201385
--- /dev/null
+++ b/mail-client/trojita/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jkt@gentoo.org</email>
+		<name>Jan Kundrát</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">trojita</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
new file mode 100644
index 000000000000..bc979f3f5ee6
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="+crypt +dbus debug +password test +zlib"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	crypt? (
+		>=app-crypt/gpgme-1.8.0[cxx,qt5]
+		dev-libs/mimetic
+	)
+	dbus? ( dev-qt/qtdbus:5 )
+	password? ( dev-libs/qtkeychain[qt5(+)] )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )
+	zlib? ( virtual/pkgconfig )
+"
+
+DOCS=( README LICENSE )
+
+PATCHES=(
+	"${FILESDIR}/${P}-gpgme.patch"
+	"${FILESDIR}/${P}-gpg-tests.patch"
+	)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
+		-DWITH_GPGMEPP=$(usex crypt)
+		-DWITH_MIMETIC=$(usex crypt)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_QTKEYCHAINPLUGIN=$(usex password)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
new file mode 100644
index 000000000000..4988ce563e13
--- /dev/null
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} == 9999 ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="+crypt debug +dbus +password test +zlib"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	crypt? (
+		dev-libs/mimetic
+		>=app-crypt/gpgme-1.8.0[cxx,qt5]
+	)
+	dbus? ( dev-qt/qtdbus:5 )
+	password? ( dev-libs/qtkeychain[qt5(+)] )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )
+	zlib? ( virtual/pkgconfig )
+"
+
+DOCS="README LICENSE"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# the build system is taking a look at `git describe ... --dirty` and
+	# gentoo's modifications to CMakeLists.txt break these
+	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
+		-DWITH_GPGMEPP=$(usex crypt)
+		-DWITH_MIMETIC=$(usex crypt)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_QTKEYCHAINPLUGIN=$(usex password)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}