proj/gentoo: Initial commit

This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
author: Robin H. Johnson <robbat2@gentoo.org> 2015-08-08 13:49:04 -0700
committer: Robin H. Johnson <robbat2@gentoo.org> 2015-08-08 17:38:18 -0700
commit: 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree: 3f91093cdb475e565ae857f1c5a7fd339e2d781e /mail-client
download: gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
225 files changed, 12500 insertions, 0 deletions
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
new file mode 100644
index 000000000000..3104fe5b10f8
--- /dev/null
+++ b/mail-client/alot/Manifest
@@ -0,0 +1,2 @@
+DIST alot-0.3.5.tar.gz 1201061 SHA256 7f273b0657e7ee22fd65d6030a536c99ced39d6537c17eb186187923daa9125a SHA512 e781f63971dd1df46f221d0a11e14e4d0e1cb3a307ac317e950a53e28445130822c9d65c3bc99489d68500d4cc864c38c06f3f79e5fe98813d049a0dde22c22c WHIRLPOOL 1dc67524f0be9eb3088ce0710fa06205ac80dc63b3b194fc3bf0cb9a8c35139723372de27a21c466b8c3f3b01a6b4bb47fbdda109e3e13d915ef11fc72eebe37
+DIST alot-0.3.6.tar.gz 1492278 SHA256 b8e6092f18e503a528e934231c448db0e03d00e11d844192ba7eeb483838fee7 SHA512 30037ca1d2c169dda6c1660a24dadee12c6b5858d733ec7cd78e49d633850eecb763852c16565340596e32a6831ff8c36764d3f812de7f7947584defe05322b4 WHIRLPOOL cd4aab9dd84a441b92f5d4c62c783d58d8c4fafca614bf8bf462c1b3f0ffb4266e083380712b16f9469a0b418af1672625a21a6ae1f82f6623c6c22e005be6e9
diff --git a/mail-client/alot/alot-0.3.5.ebuild b/mail-client/alot/alot-0.3.5.ebuild
new file mode 100644
index 000000000000..c3299d1a4c44
--- /dev/null
+++ b/mail-client/alot/alot-0.3.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils 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/twisted-core-10.2.0
+	>=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	>=net-mail/notmuch-0.13[crypt,python]
+	sys-apps/file[python]
+	"
+
+ALOT_UPDATE=""
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-0.3.2"; then
+		ALOT_UPDATE="yes"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-0001-Use-Unicode-strings-when-dealing-with-.patch"
+
+	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.3.6.ebuild b/mail-client/alot/alot-0.3.6.ebuild
new file mode 100644
index 000000000000..802ae84e31d3
--- /dev/null
+++ b/mail-client/alot/alot-0.3.6.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/twisted-core-10.2.0
+	>=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	>=net-mail/notmuch-0.13[crypt,python]
+	sys-apps/file[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/files/0.3.2-subject-fix.patch b/mail-client/alot/files/0.3.2-subject-fix.patch
new file mode 100644
index 000000000000..064b416016a0
--- /dev/null
+++ b/mail-client/alot/files/0.3.2-subject-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur pazz-alot-34f4a7d/alot/defaults/default.theme pazz-alot-34f4a7d.new/alot/defaults/default.theme
+--- pazz-alot-34f4a7d/alot/defaults/default.theme	2012-07-22 23:01:59.000000000 +0200
++++ pazz-alot-34f4a7d.new/alot/defaults/default.theme	2012-08-01 10:24:05.359838188 +0200
+@@ -62,7 +62,7 @@
+         [[[subject]]]
+             normal = 'default','','light gray','default','g66','default'
+             focus = 'standout','','yellow','light gray','yellow','g58'
+-            #width = 'weight', 1
++            width = 'weight', 1
+         [[[content]]]
+             normal = 'default','','light gray','default','dark gray','default'
+             focus = 'standout','','yellow','light gray','yellow','g58'
diff --git a/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch b/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
new file mode 100644
index 000000000000..c7809fa82615
--- /dev/null
+++ b/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
@@ -0,0 +1,78 @@
+From 119e15cae5367d86e3754a337558eb98a420f46a Mon Sep 17 00:00:00 2001
+From: Simon Chopin <chopin.simon@gmail.com>
+Date: Wed, 24 Jul 2013 15:13:20 +0200
+Subject: [PATCH] Use Unicode strings when dealing with GPG
+
+This delays the encoding of special chars, if any, to the actual display
+which is supposed to know into what it should be encoded.
+---
+ alot/db/utils.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/alot/db/utils.py b/alot/db/utils.py
+index ba6d466..7fb2deb 100644
+--- a/alot/db/utils.py
++++ b/alot/db/utils.py
+@@ -51,9 +51,9 @@ def add_signature_headers(mail, sigs, error_msg):
+     )
+     mail.add_header(
+         X_SIGNATURE_MESSAGE_HEADER,
+-        'Invalid: {0}'.format(error_msg)
++        u'Invalid: {0}'.format(error_msg)
+         if error_msg else
+-        'Valid: {0}'.format(sig_from),
++        u'Valid: {0}'.format(sig_from),
+     )
+ 
+ 
+@@ -104,19 +104,19 @@ def message_from_file(handle):
+ 
+         malformed = False
+         if len(m.get_payload()) != 2:
+-            malformed = 'expected exactly two messages, got {0}'.format(
++            malformed = u'expected exactly two messages, got {0}'.format(
+                 len(m.get_payload()))
+ 
+         ct = m.get_payload(1).get_content_type()
+         if ct != app_pgp_sig:
+-            malformed = 'expected Content-Type: {0}, got: {1}'.format(
++            malformed = u'expected Content-Type: {0}, got: {1}'.format(
+                 app_pgp_sig, ct)
+ 
+         # TODO: RFC 3156 says the alg has to be lower case, but I've
+         # seen a message with 'PGP-'. maybe we should be more
+         # permissive here, or maybe not, this is crypto stuff...
+         if not p.get('micalg', 'nothing').startswith('pgp-'):
+-            malformed = 'expected micalg=pgp-..., got: {0}'.format(
++            malformed = u'expected micalg=pgp-..., got: {0}'.format(
+                 p.get('micalg', 'nothing'))
+ 
+         sigs = []
+@@ -144,13 +144,13 @@ def message_from_file(handle):
+ 
+         ct = m.get_payload(0).get_content_type()
+         if ct != app_pgp_enc:
+-            malformed = 'expected Content-Type: {0}, got: {1}'.format(
++            malformed = u'expected Content-Type: {0}, got: {1}'.format(
+                 app_pgp_enc, ct)
+ 
+         want = 'application/octet-stream'
+         ct = m.get_payload(1).get_content_type()
+         if ct != want:
+-            malformed = 'expected Content-Type: {0}, got: {1}'.format(want, ct)
++            malformed = u'expected Content-Type: {0}, got: {1}'.format(want, ct)
+ 
+         if not malformed:
+             try:
+@@ -199,7 +199,7 @@ def message_from_file(handle):
+                     add_signature_headers(m, sigs, '')
+ 
+         if malformed:
+-            msg = 'Malformed OpenPGP message: {0}'.format(malformed)
++            msg = u'Malformed OpenPGP message: {0}'.format(malformed)
+             m.attach(email.message_from_string(msg))
+ 
+     return m
+-- 
+1.8.3.2
+
diff --git a/mail-client/alot/metadata.xml b/mail-client/alot/metadata.xml
new file mode 100644
index 000000000000..f374d0cd4fb9
--- /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>
+		<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..5e03d759ec2c
--- /dev/null
+++ b/mail-client/alpine/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/mail-client/alpine/alpine-2.00-r5.ebuild b/mail-client/alpine/alpine-2.00-r5.ebuild
new file mode 100644
index 000000000000..8d4a68fa03d3
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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://patches.freeiz.com/alpine/"
+SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
+	chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/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 nls onlyalpine passfile smime spell ssl threads topal +chappa"
+
+DEPEND="virtual/pam
+	>=net-libs/c-client-2007f-r4[topal=,chappa=]
+	>=sys-libs/ncurses-5.1
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )
+	spell? ( app-text/aspell )
+	topal? ( >=net-mail/topal-72 )"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	!onlyalpine? ( !mail-client/pine )
+	!<=net-mail/uw-imap-2004g"
+
+pkg_setup() {
+	if use smime && use topal ; then
+		ewarn "You can not have USE='smime topal'. Assuming topal is more important."
+	fi
+}
+
+src_prepare() {
+	use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+	use topal && epatch /usr/share/topal/patches/"${P}".patch-{1,2}
+
+	# 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 topal || 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..6b7b10eee90f
--- /dev/null
+++ b/mail-client/alpine/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<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 <pkg>app-editors/pico</pkg> and/or 
+			<pkg>mail-client/pine</pkg></flag>
+		<flag name='passfile'>Adds support for caching passwords into a file
+			between sessions</flag>
+		<flag name='smime'>Enable support for S/MIME</flag>
+		<flag name='topal'>Enable support for <pkg>net-mail/topal</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
new file mode 100644
index 000000000000..608daccb5727
--- /dev/null
+++ b/mail-client/balsa/Manifest
@@ -0,0 +1,2 @@
+DIST balsa-2.4.14.tar.bz2 4092848 SHA256 9de197c3adf2cfa1ddf8c3b6da11e5b06f58b27a917e064de34621d5f9210522 SHA512 e33b8a59b70861827f063a4336d2055169d719707e774d50443e6dc6884d99c23a36c42e1acfd99485bfe864e710dd0f635adc76697a911339cf8b6870a64c3d WHIRLPOOL 43e0ad0356fb5e4f1840daa33bce40ae1dc89c0864cf04ab7b50e604d0589014e28199e2b694fcb48d1c7cc54e1bac6bc912aa93033a24852d9c68a20555d8ab
+DIST balsa-2.5.2.tar.bz2 4049163 SHA256 01218dd8cb2c052c2d221d96e4ef5e277271befb2b50bbf4913223913214d21d SHA512 f7a9127d87869d57acebaf33f9e3e4b82c5a5ba90aa5304ce40ba48a1a7f01eaf602555f8e97bce70b0baeb2ac8b5ac12941eaa8b85be1886bf22f7767dd75ba WHIRLPOOL 7b7d96cda21b50a4acb068e5989696acd02ebb1fa70563f47230a8c0a04da51cf3af4422c23d13c5dbff27d89cce6e7516a6eeaa6464c9dedd6d2d326587fc65
diff --git a/mail-client/balsa/balsa-2.4.14.ebuild b/mail-client/balsa/balsa-2.4.14.ebuild
new file mode 100644
index 000000000000..998f1d37ae0c
--- /dev/null
+++ b/mail-client/balsa/balsa-2.4.14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+# Doesn't currently build with -gnome
+IUSE="crypt gnome +gtkspell kerberos ldap libnotify networkmanager rubrica sqlite ssl webkit xface"
+
+# TODO: esmtp can be optional
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.18:2
+	dev-libs/gmime:2.6
+	dev-libs/libunique:1
+	>=net-libs/libesmtp-1.0.3:=
+	net-mail/mailbase
+	media-libs/libcanberra:=[gtk]
+	x11-themes/hicolor-icon-theme
+	crypt? ( >=app-crypt/gpgme-1.0:= )
+	gnome? (
+		>=gnome-base/orbit-2
+		>=gnome-base/libbonobo-2.0
+		>=gnome-base/libgnome-2.0
+		>=gnome-base/libgnomeui-2.0
+		>=gnome-base/gconf-2.0:2
+		>=gnome-base/gnome-keyring-2.20
+		>=x11-libs/gtksourceview-2.10:2.0 )
+	sqlite? ( >=dev-db/sqlite-2.8:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	gtkspell? (
+		app-text/gtkspell:2
+		app-text/enchant )
+	!gtkspell? ( app-text/aspell )
+	kerberos? ( app-crypt/mit-krb5 )
+	ldap? ( net-nds/openldap )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	rubrica? ( dev-libs/libxml2:2 )
+	ssl? ( dev-libs/openssl:= )
+	webkit? ( >=net-libs/webkit-gtk-1.5.1:2 )
+	xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=app-text/scrollkeeper-0.1.4
+	app-text/gnome-doc-utils
+"
+
+src_prepare() {
+	# Fix documentation
+	epatch "${FILESDIR}/${PN}-2.4.11-doc-fixes.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+	if use crypt ; then
+		myconf+=" --with-gpgme=gpgme-config"
+	else
+		myconf+=" --without-gpgme"
+	fi
+
+	if use webkit; then
+		myconf+=" --with-html-widget=webkit"
+	else
+		myconf+=" --with-html-widget=no"
+	fi
+
+	gnome2_src_configure \
+		--disable-pcre \
+		--enable-gregex \
+		--enable-threads \
+		--with-gmime=2.6 \
+		--with-unique \
+		--with-canberra \
+		$(use_with gnome) \
+		$(use_with gnome gtksourceview) \
+		$(use_with gtkspell) \
+		$(use_with kerberos gss) \
+		$(use_with ldap) \
+		$(use_with libnotify) \
+		$(use_with networkmanager nm) \
+		$(use_with rubrica) \
+		$(use_with sqlite) \
+		$(use_with ssl) \
+		$(use_with xface compface) \
+		${myconf}
+}
diff --git a/mail-client/balsa/balsa-2.5.2.ebuild b/mail-client/balsa/balsa-2.5.2.ebuild
new file mode 100644
index 000000000000..63fb575a0165
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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/gnome-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? ( dev-libs/openssl:= )
+	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/files/balsa-2.4.11-doc-fixes.patch b/mail-client/balsa/files/balsa-2.4.11-doc-fixes.patch
new file mode 100644
index 000000000000..a4ce0cea02eb
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.4.11-doc-fixes.patch
@@ -0,0 +1,109 @@
+From 18dfe046c769900b3ed27087b652b05d6fd6cb55 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 14 Apr 2012 18:34:41 +0200
+Subject: [PATCH] Fix build issues in documentation
+
+---
+ doc/de/de.po     |    2 +-
+ doc/fr/fr.po     |    8 ++++----
+ doc/sl/sl.po     |   10 +++++-----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/doc/de/de.po b/doc/de/de.po
+index d62f188..0739ea0 100644
+--- a/doc/de/de.po
++++ b/doc/de/de.po
+@@ -183,7 +183,7 @@ msgstr "Alle weiteren Warenzeichen gehören den jeweiligen Eigentümern."
+ 
+ #: C/balsa.xml:100(releaseinfo)
+ msgid "This is version 2.721 of the Balsa manual."
+-msgstr "Dies ist Version 2.721 des <application>Balsa</application>-Handbuchs."
++msgstr "Dies ist Version 2.721 des Balsa-Handbuchs."
+ 
+ #: C/balsa.xml:106(revnumber)
+ msgid "2.721"
+diff --git a/doc/fr/fr.po b/doc/fr/fr.po
+index 7f8966a..8484ac6 100644
+--- a/doc/fr/fr.po
++++ b/doc/fr/fr.po
+@@ -5159,8 +5159,8 @@ msgid ""
+ msgstr ""
+ "L'onglet affiche alors le nom du filtre et les conditions qui décrivent "
+ "comment le filtre sélectionne les messages. La liste affiche le type des "
+-"conditions (les conditions sont décrites ensuite) : <placeholder-1/> <para></"
+-"para>Les trois boutons sous la liste permettent de modifier la condition "
++"conditions (les conditions sont décrites ensuite) : <placeholder-1/> "
++"Les trois boutons sous la liste permettent de modifier la condition "
+ "sélectionnée, d'en ajouter une nouvelle ou d'en supprimer une. La modification ou "
+ "la création d'une condition se fait dans la fenêtre <link linkend=\"win-"
+ "condition\">Éditer les conditions ...</link> qui s'ouvre quand vous cliquez "
+@@ -6078,7 +6078,7 @@ msgid ""
+ msgstr ""
+ "Par le passé, de nombreuses personnes ont contribué à <application>Balsa</"
+ "application>, tout particulièrement (par ordre alphabétique) : <placeholder-"
+-"1/> <para></para>Pour plus d'informations à ce sujet, consultez le <ulink "
++"1/> Pour plus d'informations à ce sujet, consultez le <ulink "
+ "url=\"http://balsa.gnome.org/\" type=\"http\">site Web de "
+ "<application>Balsa</application></ulink>. Veuillez envoyer tous "
+ "commentaires, suggestions et rapports d'anomalies à <ulink url=\"http://bugs."
+@@ -6117,7 +6117,7 @@ msgid ""
+ "Documentation Status Table</ulink>."
+ msgstr ""
+ "Les personnes ci-après ont apporté leurs contributions à ce manuel : "
+-"<placeholder-1/> <para></para>Adressez vos commentaires et suggestions au "
++"<placeholder-1/> Adressez vos commentaires et suggestions au "
+ "sujet du manuel au projet de documentation de <acronym>GNOME</acronym> "
+ "<email>docs@gnome.org</email> et à la liste de diffusion de "
+ "<application>Balsa</application> <email>balsa-list@gnome.org</email>. Vous "
+diff --git a/doc/sl/sl.po b/doc/sl/sl.po
+index aa24436..796a351 100644
+--- a/doc/sl/sl.po
++++ b/doc/sl/sl.po
+@@ -924,7 +924,7 @@ msgstr "<menuchoice><guimenu>Možnosti</guimenu><guimenuitem>Zahtevaj obvestilo
+ 
+ #: C/balsa.xml:1730(para)
+ msgid "<menuchoice><guimenu>Options</guimenu><guimenuitem>Format = Flowed</guimenuitem></menuchoice> -- The <quote>Flowed</quote> format (RFC 3676) breaks the message text into paragraphs, which you type continuously using the <keysym>Enter</keysym> key only to mark the end of a paragraph, and <quote>fixed</quote> lines which you mark individually using the <keysym>Enter</keysym> key. This allows other mailers that recognize the format to display the text appropriately for the width of the recipient's screen, and to quote the text correctly when constructing a reply. The text is also displayed intelligibly by a non-flowed-aware mailer."
+-msgstr "<menuchoice><guimenu>Možnosti</guimenu><guimenuitem>Oblika = Povezano</guimenuitem></menuchoice> -- Oblika <quote>Povezano</quote> (RFC 3676) prelomi sporočilo v odstavke, ki jih zvezno vnašate z <keysem>Vnosno tipko</keysym> le za oznako konca odstavka in <quote>nespremenljive</quote>vrstice, ki jih posamezno označite z uporabo <keysym>Vnosne tipke</keysym>. To ostalim poštnim odjemalcem, ki prepoznajo obliko, omogoča prikaz primeren širini zaslona prejemnika in pravilno samodejno citiranje pri sestavljanju odgovora. Besedilo pametno prikažejo tudi poštni odjemalci, ki ne prepoznajo oblike.  "
++msgstr "<menuchoice><guimenu>Možnosti</guimenu><guimenuitem>Oblika = Povezano</guimenuitem></menuchoice> -- Oblika <quote>Povezano</quote> (RFC 3676) prelomi sporočilo v odstavke, ki jih zvezno vnašate z <keysym>Vnosno tipko</keysym> le za oznako konca odstavka in <quote>nespremenljive</quote>vrstice, ki jih posamezno označite z uporabo <keysym>Vnosne tipke</keysym>. To ostalim poštnim odjemalcem, ki prepoznajo obliko, omogoča prikaz primeren širini zaslona prejemnika in pravilno samodejno citiranje pri sestavljanju odgovora. Besedilo pametno prikažejo tudi poštni odjemalci, ki ne prepoznajo oblike.  "
+ 
+ #: C/balsa.xml:1747(para)
+ msgid "Using <quote>Format=Flowed</quote> is strongly recommended. It helps to avert the <quote>embarrassing line wrap</quote> that you see when quoted text is broken across lines and shown with the wrong level of quoting."
+@@ -2635,7 +2635,7 @@ msgstr "Vrsta <guimenuitem>Enostavno</guimenuitem>: vnos besedila vam omogoča v
+ 
+ #: C/balsa.xml:4370(para)
+ msgid "<guimenuitem>Regular expression</guimenuitem>: you can input a list of regular expressions. You type your regular expression in the text entry, then you click on the <guibutton>Add</guibutton> button to put it into the list. Of course the <guibutton>Remove</guibutton> button destroys the selected regular expression in the list. The last button <guibutton>One matches/None matches</guibutton> lets you specify when a message matches the condition: when one of the regular expression matches or when none matches. The sentence above te list will be updated accordingly."
+-msgstr "<guimenuiutem>Logični izraz</guimenuitem>: vnesete lahko seznam logičnih izrazov. Logične izraze lahko vpišete v vnos besedila ter za dodajanje na seznam kliknite gumb <guibutton>Dodaj</guibutton>. Gumb <guibutton>Odstrani</guibutton> uniči izbran logični izraz s seznama. Zadnji gumb <guibutton>Eno skladanje/Brez skladanja</guibutton> vam omogoča navedbo kdaj se sporočilo sklada s pogojem: ko se sklada en logičen izraz ali ko se ne sklada noben logični izraz. Stavek nad seznamom bo ustrezno posodobljen."
++msgstr "<guimenuitem>Logični izraz</guimenuitem>: vnesete lahko seznam logičnih izrazov. Logične izraze lahko vpišete v vnos besedila ter za dodajanje na seznam kliknite gumb <guibutton>Dodaj</guibutton>. Gumb <guibutton>Odstrani</guibutton> uniči izbran logični izraz s seznama. Zadnji gumb <guibutton>Eno skladanje/Brez skladanja</guibutton> vam omogoča navedbo kdaj se sporočilo sklada s pogojem: ko se sklada en logičen izraz ali ko se ne sklada noben logični izraz. Stavek nad seznamom bo ustrezno posodobljen."
+ 
+ #: C/balsa.xml:4386(para)
+ msgid "<guimenuitem>Date</guimenuitem> interval: you can input the interval by the mean of the two text entries. A blank entry means no bound. The button tells to match when the message date is within the bounds or not. The sentence above the text entries will be updated accordingly."
+@@ -2788,7 +2788,7 @@ msgstr "Za ustvarjanje novega poštnega predala <glossterm linkend=\"glossary-po
+ 
+ #: C/balsa.xml:4623(para)
+ msgid "Under <application>Sawfish</application>, this dialog has been known to become obscured, causing the appearance that <application>Balsa</application> has locked up. Move the configuration dialog and see if the new dialog was hidden."
+-msgstr "V <applicartion>Sawfist</application> je to pogovorno okno postalo zakrito in daje vtis da se je <application>Balsa</application> zaklenil. Premaknite pogovorno okno nastavitev in poglejte, če je bilo pogovorno okno skrito."
++msgstr "V <application>Sawfist</application> je to pogovorno okno postalo zakrito in daje vtis da se je <application>Balsa</application> zaklenil. Premaknite pogovorno okno nastavitev in poglejte, če je bilo pogovorno okno skrito."
+ 
+ #: C/balsa.xml:4634(title)
+ msgid "Moving Messages"
+@@ -2825,7 +2825,7 @@ msgstr "<application>Balsa</application> lahko razširi imena vaših stikov, ki
+ 
+ #: C/balsa.xml:4680(para)
+ msgid "As you type a username in any of the To:, Cc:, or Bcc: entry boxes in the <link linkend=\"win-composer\">Compose window</link>, it will do a case insensitive search in the addressbook for a matching username, and pop up a list of matching complete addresses. Press <keysym>Cursor-Down</keysym> to highlight one of the addresses, and <keysym>Enter</keysym> to select it."
+-msgstr "Ko vtipkate uporabniško ime v katero od vnosnih polj Za:, Kp: ali Skp: v <link linkend=\"win-composer\">Sestavljalnemu oknu</link>, se bo izvedlo na velikost črk neobčutljivo iskanje za skladajoče uporabniško ime in pojavil se bo seznam skladajočih celotnih naslovov. Pritisnite <keysem>Navzdol</keysym> za poudarjanje enega naslovov in <keysym>Enter</keysym> za izbiro."
++msgstr "Ko vtipkate uporabniško ime v katero od vnosnih polj Za:, Kp: ali Skp: v <link linkend=\"win-composer\">Sestavljalnemu oknu</link>, se bo izvedlo na velikost črk neobčutljivo iskanje za skladajoče uporabniško ime in pojavil se bo seznam skladajočih celotnih naslovov. Pritisnite <keysym>Navzdol</keysym> za poudarjanje enega naslovov in <keysym>Enter</keysym> za izbiro."
+ 
+ #. This is best demonstrated
+ #.   with the following picture:</para>
+@@ -2984,7 +2984,7 @@ msgstr "Peter Williams (<email>peter@newton.cx</email>)"
+ 
+ #: C/balsa.xml:4856(para)
+ msgid "In the past, numerous people contributed to balsa, including (in alphabetical order): <placeholder-1/> To find more information about it, please visit the <application>Balsa</application><ulink url=\"http://balsa.gnome.org/\" type=\"http\">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url=\"http://bugs.gnome.org/\" type=\"http\"><acronym>GNOME</acronym> bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at <ulink url=\"http://balsa.gnome.org/bugs.html\" type=\"http\"> http://balsa.gnome.org/bugs.html</ulink>. If you are using <acronym>GNOME</acronym> 1.1 or later, you can also use command <command>bug-buddy</command> for submitting bug reports."
+-msgstr "V preteklosti je k programu prispevalo več ljudi, vključno z (v abecednem redu:) <placeholder-1/> Za več podrobnosti obiščite <applicaiton>Balsa</application> <ulink url=\"http://balsa.gnome.org/\" type=\"http\">Spletno stran</ulink>. Vse opombe, predloge in poročila o hroščih pošljite na <ulink url=\"http://bugs.gnome.org/\" type=\"http\"><acronym>GNOME</acronym> zbirko podatkov hroščev</ulink>. Navodila za pošiljanje poročil o hroščih je mogoče najti na <ulink url=\"http://balsa.gnome.org/bugs.html\" type=\"http\"> http://balsa.gnome.org/bugs.html</ulink>. V primeru da uporabljate <acronym>GNOME</acronym> 1.1 ali kasnejši lahko za pošiljanje poročil o hroščih uporabite tudi ukaz <command>bug-buddy</command>."
++msgstr "V preteklosti je k programu prispevalo več ljudi, vključno z (v abecednem redu:) <placeholder-1/> Za več podrobnosti obiščite <application>Balsa</application> <ulink url=\"http://balsa.gnome.org/\" type=\"http\">Spletno stran</ulink>. Vse opombe, predloge in poročila o hroščih pošljite na <ulink url=\"http://bugs.gnome.org/\" type=\"http\"><acronym>GNOME</acronym> zbirko podatkov hroščev</ulink>. Navodila za pošiljanje poročil o hroščih je mogoče najti na <ulink url=\"http://balsa.gnome.org/bugs.html\" type=\"http\"> http://balsa.gnome.org/bugs.html</ulink>. V primeru da uporabljate <acronym>GNOME</acronym> 1.1 ali kasnejši lahko za pošiljanje poročil o hroščih uporabite tudi ukaz <command>bug-buddy</command>."
+ 
+ #: C/balsa.xml:4905(para)
+ msgid "Peter Bloomfield (<email>peterbloomfield@bellsouth.net</email>)"
+-- 
+1.7.8.5
+
diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
new file mode 100644
index 000000000000..43c78fdfad4a
--- /dev/null
+++ b/mail-client/balsa/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<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 <pkg>app-office/rubrica</pkg>
+			addressbook</flag>
+	</use>
+</pkgmetadata>
diff --git a/mail-client/biabam/Manifest b/mail-client/biabam/Manifest
new file mode 100644
index 000000000000..166fc488e001
--- /dev/null
+++ b/mail-client/biabam/Manifest
@@ -0,0 +1 @@
+DIST biabam-0.9.7.tar.bz2 8334 RMD160 d75431e45f10fc3d190d8e61454aaf7e807429d0 SHA1 b17284996dbfa09d219465b4f81ecefb4fba6d4d SHA256 3db74189e3af2eca922dc4a2e0310bc92461acdf5cfb4d51241fc0bba89b5a2d
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..1a15d2fd6309
--- /dev/null
+++ b/mail-client/biabam/biabam-0.9.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/biabam/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-acpi-notifier/Manifest b/mail-client/claws-mail-acpi-notifier/Manifest
new file mode 100644
index 000000000000..44eb0786defd
--- /dev/null
+++ b/mail-client/claws-mail-acpi-notifier/Manifest
@@ -0,0 +1 @@
+DIST acpi_notifier-1.0.28.tar.gz 416732 SHA256 826208e16dfb3c4da7c9bd87aa7ab399d058ac740309347f2bbc769368b1f55c SHA512 f4bc09cfe3db52912f367fe4b2e1f73baf5714842a5c0798897fea576a61110749689b836f55ce94d6e5702f75ebc3c89562751b9a39513f7f33f0161b8e3c40 WHIRLPOOL 11de745541a7e057b684ebb587c3e7ed489e7d63378cf610b3f1915cd01497e8c01824a147fed3c52c87dec3a99b11493d64c7b2c97284c35d1ae167e35054b4
diff --git a/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild b/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild
new file mode 100644
index 000000000000..f7bad8355fa4
--- /dev/null
+++ b/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.28.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+MY_P="${MY_P/-/_}"
+
+DESCRIPTION="This plugin enables mail notification via LEDs on some laptops"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_postinst() {
+	PROC_IFACES="$(echo /proc/acpi/{asus/mled,ibm/led,acer/mailled}) /proc/driver/acerhk/led"
+
+	local procfile
+	local message_shown=false
+
+	for procfile in ${PROC_IFACES}; do
+		if [[ -f ${procfile} ]]; then
+			elog "Make sure ${procfile} is writable by users of this plugin."
+			message_shown=true
+		fi
+	done
+}
diff --git a/mail-client/claws-mail-acpi-notifier/metadata.xml b/mail-client/claws-mail-acpi-notifier/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-acpi-notifier/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-address_keeper/Manifest b/mail-client/claws-mail-address_keeper/Manifest
new file mode 100644
index 000000000000..8a3f51704a3b
--- /dev/null
+++ b/mail-client/claws-mail-address_keeper/Manifest
@@ -0,0 +1 @@
+DIST address_keeper-1.0.7.tar.gz 381829 SHA256 ed3f1aee0ff9d4f9879938a8f3615ddb7d037b666d2cebbf65dcb45b8937b019 SHA512 243061c74735f212586504d572337ba8e70373058c76bfda67a0837996de9843c929d0301788845121bed4dcf15df4bb8dff4002b3c66a10f1d0f95bee9b745d WHIRLPOOL 64d3ec1ba13fb79d2455ba8f7cf6e978901699064a32b2471629a4f8ead8c1f4d20b7809540bdbbc1e977a8e62dec715e65f31824f412e73ae42695cea99df3b
diff --git a/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild b/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild
new file mode 100644
index 000000000000..17a284e68d1b
--- /dev/null
+++ b/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Plugin for Claws to collect all recipients in an address book folder"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-address_keeper/metadata.xml b/mail-client/claws-mail-address_keeper/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-address_keeper/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-archive/Manifest b/mail-client/claws-mail-archive/Manifest
new file mode 100644
index 000000000000..fce1f4cdaaac
--- /dev/null
+++ b/mail-client/claws-mail-archive/Manifest
@@ -0,0 +1 @@
+DIST archive-0.6.13.tar.gz 463329 SHA256 0edf299d82760f28f553bcd1abc02337ca5adfde0626313dc361584d9bf0359b SHA512 93f331962648666234ec0c3bb2c488678e72ef32c27c18588726a93cbe63d3168eed149d3b5a4b2cf23f090988c46dc0b7cf1c3d2c3316d3061dae6b92f86157 WHIRLPOOL 5d5b30c1e17b4ae92e1c331461ee37dd157679d4e5205326de74b91ffdbedcc8b117074390c5a67440a37dda469af16c30cd8a003def8c8364ad6ce30972336b
diff --git a/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild b/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild
new file mode 100644
index 000000000000..817a01379087
--- /dev/null
+++ b/mail-client/claws-mail-archive/claws-mail-archive-0.6.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Plugin for Claws to add archiving features"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+	app-arch/libarchive
+	>=net-misc/curl-7.9.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-archive/metadata.xml b/mail-client/claws-mail-archive/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-archive/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-att-remover/Manifest b/mail-client/claws-mail-att-remover/Manifest
new file mode 100644
index 000000000000..596d9ab08de5
--- /dev/null
+++ b/mail-client/claws-mail-att-remover/Manifest
@@ -0,0 +1 @@
+DIST att_remover-1.0.15.tar.gz 318481 SHA256 f0946331dd692c2ab6b13ed4791338c823359b59649a24dfb6fd4b1b4bb66d32 SHA512 a7a6c4248b7e5918743a8d78be3e37c6f07505d4ac9ab4fb06285cbc1f13b72cf6988cc4622e5ca3ecd69556654d66fec2bd668408ba39d06e498f9cf809eb50 WHIRLPOOL 7f0aba8caa2273a6c1cb21ed496dd559030dd0d93473f6fc3aabe681bafb2fe6c1d693f4081185b21f52a2b54917484dcaa78b2d5a60de096006556104759e97
diff --git a/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild b/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild
new file mode 100644
index 000000000000..074509a001b7
--- /dev/null
+++ b/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.15.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+MY_P="${MY_P/-/_}"
+
+DESCRIPTION="This plugin lets you remove attachments from mails"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-att-remover/metadata.xml b/mail-client/claws-mail-att-remover/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-att-remover/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-attachwarner/Manifest b/mail-client/claws-mail-attachwarner/Manifest
new file mode 100644
index 000000000000..3956c463240d
--- /dev/null
+++ b/mail-client/claws-mail-attachwarner/Manifest
@@ -0,0 +1 @@
+DIST attachwarner-1.0.tar.gz 402072 SHA256 6b66677bd8a4bedbeb96ce41eab1c2d8ee2f1b20742926e4df732f82f025e15a SHA512 a4e2ce81e368b9af52bfb343498244d065b712d0655b461bbf57a520dc844290d8829a5c27a3f146d2bf903c0c8ba9e2a40a7657ef6be1f67a03334c668d2fe7 WHIRLPOOL 20210057bfc0694920982525be10600f7aeda660bad82a8a393ed8846f817fca5eb3948e03a6d45eb0257a4819e3e46c0e741c846d9f9b64c9254753b33618e1
diff --git a/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild b/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild
new file mode 100644
index 000000000000..69c43f3cd174
--- /dev/null
+++ b/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Warn about missing attachment, if it's mentioned in message body"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="nls"
+RDEPEND="~mail-client/claws-mail-3.9.0
+		nls? ( >=sys-devel/gettext-0.12.1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-attachwarner/metadata.xml b/mail-client/claws-mail-attachwarner/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-attachwarner/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-clamd/Manifest b/mail-client/claws-mail-clamd/Manifest
new file mode 100644
index 000000000000..c6f9ccde1a93
--- /dev/null
+++ b/mail-client/claws-mail-clamd/Manifest
@@ -0,0 +1 @@
+DIST clamd-3.5.5.tar.gz 411572 SHA256 0b433e128899e5fcf76201a9aaf2bebef4273a313fe36195e94595baa6fbefec SHA512 b752d28529d6d5bfe54cb6c67ccbb8154763bedb2cc6c1caae4a6c4d476b988ce048ecfe4fc997c55ea6177b5602e97679c55beb4e992881b0a96b8ffc9d761c WHIRLPOOL 0658ceba4437c021769715fad506b4966d75ff56106f961811130b32993f0f3bb10091614362a335c748e08e105071ac72e41a6da9caa3d358c4af83ad1e15ce
diff --git a/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild b/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild
new file mode 100644
index 000000000000..650606bc17c4
--- /dev/null
+++ b/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Plugin for Claws to scan for viruses"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+	app-antivirus/clamav
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-clamd/metadata.xml b/mail-client/claws-mail-clamd/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-clamd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-fancy/Manifest b/mail-client/claws-mail-fancy/Manifest
new file mode 100644
index 000000000000..68cf0699a140
--- /dev/null
+++ b/mail-client/claws-mail-fancy/Manifest
@@ -0,0 +1 @@
+DIST fancy-0.9.17.tar.gz 401521 SHA256 8d88906544f5221333ec54260fca55f96d141731326e328162d5569523f6b115 SHA512 0fd080356ea97035f6b271ca4f84c5e2e2bca163353bb3fdfff1e6d05161d89821f8de2e5a47ae30cf81ad753c9624285d7d91a2d397cb4ab9ed9eed6fcc4d3a WHIRLPOOL fa00041587e4d1932e2d2b7fcd76788e78c879fc21718089ca7f5915419cdba0e1aeb6c52960920f37d093b372b9ef28e7030f7b6ee52af232b96f434e467add
diff --git a/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild b/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild
new file mode 100644
index 000000000000..16aa74634e0d
--- /dev/null
+++ b/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+MY_P="${PN#claws-mail-}-${PV}"
+
+DESCRIPTION="Plugin to display HTML with Webkit"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+	>=net-libs/webkit-gtk-1.0:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-fancy/metadata.xml b/mail-client/claws-mail-fancy/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-fancy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-fetchinfo/Manifest b/mail-client/claws-mail-fetchinfo/Manifest
new file mode 100644
index 000000000000..4fd1a1b8c333
--- /dev/null
+++ b/mail-client/claws-mail-fetchinfo/Manifest
@@ -0,0 +1 @@
+DIST fetchinfo-plugin-0.4.25.tar.gz 377476 SHA256 94fa60b0bc4245a6e25c453127b8caf2bd356ad27d6c7da57cabb3bd8eeec0e4 SHA512 8b5f6436b499c52a92f5d69ea638bcfce9a4ba88f772c8191ece11a580389d5a0aa501faba319e2613dc19c98eaf7a907e6192a27302a743f25292e541ffdf00 WHIRLPOOL 33e4fe9e52ce6cf47713dcaa18d85756a48d5f93831d8a2bf6ff1b0a5200d7b04ce4e7743e25517496ecd94bde1c76b5617dea30546a7b6e2d0b580e5bc133df
diff --git a/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild b/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild
new file mode 100644
index 000000000000..021c30f2e8a1
--- /dev/null
+++ b/mail-client/claws-mail-fetchinfo/claws-mail-fetchinfo-0.4.25.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="${PN#claws-mail-}-plugin-${PV}"
+
+DESCRIPTION="Plugin to add additional headers with download information"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-fetchinfo/metadata.xml b/mail-client/claws-mail-fetchinfo/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-fetchinfo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-gdata/Manifest b/mail-client/claws-mail-gdata/Manifest
new file mode 100644
index 000000000000..b2b8d652903a
--- /dev/null
+++ b/mail-client/claws-mail-gdata/Manifest
@@ -0,0 +1 @@
+DIST gdata_plugin-0.5.tar.gz 372567 SHA256 7352efcbe078d23f3a8df49affdbb63cfe98b06ca138ce63e4ac82b49ebfb469 SHA512 ec0e614594be1abf310ef0c202f1b249b0838beafab4c5c6cf7b55d8c226b560f98c9dd314348ea635bb66b660db4b275117229d27df95fb6306be76eec464bd WHIRLPOOL 2cdb8784c337880e02fdff77b112f548e0279689128eed3324cb6cd4f1fe433723377f2c75b4574d16d17178914f94ab9f8fca38a329840d28a28f2f30e0b503
diff --git a/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild b/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild
new file mode 100644
index 000000000000..9158daabce6b
--- /dev/null
+++ b/mail-client/claws-mail-gdata/claws-mail-gdata-0.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib
+
+MY_P="${PN#claws-mail-}_plugin-${PV}"
+
+DESCRIPTION="Plugin for Claws to use Google data providers"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+	>=dev-libs/libgdata-0.6.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-gdata/metadata.xml b/mail-client/claws-mail-gdata/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-gdata/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-gtkhtml/Manifest b/mail-client/claws-mail-gtkhtml/Manifest
new file mode 100644
index 000000000000..95961d966e3c
--- /dev/null
+++ b/mail-client/claws-mail-gtkhtml/Manifest
@@ -0,0 +1 @@
+DIST gtkhtml2_viewer-0.34.tar.gz 714838 SHA256 283fd3dff88ea0431c8595431fe0f2944b13d8480d952e1ead7fdc6e6eca282c SHA512 4a7c14fd794c1e5bbca031a07f355b3e1f4aa1fa0dd9e4e702b7398e18ef7e418a24c20079093bdfc14c755db83c1983dd6d29ea501c3762bbd890bcb7ccebb4 WHIRLPOOL e14937b37e2fa4a82b44d3bf1fe65803fe1433ae03946dd7df789f6074a0dd1da0e950f09c71ad458a9a07658a30c13ae5090201c3e9e269d158cfa6968aebcb
diff --git a/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.34.ebuild b/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.34.ebuild
new file mode 100644
index 000000000000..147b4ad764cf
--- /dev/null
+++ b/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.34.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+MY_P="${PN#claws-mail-}2_viewer-${PV}"
+
+DESCRIPTION="Renders HTML mail using the gtkhtml2 rendering widget"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+		net-misc/curl"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf --disable-accessibility || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-gtkhtml/metadata.xml b/mail-client/claws-mail-gtkhtml/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-gtkhtml/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-mailmbox/Manifest b/mail-client/claws-mail-mailmbox/Manifest
new file mode 100644
index 000000000000..ee13bf6d43e0
--- /dev/null
+++ b/mail-client/claws-mail-mailmbox/Manifest
@@ -0,0 +1 @@
+DIST mailmbox-1.15.tar.gz 394046 SHA256 633f7835261c88a0aa06de38553ac935a1799a7128120963a7fa87ace01dac18 SHA512 012172b2dec15ec6071279e27f80678c4e89d625974762dbc6cb421fcc220231021075fce11badc1bf31825004745a7601975edab7956ae288a883ec2b58df49 WHIRLPOOL 2ac17bea9326ab21d6b7290dbfb83ff5cbcec658f42f20d3d894363d519f9e527eb571c63301c54a5408649f55420585219f9baac1446da2c1685f12b817469b
diff --git a/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild b/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild
new file mode 100644
index 000000000000..e72dc7e5f360
--- /dev/null
+++ b/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Plugin to operate on mbox type mailboxes"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-mailmbox/metadata.xml b/mail-client/claws-mail-mailmbox/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-mailmbox/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-newmail/Manifest b/mail-client/claws-mail-newmail/Manifest
new file mode 100644
index 000000000000..8a004627e3d9
--- /dev/null
+++ b/mail-client/claws-mail-newmail/Manifest
@@ -0,0 +1 @@
+DIST newmail-0.0.16.tar.gz 311897 SHA256 cf5117b394c40a2eabb60cc7c45d7ebfb34d028e88cc97c49d25d3f219306e38 SHA512 ae678b1678310aec8cb43f0789c3f032dfdea670cd126d9b0873eef897ef0342ad9a3d1065f5f72fdcf4f24876c441667bb9cf2b114617351818c8c4a9cdef41 WHIRLPOOL a543e240d6161a810d52c90ea87bd116429f9fccf45194c974958928a66ab7b22f292f5fe6ffa381d931001431825bc2348570ccf84ae061651941b30bab91b7
diff --git a/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild b/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild
new file mode 100644
index 000000000000..a948c286a058
--- /dev/null
+++ b/mail-client/claws-mail-newmail/claws-mail-newmail-0.0.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Plugin which writes a header summary to a log file for each received mail"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-newmail/metadata.xml b/mail-client/claws-mail-newmail/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-newmail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-notification/Manifest b/mail-client/claws-mail-notification/Manifest
new file mode 100644
index 000000000000..89947c40adee
--- /dev/null
+++ b/mail-client/claws-mail-notification/Manifest
@@ -0,0 +1 @@
+DIST notification_plugin-0.31.tar.gz 561196 SHA256 51cf2f52d60535e0ee8e1a80340cc12c6ed2179055846141afbf94faadca539e SHA512 017ed3579a193baf3f6a7e859d518ec075eb8c4f960d67d64f1f54433dab76a8f1c71b8eb2326a0e3fc6c2d68635378d119822863677a71ccf4a5560b75f2b11 WHIRLPOOL 003b3a3ca022d486882c13838459b9613eb61a04aa440fe241683e35727c4d480f087881c5ff54bd2c04b29ea8883ece4e5b2b1eb5376f02f2bebb4825f4de8e
diff --git a/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild b/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild
new file mode 100644
index 000000000000..c692c9e5956a
--- /dev/null
+++ b/mail-client/claws-mail-notification/claws-mail-notification-0.31.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit multilib
+
+MY_P=${PN#claws-mail-}_plugin-${PV}
+
+DESCRIPTION="Plugin providing various ways to notify user of new and unread mail"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="libnotify"
+
+RDEPEND="~mail-client/claws-mail-3.9.0
+	>=x11-libs/gtk+-2.10:2
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable libnotify)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch b/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch
new file mode 100644
index 000000000000..6159d139cdb5
--- /dev/null
+++ b/mail-client/claws-mail-notification/files/claws-mail-notification-0.26-libnotify-0.7.patch
@@ -0,0 +1,50 @@
+--- src/notification_popup.c
++++ src/notification_popup.c
+@@ -339,7 +339,16 @@
+     break;
+   }
+ 
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
++#else
+   ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++#endif
++#else
++  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++#endif
++
+   g_free(utf8_str);
+   if(ppopup->notification == NULL) {
+     debug_print("Notification Plugin: Failed to create a new "
+--- src/notification_trayicon.c
++++ src/notification_trayicon.c
+@@ -61,6 +61,10 @@
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ typedef struct {
+   gint count;
+   gint num_mail;
+@@ -601,8 +605,17 @@
+   summary  = notification_trayicon_popup_assemble_summary();
+   utf8_str = notification_trayicon_popup_assemble_body(msginfo);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  popup.notification = notify_notification_new(summary, utf8_str, NULL);
++#else
+   popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++#endif
++
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  /* notify_notification_attach_to_status_icon function was removed */
++#else
+   notify_notification_attach_to_status_icon(popup.notification, trayicon);
++#endif
+ 
+   g_free(summary);
+   g_free(utf8_str);
diff --git a/mail-client/claws-mail-notification/files/claws-mail-notification-0.27-libnotify-0.7-extra.patch b/mail-client/claws-mail-notification/files/claws-mail-notification-0.27-libnotify-0.7-extra.patch
new file mode 100644
index 000000000000..34b96392de00
--- /dev/null
+++ b/mail-client/claws-mail-notification/files/claws-mail-notification-0.27-libnotify-0.7-extra.patch
@@ -0,0 +1,11 @@
+--- configure	2011-04-09 19:17:25.000000000 +0200
++++ configure	2011-04-13 16:40:22.000000000 +0200
+@@ -14934,7 +14934,7 @@
+ fi
+ 
+ LIBNOTIFY_REQUIRED=0.4.3
+-LIBNOTIFY_TOO_HIGH=0.7.0
++LIBNOTIFY_TOO_HIGH=0.8.0
+ # Check whether --enable-libnotify was given.
+ if test "${enable_libnotify+set}" = set; then :
+   enableval=$enable_libnotify; enable_libnotify=$enableval
diff --git a/mail-client/claws-mail-notification/metadata.xml b/mail-client/claws-mail-notification/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-notification/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-pdf-viewer/Manifest b/mail-client/claws-mail-pdf-viewer/Manifest
new file mode 100644
index 000000000000..f9e3c8172231
--- /dev/null
+++ b/mail-client/claws-mail-pdf-viewer/Manifest
@@ -0,0 +1 @@
+DIST pdf_viewer-0.9.3.tar.gz 406297 SHA256 0c7e4bd58ad878fc59d6c11db16086176b173ee4c9eb6850aa2429efc8cb24eb SHA512 e246b681fb0af1755efd97c9fea24494c62c47cbd4141f074864130d0e4fdbf6afdcebfb5b631911061ca5b7ae712e89bcd14feea6c186870e5cc230ce138fdf WHIRLPOOL 95c7b1992f7df9b54c31ac79265fb729e4af1c1605d0c529edd684ac90a529d7dff641c0f376bcbd4d1dcabdc34bdd7d443189ce0f8b2716d5e037d78e2a6834
diff --git a/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild b/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild
new file mode 100644
index 000000000000..acc561731ab6
--- /dev/null
+++ b/mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${P#claws-mail-}"
+MY_P="${MY_P/-/_}"
+
+DESCRIPTION="A plugin for Claws to display PDF files directly"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="x86 ~amd64"
+IUSE=""
+CDEPEND="~mail-client/claws-mail-3.9.0"
+RDEPEND="app-text/ghostscript-gpl"
+DEPEND="${CDEPEND}
+		app-text/poppler:=[cairo]
+		virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-pdf-viewer/metadata.xml b/mail-client/claws-mail-pdf-viewer/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-pdf-viewer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-perl/Manifest b/mail-client/claws-mail-perl/Manifest
new file mode 100644
index 000000000000..f40f7fb1b6f8
--- /dev/null
+++ b/mail-client/claws-mail-perl/Manifest
@@ -0,0 +1 @@
+DIST perl_plugin-0.9.20.tar.gz 343772 SHA256 edb2814b8eccf3de8d0719f24ddf12d9c7b76a414279fc193670da2b49af6d84 SHA512 8afa509568b33994e0f53e869a78e4ec01b53f0f94d5cb0b55edb483ace39fa0a0404c32d6d2eeef32d9e7c3eec9059cdae173d79fcb9a957c3b3f4324097f81 WHIRLPOOL 9f524ae27dabbfd6668fd2dfb2aa7132f34719a4753c47564c01b56c03eec288f6d48843a94cb42c19d5d4edcadcf8b6f7492626682d8b96c5a768dff4ede9c7
diff --git a/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild b/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild
new file mode 100644
index 000000000000..78fca8010d66
--- /dev/null
+++ b/mail-client/claws-mail-perl/claws-mail-perl-0.9.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P="${PN#claws-mail-}_plugin-${PV}"
+
+DESCRIPTION="Plugin to use perl to write filtering rules"
+HOMEPAGE="http://www.claws-mail.org"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+		dev-lang/perl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf || die
+	emake || die
+
+	pod2man --section=1 --release=${PV} --name=cm_perl cm_perl.pod > cm_perl.1
+
+	emake -C tools || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	doman cm_perl.1
+
+	cd tools
+	exeinto /usr/lib/claws-mail/tools
+	doexe *.pl
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_postinst() {
+	echo
+	elog "The documentation for this plugin is contained in a manpage."
+	elog "You can access it with 'man cm_perl'"
+	echo
+}
diff --git a/mail-client/claws-mail-perl/metadata.xml b/mail-client/claws-mail-perl/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-perl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-python/Manifest b/mail-client/claws-mail-python/Manifest
new file mode 100644
index 000000000000..cdf35ae37be2
--- /dev/null
+++ b/mail-client/claws-mail-python/Manifest
@@ -0,0 +1 @@
+DIST python_plugin-0.11.tar.gz 406917 SHA256 15e577c4212ab3631aeff5a5814b8be79e6818e44fe3a6bed365976495fd8aa4 SHA512 be5011ef965f431f477f6b2e85ba85b21ecd196ed16e73982d0a499e6ccb0c01683a9b083285e7ba6dd07c0098688334aefff45ee6487e300c390afb04ddf9dc WHIRLPOOL be828453ac86e45d798c1d539520399283694feb9ba9cf8c6b3ed8961893eddb9f05293167745f74b229f5e24e54153fa70372ca06b21a324e285415eca85948
diff --git a/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild b/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild
new file mode 100644
index 000000000000..029c97964f92
--- /dev/null
+++ b/mail-client/claws-mail-python/claws-mail-python-0.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit multilib
+
+MY_P="${PN#claws-mail-}_plugin-${PV}"
+
+DESCRIPTION="Plugin to integrate with Python"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+	>=dev-lang/python-2.5
+	>=dev-python/pygtk-2.10.3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-python/metadata.xml b/mail-client/claws-mail-python/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-python/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-rssyl/Manifest b/mail-client/claws-mail-rssyl/Manifest
new file mode 100644
index 000000000000..006c136969c8
--- /dev/null
+++ b/mail-client/claws-mail-rssyl/Manifest
@@ -0,0 +1 @@
+DIST rssyl-0.34.tar.gz 509269 SHA256 2e96a1cd6a1a5bb7f86cd2eb48f6e174665957fafe1f3b1e8361aac3bb967f79 SHA512 c8c719907b4403fa9386a054f503620b3151720c5c780c7740cd701def09d8ea0a1b723c6f56eeebf2c8df8474e43d6f5fe3fe70afbc8edcb66de6a383a7458a WHIRLPOOL 4626644130ceef91b8d589610397d597b26a1e6545660763b2cb52426bf47e0c41a80d60e84924af703f34131653d637a2d907975423e0f86160acf927181afd
diff --git a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild
new file mode 100644
index 000000000000..7825813028cd
--- /dev/null
+++ b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.34.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Read your favorite newsfeeds in Claws Mail. RSS 1.0, 2.0 and Atom feeds are currently supported"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
+IUSE="nls"
+RDEPEND="~mail-client/claws-mail-3.9.0
+	net-misc/curl
+	dev-libs/libxml2
+	nls? ( >=sys-devel/gettext-0.12.1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(use_enable nls) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog README || die
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-rssyl/files/claws-mail-rssyl-0.27-newline_hiccup.patch b/mail-client/claws-mail-rssyl/files/claws-mail-rssyl-0.27-newline_hiccup.patch
new file mode 100644
index 000000000000..8ed58ed681f7
--- /dev/null
+++ b/mail-client/claws-mail-rssyl/files/claws-mail-rssyl-0.27-newline_hiccup.patch
@@ -0,0 +1,16 @@
+Index: src/strreplace.c
+===================================================================
+RCS file: /home/claws-mail/plugins/rssyl/src/Attic/strreplace.c,v
+retrieving revision 1.1.2.7
+diff -u -B -r1.1.2.7 strreplace.c
+--- src/strreplace.c	28 Oct 2009 08:28:43 -0000	1.1.2.7
++++ src/strreplace.c	13 Jul 2010 19:23:32 -0000
+@@ -112,7 +112,7 @@
+ 	memset(new, '\0', strlen(str) + 1);
+ 
+ 	while( *c != '\0' ) {
+-		if( !isspace(*c) || *c == ' ' ) {
++		if( !isspace(*c) || *c == ' ' || *c == '\n' ) {
+ 			*new_ptr = *c;
+ 			new_ptr++;
+ 		}
diff --git a/mail-client/claws-mail-rssyl/metadata.xml b/mail-client/claws-mail-rssyl/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-rssyl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-spam-report/Manifest b/mail-client/claws-mail-spam-report/Manifest
new file mode 100644
index 000000000000..702ee56115dd
--- /dev/null
+++ b/mail-client/claws-mail-spam-report/Manifest
@@ -0,0 +1 @@
+DIST spam_report-0.3.17.tar.gz 381326 SHA256 0213ee699ff0bf589f08dfeecb351a32ca1554dd2c1b7ef7e6ad7253d4f4debe SHA512 14d811ab2a6b03b6bdeb3d0dbb047c0f19d041e0b35ffe7063b8bff72024f4b3ce2bb7e08eb065aaf6abfb016d6d849e001ccbd35a424e4fef954b7cddc12f7a WHIRLPOOL d26f072fa31508860ae7d698541b19279610ea39bf7624814731ead9b73301d5865ce85ae317183c3c17fb485d33ca2b2bb33d77ab6a56af2bb7f3bb58b40d60
diff --git a/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild b/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild
new file mode 100644
index 000000000000..78d88f7e1059
--- /dev/null
+++ b/mail-client/claws-mail-spam-report/claws-mail-spam-report-0.3.17.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib
+
+MY_P="${P#claws-mail-}"
+MY_P="${MY_P/-/_}"
+
+DESCRIPTION="Plugin for Claws to report spam to various places"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+		>=net-misc/curl-7.9.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-spam-report/metadata.xml b/mail-client/claws-mail-spam-report/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-spam-report/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-tnef-parse/Manifest b/mail-client/claws-mail-tnef-parse/Manifest
new file mode 100644
index 000000000000..e158d02bc9b3
--- /dev/null
+++ b/mail-client/claws-mail-tnef-parse/Manifest
@@ -0,0 +1 @@
+DIST tnef_parse-0.3.14.tar.gz 411136 SHA256 41e4b3c45896bc20359bec007b7ee83961510d50e957defb92fd315a6b7d6a75 SHA512 6ddd57bdca9734a5480915e2c03077a3edb1dbf026d92159c5753fb87c16c1c6c4ec37d9d4430fc2a407716204f6039a287aba40440c9b39ebc2509f1ded2eea WHIRLPOOL 5a0f23d41c2728c848470d3f168ce1e6e995b8d885362e009173912618a94d1bf2141ab37509bdd8cf06788df39150df6387ba0156b734eeb4150c47475b3cef
diff --git a/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild b/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild
new file mode 100644
index 000000000000..85c9f9943f4e
--- /dev/null
+++ b/mail-client/claws-mail-tnef-parse/claws-mail-tnef-parse-0.3.14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib
+
+MY_P="${P#claws-mail-}"
+MY_P="${MY_P/-/_}"
+
+DESCRIPTION="Plugin for Claws to support application/ms-tnef attachments"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-tnef-parse/metadata.xml b/mail-client/claws-mail-tnef-parse/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-tnef-parse/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail-vcalendar/Manifest b/mail-client/claws-mail-vcalendar/Manifest
new file mode 100644
index 000000000000..9f4502249e14
--- /dev/null
+++ b/mail-client/claws-mail-vcalendar/Manifest
@@ -0,0 +1 @@
+DIST vcalendar-2.0.14.tar.gz 859883 SHA256 95e03f3a6df772deb2a091fb905166047cc986c46bf76dd9c8a9309d8b192130 SHA512 c392d4ff510c5a10544c9584a78c26914288cecf690e12f5362a57183ef2941b8b1d0b57b40de084f296e258fe4aba03f9f3b9febd559cac7c3fcef2b9599776 WHIRLPOOL e99a803d86297c56616750c1f14d632ff7a3eeae9938e2602fa247c84898ca157a8bd8c3c31c8ec6b982c07c83fe4f4eee576e08ddec154b219127ee89afbbce
diff --git a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild b/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild
new file mode 100644
index 000000000000..ecd25a6dc4de
--- /dev/null
+++ b/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.14.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib
+
+MY_P="${P#claws-mail-}"
+
+DESCRIPTION="Plugin for Claws to support the vCalendar meeting format"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+RDEPEND="~mail-client/claws-mail-3.9.0
+		>=net-misc/curl-7.9.7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.13_password-disclosure.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+
+	# going to conflict with libical
+	rm -f "${D}"/usr/include/ical.h
+	# kill useless files
+	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
diff --git a/mail-client/claws-mail-vcalendar/files/claws-mail-vcalendar-2.0.13_password-disclosure.patch b/mail-client/claws-mail-vcalendar/files/claws-mail-vcalendar-2.0.13_password-disclosure.patch
new file mode 100644
index 000000000000..4bea430cd31c
--- /dev/null
+++ b/mail-client/claws-mail-vcalendar/files/claws-mail-vcalendar-2.0.13_password-disclosure.patch
@@ -0,0 +1,150 @@
+In some instances, it might be the case that the only possible way to access a
+calendaring service is through https, and in such cases, the only way to
+authenticate (at least within the confines of vCalendar) is by embedding the
+username:password into the ics URL and/or have a 'private' url that shouldn't
+be shared.  
+
+In either case, after configuring a calendar and trying to access it, the full
+url is displayed in the status tray when trying to poll the calendar, something
+like:
+
+Fetching 'https://user:password@server.example.com/location/of/my/Calendar'...
+
+Thus, use of the vCalendar plugin really isn't suitable or secure for such
+configurations!  In the scenarios above, the former is more of a concern but
+neither is one you'd necessarily want to expose to prying eyes.  Even a google
+calendar "private url", for example, is visible it its entirety within the
+status tray.
+
+SOLUTION:
+Simply display the name that user has given to the calendar subscription in the
+tray instead.  Instead of what is currently displayed, just display something
+like
+
+Fetching 'My Enterprisey Collaboration Suite Calendar..."
+Fetching 'Google Calendar'...
+
+Upstream bug report: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2782
+Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=443500
+
+--- src/vcal_folder.c	11 Jul 2012 22:01:23 -0000	1.2.2.120
++++ src/vcal_folder.c	16 Nov 2012 09:03:33 -0000	1.2.2.121
+@@ -1609,7 +1609,7 @@
+ 	return GINT_TO_POINTER(0);
+ }
+ 
+-gchar *vcal_curl_read(const char *url, gboolean verbose, 
++gchar *vcal_curl_read(const char *url, const gchar *label, gboolean verbose, 
+ 	void (*callback)(const gchar *url, gchar *data, gboolean verbose, gchar *error))
+ {
+ 	gchar *result;
+@@ -1618,25 +1618,19 @@
+ 	pthread_t pt;
+ 	pthread_attr_t pta;
+ #endif
+-	gchar *msg;
+ 	void *res;
+ 	gboolean killed;
+ 	gchar *error = NULL;
+ 	result = NULL;
+ 	td = g_new0(thread_data, 1);
+-	msg = NULL;
+ 	res = NULL;
+ 	killed = FALSE;
+-	
++
+ 	td->url  = url;
+ 	td->result  = NULL;
+ 	td->done = FALSE;
+-	
+-	msg = g_strdup_printf(_("Fetching '%s'..."), url);
+-	
+-	STATUSBAR_PUSH(mainwindow_get_mainwindow(), msg);
+-	
+-	g_free(msg);
++
++	STATUSBAR_PUSH(mainwindow_get_mainwindow(), label);
+ 
+ #ifdef USE_PTHREAD
+ 	if (pthread_attr_init(&pta) != 0 ||
+@@ -1868,7 +1862,8 @@
+ static void update_subscription(const gchar *uri, gboolean verbose)
+ {
+ 	FolderItem *item = get_folder_item_for_uri(uri);
+-	
++	gchar *label;
++
+ 	if (prefs_common_get_prefs()->work_offline) {
+ 		if (!verbose || 
+ 		!inc_offline_should_override(TRUE,
+@@ -1882,7 +1877,11 @@
+ 			return;
+ 	}
+ 	main_window_cursor_wait(mainwindow_get_mainwindow());
+-	vcal_curl_read(uri, verbose, update_subscription_finish);
++
++	label = g_strdup_printf(_("Fetching calendar for %s..."), 
++			item && item->name ? item->name : _("new subscription"));
++	vcal_curl_read(uri, label, verbose, update_subscription_finish);
++	g_free(label);
+ }
+ 
+ static void check_subs_cb(GtkAction *action, gpointer data)
+Index: src/vcal_folder.h
+===================================================================
+RCS file: //plugins/vcalendar/src/vcal_folder.h,v
+retrieving revision 1.1.2.15
+retrieving revision 1.1.2.16
+diff -u -B -u -r1.1.2.15 -r1.1.2.16
+--- src/vcal_folder.h	6 Nov 2011 12:06:21 -0000	1.1.2.15
++++ src/vcal_folder.h	16 Nov 2012 09:03:33 -0000	1.1.2.16
+@@ -36,7 +36,7 @@
+ void vcal_folder_export(Folder *folder);
+ 
+ gboolean vcal_curl_put(gchar *url, FILE *fp, gint filesize, const gchar *user, const gchar *pass);
+-gchar *vcal_curl_read(const char *url, gboolean verbose, 
++gchar *vcal_curl_read(const char *url, const gchar *label, gboolean verbose, 
+ 	void (*callback)(const gchar *url, gchar *data, gboolean verbose, gchar
+ 		*error));
+ gchar* get_item_event_list_for_date(FolderItem *item, EventTime date);
+Index: src/vcal_meeting_gtk.c
+===================================================================
+RCS file: //plugins/vcalendar/src/vcal_meeting_gtk.c,v
+retrieving revision 1.1.2.95
+retrieving revision 1.1.2.96
+diff -u -B -u -r1.1.2.95 -r1.1.2.96
+--- src/vcal_meeting_gtk.c	30 Oct 2011 10:12:54 -0000	1.1.2.95
++++ src/vcal_meeting_gtk.c	16 Nov 2012 09:03:33 -0000	1.1.2.96
+@@ -1085,7 +1085,7 @@
+ 
+ 		if (!local_only) {
+ 			remail = g_strdup(email);
+-			g_free(email);
++
+ 			extract_address(remail);
+ 			if (strrchr(remail, ' '))
+ 				user = g_strdup(strrchr(remail, ' ')+1);
+@@ -1125,17 +1125,22 @@
+ 			&& strncmp(tmp, "ftp://", 6))
+ 				contents = file_read_to_str(tmp);
+ 			else {
++				gchar *label = g_strdup_printf(_("Fetching planning for %s..."), email);
+ 				if (!strncmp(tmp, "webcal://", 9)) {
+ 					gchar *tmp2 = g_strdup_printf("http://%s", tmp+9);
+ 					g_free(tmp);
+ 					tmp = tmp2;
+ 				}
+-				contents = vcal_curl_read(tmp, FALSE, NULL);
++				contents = vcal_curl_read(tmp, label, FALSE, NULL);
++				g_free(label);
+ 			}
+ 		} else {
+ 			contents = NULL;
+ 		}
++
++		g_free(email);
+ 		g_free(tmp);
++
+ 		if (contents == NULL) {
+ 			uncertain = TRUE;
+ 			att_update_icon(meet, attendee, 2, _("Free/busy retrieval failed"));
diff --git a/mail-client/claws-mail-vcalendar/metadata.xml b/mail-client/claws-mail-vcalendar/metadata.xml
new file mode 100644
index 000000000000..df7c388592e4
--- /dev/null
+++ b/mail-client/claws-mail-vcalendar/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
new file mode 100644
index 000000000000..d17a1f3b3d4b
--- /dev/null
+++ b/mail-client/claws-mail/Manifest
@@ -0,0 +1,6 @@
+DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
+DIST claws-mail-3.11.1.tar.xz 6908772 SHA256 d72381b6c9f872638cae2c208925e19bd5d4a9476bb9049742f1ba27c3efd133 SHA512 ae4f0d4299647e201e94111a6eb26cce1d6a72045c317b879a07847cfcc75c35dfdf571f2826d365800586f5798131ce95985f746f7dbdd878f3766370ab3570 WHIRLPOOL 3ddf72a97990e087cd0c8a0417d6f57ee607e62bc5d644c6fb1892f349e9646a76664888a4540b6d22f5afe065e6e1e58d63188387cc829fda6fefe55ea4183d
+DIST claws-mail-3.9.0.tar.bz2 7425870 SHA256 ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65 SHA512 5cb17106fee4549464eca03c8630fa4c46ee7b236c51eefbeb00f8a3602937cbe6073617f47a94732983ec3bc8838bc80e567f2e55cce1b30db453f350f590e8 WHIRLPOOL 4f2bef9d2240037eb6fd9b62b48c7173fddbd4fcb7258d4c5e0ee0e322894d741532c2ad716fbac96e465f87fe428fa6e926a04e7e8de1beaf68b8cb0a12c9a4
+DIST claws-mail-3.9.1.tar.bz2 9367489 SHA256 376e535aac746dccbd8871c6f3ff6ced3010b5f7c048f4e3d18e66dfb5622910 SHA512 527a19a8604672e2657a6c923bb24332a7c32f08532a970e7916621d32269643f9211af3194e75572df03f594a0c127999b6ac5de363ba7d69fa4cf2450b58ab WHIRLPOOL 13d301691e564c1bec0300afe7dfee48b0949c2fae5db8546efd840b04ff425e89268569faab331741add1242d67bbfd5504cb34d8137ac3cc3b74a982ad5a2e
+DIST claws-mail-3.9.2.tar.bz2 9413758 SHA256 e396cb67e8ecdae926dfcd59da4b3f26a633aabc0f4f00b1f24cb207f3ff2330 SHA512 8703c170b7e66fb42e8fe41ec86997edc56c9c0da92ac5482d6432159ea46d53aec414097f0c796abee5cb4402bfaa55b194f36c21d5453ab97ea140a2093240 WHIRLPOOL 0c56081cbd073e532725afc3c3714f28b6f1a9adcc835e421deb7db6814b634f26e8e95d42a832d0fdcd7b7b3824a03b66cb7d6951ffe9bf4ef10bb777bb4777
+DIST claws-mail-3.9.3.tar.bz2 9463943 SHA256 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372 SHA512 b9e7a686650bfc496bf7e6b8ca196a890e3c5b2cbce486f7940245e42dc7a9fc53d81f688d88e298f310fd71e378ea4ea29a57c8510cccb6312d4ba1c79e3d42 WHIRLPOOL 58a7c431e214e82f6629e881eaf04b8f587f5aab1f5e990f9e20dff875821e1b0e8e7c0ab7ab47329f20a2e384dd203ea8b3afbe58175f3a48c963917311359e
diff --git a/mail-client/claws-mail/claws-mail-3.10.1.ebuild b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
new file mode 100644
index 000000000000..43fe1b5917df
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.10.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${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 smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+	!!mail-client/claws-mail-archive
+	!!mail-client/claws-mail-att-remover
+	!!mail-client/claws-mail-attachwarner
+	!!mail-client/claws-mail-clamd
+	!!mail-client/claws-mail-fancy
+	!!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!!mail-client/claws-mail-geolocation
+	!!mail-client/claws-mail-gtkhtml
+	!!mail-client/claws-mail-mailmbox
+	!!mail-client/claws-mail-newmail
+	!!mail-client/claws-mail-notification
+	!!mail-client/claws-mail-perl
+	!!mail-client/claws-mail-python
+	!!mail-client/claws-mail-rssyl
+	!!mail-client/claws-mail-spam-report
+	!!mail-client/claws-mail-tnef-parse
+	!!mail-client/claws-mail-vcalendar
+	!!mail-client/claws-mail-address_keeper
+	!!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	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
+	)
+	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
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${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"
+
+src_configure() {
+	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 smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--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
+		--disable-geolocation-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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# 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.11.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
new file mode 100644
index 000000000000..98f507728376
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${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 smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+	!!mail-client/claws-mail-archive
+	!!mail-client/claws-mail-att-remover
+	!!mail-client/claws-mail-attachwarner
+	!!mail-client/claws-mail-clamd
+	!!mail-client/claws-mail-fancy
+	!!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!!mail-client/claws-mail-geolocation
+	!!mail-client/claws-mail-gtkhtml
+	!!mail-client/claws-mail-mailmbox
+	!!mail-client/claws-mail-newmail
+	!!mail-client/claws-mail-notification
+	!!mail-client/claws-mail-perl
+	!!mail-client/claws-mail-python
+	!!mail-client/claws-mail-rssyl
+	!!mail-client/claws-mail-spam-report
+	!!mail-client/claws-mail-tnef-parse
+	!!mail-client/claws-mail-vcalendar
+	!!mail-client/claws-mail-address_keeper
+	!!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	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
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${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"
+
+PATCHES=( "${FILESDIR}/${P}_RSSyl-encodings-fix.patch" )
+
+src_configure() {
+	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 smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--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
+		--disable-geolocation-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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# 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.9.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..90b65252fff2
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.9.0-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools-utils multilib gnome2-utils eutils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.20:2
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=net-libs/gnutls-2.2.0 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-0.4.5 )
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	dillo? ( www-client/dillo )
+	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 )
+	bogofilter? ( mail-filter/bogofilter )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	smime? ( >=app-crypt/gpgme-0.4.5 )"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+PLUGIN_NAMES="acpi-notifier address_keeper archive att-remover attachwarner clamd fancy fetchinfo geolocation gdata gtkhtml mailmbox newmail notification perl python rssyl spam-report tnef-parse vcalendar"
+
+PATCHES=(
+	"${FILESDIR}"/claws-3.9.0_fix-search-field_part1.patch
+	"${FILESDIR}"/claws-3.9.0_fix-search-field_part2.patch
+	)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable dbus)
+		$(use_enable pda jpilot)
+		$(use_enable spell enchant)
+		$(use_enable xface compface)
+		$(use_enable doc manual)
+		$(use_enable startup-notification)
+		$(use_enable session libsm)
+		$(use_enable crypt pgpmime-plugin)
+		$(use_enable crypt pgpinline-plugin)
+		$(use_enable crypt pgpcore-plugin)
+		$(use_enable dillo dillo-viewer-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable smime smime-plugin)
+		--enable-trayicon-plugin
+		--disable-maemo
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	if use ssl; then
+		myeconfargs+=( --enable-gnutls )
+	else
+		myeconfargs+=( --disable-gnutls )
+	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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	UPDATE_PLUGINS=""
+	for x in ${PLUGIN_NAMES}; do
+		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+	done
+	if [ -n "${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You have to re-emerge or update the following plugins:"
+		elog
+		for x in ${UPDATE_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/claws-mail/claws-mail-3.9.0.ebuild b/mail-client/claws-mail/claws-mail-3.9.0.ebuild
new file mode 100644
index 000000000000..ac92d74c67f5
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.9.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools-utils multilib gnome2-utils eutils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.20:2
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=net-libs/gnutls-2.2.0 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-0.4.5 )
+	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	dillo? ( www-client/dillo )
+	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 )
+	bogofilter? ( mail-filter/bogofilter )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	smime? ( >=app-crypt/gpgme-0.4.5 )"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+PLUGIN_NAMES="acpi-notifier address_keeper archive att-remover attachwarner clamd fancy fetchinfo geolocation gdata gtkhtml mailmbox newmail notification perl python rssyl spam_report tnef_parse vcalendar"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable dbus)
+		$(use_enable pda jpilot)
+		$(use_enable spell enchant)
+		$(use_enable xface compface)
+		$(use_enable doc manual)
+		$(use_enable startup-notification)
+		$(use_enable session libsm)
+		$(use_enable crypt pgpmime-plugin)
+		$(use_enable crypt pgpinline-plugin)
+		$(use_enable crypt pgpcore-plugin)
+		$(use_enable dillo dillo-viewer-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable smime smime-plugin)
+		--enable-trayicon-plugin
+		--disable-maemo
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	if use ssl; then
+		myeconfargs+=( --enable-gnutls )
+	else
+		myeconfargs+=( --disable-gnutls )
+	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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	UPDATE_PLUGINS=""
+	for x in ${PLUGIN_NAMES}; do
+		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+	done
+	if [ -n "${UPDATE_PLUGINS}" ]; then
+		elog
+		elog "You have to re-emerge or update the following plugins:"
+		elog
+		for x in ${UPDATE_PLUGINS}; do
+			elog "    mail-client/${PN}-$x"
+		done
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
new file mode 100644
index 000000000000..fd5ef182a42a
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.9.1-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+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 smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+	!!mail-client/claws-mail-archive
+	!!mail-client/claws-mail-att-remover
+	!!mail-client/claws-mail-attachwarner
+	!!mail-client/claws-mail-clamd
+	!!mail-client/claws-mail-fancy
+	!!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!!mail-client/claws-mail-geolocation
+	!!mail-client/claws-mail-gtkhtml
+	!!mail-client/claws-mail-mailmbox
+	!!mail-client/claws-mail-newmail
+	!!mail-client/claws-mail-notification
+	!!mail-client/claws-mail-perl
+	!!mail-client/claws-mail-python
+	!!mail-client/claws-mail-rssyl
+	!!mail-client/claws-mail-spam-report
+	!!mail-client/claws-mail-tnef-parse
+	!!mail-client/claws-mail-vcalendar
+	!!mail-client/claws-mail-address_keeper
+	!!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	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
+	)
+	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
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${COMMONDEPEND}
+	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"
+
+PATCHES=(
+	"${FILESDIR}/${P}_libsoup-check-fix.patch"
+	"${FILESDIR}/${P}_fix-nntp-segfault.patch"
+)
+
+src_configure() {
+	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 smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--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-maemo
+		--disable-bsfilter-plugin
+		--disable-geolocation-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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# 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.9.1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
new file mode 100644
index 000000000000..54fb0d69c9ef
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+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 smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+	!!mail-client/claws-mail-archive
+	!!mail-client/claws-mail-att-remover
+	!!mail-client/claws-mail-attachwarner
+	!!mail-client/claws-mail-clamd
+	!!mail-client/claws-mail-fancy
+	!!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!!mail-client/claws-mail-geolocation
+	!!mail-client/claws-mail-gtkhtml
+	!!mail-client/claws-mail-mailmbox
+	!!mail-client/claws-mail-newmail
+	!!mail-client/claws-mail-notification
+	!!mail-client/claws-mail-perl
+	!!mail-client/claws-mail-python
+	!!mail-client/claws-mail-rssyl
+	!!mail-client/claws-mail-spam-report
+	!!mail-client/claws-mail-tnef-parse
+	!!mail-client/claws-mail-vcalendar
+	!!mail-client/claws-mail-address_keeper
+	!!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	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
+	)
+	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
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${COMMONDEPEND}
+	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"
+
+PATCHES=( "${FILESDIR}/${P}_libsoup-check-fix.patch" )
+
+src_configure() {
+	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 smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--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-maemo
+		--disable-bsfilter-plugin
+		--disable-geolocation-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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# 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.9.2.ebuild b/mail-client/claws-mail/claws-mail-3.9.2.ebuild
new file mode 100644
index 000000000000..2bf44f6d3cda
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.9.2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+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 smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+	!!mail-client/claws-mail-archive
+	!!mail-client/claws-mail-att-remover
+	!!mail-client/claws-mail-attachwarner
+	!!mail-client/claws-mail-clamd
+	!!mail-client/claws-mail-fancy
+	!!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!!mail-client/claws-mail-geolocation
+	!!mail-client/claws-mail-gtkhtml
+	!!mail-client/claws-mail-mailmbox
+	!!mail-client/claws-mail-newmail
+	!!mail-client/claws-mail-notification
+	!!mail-client/claws-mail-perl
+	!!mail-client/claws-mail-python
+	!!mail-client/claws-mail-rssyl
+	!!mail-client/claws-mail-spam-report
+	!!mail-client/claws-mail-tnef-parse
+	!!mail-client/claws-mail-vcalendar
+	!!mail-client/claws-mail-address_keeper
+	!!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	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
+	)
+	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
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${COMMONDEPEND}
+	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"
+
+src_configure() {
+	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 smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--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-maemo
+		--disable-bsfilter-plugin
+		--disable-geolocation-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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# 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.9.3.ebuild b/mail-client/claws-mail/claws-mail-3.9.3.ebuild
new file mode 100644
index 000000000000..2a5d84680d57
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.9.3.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
+
+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 smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	smime? ( pgp )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+	!!mail-client/claws-mail-archive
+	!!mail-client/claws-mail-att-remover
+	!!mail-client/claws-mail-attachwarner
+	!!mail-client/claws-mail-clamd
+	!!mail-client/claws-mail-fancy
+	!!mail-client/claws-mail-fetchinfo
+	!mail-client/claws-mail-gdata
+	!!mail-client/claws-mail-geolocation
+	!!mail-client/claws-mail-gtkhtml
+	!!mail-client/claws-mail-mailmbox
+	!!mail-client/claws-mail-newmail
+	!!mail-client/claws-mail-notification
+	!!mail-client/claws-mail-perl
+	!!mail-client/claws-mail-python
+	!!mail-client/claws-mail-rssyl
+	!!mail-client/claws-mail-spam-report
+	!!mail-client/claws-mail-tnef-parse
+	!!mail-client/claws-mail-vcalendar
+	!!mail-client/claws-mail-address_keeper
+	!!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	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
+	)
+	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
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+	${COMMONDEPEND}
+	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"
+
+src_configure() {
+	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 smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable webkit fancy-plugin)
+		--enable-new-addrbook
+		--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
+		--disable-geolocation-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 || die
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins ${PN}-${res}.png ${PN}.png || die
+	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 || die
+	doexe tb2claws-mail update-po uudec uuooffice || die
+
+	# 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/files/claws-3.9.0_fix-search-field_part1.patch b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch
new file mode 100644
index 000000000000..0bdadd68da22
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch
@@ -0,0 +1,149 @@
+Make combo search field work again.
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=455590
+Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.9.0cvs8
+--- src/advsearch.c	24 Oct 2012 07:48:24 -0000	1.1.2.7
++++ src/advsearch.c	16 Nov 2012 13:10:05 -0000	1.1.2.8
+@@ -314,32 +314,6 @@
+ 	return returnstr;
+ }
+ 
+-// --------------------------
+-
+-static gchar *expand_tag_search_string(const gchar *search_string)
+-{
+-	gchar *newstr = NULL;
+-	gchar **words = search_string ? g_strsplit(search_string, " ", -1):NULL;
+-	gint i = 0;
+-	while (words && words[i] && *words[i]) {
+-		g_strstrip(words[i]);
+-		if (!newstr) {
+-			newstr = g_strdup_printf("tag matchcase \"%s\"", words[i]);
+-		} else {
+-			gint o_len = strlen(newstr);
+-			gint s_len = 17; /* strlen("|tag matchcase \"\"") */
+-			gint n_len = s_len + strlen(words[i]);
+-			newstr = g_realloc(newstr, o_len + n_len + 1);
+-			strcpy(newstr + o_len, "|tag matchcase \"");
+-			strcpy(newstr + o_len + (s_len - 1), words[i]);
+-			strcpy(newstr + o_len + (n_len - 1), "\"");
+-		}
+-		i++;
+-	}
+-	g_strfreev(words);
+-	return newstr;
+-}
+-
+ static void prepare_matcher_extended(AdvancedSearch *search)
+ {
+ 	gchar *newstr = advsearch_expand_search_string(search->request.matchstring);
+@@ -350,19 +324,51 @@
+ 	}
+ }
+ 
++#define debug_matcher_list(prefix, list)					\
++do {										\
++	gchar *str = list ? matcherlist_to_string(list) : g_strdup("(NULL)");	\
++										\
++	debug_print("%s: %s\n", prefix, str);					\
++										\
++	g_free(str);								\
++} while(0)
++
+ static void prepare_matcher_tag(AdvancedSearch *search)
+ {
+-	char *newstr = expand_tag_search_string(search->request.matchstring);
+-	search->predicate = matcher_parser_get_cond(newstr, &search->is_fast);
+-	g_free(newstr);
++	gchar **words = search->request.matchstring 
++			? g_strsplit(search->request.matchstring, " ", -1)
++			: NULL;
++	gint i = 0;
++
++	if (search->predicate == NULL) {
++		search->predicate = g_new0(MatcherList, 1);
++		search->predicate->bool_and = FALSE;
++		search->is_fast = TRUE;
++	}
++
++	while (words && words[i] && *words[i]) {
++		MatcherProp *matcher;
++
++		g_strstrip(words[i]);
++
++		matcher = matcherprop_new(MATCHCRITERIA_TAG, NULL,
++					  MATCHTYPE_MATCHCASE, words[i], 0);
++
++		search->predicate->matchers = g_slist_prepend(search->predicate->matchers, matcher);
++
++		i++;
++	}
++	g_strfreev(words);
+ }
+ 
+ static void prepare_matcher_header(AdvancedSearch *search, gint match_header)
+ {
+ 	MatcherProp *matcher;
+ 
+-	if (search->predicate == NULL)
++	if (search->predicate == NULL) {
+ 		search->predicate = g_new0(MatcherList, 1);
++		search->predicate->bool_and = FALSE;
++	}
+ 
+ 	matcher = matcherprop_new(match_header, NULL, MATCHTYPE_MATCHCASE,
+ 			search->request.matchstring, 0);
+@@ -373,10 +379,18 @@
+ static void prepare_matcher_mixed(AdvancedSearch *search)
+ {
+ 	prepare_matcher_tag(search);
++	debug_matcher_list("tag matcher list", search->predicate);
++
++	/* we want an OR search */
++	if (search->predicate)
++		search->predicate->bool_and = FALSE;
+ 
+ 	prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
++	debug_matcher_list("tag + subject matcher list", search->predicate);
+ 	prepare_matcher_header(search, MATCHCRITERIA_FROM);
++	debug_matcher_list("tag + subject + from matcher list", search->predicate);
+ 	prepare_matcher_header(search, MATCHCRITERIA_TO);
++	debug_matcher_list("tag + subject + from + to matcher list", search->predicate);
+ }
+ 
+ static void prepare_matcher(AdvancedSearch *search)
+@@ -398,26 +412,32 @@
+ 	switch (search->request.type) {
+ 		case ADVANCED_SEARCH_SUBJECT:
+ 			prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
++			debug_matcher_list("subject search", search->predicate);
+ 			break;
+ 
+ 		case ADVANCED_SEARCH_FROM:
+ 			prepare_matcher_header(search, MATCHCRITERIA_FROM);
++			debug_matcher_list("from search", search->predicate);
+ 			break;
+ 
+ 		case ADVANCED_SEARCH_TO:
+ 			prepare_matcher_header(search, MATCHCRITERIA_TO);
++			debug_matcher_list("to search", search->predicate);
+ 			break;
+ 
+ 		case ADVANCED_SEARCH_TAG:
+-			prepare_matcher_header(search, MATCHCRITERIA_TAG);
++			prepare_matcher_tag(search);
++			debug_matcher_list("tag search", search->predicate);
+ 			break;
+ 
+ 		case ADVANCED_SEARCH_MIXED:
+ 			prepare_matcher_mixed(search);
++			debug_matcher_list("mixed search", search->predicate);
+ 			break;
+ 
+ 		case ADVANCED_SEARCH_EXTENDED:
+ 			prepare_matcher_extended(search);
++			debug_matcher_list("extended search", search->predicate);
+ 			break;
+ 
+ 		default:
+
diff --git a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch
new file mode 100644
index 000000000000..bb8a78aac832
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch
@@ -0,0 +1,16 @@
+Make combo search field work again.
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=455590
+Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.9.0cvs9
+
+--- src/advsearch.c	16 Nov 2012 13:10:05 -0000	1.1.2.8
++++ src/advsearch.c	16 Nov 2012 13:11:55 -0000	1.1.2.9
+@@ -368,6 +368,7 @@
+ 	if (search->predicate == NULL) {
+ 		search->predicate = g_new0(MatcherList, 1);
+ 		search->predicate->bool_and = FALSE;
++		search->is_fast = TRUE;
+ 	}
+ 
+ 	matcher = matcherprop_new(match_header, NULL, MATCHTYPE_MATCHCASE,
+
diff --git a/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch b/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
new file mode 100644
index 000000000000..82e13b25390f
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
@@ -0,0 +1,23 @@
+From: Andrej Kacian <ticho@claws-mail.org>
+Date: Thu, 1 Jan 2015 22:36:36 +0000 (+0100)
+Subject: RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only... 
+X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d05156031070efe6104695acad93aa879bc0f084
+
+RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only thing missing was that HAVE_ICONV macro (from config.h) was not defined in parser.c, so our "unknown encoding" expat handler function did nothing. Fixes bug #3339.
+---
+
+diff --git a/src/plugins/rssyl/libfeed/parser.c b/src/plugins/rssyl/libfeed/parser.c
+index bb0bb0d..14f4a36 100644
+--- a/src/plugins/rssyl/libfeed/parser.c
++++ b/src/plugins/rssyl/libfeed/parser.c
+@@ -17,6 +17,10 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <glib.h>
+ #include <curl/curl.h>
+ #include <expat.h>
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch
new file mode 100644
index 000000000000..0abc3725a70b
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch
@@ -0,0 +1,36 @@
+claws-mail 3.9.1 reproducible segfaults on exit when compiled with NNTP support.
+
+Apparently the pointer returned by account_get_list() is truncated to an integer due to a missing function definition:
+
+(gdb) r
+Starting program: /usr/local/bin/claws-mail 
+[New LWP 101084]
+[New Thread 80ac06400 (LWP 101084)]
+
+Program received signal SIGSEGV, Segmentation fault.
+[Switching to Thread 80ac06400 (LWP 101084)]
+0x00000000005331f9 in nntp_disconnect_all (have_connectivity=1) at news.c:1418
+1418		for (list = account_get_list(); list != NULL; list = list->next) {
+(gdb) where
+#0  0x00000000005331f9 in nntp_disconnect_all (have_connectivity=1) at news.c:1418
+#1  0x0000000000669cf3 in nntp_main_done (have_connectivity=1) at nntp-thread.c:163
+#2  0x00000000004e59aa in exit_claws (mainwin=0x80acf23c0) at main.c:1811
+#3  0x00000000004e2627 in main (argc=1, argv=0x7fffffffd8b0) at main.c:1739
+(gdb) p list
+$1 = (GList *) 0xb836a00
+
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469838
+Upstream bug: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2924
+Upstream fix: http://git.claws-mail.org/?p=claws.git;a=patch;h=8891f6e23e51b38c54c7b717fa0922cb101b76a2
+
+--- a/src/news.c
++++ b/src/news.c
+@@ -56,6 +56,7 @@
+ #include "remotefolder.h"
+ #include "alertpanel.h"
+ #include "inc.h"
++#include "account.h"
+ #ifdef USE_GNUTLS
+ #  include "ssl.h"
+ #endif
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
new file mode 100644
index 000000000000..3b5c452b7652
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
@@ -0,0 +1,30 @@
+
+libsoup is not obligatory, but nonetheless a mandatory check existed.
+Fixed in releases >3.9.1
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469014
+Upstream commit: http://git.claws-mail.org/?p=claws.git;a=commitdiff;h=d04c724c9e74f7c5d1f247e41a21e472790d9992
+
+
+--- configure.ac.orig
++++ configure.ac
+@@ -1107,14 +1107,17 @@
+ AC_SUBST(WEBKIT_CFLAGS)
+ 
+ dnl libsoup ********************************************************************
+-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4)
++PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
++if test x"$HAVE_LIBSOUP" = xyes; then
++	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
++fi
+ AC_SUBST(LIBSOUP_CFLAGS)
+ AC_SUBST(LIBSOUP_LIBS)
+ 
+ dnl libsoup-gnome **************************************************************
+ PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
+ if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
+-	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup is available])
++	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
+ fi
+ AC_SUBST(LIBSOUP_GNOME_CFLAGS)
+ AC_SUBST(LIBSOUP_GNOME_LIBS)
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
new file mode 100644
index 000000000000..771935449025
--- /dev/null
+++ b/mail-client/claws-mail/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>fauli@gentoo.org</email>
+		<name>Christian Faulhammer</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="dillo">Enables support for inline HTTP email viewing with a
+			plugin (which depends on the <pkg>www-client/dillo</pkg> 
+			browser)</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="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>
+	</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..02eb4f4b5ebb
--- /dev/null
+++ b/mail-client/clawsker/Manifest
@@ -0,0 +1,2 @@
+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
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..20128d92964e
--- /dev/null
+++ b/mail-client/clawsker/clawsker-0.7.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="http://www.claws-mail.org/clawsker/"
+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-perl-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..7779bbad5966
--- /dev/null
+++ b/mail-client/clawsker/clawsker-0.7.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
+HOMEPAGE="http://www.claws-mail.org/clawsker/"
+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-perl-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..df7c388592e4
--- /dev/null
+++ b/mail-client/clawsker/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<maintainer>
+	  <email>fauli@gentoo.org</email>
+	  <name>Christian Faulhammer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
new file mode 100644
index 000000000000..1e5d0e2df154
--- /dev/null
+++ b/mail-client/cone/Manifest
@@ -0,0 +1,2 @@
+DIST cone-0.89.tar.bz2 3794802 SHA256 71678cb2a95cd02ce2c734549dee9c542e29c3a29c376b64884022febb0d3fba SHA512 86f9842381702b05446e62f5933bd080b931018f2a7136169fc7a5da1d601f108e83cc6509bc0f0ad53f374df25a45ab68bac38274e4df1f5e40ee04124ada3b WHIRLPOOL de8b3fda5f2eda359260153310364e160f22f26da5feee183370bf0f55ad67ceb587a6d1075bbe72488c84e199b86612d4157f0cbeae5309a4fb3d85096170be
+DIST cone-0.90.tar.bz2 3906323 SHA256 b03edfbf3392fb7b8d93574dad2bc4c7cbfca8890afabac8b99b21a9f46d8733 SHA512 6446f868e07a54bda074e403ce48d590a55e97cf25b7e6172ba02df1242a232ade52840a837dd92e70253159cc637c17876876db01445c60374152262329ae27 WHIRLPOOL 30f07794b712650bf2b5715aca912b34471f89cd812ce2a45c7b352c8bca392625c91a74d65917506a8f80e6255534f5ae4ebaa05b269745f1b2bc16c593d838
diff --git a/mail-client/cone/cone-0.89.ebuild b/mail-client/cone/cone-0.89.ebuild
new file mode 100644
index 000000000000..affd6167c36f
--- /dev/null
+++ b/mail-client/cone/cone-0.89.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 spell"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	dev-libs/libxml2
+	sys-libs/ncurses
+	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 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.84.20100819-aspell-automagic.patch \
+		"${FILESDIR}"/${PN}-0.86-skip-rfc2045-test.patch
+
+	cd "${S}"/cone
+	LIBTOOLIZE="true" eautoreconf
+
+	cd "${S}"/rfc2045
+	eautomake
+}
+
+src_configure() {
+	local myconf
+	if use spell ; then
+	   myconf="--with-spellcheck=aspell"
+	else
+	   myconf="--with-spellcheck=none"
+	fi
+
+	econf \
+		${myconf} \
+		$(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.90-r1.ebuild b/mail-client/cone/cone-0.90-r1.ebuild
new file mode 100644
index 000000000000..d07d54e85933
--- /dev/null
+++ b/mail-client/cone/cone-0.90-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 spell"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	dev-libs/libxml2
+	sys-libs/ncurses
+	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 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.84.20100819-aspell-automagic.patch
+	epatch "${FILESDIR}"/${PN}-0.86-skip-rfc2045-test.patch
+	epatch "${FILESDIR}"/${P}-gnutls3.patch
+
+	# 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
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in */configure.in || die
+	eautoreconf
+	# TODO: Find and fix the bug - #514048
+	cd cone && eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use spell ; then
+	   myconf="--with-spellcheck=aspell"
+	else
+	   myconf="--with-spellcheck=none"
+	fi
+
+	econf \
+		${myconf} \
+		$(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.90.ebuild b/mail-client/cone/cone-0.90.ebuild
new file mode 100644
index 000000000000..dba487ad4377
--- /dev/null
+++ b/mail-client/cone/cone-0.90.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 spell"
+
+RDEPEND=">=dev-libs/openssl-0.9.6
+	dev-libs/libxml2
+	sys-libs/ncurses
+	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 )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.84.20100819-aspell-automagic.patch \
+		"${FILESDIR}"/${PN}-0.86-skip-rfc2045-test.patch
+
+	# 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() {
+	local myconf
+	if use spell ; then
+	   myconf="--with-spellcheck=aspell"
+	else
+	   myconf="--with-spellcheck=none"
+	fi
+
+	econf \
+		${myconf} \
+		$(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/files/cone-0.84.20100819-aspell-automagic.patch b/mail-client/cone/files/cone-0.84.20100819-aspell-automagic.patch
new file mode 100644
index 000000000000..d6b4d09b5f23
--- /dev/null
+++ b/mail-client/cone/files/cone-0.84.20100819-aspell-automagic.patch
@@ -0,0 +1,84 @@
+--- cone-0.84.20100819/cone/configure.in.orig	2010-11-11 22:08:37.279191265 -0800
++++ cone-0.84.20100819/cone/configure.in	2010-11-11 23:26:22.685898387 -0800
+@@ -168,19 +168,9 @@
+ LIBS="$save_LIBS"
+ AC_MSG_RESULT($PSPELL)
+ 
+-ALLSPELLOBJ='spellcheckerNone.$(OBJEXT)'
+-if test "$ASPELL" = "yes"
+-then
+-	ALLSPELLOBJ='spellcheckerAspell.$(OBJEXT)'" $ALLSPELLOBJ"
+-fi
+-
+-if test "$PSPELL" = "yes"
+-then
+-	ALLSPELLOBJ='spellcheckerPspell.$(OBJEXT)'" $ALLSPELLOBJ"
+-fi
+-
+ AC_ARG_WITH(spellcheck, [  --with-spellcheck=pspell      Use pspell for spell checking
+-  --with-spellcheck=aspell      Use aspell for spell checking], [
++  --with-spellcheck=aspell      Use aspell for spell checking
++  --with-spellcheck=none        Disable spell checking], [
+ 
+ case "$withval" in
+ pspell)
+@@ -196,6 +186,10 @@
+ 		AC_MSG_ERROR(aspell library not found)
+ 	fi
+ 	;;
++none)
++	SPELL="no"
++	# Spellchecking is not enabled
++	;;
+ *)
+ 	AC_MSG_ERROR(Invalid --with-spellcheck option)
+ 	;;
+@@ -216,24 +210,34 @@
+ AC_MSG_RESULT(yes)
+ ], AC_MSG_RESULT(no))
+ 
+-if test "$ASPELL" = "yes"
++if test "$SPELL" = "no"
+ then
+-	SPELL_OBJ='spellcheckerAspell.$(OBJEXT)'
+-	AC_DEFINE_UNQUOTED(USE_ASPELL, 1, [ Use aspell library for spell checking ])
+-	SPELL_LIB='-laspell'
++	ALLSPELLOBJ='spellcheckerNone.$(OBJEXT)'
++	SPELL_OBJ='spellcheckerNone.$(OBJEXT)'
++	SPELL_LIB=''
++	AC_MSG_WARN(Disabling spell checking)
+ else
+-	if test "$PSPELL" = "yes"
++	if test "$ASPELL" = "yes"
+ 	then
+-		AC_DEFINE_UNQUOTED(USE_PSPELL, 1, [ Use aspell library for spell checking ])
+-		SPELL_OBJ='spellcheckerPspell.$(OBJEXT)'
+-		SPELL_LIB='-lpspell'
++		ALLSPELLOBJ='spellcheckerAspell.$(OBJEXT)'" $ALLSPELLOBJ"
++		SPELL_OBJ='spellcheckerAspell.$(OBJEXT)'
++		AC_DEFINE_UNQUOTED(USE_ASPELL, 1, [ Use aspell library for spell checking ])
++		SPELL_LIB='-laspell'
+ 	else
+-		AC_MSG_WARN(---------------------------------------------------------------)
+-		AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking)
+-		AC_MSG_WARN(---------------------------------------------------------------)
+-		sleep 5
+-		SPELL_OBJ='spellcheckerNone.$(OBJEXT)'
+-		SPELL_LIB=''
++		if test "$PSPELL" = "yes"
++		then
++			ALLSPELLOBJ='spellcheckerPspell.$(OBJEXT)'" $ALLSPELLOBJ"
++			AC_DEFINE_UNQUOTED(USE_PSPELL, 1, [ Use aspell library for spell checking ])
++			SPELL_OBJ='spellcheckerPspell.$(OBJEXT)'
++			SPELL_LIB='-lpspell'
++		else
++			AC_MSG_WARN(---------------------------------------------------------------)
++			AC_MSG_WARN(Neither pspell nor aspell was found -- disabling spell checking)
++			AC_MSG_WARN(---------------------------------------------------------------)
++			sleep 5
++			SPELL_OBJ='spellcheckerNone.$(OBJEXT)'
++			SPELL_LIB=''
++		fi
+ 	fi
+ fi
+ 
diff --git a/mail-client/cone/files/cone-0.86-skip-rfc2045-test.patch b/mail-client/cone/files/cone-0.86-skip-rfc2045-test.patch
new file mode 100644
index 000000000000..4cd5206a145f
--- /dev/null
+++ b/mail-client/cone/files/cone-0.86-skip-rfc2045-test.patch
@@ -0,0 +1,11 @@
+--- cone-0.86/rfc2045/Makefile.am.orig
++++ cone-0.86/rfc2045/Makefile.am
+@@ -77,6 +77,6 @@
+ endif
+ 
+ check-am:
+-	@SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+-	@SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
++#	@SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
++#	@SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
+ 	@SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt -
diff --git a/mail-client/cone/files/cone-0.90-gnutls3.patch b/mail-client/cone/files/cone-0.90-gnutls3.patch
new file mode 100644
index 000000000000..23f187bb0182
--- /dev/null
+++ b/mail-client/cone/files/cone-0.90-gnutls3.patch
@@ -0,0 +1,72 @@
+diff --git a/tcpd/configure.in b/tcpd/configure.in
+index 7261515..406914e 100644
+--- a/tcpd/configure.in
++++ b/tcpd/configure.in
+@@ -356,7 +356,7 @@ then
+ 
+ 		CPPFLAGS="$save_CPPFLAGS"
+ 	else
+-		have_gnutls="no: pkgconfig --modeversion gnutls failed"
++		have_gnutls="no: pkgconfig --modversion gnutls failed"
+ 	fi
+ else
+ 	have_gnutls="no: pkg-config not found"
+@@ -368,7 +368,15 @@ if test "$have_gnutls" = "yes"
+ then
+ 	LIBCOURIERTLSGNUTLS="libcouriertlsgnutls.la"
+ 	CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags gnutls`"
+-	gnutlsdep="`$PKGCONFIG --libs gnutls` -lgnutls-extra"
++	have_gnutls3=no
++	PKG_CHECK_EXISTS([gnutls >= 3.0], [have_gnutls3=yes])
++	if test "x$have_gnutls3" = "xno"
++	then
++		gnutlsdep="`$PKGCONFIG --libs gnutls` -lgnutls-extra"
++	else
++		gnutlsdep="`$PKGCONFIG --libs gnutls`"
++		AC_DEFINE([HAVE_GNUTLS3], [1], [Use GnuTLS3])
++	fi
+ fi
+ 
+ AC_CHECK_SIZEOF(gnutls_transport_ptr_t,0, [
+diff --git a/tcpd/libcouriergnutls.c b/tcpd/libcouriergnutls.c
+index 4aa4996..ef8cb70 100644
+--- a/tcpd/libcouriergnutls.c
++++ b/tcpd/libcouriergnutls.c
+@@ -9,7 +9,9 @@
+ #include	"tlscache.h"
+ #include	"soxwrap/soxwrap.h"
+ #include	<gnutls/gnutls.h>
++#ifndef HAVE_GNUTLS3
+ #include	<gnutls/extra.h>
++#endif
+ #include	<gnutls/x509.h>
+ #include	<gnutls/openpgp.h>
+ #include	<stdio.h>
+@@ -146,7 +148,11 @@ static const struct intmap {
+ 		{ NULL, 0}
+ 	}, all_comps[]={
+ 		{ "DEFLATE", GNUTLS_COMP_DEFLATE},
++#ifndef HAVE_GNUTLS3
+ 		{ "LZO", GNUTLS_COMP_LZO},
++#else
++		{ "ZLIB", GNUTLS_COMP_ZLIB},
++#endif
+ 		{ "NULL", GNUTLS_COMP_NULL},
+ 		{ NULL, 0}
+ 	}, all_certs[]={
+@@ -408,6 +414,7 @@ ssl_context tls_create(int isserver, const struct tls_info *info)
+ 			return (NULL);
+ 		}
+ 
++#ifndef HAVE_GNUTLS3
+ 		if (gnutls_global_init_extra() < 0)
+ 		{
+ 			gnutls_global_deinit();
+@@ -416,6 +423,7 @@ ssl_context tls_create(int isserver, const struct tls_info *info)
+ 			errno=EINVAL;
+ 			return (NULL);
+ 		}
++#endif
+ 	}
+ 
+ 	if (!(words=splitwords(safe_getenv(p, "TLS_PROTOCOL",
diff --git a/mail-client/cone/metadata.xml b/mail-client/cone/metadata.xml
new file mode 100644
index 000000000000..5c974e7d457b
--- /dev/null
+++ b/mail-client/cone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<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..bb9d93389f57
--- /dev/null
+++ b/mail-client/drac/Manifest
@@ -0,0 +1 @@
+DIST drac.tar.Z 20705 SHA256 2c184de422ae4b347464de5083c38cb8d3ab4d53b6584514c7a5bd67870729db
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..ca6b3c64c6b4
--- /dev/null
+++ b/mail-client/drac/drac-1.12-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..98a9de51cf1e
--- /dev/null
+++ b/mail-client/drac/files/dracd.rc6
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/drac/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/mail-client/etpan-ng/Manifest b/mail-client/etpan-ng/Manifest
new file mode 100644
index 000000000000..8fce1e1eb6e6
--- /dev/null
+++ b/mail-client/etpan-ng/Manifest
@@ -0,0 +1 @@
+DIST etpan-ng-0.7.1.tar.gz 364394 SHA256 085b030e6ddebd816600b5fc9ca92eae1b6301e60691cfaf36e38140934d5dc3
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..d5a6b1b43b50
--- /dev/null
+++ b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b2f66f193014
--- /dev/null
+++ b/mail-client/etpan-ng/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<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..e044e5a1e718
--- /dev/null
+++ b/mail-client/evolution/Manifest
@@ -0,0 +1,3 @@
+DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc
+DIST evolution-3.16.3.tar.xz 11877676 SHA256 cdc25d9c0c7749d9049d480a8fcde870b1991523bf7009ba101990df543207d6 SHA512 fd81e351ae9a482b48429b04ab41d53f25ad36823765dcd4c5810d8134788d7bdda35e78fdb453686ea7b6eca999f70cd4352486ef38da96a3a927fff3b2b98e WHIRLPOOL 96ea257e30b763db4fdf0ae39e3dc60e8845b3ad021538d2ab62dd1c0bf448f009bf39a89e695cbd1f6af08e18486d9968c6a7bac2772c6cd9ca4e38d356aee8
+DIST evolution-3.16.4.tar.xz 11946404 SHA256 60d90c4f36cc05f925f50dc7e8dcc4f83edd6d9b5476f14e75c1d10ce7fbd67f SHA512 d985cfdf5729e7442a9df4f69f486e617e98f59b7781ffb18dbf0424d5843e3046508b0bde0fbc083648b0b995cd0e534e68b9cc1e11cf21bca58791665480da WHIRLPOOL bce88813f90bbb1aec904ed6ee9163881a5a643b8bb2838f9dce47ac18ee457d9c930966bb12f0642d02177cbff1b98ef1a352297e3b5be0d633a7fadf89ce6b
diff --git a/mail-client/evolution/evolution-3.12.11.ebuild b/mail-client/evolution/evolution-3.12.11.ebuild
new file mode 100644
index 000000000000..06de1890603d
--- /dev/null
+++ b/mail-client/evolution/evolution-3.12.11.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic readme.gentoo gnome2
+
+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 highlight ldap map spamassassin spell ssl +weather"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc 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[gtk] app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# FIXME: You need to have gnome-icon-theme or adwaita-icon-theme installed
+# (last one not yet in the tree)
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gtk+-3.8.0:3
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=x11-libs/libnotify-0.7:=
+	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
+	>=gnome-extra/gtkhtml-4.5.2:4.0
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.6
+	dev-libs/libical:=
+	>=dev-libs/libxml2-2.7.3:2
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-misc/shared-mime-info-0.22
+	>=x11-themes/gnome-icon-theme-2.30.2.1
+	>=dev-libs/libgdata-0.10:=
+	>=net-libs/webkit-gtk-2.0.1:3
+
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? ( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+	map? (
+		>=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 )
+	spell? ( app-text/gtkspell:3 )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+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() {
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness, upstream bug #653157
+	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "CPPFLAGS sed failed"
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-image-inline \
+		--disable-pst-import \
+		--enable-canberra \
+		--enable-gnome-desktop \
+		$(use_enable bogofilter) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spamassassin) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with ldap openldap) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	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.16.3.ebuild b/mail-client/evolution/evolution-3.16.3.ebuild
new file mode 100644
index 000000000000..f454653a52f4
--- /dev/null
+++ b/mail-client/evolution/evolution-3.16.3.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic readme.gentoo gnome2
+
+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 highlight ldap map spamassassin spell ssl +weather"
+# Needs x11-libs/libcryptui keyworded
+#KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~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[gtk] app-crypt/pinentry[qt4] )"
+
+# gtk+-3.16 needed for gtk_drag_cancel
+# 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
+# google tasks requires >=libgdata-0.15.1
+# 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
+	>=app-text/enchant-1.1.7
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libgdata-0.10:=
+	>=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-3.16:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2:3
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.16: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 )
+	map? (
+		>=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 )
+	spell? ( app-text/gtkspell:3 )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
+
+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() {
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	gnome2_src_prepare
+
+}
+
+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 map 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) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	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.16.4.ebuild b/mail-client/evolution/evolution-3.16.4.ebuild
new file mode 100644
index 000000000000..718861d2ae83
--- /dev/null
+++ b/mail-client/evolution/evolution-3.16.4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic readme.gentoo gnome2
+
+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 highlight ldap map spamassassin spell ssl +weather"
+KEYWORDS="~amd64 ~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] )"
+
+# 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
+# google tasks requires >=libgdata-0.15.1
+# 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
+	>=app-text/enchant-1.1.7
+	>=dev-libs/glib-2.40:2[dbus]
+	>=dev-libs/libgdata-0.10:=
+	>=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-3.16:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2:3
+	>=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 )
+	map? (
+		>=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 )
+	spell? ( app-text/gtkspell:3 )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
+
+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() {
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	# Do not create Contacts source for GMail accounts (from 3.16 branch)
+	epatch "${FILESDIR}"/${P}-contacts-gmail.patch
+
+	gnome2_src_prepare
+
+}
+
+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 map 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() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	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/files/evolution-3.16.4-contacts-gmail.patch b/mail-client/evolution/files/evolution-3.16.4-contacts-gmail.patch
new file mode 100644
index 000000000000..70d686ecf3ce
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.16.4-contacts-gmail.patch
@@ -0,0 +1,88 @@
+From 53dc4e4d1551750905e6b6f1407eb3ee0b0e2a82 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 13 Jul 2015 22:13:57 +0200
+Subject: Do not create Contacts source for GMail accounts
+
+The Contacts part requires OAUTH2, which will be supported once
+bug #749974 is done. Till then, do not allow auto-adding Contacts
+source for GMail accounts, to not confuse users with error message
+about it not being able to open.
+
+diff --git a/modules/mail-config/e-mail-config-google-summary.c b/modules/mail-config/e-mail-config-google-summary.c
+index c5ac1ba..164aae4 100644
+--- a/modules/mail-config/e-mail-config-google-summary.c
++++ b/modules/mail-config/e-mail-config-google-summary.c
+@@ -29,12 +29,17 @@
+ #define GOOGLE_HELP_URI \
+ 	"http://support.google.com/mail/bin/answer.py?hl=en&answer=77695"
+ 
++/* Once EDS will directly support OAUTH2, this can be enabled/removed again */
++/* #define EDS_SUPPORTS_OAUTH2 */
++
+ struct _EMailConfigGoogleSummaryPrivate {
+ 	ESource *collection_source;
+ 
+ 	/* Widgets (not referenced) */
+ 	GtkWidget *calendar_toggle;
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	GtkWidget *contacts_toggle;
++#endif
+ 
+ 	gboolean applicable;
+ };
+@@ -130,8 +135,12 @@ mail_config_google_summary_commit_changes_cb (EMailConfigSummaryPage *page,
+ 	toggle_button = GTK_TOGGLE_BUTTON (extension->priv->calendar_toggle);
+ 	calendar_active = gtk_toggle_button_get_active (toggle_button);
+ 
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	toggle_button = GTK_TOGGLE_BUTTON (extension->priv->contacts_toggle);
+ 	contacts_active = gtk_toggle_button_get_active (toggle_button);
++#else
++	contacts_active = FALSE;
++#endif
+ 
+ 	/* If the user declined both Calendar and Contacts, do nothing. */
+ 	if (!calendar_active && !contacts_active)
+@@ -264,6 +273,7 @@ mail_config_google_summary_constructed (GObject *object)
+ 	extension->priv->calendar_toggle = widget;  /* not referenced */
+ 	gtk_widget_show (widget);
+ 
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	text = _("Add Google Con_tacts to this account");
+ 	widget = gtk_check_button_new_with_mnemonic (text);
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
+@@ -271,11 +281,16 @@ mail_config_google_summary_constructed (GObject *object)
+ 	gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1);
+ 	extension->priv->contacts_toggle = widget;  /* not referenced */
+ 	gtk_widget_show (widget);
++#endif
+ 
+ 	text = _("You may need to enable IMAP access");
+ 	widget = gtk_link_button_new_with_label (GOOGLE_HELP_URI, text);
+ 	gtk_widget_set_margin_left (widget, 12);
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 1, 1);
++#else
++	gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1);
++#endif
+ 	gtk_widget_show (widget);
+ 
+ 	source = extension->priv->collection_source;
+@@ -291,10 +306,14 @@ mail_config_google_summary_constructed (GObject *object)
+ 		collection_extension, "calendar-enabled",
+ 		G_BINDING_SYNC_CREATE);
+ 
++#ifdef EDS_SUPPORTS_OAUTH2
+ 	e_binding_bind_property (
+ 		extension->priv->contacts_toggle, "active",
+ 		collection_extension, "contacts-enabled",
+ 		G_BINDING_SYNC_CREATE);
++#else
++	g_object_set (G_OBJECT (collection_extension), "contacts-enabled", FALSE, NULL);
++#endif
+ }
+ 
+ static void
+-- 
+cgit v0.10.2
+
diff --git a/mail-client/evolution/metadata.xml b/mail-client/evolution/metadata.xml
new file mode 100644
index 000000000000..cfd0a3170188
--- /dev/null
+++ b/mail-client/evolution/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<use>
+		<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="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="map">Enable support for displaying contacts on a map inside
+			evolution using <pkg>media-libs/libchamplain</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..b8246a9bf610
--- /dev/null
+++ b/mail-client/geary/Manifest
@@ -0,0 +1,2 @@
+DIST geary-0.10.0.tar.xz 917376 SHA256 46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5 SHA512 9126acb3608f7aac9236f7d38f5ca549fe04427e244bbff093d06095e09d0ae642ed8e5722325f152a40d3c642a5f31035fca1685749fbe311c4bf3965ee3256 WHIRLPOOL 5d79011682cb47299a147f44380341c05b997b1c825f86df53772be8fcf3818eca85eb55aa325e8c6a6737024166d58044ab01298476a5dad5036092d5a17f74
+DIST geary-0.6.3.tar.xz 791248 SHA256 2fa2612bf3821f8ff74664463a430729776f6f9bf31795156be2ca7959b52eca SHA512 4a4f26b3e88032191f2b683d8ed0d48401b278c4d1cc69c09731d9ca878450847a35c0653a8b9907ce81b989e713d1a41a40b7b6193f6e84a6e6f4eb4d5053f4 WHIRLPOOL 83e4a648a792639a10fde6eccf78db2fb582ebea4f5f0806091e4cc9f8550387e976e46b383b33819b32a25ec665116cfecfa3417acb72950f1eba3ffa48d403
diff --git a/mail-client/geary/files/geary-0.5.3-unity.patch b/mail-client/geary/files/geary-0.5.3-unity.patch
new file mode 100644
index 000000000000..7bf282963564
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.3-unity.patch
@@ -0,0 +1,31 @@
+commit 1f875e8a629a54748eb46237fd854359aa5edbc8
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:45 2013 +0200
+
+    provide option for unity
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66145c9..5d4464c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,7 @@
+ option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
+ option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
+ option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON)
++option(WITH_UNITY "Add unity support." OFF)
+ 
+ if (DEBUG)
+     message(STATUS "Debug build")
+@@ -46,8 +47,10 @@
+ endif ()
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
+-pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++if (WITH_UNITY)
++	pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
++	pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++endif ()
+ 
+ # CMake's range-checking syntax doesn't allow for a bare less-than, so using
+ # improbably high version numbers to indicate maximum
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.6.3-cflags.patch b/mail-client/geary/files/geary-0.6.3-cflags.patch
new file mode 100644
index 000000000000..959ae4b1f34d
--- /dev/null
+++ b/mail-client/geary/files/geary-0.6.3-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/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.10.0.ebuild b/mail-client/geary/geary-0.10.0.ebuild
new file mode 100644
index 000000000000..9c67de189cd3
--- /dev/null
+++ b/mail-client/geary/geary-0.10.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION=0.22
+
+# Keep cmake-utils at the end
+inherit eutils fdo-mime 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[gtk,introspection,vala]
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	>=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
+"
+
+DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751556
+	epatch "${FILESDIR}"/${PN}-0.7.2-cflags.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
+	epatch "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751558
+	epatch "${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
+		-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/geary-0.6.3-r1.ebuild b/mail-client/geary/geary-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..009195e63d83
--- /dev/null
+++ b/mail-client/geary/geary-0.6.3-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.22
+
+inherit eutils fdo-mime gnome2-utils vala cmake-utils
+
+MY_P=${P/_pre/pr}
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="http://www.yorba.org/projects/geary/"
+SRC_URI="mirror://gnome/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+DEPEND="
+	app-crypt/gcr[gtk,introspection,vala]
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	>=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.6.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"
+
+DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.3-{unity,vapigen}.patch \
+		"${FILESDIR}"/${PN}-0.6.3-cflags.patch \
+		"${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
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDESKTOP_UPDATE=OFF
+		-DGSETTINGS_COMPILE=OFF
+		-DICON_UPDATE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DWITH_UNITY=OFF
+		-DDESKTOP_VALIDATE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	elog "For libnotify sounds you will need"
+	elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra"
+	elog "enabled."
+
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
new file mode 100644
index 000000000000..e98dd9082dc1
--- /dev/null
+++ b/mail-client/geary/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
+
diff --git a/mail-client/hap/Manifest b/mail-client/hap/Manifest
new file mode 100644
index 000000000000..fbde181a46ac
--- /dev/null
+++ b/mail-client/hap/Manifest
@@ -0,0 +1 @@
+DIST hap-3.7.tar 194560 SHA256 ae2aa6fbc2d95bcdc0a58cb8e51e458eff868241bd6576123bc291a55d8c4de2 SHA512 3a42b8ae5d4c96812190e0551df289ad748c11f93d7632de1698437246723fd159a3f1a0b6f06c925b31ce8e389b73bc0b3a68f978570ae5d9f283d1651fa42b WHIRLPOOL a250c94dde3af898f4df81eef458735a08daf0c33c914abea4fb521c0088164078224322768256cb7ec58e7e7288094ec3770651394dc05dd376aa95de6ce918
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..76f2c0417d4e
--- /dev/null
+++ b/mail-client/hap/hap-3.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/hap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest
new file mode 100644
index 000000000000..5571e9a48d55
--- /dev/null
+++ b/mail-client/mail-notification/Manifest
@@ -0,0 +1 @@
+DIST mail-notification-eab5c13.tar.gz 569791 SHA256 12f79cfaa6f5bbfa68e2a5e8dca651cfe19ed017741c21bec5b3b91bccecffe6 SHA512 fe4b5c7b04fe24950fcff0796dbe27c0172e9e8c1b1229f18064ae3720d12a669803e08796ac61d64912847eaaccc451363d69cecd55995274c5a0b2705a78f1 WHIRLPOOL 480179b855b7b86cb80b750c14c034e2f52b280a4b1b6e6aeed3c64b722808c7bd0086e75a9a0423d71424ffa37b3752da2b170c3b7af13697b77cafaceabb25
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..4516f32c6f52
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-5.4-remove-ubuntu-special-case.patch
@@ -0,0 +1,33 @@
+--- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
++++ 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..e246a8cc9389
--- /dev/null
+++ b/mail-client/mail-notification/files/mail-notification-dont-link-against-bsd-compat.patch
@@ -0,0 +1,10 @@
+--- jbsrc/jb.c.orig	2014-01-19 20:06:48.525462981 +0100
++++ 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-r8.ebuild b/mail-client/mail-notification/mail-notification-5.4-r8.ebuild
new file mode 100644
index 000000000000..43bd96b1ca1e
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r8.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils 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="eab5c13" # 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 sasl +sound 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? ( >=dev-libs/openssl-0.9.6 )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	sound? ( media-libs/gstreamer:0.10 )
+	sylpheed? ( mail-client/sylpheed )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	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
+	epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
+
+	# Apply Fedora patches
+	# Fix gcc warning
+	epatch "${FILESDIR}/${PN}-jb-gcc-format.patch"
+	# Support aarch64
+	epatch "${FILESDIR}/${PN}-aarch64.patch"
+	# Fix build with latest libc
+	epatch "${FILESDIR}/${PN}-dont-link-against-bsd-compat.patch"
+}
+
+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
+	dodoc NEWS README AUTHORS TODO TRANSLATING
+	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..6706026589f4
--- /dev/null
+++ b/mail-client/mail-notification/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..c2ff4944951e
--- /dev/null
+++ b/mail-client/mailx-support/Manifest
@@ -0,0 +1 @@
+DIST mailx-support-20060102.tar.bz2 8822 SHA256 e962d12116a99ab72cc04304cc0f9b86dce2ab84c5028599e052c21930fc4d62 SHA512 a4bd84253fcb5a97119e75290dfda01004115c3eb5898bb792c75f7b01c7e48fa1189b9ec4ed195c404196893af8b9390062f2f258da68889b464b53aa0ecbc2 WHIRLPOOL b009fc0405a9610c9ac8cd66024dc237dbc5910f9a7e9b13440a167be8a1bc751d9ce2e318008ca83d6ad5c6d8cd32a1433bb1647ab1f271da5ffe334318331a
diff --git a/mail-client/mailx-support/files/mailx-support-20030215-gentoo.patch b/mail-client/mailx-support/files/mailx-support-20030215-gentoo.patch
new file mode 100644
index 000000000000..829b85820488
--- /dev/null
+++ b/mail-client/mailx-support/files/mailx-support-20030215-gentoo.patch
@@ -0,0 +1,66 @@
+--- -	2003-02-15 23:35:46.000000000 +0800
++++ locking.c	2003-02-15 23:19:11.000000000 +0800
+@@ -45,6 +45,7 @@
+ #include <stdarg.h>
+ #include "pathnames.h"
+ #include "mail.local.h"
++#include "open_with_exlock.h"
+ 
+ static char lpath[MAXPATHLEN];
+ 
+@@ -93,7 +94,7 @@
+ 				}
+ 				goto again;
+ 			}
+-			if ((lfd = open(lpath, O_CREAT|O_WRONLY|O_EXCL|O_EXLOCK,
++			if ((lfd = open_with_exlock(lpath, O_CREAT|O_WRONLY|O_EXCL,
+ 			    S_IRUSR|S_IWUSR)) != -1)
+ 				break;
+ again:
+@@ -104,7 +105,7 @@
+ 				return(-1);
+ 			}
+ 			if (tries > 9 &&
+-			    (lfd = open(lpath, O_WRONLY|O_EXLOCK, 0)) != -1) {
++			    (lfd = open_with_exlock(lpath, O_WRONLY, 0)) != -1) {
+ 				if (fstat(lfd, &fsb) != -1 &&
+ 				    lstat(lpath, &sb) != -1) {
+ 					if (fsb.st_dev == sb.st_dev &&
+@@ -169,3 +170,4 @@
+ 	if (isfatal)
+ 		exit(1);
+ }
++
+--- -	2003-02-15 23:37:13.000000000 +0800
++++ mail.local.c	2003-02-15 23:20:50.000000000 +0800
+@@ -66,6 +66,7 @@
+ #include <string.h>
+ #include "pathnames.h"
+ #include "mail.local.h"
++#include "open_with_exlock.h"
+ 
+ int
+ main(int argc, char *argv[])
+@@ -218,7 +219,7 @@
+ 			merr(NOTFATAL, "%s: %s", path, strerror(errno));
+ 			goto bad;
+ 		}
+-		if ((mbfd = open(path, O_APPEND|O_CREAT|O_EXCL|O_WRONLY|O_EXLOCK,
++		if ((mbfd = open_with_exlock(path, O_APPEND|O_CREAT|O_EXCL|O_WRONLY,
+ 		     S_IRUSR|S_IWUSR)) < 0) {
+ 			if (errno == EEXIST) {
+ 				/* file appeared since lstat */
+@@ -244,7 +245,7 @@
+ 			merr(NOTFATAL, "%s: linked or special file", path);
+ 			goto bad;
+ 		}
+-		if ((mbfd = open(path, O_APPEND|O_WRONLY|O_EXLOCK,
++		if ((mbfd = open_with_exlock(path, O_APPEND|O_WRONLY,
+ 		    S_IRUSR|S_IWUSR)) < 0) {
+ 			merr(NOTFATAL, "%s: %s", path, strerror(errno));
+ 			goto bad;
+@@ -340,3 +341,4 @@
+ {
+ 	merr(FATAL, "usage: mail.local [-lL] [-f from] user ...");
+ }
++
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..2ab64ae9833c
--- /dev/null
+++ b/mail-client/mailx-support/mailx-support-20060102-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..658f9590b57f
--- /dev/null
+++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="${D}/usr" install
+}
diff --git a/mail-client/mailx-support/metadata.xml b/mail-client/mailx-support/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/mailx-support/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</pkgmetadata>
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
new file mode 100644
index 000000000000..45f2054aa14c
--- /dev/null
+++ b/mail-client/mailx/Manifest
@@ -0,0 +1,2 @@
+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
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..1c8140edaee8
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/mail-client/mailx/metadata.xml
new file mode 100644
index 000000000000..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/mailx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</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..d564e4ecbf14
--- /dev/null
+++ b/mail-client/mutt/Manifest
@@ -0,0 +1,4 @@
+DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d24728df388c5c90eed3276783db061b92212786f3 SHA512 8f89abcca7048a24f5e37190b479f724eb51eb6a1703bc419c9f200f4ad1cb544fa7283ea6d76519f002aed26c9c2f54bd14e89b845001755a0b98e3317b39f8 WHIRLPOOL 04843ec6df35a34b2f601caaff60c6cd2fe16ab66946c6ab0a3be0ff4570743fdc365f7fb28c00c16b6d88e299d0b1b8fac86e8936474e170d1f0d2331209e2c
+DIST mutt-1.5.23-gentoo-patches-r6.tar.bz2 146133 SHA256 8d86fd8ce3be2febf9e13963d5a33088cea34d42e7d5f0eca7fd1bed5cfb12cc SHA512 f6901c1afe651b96a7159a4151738bc2492e9edc4f5f462586278cb2e999affb18e469f81490f3d14b4841bbe8faab32458568795c25784f9d59b30f57278863 WHIRLPOOL 3f9e07ec9eaf029a636e0fb4e1f0723ff4cc202195574748a14ae2950fde6af94f428f017129bcd550caae87dc28933dd0d93bcb7d2066f36255c93da4a5b4f9
+DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
+DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
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..b096488874da
--- /dev/null
+++ b/mail-client/mutt/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <maintainer>
+    <email>grobian@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="gpg">Enable support for <pkg>app-crypt/gpgme</pkg></flag>
+    <flag name="pop">Enable support for pop</flag>
+    <flag name="sidebar">Use the vanilla tree + sidebar patch</flag>
+    <flag name="smime">Enable support for smime</flag>
+    <flag name="smtp">Enable support for smtp</flag>
+    <flag name="tokyocabinet">Enable tokyocabinet database backend for header
+      caching</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mutt</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/mail-client/mutt/mutt-1.5.23-r5.ebuild b/mail-client/mutt/mutt-1.5.23-r5.ebuild
new file mode 100644
index 000000000000..5a213a9d8254
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.23-r5.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r5"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+	ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	kerberos? ( virtual/krb5 )
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	slang? ( sys-libs/slang )
+	!slang? ( >=sys-libs/ncurses-5.2 )
+"
+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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+	# Post-release hot-fixes grabbed from HG, this is what all following
+	# patches are based on in my Mercurial patchqueue (mq).
+	# If you ever take over or need to modify patches here, just check
+	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+	# the patchqueue as it'll save you a lot of work.
+	# http://prefix.gentooexperimental.org:8000/mutt/
+	# http://prefix.gentooexperimental.org:8000/mutt-patches/
+	for rev in $(eval echo {0..${PR#r}}) ; do
+		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+		[[ -e ${revpatch} ]] && \
+			epatch "${revpatch}"
+	done
+	# fix compilation with ncurses[tinfo], #459260
+	epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+	# this patch is non-generic and only works because we use a sysconfdir
+	# different from the one used by the mailbase ebuild
+	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+	# must have fixes to compile or behave correctly, upstream
+	# ignores, disagrees or simply doesn't respond/apply
+	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+	# same category, but functional bits
+	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+	# the big feature patches that upstream doesn't want to include, but
+	# nearly every distro has due to their usefulness
+	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+		epatch "${p}"
+	done
+
+	# we conditionalise this one, simply because it has considerable
+	# impact on the code
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar-20140412.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+		epatch "${PATCHDIR}"/sidebar-counts.patch
+	fi
+
+	local upatches=
+	# allow user patches
+	epatch_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+	# don't just build documentation (lengthy process, with big dependencies)
+	if use !doc ; then
+		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable crypt pgp) \
+		$(use_enable debug) \
+		$(use_enable gpg gpgme) \
+		$(use_enable imap) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable pop) \
+		$(use_enable smime) \
+		$(use_enable smtp) \
+		$(use_with idn) \
+		$(use_with kerberos gss) \
+		$(use slang && echo --with-slang) \
+		--enable-compressed \
+		--enable-external-dotlock \
+		--enable-nfs-fix \
+		--sysconfdir=${EPREFIX}/etc/${PN} \
+		--with-curses \
+		--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--with-exec-shell=${EPREFIX}/bin/sh"
+
+	case $CHOST in
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf="${myconf} --enable-fcntl --disable-flock"
+		;;
+		*)
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use tokyocabinet; then
+		myconf="${myconf} --enable-hcache \
+			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	elif use qdbm; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# 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="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+	else
+		myconf="${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() {
+	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
+}
diff --git a/mail-client/mutt/mutt-1.5.23-r6.ebuild b/mail-client/mutt/mutt-1.5.23-r6.ebuild
new file mode 100644
index 000000000000..3dc63b7f720a
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.23-r6.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r6"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+	ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	kerberos? ( virtual/krb5 )
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	slang? ( sys-libs/slang )
+	!slang? ( >=sys-libs/ncurses-5.2 )
+"
+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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+	# Post-release hot-fixes grabbed from HG, this is what all following
+	# patches are based on in my Mercurial patchqueue (mq).
+	# If you ever take over or need to modify patches here, just check
+	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+	# the patchqueue as it'll save you a lot of work.
+	# http://prefix.gentooexperimental.org:8000/mutt/
+	# http://prefix.gentooexperimental.org:8000/mutt-patches/
+	for rev in $(eval echo {0..${PR#r}}) ; do
+		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+		[[ -e ${revpatch} ]] && \
+			epatch "${revpatch}"
+	done
+	# fix compilation with ncurses[tinfo], #459260
+	epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+	# this patch is non-generic and only works because we use a sysconfdir
+	# different from the one used by the mailbase ebuild
+	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+	# must have fixes to compile or behave correctly, upstream
+	# ignores, disagrees or simply doesn't respond/apply
+	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+	# same category, but functional bits
+	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+	# the big feature patches that upstream doesn't want to include, but
+	# nearly every distro has due to their usefulness
+	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+		epatch "${p}"
+	done
+
+	# we conditionalise this one, simply because it has considerable
+	# impact on the code
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar-20140412.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+		epatch "${PATCHDIR}"/sidebar-counts.patch
+	fi
+
+	local upatches=
+	# allow user patches
+	epatch_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+	# don't just build documentation (lengthy process, with big dependencies)
+	if use !doc ; then
+		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable crypt pgp) \
+		$(use_enable debug) \
+		$(use_enable gpg gpgme) \
+		$(use_enable imap) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable pop) \
+		$(use_enable smime) \
+		$(use_enable smtp) \
+		$(use_with idn) \
+		$(use_with kerberos gss) \
+		$(use slang && echo --with-slang) \
+		--enable-compressed \
+		--enable-external-dotlock \
+		--enable-nfs-fix \
+		--sysconfdir=${EPREFIX}/etc/${PN} \
+		--with-curses \
+		--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--with-exec-shell=${EPREFIX}/bin/sh"
+
+	case $CHOST in
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf="${myconf} --enable-fcntl --disable-flock"
+		;;
+		*)
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use tokyocabinet; then
+		myconf="${myconf} --enable-hcache \
+			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	elif use qdbm; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# 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="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+	else
+		myconf="${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() {
+	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
+}
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
new file mode 100644
index 000000000000..bba395296810
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r7"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+	ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	kerberos? ( virtual/krb5 )
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	slang? ( sys-libs/slang )
+	!slang? ( >=sys-libs/ncurses-5.2 )
+"
+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 )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+	# Post-release hot-fixes grabbed from HG, this is what all following
+	# patches are based on in my Mercurial patchqueue (mq).
+	# If you ever take over or need to modify patches here, just check
+	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+	# the patchqueue as it'll save you a lot of work.
+	# http://prefix.gentooexperimental.org:8000/mutt/
+	# http://prefix.gentooexperimental.org:8000/mutt-patches/
+	for rev in $(eval echo {0..${PR#r}}) ; do
+		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+		[[ -e ${revpatch} ]] && \
+			epatch "${revpatch}"
+	done
+	# fix compilation with ncurses[tinfo], #459260
+	epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+	# this patch is non-generic and only works because we use a sysconfdir
+	# different from the one used by the mailbase ebuild
+	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+	# must have fixes to compile or behave correctly, upstream
+	# ignores, disagrees or simply doesn't respond/apply
+	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+	# same category, but functional bits
+	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+	# the big feature patches that upstream doesn't want to include, but
+	# nearly every distro has due to their usefulness
+	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+		epatch "${p}"
+	done
+
+	# we conditionalise this one, simply because it has considerable
+	# impact on the code
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar-20140412.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+		epatch "${PATCHDIR}"/sidebar-counts.patch
+	fi
+
+	local upatches=
+	# allow user patches
+	epatch_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${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"
+
+	# don't just build documentation (lengthy process, with big dependencies)
+	if use !doc ; then
+		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable crypt pgp) \
+		$(use_enable debug) \
+		$(use_enable gpg gpgme) \
+		$(use_enable imap) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable pop) \
+		$(use_enable smime) \
+		$(use_enable smtp) \
+		$(use_with idn) \
+		$(use_with kerberos gss) \
+		$(use slang && echo --with-slang) \
+		--enable-compressed \
+		--enable-external-dotlock \
+		--enable-nfs-fix \
+		--sysconfdir=${EPREFIX}/etc/${PN} \
+		--with-curses \
+		--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--with-exec-shell=${EPREFIX}/bin/sh"
+
+	case $CHOST in
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf="${myconf} --enable-fcntl --disable-flock"
+		;;
+		*)
+			myconf="${myconf} --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use tokyocabinet; then
+		myconf="${myconf} --enable-hcache \
+			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	elif use qdbm; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# 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="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+	else
+		myconf="${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
+	fi
+}
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
new file mode 100644
index 000000000000..2a648791aa07
--- /dev/null
+++ b/mail-client/nail/Manifest
@@ -0,0 +1 @@
+DIST mailx-12.4.tar.bz2 271482 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8 WHIRLPOOL 05884e1fe21b49dfdec298a7ba1e812d471686c744073b766cffb9f5f7bc62573f82ca59a0bd9e6fabc4625dedff97a1401167a1c8fbc92c24b47ce9d56c259e
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..cec2552c7b96
--- /dev/null
+++ b/mail-client/nail/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <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/kerberos</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..96f5ddbb9083
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~x86-interix ~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.ebuild b/mail-client/nail/nail-12.4.ebuild
new file mode 100644
index 000000000000..6fb81dc8e0aa
--- /dev/null
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~x86-interix"
+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/nmh/Manifest b/mail-client/nmh/Manifest
new file mode 100644
index 000000000000..503259b45a50
--- /dev/null
+++ b/mail-client/nmh/Manifest
@@ -0,0 +1 @@
+DIST nmh-1.3.tar.gz 847614 SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
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..fd653cd8be8a
--- /dev/null
+++ b/mail-client/nmh/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>in-gentoo@baka.org</email>
+<name>Seth Robertson</name>
+<description>Maintainer</description>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/mail-client/nmh/nmh-1.3-r3.ebuild b/mail-client/nmh/nmh-1.3-r3.ebuild
new file mode 100644
index 000000000000..72e78f1f0310
--- /dev/null
+++ b/mail-client/nmh/nmh-1.3-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils base
+
+DESCRIPTION="New MH mail reader"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+SRC_URI="http://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
+	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 )
+
+src_prepare() {
+	# Patches from bug #22173.
+	epatch "${FILESDIR}"/${P}-inc-login.patch
+	epatch "${FILESDIR}"/${P}-install.patch
+	# bug #57886
+	epatch "${FILESDIR}"/${P}-m_getfld.patch
+	# bug #319937
+	epatch "${FILESDIR}"/${P}-db5.patch
+	# Allow parallel compiles/installs
+	epatch "${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..f82b86611e6a
--- /dev/null
+++ b/mail-client/novell-groupwise-client/Manifest
@@ -0,0 +1 @@
+DIST gw802_hp3_client_linux_multi.tar.gz 209918505 SHA256 f9be044980dd00703aaf2a1b2b93468e526a308cfe91769a61c7079ec3e08f98 SHA512 3a03ac02954f86c2e797404128441bff980f82cdc9936668fb528aef0190240891f92e4094fe53d58a0684ef8e94ebac7c73fbfa262e72bc450fab8ea9872efd WHIRLPOOL a07c30b18f6902521fe07d60b1ead302dc669a19c3d31e1af5acf91185b581924bd2ccfc07216a00ac06e7451aa981ac88958719d59a51b5a9053a445f455ad5
diff --git a/mail-client/novell-groupwise-client/metadata.xml b/mail-client/novell-groupwise-client/metadata.xml
new file mode 100644
index 000000000000..606b5ed6bb4d
--- /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>
+    <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..4bb1beb4fe93
--- /dev/null
+++ b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2c5f75fd5fe3
--- /dev/null
+++ b/mail-client/pinepgp/Manifest
@@ -0,0 +1 @@
+DIST pinepgp-0.18.0.tar.gz 38103 RMD160 1990bdc56460cbafe8b62cffaf5520038fe910ce SHA1 d80495079f398d60a7c6262f0778fbf0db6ecaf2 SHA256 2917ed5734b2c2e70cd8d944537cb0280f7cdfa34fcd64121f41bb4c37c7d6d9
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..51f94e3fbe0e
--- /dev/null
+++ b/mail-client/pinepgp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-mail</herd>
+</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..c32067c67008
--- /dev/null
+++ b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Use GPG/PGP with Pine"
+HOMEPAGE="http://www.megaloman.com/~hany/software/pinepgp/"
+SRC_URI="http://www.megaloman.com/~hany/_data/pinepgp/${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..423f64f582da
--- /dev/null
+++ b/mail-client/roundcube/Manifest
@@ -0,0 +1 @@
+DIST roundcubemail-1.0.5.tar.gz 4056852 SHA256 22af84480f2c543884b17c9b0196ed105d2ea7f429bfcc34a6fb7c96dd712792 SHA512 28016a8b05bdf4777486c63d95a91a22022006252e61e4e93320d81448cbc630ed5a04a1388d8576a40617d8e0630b90290341fcd3fed4f5080ab250fb568c6c WHIRLPOOL f0e48173e0fe07a8f3a00a49ad1091c33f76dbeb153941e32c35684f4eb41e04f805f63ec9623e3664c165c6e88407db3665f1e60a01c2076a3c60bc96c4a122
diff --git a/mail-client/roundcube/metadata.xml b/mail-client/roundcube/metadata.xml
new file mode 100644
index 000000000000..1197f8861880
--- /dev/null
+++ b/mail-client/roundcube/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+	<upstream>
+		<remote-id type="sourceforge">roundcubemail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/roundcube/roundcube-1.0.5.ebuild b/mail-client/roundcube/roundcube-1.0.5.ebuild
new file mode 100644
index 000000000000..85b66fca3512
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.0.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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="http://roundcube.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${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 ~hppa ppc ~ppc64 ~sparc x86"
+IUSE="ldap +mysql postgres sqlite ssl spell"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.3[crypt,filter,gd,iconv,json,ldap?,pdo,postgres?,session,sockets,ssl?,unicode,xml]
+	>=dev-php/PEAR-Auth_SASL-1.0.3
+	>=dev-php/PEAR-Crypt_GPG-1.3.2
+	>=dev-php/PEAR-Mail_Mime-1.8.1
+	>=dev-php/PEAR-Net_IDNA2-0.1.1
+	>=dev-php/PEAR-Net_SMTP-1.4.2
+	>=dev-php/PEAR-Net_Sieve-1.3.2
+	>=dev-php/PEAR-Net_Socket-1.0.14
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	spell? ( dev-lang/php[curl,spell] )
+	sqlite? ( dev-lang/php[sqlite] )
+	virtual/httpd-php
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Remove bundled PEAR packages
+	rm -r program/lib/{Auth,Crypt,Mail,Net,PEAR*} || die
+}
+
+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 UPGRADING
+	webapp_src_install
+}
+
+pkg_postinst() {
+	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 "Run the ./bin/update.sh script to convert those"
+	ewarn "or manually merge the files."
+	ewarn "The new config.inc.php should only contain options that"
+	ewarn "differ from the ones listed in defaults.inc.php."
+}
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
new file mode 100644
index 000000000000..53a0a99de2c8
--- /dev/null
+++ b/mail-client/squirrelmail/Manifest
@@ -0,0 +1,10 @@
+DIST admin_add.0.1-1.4.0.tar.gz 2388 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc SHA512 c8abb5a29b815ad2a4591ed965d60d1f75deea17d64c5eaa85ba4fec11d7d1ac1aa5beb8d39228e02b1377782d507b0fb55c47bb8ad10b9b958af8c207c6b627 WHIRLPOOL 94d26bd55e1e859f583db0cd39e4ae9b1ef778139302a24af1a10a671b44989354180c837e9eb74b0d58cef0adb345e65a2421c7777ddf77bcb48795133ce534
+DIST all_locales-1.4.18-20090526.tar.bz2 3898341 SHA256 b9198127084407950ad6158e030c76fdf9be5fd0d0abd69c606fb7757ae246c6 SHA512 082317a7b443db11236a5fa5771fa68535200b212cf0471ea37013f54c4b3979a3ee3d289aa3e6eed0988febd2188ab7a6054508068d972dd19c49fa700c9492 WHIRLPOOL 66b2eb3f4353f03280b45d1a14d00d924af38b6558997ca667b1672144dfcbfb5731e4df7b910f80a3aec11bc6fbcc2b28ff5a56fff6a3b8d1bfee86cd51ba1b
+DIST amavisnewsql-0.8.0-1.4.tar.gz 101008 SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c
+DIST compatibility-2.0.16-1.0.tar.gz 41497 SHA256 bf179d29223fc76ff6609fdf5146d8f488c603314a343ef70e41f77267de0261 SHA512 478b921da90679022da8790183a651c91bcc879e2ec42db9982e3fef7d3f7e92cd23703ac81a7e8e465889348b28597feba8aaa60943cdbe518a076c4723cf3c WHIRLPOOL 6248e48123484d29c299f88485342b612ecfd72f1ea21a67e988b8d379fcc54bc1262095ed75a3ee238bc60e527d5177e1252a370d0e32f0640b227a4e5e69c2
+DIST ldapuserdata-0.4.tar.gz 67439 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 SHA512 89cb6740865a6b48dbdae8b6ded49bfdac1946f0a76538dd874db104d01ddbbd022f1819a7f94d9ade599d9583dc4b4a1e3f4981bdd6d3dbd86c673bb1d388ac WHIRLPOOL 0c69741b1abbdd51dad33e284fafe148e29c66e6fe20351763bee1d400f980a52ec95eb59d6d9a10afa1a4baf1e7d27843c3b51ccd296c1eae47723cee4ff5ab
+DIST retrieveuserdata.0.9-1.4.0.tar.gz 10448 SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d SHA512 77588d0dafc603837cff7c33f8e487ee9b322d9ba875077fce1c5ef85b6e57fe9239680f1b9cf805e0940ae4f1a34c0dcd03e3d26706ac44732ea679ccaf8896 WHIRLPOOL b0121dac6146659fce80b9653084b92efb44fb4cc5ee986ebde91c46e581a721c775c8791e5f38bad10fba5b2369ab0f9e72c8749eeec102d1006a93e5f9d13a
+DIST secure_login-1.4-1.2.8.tar.gz 16993 SHA256 b6ede807a79c9b5300b43565c920570c583a1cc4d339bcea715c32196518837e SHA512 3246bf3e3f058d73e33a3f2e33166aa57061be0210fcc939f3a881bdb569d049fb95d8ad5c141de9ff7f2014feff40bcc5c72f4ca9acf9c30937c484977e15db WHIRLPOOL 86e5361ec0e0df994c2bd80346fc54126f77d463f642bb23e1fa39daf31488d2abab71cf81c8b290059e9acba1032b160b87a2d92f1295fb6b8b0ee22a477707
+DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a SHA512 5e2579a6d55924e5b92ee558379e88f7a5ffd4702009fa00c9a99a2a5bec750cf7b1de7b78ac05c0cdb5f59248c73bde15404e8b27a408766c96fc24ecc4b9c8 WHIRLPOOL d99dc6a04ef026b3faf8029b695ad5bb374009c1e19866661f3b32f5d2b46f27e231cd82f59130cbd15ca3caac3496b132b8c79b5229f5ed558b05e8743e7b8e
+DIST squirrelmail-20140426_0200-SVN.stable.tar.bz2 552464 SHA256 1ace525d0e19ed2df9bc294027b4f1c189fb6b454c434abd0ea700e5abefe9ec SHA512 bf0853a878c4a6fe01083090e0fb9cda2c5620248ffcd2e77f728c66480ae9161c6aba9798002b0c4f63d595dc5efa07ec1d5ec2b281d9cfe74096ed51db4850 WHIRLPOOL 29313fa14ec648f93728f2e37727aaa519bcb502b4ecc6fd4100df863b1276233f8a2c28d96d3b83af2a2fe85114b2e567b0ba0f818536a2a40b9f60ae338d86
+DIST squirrelmail-decode-1.2.tar.bz2 333942 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26 SHA512 f804d7e4bf8814fc00ea076b388a106820df6cb22e0d6c76305fef414f159238578a31e13787a932f9e832dc4b31eb4a7ef5da481f2abbcb164b81673e68698b WHIRLPOOL 735695b9f78068542b1db65cb1d35c06eb5c7d94b699fb176d6c5c82cb2b2f38725a83c6bff355ec7035916a55493666e5f839356369b923d2a6b8f9bd5688da
diff --git a/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch b/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
new file mode 100644
index 000000000000..46ebc04cff51
--- /dev/null
+++ b/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
@@ -0,0 +1,20 @@
+--- plugins/ldapuserdata/setup.php.orig	2004-01-15 23:40:41.000000000 -0800
++++ plugins/ldapuserdata/setup.php	2004-01-15 23:40:52.000000000 -0800
+@@ -92,7 +92,7 @@
+ 	global $ldap_bind_dn, $ldap_host;
+ 
+ 	/* fill $ldap_prefs_cache with data from LDAP. */
+-	$ldap_prefs_cache = retrieve_data($login_username);
++	$ldap_prefs_cache = ldap_retrieve_data($login_username);
+ 
+ 	/*
+ 	print "<pre>";
+@@ -121,7 +121,7 @@
+ }
+ 
+ 
+-function retrieve_data ($uid) {
++function ldap_retrieve_data ($uid) {
+ 	global $ldap_host, $username, $ldap_base_dn, $ldap_bind_dn, $ldap_bind_pw;
+ 	global $ldap_manager_dn, $ldap_manager_pw;
+ 	global $ldap_objectclass, $prefs_default, $ldap_attributes, $boolean_attrs, $multivalue_attrs;
diff --git a/mail-client/squirrelmail/files/postinstall-en.txt b/mail-client/squirrelmail/files/postinstall-en.txt
new file mode 100644
index 000000000000..dc9c64a86119
--- /dev/null
+++ b/mail-client/squirrelmail/files/postinstall-en.txt
@@ -0,0 +1,18 @@
+ * You must edit the following configuration files to setup your server.
+ * Note that not all of them may be present depending on USE flags.
+ * 
+ * config/config.php
+ * plugins/retrieveuserdata/config.php
+ * plugins/virus_scan/config.php
+ * plugins/gpg/gpg_local_prefs.txt
+ * plugins/ldapuserdata/config.php
+ * plugins/show_ssl_link/config.php
+ * plugins/secure_login/config.php
+ * 
+ * You should also create the file 'config/admins'
+ * containing the users who should have access to administrative options.
+ * Put each login on its own line, and be sure to leave a newline at the
+ * end of the file.
+ * 
+ * You can use the console based configuration tool by executing:
+ * cd config; perl conf.pl
diff --git a/mail-client/squirrelmail/metadata.xml b/mail-client/squirrelmail/metadata.xml
new file mode 100644
index 000000000000..7d41afda0934
--- /dev/null
+++ b/mail-client/squirrelmail/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-mail</herd>
+	<use>
+		<flag name="filter">Enable <pkg>mail-filter/amavisd-new</pkg>
+		filtering</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">squirrelmail</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.23_pre20140426.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.23_pre20140426.ebuild
new file mode 100644
index 000000000000..80b6b1a55f67
--- /dev/null
+++ b/mail-client/squirrelmail/squirrelmail-1.4.23_pre20140426.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit webapp eutils
+
+IUSE="ldap spell ssl filter mysql postgres nls"
+DESCRIPTION="Webmail for nuts!"
+
+# Plugin Versions
+COMPATIBILITY_VER=2.0.16-1.0
+USERDATA_VER=0.9-1.4.0
+ADMINADD_VER=0.1-1.4.0
+AMAVIS_VER=0.8.0-1.4
+LDAP_USERDATA_VER=0.4
+SECURELOGIN_VER=1.4-1.2.8
+SHOWSSL_VER=2.2-1.2.8
+LOCALES_VER=1.4.18-20090526
+DECODING_VER=1.2
+
+#MY_P=${PN}-webmail-${PV}
+MY_P=${PN}-${PVR##*_pre}_0200-SVN.stable
+#S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}.stable/${PN}"
+
+PLUGINS_LOC="http://www.squirrelmail.org/plugins"
+SRC_URI="http://snapshots.squirrelmail.org/${MY_P}.tar.bz2
+	mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
+	mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
+	${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
+	ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
+	ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
+	${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
+	filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
+	ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
+	nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
+
+HOMEPAGE="http://www.squirrelmail.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
+
+DEPEND=""
+
+RDEPEND="dev-lang/php[session]
+	virtual/perl-DB_File
+	ldap? ( net-nds/openldap )
+	spell? ( app-text/aspell )
+	filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
+	postgres? ( dev-php/PEAR-DB )
+	mysql? ( dev-php/PEAR-DB )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
+
+	cd "${S}" || die
+
+	mv config/config_default.php config/config.php || die
+
+	# Now do the plugins
+	cd "${S}/plugins" || die
+
+	unpack compatibility-${COMPATIBILITY_VER}.tar.gz
+
+	unpack admin_add.${ADMINADD_VER}.tar.gz
+
+	unpack retrieveuserdata.${USERDATA_VER}.tar.gz
+
+	use filter &&
+		unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
+		mv amavisnewsql/config.php.dist amavisnewsql/config.php
+
+	use ldap &&
+		unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz
+
+	use ssl &&
+		unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
+		mv secure_login/config.sample.php secure_login/config.php &&
+		unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
+		mv show_ssl_link/config.php.sample show_ssl_link/config.php
+
+	use nls &&
+		cd "${S}" &&
+		unpack all_locales-${LOCALES_VER}.tar.bz2
+}
+
+src_prepare() {
+	sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \
+		config/config.php || die
+
+	cd "${S}/plugins" || die
+	if use ldap; then
+		epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch
+		mv ldapuserdata/config_sample.php ldapuserdata/config.php || die
+	fi
+}
+
+src_configure() {
+	#we need to have this empty function ...
+	echo "Nothing to configure"
+}
+
+src_compile() {
+	#we need to have this empty function ... default compile hangs
+	echo "Nothing to compile"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dodoc README
+
+	docinto compatibility
+	for doc in plugins/compatibility/docs/INSTALL plugins/compatibility/docs/README; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto admin_add
+	for doc in plugins/admin_add/README; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	docinto retrieveuserdata
+	for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
+		dodoc ${doc}
+		rm -f ${doc}
+	done
+
+	if use filter; then
+		docinto amavisnewsql
+		for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use ldap; then
+		rm plugins/ldapuserdata/README
+		docinto ldapuserdata
+		for doc in plugins/ldapuserdata/doc/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	if use ssl; then
+		docinto secure_login
+		for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+
+		docinto show_ssl_link
+		for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
+			dodoc ${doc}
+			rm -f ${doc}
+		done
+	fi
+
+	# Copy the app's main files
+	einfo "Installing squirrelmail files."
+	cp -r . "${D}${MY_HTDOCSDIR}" || die
+
+	cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php \
+		"${D}${MY_HTDOCSDIR}/functions/decode" || die
+
+	# Identify the configuration files that this app uses
+	local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
+	use filter && configs="${configs} plugins/amavisnewsql/config.php"
+	use ldap && configs="${configs} plugins/ldapuserdata/config.php"
+	use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
+
+	for file in ${configs}; do
+		webapp_configfile ${MY_HTDOCSDIR}/${file}
+	done
+
+	# Identify any script files that need #! headers adding to run under
+	# a CGI script (such as PHP/CGI)
+	#
+	# for phpmyadmin, we *assume* that all .php files that don't end in
+	# .inc.php need to have CGI/BIN support added
+
+	#for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
+	#	webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
+	#done
+
+	local server_owned="data index.php"
+	for file in ${server_owned}; do
+		webapp_serverowned ${MY_HTDOCSDIR}/${file}
+	done
+
+	# add the post-installation instructions
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	# all done
+	#
+	# now we let the eclass strut its stuff ;-)
+
+	webapp_src_install
+}
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
new file mode 100644
index 000000000000..5df0a227f9ae
--- /dev/null
+++ b/mail-client/sylpheed/Manifest
@@ -0,0 +1,3 @@
+DIST sylpheed-3.3.0.tar.bz2 3294536 SHA256 4d8f791aaf0f347439512aec72cd8262f90e020352cb2f7b63727ac5bc07353b SHA512 75e2a7573b2eba0f54386e020a82daee7219e45cd032b4568b04362c88fe84bdde6a4023e1259ea06767944c32f605d739121aa7e389b4538924c6eefafff372 WHIRLPOOL c31a173f6f39cf4177bb32083efc97387d9477e11f270f08de7cb650f2af997a52b0031daa44c0f07d78aab692735c0dd7b1e4f1c887cd1f09cd042d5ddabfe9
+DIST sylpheed-3.4.2.tar.bz2 3474176 SHA256 198de08d01a5c150adae6b6612da80674bbc7ed59b58bbd7508124b869322ba3 SHA512 1bfaf5636facb6ca55173e914904be7f9fb9ca98eb440f5b548fbbbe03f5dfb5428801e878f3275d3683e715d0b4bd33f63f69f5f98578ce1a25cef695406b5e WHIRLPOOL a7dda342adb598027765c5ab6d14ae3e850bf39ff63d90a79927fa2aec1bf539454357cb6dea8664d21f68deeccf78fada264d04b0a14ff311ff5827717c4aa8
+DIST sylpheed-3.4.3.tar.bz2 3474313 SHA256 09fae954c775073b43ce2f660a6bed1087237659eade1c68913cb86add1fb905 SHA512 cadae6a6855fae8c2df249d83cfd2d7b214062e3e49c74f6d64b3c2f97a9eb2586f14e2b766715e07fa1b229e4462cd39eee69bd02c26053b1ed93a497c3836b WHIRLPOOL 4d76ba80a60c3f0513b80af8854292712a74e5a9b5d2e53b82de0edee4fea7b76316b807af396bcda918a0e5c9e66b05e4201d89992a443cc3bb582574653431
diff --git a/mail-client/sylpheed/metadata.xml b/mail-client/sylpheed/metadata.xml
new file mode 100644
index 000000000000..a619498bd13f
--- /dev/null
+++ b/mail-client/sylpheed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>net-mail</herd>
+  <maintainer>
+    <email>hattya@gentoo.org</email>
+  </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.3.0-r1.ebuild b/mail-client/sylpheed/sylpheed-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..ef48c708160a
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.3.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+SRC_URI="http://sylpheed.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
+	nls? ( sys-devel/gettext )
+	crypt? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap )
+	oniguruma? ( dev-libs/oniguruma )
+	pda? ( app-pda/jpilot )
+	spell? ( app-text/gtkspell:2 )
+	ssl? ( dev-libs/openssl )"
+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-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
+	docinto plugin/attachment_tool
+	emake DESTDIR="${D}" install-plugin
+	dodoc README
+}
diff --git a/mail-client/sylpheed/sylpheed-3.3.0.ebuild b/mail-client/sylpheed/sylpheed-3.3.0.ebuild
new file mode 100644
index 000000000000..83efacd4a5c5
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.3.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+SRC_URI="http://sylpheed.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
+	nls? ( sys-devel/gettext )
+	crypt? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap )
+	oniguruma? ( dev-libs/oniguruma )
+	pda? ( app-pda/jpilot )
+	spell? ( app-text/gtkspell:2 )
+	ssl? ( dev-libs/openssl )"
+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-manualdir=${htmldir}/manual \
+		--with-faqdir=${htmldir}/faq \
+		--disable-updatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
+
+	doicon *.png
+	domenu *.desktop
+}
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..fb700aa08d2d
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.4.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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 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 )"
+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-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
+	docinto plugin/attachment_tool
+	emake DESTDIR="${D}" install-plugin
+	dodoc README
+}
diff --git a/mail-client/sylpheed/sylpheed-3.4.3.ebuild b/mail-client/sylpheed/sylpheed-3.4.3.ebuild
new file mode 100644
index 000000000000..5bd6d3803ee5
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.4.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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 ~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 )"
+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-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
+	docinto plugin/attachment_tool
+	emake DESTDIR="${D}" install-plugin
+	dodoc README
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
new file mode 100644
index 000000000000..9f6f6614a217
--- /dev/null
+++ b/mail-client/thunderbird-bin/Manifest
@@ -0,0 +1,113 @@
+DIST lightning-4.0.1.xpi 6637522 SHA256 a93af3b8548a82e5709ed1c0d06d0a103e3fcdd5e554b1124e42166a814be3a6 SHA512 ed8ae62eb6b339a4108756934142dbc2aeb7e039d6fd856067bf3f24ce5a2450336e281dd018b5a14c359c5f58fc20668e5cad4b3929955572f44002be1a940c WHIRLPOOL caa23550eab6cc8f4b8ec63dd6c34282944cb9f150885ab2120d315db0910b640fab3fdb466d97cc7e15364e88bdc09c7041f107d11bf508f361979de1bf2722
+DIST thunderbird-31.8.0-ar.xpi 472812 SHA256 2f2f6e0e5554604fa861571eeaffc702a15a4be088df99af6f7c1944d35c7e9d SHA512 ad77e3f4dca5ff063fe44a7e23e68b897efb417e529be58f310e486b3f322386512afbb00f95f121fd29df3a186d3d2b38c5ec08096c77832fa4ccec903e6d85 WHIRLPOOL 863e32689def07e16218b7b0d4a7fa18ec232a9665f4a03ba4b58fa3cdf020b5835ff07c32bfa0db2b10692f545a46db478324e722c83aa91c8149b81ab1e5f7
+DIST thunderbird-31.8.0-ast.xpi 393048 SHA256 4ed7590913176d329ac340afb8ea5edadc7ad992ccd85b8731c9967e4021b3c8 SHA512 091734274191b515f6cae98555418a97bce2b7beaeb10059d0bef1f802d3d013430aece7e4470b36419fd66316a7f96147deefdfb99da66c4086ee955fb9bfa7 WHIRLPOOL e980f35455204c9686d3d7126c92df6a9f4a4e8d8fb5ebc7e1c0604e6467c21e20e434598ee47c3e5feb843ec146d3e5e2e9fe8dd737568982878c9c0b9632d0
+DIST thunderbird-31.8.0-be.xpi 427488 SHA256 62bf36d474fbe878ffdba51de16d9b0d398f36aba869063ef2f3f105828a122c SHA512 67ef52595ad5459e28bf563022c8cafe2ea5d06084a48e86dbe8d0c78655636a677a6cde7c38741af50425f3f563179495eee2d16b032b829fcdd9ebb1a13fee WHIRLPOOL ce54655edfe810df6a3a607daa393a03347fb42e8e4c512c809a4c63ff33136879d537fbfba11c58a84b9a61506ef9f18db19aa0cde1b90f9c558468d8595a48
+DIST thunderbird-31.8.0-bg.xpi 493734 SHA256 3103ddd1ba3601813c506c46a98897b539b7e18c244768e5d3f39f33fca2daef SHA512 f13f5cf7dfc85a0b61ba0c4f67e4eab4fa9d36944401f73cd0b4512aec6711886632465e15e4e33009e370d023e3cd3a3123b015774a6ed66c0d31541d52bb9a WHIRLPOOL 64471420f2e56e04f8a7e046c8487c0e89d983d519019b6fe212c0ea7b5d5c0e58347b5fede26d4645c2e6052f7004224947720f1241361a46d0135148805b0f
+DIST thunderbird-31.8.0-bn-BD.xpi 555613 SHA256 ada4af2285f78c73c21a3fdba8dc2fe03c8526900df30e957f577bc82072301e SHA512 1a2dc7f7c1682f4e34ee66620dfbcb6a11c3588fce293b2a42a6c2052913a4827a7e0fa31a4af803c2b7b93f7518cd7660a3c2ffb77da995b189ec793c63945a WHIRLPOOL b300f7674ddf54fa5aef1462d43c6df1c5e7b6133f9421911c69a6fcbec3fb386139da61513ed289200a9d067409c3aca87adc7bd34622fdf8ae7a9c31888283
+DIST thunderbird-31.8.0-br.xpi 441445 SHA256 4ac048f1635890e65ac33826b40031d32bb23273aa48d17363d061ebc70003e2 SHA512 471db2eb2165b386c77e8e4e52f29cf4eb62c4fee1b69312a30b48f762652876b1c7f7c56ccfe66980d425c152636e18c538b58e90633b39ddc50a673db6b63d WHIRLPOOL ecb104bdba702d5a8207914ca4ae9fc2f4e8b38dd9b068ee3efb133cc005551edea1d21d689e2b08264426e18e9ca4472a389a444a550b7f2cc7ae4f32ff24ec
+DIST thunderbird-31.8.0-ca.xpi 441712 SHA256 e8e445f4349eda7eab3b0771434b01f843a8a41c103ef8104a10de33e14fc99d SHA512 910b60383df51de0adf3df51152a1a73b7821c489547e928c2e0995150021a246f55bbf6be092e8d5c33e80133d4d2c472172eb71d1300ab2db478fa59b1916d WHIRLPOOL d8a0991c4f48e808a0eb8977128aefa577a34a77efcd7fbc552fc20ffbfaf621016513d1557d2ad7ad306fe970d3806a890a75dba600320c22ee0b044643850a
+DIST thunderbird-31.8.0-cs.xpi 444701 SHA256 532e5ff05d90ec1419e65b74a6fa570edf1f69b494b51ea6dc53545806803138 SHA512 605d897b856fa71888d54fcb6de872be449de5bde0d3d618293bde135fff1e880c3671164e27d855bbe4b101fc0f5aaa49d1d0f4a034079d62c71b83634e2d91 WHIRLPOOL 6f189127526398d936693a769a8471b1cbcd4644d3b70046780e14942015c8c6a81a8aea388f6f3e25b5c7d96603fdee2c03ff3f86f472f6cf77c6dd11e29f43
+DIST thunderbird-31.8.0-da.xpi 422052 SHA256 2e3839fc9f374f9e933c90c010b3cb645915148b67a43b1aaa0b9d9a3213e5c8 SHA512 abe25acb5f46a33052ce9fda75405e6dfbfde4d0c41b6aa20d1c7fe8e9fbd24a0cb81a57a3c255f17e1dcbf6d0ab51d4f49f2cfabb89c51d05e554aa0a4cf9ea WHIRLPOOL 779821d250f72a3b7ac6b783bba06bb561299ba7a045a593a4cdf71906eee186c4490d4756bc644f9711ac0ebf2fcad3427b897079cbe97bb0df335b4c18a2dd
+DIST thunderbird-31.8.0-de.xpi 424665 SHA256 d9e19fd0a44e0882f371f3e5cc7d558ca4eba05241026f228870b231ebc485ef SHA512 fa78d913010f3b88507ee0dd3d7b1a527b68b8dc72d2d9cd7368ab5363a0b437778d6adad6d1e1cc6b1673b34a84c04fdc5fb0bc4f0e4687e7d8b4972a2273c9 WHIRLPOOL 8d0d0fc3b658b7d673126c5407abd86e47a22da2abc44b1c63382646a5cc9e6196106dfdefcd0444ec89f0fd0ca2bbda7f8941bf49d753bb301c2965fa82f523
+DIST thunderbird-31.8.0-el.xpi 484855 SHA256 ece947f2e7451cf068093cb0d430434c2cea5292b2226c1f499dbdd79cc84330 SHA512 b2749f79374f20ce000ed9461c55a55c82d120e9f5b5625b5d000f4a28ead50abe2ba7e72add255a0e9b3d2f7c08c9f958bd40875c9e6ba17664ccc155695aac WHIRLPOOL 4986d0448659950953a2bafc7f68370cee9b97eed2f120527adec04b6cc7ac1d047e96e55e267e205da7c7f60941340beee6fcc6851b6a1e82a9adfc007b183e
+DIST thunderbird-31.8.0-en-GB.xpi 412515 SHA256 0d522c9aa03294a8e8a600ffafd27f9bd66f99a84a7096d79a78c66e3c4411f5 SHA512 78382e06ac8eda6352ffdd53c6136d52754395ec97ca2ef69484d8f71ce44774bedd0402e8c41ae4b41e766867b5d528c0c9793e80578d3ba0424bc3074e5491 WHIRLPOOL 37afa8cbb32f7063d81eaf249176323638e32bfe598e15b0c3145c535f55c9bd12e51f3e928d8acd8ba9b58d3e12c2c3a8f45ddca6300c1e5bc78534de386672
+DIST thunderbird-31.8.0-es-AR.xpi 438531 SHA256 5b8014d21af14cb90b9fc4c9dca8a839a5ba63d1520d43ed6673c23cc8683b8c SHA512 bd262cdda22e9590f109a90ed1ec463bb2f9bbc27d643aa70136fa2d34eda0c4fb839b400c376c9a45698c7014530fd770620382f9fe69fbf48eea85532a152d WHIRLPOOL a2e02d4966f0f884abf4ccb316f22a931ee0514bf1e1131a5b34125f1e17ad82cb4bdc6be294d79bc15a75939d46087b76dd8d68d1e1575355207661f11d96c4
+DIST thunderbird-31.8.0-es-ES.xpi 374979 SHA256 8b106c8c624d7644df31a256380e448f68252b4554b938a501b34acd38886b30 SHA512 3fa3a36f2e72b5123a737e11e96b7a76ca0d7202ee5a81bea271b51e9027dbc8c03b887567c6d4bc6d65d2daf4429da96a8a33f10dfe0b1ce81df9ee73f2b043 WHIRLPOOL bc26ca5a03f42708e367ccc6b3a08bc5fb3b156510b681aa05a1de14f1bbbcf9ce4e5b47d78d682bac7e6ec38042492d64e91cfa2fbe8f71dff577a6546b79c0
+DIST thunderbird-31.8.0-et.xpi 434365 SHA256 b9cfbb57c173dee56a575691c69ea7edd7e81ce550512299b724cd112a547ce6 SHA512 6baebdb829e6f43e65e4a0fc2746523436a145e433807846769ce2079c85d486acca61d90d6a353875ec04c7ed1a351115d064ae4a4bf7e78d4174132b814dfb WHIRLPOOL 7138104c4f1c0ddb2bbe5094fa6b4154fb5bcabed2fef8c7dba6718b1c58f7d5701440ba38bf673dce511e67a40d5a95f8b215794ea2e4b4724d11254b7b6308
+DIST thunderbird-31.8.0-eu.xpi 431448 SHA256 c5606381a11d074e86672ee0d57e3dc8b56069a637484c82f010f5cacd23a747 SHA512 87c2424350cd9da9433c149c7b24f9d66d124561a07321dad388fba5f3a476b00f1cff2f229bcf8d2d5376308708f59c0f48079fc45ec89f3f794a2ec9cc6a5d WHIRLPOOL 08efd6ab32c95ff512b52d52020c6a502889b97f16bc85527007500df56a70edb852f7f4f2189062e11659e1f67e131b25da160adcc548de776bdf637215de0e
+DIST thunderbird-31.8.0-fi.xpi 435632 SHA256 352181f29404b237d28bdb2778cbf55ec5912f03dd2c338e34da7db404f6a04d SHA512 b0e5886669d625346a6829a2f774d5cc3a5313a6e0d927f57fced92f62851664a484d8b04026c30519ff43449c3ec991b49ee2dc97ff1a16129e459d45bfa59b WHIRLPOOL 208d9e047eb8b04c20b9f21d8c2b71fc54f625dc9baf6bdba1ad847846ea9822a2957d9cf97d4833d74c3b28c434fb687028791e58c41fc077cd8002776aa734
+DIST thunderbird-31.8.0-fr.xpi 444144 SHA256 0d173c8ad8f302b7f39497178f975b895ffdcdc767eb328519326e9fdb3e1215 SHA512 48529d49270dcba03f2673d1e31eb9dbc98ecf6e9555ce3610155b02634c52bce00772538866d15d7e3a23905bd673556141333eeb87d53c8c1e7716fea690ee WHIRLPOOL 913fd579553a50bf8dd3fe7ceafc82108230a31a55abfc5af0a993979c5ec7a24bc5861dd93dfb93017f562bc8f89bef36f40e5ce638ae9b2d8311c0a547e428
+DIST thunderbird-31.8.0-fy-NL.xpi 438544 SHA256 9e4e7a16b8f4489aafecb48a0e4df0b40495dc49a8dcea2ae5638a25dc4a5202 SHA512 29d5f416e8a9db19c9d8c01154f8e8225abb63c7deca10df005748de49e88e74e3fd26f44c0c911987e74743d66e433459a03b299f9979bf33d8e1a859e0921c WHIRLPOOL 324bbef93998a958dfa92bf18978299f4284501daecb1c94238eb2cf0b3ac3ef4ca0aad327bb35d1dd59ae2dbe674e65ce613de4c5f5ea4b38cc2877445ba709
+DIST thunderbird-31.8.0-ga-IE.xpi 449362 SHA256 0a5e915a2844c64c954bbd7d17f2f7dbef93919f1ce9b65d3561c20385977788 SHA512 31bf2153a6f682e265f48ac5a5c7c987cf1c57183a985cea5245e121d357ac0d8835cc6e0209af43dd5b654610d4d5b3c9d4d836e97aa49f3a7a5488782c217c WHIRLPOOL ec36bea9cd1c6fbebe8f6d7a47961f3313713b09655d52209e89a8404b6e4258b752d01f021cb8fa08c70aa456b5d51703b354b0af15c678f548ff1bed33ee0a
+DIST thunderbird-31.8.0-gd.xpi 453171 SHA256 759f6f95a8064f786f1dc7aa4814fd6ae9127a2f20c8f9ac6655b9034a234b3e SHA512 d82435c056b5e2d6ff62df2bc96afe576c3ea35939b8c5d197b27e1179417fcc58e8eae4e015561d7dfef030d456bee7dcf78134e1073c8626da5b6cf3e44da8 WHIRLPOOL 382fe925cc86206a51aba6066e9968dd1d5ffccb72f42a4d195fc838dffed6d5fe0eb28cb8eae5cdd4bd486c6d3c37b102f6a5efa75586c5675f8633e6952fb9
+DIST thunderbird-31.8.0-gl.xpi 446788 SHA256 170d3cda37b0e81c09129bcbf2ebd321c88b2fea8938605483edaf323b506fa9 SHA512 943cc38c1906e7179bd41806267815d8ad3d8f4dd34a57e2d161afaf649d64bf30dfb711343ac0b92421eab5e081155f5a9463731a52fc728f31e52e09300c13 WHIRLPOOL 3d7b8b201e9790a4eff65e235e27b42ac4ff45195bf341187b8885847b656ce8bb4f43f3730e50c472773003d65a6af82cd5d66a8c06f19c60bc8950aca52ee5
+DIST thunderbird-31.8.0-he.xpi 476112 SHA256 db94934ca21361444479bd8ee4befb7b3010998972924c2c3726a2e256871396 SHA512 663aaadc678acc36a94bf023f8927bd12102af689a4624aa3201e683d0bf74aca640470f0e9604777f74cdd1c53f6865136ac749fe903989921947adf6dbdc93 WHIRLPOOL 8be664f45fad2ca8a93765eeb3fc14d500227c5a36c3f7ea32b2d4299ff1f5ab9029fd1387223a52586ba263a4a5ffa43f3a31f186114664b9e0ba213fc99a1f
+DIST thunderbird-31.8.0-hu.xpi 454542 SHA256 f2004a17d93d0b62a1ff5162fd183f43edca2cf518f4cf5476ec013f15267b21 SHA512 e03999454e676863e784a822e85ea322f2e304b71eeef09e3b8c76530bc854c39a8d367b02ee6a7e60a02d69702b8f70bef25f8a824d6f428851384fcb999b03 WHIRLPOOL 4c8bf2b0bb1e57a2030c41e4815b8ab9d3555e47bb53b8d72a6463aba9c38682e3263af3d538aa1a1ccb288a3d61bc7762766ffeffd8e2610eae9769f7463d55
+DIST thunderbird-31.8.0-id.xpi 475876 SHA256 7bf665c85bc85230025903fc079f885b9af577da9caec79952fac1a6de7b4765 SHA512 c2c6369f14fa53da61da2a6f29e3f30eed7ddebbd897f82700a53bd55b2c000ddefdaac6980fa45ac2244a7d048fab162c3a69043f605e5e7459e1824089c8a1 WHIRLPOOL 02469686768373e3605e0e329f1c7d60d236b69a8e234d0f9d12f68207887b639d87c9b0464bc5f6103b491fe5dd4c3cebab9b2e516fa68e35ee5a8f84445419
+DIST thunderbird-31.8.0-is.xpi 437959 SHA256 366b58d187067794c02580d8bc4ca3ef7e29d877d4736485d1d572382a1158df SHA512 c2a8512912dcc7661ea3828ca18e779999a757e9836a00501b356b215af2ba0150373d482885c5d28996ebd280b4f953bd625d2cf045ca80b658cc055b9b10d9 WHIRLPOOL 1124720affc28ae2a89d3484362a17354891bd9b90e8d54193a6ced7855013e3be2f06bd578ff6a1943b9eeb236cde28db827d3b32cc5a5ad233b124e124cf76
+DIST thunderbird-31.8.0-it.xpi 368001 SHA256 1a7de0809d940c0c48ba13fd5b4a8de9713b3512df9e0cdaf4e5d032d598b976 SHA512 2699b99c7ab5f9e7f9e89988bdaf22fc98698ade02a831d9902b5ab6e3773f6e861f40c78a337a89bb676105d72506a97909fb2a1d073b8a229a74a1dc498897 WHIRLPOOL 607bf31f39f949894a9b653a33ca2eae1f896b888dd7602b8e33458391471001ee926b363279a4f1c8f159a3cab3f55c959dc06189888d4cb2bcc8115d35062c
+DIST thunderbird-31.8.0-ja.xpi 489267 SHA256 d85dd73c6e239f7307afb8faf426041664fa80a28c013fada8d144373a87bec7 SHA512 612c8e8ba46cb028775882ba777d8accea963ab74535dbafd5635a61e4fe1cde3e78cd90c2d40bf345a82a371f8a69980abe71724f2615e470c10a30a7fd5bd1 WHIRLPOOL a17cf6a55cd86d5584249ba294b5079363e642a2f885b1ddcb925505b85d9d2602af99f898afd63e99cb19da854c1c55195b48166c5c0af68057b53c1c161400
+DIST thunderbird-31.8.0-ko.xpi 448920 SHA256 855fcbd76a5fd150476fcbfb896f910dcf5cb997d0e43439d8bc4fdf09412d3d SHA512 9cc2fa64ada971b49dd05aca1d87edceaf125475c484c2e3ae2f5ec2d0d43c19d6901eeef40543d7ccc0e201c935cca9a3d9f7d4d93ed80cb95c8d1ca4fc93c9 WHIRLPOOL 8e7a51b754948f3261c20b3814b2b17eb76fed9bfc1901647ab3041bd99d56f6c3d446152138d88057447671dd81181f4907a66cb36dc3f9c06d09264ce6483a
+DIST thunderbird-31.8.0-lt.xpi 456352 SHA256 092a770ff436b870a5031758662f95bc284246af07c06cafc9dbea3617a54a96 SHA512 bf42b440046fd9cbb3e0dcadf99f9c8afaa8de1c02e54c1c83008882f9c0d1185a54d13d819d929226fb04355571212c0856cc4617a9dc34c115bf3eb1f96ce0 WHIRLPOOL aada19c3b1336a70ec93cbb4d77f91d4ed484dc0146ab78d88260c8e3bfa542c5dd65f8988eabcc4c257bab65bfb89a3ff23a6df512ece70db68c7b46ae72db0
+DIST thunderbird-31.8.0-nb-NO.xpi 430941 SHA256 a911e621cf2d667d3a3a0766a8088bda274a7a4c2bd0d72775165683590efc39 SHA512 6e163f7f287cd05d0c6072ac3f3917ce4dc9eb672ed4fab6d4f2ee8c6a4cd15daa80f93b5208e3365c203b6ee7b43fd75f1d685f73ee6c80f2043fe9608dad60 WHIRLPOOL 5826c6d1c1b02f293c5a7f2771ef648948e735c9434e7f1fcee26fbe77279300741ab74191cdb412d926e200ca399839c3317c30684d019ddfa44318a06aefbe
+DIST thunderbird-31.8.0-nl.xpi 431888 SHA256 6b96a69616d71057473087c3e82da8cb32f469f7621568abdb6e8111cbbd1be9 SHA512 57c40ca7594955bb4f73749cbdffe41684a3fd278fa7ce9929b80a116ab0bfcac2d88c9133880ced012aef2970dd7917c30150a92cfa20a1773f8b67d0c124bf WHIRLPOOL 1e3c80d3c107d8fcb923cd24b5f422f1fcf24c6c3423fb54704cbf020d5b9689d9701945f44fe5363cc5550d950219b0d982d2cc60264d478b24d93cdc243c7a
+DIST thunderbird-31.8.0-nn-NO.xpi 433198 SHA256 34088f0efd585872735c072b1060c754716720a9e5f7d320f7def582b84d7bae SHA512 ab019f87a2e26ee380835c7981def457f69145f004dc6010be9f56f891d4f9fc8320c64377d8497edaf7481ce7bf14cf801754122f062a0c268693fdb651bd28 WHIRLPOOL c3a2f201cb3d8f319a2342a0ab85f1947fd6958f02f482eb524a1541906c90de646e7083735cfe9934877244150972e1b6f9580edacd491ce51c0eb52ffb9f54
+DIST thunderbird-31.8.0-pa-IN.xpi 525323 SHA256 6c4e01a89da5ba2ae1488c3c99bee176ae75b8174e5260bbe57ebe1cdcb58a52 SHA512 1b790a242bc69e8e795636565a29c2cc37c5cce64fd0a718757106da878810f73227aec931d1d8e1d75d5d271282b4764e2b868f481423cabd0603b2406c12c1 WHIRLPOOL 4a3f8208ff66a45cc7aaffc225fb9ed85cc2526c6ab70084cb11e663514f3f43a80e9b5b472569089f4bc7cb534d4c5845017da49fe0d2bc4d348c2727c63d7c
+DIST thunderbird-31.8.0-pl.xpi 410872 SHA256 c850cf5d3b32fe3fb158f0aa9102b231f3765b3e73d003d56efa22c8f43eb1dd SHA512 bbf0b8b4a71183099d1ac2f49ca719a796c234dab223b73bf3746c433d72b4a14b452745daf0804101e9635a51fe8d1ca528d04775fff41aecde11f4046f88f9 WHIRLPOOL 58f5551eb236e9bf3ba75757cbde50713a5178223470daf0bb1a229e9d418c89537c81f6dbf471fc3cffa1e2b1a2bf21b3a3ad5820fbbe2ba8fac1dbfde0a2b2
+DIST thunderbird-31.8.0-pt-BR.xpi 450477 SHA256 b2c2139b6a3f38ab4439024d4a63002282689e6d07a7bc5dcdf98928872e1336 SHA512 aaa96d96a1f597cc2b8ec123acbd271df2d37b382825b76149047b51fb4e7ea50f59621d51266b1365129328232f0a8a1aa73c938f8fa2998079840bc0147c8e WHIRLPOOL b1a8b82adea706494ae3738d1db94e52bb51addcbe7809238b88b475c9f70bade6cd69a94df758759535ce2134fc000b0cb0703a00dc47abdcf2705465347f04
+DIST thunderbird-31.8.0-pt-PT.xpi 439604 SHA256 2321cf232ddbfdcecf86290c3e5671211cabe576f14c0cc5d34ace8dbc1b9562 SHA512 14fa6a8947b0aaf8436a0f5cacfa9d78ab30cb57f36d8be42ed12f8c6d479d072e5a29caf6c5feab89a1a99ba0ca84bc067dd6391631c6bd12665ee98699ecfa WHIRLPOOL cf016ce2e447f45973ba2d94a92b19ee9cff2f3896077e0b85bc38e07c1a45a9c4d1b368a31872bfaa285de5f0440b6b479a6e92ed6293d4b4893987fc6a2e3c
+DIST thunderbird-31.8.0-rm.xpi 439186 SHA256 7e5045e3e186da0f63c5c456b65e5c017c30549393468ba61b44183bb80cd8f0 SHA512 f2f448066aeb0336c50a2dfa1a276e78c42c1540ca7a20eda1757775adbcfeb4dfe169dd5e1541adfedf66c31388ce66a4fdc0b604adbce9f90a46be692e0d6e WHIRLPOOL 30c52f2bcbc89e672fb2411369e0dbf7ecb96abc77668a563fe05fa08e76ea6589f0862e295f749e38e1a1325eb6f3c98cda15373a52f3e7ca8e3df531eced75
+DIST thunderbird-31.8.0-ro.xpi 479749 SHA256 55e09951b497d9f304499acc6814832ed9c11e6a1bfec3a8e100a9b7b79ac0c3 SHA512 32f6ce6120d28fa4686bc71de5c5210509b312336210903b3cb8884cfd427a5567ff1410cc725e60abbd68835a822a8358fdc14e0cb82ca752099c18685f2bdb WHIRLPOOL 5f448770e921bf62203556728ffd834a4750266eb676f681259090a5ad6f0f5660fbb64b1fe329c65891640383744da3f6b8d638ab9225b207df1b6535ad4cbf
+DIST thunderbird-31.8.0-ru.xpi 436156 SHA256 e2c21d997f0ce377a7ff9e660d54bd5d5c6d4225f764b0e47013b518653ba1f4 SHA512 1890ae5a6e2fdbb78706076ddb4ba7630bba30a0cdcbc4c327f503661624588678793c9aeea45f484810d849a41b4cd849c4755d95352b5de4f03afe7fe75126 WHIRLPOOL f1c16015dcceb18bd3cbfde622fa2a4b118e4a0e5da489d64233d9bbc097ac25a1464a9e31969db55e1bc79e7cfd1626eef3409a894f404b72fac55d41864286
+DIST thunderbird-31.8.0-si.xpi 528812 SHA256 3e421d61fd70ad882673eb5024a35e39e2375d9584736213bf38956d2504d8d6 SHA512 784f26b2d90cf04c9bf68e9083ef2e42e10106598b5c512a27d81f244fec5491ec8db7a80c8acf9efc250144c1b9d83b36fe62438d3d28704830f81f8c1aa705 WHIRLPOOL 9fd3a2e1cb329769566fc7a64cc3f17033cf374bddd558bf0c26dff44e4f74fc810fc2a587f4c02190798036db2fcc3484f77e19e5f55b4efcec82dc92a96a27
+DIST thunderbird-31.8.0-sk.xpi 452995 SHA256 e6172c82f568f1e7edc4ef77bc93fbca931e86a93e11aca12c6d31a4a5204b47 SHA512 5ea21589996bbff2d6d4fb43dbc87381bb2764cbcad9a0bf43f03279391ddfd2f7564193775d211489757a9e974db6812fab10b2beba2819857fde5d3ff3e31d WHIRLPOOL 7f4449b97d62be2062ac9973a211de2273363936d8101cd4b1290c1d299313bb62094d5f01cf11c3e6f3e6c20cde49e1195ef58362b5f0e001945d9bcfdc0dcb
+DIST thunderbird-31.8.0-sl.xpi 433874 SHA256 b8d7e069ee329f8e0dc66e4277134009c6eb0ec1ea80de6bcfda2997dbabea73 SHA512 085dfc6664fd8cfd7935d017365b0123e62a303e502c1f969d26f37d29257a80af0dde694465e97cc12d89457e8b6b1e35e55a75d297deae697b406330d71009 WHIRLPOOL 08c6c3362cc5aed2d74343ec0fabc3944b558b5486108cdc083fe6241d4d879acea4145a18db569015b79d8e44be3636e52995f0c760ac86fde873c4c5979231
+DIST thunderbird-31.8.0-sq.xpi 454695 SHA256 9b8a0b4e4a4f9c0e0c1a523dbdc809ee4e426c7920f8bd7e9d07ccd5da276e1d SHA512 5e552b84ce747ecfe73ccc157a40a4dbe208dca2c2a11eaab814b913f7fbcc8d2ea9b890a99b771b3410d3db9aa25e1cb6a4381ffa02217a274a88cc9c579d0f WHIRLPOOL 4c00fcf53ff3723855f3acbbecdb8c80dbe24ece501e73801ef77036fa65911fd759754a272650f8fcab0eca31b196df88fedfdf3cd4e5b812e89391b61bb65d
+DIST thunderbird-31.8.0-sr.xpi 537335 SHA256 69a86a8928970bcd6b5f8d11e469949148d3f6d1dd6e160adc52d7912dd29ac3 SHA512 aad88436c62ce746cc6855cb7e769cfe2612251e4a089e22ecc529cd0d377fd1a316204ba222ee5febae4da3126cc6562cb3332c2f9015f355d6f78b799702db WHIRLPOOL 9e6d5fb272e2f2e75e5ff5e30202e4ecd1c54309e2c045fbe68ba903ef4badec9def80b6e09e23d0c282bed5e9f7b094a77a3612119fc590aaf9a466dd66e171
+DIST thunderbird-31.8.0-sv-SE.xpi 436105 SHA256 8b98daaa42a9352b869332980194efdb5ddb653b920be49f98e9d2a635147314 SHA512 7b99be71678e3acdc20f4662eed340d5e1f2e989a189d2cef128da7b2a0adc6b0d6d3f361a184004c4163e07a45a5d369f6b5bde5bccd85274033d061642809a WHIRLPOOL 51315ec5344a7c131cc95a0e3f4c211b48679f8474bd0c4967580dfdd0d280d053ebd33f1bd1eb8a4231055892f57fe40cafcbd8561deac0e61ced230e563063
+DIST thunderbird-31.8.0-ta-LK.xpi 553509 SHA256 4698fa1d22c3780b65e34f0999d2f6c81d730c42b52a25d9ede7621570c123a7 SHA512 63fedff334f426fd08aeae6603a332c28c4acfb3e99a24fa8b243b0b5b875a2a77c2c4a54b8ee1c57f22ec87c26f45e119c515325035d82ed7823db6e9f21fbc WHIRLPOOL 635392c74c7454f472e228dabdff4b7111dbce54a1f87f0222844454acd2defca4e45c1832c7ebcbc21c8110c2d0492c095f7d8589a4a9cbf79a9f9485c3fd97
+DIST thunderbird-31.8.0-tr.xpi 457360 SHA256 f50bd19592b71cd077c01e4dbd577ac68fc57432a840010e171ec1e073c96d26 SHA512 4a1ae59efa98c7c78faaeaa122a4eee9025be7f7f56f0eba50d216ea003e4de0c58df8c2e88df962615b139d652f99aea1e4a21e3857ca464fc345eb0932ec9a WHIRLPOOL 1146e84ca6c015342797a22629721a77c0e2323eec7df4df8fb95ce4482781a7ae938e3f6bdb9e620d06d46e9810da45421c0e2fbfa9a34a15aafb08d4ac5ae0
+DIST thunderbird-31.8.0-uk.xpi 499656 SHA256 d5163a906069e20dd5e5b785dc1af32f69487c2118fb1208ad45893a8cfc4bb2 SHA512 761165079979e023bd37f5d42b9828cd499f0e6b161aae5a59daadbf433ef47144f1c8c348f99ac50e510052b136f36d800b0f8f2db5503a901bc40ef37e6e7a WHIRLPOOL 8f3b3c5263af87ec126145e5d1346129f6ff5536d174bfd49551f469acd3cfd9cebb0ef317b29a09b65839d32541adff4563e372cc94dadba9bb1ee099774e34
+DIST thunderbird-31.8.0-vi.xpi 513835 SHA256 9885e46bca6670d6659bc9ddfd4d41eacd4cfd13a0b95646001093598943a945 SHA512 8b225f0b8a4d1d1dc11caaec9d043ee0e6cc5a4e86aaf608819f94182f67fac15bb540a9a95430bdb6053a46faa79ced741a8565b1bd926bfe7940ea8e87ed80 WHIRLPOOL 1cf0564d6293676c68335becb5e0294f2304359091a104ab7219cbef33082d6b3d78221fd57859c90f4f334d1553d1ac9afc5fe532ceb8e425605755c17e7f2d
+DIST thunderbird-31.8.0-zh-CN.xpi 462668 SHA256 09116541b41128d53caa6c14c6c6607896c82592723d6990e1ddb0888868e1a3 SHA512 823d24d53f025bbf8cc8d6fdb6a8056858659d743a2fd5c1c2851d138183186d6fc5c2ff1777005527a325f794d68c76df4ae007227d946b3ac3d19a011fbff9 WHIRLPOOL 573e35628df0f671a66a67313f4959963aa8807c717dbd88e96e325f7d2cef17a6fe6e148808d4ffeb5309fa2af948da1ffea890e5c2759dbd38e25332047303
+DIST thunderbird-31.8.0-zh-TW.xpi 463408 SHA256 2bfd0efd2a0695733bf59d0a8f2c184c4798cc1f3589672f3095a77217d9bbe5 SHA512 cd71d2e4a08ec157b95e70a2ff7acdd62c4c21ac93040b6183be55a14d6b3a4fdf5f9915078ce2487d544d3a2dde3954d5aed40ab3276f72615fb4462e4974a8 WHIRLPOOL 8939d94d9d5ca7ed72fe9e05ebbde37090410ed9b3d1d7d2a8f5495d718e2904f516a5bc123580c87d84baba01bde6c359c66ee371c003fbfc5f65a02111c6b1
+DIST thunderbird-38.1.0-ar.xpi 475295 SHA256 8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49 SHA512 cb8fa60dd8531d6ae4c8015d41568dedab74a83eaa742ea714224f276a8a3d4d71e1cd84e6f4d4e17e4b09a6fcca8b94d2b885c4323776bdd037922b6b38ae31 WHIRLPOOL 37767cc83500f47b40f554cdbc298de10eca85887b80800678a4ac4cfe2afce7d026c52d3dbf45449b81300c407883f1aafc863c1dcc7a25cfbb8e1555c2ab96
+DIST thunderbird-38.1.0-ast.xpi 405893 SHA256 2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb SHA512 9de891efb22720b9c0b71d9290e4643528b269eb595e6f3d1ebcbebda05d061b6db4b49ba934c49039dcbb424db10dd72baf748469387fcbf7726f91b852cbd2 WHIRLPOOL 9782a065f54b748f259a9fd365b9b652b29c8d670552239d319981205a15ff911a7296eb24225bb93c2f987c05feac29fe06861313ae904887e469ff98a2c53a
+DIST thunderbird-38.1.0-be.xpi 442473 SHA256 0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864 SHA512 3a51c25cd27432d64b5980378019f6c5e455c657f3c72a0b72b11fde8cd04d51d9a09f1199e6539c7531aaebc85bc1016fff4e11cd19c98c2810e07a00c38c3a WHIRLPOOL ce6386e21ac5eaf9c8b199699d9d44daaa04aaf142436070824d6b90625c5ac410cf36a99e6241f84f0da2592e3fe420ee920997ddcdc2dbf096495133d3acd4
+DIST thunderbird-38.1.0-bg.xpi 506149 SHA256 806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a SHA512 6fc098efa1c66d3b847ba30e92c41bbe386d83bb2f3d9506e0555aff4a226f082962c5d377074c470b31aee20b917567d0e4816bdf94093abd4754830efbde69 WHIRLPOOL 5d51780c129379203f6796a2054e7ff4ae1d81dfdc7f6234840024591028f98cdfac9df7398d67a66f521f9a7d1273fe2240f33df6ada62ef9e92c9ec4adbfda
+DIST thunderbird-38.1.0-bn-BD.xpi 560648 SHA256 5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a SHA512 902bd6c4e55876ee2af76b8b4b60a1c4dae7a76a436e46bbfaf3cd9ead59a631871e6de561cc85e0c0e6953209f11719376a8aedb95bea911f89d0bcb48487f9 WHIRLPOOL 0bb2d627bdbe4566b3bcab6499fe3e0582a63060d0d9faaaa2545b0b1b7977744172af0b3ac8df4dc275ab5ae149ac0b0d733971c7fd76be74cd75afbebcb536
+DIST thunderbird-38.1.0-br.xpi 449788 SHA256 c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9 SHA512 6f65a0df88c83068746a74a0730cc306c8679efc3aab8db17a7baae90b289022743134b08db3941fe62a0bc573f372e41ed24771dd88d957ee99f57278444f85 WHIRLPOOL bc673bd36d1925e5b7ecd176a74481ba1c3cb7ee2957c9920dfdee870977b420e7b179a05c02cb51942a3695857d674ba03e5593ffeb21ab2def602a4f67eb73
+DIST thunderbird-38.1.0-ca.xpi 450347 SHA256 82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309 SHA512 914cc04784793762392010bde0a32228720a4ad76b9381e63717d32012b0b49b69cbd26b2616a14ba4cd057e1d70a9489890ee7f7e3f6bea85bb9874ddba4715 WHIRLPOOL 1cf1d2e27daa1fd9205e68bd7910c91fb0b999ca3aa3f515c8091b5cf038d935769a8b143e505efaca2f7d9cac2d673401fb94aedde31a9bb1c2c0c67ce61bfa
+DIST thunderbird-38.1.0-cs.xpi 448723 SHA256 a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca SHA512 268171ca2a3401ae13e711e5decf1bcd3e2c1b76eeee39390b155e73165a7b05f95910a65fc69005dc347abab3dca37177b067589cfad1e5928cc15aa45d17cb WHIRLPOOL 21f010619c319c46f988f01900969f48e6d7cc8e2be92803714644d23b4540a25f727f0bf866ba177400d16d5a614f9f91e580bed68c1abb84beaa7978d50b7e
+DIST thunderbird-38.1.0-cy.xpi 434848 SHA256 877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365 SHA512 acd4c4e811792d68e2a1f58517f9a9b07976354630f396ea994b9be43bca616bee05edf998347e87f542b85eadaf9a0dfe866a9e08a4f2854e29a8267a7a724d WHIRLPOOL aba90842e54b2636c7a5e8d599087b21672fcf4e8ea0e8123302ad8566e859fd8abd6afac258630938a08e0ca2e0d49c47bb52d535634e39f546aff1f6cc0928
+DIST thunderbird-38.1.0-da.xpi 425828 SHA256 fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526 SHA512 ae0f931ca42143ea154b0a5c8442f3cc7ea7c2684f90ead32f8f61ba520367ace19293eba21c6eb2f17a7f600bd75262098a972356ef3efaada8a40180327831 WHIRLPOOL 3dffc0d259e0877c085bc34eeb827808dc7496f97283c6fd9c5d82f20ab7fff6d0916da528e999ac7d00d0c89fded72ab14c2d523bab6f9e4060daed3bf5c053
+DIST thunderbird-38.1.0-de.xpi 429876 SHA256 bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e SHA512 9e6d9eb4f537d03627f5f9566a5c1c78b80e34706fac60ed7fdd32f071d574b9590df89751b1d0257fc8495fcea78682f11ced2130163151945014cab5a56568 WHIRLPOOL 2d19fcf7698e16588f929b54a9665f6cf71a7457d54dd331a8fcc5767aacbd0d6e0e7eed515362484fed2d1bbdb078be6928b6263242685b9b7cc1c6a20fe61d
+DIST thunderbird-38.1.0-el.xpi 493511 SHA256 d6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c SHA512 768a6ca1c5611a1cb712cced47f6678bf5c85182929a198a4885ad8cfa9359aa906d290b3de93e8dabaa2cfd1f809bff9601d12abcd3feece5b0c0e429a30f21 WHIRLPOOL caec8f093ff178aa212b8907ebc8f8e9cbeb66bab9e14e914ec5c81da9cfca6fc53f67a2ad6203ad49fc99e3e1ff62be8e4f2bef79e1d0ae9f9336b18c5584a2
+DIST thunderbird-38.1.0-en-GB.xpi 416571 SHA256 07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81 SHA512 b60b0b2410f0e61d491db9538530e6eca40f43801e33b75ee4fcc94808893b81186cd7d759549fbb0abfad38c5d03c38a358a2314c48558b43164d1b62b6687a WHIRLPOOL d0e6237a104ac78e85a20e0fed5109d3a36ae0d2920af72c01f457b5c13b8b4a457c727b00512bf73d87d96c68d645678097c3e99eb0790465795262431bd294
+DIST thunderbird-38.1.0-es-AR.xpi 442640 SHA256 c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d SHA512 9110f799b42ef8fc629f15849588b60fc3cde6e58286cb61f17b26b0b5c7174bdd25ad324badc1909f6329000ef987dedbb485e2a7e42cdf9563229ef4a562fb WHIRLPOOL 37a08ffde4646e5e34b9e9d0de912271815ee85fefa7325db9df7cf7f40ac0856cf751534a8b6f25c45c06453f2cd188a75d5b0b32275120229e28f7fffd4de7
+DIST thunderbird-38.1.0-es-ES.xpi 376066 SHA256 79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0 SHA512 388f5b8d4713efd92cec581fded9a90a6bbf80958f77fc1b40e533851ecb2bb5d3c16a3ec74fe448d2a2db613d08bf5ffb42d150426dc846d34694208d274dff WHIRLPOOL ce5757a6dc4698cc5942da060b2d5dcfc73469a9a38a7d60890bf37a5c16f462ce3454599de88f1b6dbd82418cb0f5a7987eb3d24d3deaf787de08c96d1112c8
+DIST thunderbird-38.1.0-et.xpi 438262 SHA256 9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d SHA512 56cf66e23983983535d86b1d772ba133b93b6d45e05768780ad0b471b9c284c9a0bee466dfc162fa8d53e83b87bcb86027e23b9bf4491df072d5b18e3d91c86c WHIRLPOOL 3211c433fe48be15600c60b6c9b9d186dd740c858d0204a647d16d17d6ab7942191bc7e33aa04ab8271b906048f8c5c0f9c648e4859f118282e01b744ab5a382
+DIST thunderbird-38.1.0-eu.xpi 434837 SHA256 0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0 SHA512 55f2202ae4a3d52944a71c06a9faaa9c6be9ddddcffe6f8116dbc8283dfec24d5cf0f6dfc28f1c2af2381ddab5427bdb1e4a821356f13ae54268e35084bcee14 WHIRLPOOL fabcca0cc70d928a203af9498bde229ede4d75bea39020a3baed86595f59169a787659dde6aa9a8266c5ede06b4e4f93a2f3dfeb546dc5420a320b919bdf5f2c
+DIST thunderbird-38.1.0-fi.xpi 438889 SHA256 cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729 SHA512 5e7ea275f05dcec6e4786aa2861e6944f2e80ed6f36cfaeab42484ad11e218be620ba9e72fe1271f304b3c9bcc2eaf08b5e1f5ae9f64fc0440622f16fd139d61 WHIRLPOOL c8d5cc80a791828e8e1881dfc72633373742960874a0b63aae4504c2db35a1e172808077e8b295e001414707a43c3eb9590a23c64261e79ba68971f181b76c49
+DIST thunderbird-38.1.0-fr.xpi 448227 SHA256 56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77 SHA512 7c38d209a3be6a49e0777df74e56107d149bb28a8071db146556c0aaf9f3dfa5dd34839cd64311d2db3f543706820cc3058d9c14e3ca216d9ed5339d147fd113 WHIRLPOOL 70ba05665af63341fb4ae510c5959bf861b9b146bd675a2d9ebe6b2e19fb3562f805df4281ac6de4a863ac2f1782d307a403012838ef3c77ddaf82e6de81b0cb
+DIST thunderbird-38.1.0-fy-NL.xpi 442161 SHA256 00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87 SHA512 2797c569cb1466e65b090975fd01db88065ea4631c740ea37cc2ca2aff3fe31fe746cc463738440618decd8899192839c3cfb8e826ae73b7a8d3ebedfca881b2 WHIRLPOOL d8d44b1b8c38da2cf336b3b3ef127d54c67295cd061be38a2443abac18594fa3cee668d62d044f720985e9ce96bd5ad8a69aa7fd4522d0f19ff0366737cc2a5d
+DIST thunderbird-38.1.0-ga-IE.xpi 457412 SHA256 76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e SHA512 e4334a33f704de6e1e51a342b165b42c7a2c5fbbb1f74ed4532fba20098adc9b23a8b4e65f48bb995117d8e8c59a9b4938b83af4ec1683d2ddf471365eee7c26 WHIRLPOOL 0a3b1cfc1bed92403e37117944070972ec7732c7593239dfb8554ef779aed600dd0b7c0f1f276706d61659a31d63ab70be58a89a0c5a24570d6a894f1087467c
+DIST thunderbird-38.1.0-gd.xpi 456317 SHA256 1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835 SHA512 37948f8d660f71f4bc8cfeee8fd57b8e904bf0d82844940389bdd92647743861c6b55b755d38be43c0e17a19c80963bcd19f66b7a924ec1e1482d654f392809e WHIRLPOOL 5bdacf218b791809ac28b936a5809cad9737873e325d63ed4eb4f6137fddd28912854bbfc802c9916d58304ad2d9c5c547fc9bef2886015138358fed846c29ac
+DIST thunderbird-38.1.0-gl.xpi 457860 SHA256 ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3 SHA512 56bb87f1df17f25d5067c8c0c2d450066970d316d0cd67d3e8b51916f999c0b25e7fe5d15de506a01622095d724b1492d760d1d1c3259a0b16b59628019dc116 WHIRLPOOL 9395bdf33dd6c634bb9727442e13ffbfb41cb145ba17f04387798770ff561a04a5bcbd470dbc4830b07323d5a6c334240b8923db900746c1cd65a21517f72dc8
+DIST thunderbird-38.1.0-he.xpi 485888 SHA256 aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41 SHA512 9c42ac8fe730ec61adf3304281d49757a47dce6e9ffc9c233368d5c4187e9314e943f167435b5077285b1b4f647a2b13f4d1c691c738f74635b225c9d389a940 WHIRLPOOL 2ff8a0c59153cc288389ee777716afea3313402a2815dd18e8caaa9bbb0a8d48a6c6e911aa7d3b0bd298e6cabd9052fe067c507f1d1cc458f28b89a944b0c34c
+DIST thunderbird-38.1.0-hr.xpi 440419 SHA256 f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a SHA512 193270f7567d3c44d27e04a9ae8aade37ddef7c38f26965bd2aedda8a6803f9f6d69a5899f8de7cefbc7ebd4ad1aa54a840df21ed51dc2485669e2c0339d6d2e WHIRLPOOL 530087456acef4d1f2d4d8174a826fe1533a8ac121377099993301f9c373a2b421fb9508ebe34de90b5594d81cc928a8f48bf04886180eaddf111aa396962837
+DIST thunderbird-38.1.0-hsb.xpi 456454 SHA256 f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a SHA512 734ce7c3e0bf0f030da540f5acb1ae586c27a41474c718ecb911b03449130c6753a0c37202b232b83c9b6943bcf49f1f8e57bb945e580b15c09ed50becc5157d WHIRLPOOL 8f712f5f7202991dd22262b4a5406d04b20f764d661552e30b43cb561c06217c2ceb4819574b7071c4b67f7ca53d22323064300a97152323415a2827bbb8d4d4
+DIST thunderbird-38.1.0-hu.xpi 457987 SHA256 c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf SHA512 84743fc8e8f272eec14a9341f08688c07c36730813f832e27811e9cfa34b30b13c5bf197b1ac41005724ff71ef2c9d87384066de385a60c888f794859e8b0547 WHIRLPOOL 562822eb2fa08d3323a51c2da47f3756941f0b0851bd191c54ea50ea58058fee04ea331ab7bfdf8d32547f2b43498abdb5d8bc047247736ede03130c5c33040c
+DIST thunderbird-38.1.0-hy-AM.xpi 500379 SHA256 56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c SHA512 57fcfe8abfa0d7e3c109bbbd54d6e7d87affbee17bff3e0c4054790a8d80400686f785b0bd02197b8845a12d71be59e03ca09ca9c0f6ad2228ca4cebb2ae2583 WHIRLPOOL 0ae42cc1d667776453b110c0d9e21f1e8c80af7cf1d0e4b9a9786d072d707cabea398223588eb120d9d6a0ddacead7586082cf26d3c26162eb365d0250b062b3
+DIST thunderbird-38.1.0-id.xpi 483209 SHA256 913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321 SHA512 921e941c2ba48f71d0051f64337dae777ece1b4c431c770ffb59dda77d3d6affdab5e1325d3735f185c2e6036a8bcf4654669dfb5e45223752b5182042293f96 WHIRLPOOL e93b6acd424ca87c91c3172b19e654a5bd97f0fc1502cd0cbe8baa4fec68a9933c0bff37e99d1090211bfa7da97aa21763b5374be6756ae8a2187c0ae7c9dc2a
+DIST thunderbird-38.1.0-is.xpi 443008 SHA256 0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970 SHA512 ed917f0509eeec67a02c633551c1eb0480f6b4b9ce4448869bd99d9269979a52ac1c450bd8b8b27338f481c0a46dada125474e0b0d27f04c2ff0320488fb8e86 WHIRLPOOL 99f202a528e2aefbbfaf963448f846afab231c9bd1c9ab100f658636594633df5c344b0c5f6f106ea80d557588c640b661a054c6734f8456ea1864ea59de9656
+DIST thunderbird-38.1.0-it.xpi 369023 SHA256 2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7 SHA512 1ab2b5255fd9e5a5b8040d72a690ad7d3d92189f0f55ea175e0b6982dd4f14dc754129821c9f208979ee33286509fda1343e51474ad259fc078acedb3c91b246 WHIRLPOOL 49046c224a488b5f967aa4161d5a7c6aeaac42531ec4a6297cd37805de5288f8b6bad06522ebeaac4358fea5d6fc9533e223ba22a79920f27a2e1c587ab132d0
+DIST thunderbird-38.1.0-ja.xpi 492860 SHA256 c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257 SHA512 4b14e14e3be3d7d4839c52617200d7c2d9dac3f7e7f4e9e69657f51b42750a1e9aa1b23a47b361fdfe959f66e6adf5fee9fed73f3f80588de77c532376ca69ff WHIRLPOOL d6ae239e45c3646748315aecea853407f75bec6b155a0985d93236209167dfde2462d5aa8d7c3b113ae43a0119ee49da527f9423629a9ef720885c61ce8e6b53
+DIST thunderbird-38.1.0-ko.xpi 454852 SHA256 42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951 SHA512 f85cf05450159b0680463f64e0aef47fb1c257d96d7edf69bb30cb1085d4cb2791054ff1d3e8e1c457bdc495ab3400b1fb87441b632518fad2d75b96f6c9a479 WHIRLPOOL 2980c6214cafec7d72adfe415ffaa7073a50b3fd4cf850646476745a972ecea8921205ef5ec36442687b77a9b3066ae42fe9baf2830db7193627e8d3e1e0421d
+DIST thunderbird-38.1.0-lt.xpi 454571 SHA256 bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad SHA512 48105894bab38f2172f8f2d0c827f602ec64c0bdba1b42d118605fc24f08e1389a19fd02bbfd5d87144a952622a4c1cbacad4e7ebeb7c4ee61e012981cb3fa55 WHIRLPOOL b2c300b0e4cbb4ad295862a385c14b7f650c2af612629fab7254010cb3fdbc8ea94e3bf7bf618ba3793e3dc97ce585f320e2dcd5ee9d3980a27454c51d6e0d1e
+DIST thunderbird-38.1.0-nb-NO.xpi 434340 SHA256 e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3 SHA512 45cd2f27ed20fc4dd9524637b23dda1540436f6c1907593a542f534c5cbba0b550fbaa8fd392f253a43be9e1e7f44e5e4efe3173448c0c474993df99a05d0f34 WHIRLPOOL 51a7bbe055d4362ac957cc003e1fae5d695e2e1795b57b9d18ec370f174e183e3c49de12b459e6541f34f5552981a17883fca022655c0487c8e782dbab8ae980
+DIST thunderbird-38.1.0-nl.xpi 435107 SHA256 032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d SHA512 109d4350fffd9fd2f67785ca1714ca5f31059d1c123b58fac167f25326d360a7119b52acc5ad414d9b5d130437ee6410d3f114a2672d9be72e00829dac6d9b7a WHIRLPOOL 2e7d7f16c7ffe06e94b6c43db8861a166239b2900721167703a8091dea8960a6de9680c70590b8b22f4fc785d53e84bf067cc91aee0d5dd5fcd5725fa4c01995
+DIST thunderbird-38.1.0-nn-NO.xpi 436622 SHA256 361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29 SHA512 b76a3a779dcdc0239a4af5cf05edf522392a67824d756708dfe9d4e9e7def38ea07e4e2ec622bb7fd44c57bb91e88136c978e2c215f9e03d1babaa84d5203bec WHIRLPOOL 5d05d6c8bf9e2213994504720434e7781618da2904299d3e9b9ae45a897a67cba0a41e9577ddc0b9ae2dea1b5b3990e01596cdb5097bf34d754d1207cd030b61
+DIST thunderbird-38.1.0-pa-IN.xpi 530483 SHA256 53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e SHA512 36d63c933d5d37a4108158a12a9010eb90f62c3c7f0dc3fe30c9e114ef6b8c858d0a72f5020f177d4c8b71391f419ddff67fc071c04a08cfbca2383f940fbbdf WHIRLPOOL 8c0e41dd39c0229a8ea70d256a176bc3bd31a79e071b6afd08ba7403627ba8b02ff47fcd7277a97bcc2a06990be6bbb6f785675944815360e9dd0a2715c295dc
+DIST thunderbird-38.1.0-pl.xpi 411508 SHA256 d9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503 SHA512 0a1ab6513a3ab150d0a249e61027edca34bfb42c0c6ad3480f2c9b43493f37610f0ebf503d06e3d069207a491d42d9aca544afb54ca2f2f3fc78e48171b82979 WHIRLPOOL 59c4bda706c1bf5b9599c4567339bb5f95d461dccec4d51ac8be98ae8104e7962033c99018bfec375d7773ebacfe2d8c1fd6bbb7caeebe09b51fdc095a8ac2bd
+DIST thunderbird-38.1.0-pt-BR.xpi 443773 SHA256 8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0 SHA512 d36e43092058e352a0c6c3d605cd48c80d62266fe5ff6870a8032b3ae8aa7c5c779896a65db22a4c331adfe3b31669f160ed33602cd6d0e1635442580105f5b0 WHIRLPOOL a6439044cc8b936d32f113d93b305424c7c3a1e5fe6954291e08f932275d1afbfa9ebe9e7428971768d1294d51a69cd0e5db743316c70a6cc8a81a2b4048ddd8
+DIST thunderbird-38.1.0-pt-PT.xpi 442063 SHA256 d6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe SHA512 451c6221d5a1acac6c2b68f2be0a833486904cc8236d1cf68000b4ef2c2e3bab1ddf623c21c67f6335bfd7003a92e1efc84f5961e452907ab39d934d4bdb0316 WHIRLPOOL c93e1c58e8ddbf7c3adcfc4d92037ecaee99f24ef3f32a35b51e4f9f59698f1865dfaff9290e613867ec391c5f46a6a84914722724f326529577b892ec1f2882
+DIST thunderbird-38.1.0-rm.xpi 442112 SHA256 fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400 SHA512 b5a9435a3de499154b5113f48b59c7caba6d216bd17d74d41abf9cd308f7262392cbdc9647d4df4958d9a8c770cc6a0325ee50b6f5a7a9c2bbfdac25cf414e10 WHIRLPOOL d3c671ad440b88bf6de4009bc86994ab959f5106629a13c071566fd79e748b2a63ac0add8789950545619bd29f5627f0bac2f57d7104d3c004e89c0cd727e245
+DIST thunderbird-38.1.0-ro.xpi 448347 SHA256 2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42 SHA512 4c8d92655e25e3aa897d6ee82ab603867ce5ff94cfa3a9905752406b01c4e21f3555d3925398d36927bb03b409f963484303ae281f1865fd8c43a4dcc3943b68 WHIRLPOOL efc5fd7df29e3b76ccd17730dc5161c9f208d386e8e32fe2cbd7a6c07d51ce4ace8bf74d457feaa86a3a19899b0ae5338f0144981cb726ec96dfe06fcfdaf477
+DIST thunderbird-38.1.0-ru.xpi 437591 SHA256 85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104 SHA512 0af66f2923376e8aa3d646923347538451ef8239933052a5f6b984e7b805e2d664881613ffb805b000d04b02c54f8e59ff7138f9f0d68f7c327ed5657df21805 WHIRLPOOL 6ef4ceab17f8ec824f38c7eb3b41bc5f998239928ec1aa4796f296d03639f2780927366ae715459b2d43ab30550f8a9f78e723dafa25f04654f423baca845b05
+DIST thunderbird-38.1.0-si.xpi 535362 SHA256 8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25 SHA512 ceaaff93b4b55961d5d6a30aa801d16487193bde9c42b5b58a57cbbbd3476aee8c3955a90c353f30121480d738d2b8bf0ed40cb6132be3f5d0ddadb47bc088c0 WHIRLPOOL 3e65b4a10d0d948b3ccb1b8728c730c797486505b2a5557cbc14e0adb1fa8f60c8638161ad94bd5818db291190c06b4ceb3222445ff66360e7e502957bdb4fbe
+DIST thunderbird-38.1.0-sk.xpi 456606 SHA256 8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659 SHA512 d4078fe186924846b3f98b76518bb3aa1075b7ad023060ab42f680d0058a5f5496958b2e6038cb8f52174cefba7951d3608b40d806a978363bbd9a212e4d1327 WHIRLPOOL 27ade9ad8d1b9e6524b4dd5b6f5d354b28f1af4c72136569c1127a0edfcb256c6ccda33a2dd6fbc32350d1dd15e9e5843a45b67f82be81eab633ebd48332f446
+DIST thunderbird-38.1.0-sl.xpi 437847 SHA256 7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66 SHA512 bf5f55c46957297d56d3c061552c18ef42e5c39376d2a69340e052a6cb4f9be1685a3631263102444317e3e3d74a83e16498619439a8bb2f79bc64187c84c683 WHIRLPOOL af214ee8d40ba59535047d6cebea0135f52df57ab3d28f17e2f7e665c22408b858f37d41579fbbb20b098da649a46ab687ffe087d8ab1e5197f12db961b95431
+DIST thunderbird-38.1.0-sq.xpi 446896 SHA256 0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6 SHA512 41daf3b6c0b30d171017d9ac929de4d31ad1e9966509f319a2ab998865e699c7c433f8a6158cedf93d06e376b78ccb4d20081d7de50023590670ff18e21d8f94 WHIRLPOOL a1c6a72faaa7d9be63cf0bb30ac131207f3d1af1f8c21c5d18662141a6b44d20a9046ad73a7dd8829aca9f89fd01ec56db55c8e55e04d29844728ed8410d5ace
+DIST thunderbird-38.1.0-sr.xpi 543336 SHA256 c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee SHA512 bcea2e30e0cd9a2327913fb472537fbbbf40e179270859cb3739bebbb14bc91c15566de46d0dd3a2f867944c68fd06243f5d2530d7da1b70b1e14186db5e46ce WHIRLPOOL d3725d45a9d8e811c956f584603299819a719b371dfd5d69d7e4692d106379078b2f33d6581e37f61097196e52797639dba8a4b9d48becf114976765b27baf33
+DIST thunderbird-38.1.0-sv-SE.xpi 439633 SHA256 59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133 SHA512 455ac778423c502dc3b7512312c7838b03175fa46c541a28ef0228735a8e13fa4e3f0cdeb1d1b4fa5b147515d2789278d3f9504f86143d99fa444febcc90ed66 WHIRLPOOL a5399a91265c8bcd9042cff5884673bbbd0d1205b32e70e9f7d4efcaa55b08a1ce9053a177bade67ab30f0853172ebcc2c7d979756c752cdfbb2c669f953d19c
+DIST thunderbird-38.1.0-ta-LK.xpi 558759 SHA256 891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f SHA512 eb9fce88f57b0b2ea2ff79968a502dadf757483688d498bdeeb64a2a1a5d5d33918adab3af5aef53dd15fbf9c18b4f6196a64580b089d8fe84f9d9180146ed92 WHIRLPOOL 494e95f5ebc90872c340b65bf6b65b7640863c6033dd36f5ef84fb729031ad485a7fa9b8b16b536800c959b80da024aa6563507c09c95daad5df6ffba407ede0
+DIST thunderbird-38.1.0-tr.xpi 447799 SHA256 5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc SHA512 8be8b566c9c53f3bd3ab4f6121bc0b4f5c8c718d2ec52e4ed7bf673844668cfd35b44c99a7a96703fb7f7dc26c8eb26ed50cce5428fc4bbc2735d57709dbe8e0 WHIRLPOOL 5359fa06fa12527a9f718c6a35be88eb874f41206269ee4e71b2ff5d96285a62c030d041eb3284cd12e9d32bb1563277c36233c3fa46eeb18de5d8bde673b974
+DIST thunderbird-38.1.0-uk.xpi 509621 SHA256 e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1 SHA512 53ee0b14851faf57127bd84aa2a9113b05ada16a85b81f589786f264819e79c93e0e250ed46405cb94c2cc7b509a5b85ab92071fb8876fd03e3362cd613869ac WHIRLPOOL 78e834301e45df4940c1f1d9109fd629d32c1ed1120365297f709019c294d6e20cd75edbbce318e435ff7dcbd1fb1273cd318e25b8f05868adc64325dea916b4
+DIST thunderbird-38.1.0-vi.xpi 519864 SHA256 6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626 SHA512 baf9551168ad25f6fe07be1798bf9256313211d3722a18e49ac8f6d4f266ea9379be1561ac5a4e798ac8c908cdd143e5423e3f81e57d7ad074577ec191df5c12 WHIRLPOOL 067a004abf19e12b6e17d1e2d7b54d19037ed53906e2c1fa655c5b10ba5474d71926d566a7254cf870a1cd2e3e8e6b286f176b09c971bee75ef493d26320a883
+DIST thunderbird-38.1.0-zh-CN.xpi 466411 SHA256 9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b SHA512 f6b42fc98b12bb821ac86c1e860e4191636d67b1647810fef45804fe4530131531a1b5e3a0212fa8a97d53c2d89611fa3f316517f3f1dcb12f8ebd4f52c3225d WHIRLPOOL d8e4e527a19883aa64fc19b55761fd2506464c3223f1ead63943c3564bf5228542d2639c52446a738ca538a13e913707ca0ade4500b4e5e500ab06f713182903
+DIST thunderbird-38.1.0-zh-TW.xpi 466660 SHA256 65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca SHA512 9cc890a50c5ba199e0a1fea9b9245895b1bda8f9a73e38c60191536113a960f8eef9c0d9c46bbf6b06451109fe60dee4e88136520291581229b8b302dfaee4a8 WHIRLPOOL 9e47e59b80ab8e947e8ecf8f0a02e76a9b1b92916701582e9c2995bf1eba8063497f05abb2ea75df05cff7181970357db24908e43fcad003e19138aca7a5a939
+DIST thunderbird-bin_i686-31.8.0.tar.bz2 36887073 SHA256 b0dae02046e97849d8e0136787b823a05ba38f85ac757b549f02f2672608407d SHA512 542d01ebbbf6c63c6d051e98964614aad628678ff9089382a080a8fecea8f84f8cf5b9bcc68e89fcd838c0c74cb9947de41eabf850be15b4363c94b35bb16e5e WHIRLPOOL fbe97109c8669a9aa7dca01942001ae59b7dd2af60394344428c26746d83d0e77205896faee1947c8054fe3180c8c2b1488263c6cfd2b9e33553ad66d007ad4f
+DIST thunderbird-bin_i686-38.1.0.tar.bz2 41827825 SHA256 3ef348d181d5a8ef35dd2781ac468e365878139e67a9c34fa817055928b95b3c SHA512 fffa54cfcb1f7d1cf932b2750071e9dbd254f53e8cce5959ac137c76000cc6978850fd96728b7ea6a7c30894c536764c91dc9c621c9c5a8599a65157e634c763 WHIRLPOOL 1d5f55fa983e3653c8ce253f9d6ec8c4485d3551dabab7416bf31327d80bb98f9701fe9a280e2b95b6ab53d787dd66a858f8eab7d80ff712c5674f3edab3005c
+DIST thunderbird-bin_x86_64-31.8.0.tar.bz2 35851678 SHA256 5e2fc9deb0726f5d1b685bb64e28046401468a8f8249e599a6a0cd003b105d62 SHA512 ce81356925208b92c06211a1568dbdf2a494c5bb03c7d37e5c3d1d2a46a83b817725e6f2f3bd818a811ab3404885f44260a9b892b7143fc505d04f23470a584c WHIRLPOOL 585e8d6970d518ff1067fa149dc59762f2f70ba8b54e459c264213fcbf7b9e6d90b6ce8f5a8e465398b053604d484561ccdb61253e2b936f49e2527fa4e28855
+DIST thunderbird-bin_x86_64-38.1.0.tar.bz2 40621448 SHA256 b974434ff479b800ef969063fc930b197f606bc3b7bed4e2254d29e65c52916f SHA512 4d5dd79f4fba2fb79120a8cb9c2bd7fe7367bcbee2e6211972950f3ce4763fe834d2b76e76c09f3891f16c5ea91b7b181c50028cc829f1be9cd55b289a3a92dd WHIRLPOOL 17b25cb1dfd14a3193d6f8601063194288108ee371644ac8f3c3da3bff82f7badbca25cec75de221066844fff529f7f7fa487cc04a8b11646c4f6536edf9b966
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..898de1be8c0f
--- /dev/null
+++ b/mail-client/thunderbird-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mozilla</herd>
+<use>
+	<flag name="crashreporter">Enable crash reporter for bugs</flag>
+</use>
+</pkgmetadata>
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-31.8.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-31.8.0.ebuild
new file mode 100644
index 000000000000..81c1c29a9982
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-31.8.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MOZ_ESR="0"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
+fi fr fy-NL ga-IE gd gl he hu 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}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+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 selinux"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="virtual/freedesktop-icon-theme
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.72
+	dev-libs/glib:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	>=sys-apps/dbus-0.60
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	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
+}
+
+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}" "${D}"${MOZILLA_FIVE_HOME}
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${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 \
+		"${D}/${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() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild
new file mode 100644
index 000000000000..a005e09337b6
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-38.1.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MOZ_ESR="0"
+MOZ_LIGHTNING_VER="4.0.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}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? (
+		${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2
+	)
+	x86? (
+		${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2
+		${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2
+	)
+	${MOZ_FTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+	${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 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/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	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}" "${D}"${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/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${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 \
+		"${D}/${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() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "If calendar fails to show up in extensions, or if you need to force it"
+	elog "to be reloaded in your profile (ie: after re-emerging ${PN}"
+	elog "to enable or disable locales via LINGUAS), 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."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
new file mode 100644
index 000000000000..8ef85d553720
--- /dev/null
+++ b/mail-client/thunderbird/Manifest
@@ -0,0 +1,182 @@
+DIST enigmail-1.6.tar.gz 1231111 SHA256 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d SHA512 877ca75a0ed1538f156307dc181ce8808deb96f58250d26d4d2c1f474d637959347c2305cb3b8f92f12d3ebd95bfa9d4d35aaaa1f4670728f205be7ae76852b8 WHIRLPOOL 91a11a81cc7b4c05c4a0a320284bc362b13f6aecb4fb20b04f38080bffbc5b94ab1913cf7e2d4480a452a916fd0d4297830ce0ba36867c7418b11deb1e060b06
+DIST enigmail-1.8.1.tar.gz 1592706 SHA256 15b621455fb945b0ff1a55b50bd75e8bacee8650246fb9cd683b55b8d17c6dbb SHA512 5eff0e8ee9ed2b4def956ad6ca83db47f3710ae2937cf7ec6958e8b0f8941ce01c3c99285d2c127465c6a99ba4aeb4dd56cfddb996c5dadecc4872bbf63d857f WHIRLPOOL 952de0cfbccd23ef0e7862360909542ee955c47b7f90353cb2743f95f9f0da62f73981bb235896c6c91aa4fd5a03e3477648911b562bb27191002dfa452433c7
+DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
+DIST firefox-24.0-patches-0.9.tar.xz 6576 SHA256 615b47ed076ead8f6fe8a9cc8b51ae7615bb8fb404a3e7254190e73c6669479f SHA512 caf76c23e3ad4ae0fd9d240d4ee61c289bfc727ae8117a17c27396d32ab9e06512cfa53da86c99e6c2d941eca96e18c41775473f3c4a16cf8c91a2e8dbe144ad WHIRLPOOL c0104c84c20a28b945ce2fe5a22e00ccd412d00bc38e4d51583fb47765bd639808db1a1bb52be9b7515423437ae131e12dd5f837b35d8e2e50dfb86341446396
+DIST firefox-31.0-patches-0.3.tar.xz 6004 SHA256 1ca282d9b58e611c395fcda508bf0ddfebfc91ea6a6132b59f1acf90566f663c SHA512 4469ccc3200955bb790a177352ebdbfa5c2299581bbbd0d83be4e2e0ccd5cb850c5023f3784dfbb3cd5d0dbed9bea4b533bdbe1627e42ba60437b4743a0e8fae WHIRLPOOL 86b2da659dcb11f34cbb6bc966d7f7ab79fb3f8f3584f929ea50f7893bf84b01ece435c4598c05b538d0719fb0426fca51a1cc9f9abdecd8b8e8beb5109cc899
+DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
+DIST gdata-provider-1.0.3.tar.xz 55860 SHA256 2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb WHIRLPOOL 2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f
+DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d333354c9f6b469c95ddb190fa04fe14a54a WHIRLPOOL df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
+DIST gdata-provider-2.6.3.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
+DIST lightning-2.6.5.xpi 3645840 SHA256 c4bc84f7e21148d6d06f4f61de70c7b4e331b53dce12979309e91294d4289b31 SHA512 880002e1c01a06b22ca20a120a5e4d893c364b058d7d52d12dddcdd3f4215652ae2c20332c3ca29fa6c5012df71330abda05bf3b862485043ddd481628ef801b WHIRLPOOL 5003a341a174cbe7da8b069d9f5d6ade0a7c0e8d842a0c25f74702e997942b3ea43be1e0eb6913d75bc78ef23fb2ee57551860d02b331db039cd6adbfcfa1f5c
+DIST lightning-3.3.xpi 4226096 SHA256 eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34 WHIRLPOOL abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
+DIST lightning-4.0.1.xpi 6637522 SHA256 a93af3b8548a82e5709ed1c0d06d0a103e3fcdd5e554b1124e42166a814be3a6 SHA512 ed8ae62eb6b339a4108756934142dbc2aeb7e039d6fd856067bf3f24ce5a2450336e281dd018b5a14c359c5f58fc20668e5cad4b3929955572f44002be1a940c WHIRLPOOL caa23550eab6cc8f4b8ec63dd6c34282944cb9f150885ab2120d315db0910b640fab3fdb466d97cc7e15364e88bdc09c7041f107d11bf508f361979de1bf2722
+DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
+DIST thunderbird-24.8.0-ar.xpi 457862 SHA256 e954ec8c64356b82006b01f3bb30d247994ce81f37a7e96de93c606b464c55cc SHA512 f8267f4ef885d900e15bc8609503ea6da37dde39b17362b0e35d384ec51416847c4c898a638708dcbc792bfb1a819bacc1b1f9f8bbff45623ea521c902929cce WHIRLPOOL 8116a679e37eae740e880fcadb48ade6d49cb96732a4f4212038f1ed03c15288219fc7be9a308709a658882872dc79aa794907643df7ab2c139358192635eb98
+DIST thunderbird-24.8.0-ast.xpi 373831 SHA256 acdfeef9612eb4ec261ffadb8f5ea494aef4200f9758df55365646a99a6bd47c SHA512 5968a948bfc69f82982890ac3414fe6d9c8c587fe9b815dd29ab3d4a01b27e67d99270d5f915f5c86edab430fa3c4e57ee2dae73be1d32bc06088831180d2e14 WHIRLPOOL b3edbf4b1f70df7d8d08e24f801b82961174b5e78b0d8977b0a070c18a4dae0871063e0f177f2388b8dad1589a2e33d0f87a876dc63bd3f558cf645dd3d46718
+DIST thunderbird-24.8.0-be.xpi 416882 SHA256 861ec1313b6e53138f6d077f48315d99caff08057054c73416ab6fef37ac5ba6 SHA512 112aaff5a25495684b0b30a92ea9c97f3d17edff049e4b1290308d3a5cea0217a8e0831cd79489364d6ada96bf28836e061118cbfaa5047bd74ecfba9532374e WHIRLPOOL a8eb9a6be65d04b8d2615e53182e40d93039a862c41734b2b67282819d2cabc7f8b3408a48c792d25c2c213a3341bfbb29f4830d9b3cf319a0a56cd33d5101ac
+DIST thunderbird-24.8.0-bg.xpi 485024 SHA256 8eab0f0c8378a767af1a3b6b6dfb695bfc21bc21b1fa7a4645a31caac3702a6d SHA512 4eeec990207ebdee06b7da3b3a7fb56d5ddeda76fa298e5004d6e0467684cedf81546d88545b6ad814e692c986fcdb834a0186af361537aa4932a7a6a965fa55 WHIRLPOOL f327828899f7a47d92c087401da72f8064e0f3c88142b6d806d457cb99dcba65711953c09067dacd5742e4beb9ece1768ebbd07599e7471d91bcc4cb6aa50e7b
+DIST thunderbird-24.8.0-bn-BD.xpi 537258 SHA256 647b426bf71da4580e83d2f286742897b5ab93aede2f331f995c18a3fd42b03b SHA512 7836b6a15f8b9ef5dedf81f23c59cdefe45982ceaf8dff97c67dcef31dfb524fb77e3e4c5945373b2d6ce7a66ce52abcd963f8dceb135062118063a1e91de996 WHIRLPOOL 75677adc8d162c6f30e3a7f111629945a9031c81a718e51e38b1df834d747b64494d1023956aa578341096e1d3341921bdcb52d3d800e81ee0328d19a39c4125
+DIST thunderbird-24.8.0-br.xpi 427680 SHA256 6eb9ef9f9e4cdbf631450aea2e668ebfa32f07a9acfb5676178e47bda0202d69 SHA512 1c7042ed95b172e0cd6700e5042321ee6fff8f9bae2c14f68343e7807b869f005fda1dcc9027fc32621e3fe11c5c9dd55281ad053c0f860b399d4a7af123c1ef WHIRLPOOL 44fe3e29f901b4af8cacc0c0cc18225593e710f6e3b50a43108ae06f42cfe895434e252140ee4772ee577e7dd61eb9908450a0b188a6099022af2696d42cc06d
+DIST thunderbird-24.8.0-ca.xpi 429746 SHA256 fd754a7a6879684fb2996fc9584617b4cf5276569f0c9d6476c773e13f3f0f78 SHA512 d0cd58fb77b4ab01c55456f43ee445851931cd52abcadb33cb4d5c93fac65757b353fdb52a090222de5a938a92349219b075136fbfccc9ffbe92d56f67b6747a WHIRLPOOL b6d9ff0b2998d2f18856ae8d63707d166cc4862ee1bb669fb338e8f2511276b9c3715bb7dc6f3d32770ae8b26d5c4a9ccf1928b303dedbcbdb81b866840b495c
+DIST thunderbird-24.8.0-cs.xpi 431476 SHA256 199e2ff2d93ec03fbc1bc0d3bb783f052d6b28d7fdbb0901290075ba94a9a073 SHA512 e1e835460369f018e8f8ea99853949f4d3aad21d4341343048ba218bc30cf81236e7c6fb20a565a0f95dabc96ad961f23c7723a87c3752fa22848df1cba13ecf WHIRLPOOL bfcdd60dcfa207aea96e1427c90023880ee3f8c274bbd51e1aa71a8c0d9055ddc00da81c7d874ea4cf38d3ff397fd41b1874785ea91c15ae07834eb5424c3e43
+DIST thunderbird-24.8.0-da.xpi 409627 SHA256 a05338b5328f1513910489f5cf6db15d5765aaaff4246f0e06ae597dba3a9be1 SHA512 70941cce99a9f75d413f73d3287f4d6120efa657375717fdadf949d27c46680cfc009a3091f69576d44309185488acbc7ee7b0e3c18ef02c8489b1b64806ffd1 WHIRLPOOL 6fe4e2ec2620c9e0e7c726b82a07ee01e3fd28586289b084178fe2d67eba5b8bed527e60500d112ace600b662ebb36bcd652e5f5f87329e8bf29fb704d6c0c12
+DIST thunderbird-24.8.0-de.xpi 408674 SHA256 45d5155abdcd00ea0efa8f57ac3c2229abe6e1ee45d66497aaa1ad7c4659c1b1 SHA512 550990c187e4f6ce7be42d5028271f2deaafb62cf751644acaf40ab101005e461fc47044d89bef2640951d0299b132b8aee76f66a2d53986a20294a380a34e75 WHIRLPOOL 8081de4bc48272821d06c892802b3d6368e0a0af929fae607b272ddc2e53bfda25a73bfe51e6eb35f6010814addb545180508d68f539b2e3102ed7803787f664
+DIST thunderbird-24.8.0-el.xpi 464552 SHA256 9ac5e9cc4cea2582359c31738bdc50f10ceb402991eb9c1ed7f2cf2c10a3e631 SHA512 99157dfac6cfec25f6cb21f6ea625f3f837c9a8d33e5a7fac948a6e00dfdc82223d12c8ddda87e1a1186b9e23aa8970664b6b0546ad63537ed59b4a48fbb7c06 WHIRLPOOL f196c71cbbd910e99443cf5501af5b816f0f9761da414fa385620abe6c74e11d1085ae73887fb4f5cde6ad9f9685b2cf5306f72536c2750ae3fbfe9ee5f577a8
+DIST thunderbird-24.8.0-en-GB.xpi 400962 SHA256 a0532658cd67add0489f08e878b76b87eb2e166e91b7ae4e22a8745198e6a8ac SHA512 e75611d535a5ecdcf40642a2e50e19bad312e5bb59e9696dea3a5a02e40e942c88293c510c0d71b41fba3356deab3b48b7f08900098d3d165177d37e40571168 WHIRLPOOL 783e0801e3a69b882467a4b28264edd9eb785b40d48b3feeeb87d3e9f6efa6b00d380511f78e4a0747255cafbd54aede1136b5d08f732df85530d3e46081957b
+DIST thunderbird-24.8.0-es-AR.xpi 425657 SHA256 82ef4326d06398a526f236d7915c6957967d870e4752110ad95068488d93b7be SHA512 7803cfe3c06b26fdc1f161cbebd60f80fabf793d82f84c4cc2323ccb91c81fe5fa63d59c681b2feb3c97fbebba1497cfdff527bf9ab5d8d97491b9c7a919b461 WHIRLPOOL f7b6bff1e4b4e469f27e5434c40260eb65d0f74d8947d3e26726297fb9f34669d32b3d0edeb13ea071b045640af3dafb26dac547d324aab8ef9b38bf251c48c4
+DIST thunderbird-24.8.0-es-ES.xpi 366308 SHA256 3e2a066b27256a3e87f0c6e47aea8ddcb12e2b09850c5cd9e46a5c4fbf7e5a1a SHA512 fa1526629ebe6947dcac6680a8103465a24f7bbbd148c9f2b12aa11bd977c0fdb88ac083272f9c69b1b861821cd2b29ea389776d76b08591854f8a8a89e1183a WHIRLPOOL d95611a028d99db70ca4c63b87c90abd7efc84efc59d08c9fc4d3adf0965a9380103cee111810bd7906ccb0a4e0bd3b2d1129475200923fd442556baf907f2d8
+DIST thunderbird-24.8.0-et.xpi 422893 SHA256 abfd378dc6b6f6cb7a269bf52c9070a6f77c7442e9049455184b912e296963bb SHA512 95dbb7a2c831dbde2866180f6004658da338fb00adab2c187b1d207b0d9bd8f6f51a8fde3ebba564936a9ffa2db294f298cb218b7999e94311957ac37f31eb25 WHIRLPOOL 0e03a888119458febc45e93b9603cec5d67047f4d0469b4c4f3b690edabe233c2769f28d4cd3cd5fc29932b6b9d3fa42e4f0b4cc0e124e7b40d3cfd99ef2c330
+DIST thunderbird-24.8.0-eu.xpi 418497 SHA256 de05f69388ad1e52670570fc0f924c33402357e1af17114cbde42cb4ed0bce05 SHA512 64005b22c16e34d6a37f04010c6b5adbe65bd44df55bd39e21386fb9c4d56f12b797c49b825bf79be34538a978e6662be8b717ad17986adaa0ff39fa759fc90c WHIRLPOOL 0c383feb951aba8601f5afcf4d5e6cee5367aa38a13e1cdbd718d74f52f21f21a170b4f6d0634e068e498154c08e79bbfd16d6366dc9293adb589e308d41d497
+DIST thunderbird-24.8.0-fi.xpi 424264 SHA256 09254e8e1ef9d6785bbab49a4643b574731099737095cb6fc5904f6559b566c0 SHA512 7d4773417fbe358307df28f72cc66308f4d977636142f792a21b6da38b507ca4ce9dce315ed1164746962ae7ccfe1164dc48fdf4e8a0698177cc5c76c13b8a72 WHIRLPOOL b3a92b6452125dd2bafea5ce7659bf2594da6f7e2c75de121ff6ac7538d1262de3e6c75fc6036f0b9f9c4a81e18da2bf5d66e46e5562e3955418f48ad3f83a6f
+DIST thunderbird-24.8.0-fr.xpi 431289 SHA256 bdd9c7056baa1dcfe1f311074f768babd082c717d6c738c27ff344192f1ea032 SHA512 beb420ce99e6d303ebdf3331c365bf0d0878806ab36bd37c2d9b091cd884b150e2091bb11dc14ea4f33f51ec5a46918acbddd8eda1b6921691e9dd3cc0120b72 WHIRLPOOL 499ff0649473f4c5a79f67364483b412ef65250e08ae7c1444ef5c22e444f5b96179f78a91f5bebe1f4c3edd67942ea7329277f584a5a808b2d4dcc739376966
+DIST thunderbird-24.8.0-fy-NL.xpi 426098 SHA256 8360386ef0d816767cbe94860b6fff61133b05ad0325c7942bf9f8eb693a8407 SHA512 4c86b31fe2efbc32c6681fe6bae6dc85bbbdf12b82622bec705b7ef6b390912b5d26239c78e365311e317d0eb1999fc84131ede4b1583ccd528067e9024a4553 WHIRLPOOL 9af1cabce9f0f5d6ef2e4e757fe0c1d5741f84c9d722f55db0491a01621d807de88b0e49e968f8a20e80ee0f9bc18285c922c666e90f0dc28dfbfcf5080d60ee
+DIST thunderbird-24.8.0-ga-IE.xpi 437114 SHA256 7913a776ad7ace0b7cae5c2c270ce1c36db7b9b2344639c6ecc77d314ab2d407 SHA512 6e089a515f957354a32d12c4ca81c7fc422422ea44f4b4995bd6ce0d4e26fcd4cd35d1bdfdcb3488ec332026009c8fdca487ed19c24096357a9c364481a77aef WHIRLPOOL 51cccbe0bac30cca14b2c1bffe1cd50f292249f973c2d102e4036cf8bc6d474df0cc7b502f0bcaafac996d54ab11b89bce15554d49883b7e2523146f717899c1
+DIST thunderbird-24.8.0-gd.xpi 440092 SHA256 3de52a7024e8e4adca72d85d136457c10d8fdbcd03753adf4c26455077ffc280 SHA512 3e5b355fae0887c3a12a830815410d935812acf3fad4817237e4090dd39d22f0aaf4d8c2811ef6af90f9b3d12797ee3e27cbdd12d83d4fca98d65f15a5a84f3b WHIRLPOOL 742a32f8d6c869429dd0dea1d35f77aea1b46c60bd4b6b88c7c2df50d1408d68ff80d03c84c275e4323f040d2786c88d7ef4e73b641cf4c4ec886493e4c59c15
+DIST thunderbird-24.8.0-gl.xpi 427543 SHA256 31cab27c8a854e4d80b355c105b06cf44d18f977da8449c015b36740460e28d5 SHA512 c9ebaaf1292be1f14bc7b95f98bb79b764a764440176353ad4deee351417ff879f3a8690b6fcf7d4ad26cb67b6e995665affd84e76d3e522a1d682a915dba657 WHIRLPOOL 6e0e6de7c6aa859f1790cc6570b0599ec722f484327bb70854536c182be589ebec549995dfabf180df34f043c2f3ef25aefa5abd4f03805b4c18ad27a444ca4b
+DIST thunderbird-24.8.0-he.xpi 457065 SHA256 68e3e56e8d4807141d3cff46574940530c362ce04ccee947a0bfffe32e534e8a SHA512 7530c567efec3719f787888e3ba4e38ad79d0abea9622ec1cf4d199280ebd6b9d9cde54fa3d22917faf3a4081fde11e181108bb39843c149f258f016ae5198a6 WHIRLPOOL 5a7f237a5695d99516c9bb4f1dab3488b6e82de5a3ac6042edfe510773044c3e9a4aa546a8f327639a0fae5f1c21e510e68ddac6ab14cbcb395e8b9e92f9ac42
+DIST thunderbird-24.8.0-hr.xpi 422387 SHA256 e2d1edc187ccee9039dbcde65a5d7db85e394a38c3021f2c2c4429bbf16abf41 SHA512 c3b71943dffbf0a29a9091e4bea2402478ad9f95978eaae55129439d3e8a39d0769045890cba54d17cae97293f76aee3c5de7243e4e0d72f19921fcd5158a399 WHIRLPOOL 4ffb188be3ba6e6953a72388d87be24c90847a6c1535859586fe0499222c78bc4f8c87e11c3ceb9c9403a17e7053be8ff9b5dd8cbeeef884567432ae22cb0fb6
+DIST thunderbird-24.8.0-hu.xpi 441511 SHA256 022bea0bbb7506a4d5700cad4bca74c10c24c18de828c665bbcbdc04abd79906 SHA512 df7152e766462c6e99850af6465d30c3a33664302fa9f1a532eddece4cb1b37f084c85149abc4dcbbc7c919d72c21d9d09dd59b0e02f002913f83d8e5491391b WHIRLPOOL e77a192d30f6245ff792edc2013f8ed9264fd9a2a1fbe061971d7c405950eb47c22cfeefb7222688e96f3d10e865d3471d63cb94465342034d6eb987040a26e5
+DIST thunderbird-24.8.0-hy-AM.xpi 477923 SHA256 8678ef98188d35fe3430ce8fa80df624492b9c14e5165ab5d6d0ea5687ca5df0 SHA512 0be1ba3783d1e0348dc64ab2c63e074dc517ab4c14f8e3cf887580b80b6550575a6c0c127bdfcc476f9f08e66d5b22fa88c0ccc6598403a6425ac65f3afa2ed2 WHIRLPOOL 89fc87693c2ce98dc678274388a2e4fd85917c9f45268cde57c80a33fa98b21f6dc62352944742f64931554b32827f1b41bd9daf85dc61cefe176c7bc408c108
+DIST thunderbird-24.8.0-id.xpi 457499 SHA256 1f0013f108ad19bcbb1371f3073c0c6efb7d0f147f7d5c425c1b01fb9f201c54 SHA512 1d5c9f40933d367720c5ad47721a793d7c799db8c99fc029772c80f81a8edc9d70b0b9ccbb5d7d4f6c4b14772d78c0e073876b84171f3c20fc3103077af5464f WHIRLPOOL 0941d3cdbae511c202ec64606281083ea2f51654be4e447914cfabb83e9e46cb1af3bc4ea22ece1c570b01df27df741f16ff0600e6dd856c132dc46a351adc39
+DIST thunderbird-24.8.0-is.xpi 425711 SHA256 f265fc9a62983c54a23346668a699b1c9e677bdc3d6d83faba01f298562410db SHA512 49e135742555faa10007c984337e66c8ac35343b9d1bbafa5edf31f7149eee0753dc96016f5513245bf268bfc2463319f1e29898fa5817dfa7d44457f80dc222 WHIRLPOOL 2af3860c7b8d3a0fa05de26c1c8fa4b809aa179bfe1dff168edcc1edcf9214566c387550d781167ad79d59dbb04402d7629a1c977093e40549b93dcb921f5712
+DIST thunderbird-24.8.0-it.xpi 357933 SHA256 cc493164a44011568b70c563f727027f4e3f99f3fdf0c34e0b3282575d955459 SHA512 a96ace69534bb3c729d34ca8021189f7578b6cd2a4e0befdbb5a08e6e6cf3f1405ea096ed8f7c7f3de3880690d3cf6534145261e30c9d1a15b4326b84e59418b WHIRLPOOL bcbd53e1d2cea1155ee663ce7b9f38d320b2340bb5c84c1a22ff0c2be08b80f52061c041ab3f3de924140d32a7fa2bb2895d67838f638722b7d4795d07ce7f67
+DIST thunderbird-24.8.0-ja.xpi 475559 SHA256 ed748b52232a56940da303da2dd7b118d93c1a573f655993473815ee800ac12e SHA512 5911554a2f965579c2a78b09f49b857a203a76570361eedf74ee61ede8e89496a1049e2510212d23fe0f19445d11572f74cd5cb17c5c0c28a4d43773d70b672c WHIRLPOOL 2b7b30a7bb336603808a192c32ec90232274240e1b71f7d3a4e6010f566f3ea5022ad31382a91e8be72b9c9325d6701f7971c990c5a7fcfd139960f2474f1620
+DIST thunderbird-24.8.0-ko.xpi 428071 SHA256 6f4c37fc85a5b4553613070523d47e148acbebd7f3a4ec8c1bc3c63d1cf74e8d SHA512 69bb1dd1d2854f061830a98cf7c79855cec98c6400f95b240036026cd468bd84f10457b1170a016e8cdcd7720e91121bde05be20a8d9c474f82b96d3997d9c20 WHIRLPOOL a42f9168f2a3f1bae61bb9eb128398649aff1902cfbcc2c52d550acf00e6cd972a4a8ca0bbae7f54129424dcebe19f460000be3f7623afbea153782641afd5ac
+DIST thunderbird-24.8.0-lt.xpi 443260 SHA256 b8ec362b05c0020cfee6a306a4dd380676c2e9677f09e7fa314372ed5e522e78 SHA512 7b673d38109e62d869aa554b79a9c8101c237e491ee3599b60ed83314e08060be0a96444435a18a656fdee604ab628f27409a5b84b53fd18fce3c7de50580cab WHIRLPOOL 9ae217e8cc3fb038a14dc58b96d5d61afb4f0bab5e3d4d3fed6e17ff22623f681d6c883fb5c56e52c1bee699a2e7149f6150cb94f9cc980917f3e6ebca84fd5f
+DIST thunderbird-24.8.0-nb-NO.xpi 418922 SHA256 a24e7504b11de96983a8b8067c3d0df6011a1a48ac40356a4b8e3017eaf5903c SHA512 173f6a3fa1fd48d67927f350971e2f3937a090d14becf78866345875f89bd9381237c4d6ca4a065788f2a8f749ed24f4b5e7d7f27b3622d15010021774965ac0 WHIRLPOOL 7002bcfaf80bfd0d16cfec0fd5b38499abfc61a9fe2e7330db035fe332734a040c1c9646daf8c46062816aa7a6b89f31d36b776d74618afe4fb6be7c1f34e83a
+DIST thunderbird-24.8.0-nl.xpi 418764 SHA256 07d52b12eb6ed5bbe13421f9d20413ea5cb06fe041414e5689b06d993db088e3 SHA512 c392026a91d8a6e86cffec705f792fab33c81284084124e560827c121712e7d28eaa94443c687782013c32358d7fbcb15fd3ea8b93c929c0dfbc4d6d8c9332f7 WHIRLPOOL 763abcf82489c276fd654e8abfb84d84d8aff0685b4dfb56c4fc907c66a083d3aade84334f416dc3beaffa21c5a22a795830b8a6d34fb143eefc1cdd9607f991
+DIST thunderbird-24.8.0-nn-NO.xpi 421134 SHA256 dadfdf8fa79ac0f9dd9150c50e28c5c34c3d1c916f64fc456ecaf4ed0058881b SHA512 91e3aaf2eab3c8a5eabbbe891f6141cd48f8c6cbc5e00a979a1eaabe8de36031647d57cec410fdad0e8e42f890096c4900c8408d10f350eb765daf7a15a9a56b WHIRLPOOL 861d024e803ac5da232a0c638a3b471005368ebecb163703276ee43e3c599707fc37ff459ecb7fee80e47d84f1200e6197e6afd4c321895cda416c0e487bfbc8
+DIST thunderbird-24.8.0-pa-IN.xpi 508272 SHA256 04aff0be47072fe90dbf620c0520979e791cedc81488f8fb49217429f6cd5e57 SHA512 e40092e8b3b9bac9281aebeb7369c716b4d96b5bc67327bfe3b5afa0cc2f99198928fcb1fbf2d6b2de9cdcc7659ffa6c5eba091cf9f30267efae36856f8475f6 WHIRLPOOL 22443b2a71cead6c0d08ee49a75cbcb5252736f814ec5da619b1d48ccda206953c3327fd9ac177574ca30188433f25bd15f65f995e262cace5c0f058f358b345
+DIST thunderbird-24.8.0-pl.xpi 401753 SHA256 7daef6a6c36cd450b69634d42e1bc56f703904b7ee994b844a1ab6cea975d5a9 SHA512 421755538eae1538a2347662c268457d5186deccbd50c461e7f65f152b4461f3bfa308b6e98fa330dda77d9a05024f9efbaafe6d3a7064f98d4a7910d5b3f58b WHIRLPOOL 2753e1c5914e7af440dda2413e1b6a768b93fb8fbc514b03bf8656bb489c4de4c4aedb861aca66e3febf325d346732da3d7919d22240a5d639c3c4bd7addfeca
+DIST thunderbird-24.8.0-pt-BR.xpi 430909 SHA256 60ddd15161ddbd99e5b17f7d1a27bac82633c13446d7cc320cacc4e591d9c00b SHA512 a64f0c7f6a80e310749ad9261ab24efd20957b3f95af239d5ee42af5fdbdc4a420a7f2db5a87a8e84bcd94dad2ed485e0df6824fa51f0aefb164bc1514365f8b WHIRLPOOL 39b6bcb78dfcfc18772264e8c3b53cc7171a313167782061812fa757bb1de57f5c2abe6d244bbcf386a40c330e837fee80a342e623c3cdf51f2c16c026f79bd5
+DIST thunderbird-24.8.0-pt-PT.xpi 425025 SHA256 91ab184f36796ed8cf2d545d26da8d67004454a0c65e5d59e5e684be15ea53b8 SHA512 e78a5f7c458ea058dad3cf94d30eea597eca63ed1fbdaebda0300a9b9a5aae0c3b3f5bfb0af6d99e09dee36739bf90a23240fe43a41eda12ff6281bc166628d0 WHIRLPOOL 90656993259e2b60e2ed50e9813746298bd1073936b52b4dc35d89ba8959fcbabd1df4e88ed8dbfebce690ce6bbe58a7b9c6ca8006ec6d3c558ba4540ca49c3c
+DIST thunderbird-24.8.0-rm.xpi 432385 SHA256 819832e0861b77ef84094e2d83e01f95c95c30db766be872418810a8422ecdfb SHA512 2e7a9a5fa8993398d6e23af0dd621f63168476945e00ef1cca28a77b93b119214bcbe8abd7f9b419008e4b3bbc707e10f5c0057c3f31ba3f0092515e1eee5e23 WHIRLPOOL 094cb24ac7d05834e2a2069f2a1f95c3035a0bed68080fb59187fe72af28896e8973eeac89d757a66bce5c3cdb083b370990b6c9d4e4b70e2d822bf81c595604
+DIST thunderbird-24.8.0-ro.xpi 497491 SHA256 99191c90028539a69a42b8ba0bd62af6226e945e75b7ad2d6137450810c57db9 SHA512 6abb3b53419a064d954f419392b44b0753f8655884c1bf67672d09bbfd9df86ac89395d545826011eb2b9478da946ecbe033bcd7c490f48fe94c78a22855eaa6 WHIRLPOOL 4a56cd17ccc6ad8d201f10ef4ddf655c50eb8cb892b39425f26091c9c9fcd606273b73bb02b2681749b2c34e41df8e321d989bdd55095f33b7f2f2402e2aad22
+DIST thunderbird-24.8.0-ru.xpi 425098 SHA256 927801fde3daecbb66e14024280efe9c5e63c8a443c8a2895a00b5ecaa578c03 SHA512 0b1e63e2f6ad32e7036a755c27654e274032a9fb13bbe1f4a71273e5f881d8bcb463ca2c8fbce6b5f6225f1f83e20ed9dc0be9e318630ba4cc76672cbb81a2f9 WHIRLPOOL c27581488bd79ae52e2ae0bfb6085284e9b49b24b162f8cfd0289165206e2d587578f9097975fa1dcfa3311584d26db5b60155836a56aa684c8a95981be4b8d9
+DIST thunderbird-24.8.0-si.xpi 511167 SHA256 1a6def95da3b092ba46f0aa1f853135de58e94c16b91ae42aa4810f4896c24c6 SHA512 7ad3fba7ebf1696721ad03250cfb0dcf7fc64c7def5da241f25d4e3af386d859b18d8a0612d76894a3923d50830e623a4ae236c97ce5811c820289ac9bec401e WHIRLPOOL 68c53ea1e2de86f5afb5c83df367e947b1109d08d019650868a3aa1d4f712677cccd958ec63af129653391e68c5adc09422fae0de9e6a7801a498164b696d8e3
+DIST thunderbird-24.8.0-sk.xpi 440106 SHA256 f3a9982fb0e5f560b9a3ee9e594cb12dac3a41830f14c0666d8466e9d6bc8a94 SHA512 8f64b5b253596105195bf3cd1a80071d1b7bc92a1c947c71eb7bf3b6c2ec1d5edcec27f913100d49b2a67178a948906dd5316f2bc3331fdb21f9b9b5052d7a68 WHIRLPOOL 7724968f630297f31514a833bc2d30fc1857deaf234b39985b7e04b553a64c675e7c871aa797d8d200eedfb734047b9abdd27a01ed47a8e75ceb88369941fb36
+DIST thunderbird-24.8.0-sl.xpi 421706 SHA256 73485bf79d185b9b41f6c1759b175e83e2f3fa02d8cb97963bc8cdde148ba3ee SHA512 05e03fe3360b33ad3155c84137ca95574437e450893de453ed1e1db0f58ef1c8034f83f9855818d045b0518151ebcc23676373316b49ba0269f7fa78f329fdbe WHIRLPOOL 2e37504147cf7ba3bf10f6ceb92dc4a37b8059aac67c89f162d41f4c54d5b1bf9d163ab17176778d1ec2e87d6afc7caf9808efac262ba592c13af37b8ce5fa08
+DIST thunderbird-24.8.0-sq.xpi 435215 SHA256 62a97b3ae209e7e967700c7968e43748a30382e3ebadb6b68c41a4d6c1149d59 SHA512 7474ebce3cc9833b8df6b2cf38e5f50d2bd1b86900bac01a8ce9a265c687133b62053b7998fc76c30fd9e471e49c3aa6162b0224125ac4075dd21fd4c7c1cb39 WHIRLPOOL 44222a376f65626210d12c341bf9ff76e1c5e62b2ad5edd75e24451a4d6955a72764e194b8e7509620437b2a75334306129a19e8c96bee39403f98f5a88b6e27
+DIST thunderbird-24.8.0-sr.xpi 518889 SHA256 db7a470d46675a6177515f2a55f7ddf8318ff68fa1a320e92419e0434d946033 SHA512 421caaa6c229428b37cf0480d57e676e09e7e227a8a7b2ff5ad2a1e8eb9c195c885b582b330cd07a3e925d4ca6318f11bf15abb97900879d581d6ec9d2e6c948 WHIRLPOOL 93535d74655dcbb212c55b37cae26abbd325f86172cb819bc4e6be9e85aebf7cdf5d326cfe93417936c0f95d6e26ec75bfcf90aad5b3078fe04513604a2a59cc
+DIST thunderbird-24.8.0-sv-SE.xpi 423816 SHA256 20fe9c108045954f64e91f99ab33a1896a1732b117a7cf5bac576b19e6420b3e SHA512 bc73a1e360bf4d522d281e9db543bc1d57bc81a2b0a3ea268c8ee2a1b66058a25c89bcaff8dea76774d03bd36c438078b0765c672f16eeeb02dacd4270516f2c WHIRLPOOL 137f5fc72adccf22d6408231480b261fef981c9de634fdeb1a6732f9e2ca3932cbc70ff466eb133bcc4e6af9b74577af981963f341250d3537e50d66c92f6979
+DIST thunderbird-24.8.0-ta-LK.xpi 534923 SHA256 48b47e31b53fb1eefde40fc44773af4349d95a38db9723cde6024bfd0297d16e SHA512 bc22b45230b5463dc9c79ddaccfb86df47c8fff52755053aca7503b2e7b5d728f0b6223248f923a3dea95f5b30c5c1f433987a0deeb41c753c4f650c27be7029 WHIRLPOOL 00b1dd98d8cf05da848117c46c9499e4570588d0599295d71c0f4806855aa8ffcaccccc5fc16c348f0d31d29aca5c0b938cf7cc5fc3ca301194e2ad500cb382c
+DIST thunderbird-24.8.0-tr.xpi 438067 SHA256 1e6cec1d2d0f100a053fb16e0b1921c070c5a16f1fa8026ec72f80b7256623d6 SHA512 9d03dd9058eea97b7fb2225700a0f3afb9e0ea0e92da1853be451a97f86cda592f39936dc337920e5950d6ad19ceac244e96dd49e48428d11e5ba9d31e338f4f WHIRLPOOL a6b7139744f4900ac4750429e81a3bc976e77972a9949da0d674352eb486669c05ca4a30f55bfb4bab3e08ebffa850fed0a09a420bcd962818d58890d2bd054a
+DIST thunderbird-24.8.0-uk.xpi 480948 SHA256 b473ce8954e01a3fe3848e4778453ababa6664507979b5c57547a717c5b93b4d SHA512 99c173f0246f61222526debac765a698ec752ed9114df2e306e2c29f29190c64871c73f5ae38bb2840d9f6f439031b018d5afb61d9826eb0aabb27b11d2d705a WHIRLPOOL b5b206eb9b32e034b03155b3cc86afba61ee9551c4c0f0d3fea3b7c2502a5caa68d73a6c93200fb26975a7957465a2e2ac402446ab0c639c9f79acb8bd584418
+DIST thunderbird-24.8.0-vi.xpi 495558 SHA256 11230049f83e3a4aed42f638df67518ba53917c44cfef43bc0116543b0e38a99 SHA512 1eb78c7c5ab9fb5344c8a85216a6c58d72e5b13d731b046658d6a040c4b8f4e6bcb5e93620ba555ccad8b5c5ab1ce36d170ebe0654e6ac4a27c8569ce17110bb WHIRLPOOL bd04a6be1b07e91b85cd805f1a477837ee597b4616709bdbef32ba76cd3812cc41dc480d2a068fa6a172f639ae4d9ae4a720786d61ee3910da3ba6b90116fad1
+DIST thunderbird-24.8.0-zh-CN.xpi 449181 SHA256 d0a1c7a75d9fdcedfd1fdd760a1258ed244920c1fe51dfb71824c62a1f454039 SHA512 980f5a4658057fa6f74989db39abf4e0a8c045246a9d0474bd99b3348b688a13b5f63c4b4286edeffbf11ede9dff16fd3db58da5d099805e6b2fa273eee3dc5f WHIRLPOOL aa3b852ebe74cdc5494414ab26e5492fbc91f830575630456c890ecd3d700ef3d3e7f3589b449c628dfa9e178d6471f1be6b0860102b11639a01ef7e535b54e4
+DIST thunderbird-24.8.0-zh-TW.xpi 450001 SHA256 342d949817659c5e4b405d2bc0cb5cf237e1d0657d77823f6a6492364f7da552 SHA512 f3990295d9ba1e6c70648e2981a1f37b98704875e742d5bd7bd637fe62125f0b763e738881bd3611231749f169f7ca97d581baed319a0f8f4b471116ce088d0a WHIRLPOOL b12c30d3903e6e54ccc0aa51f2d558f7a9ed2a50ea3e632fbf064461925275d2677c1c332e667ba2c89a05dc8966a214780481b4f8ceb534840049ef2129c8b4
+DIST thunderbird-24.8.0.source.tar.bz2 140364864 SHA256 5b9428c21828b439698e00beb92c71c5a1574c42b92a6fe563d99e3b52ed6a91 SHA512 2848af60efe78b03b61e9361e9044237928b3b9e5bcfbbd9ef97dcafcb7499aa5bd8247cde10846d947e182be46f78c746c58fb783da0b2679a44b0fa0ab58f5 WHIRLPOOL 8c613030d6fe3dc75fbfaeaa71f8e4ffe36a40701d1254a1648a0bc64ad166a900128f34672836a83337d0b2677f4cadf7e7bb0ca656addc189cc5945c8c3bb8
+DIST thunderbird-31.0-patches-0.1.tar.xz 948 SHA256 eec36d5cd4c384d4787ca034b2abd4aaa41e831fbb6988169f603703af2083a3 SHA512 4a20f23bcc97c9b00fa461f7b0e3b7660ec39a99c16154a0d35d6048d72db2b8bdb1c82c81cdd75047ab4a11326173313b4a85733b8697d2febeae968a85b38d WHIRLPOOL 921e21cc3451f0db19d1f891952b53f75da08ad9e2da6309cf3d29c1facc05b83c618b6ad0c01abb121ff29b7a65af140a7021d4c584827b81a4977c879f6df8
+DIST thunderbird-31.8.0-ar.xpi 472812 SHA256 2f2f6e0e5554604fa861571eeaffc702a15a4be088df99af6f7c1944d35c7e9d SHA512 ad77e3f4dca5ff063fe44a7e23e68b897efb417e529be58f310e486b3f322386512afbb00f95f121fd29df3a186d3d2b38c5ec08096c77832fa4ccec903e6d85 WHIRLPOOL 863e32689def07e16218b7b0d4a7fa18ec232a9665f4a03ba4b58fa3cdf020b5835ff07c32bfa0db2b10692f545a46db478324e722c83aa91c8149b81ab1e5f7
+DIST thunderbird-31.8.0-ast.xpi 393048 SHA256 4ed7590913176d329ac340afb8ea5edadc7ad992ccd85b8731c9967e4021b3c8 SHA512 091734274191b515f6cae98555418a97bce2b7beaeb10059d0bef1f802d3d013430aece7e4470b36419fd66316a7f96147deefdfb99da66c4086ee955fb9bfa7 WHIRLPOOL e980f35455204c9686d3d7126c92df6a9f4a4e8d8fb5ebc7e1c0604e6467c21e20e434598ee47c3e5feb843ec146d3e5e2e9fe8dd737568982878c9c0b9632d0
+DIST thunderbird-31.8.0-be.xpi 427488 SHA256 62bf36d474fbe878ffdba51de16d9b0d398f36aba869063ef2f3f105828a122c SHA512 67ef52595ad5459e28bf563022c8cafe2ea5d06084a48e86dbe8d0c78655636a677a6cde7c38741af50425f3f563179495eee2d16b032b829fcdd9ebb1a13fee WHIRLPOOL ce54655edfe810df6a3a607daa393a03347fb42e8e4c512c809a4c63ff33136879d537fbfba11c58a84b9a61506ef9f18db19aa0cde1b90f9c558468d8595a48
+DIST thunderbird-31.8.0-bg.xpi 493734 SHA256 3103ddd1ba3601813c506c46a98897b539b7e18c244768e5d3f39f33fca2daef SHA512 f13f5cf7dfc85a0b61ba0c4f67e4eab4fa9d36944401f73cd0b4512aec6711886632465e15e4e33009e370d023e3cd3a3123b015774a6ed66c0d31541d52bb9a WHIRLPOOL 64471420f2e56e04f8a7e046c8487c0e89d983d519019b6fe212c0ea7b5d5c0e58347b5fede26d4645c2e6052f7004224947720f1241361a46d0135148805b0f
+DIST thunderbird-31.8.0-bn-BD.xpi 555613 SHA256 ada4af2285f78c73c21a3fdba8dc2fe03c8526900df30e957f577bc82072301e SHA512 1a2dc7f7c1682f4e34ee66620dfbcb6a11c3588fce293b2a42a6c2052913a4827a7e0fa31a4af803c2b7b93f7518cd7660a3c2ffb77da995b189ec793c63945a WHIRLPOOL b300f7674ddf54fa5aef1462d43c6df1c5e7b6133f9421911c69a6fcbec3fb386139da61513ed289200a9d067409c3aca87adc7bd34622fdf8ae7a9c31888283
+DIST thunderbird-31.8.0-br.xpi 441445 SHA256 4ac048f1635890e65ac33826b40031d32bb23273aa48d17363d061ebc70003e2 SHA512 471db2eb2165b386c77e8e4e52f29cf4eb62c4fee1b69312a30b48f762652876b1c7f7c56ccfe66980d425c152636e18c538b58e90633b39ddc50a673db6b63d WHIRLPOOL ecb104bdba702d5a8207914ca4ae9fc2f4e8b38dd9b068ee3efb133cc005551edea1d21d689e2b08264426e18e9ca4472a389a444a550b7f2cc7ae4f32ff24ec
+DIST thunderbird-31.8.0-ca.xpi 441712 SHA256 e8e445f4349eda7eab3b0771434b01f843a8a41c103ef8104a10de33e14fc99d SHA512 910b60383df51de0adf3df51152a1a73b7821c489547e928c2e0995150021a246f55bbf6be092e8d5c33e80133d4d2c472172eb71d1300ab2db478fa59b1916d WHIRLPOOL d8a0991c4f48e808a0eb8977128aefa577a34a77efcd7fbc552fc20ffbfaf621016513d1557d2ad7ad306fe970d3806a890a75dba600320c22ee0b044643850a
+DIST thunderbird-31.8.0-cs.xpi 444701 SHA256 532e5ff05d90ec1419e65b74a6fa570edf1f69b494b51ea6dc53545806803138 SHA512 605d897b856fa71888d54fcb6de872be449de5bde0d3d618293bde135fff1e880c3671164e27d855bbe4b101fc0f5aaa49d1d0f4a034079d62c71b83634e2d91 WHIRLPOOL 6f189127526398d936693a769a8471b1cbcd4644d3b70046780e14942015c8c6a81a8aea388f6f3e25b5c7d96603fdee2c03ff3f86f472f6cf77c6dd11e29f43
+DIST thunderbird-31.8.0-da.xpi 422052 SHA256 2e3839fc9f374f9e933c90c010b3cb645915148b67a43b1aaa0b9d9a3213e5c8 SHA512 abe25acb5f46a33052ce9fda75405e6dfbfde4d0c41b6aa20d1c7fe8e9fbd24a0cb81a57a3c255f17e1dcbf6d0ab51d4f49f2cfabb89c51d05e554aa0a4cf9ea WHIRLPOOL 779821d250f72a3b7ac6b783bba06bb561299ba7a045a593a4cdf71906eee186c4490d4756bc644f9711ac0ebf2fcad3427b897079cbe97bb0df335b4c18a2dd
+DIST thunderbird-31.8.0-de.xpi 424665 SHA256 d9e19fd0a44e0882f371f3e5cc7d558ca4eba05241026f228870b231ebc485ef SHA512 fa78d913010f3b88507ee0dd3d7b1a527b68b8dc72d2d9cd7368ab5363a0b437778d6adad6d1e1cc6b1673b34a84c04fdc5fb0bc4f0e4687e7d8b4972a2273c9 WHIRLPOOL 8d0d0fc3b658b7d673126c5407abd86e47a22da2abc44b1c63382646a5cc9e6196106dfdefcd0444ec89f0fd0ca2bbda7f8941bf49d753bb301c2965fa82f523
+DIST thunderbird-31.8.0-el.xpi 484855 SHA256 ece947f2e7451cf068093cb0d430434c2cea5292b2226c1f499dbdd79cc84330 SHA512 b2749f79374f20ce000ed9461c55a55c82d120e9f5b5625b5d000f4a28ead50abe2ba7e72add255a0e9b3d2f7c08c9f958bd40875c9e6ba17664ccc155695aac WHIRLPOOL 4986d0448659950953a2bafc7f68370cee9b97eed2f120527adec04b6cc7ac1d047e96e55e267e205da7c7f60941340beee6fcc6851b6a1e82a9adfc007b183e
+DIST thunderbird-31.8.0-en-GB.xpi 412515 SHA256 0d522c9aa03294a8e8a600ffafd27f9bd66f99a84a7096d79a78c66e3c4411f5 SHA512 78382e06ac8eda6352ffdd53c6136d52754395ec97ca2ef69484d8f71ce44774bedd0402e8c41ae4b41e766867b5d528c0c9793e80578d3ba0424bc3074e5491 WHIRLPOOL 37afa8cbb32f7063d81eaf249176323638e32bfe598e15b0c3145c535f55c9bd12e51f3e928d8acd8ba9b58d3e12c2c3a8f45ddca6300c1e5bc78534de386672
+DIST thunderbird-31.8.0-es-AR.xpi 438531 SHA256 5b8014d21af14cb90b9fc4c9dca8a839a5ba63d1520d43ed6673c23cc8683b8c SHA512 bd262cdda22e9590f109a90ed1ec463bb2f9bbc27d643aa70136fa2d34eda0c4fb839b400c376c9a45698c7014530fd770620382f9fe69fbf48eea85532a152d WHIRLPOOL a2e02d4966f0f884abf4ccb316f22a931ee0514bf1e1131a5b34125f1e17ad82cb4bdc6be294d79bc15a75939d46087b76dd8d68d1e1575355207661f11d96c4
+DIST thunderbird-31.8.0-es-ES.xpi 374979 SHA256 8b106c8c624d7644df31a256380e448f68252b4554b938a501b34acd38886b30 SHA512 3fa3a36f2e72b5123a737e11e96b7a76ca0d7202ee5a81bea271b51e9027dbc8c03b887567c6d4bc6d65d2daf4429da96a8a33f10dfe0b1ce81df9ee73f2b043 WHIRLPOOL bc26ca5a03f42708e367ccc6b3a08bc5fb3b156510b681aa05a1de14f1bbbcf9ce4e5b47d78d682bac7e6ec38042492d64e91cfa2fbe8f71dff577a6546b79c0
+DIST thunderbird-31.8.0-et.xpi 434365 SHA256 b9cfbb57c173dee56a575691c69ea7edd7e81ce550512299b724cd112a547ce6 SHA512 6baebdb829e6f43e65e4a0fc2746523436a145e433807846769ce2079c85d486acca61d90d6a353875ec04c7ed1a351115d064ae4a4bf7e78d4174132b814dfb WHIRLPOOL 7138104c4f1c0ddb2bbe5094fa6b4154fb5bcabed2fef8c7dba6718b1c58f7d5701440ba38bf673dce511e67a40d5a95f8b215794ea2e4b4724d11254b7b6308
+DIST thunderbird-31.8.0-eu.xpi 431448 SHA256 c5606381a11d074e86672ee0d57e3dc8b56069a637484c82f010f5cacd23a747 SHA512 87c2424350cd9da9433c149c7b24f9d66d124561a07321dad388fba5f3a476b00f1cff2f229bcf8d2d5376308708f59c0f48079fc45ec89f3f794a2ec9cc6a5d WHIRLPOOL 08efd6ab32c95ff512b52d52020c6a502889b97f16bc85527007500df56a70edb852f7f4f2189062e11659e1f67e131b25da160adcc548de776bdf637215de0e
+DIST thunderbird-31.8.0-fi.xpi 435632 SHA256 352181f29404b237d28bdb2778cbf55ec5912f03dd2c338e34da7db404f6a04d SHA512 b0e5886669d625346a6829a2f774d5cc3a5313a6e0d927f57fced92f62851664a484d8b04026c30519ff43449c3ec991b49ee2dc97ff1a16129e459d45bfa59b WHIRLPOOL 208d9e047eb8b04c20b9f21d8c2b71fc54f625dc9baf6bdba1ad847846ea9822a2957d9cf97d4833d74c3b28c434fb687028791e58c41fc077cd8002776aa734
+DIST thunderbird-31.8.0-fr.xpi 444144 SHA256 0d173c8ad8f302b7f39497178f975b895ffdcdc767eb328519326e9fdb3e1215 SHA512 48529d49270dcba03f2673d1e31eb9dbc98ecf6e9555ce3610155b02634c52bce00772538866d15d7e3a23905bd673556141333eeb87d53c8c1e7716fea690ee WHIRLPOOL 913fd579553a50bf8dd3fe7ceafc82108230a31a55abfc5af0a993979c5ec7a24bc5861dd93dfb93017f562bc8f89bef36f40e5ce638ae9b2d8311c0a547e428
+DIST thunderbird-31.8.0-fy-NL.xpi 438544 SHA256 9e4e7a16b8f4489aafecb48a0e4df0b40495dc49a8dcea2ae5638a25dc4a5202 SHA512 29d5f416e8a9db19c9d8c01154f8e8225abb63c7deca10df005748de49e88e74e3fd26f44c0c911987e74743d66e433459a03b299f9979bf33d8e1a859e0921c WHIRLPOOL 324bbef93998a958dfa92bf18978299f4284501daecb1c94238eb2cf0b3ac3ef4ca0aad327bb35d1dd59ae2dbe674e65ce613de4c5f5ea4b38cc2877445ba709
+DIST thunderbird-31.8.0-ga-IE.xpi 449362 SHA256 0a5e915a2844c64c954bbd7d17f2f7dbef93919f1ce9b65d3561c20385977788 SHA512 31bf2153a6f682e265f48ac5a5c7c987cf1c57183a985cea5245e121d357ac0d8835cc6e0209af43dd5b654610d4d5b3c9d4d836e97aa49f3a7a5488782c217c WHIRLPOOL ec36bea9cd1c6fbebe8f6d7a47961f3313713b09655d52209e89a8404b6e4258b752d01f021cb8fa08c70aa456b5d51703b354b0af15c678f548ff1bed33ee0a
+DIST thunderbird-31.8.0-gd.xpi 453171 SHA256 759f6f95a8064f786f1dc7aa4814fd6ae9127a2f20c8f9ac6655b9034a234b3e SHA512 d82435c056b5e2d6ff62df2bc96afe576c3ea35939b8c5d197b27e1179417fcc58e8eae4e015561d7dfef030d456bee7dcf78134e1073c8626da5b6cf3e44da8 WHIRLPOOL 382fe925cc86206a51aba6066e9968dd1d5ffccb72f42a4d195fc838dffed6d5fe0eb28cb8eae5cdd4bd486c6d3c37b102f6a5efa75586c5675f8633e6952fb9
+DIST thunderbird-31.8.0-gl.xpi 446788 SHA256 170d3cda37b0e81c09129bcbf2ebd321c88b2fea8938605483edaf323b506fa9 SHA512 943cc38c1906e7179bd41806267815d8ad3d8f4dd34a57e2d161afaf649d64bf30dfb711343ac0b92421eab5e081155f5a9463731a52fc728f31e52e09300c13 WHIRLPOOL 3d7b8b201e9790a4eff65e235e27b42ac4ff45195bf341187b8885847b656ce8bb4f43f3730e50c472773003d65a6af82cd5d66a8c06f19c60bc8950aca52ee5
+DIST thunderbird-31.8.0-he.xpi 476112 SHA256 db94934ca21361444479bd8ee4befb7b3010998972924c2c3726a2e256871396 SHA512 663aaadc678acc36a94bf023f8927bd12102af689a4624aa3201e683d0bf74aca640470f0e9604777f74cdd1c53f6865136ac749fe903989921947adf6dbdc93 WHIRLPOOL 8be664f45fad2ca8a93765eeb3fc14d500227c5a36c3f7ea32b2d4299ff1f5ab9029fd1387223a52586ba263a4a5ffa43f3a31f186114664b9e0ba213fc99a1f
+DIST thunderbird-31.8.0-hr.xpi 436980 SHA256 a0bd70913fc9744bd75c08a87dd530e83fdd43ac3f6d7cf052b010c02a37b38c SHA512 18a10ba2f0752b022fa7cb502496d4e858416b8f206c5699ac8f9782360017992c493e9970b6f8745da03f636dae577491c6a0569437e7090490284c24838cf4 WHIRLPOOL 825809dfa9132c0e99d8e3a0971c2bbc9abe9665457a2cd1bac052838addcaeed1d54878fd6a5a9f8bd09bcd5a19c17a759c34eab0d725466b034287c28a3dbe
+DIST thunderbird-31.8.0-hu.xpi 454542 SHA256 f2004a17d93d0b62a1ff5162fd183f43edca2cf518f4cf5476ec013f15267b21 SHA512 e03999454e676863e784a822e85ea322f2e304b71eeef09e3b8c76530bc854c39a8d367b02ee6a7e60a02d69702b8f70bef25f8a824d6f428851384fcb999b03 WHIRLPOOL 4c8bf2b0bb1e57a2030c41e4815b8ab9d3555e47bb53b8d72a6463aba9c38682e3263af3d538aa1a1ccb288a3d61bc7762766ffeffd8e2610eae9769f7463d55
+DIST thunderbird-31.8.0-hy-AM.xpi 492766 SHA256 529fc038b086d1cf79b921e526931ddc061dfb427e308e07b3794c4e6c542a73 SHA512 fae11327a0ed88c0bc5318d912499a7ef74ee597c182f1c86065dbd9bbbfce11f251ad4058ca4c5ef965d1617f7e070f7cd06fa61a317fbe976082f1901592a3 WHIRLPOOL 2ca7aadb40539b1f339d1b5035a39aa52cb73ee856a30703964af2e1b72154e16b5f547508279399a313a52de157d8992240d93735132010d8268b9cbe954506
+DIST thunderbird-31.8.0-id.xpi 475876 SHA256 7bf665c85bc85230025903fc079f885b9af577da9caec79952fac1a6de7b4765 SHA512 c2c6369f14fa53da61da2a6f29e3f30eed7ddebbd897f82700a53bd55b2c000ddefdaac6980fa45ac2244a7d048fab162c3a69043f605e5e7459e1824089c8a1 WHIRLPOOL 02469686768373e3605e0e329f1c7d60d236b69a8e234d0f9d12f68207887b639d87c9b0464bc5f6103b491fe5dd4c3cebab9b2e516fa68e35ee5a8f84445419
+DIST thunderbird-31.8.0-is.xpi 437959 SHA256 366b58d187067794c02580d8bc4ca3ef7e29d877d4736485d1d572382a1158df SHA512 c2a8512912dcc7661ea3828ca18e779999a757e9836a00501b356b215af2ba0150373d482885c5d28996ebd280b4f953bd625d2cf045ca80b658cc055b9b10d9 WHIRLPOOL 1124720affc28ae2a89d3484362a17354891bd9b90e8d54193a6ced7855013e3be2f06bd578ff6a1943b9eeb236cde28db827d3b32cc5a5ad233b124e124cf76
+DIST thunderbird-31.8.0-it.xpi 368001 SHA256 1a7de0809d940c0c48ba13fd5b4a8de9713b3512df9e0cdaf4e5d032d598b976 SHA512 2699b99c7ab5f9e7f9e89988bdaf22fc98698ade02a831d9902b5ab6e3773f6e861f40c78a337a89bb676105d72506a97909fb2a1d073b8a229a74a1dc498897 WHIRLPOOL 607bf31f39f949894a9b653a33ca2eae1f896b888dd7602b8e33458391471001ee926b363279a4f1c8f159a3cab3f55c959dc06189888d4cb2bcc8115d35062c
+DIST thunderbird-31.8.0-ja.xpi 489267 SHA256 d85dd73c6e239f7307afb8faf426041664fa80a28c013fada8d144373a87bec7 SHA512 612c8e8ba46cb028775882ba777d8accea963ab74535dbafd5635a61e4fe1cde3e78cd90c2d40bf345a82a371f8a69980abe71724f2615e470c10a30a7fd5bd1 WHIRLPOOL a17cf6a55cd86d5584249ba294b5079363e642a2f885b1ddcb925505b85d9d2602af99f898afd63e99cb19da854c1c55195b48166c5c0af68057b53c1c161400
+DIST thunderbird-31.8.0-ko.xpi 448920 SHA256 855fcbd76a5fd150476fcbfb896f910dcf5cb997d0e43439d8bc4fdf09412d3d SHA512 9cc2fa64ada971b49dd05aca1d87edceaf125475c484c2e3ae2f5ec2d0d43c19d6901eeef40543d7ccc0e201c935cca9a3d9f7d4d93ed80cb95c8d1ca4fc93c9 WHIRLPOOL 8e7a51b754948f3261c20b3814b2b17eb76fed9bfc1901647ab3041bd99d56f6c3d446152138d88057447671dd81181f4907a66cb36dc3f9c06d09264ce6483a
+DIST thunderbird-31.8.0-lt.xpi 456352 SHA256 092a770ff436b870a5031758662f95bc284246af07c06cafc9dbea3617a54a96 SHA512 bf42b440046fd9cbb3e0dcadf99f9c8afaa8de1c02e54c1c83008882f9c0d1185a54d13d819d929226fb04355571212c0856cc4617a9dc34c115bf3eb1f96ce0 WHIRLPOOL aada19c3b1336a70ec93cbb4d77f91d4ed484dc0146ab78d88260c8e3bfa542c5dd65f8988eabcc4c257bab65bfb89a3ff23a6df512ece70db68c7b46ae72db0
+DIST thunderbird-31.8.0-nb-NO.xpi 430941 SHA256 a911e621cf2d667d3a3a0766a8088bda274a7a4c2bd0d72775165683590efc39 SHA512 6e163f7f287cd05d0c6072ac3f3917ce4dc9eb672ed4fab6d4f2ee8c6a4cd15daa80f93b5208e3365c203b6ee7b43fd75f1d685f73ee6c80f2043fe9608dad60 WHIRLPOOL 5826c6d1c1b02f293c5a7f2771ef648948e735c9434e7f1fcee26fbe77279300741ab74191cdb412d926e200ca399839c3317c30684d019ddfa44318a06aefbe
+DIST thunderbird-31.8.0-nl.xpi 431888 SHA256 6b96a69616d71057473087c3e82da8cb32f469f7621568abdb6e8111cbbd1be9 SHA512 57c40ca7594955bb4f73749cbdffe41684a3fd278fa7ce9929b80a116ab0bfcac2d88c9133880ced012aef2970dd7917c30150a92cfa20a1773f8b67d0c124bf WHIRLPOOL 1e3c80d3c107d8fcb923cd24b5f422f1fcf24c6c3423fb54704cbf020d5b9689d9701945f44fe5363cc5550d950219b0d982d2cc60264d478b24d93cdc243c7a
+DIST thunderbird-31.8.0-nn-NO.xpi 433198 SHA256 34088f0efd585872735c072b1060c754716720a9e5f7d320f7def582b84d7bae SHA512 ab019f87a2e26ee380835c7981def457f69145f004dc6010be9f56f891d4f9fc8320c64377d8497edaf7481ce7bf14cf801754122f062a0c268693fdb651bd28 WHIRLPOOL c3a2f201cb3d8f319a2342a0ab85f1947fd6958f02f482eb524a1541906c90de646e7083735cfe9934877244150972e1b6f9580edacd491ce51c0eb52ffb9f54
+DIST thunderbird-31.8.0-pa-IN.xpi 525323 SHA256 6c4e01a89da5ba2ae1488c3c99bee176ae75b8174e5260bbe57ebe1cdcb58a52 SHA512 1b790a242bc69e8e795636565a29c2cc37c5cce64fd0a718757106da878810f73227aec931d1d8e1d75d5d271282b4764e2b868f481423cabd0603b2406c12c1 WHIRLPOOL 4a3f8208ff66a45cc7aaffc225fb9ed85cc2526c6ab70084cb11e663514f3f43a80e9b5b472569089f4bc7cb534d4c5845017da49fe0d2bc4d348c2727c63d7c
+DIST thunderbird-31.8.0-pl.xpi 410872 SHA256 c850cf5d3b32fe3fb158f0aa9102b231f3765b3e73d003d56efa22c8f43eb1dd SHA512 bbf0b8b4a71183099d1ac2f49ca719a796c234dab223b73bf3746c433d72b4a14b452745daf0804101e9635a51fe8d1ca528d04775fff41aecde11f4046f88f9 WHIRLPOOL 58f5551eb236e9bf3ba75757cbde50713a5178223470daf0bb1a229e9d418c89537c81f6dbf471fc3cffa1e2b1a2bf21b3a3ad5820fbbe2ba8fac1dbfde0a2b2
+DIST thunderbird-31.8.0-pt-BR.xpi 450477 SHA256 b2c2139b6a3f38ab4439024d4a63002282689e6d07a7bc5dcdf98928872e1336 SHA512 aaa96d96a1f597cc2b8ec123acbd271df2d37b382825b76149047b51fb4e7ea50f59621d51266b1365129328232f0a8a1aa73c938f8fa2998079840bc0147c8e WHIRLPOOL b1a8b82adea706494ae3738d1db94e52bb51addcbe7809238b88b475c9f70bade6cd69a94df758759535ce2134fc000b0cb0703a00dc47abdcf2705465347f04
+DIST thunderbird-31.8.0-pt-PT.xpi 439604 SHA256 2321cf232ddbfdcecf86290c3e5671211cabe576f14c0cc5d34ace8dbc1b9562 SHA512 14fa6a8947b0aaf8436a0f5cacfa9d78ab30cb57f36d8be42ed12f8c6d479d072e5a29caf6c5feab89a1a99ba0ca84bc067dd6391631c6bd12665ee98699ecfa WHIRLPOOL cf016ce2e447f45973ba2d94a92b19ee9cff2f3896077e0b85bc38e07c1a45a9c4d1b368a31872bfaa285de5f0440b6b479a6e92ed6293d4b4893987fc6a2e3c
+DIST thunderbird-31.8.0-rm.xpi 439186 SHA256 7e5045e3e186da0f63c5c456b65e5c017c30549393468ba61b44183bb80cd8f0 SHA512 f2f448066aeb0336c50a2dfa1a276e78c42c1540ca7a20eda1757775adbcfeb4dfe169dd5e1541adfedf66c31388ce66a4fdc0b604adbce9f90a46be692e0d6e WHIRLPOOL 30c52f2bcbc89e672fb2411369e0dbf7ecb96abc77668a563fe05fa08e76ea6589f0862e295f749e38e1a1325eb6f3c98cda15373a52f3e7ca8e3df531eced75
+DIST thunderbird-31.8.0-ro.xpi 479749 SHA256 55e09951b497d9f304499acc6814832ed9c11e6a1bfec3a8e100a9b7b79ac0c3 SHA512 32f6ce6120d28fa4686bc71de5c5210509b312336210903b3cb8884cfd427a5567ff1410cc725e60abbd68835a822a8358fdc14e0cb82ca752099c18685f2bdb WHIRLPOOL 5f448770e921bf62203556728ffd834a4750266eb676f681259090a5ad6f0f5660fbb64b1fe329c65891640383744da3f6b8d638ab9225b207df1b6535ad4cbf
+DIST thunderbird-31.8.0-ru.xpi 436156 SHA256 e2c21d997f0ce377a7ff9e660d54bd5d5c6d4225f764b0e47013b518653ba1f4 SHA512 1890ae5a6e2fdbb78706076ddb4ba7630bba30a0cdcbc4c327f503661624588678793c9aeea45f484810d849a41b4cd849c4755d95352b5de4f03afe7fe75126 WHIRLPOOL f1c16015dcceb18bd3cbfde622fa2a4b118e4a0e5da489d64233d9bbc097ac25a1464a9e31969db55e1bc79e7cfd1626eef3409a894f404b72fac55d41864286
+DIST thunderbird-31.8.0-si.xpi 528812 SHA256 3e421d61fd70ad882673eb5024a35e39e2375d9584736213bf38956d2504d8d6 SHA512 784f26b2d90cf04c9bf68e9083ef2e42e10106598b5c512a27d81f244fec5491ec8db7a80c8acf9efc250144c1b9d83b36fe62438d3d28704830f81f8c1aa705 WHIRLPOOL 9fd3a2e1cb329769566fc7a64cc3f17033cf374bddd558bf0c26dff44e4f74fc810fc2a587f4c02190798036db2fcc3484f77e19e5f55b4efcec82dc92a96a27
+DIST thunderbird-31.8.0-sk.xpi 452995 SHA256 e6172c82f568f1e7edc4ef77bc93fbca931e86a93e11aca12c6d31a4a5204b47 SHA512 5ea21589996bbff2d6d4fb43dbc87381bb2764cbcad9a0bf43f03279391ddfd2f7564193775d211489757a9e974db6812fab10b2beba2819857fde5d3ff3e31d WHIRLPOOL 7f4449b97d62be2062ac9973a211de2273363936d8101cd4b1290c1d299313bb62094d5f01cf11c3e6f3e6c20cde49e1195ef58362b5f0e001945d9bcfdc0dcb
+DIST thunderbird-31.8.0-sl.xpi 433874 SHA256 b8d7e069ee329f8e0dc66e4277134009c6eb0ec1ea80de6bcfda2997dbabea73 SHA512 085dfc6664fd8cfd7935d017365b0123e62a303e502c1f969d26f37d29257a80af0dde694465e97cc12d89457e8b6b1e35e55a75d297deae697b406330d71009 WHIRLPOOL 08c6c3362cc5aed2d74343ec0fabc3944b558b5486108cdc083fe6241d4d879acea4145a18db569015b79d8e44be3636e52995f0c760ac86fde873c4c5979231
+DIST thunderbird-31.8.0-sq.xpi 454695 SHA256 9b8a0b4e4a4f9c0e0c1a523dbdc809ee4e426c7920f8bd7e9d07ccd5da276e1d SHA512 5e552b84ce747ecfe73ccc157a40a4dbe208dca2c2a11eaab814b913f7fbcc8d2ea9b890a99b771b3410d3db9aa25e1cb6a4381ffa02217a274a88cc9c579d0f WHIRLPOOL 4c00fcf53ff3723855f3acbbecdb8c80dbe24ece501e73801ef77036fa65911fd759754a272650f8fcab0eca31b196df88fedfdf3cd4e5b812e89391b61bb65d
+DIST thunderbird-31.8.0-sr.xpi 537335 SHA256 69a86a8928970bcd6b5f8d11e469949148d3f6d1dd6e160adc52d7912dd29ac3 SHA512 aad88436c62ce746cc6855cb7e769cfe2612251e4a089e22ecc529cd0d377fd1a316204ba222ee5febae4da3126cc6562cb3332c2f9015f355d6f78b799702db WHIRLPOOL 9e6d5fb272e2f2e75e5ff5e30202e4ecd1c54309e2c045fbe68ba903ef4badec9def80b6e09e23d0c282bed5e9f7b094a77a3612119fc590aaf9a466dd66e171
+DIST thunderbird-31.8.0-sv-SE.xpi 436105 SHA256 8b98daaa42a9352b869332980194efdb5ddb653b920be49f98e9d2a635147314 SHA512 7b99be71678e3acdc20f4662eed340d5e1f2e989a189d2cef128da7b2a0adc6b0d6d3f361a184004c4163e07a45a5d369f6b5bde5bccd85274033d061642809a WHIRLPOOL 51315ec5344a7c131cc95a0e3f4c211b48679f8474bd0c4967580dfdd0d280d053ebd33f1bd1eb8a4231055892f57fe40cafcbd8561deac0e61ced230e563063
+DIST thunderbird-31.8.0-ta-LK.xpi 553509 SHA256 4698fa1d22c3780b65e34f0999d2f6c81d730c42b52a25d9ede7621570c123a7 SHA512 63fedff334f426fd08aeae6603a332c28c4acfb3e99a24fa8b243b0b5b875a2a77c2c4a54b8ee1c57f22ec87c26f45e119c515325035d82ed7823db6e9f21fbc WHIRLPOOL 635392c74c7454f472e228dabdff4b7111dbce54a1f87f0222844454acd2defca4e45c1832c7ebcbc21c8110c2d0492c095f7d8589a4a9cbf79a9f9485c3fd97
+DIST thunderbird-31.8.0-tr.xpi 457360 SHA256 f50bd19592b71cd077c01e4dbd577ac68fc57432a840010e171ec1e073c96d26 SHA512 4a1ae59efa98c7c78faaeaa122a4eee9025be7f7f56f0eba50d216ea003e4de0c58df8c2e88df962615b139d652f99aea1e4a21e3857ca464fc345eb0932ec9a WHIRLPOOL 1146e84ca6c015342797a22629721a77c0e2323eec7df4df8fb95ce4482781a7ae938e3f6bdb9e620d06d46e9810da45421c0e2fbfa9a34a15aafb08d4ac5ae0
+DIST thunderbird-31.8.0-uk.xpi 499656 SHA256 d5163a906069e20dd5e5b785dc1af32f69487c2118fb1208ad45893a8cfc4bb2 SHA512 761165079979e023bd37f5d42b9828cd499f0e6b161aae5a59daadbf433ef47144f1c8c348f99ac50e510052b136f36d800b0f8f2db5503a901bc40ef37e6e7a WHIRLPOOL 8f3b3c5263af87ec126145e5d1346129f6ff5536d174bfd49551f469acd3cfd9cebb0ef317b29a09b65839d32541adff4563e372cc94dadba9bb1ee099774e34
+DIST thunderbird-31.8.0-vi.xpi 513835 SHA256 9885e46bca6670d6659bc9ddfd4d41eacd4cfd13a0b95646001093598943a945 SHA512 8b225f0b8a4d1d1dc11caaec9d043ee0e6cc5a4e86aaf608819f94182f67fac15bb540a9a95430bdb6053a46faa79ced741a8565b1bd926bfe7940ea8e87ed80 WHIRLPOOL 1cf0564d6293676c68335becb5e0294f2304359091a104ab7219cbef33082d6b3d78221fd57859c90f4f334d1553d1ac9afc5fe532ceb8e425605755c17e7f2d
+DIST thunderbird-31.8.0-zh-CN.xpi 462668 SHA256 09116541b41128d53caa6c14c6c6607896c82592723d6990e1ddb0888868e1a3 SHA512 823d24d53f025bbf8cc8d6fdb6a8056858659d743a2fd5c1c2851d138183186d6fc5c2ff1777005527a325f794d68c76df4ae007227d946b3ac3d19a011fbff9 WHIRLPOOL 573e35628df0f671a66a67313f4959963aa8807c717dbd88e96e325f7d2cef17a6fe6e148808d4ffeb5309fa2af948da1ffea890e5c2759dbd38e25332047303
+DIST thunderbird-31.8.0-zh-TW.xpi 463408 SHA256 2bfd0efd2a0695733bf59d0a8f2c184c4798cc1f3589672f3095a77217d9bbe5 SHA512 cd71d2e4a08ec157b95e70a2ff7acdd62c4c21ac93040b6183be55a14d6b3a4fdf5f9915078ce2487d544d3a2dde3954d5aed40ab3276f72615fb4462e4974a8 WHIRLPOOL 8939d94d9d5ca7ed72fe9e05ebbde37090410ed9b3d1d7d2a8f5495d718e2904f516a5bc123580c87d84baba01bde6c359c66ee371c003fbfc5f65a02111c6b1
+DIST thunderbird-31.8.0.source.tar.bz2 171428094 SHA256 16731f49640e01b908d704e7477b4d9628cb2af9c2a492e5b996adf5218112df SHA512 a37133ca0764df44cde41429b5165e53496d58db1168529388d565c8169b2078492241bf9c95c864b76b226e7b2ec95ac1c121561bc0a87bd5faa8b94a1862d0 WHIRLPOOL 47a8fc9c9828a785e660dbf4e2313be46a6a53d290f489334b7cf2d9bb78129e6a7dd3b9f22f0a1bbbc3bc18145d78751a272190f3e0a503b40962ccee542b08
+DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
+DIST thunderbird-38.1.0-ar.xpi 475295 SHA256 8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49 SHA512 cb8fa60dd8531d6ae4c8015d41568dedab74a83eaa742ea714224f276a8a3d4d71e1cd84e6f4d4e17e4b09a6fcca8b94d2b885c4323776bdd037922b6b38ae31 WHIRLPOOL 37767cc83500f47b40f554cdbc298de10eca85887b80800678a4ac4cfe2afce7d026c52d3dbf45449b81300c407883f1aafc863c1dcc7a25cfbb8e1555c2ab96
+DIST thunderbird-38.1.0-ast.xpi 405893 SHA256 2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb SHA512 9de891efb22720b9c0b71d9290e4643528b269eb595e6f3d1ebcbebda05d061b6db4b49ba934c49039dcbb424db10dd72baf748469387fcbf7726f91b852cbd2 WHIRLPOOL 9782a065f54b748f259a9fd365b9b652b29c8d670552239d319981205a15ff911a7296eb24225bb93c2f987c05feac29fe06861313ae904887e469ff98a2c53a
+DIST thunderbird-38.1.0-be.xpi 442473 SHA256 0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864 SHA512 3a51c25cd27432d64b5980378019f6c5e455c657f3c72a0b72b11fde8cd04d51d9a09f1199e6539c7531aaebc85bc1016fff4e11cd19c98c2810e07a00c38c3a WHIRLPOOL ce6386e21ac5eaf9c8b199699d9d44daaa04aaf142436070824d6b90625c5ac410cf36a99e6241f84f0da2592e3fe420ee920997ddcdc2dbf096495133d3acd4
+DIST thunderbird-38.1.0-bg.xpi 506149 SHA256 806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a SHA512 6fc098efa1c66d3b847ba30e92c41bbe386d83bb2f3d9506e0555aff4a226f082962c5d377074c470b31aee20b917567d0e4816bdf94093abd4754830efbde69 WHIRLPOOL 5d51780c129379203f6796a2054e7ff4ae1d81dfdc7f6234840024591028f98cdfac9df7398d67a66f521f9a7d1273fe2240f33df6ada62ef9e92c9ec4adbfda
+DIST thunderbird-38.1.0-bn-BD.xpi 560648 SHA256 5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a SHA512 902bd6c4e55876ee2af76b8b4b60a1c4dae7a76a436e46bbfaf3cd9ead59a631871e6de561cc85e0c0e6953209f11719376a8aedb95bea911f89d0bcb48487f9 WHIRLPOOL 0bb2d627bdbe4566b3bcab6499fe3e0582a63060d0d9faaaa2545b0b1b7977744172af0b3ac8df4dc275ab5ae149ac0b0d733971c7fd76be74cd75afbebcb536
+DIST thunderbird-38.1.0-br.xpi 449788 SHA256 c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9 SHA512 6f65a0df88c83068746a74a0730cc306c8679efc3aab8db17a7baae90b289022743134b08db3941fe62a0bc573f372e41ed24771dd88d957ee99f57278444f85 WHIRLPOOL bc673bd36d1925e5b7ecd176a74481ba1c3cb7ee2957c9920dfdee870977b420e7b179a05c02cb51942a3695857d674ba03e5593ffeb21ab2def602a4f67eb73
+DIST thunderbird-38.1.0-ca.xpi 450347 SHA256 82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309 SHA512 914cc04784793762392010bde0a32228720a4ad76b9381e63717d32012b0b49b69cbd26b2616a14ba4cd057e1d70a9489890ee7f7e3f6bea85bb9874ddba4715 WHIRLPOOL 1cf1d2e27daa1fd9205e68bd7910c91fb0b999ca3aa3f515c8091b5cf038d935769a8b143e505efaca2f7d9cac2d673401fb94aedde31a9bb1c2c0c67ce61bfa
+DIST thunderbird-38.1.0-cs.xpi 448723 SHA256 a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca SHA512 268171ca2a3401ae13e711e5decf1bcd3e2c1b76eeee39390b155e73165a7b05f95910a65fc69005dc347abab3dca37177b067589cfad1e5928cc15aa45d17cb WHIRLPOOL 21f010619c319c46f988f01900969f48e6d7cc8e2be92803714644d23b4540a25f727f0bf866ba177400d16d5a614f9f91e580bed68c1abb84beaa7978d50b7e
+DIST thunderbird-38.1.0-cy.xpi 434848 SHA256 877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365 SHA512 acd4c4e811792d68e2a1f58517f9a9b07976354630f396ea994b9be43bca616bee05edf998347e87f542b85eadaf9a0dfe866a9e08a4f2854e29a8267a7a724d WHIRLPOOL aba90842e54b2636c7a5e8d599087b21672fcf4e8ea0e8123302ad8566e859fd8abd6afac258630938a08e0ca2e0d49c47bb52d535634e39f546aff1f6cc0928
+DIST thunderbird-38.1.0-da.xpi 425828 SHA256 fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526 SHA512 ae0f931ca42143ea154b0a5c8442f3cc7ea7c2684f90ead32f8f61ba520367ace19293eba21c6eb2f17a7f600bd75262098a972356ef3efaada8a40180327831 WHIRLPOOL 3dffc0d259e0877c085bc34eeb827808dc7496f97283c6fd9c5d82f20ab7fff6d0916da528e999ac7d00d0c89fded72ab14c2d523bab6f9e4060daed3bf5c053
+DIST thunderbird-38.1.0-de.xpi 429876 SHA256 bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e SHA512 9e6d9eb4f537d03627f5f9566a5c1c78b80e34706fac60ed7fdd32f071d574b9590df89751b1d0257fc8495fcea78682f11ced2130163151945014cab5a56568 WHIRLPOOL 2d19fcf7698e16588f929b54a9665f6cf71a7457d54dd331a8fcc5767aacbd0d6e0e7eed515362484fed2d1bbdb078be6928b6263242685b9b7cc1c6a20fe61d
+DIST thunderbird-38.1.0-el.xpi 493511 SHA256 d6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c SHA512 768a6ca1c5611a1cb712cced47f6678bf5c85182929a198a4885ad8cfa9359aa906d290b3de93e8dabaa2cfd1f809bff9601d12abcd3feece5b0c0e429a30f21 WHIRLPOOL caec8f093ff178aa212b8907ebc8f8e9cbeb66bab9e14e914ec5c81da9cfca6fc53f67a2ad6203ad49fc99e3e1ff62be8e4f2bef79e1d0ae9f9336b18c5584a2
+DIST thunderbird-38.1.0-en-GB.xpi 416571 SHA256 07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81 SHA512 b60b0b2410f0e61d491db9538530e6eca40f43801e33b75ee4fcc94808893b81186cd7d759549fbb0abfad38c5d03c38a358a2314c48558b43164d1b62b6687a WHIRLPOOL d0e6237a104ac78e85a20e0fed5109d3a36ae0d2920af72c01f457b5c13b8b4a457c727b00512bf73d87d96c68d645678097c3e99eb0790465795262431bd294
+DIST thunderbird-38.1.0-es-AR.xpi 442640 SHA256 c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d SHA512 9110f799b42ef8fc629f15849588b60fc3cde6e58286cb61f17b26b0b5c7174bdd25ad324badc1909f6329000ef987dedbb485e2a7e42cdf9563229ef4a562fb WHIRLPOOL 37a08ffde4646e5e34b9e9d0de912271815ee85fefa7325db9df7cf7f40ac0856cf751534a8b6f25c45c06453f2cd188a75d5b0b32275120229e28f7fffd4de7
+DIST thunderbird-38.1.0-es-ES.xpi 376066 SHA256 79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0 SHA512 388f5b8d4713efd92cec581fded9a90a6bbf80958f77fc1b40e533851ecb2bb5d3c16a3ec74fe448d2a2db613d08bf5ffb42d150426dc846d34694208d274dff WHIRLPOOL ce5757a6dc4698cc5942da060b2d5dcfc73469a9a38a7d60890bf37a5c16f462ce3454599de88f1b6dbd82418cb0f5a7987eb3d24d3deaf787de08c96d1112c8
+DIST thunderbird-38.1.0-et.xpi 438262 SHA256 9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d SHA512 56cf66e23983983535d86b1d772ba133b93b6d45e05768780ad0b471b9c284c9a0bee466dfc162fa8d53e83b87bcb86027e23b9bf4491df072d5b18e3d91c86c WHIRLPOOL 3211c433fe48be15600c60b6c9b9d186dd740c858d0204a647d16d17d6ab7942191bc7e33aa04ab8271b906048f8c5c0f9c648e4859f118282e01b744ab5a382
+DIST thunderbird-38.1.0-eu.xpi 434837 SHA256 0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0 SHA512 55f2202ae4a3d52944a71c06a9faaa9c6be9ddddcffe6f8116dbc8283dfec24d5cf0f6dfc28f1c2af2381ddab5427bdb1e4a821356f13ae54268e35084bcee14 WHIRLPOOL fabcca0cc70d928a203af9498bde229ede4d75bea39020a3baed86595f59169a787659dde6aa9a8266c5ede06b4e4f93a2f3dfeb546dc5420a320b919bdf5f2c
+DIST thunderbird-38.1.0-fi.xpi 438889 SHA256 cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729 SHA512 5e7ea275f05dcec6e4786aa2861e6944f2e80ed6f36cfaeab42484ad11e218be620ba9e72fe1271f304b3c9bcc2eaf08b5e1f5ae9f64fc0440622f16fd139d61 WHIRLPOOL c8d5cc80a791828e8e1881dfc72633373742960874a0b63aae4504c2db35a1e172808077e8b295e001414707a43c3eb9590a23c64261e79ba68971f181b76c49
+DIST thunderbird-38.1.0-fr.xpi 448227 SHA256 56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77 SHA512 7c38d209a3be6a49e0777df74e56107d149bb28a8071db146556c0aaf9f3dfa5dd34839cd64311d2db3f543706820cc3058d9c14e3ca216d9ed5339d147fd113 WHIRLPOOL 70ba05665af63341fb4ae510c5959bf861b9b146bd675a2d9ebe6b2e19fb3562f805df4281ac6de4a863ac2f1782d307a403012838ef3c77ddaf82e6de81b0cb
+DIST thunderbird-38.1.0-fy-NL.xpi 442161 SHA256 00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87 SHA512 2797c569cb1466e65b090975fd01db88065ea4631c740ea37cc2ca2aff3fe31fe746cc463738440618decd8899192839c3cfb8e826ae73b7a8d3ebedfca881b2 WHIRLPOOL d8d44b1b8c38da2cf336b3b3ef127d54c67295cd061be38a2443abac18594fa3cee668d62d044f720985e9ce96bd5ad8a69aa7fd4522d0f19ff0366737cc2a5d
+DIST thunderbird-38.1.0-ga-IE.xpi 457412 SHA256 76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e SHA512 e4334a33f704de6e1e51a342b165b42c7a2c5fbbb1f74ed4532fba20098adc9b23a8b4e65f48bb995117d8e8c59a9b4938b83af4ec1683d2ddf471365eee7c26 WHIRLPOOL 0a3b1cfc1bed92403e37117944070972ec7732c7593239dfb8554ef779aed600dd0b7c0f1f276706d61659a31d63ab70be58a89a0c5a24570d6a894f1087467c
+DIST thunderbird-38.1.0-gd.xpi 456317 SHA256 1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835 SHA512 37948f8d660f71f4bc8cfeee8fd57b8e904bf0d82844940389bdd92647743861c6b55b755d38be43c0e17a19c80963bcd19f66b7a924ec1e1482d654f392809e WHIRLPOOL 5bdacf218b791809ac28b936a5809cad9737873e325d63ed4eb4f6137fddd28912854bbfc802c9916d58304ad2d9c5c547fc9bef2886015138358fed846c29ac
+DIST thunderbird-38.1.0-gl.xpi 457860 SHA256 ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3 SHA512 56bb87f1df17f25d5067c8c0c2d450066970d316d0cd67d3e8b51916f999c0b25e7fe5d15de506a01622095d724b1492d760d1d1c3259a0b16b59628019dc116 WHIRLPOOL 9395bdf33dd6c634bb9727442e13ffbfb41cb145ba17f04387798770ff561a04a5bcbd470dbc4830b07323d5a6c334240b8923db900746c1cd65a21517f72dc8
+DIST thunderbird-38.1.0-he.xpi 485888 SHA256 aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41 SHA512 9c42ac8fe730ec61adf3304281d49757a47dce6e9ffc9c233368d5c4187e9314e943f167435b5077285b1b4f647a2b13f4d1c691c738f74635b225c9d389a940 WHIRLPOOL 2ff8a0c59153cc288389ee777716afea3313402a2815dd18e8caaa9bbb0a8d48a6c6e911aa7d3b0bd298e6cabd9052fe067c507f1d1cc458f28b89a944b0c34c
+DIST thunderbird-38.1.0-hr.xpi 440419 SHA256 f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a SHA512 193270f7567d3c44d27e04a9ae8aade37ddef7c38f26965bd2aedda8a6803f9f6d69a5899f8de7cefbc7ebd4ad1aa54a840df21ed51dc2485669e2c0339d6d2e WHIRLPOOL 530087456acef4d1f2d4d8174a826fe1533a8ac121377099993301f9c373a2b421fb9508ebe34de90b5594d81cc928a8f48bf04886180eaddf111aa396962837
+DIST thunderbird-38.1.0-hsb.xpi 456454 SHA256 f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a SHA512 734ce7c3e0bf0f030da540f5acb1ae586c27a41474c718ecb911b03449130c6753a0c37202b232b83c9b6943bcf49f1f8e57bb945e580b15c09ed50becc5157d WHIRLPOOL 8f712f5f7202991dd22262b4a5406d04b20f764d661552e30b43cb561c06217c2ceb4819574b7071c4b67f7ca53d22323064300a97152323415a2827bbb8d4d4
+DIST thunderbird-38.1.0-hu.xpi 457987 SHA256 c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf SHA512 84743fc8e8f272eec14a9341f08688c07c36730813f832e27811e9cfa34b30b13c5bf197b1ac41005724ff71ef2c9d87384066de385a60c888f794859e8b0547 WHIRLPOOL 562822eb2fa08d3323a51c2da47f3756941f0b0851bd191c54ea50ea58058fee04ea331ab7bfdf8d32547f2b43498abdb5d8bc047247736ede03130c5c33040c
+DIST thunderbird-38.1.0-hy-AM.xpi 500379 SHA256 56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c SHA512 57fcfe8abfa0d7e3c109bbbd54d6e7d87affbee17bff3e0c4054790a8d80400686f785b0bd02197b8845a12d71be59e03ca09ca9c0f6ad2228ca4cebb2ae2583 WHIRLPOOL 0ae42cc1d667776453b110c0d9e21f1e8c80af7cf1d0e4b9a9786d072d707cabea398223588eb120d9d6a0ddacead7586082cf26d3c26162eb365d0250b062b3
+DIST thunderbird-38.1.0-id.xpi 483209 SHA256 913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321 SHA512 921e941c2ba48f71d0051f64337dae777ece1b4c431c770ffb59dda77d3d6affdab5e1325d3735f185c2e6036a8bcf4654669dfb5e45223752b5182042293f96 WHIRLPOOL e93b6acd424ca87c91c3172b19e654a5bd97f0fc1502cd0cbe8baa4fec68a9933c0bff37e99d1090211bfa7da97aa21763b5374be6756ae8a2187c0ae7c9dc2a
+DIST thunderbird-38.1.0-is.xpi 443008 SHA256 0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970 SHA512 ed917f0509eeec67a02c633551c1eb0480f6b4b9ce4448869bd99d9269979a52ac1c450bd8b8b27338f481c0a46dada125474e0b0d27f04c2ff0320488fb8e86 WHIRLPOOL 99f202a528e2aefbbfaf963448f846afab231c9bd1c9ab100f658636594633df5c344b0c5f6f106ea80d557588c640b661a054c6734f8456ea1864ea59de9656
+DIST thunderbird-38.1.0-it.xpi 369023 SHA256 2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7 SHA512 1ab2b5255fd9e5a5b8040d72a690ad7d3d92189f0f55ea175e0b6982dd4f14dc754129821c9f208979ee33286509fda1343e51474ad259fc078acedb3c91b246 WHIRLPOOL 49046c224a488b5f967aa4161d5a7c6aeaac42531ec4a6297cd37805de5288f8b6bad06522ebeaac4358fea5d6fc9533e223ba22a79920f27a2e1c587ab132d0
+DIST thunderbird-38.1.0-ja.xpi 492860 SHA256 c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257 SHA512 4b14e14e3be3d7d4839c52617200d7c2d9dac3f7e7f4e9e69657f51b42750a1e9aa1b23a47b361fdfe959f66e6adf5fee9fed73f3f80588de77c532376ca69ff WHIRLPOOL d6ae239e45c3646748315aecea853407f75bec6b155a0985d93236209167dfde2462d5aa8d7c3b113ae43a0119ee49da527f9423629a9ef720885c61ce8e6b53
+DIST thunderbird-38.1.0-ko.xpi 454852 SHA256 42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951 SHA512 f85cf05450159b0680463f64e0aef47fb1c257d96d7edf69bb30cb1085d4cb2791054ff1d3e8e1c457bdc495ab3400b1fb87441b632518fad2d75b96f6c9a479 WHIRLPOOL 2980c6214cafec7d72adfe415ffaa7073a50b3fd4cf850646476745a972ecea8921205ef5ec36442687b77a9b3066ae42fe9baf2830db7193627e8d3e1e0421d
+DIST thunderbird-38.1.0-lt.xpi 454571 SHA256 bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad SHA512 48105894bab38f2172f8f2d0c827f602ec64c0bdba1b42d118605fc24f08e1389a19fd02bbfd5d87144a952622a4c1cbacad4e7ebeb7c4ee61e012981cb3fa55 WHIRLPOOL b2c300b0e4cbb4ad295862a385c14b7f650c2af612629fab7254010cb3fdbc8ea94e3bf7bf618ba3793e3dc97ce585f320e2dcd5ee9d3980a27454c51d6e0d1e
+DIST thunderbird-38.1.0-nb-NO.xpi 434340 SHA256 e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3 SHA512 45cd2f27ed20fc4dd9524637b23dda1540436f6c1907593a542f534c5cbba0b550fbaa8fd392f253a43be9e1e7f44e5e4efe3173448c0c474993df99a05d0f34 WHIRLPOOL 51a7bbe055d4362ac957cc003e1fae5d695e2e1795b57b9d18ec370f174e183e3c49de12b459e6541f34f5552981a17883fca022655c0487c8e782dbab8ae980
+DIST thunderbird-38.1.0-nl.xpi 435107 SHA256 032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d SHA512 109d4350fffd9fd2f67785ca1714ca5f31059d1c123b58fac167f25326d360a7119b52acc5ad414d9b5d130437ee6410d3f114a2672d9be72e00829dac6d9b7a WHIRLPOOL 2e7d7f16c7ffe06e94b6c43db8861a166239b2900721167703a8091dea8960a6de9680c70590b8b22f4fc785d53e84bf067cc91aee0d5dd5fcd5725fa4c01995
+DIST thunderbird-38.1.0-nn-NO.xpi 436622 SHA256 361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29 SHA512 b76a3a779dcdc0239a4af5cf05edf522392a67824d756708dfe9d4e9e7def38ea07e4e2ec622bb7fd44c57bb91e88136c978e2c215f9e03d1babaa84d5203bec WHIRLPOOL 5d05d6c8bf9e2213994504720434e7781618da2904299d3e9b9ae45a897a67cba0a41e9577ddc0b9ae2dea1b5b3990e01596cdb5097bf34d754d1207cd030b61
+DIST thunderbird-38.1.0-pa-IN.xpi 530483 SHA256 53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e SHA512 36d63c933d5d37a4108158a12a9010eb90f62c3c7f0dc3fe30c9e114ef6b8c858d0a72f5020f177d4c8b71391f419ddff67fc071c04a08cfbca2383f940fbbdf WHIRLPOOL 8c0e41dd39c0229a8ea70d256a176bc3bd31a79e071b6afd08ba7403627ba8b02ff47fcd7277a97bcc2a06990be6bbb6f785675944815360e9dd0a2715c295dc
+DIST thunderbird-38.1.0-pl.xpi 411508 SHA256 d9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503 SHA512 0a1ab6513a3ab150d0a249e61027edca34bfb42c0c6ad3480f2c9b43493f37610f0ebf503d06e3d069207a491d42d9aca544afb54ca2f2f3fc78e48171b82979 WHIRLPOOL 59c4bda706c1bf5b9599c4567339bb5f95d461dccec4d51ac8be98ae8104e7962033c99018bfec375d7773ebacfe2d8c1fd6bbb7caeebe09b51fdc095a8ac2bd
+DIST thunderbird-38.1.0-pt-BR.xpi 443773 SHA256 8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0 SHA512 d36e43092058e352a0c6c3d605cd48c80d62266fe5ff6870a8032b3ae8aa7c5c779896a65db22a4c331adfe3b31669f160ed33602cd6d0e1635442580105f5b0 WHIRLPOOL a6439044cc8b936d32f113d93b305424c7c3a1e5fe6954291e08f932275d1afbfa9ebe9e7428971768d1294d51a69cd0e5db743316c70a6cc8a81a2b4048ddd8
+DIST thunderbird-38.1.0-pt-PT.xpi 442063 SHA256 d6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe SHA512 451c6221d5a1acac6c2b68f2be0a833486904cc8236d1cf68000b4ef2c2e3bab1ddf623c21c67f6335bfd7003a92e1efc84f5961e452907ab39d934d4bdb0316 WHIRLPOOL c93e1c58e8ddbf7c3adcfc4d92037ecaee99f24ef3f32a35b51e4f9f59698f1865dfaff9290e613867ec391c5f46a6a84914722724f326529577b892ec1f2882
+DIST thunderbird-38.1.0-rm.xpi 442112 SHA256 fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400 SHA512 b5a9435a3de499154b5113f48b59c7caba6d216bd17d74d41abf9cd308f7262392cbdc9647d4df4958d9a8c770cc6a0325ee50b6f5a7a9c2bbfdac25cf414e10 WHIRLPOOL d3c671ad440b88bf6de4009bc86994ab959f5106629a13c071566fd79e748b2a63ac0add8789950545619bd29f5627f0bac2f57d7104d3c004e89c0cd727e245
+DIST thunderbird-38.1.0-ro.xpi 448347 SHA256 2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42 SHA512 4c8d92655e25e3aa897d6ee82ab603867ce5ff94cfa3a9905752406b01c4e21f3555d3925398d36927bb03b409f963484303ae281f1865fd8c43a4dcc3943b68 WHIRLPOOL efc5fd7df29e3b76ccd17730dc5161c9f208d386e8e32fe2cbd7a6c07d51ce4ace8bf74d457feaa86a3a19899b0ae5338f0144981cb726ec96dfe06fcfdaf477
+DIST thunderbird-38.1.0-ru.xpi 437591 SHA256 85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104 SHA512 0af66f2923376e8aa3d646923347538451ef8239933052a5f6b984e7b805e2d664881613ffb805b000d04b02c54f8e59ff7138f9f0d68f7c327ed5657df21805 WHIRLPOOL 6ef4ceab17f8ec824f38c7eb3b41bc5f998239928ec1aa4796f296d03639f2780927366ae715459b2d43ab30550f8a9f78e723dafa25f04654f423baca845b05
+DIST thunderbird-38.1.0-si.xpi 535362 SHA256 8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25 SHA512 ceaaff93b4b55961d5d6a30aa801d16487193bde9c42b5b58a57cbbbd3476aee8c3955a90c353f30121480d738d2b8bf0ed40cb6132be3f5d0ddadb47bc088c0 WHIRLPOOL 3e65b4a10d0d948b3ccb1b8728c730c797486505b2a5557cbc14e0adb1fa8f60c8638161ad94bd5818db291190c06b4ceb3222445ff66360e7e502957bdb4fbe
+DIST thunderbird-38.1.0-sk.xpi 456606 SHA256 8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659 SHA512 d4078fe186924846b3f98b76518bb3aa1075b7ad023060ab42f680d0058a5f5496958b2e6038cb8f52174cefba7951d3608b40d806a978363bbd9a212e4d1327 WHIRLPOOL 27ade9ad8d1b9e6524b4dd5b6f5d354b28f1af4c72136569c1127a0edfcb256c6ccda33a2dd6fbc32350d1dd15e9e5843a45b67f82be81eab633ebd48332f446
+DIST thunderbird-38.1.0-sl.xpi 437847 SHA256 7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66 SHA512 bf5f55c46957297d56d3c061552c18ef42e5c39376d2a69340e052a6cb4f9be1685a3631263102444317e3e3d74a83e16498619439a8bb2f79bc64187c84c683 WHIRLPOOL af214ee8d40ba59535047d6cebea0135f52df57ab3d28f17e2f7e665c22408b858f37d41579fbbb20b098da649a46ab687ffe087d8ab1e5197f12db961b95431
+DIST thunderbird-38.1.0-sq.xpi 446896 SHA256 0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6 SHA512 41daf3b6c0b30d171017d9ac929de4d31ad1e9966509f319a2ab998865e699c7c433f8a6158cedf93d06e376b78ccb4d20081d7de50023590670ff18e21d8f94 WHIRLPOOL a1c6a72faaa7d9be63cf0bb30ac131207f3d1af1f8c21c5d18662141a6b44d20a9046ad73a7dd8829aca9f89fd01ec56db55c8e55e04d29844728ed8410d5ace
+DIST thunderbird-38.1.0-sr.xpi 543336 SHA256 c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee SHA512 bcea2e30e0cd9a2327913fb472537fbbbf40e179270859cb3739bebbb14bc91c15566de46d0dd3a2f867944c68fd06243f5d2530d7da1b70b1e14186db5e46ce WHIRLPOOL d3725d45a9d8e811c956f584603299819a719b371dfd5d69d7e4692d106379078b2f33d6581e37f61097196e52797639dba8a4b9d48becf114976765b27baf33
+DIST thunderbird-38.1.0-sv-SE.xpi 439633 SHA256 59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133 SHA512 455ac778423c502dc3b7512312c7838b03175fa46c541a28ef0228735a8e13fa4e3f0cdeb1d1b4fa5b147515d2789278d3f9504f86143d99fa444febcc90ed66 WHIRLPOOL a5399a91265c8bcd9042cff5884673bbbd0d1205b32e70e9f7d4efcaa55b08a1ce9053a177bade67ab30f0853172ebcc2c7d979756c752cdfbb2c669f953d19c
+DIST thunderbird-38.1.0-ta-LK.xpi 558759 SHA256 891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f SHA512 eb9fce88f57b0b2ea2ff79968a502dadf757483688d498bdeeb64a2a1a5d5d33918adab3af5aef53dd15fbf9c18b4f6196a64580b089d8fe84f9d9180146ed92 WHIRLPOOL 494e95f5ebc90872c340b65bf6b65b7640863c6033dd36f5ef84fb729031ad485a7fa9b8b16b536800c959b80da024aa6563507c09c95daad5df6ffba407ede0
+DIST thunderbird-38.1.0-tr.xpi 447799 SHA256 5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc SHA512 8be8b566c9c53f3bd3ab4f6121bc0b4f5c8c718d2ec52e4ed7bf673844668cfd35b44c99a7a96703fb7f7dc26c8eb26ed50cce5428fc4bbc2735d57709dbe8e0 WHIRLPOOL 5359fa06fa12527a9f718c6a35be88eb874f41206269ee4e71b2ff5d96285a62c030d041eb3284cd12e9d32bb1563277c36233c3fa46eeb18de5d8bde673b974
+DIST thunderbird-38.1.0-uk.xpi 509621 SHA256 e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1 SHA512 53ee0b14851faf57127bd84aa2a9113b05ada16a85b81f589786f264819e79c93e0e250ed46405cb94c2cc7b509a5b85ab92071fb8876fd03e3362cd613869ac WHIRLPOOL 78e834301e45df4940c1f1d9109fd629d32c1ed1120365297f709019c294d6e20cd75edbbce318e435ff7dcbd1fb1273cd318e25b8f05868adc64325dea916b4
+DIST thunderbird-38.1.0-vi.xpi 519864 SHA256 6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626 SHA512 baf9551168ad25f6fe07be1798bf9256313211d3722a18e49ac8f6d4f266ea9379be1561ac5a4e798ac8c908cdd143e5423e3f81e57d7ad074577ec191df5c12 WHIRLPOOL 067a004abf19e12b6e17d1e2d7b54d19037ed53906e2c1fa655c5b10ba5474d71926d566a7254cf870a1cd2e3e8e6b286f176b09c971bee75ef493d26320a883
+DIST thunderbird-38.1.0-zh-CN.xpi 466411 SHA256 9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b SHA512 f6b42fc98b12bb821ac86c1e860e4191636d67b1647810fef45804fe4530131531a1b5e3a0212fa8a97d53c2d89611fa3f316517f3f1dcb12f8ebd4f52c3225d WHIRLPOOL d8e4e527a19883aa64fc19b55761fd2506464c3223f1ead63943c3564bf5228542d2639c52446a738ca538a13e913707ca0ade4500b4e5e500ab06f713182903
+DIST thunderbird-38.1.0-zh-TW.xpi 466660 SHA256 65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca SHA512 9cc890a50c5ba199e0a1fea9b9245895b1bda8f9a73e38c60191536113a960f8eef9c0d9c46bbf6b06451109fe60dee4e88136520291581229b8b302dfaee4a8 WHIRLPOOL 9e47e59b80ab8e947e8ecf8f0a02e76a9b1b92916701582e9c2995bf1eba8063497f05abb2ea75df05cff7181970357db24908e43fcad003e19138aca7a5a939
+DIST thunderbird-38.1.0.source.tar.bz2 204161689 SHA256 ddf1fd6048f07370bb0375eac76e687c19d29100c19e9f86fc04bb88d4409787 SHA512 9b83873a06ac9d6c01222e9079b8c1b6dbd25594cd1c134b20ba44d06d209a764ff8a1549b5a6f2c53b27cb3779374dd95c6c8f51f415a07b45b7dcf5dfd576f WHIRLPOOL ecf40449657f91175316020dcc3d74f5e57350ad28fe50137872ea5671088110a0033b51a73fafb28f9c131193583688c03cae17ccd45e9628020648773757b0
diff --git a/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch b/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch
new file mode 100644
index 000000000000..ab4b613c364b
--- /dev/null
+++ b/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch
@@ -0,0 +1,38 @@
+commit dd4ad2eebd36c84307222ca56c10c073527d7054
+Author: Patrick Brunschwig <patrick@enigmail.net>
+Date:   Sun Nov 24 19:06:23 2013 +0100
+
+    fixed broken parallel full build of TB (patch by Fabio Rossi)
+
+diff --git a/lang/Makefile.in b/lang/Makefile.in
+index 2334d4f..38688e0 100644
+--- a/lang/Makefile.in
++++ b/lang/Makefile.in
+@@ -16,12 +16,12 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(srcdir)/../util/build.mk
+ 
+-all: export jar
++all: jar
+ 
+ export:
+ 	$(PERL) $(srcdir)/make-lang-xpi.pl $(srcdir)/current-languages.txt $(srcdir)
+ 
+-jar:
++jar: export
+ 	$(MAKEJAR)
+ 
+ clean:
+diff --git a/ui/Makefile.in b/ui/Makefile.in
+index 6309525..13c98ee 100644
+--- a/ui/Makefile.in
++++ b/ui/Makefile.in
+@@ -28,7 +28,7 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(srcdir)/../util/build.mk
+ 
+-jar:
++jar: dirs
+ 	$(MAKEJAR)
+ 
+ clean:
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-31.7.0-gcc5-1.patch b/mail-client/thunderbird/files/thunderbird-31.7.0-gcc5-1.patch
new file mode 100644
index 000000000000..7723b81488a4
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-31.7.0-gcc5-1.patch
@@ -0,0 +1,242 @@
+Submitted By:            Fernando de Oliveira <famobr at yahoo dot com dot br>
+Date:                    2015-05-17
+Initial Package Version: 31.7.0
+Upstream Status:         Unknown
+Origin:                  Upstream, self
+URL:                     URL=https://bug1024492.bugzilla.mozilla.org/attachment.cgi?id=8439834&action=diff&context=patch&format=raw&headers=1
+Description:             Fix building with gcc5
+
+diff -Nur comm-esr31.orig/mozilla/js/src/builtin/TypedObject.cpp comm-esr31/mozilla/js/src/builtin/TypedObject.cpp
+--- comm-esr31.orig/mozilla/js/src/builtin/TypedObject.cpp	2015-05-07 15:53:49.000000000 -0300
++++ comm-esr31/mozilla/js/src/builtin/TypedObject.cpp	2015-05-17 09:38:36.550714030 -0300
+@@ -710,12 +710,12 @@
+     contents.append(")");
+     RootedAtom stringRepr(cx, contents.finishAtom());
+     if (!stringRepr)
+-        return nullptr;
++        return false;
+ 
+     // Extract ArrayType.prototype
+     RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal));
+     if (!arrayTypePrototype)
+-        return nullptr;
++        return false;
+ 
+     // Create the instance of ArrayType
+     Rooted<UnsizedArrayTypeDescr*> obj(cx);
+@@ -728,7 +728,7 @@
+     if (!JSObject::defineProperty(cx, obj, cx->names().length,
+                                   UndefinedHandleValue, nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     args.rval().setObject(*obj);
+     return true;
+@@ -762,7 +762,7 @@
+     if (!size.isValid()) {
+         JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr,
+                              JSMSG_TYPEDOBJECT_TOO_BIG);
+-        return nullptr;
++        return false;
+     }
+ 
+     // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`:
+@@ -775,7 +775,7 @@
+     contents.append(")");
+     RootedAtom stringRepr(cx, contents.finishAtom());
+     if (!stringRepr)
+-        return nullptr;
++        return false;
+ 
+     // Create the sized type object.
+     Rooted<SizedArrayTypeDescr*> obj(cx);
+@@ -793,7 +793,7 @@
+     if (!JSObject::defineProperty(cx, obj, cx->names().length,
+                                   lengthVal, nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     // Add `unsized` property, which is a link from the sized
+     // array to the unsized array.
+@@ -801,7 +801,7 @@
+     if (!JSObject::defineProperty(cx, obj, cx->names().unsized,
+                                   unsizedTypeDescrValue, nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     args.rval().setObject(*obj);
+     return true;
+@@ -1253,7 +1253,7 @@
+     Rooted<TypedProto*> proto(cx);
+     proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject);
+     if (!proto)
+-        return nullptr;
++        return false;
+     proto->initTypeDescrSlot(*descr);
+     descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto));
+ 
+@@ -1358,14 +1358,14 @@
+ #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_)                       \
+     if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_,      \
+                                             cx->names().name_))                 \
+-        return nullptr;
++        return false;
+     JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE)
+ #undef BINARYDATA_SCALAR_DEFINE
+ 
+ #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_)                    \
+     if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_,   \
+                                                cx->names().name_))              \
+-        return nullptr;
++        return false;
+     JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE)
+ #undef BINARYDATA_REFERENCE_DEFINE
+ 
+@@ -1375,14 +1375,14 @@
+     arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>(
+         cx, global, module, TypedObjectModuleObject::ArrayTypePrototype);
+     if (!arrayType)
+-        return nullptr;
++        return false;
+ 
+     RootedValue arrayTypeValue(cx, ObjectValue(*arrayType));
+     if (!JSObject::defineProperty(cx, module, cx->names().ArrayType,
+                                   arrayTypeValue,
+                                   nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     // StructType.
+ 
+@@ -1390,14 +1390,14 @@
+     structType = DefineMetaTypeDescr<StructMetaTypeDescr>(
+         cx, global, module, TypedObjectModuleObject::StructTypePrototype);
+     if (!structType)
+-        return nullptr;
++        return false;
+ 
+     RootedValue structTypeValue(cx, ObjectValue(*structType));
+     if (!JSObject::defineProperty(cx, module, cx->names().StructType,
+                                   structTypeValue,
+                                   nullptr, nullptr,
+                                   JSPROP_READONLY | JSPROP_PERMANENT))
+-        return nullptr;
++        return false;
+ 
+     // Everything is setup, install module on the global object:
+     RootedValue moduleValue(cx, ObjectValue(*module));
+@@ -1407,7 +1407,7 @@
+                                   nullptr, nullptr,
+                                   0))
+     {
+-        return nullptr;
++        return false;
+     }
+ 
+     return module;
+@@ -2466,7 +2466,7 @@
+         if (length < 0) {
+             JS_ReportErrorNumber(cx, js_GetErrorMessage,
+                                  nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS);
+-            return nullptr;
++            return false;
+         }
+         Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length));
+         if (!obj)
+diff -Nur comm-esr31.orig/mozilla/js/src/frontend/BytecodeCompiler.cpp comm-esr31/mozilla/js/src/frontend/BytecodeCompiler.cpp
+--- comm-esr31.orig/mozilla/js/src/frontend/BytecodeCompiler.cpp	2015-05-07 15:53:49.000000000 -0300
++++ comm-esr31/mozilla/js/src/frontend/BytecodeCompiler.cpp	2015-05-17 09:39:00.183186652 -0300
+@@ -544,7 +544,7 @@
+ 
+     RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options));
+     if (!sourceObject)
+-        return nullptr;
++        return false;
+     ScriptSource* ss = sourceObject->source();
+ 
+     SourceCompressionTask sct(cx);
+diff -Nur comm-esr31.orig/mozilla/js/src/vm/ScopeObject.h comm-esr31/mozilla/js/src/vm/ScopeObject.h
+--- comm-esr31.orig/mozilla/js/src/vm/ScopeObject.h	2015-05-07 15:53:56.000000000 -0300
++++ comm-esr31/mozilla/js/src/vm/ScopeObject.h	2015-05-17 09:53:20.202966820 -0300
+@@ -63,21 +63,9 @@
+     bool onNamedLambda;
+ 
+   public:
+-    StaticScopeIter(ExclusiveContext* cx, JSObject* obj)
+-      : obj(cx, obj), onNamedLambda(false)
+-    {
+-        JS_STATIC_ASSERT(allowGC == CanGC);
+-        JS_ASSERT_IF(obj, obj->is<StaticBlockObject>() || obj->is<StaticWithObject>() ||
+-                     obj->is<JSFunction>());
+-    }
++    StaticScopeIter(ExclusiveContext *cx, JSObject *obj);
+ 
+-    StaticScopeIter(JSObject* obj)
+-      : obj((ExclusiveContext*) nullptr, obj), onNamedLambda(false)
+-    {
+-        JS_STATIC_ASSERT(allowGC == NoGC);
+-        JS_ASSERT_IF(obj, obj->is<StaticBlockObject>() || obj->is<StaticWithObject>() ||
+-                     obj->is<JSFunction>());
+-    }
++    explicit StaticScopeIter(JSObject *obj);
+ 
+     bool done() const;
+     void operator++(int);
+diff -Nur comm-esr31.orig/mozilla/js/src/vm/ScopeObject-inl.h comm-esr31/mozilla/js/src/vm/ScopeObject-inl.h
+--- comm-esr31.orig/mozilla/js/src/vm/ScopeObject-inl.h	2015-05-07 15:53:56.000000000 -0300
++++ comm-esr31/mozilla/js/src/vm/ScopeObject-inl.h	2015-05-17 09:51:33.939344362 -0300
+@@ -13,6 +13,26 @@
+ 
+ namespace js {
+ 
++template <AllowGC allowGC>
++inline
++StaticScopeIter<allowGC>::StaticScopeIter(ExclusiveContext *cx, JSObject *obj)
++  : obj(cx, obj), onNamedLambda(false)
++{
++    JS_STATIC_ASSERT(allowGC == CanGC);
++    JS_ASSERT_IF(obj, obj->is<StaticBlockObject>() || obj->is<StaticWithObject>() ||
++                 obj->is<JSFunction>());
++}
++
++template <AllowGC allowGC>
++inline
++StaticScopeIter<allowGC>::StaticScopeIter(JSObject *obj)
++  : obj((ExclusiveContext *) nullptr, obj), onNamedLambda(false)
++{
++    JS_STATIC_ASSERT(allowGC == NoGC);
++    JS_ASSERT_IF(obj, obj->is<StaticBlockObject>() || obj->is<StaticWithObject>() ||
++                 obj->is<JSFunction>());
++}
++
+ inline void
+ ScopeObject::setAliasedVar(JSContext* cx, ScopeCoordinate sc, PropertyName* name, const Value& v)
+ {
+diff -Naur comm-esr31.orig/mozilla/netwerk/ipc/NeckoParent.cpp porg-build-2015.05.17-10h30m39s/comm-esr31/mozilla/netwerk/ipc/NeckoParent.cpp
+--- comm-esr31.orig/mozilla/netwerk/ipc/NeckoParent.cpp	2015-05-07 15:53:46.000000000 -0300
++++ porg-build-2015.05.17-10h30m39s/comm-esr31/mozilla/netwerk/ipc/NeckoParent.cpp	2015-05-17 10:51:24.013181648 -0300
+@@ -359,7 +359,7 @@
+   RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor);
+   return p->Init(aConnectArgs);
+ #else
+-  return nullptr;
++  return false;
+ #endif
+ }
+
+diff -Naur comm-esr31.orig/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp comm-esr31/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp
+--- comm-esr31.orig/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-05-07 15:53:42.000000000 -0300
++++ comm-esr31/mozilla/js/xpconnect/wrappers/XrayWrapper.cpp	2015-05-17 11:22:59.442942469 -0300
+@@ -351,7 +351,7 @@
+         {
+             JSAutoCompartment ac(cx, target);
+             if (!JS_GetClassPrototype(cx, key, protop))
+-                return nullptr;
++                return false;
+         }
+         return JS_WrapObject(cx, protop);
+     }
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..71406ae3c9e2
--- /dev/null
+++ b/mail-client/thunderbird/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mozilla</herd>
+<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'>Fine-tune custom compiler optimizations
+		(-Os, -O0, -O1, -O2, -O3)</flag>
+	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
+	<flag name='gstreamer-0'>Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
+	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</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-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-24.8.0.ebuild b/mail-client/thunderbird/thunderbird-24.8.0.ebuild
new file mode 100644
index 000000000000..3ad1f901f3cf
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-24.8.0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="2.6.5"
+MOZ_LIGHTNING_GDATA_VER="2.6.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 da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr 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 th firefox-24.0-patches-0.4.tar.xze upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.6"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
+
+inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+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 gstreamer +jit ldap +lightning +minimal mozdom pulseaudio selinux system-cairo system-icu system-jpeg system-sqlite"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH="thunderbird-24.0-patches-0.1"
+PATCHFF="firefox-24.0-patches-0.9"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	lightning? (
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_GDATA_VER}/linux/gdata-provider.xpi -> gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+	)
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.16.2
+	>=dev-libs/nspr-4.10.4
+	>=dev-libs/glib-2.26:2
+	>=media-libs/mesa-7.10
+	>=media-libs/libpng-1.6.6[apng]
+	virtual/libffi
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] )
+	pulseaudio? ( media-sound/pulseaudio )
+	system-cairo? ( >=x11-libs/cairo-1.12[X] )
+	system-icu? ( >=dev-libs/icu-51.1 )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-sqlite? ( >=dev-db/sqlite-3.8.0.2:3[secure-delete,debug=] )
+	>=media-libs/libvpx-1.0.0
+	<media-libs/libvpx-1.4
+	kernel_linux? ( media-libs/alsa-lib )
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${CDEPEND}
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+fi
+
+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
+
+	# Unpack lightning for calendar locales
+	if use lightning ; then
+		xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+		xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+	fi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	if use crypt ; then
+		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+		epatch "${FILESDIR}"/enigmail-1.6.0-parallel-fix.patch
+		popd &>/dev/null || die
+	fi
+
+	# 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
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(cat "${S}"/calendar/sunbird/config/version.txt)
+	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
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	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"
+
+	# We must force enable jemalloc 3 threw .mozconfig
+	echo "export MOZ_JEMALLOC=1" >> ${S}/.mozconfig
+
+	mozconfig_annotate '' --enable-jemalloc
+	mozconfig_annotate '' --enable-replace-malloc
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
+	mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
+
+	# Use enable features
+	mozconfig_use_enable gstreamer
+	mozconfig_use_enable pulseaudio
+	mozconfig_use_enable system-cairo
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_enable system-icu intl-api
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable ldap
+	# Feature is know to cause problems on hardened
+	mozconfig_use_enable jit ion
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/tbird" >> "${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
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake -f client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		cd "${S}"/mailnews/extensions/enigmail || die
+		./makemake -r 2&> /dev/null
+		cd "${S}"/tbird/mailnews/extensions/enigmail
+		emake
+		emake xpi
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	declare emid
+	local obj_dir="tbird"
+	cd "${S}/${obj_dir}"
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use crypt ; then
+		cd "${T}" || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi install.rdf \
+		|| die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/bin/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		local l c
+		mozlinguas_export
+
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider-*.xpi
+		# Install locales for gdata-provider -- each locale is a directory tree
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/chrome
+		for l in "${mozlinguas[@]}"; do if [[ -d gdata-provider-${l} ]]; then
+			doins -r gdata-provider-${l}
+			echo "locale gdata-provider ${l} chrome/gdata-provider-${l}/locale/${l}/" \
+				>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+				|| die "Error adding gdata-provider-${l} to chrome.manifest"
+		else
+			ewarn "Sorry, but lightning gdata-provider in ${P} does not support the ${l} locale"
+		fi; done
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi \
+			|| die
+		# Install locales for lightning - each locale is a jar file
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome || die
+		for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]]; then
+			for c in calendar lightning; do
+				doins ${c}-${l}.jar
+				echo "locale ${c} $l jar:chrome/${c}-${l}.jar!/locale/${l}/${c}/" \
+					>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+					|| die "Error adding ${c}-${l} to chrome.manifest"
+			done
+		else
+			ewarn "Sorry, but lightning calendar in ${P} does not support the ${l} locale"
+		fi; done
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop || die
+	fi
+
+	pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird}
+
+	# 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_postinst() {
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+}
diff --git a/mail-client/thunderbird/thunderbird-31.8.0.ebuild b/mail-client/thunderbird/thunderbird-31.8.0.ebuild
new file mode 100644
index 000000000000..ec95f61dd683
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-31.8.0.ebuild
@@ -0,0 +1,403 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="3.3"
+#MOZ_LIGHTNING_GDATA_VER="2.6.3"
+MOZ_LIGHTNING_GDATA_VER="1.0.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 da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr 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 th firefox-24.0-patches-0.4.tar.xze upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.8.1"
+
+# Patches
+PATCH="thunderbird-31.0-patches-0.1"
+PATCHFF="firefox-31.0-patches-0.3"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
+
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit flag-o-matic toolchain-funcs mozconfig-v5.31 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+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 )"
+
+SRC_URI="${SRC_URI}
+	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	lightning? (
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+		http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz
+	)
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCHFF}.tar.xz
+	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.8
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+fi
+
+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
+
+	# Unpack lightning for calendar locales
+	if use lightning ; then
+		xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+	fi
+}
+
+src_prepare() {
+	# Apply our Thunderbird patchset
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	if [[ $(gcc-major-version) -ge 5 ]]; then
+		epatch "${FILESDIR}/thunderbird-31.7.0-gcc5-1.patch"
+	fi
+	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
+
+	# 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
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	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
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable lightning calendar
+	mozconfig_use_enable ldap
+
+	# 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
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	if use crypt; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
+		econf
+		popd &>/dev/null ||die
+	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}" \
+	emake -f "${S}"/client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake -j1 xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	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}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	if use crypt ; then
+		local enigmail_xpipath="${WORKDIR}/enigmail/build"
+		cd "${T}" || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
+	fi
+
+	if use lightning ; then
+		local l c
+		mozlinguas_export
+
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
+		# just for ESR31, install custom-rolled gdata-provider
+		cd "${WORKDIR}/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}" || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		if [[ -e chrome.manifest.original ]]; then
+			cp chrome.manifest.original chrome.manifest || die
+		fi
+		doins -r chrome.manifest components defaults modules install.rdf
+		cd "${WORKDIR}/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/chrome" || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		doins -r gdata-provider gdata-provider-en-US
+		# Install locales for gdata-provider -- each locale is a directory tree
+		for l in "${mozlinguas[@]}"; do if [[ -d gdata-provider-${l} ]]; then
+			doins -r gdata-provider-${l}
+			echo "locale gdata-provider ${l} chrome/gdata-provider-${l}/locale/${l}/" \
+				>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+				|| die "Error adding gdata-provider-${l} to chrome.manifest"
+		else
+			ewarn "Sorry, but lightning gdata-provider in ${P} does not support the ${l} locale"
+		fi; done
+
+		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${BUILD_OBJ_DIR}"/mozilla/dist/xpi-stage/lightning-*.xpi || die
+		# Install locales for lightning - each locale is a jar file
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome || die
+		for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]]; then
+			for c in calendar lightning; do
+				doins ${c}-${l}.jar
+				echo "locale ${c} $l jar:chrome/${c}-${l}.jar!/locale/${l}/${c}/" \
+					>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+					|| die "Error adding ${c}-${l} to chrome.manifest"
+			done
+		else
+			ewarn "Sorry, but lightning calendar in ${P} does not support the ${l} locale"
+		fi; done
+
+		# Fix mimetype so it shows up as a calendar application in GNOME 3
+		# This requires that the .desktop file was already installed earlier
+		sed -e "s:^\(MimeType=\):\1text/calendar;:" \
+			-e "s:^\(Categories=\):\1Calendar;:" \
+			-i "${ED}"/usr/share/applications/${PN}.desktop || die
+	fi
+
+	# Required in order for jit to work on hardened, for mozilla-31
+	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_postinst() {
+	if use crypt; then
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+			ewarn "You may be prompted for your password in an inaccessible shell!!"
+			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+			;;
+		esac
+	fi
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+}
diff --git a/mail-client/thunderbird/thunderbird-38.1.0.ebuild b/mail-client/thunderbird/thunderbird-38.1.0.ebuild
new file mode 100644
index 000000000000..f089330b7c40
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-38.1.0.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="4.0.1"
+MOZ_LIGHTNING_GDATA_VER="1.9"
+
+# 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}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.8.2"
+
+# Patches
+PATCH="thunderbird-38.0-patches-0.1"
+PATCHFF="firefox-38.0-patches-0.3"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases/"
+
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit flag-o-matic toolchain-funcs mozconfig-v6.38 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+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 )"
+
+SRC_URIS=(
+	${SRC_URI}
+	{${MOZ_FTP_URI},${MOZ_HTTP_URI}}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_FTP_URI/${PN}/calendar/lightning}"${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi"
+	${MOZ_HTTP_URI/${PN}/calendar/lightning}"${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi"
+	"lightning? ( http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )"
+	"crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
+	http://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz
+)
+SRC_URI="${SRC_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.8
+	!x11-plugins/enigmail
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/comm-beta"
+else
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+fi
+
+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
+
+	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_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/thunderbird"
+
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${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
+	epatch_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() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	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-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	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
+
+	if use crypt; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
+		econf
+		popd &>/dev/null ||die
+	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}" \
+	emake -f "${S}"/client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake -j1 xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	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
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	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
+		local enigmail_xpipath="${WORKDIR}/enigmail/build"
+		cd "${T}" || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
+	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_postinst() {
+	if use crypt; then
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+			ewarn "You may be prompted for your password in an inaccessible shell!!"
+			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+			;;
+		esac
+	fi
+	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
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
new file mode 100644
index 000000000000..36538e75f47d
--- /dev/null
+++ b/mail-client/trojita/Manifest
@@ -0,0 +1,2 @@
+DIST trojita-0.4.1.tar.bz2 1219460 SHA256 68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a WHIRLPOOL 47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
+DIST trojita-0.5.tar.bz2 1421368 SHA256 21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904 WHIRLPOOL 59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
new file mode 100644
index 000000000000..4f9aa6a88e76
--- /dev/null
+++ b/mail-client/trojita/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<herd>kde</herd>
+	<maintainer>
+		<email>jkt@gentoo.org</email>
+		<name>Jan Kundrát</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.4.1.ebuild b/mail-client/trojita/trojita-0.4.1.ebuild
new file mode 100644
index 000000000000..34af0bf850f4
--- /dev/null
+++ b/mail-client/trojita/trojita-0.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+QT_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+
+inherit cmake-utils virtualx ${GIT_ECLASS}
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 ~ppc x86"
+	MY_LANGS="bs cs da de el es et fr ga gl hu ia it lt mr nb nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
+
+RDEPEND="
+	>=dev-qt/qtbearer-${QT_REQUIRED}:4
+	>=dev-qt/qtgui-${QT_REQUIRED}:4
+	>=dev-qt/qtsql-${QT_REQUIRED}:4[sqlite]
+	>=dev-qt/qtwebkit-${QT_REQUIRED}:4
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qttest-${QT_REQUIRED}:4 )
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
+"
+
+DOCS="README LICENSE"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with test TESTS)
+		$(cmake-utils_use_with zlib ZLIB)
+	)
+	if [[ ${MY_LANGS} ]]; then
+		rm po/trojita_common_x-test.po
+		for x in po/*.po; do
+			mylang=${x#po/trojita_common_}
+			mylang=${mylang%.po}
+			use linguas_$mylang || rm $x
+		done
+	fi
+
+	# 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"
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}
diff --git a/mail-client/trojita/trojita-0.5.ebuild b/mail-client/trojita/trojita-0.5.ebuild
new file mode 100644
index 000000000000..f923d86a23d9
--- /dev/null
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+QT4_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+
+inherit cmake-utils virtualx ${GIT_ECLASS}
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug +password qt5 test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
+
+RDEPEND="
+	qt5? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		>=dev-qt/qtbearer-${QT4_REQUIRED}:4
+		>=dev-qt/qtgui-${QT4_REQUIRED}:4
+		>=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
+		>=dev-qt/qtwebkit-${QT4_REQUIRED}:4
+	)
+"
+DEPEND="${RDEPEND}
+	password? (
+		qt5?	( dev-libs/qtkeychain[qt5] )
+		!qt5?	( dev-libs/qtkeychain[qt4] )
+	)
+	test? (
+		qt5?	( dev-qt/qttest:5 )
+		!qt5?	( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
+	)
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
+"
+
+DOCS="README LICENSE"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with qt5 QT5)
+		$(cmake-utils_use_with password QTKEYCHAIN_PLUGIN)
+		$(cmake-utils_use_with test TESTS)
+		$(cmake-utils_use_with zlib ZLIB)
+	)
+	if [[ ${MY_LANGS} ]]; then
+		rm po/trojita_common_x-test.po
+		for x in po/*.po; do
+			mylang=${x#po/trojita_common_}
+			mylang=${mylang%.po}
+			use linguas_$mylang || rm $x
+		done
+	fi
+
+	# 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"
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
new file mode 100644
index 000000000000..4656b552d145
--- /dev/null
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+QT4_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+
+inherit cmake-utils virtualx ${GIT_ECLASS}
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+if [[ ${PV} == "9999" ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug +password qt5 test +zlib"
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+done
+
+RDEPEND="
+	qt5? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)
+	!qt5? (
+		>=dev-qt/qtbearer-${QT4_REQUIRED}:4
+		>=dev-qt/qtgui-${QT4_REQUIRED}:4
+		>=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
+		>=dev-qt/qtwebkit-${QT4_REQUIRED}:4
+	)
+"
+DEPEND="${RDEPEND}
+	password? (
+		qt5?	( dev-libs/qtkeychain[qt5] )
+		!qt5?	( dev-libs/qtkeychain[qt4] )
+	)
+	test? (
+		qt5?	( dev-qt/qttest:5 )
+		!qt5?	( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
+	)
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
+"
+
+DOCS="README LICENSE"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with qt5 QT5)
+		$(cmake-utils_use_with password QTKEYCHAIN_PLUGIN)
+		$(cmake-utils_use_with test TESTS)
+		$(cmake-utils_use_with zlib ZLIB)
+	)
+	if [[ ${MY_LANGS} ]]; then
+		rm po/trojita_common_x-test.po
+		for x in po/*.po; do
+			mylang=${x#po/trojita_common_}
+			mylang=${mylang%.po}
+			use linguas_$mylang || rm $x
+		done
+	fi
+
+	# 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"
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+}
author	Robin H. Johnson <robbat2@gentoo.org>	2015-08-08 13:49:04 -0700
committer	Robin H. Johnson <robbat2@gentoo.org>	2015-08-08 17:38:18 -0700
commit	56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree	3f91093cdb475e565ae857f1c5a7fd339e2d781e /mail-client
download	gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip