From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 12 Mar 2021 21:55:15 +0000
Subject: gentoo resync : 12.03.2021

---
 mail-client/Manifest.gz                            |  Bin 4382 -> 4388 bytes
 mail-client/claws-mail/Manifest                    |    2 +-
 mail-client/claws-mail/claws-mail-3.17.8.ebuild    |    2 +-
 mail-client/evolution/Manifest                     |    2 +-
 mail-client/evolution/evolution-3.38.4.ebuild      |    2 +-
 mail-client/mutt/Manifest                          |    3 +
 mail-client/mutt/mutt-2.0.6.ebuild                 |  265 +++++
 mail-client/neomutt/Manifest                       |   10 +-
 mail-client/neomutt/metadata.xml                   |    1 +
 mail-client/neomutt/neomutt-20201127-r1.ebuild     |   11 +-
 mail-client/neomutt/neomutt-20201127.ebuild        |   13 +-
 mail-client/neomutt/neomutt-20210205.ebuild        |   11 +-
 mail-client/neomutt/neomutt-99999999.ebuild        |   11 +-
 mail-client/s-nail/Manifest                        |    4 +-
 mail-client/s-nail/s-nail-14.9.16.ebuild           |   92 --
 mail-client/s-nail/s-nail-14.9.22.ebuild           |   89 ++
 mail-client/thunderbird-bin/Manifest               |   67 ++
 .../thunderbird-bin/thunderbird-bin-78.8.1.ebuild  |  378 +++++++
 mail-client/thunderbird/Manifest                   |   66 ++
 mail-client/thunderbird/thunderbird-78.8.1.ebuild  | 1108 ++++++++++++++++++++
 20 files changed, 2029 insertions(+), 108 deletions(-)
 create mode 100644 mail-client/mutt/mutt-2.0.6.ebuild
 delete mode 100644 mail-client/s-nail/s-nail-14.9.16.ebuild
 create mode 100644 mail-client/s-nail/s-nail-14.9.22.ebuild
 create mode 100644 mail-client/thunderbird-bin/thunderbird-bin-78.8.1.ebuild
 create mode 100644 mail-client/thunderbird/thunderbird-78.8.1.ebuild

(limited to 'mail-client')

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 5e9c1e663feb..889cf2a55a25 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index eac816f053e3..564ab0b041a7 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,5 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e19b6658d1970e6ec8f41e97e37063d3823f4aaae3ffcd855bd2839b7feb3a4bca0c15595fce2968de2418758f4fc50c SHA512 dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7
-EBUILD claws-mail-3.17.8.ebuild 5821 BLAKE2B 2cefa2ab30c7b3a34f011b76db88492c6ab565f1bedfe71bc3f682c5372d19e7156e0513b355e064b8af3a3a850eac7b3628fee7c6b89507f9e816c3d7390aca SHA512 2f8ae828d37af2f2b042edd8811ac1c0c1451b46145e00025c08d593a10f3f8c88056b147c6be5877dbc21b14ea999ad09d1efda08e0ff6863a513bf6d1a909d
+EBUILD claws-mail-3.17.8.ebuild 5820 BLAKE2B ccf11fa8ae8ea217d83c164fc5ede031c7d34d2ad891a4434fc4d9af2f2a89dec56d4e3e887d816c9bbd31b08575c701a421763f1e0a1174d218d16b37549ecd SHA512 04935eb312b4b2547d50d33d52ca621be4845a51cbf6913e13b2fcbee1ad56b500b90d82c3733c97e0b8004f32432b9e998fd13c40840cf5ce64aab133f987b1
 EBUILD claws-mail-9999.ebuild 6011 BLAKE2B 6ae0cd5309e1f715bdd9abee4675bba545a4bfeed04ae98d14dfae3c1232069d8738269593095c1d2c415ff5a632aed4f928579daad601942a38db7f4360a8cd SHA512 57aab86cd5b19892c4f2cdd0bdbc99bde5b756845f92a4f1737e75c6194ae9b4fa14b6316990e550e56b5f8208c64f60626c660eca00c4907468e9c5d6577a82
 MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1
diff --git a/mail-client/claws-mail/claws-mail-3.17.8.ebuild b/mail-client/claws-mail/claws-mail-3.17.8.ebuild
index 03ececfaf159..2af54bfe69ee 100644
--- a/mail-client/claws-mail/claws-mail-3.17.8.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.8.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 81365e9669d2..cda8de9a76aa 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -5,5 +5,5 @@ DIST evolution-3.38.4.tar.xz 12165500 BLAKE2B 0f60774fab861bb5999a5cbafa04de96e0
 EBUILD evolution-3.36.5.ebuild 4369 BLAKE2B bde99ca123b65c59f2a990a4143b878951dc029798842696c138d99d3691f4ba653ccd06fe89d5ddbf53287849397d9a61c6c310fb5b56b502ce96776032bb83 SHA512 f6245aa174e4a8cc20d3b330ab3cc49a45fd5e25dd12502f190ec48c3fc7b442c3a580133f314f41b6e8176a83ce99f483f9a0cd7f1e083d36b3f8e1ba0feaa4
 EBUILD evolution-3.38.2.ebuild 4168 BLAKE2B 7d8d15474ddbeb25f537b08e8f4b6b2c912396f237ac0385cf706a28e5440b7a63958362c8fcdbd7aac92c3bc55169fa638cc9bb12ff4c372469d05799ca9729 SHA512 bc007c937dfe6b69afb8f90630f8a00afde0e92df3175a5549506bffe4e16b401d842219ccc9e1a0a087aac366e0e137b7a936f61ef21bc54a77b7dd0607c35b
 EBUILD evolution-3.38.3.ebuild 4176 BLAKE2B b36bfa565223b60fce12875c4cb20c4ccd26c4a9fe64920904423542face265afca3251d96df7b30b9255f38c7da0a16411074e7244d0bb7425313796a3adcf6 SHA512 c8eace659a40e443d1f99b31bcabe74edb7f9182bab1aa4ecd9c02bb64d2f6d9856593d42121eb564139a4bf5b71a770514ce87ade0ce601e09e65ab9270ecab
-EBUILD evolution-3.38.4.ebuild 4176 BLAKE2B b36bfa565223b60fce12875c4cb20c4ccd26c4a9fe64920904423542face265afca3251d96df7b30b9255f38c7da0a16411074e7244d0bb7425313796a3adcf6 SHA512 c8eace659a40e443d1f99b31bcabe74edb7f9182bab1aa4ecd9c02bb64d2f6d9856593d42121eb564139a4bf5b71a770514ce87ade0ce601e09e65ab9270ecab
+EBUILD evolution-3.38.4.ebuild 4175 BLAKE2B d8097ae83d80169313285881ec862575735eb7eb9bb717c170d6de0e1239579fa4ddfccfe680019423278670bfca0e1081b3fdf380d1c609f76c8260929edc4a SHA512 fcf09dfcad9244b7300e171d39afd5d6c5f87d7dcd4852ef576f9b173c5805e418a6c5d7ced28f871e0c4df748567d5200aa4747b78c40915c08b7d343d0a994
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.38.4.ebuild b/mail-client/evolution/evolution-3.38.4.ebuild
index d84609add550..b1f4dd674f38 100644
--- a/mail-client/evolution/evolution-3.38.4.ebuild
+++ b/mail-client/evolution/evolution-3.38.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 30cd2796f231..66b8a090376f 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,8 +2,11 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
 DIST mutt-2.0.5.tar.gz 5294710 BLAKE2B f33f4d496629c34ad4f341ecd02a1ef6b9e59b77234ca80c096acf30e189fcfbd4d8cf1182d8efcdcac8aeaab8fe0f9b4fdeb47f361a5db23da0c690ea5bf638 SHA512 41849d700b88e1b28b51fb90be2a9f6b639e8b111dce914073b66327e4655b5d4ca04dc3aedf2d44a0aa1a80ac3c4fcca6058eae7fb4f71f6b506fbe00a2a740
+DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
 DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
 DIST mutt-gentoo-2.0.5-patches-r0.tar.xz 26408 BLAKE2B f0ce4b72ccc3bdf870bde2b52b6dec7a89f227533982036524e34b6e37093e419eede4fcac79fe4c0436f475ca8672f0de872b78459959b4c3e78e0628f9a67d SHA512 1db20c1e2dad6d35ca86b0d52020ad02946ebfef9fbf46341d9dcc95f16b864d026b147a9bd05992416b1b7204e4475df80603c900a5cd85efb00a071758e0fc
+DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732
 EBUILD mutt-2.0.4-r1.ebuild 8030 BLAKE2B be5718af60862f5ea645ab8a4a830b1d1c5517a5b3b27d518a61f4360e69610d66304b8b3493ae317287c3dc1df768e12d706e1dbdbe338e6d519c0d41318f4a SHA512 8e8da2f046426d4215b595345de625690378267e40fe34908d33db6f835e80d37c04157ade179b5aece54e92b734649e4c3573a63ccde2f49033e400925744e4
 EBUILD mutt-2.0.5.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
+EBUILD mutt-2.0.6.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild
new file mode 100644
index 000000000000..c9a2e340a3c6
--- /dev/null
+++ b/mail-client/mutt/mutt-2.0.6.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	smime-classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp ) )
+	kerberos?         ( || ( imap pop smtp ) )
+	autocrypt?        ( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	autocrypt?     ( >=dev-db/sqlite-3 )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	pgp-classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		$(use_enable autocrypt) $(use_with autocrypt sqlite3)
+		$(use_enable pgp-classic pgp)
+		$(use_enable smime-classic smime)
+		$(use_enable gpgme)
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--without-bundled-regex"     # use the implementation from libc
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc/${PN}
+	if use mbox; then
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# include attachment settings, it's mandatory and shouldn't harm
+	# when not being referenced (index_format using %X)
+	{
+		echo
+		echo "# mandatory attachments settings, not setting these is a BUG!"
+		echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
+		grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
+	} >> "${ED}"/etc/${PN}/Muttrc
+
+	# add setting to actually enable gpgme usage
+	if use gpgme || use autocrypt ; then
+		{
+		echo
+		echo "# this setting enables the gpgme backend (via USE=gpgme)"
+		# https is broken due to a certificate mismatch :(
+		echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
+		echo "set crypt_use_gpgme = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# similar for autocrypt
+	if use autocrypt ; then
+		{
+			echo
+			echo "# enables autocrypt (via USE=autocrypt)"
+			echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
+			echo "set autocrypt = yes"
+		} >> "${ED}"/etc/${PN}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym ../mime.types /etc/${PN}/mime.types
+
+	# nuke manpages that should be provided by an MTA, bug #177605
+	rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+		|| ewarn "failed to remove files, please file a bug"
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc 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/neomutt/Manifest b/mail-client/neomutt/Manifest
index 19309e4d0c6b..f01fb7ca731e 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,8 +1,8 @@
 DIST neomutt-20201127.tar.gz 3456248 BLAKE2B 49d12285e4adfb15cd70f3c6cb06d0d260ccd3f3817ae6902ac5a58105c1fc36f2d6ead3927911b970bf2e72dcd8220340c900c20e011e09ac2159e7c4123987 SHA512 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
 DIST neomutt-20210205.tar.gz 3476980 BLAKE2B 2b8f07a957d668f0903ae3f48d72e0b00414b9ed0411723bc725cd2369ed16c31e461799a0161f3b6caecb8b3a182a0ad9ca7bbb5431ed9ff67cae5dc87b11e5 SHA512 4e9faaa989eb17d1f65e835d3ad37bbda3307f9a939f351776d4cb4677d856fa998ba0eff04bf0cf344485977077695e07c55e79e0800888f646c46fbfac8554
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
-EBUILD neomutt-20201127-r1.ebuild 3902 BLAKE2B c319c745a1e5e6e3ac6d8112a15d1e5dad8cbeb351e0248947186d85f5be4d3c8cd7dbb7736e8f9584d7570c5354b544e9096e3cc75b84ffe61b2e912b67b264 SHA512 c50796b7093e7ea8ba4197214f088034b0860af8d10930476ab30b35e53019ed3aff15a3bfa1ea2525dc408dfdaa781c0588b1fe380c24c556c22b12b179a0e8
-EBUILD neomutt-20201127.ebuild 3893 BLAKE2B 4adc997b079b216529697ae0dd46947fcb8a01b068aeff3c8eae4c9e6b48a9151228160a87e159aa96f897c8f636425930507323834862d052730040eb7b66a7 SHA512 1c6caa40884d8c1daeda009ce81098f61acde8c4cef0cfd29c87465f7b7610138c946f5f4e429fe9d81161bca909f476bea08942c4c61d190b5529b8f30c8e1f
-EBUILD neomutt-20210205.ebuild 3902 BLAKE2B 9b5951d022ad3ff9388019308a8420479eb58035008c9af37d56b38d9ba34ef356ec6964b5c8a2944e826fc22183ff569461a11942842c7726ffb8cf81b414f7 SHA512 83fa535f8dcd5db0b9ed4642f2bcb856c357bbb3f0bf51ea56026005d4336c3031f88a5381c1da5eeb597e69db68ffdbcaa6b59d3f2f2af84ccdb8ef0e192c7b
-EBUILD neomutt-99999999.ebuild 3902 BLAKE2B 9b5951d022ad3ff9388019308a8420479eb58035008c9af37d56b38d9ba34ef356ec6964b5c8a2944e826fc22183ff569461a11942842c7726ffb8cf81b414f7 SHA512 83fa535f8dcd5db0b9ed4642f2bcb856c357bbb3f0bf51ea56026005d4336c3031f88a5381c1da5eeb597e69db68ffdbcaa6b59d3f2f2af84ccdb8ef0e192c7b
-MISC metadata.xml 1287 BLAKE2B a60b6e9c0b731c9d42d89cf0992074a0d015ba35bf8153c2f77b27b67b56205f8676afb6d4e477dd6be7de1c7716b463c50ea4850705616452158d7b232b3b52 SHA512 87c81c3f14a4670bc14cbe556d99fec370450f68a757b7c0985f81555692dad9fb966c7b11ffb721942f2193b8de37fb2130fe91be7fcf7d824277c9c54346ed
+EBUILD neomutt-20201127-r1.ebuild 4171 BLAKE2B 52bcc1cbd3a91d1eda6ffdbaa21f2cc55cafbd702c031649b0914c3241eb3e8e4c3d93860f83b5cc01fba4e73b4eae1a83b71c9edccad70844d5ee805bdb9bce SHA512 56e196e19afcb6bbe9e8d13f4b14c677ab2c0c53401455c02b90189320f8c2d0badd0a5a043f8cfa0ee6992650b45bea6b5908a515519c16531bfa1dffe54465
+EBUILD neomutt-20201127.ebuild 4162 BLAKE2B 05d6749456a017f027d4b8fac0eb7c21f23200c70e124fb687afbddc983a36a8e26a275b4b76f739b06ef4725f37068a547cbfb30ab1b2bda17c93157ed24e67 SHA512 3ccf72f597519e8d8f5dc75d0f5d03e3702bc68f6f68db51c7f90352a7aac1be692fe1c7a813644d241a6134900e0848855a4d0eae2e52a61d00e063ed97c2eb
+EBUILD neomutt-20210205.ebuild 4171 BLAKE2B e9819a220da8871e5e37c24ab526b27b41679f50055d0143fdabf645b4cbf5b3d4f50cff491e97ae0d5c970f47aeb0e9f2536934da881e20e1d90f5d517b72dd SHA512 25c3886f180c16ad71cafd9d0a4985c2e359f2f3fc8ca0d746de2491524debfb2ea1f28d90b726883e83408b428bac50ea82bceb0b2285de143ed1ead112d43f
+EBUILD neomutt-99999999.ebuild 4171 BLAKE2B e9819a220da8871e5e37c24ab526b27b41679f50055d0143fdabf645b4cbf5b3d4f50cff491e97ae0d5c970f47aeb0e9f2536934da881e20e1d90f5d517b72dd SHA512 25c3886f180c16ad71cafd9d0a4985c2e359f2f3fc8ca0d746de2491524debfb2ea1f28d90b726883e83408b428bac50ea82bceb0b2285de143ed1ead112d43f
+MISC metadata.xml 1348 BLAKE2B b48dbbae622e7bf2bf2662256564748017713980111a69291b9e3b02e261145c2eac5afd2994ba35d5c18bb9ec6a73ac0018347452a6c9b91d45a49da845ab90 SHA512 215c1b961ee853156e2d7f840cde54f584df868b6d5913fba8ef377b63248d05e1b31a1c024ed1d7a86c05c4362faf77fcca32880cd093fe78d9b404bd7f139e
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index 2fbef90b636b..59bca7500206 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Nicolas Bock</name>
 	</maintainer>
 	<use>
+		<flag name="autocrypt">Enable autocrypt.org support</flag>
 		<flag name="berkdb">Enable BDB (Berkley DB) backend for header
 			caching</flag>
 		<flag name="gdbm">Enable GDBM (GNU dbm) backend for header
diff --git a/mail-client/neomutt/neomutt-20201127-r1.ebuild b/mail-client/neomutt/neomutt-20201127-r1.ebuild
index 863e199daac7..494bea47a6c2 100644
--- a/mail-client/neomutt/neomutt-20201127-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20201127-r1.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }
diff --git a/mail-client/neomutt/neomutt-20201127.ebuild b/mail-client/neomutt/neomutt-20201127.ebuild
index 2fbecf8b7800..4a1c914f9bb0 100644
--- a/mail-client/neomutt/neomutt-20201127.ebuild
+++ b/mail-client/neomutt/neomutt-20201127.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -42,7 +44,8 @@ CDEPEND="
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
-	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme? ( >=app-crypt/gpgme-1.8.0:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }
diff --git a/mail-client/neomutt/neomutt-20210205.ebuild b/mail-client/neomutt/neomutt-20210205.ebuild
index aec8ac349253..74180642cbc4 100644
--- a/mail-client/neomutt/neomutt-20210205.ebuild
+++ b/mail-client/neomutt/neomutt-20210205.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index aec8ac349253..74180642cbc4 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -21,9 +21,11 @@ HOMEPAGE="https://neomutt.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+IUSE="autocrypt berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
 	ssl tokyocabinet test"
+REQUIRED_USE="
+	autocrypt? ( gpgme )"
 
 CDEPEND="
 	app-misc/mime-types
@@ -43,6 +45,7 @@ CDEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 	gnutls? ( >=net-libs/gnutls-1.0.17:= )
 	gpgme? ( >=app-crypt/gpgme-1.13.1:= )
+	autocrypt? ( >=dev-db/sqlite-3 )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	notmuch? ( net-mail/notmuch:= )
@@ -80,6 +83,7 @@ src_configure() {
 		"$(use_enable nls)"
 		"$(use_enable notmuch)"
 
+		"$(use_enable autocrypt)"
 		"$(use_enable gpgme)"
 		"$(use_enable pgp-classic pgp)"
 		"$(use_enable smime-classic smime)"
@@ -145,4 +149,9 @@ pkg_postinst() {
 		ewarn "  and smime-classic (old smime) from your USE-flags and"
 		ewarn "  only enable gpgme."
 	fi
+
+	if use autocrypt && ! use idn; then
+		ewarn "  It is highly recommended that NeoMutt be also configured"
+		ewarn "  with idn when autocrypt is enabled."
+	fi
 }
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index 20211c5af47d..b74f61bd4f36 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,5 +1,5 @@
-DIST s-nail-14.9.16.tar.xz 790052 BLAKE2B c12dcb3e0f412b34a3f3214ad3be05095ac5045932f5605b59a21ae953c0edb2619cdff1c67249a2ff8a02d809af08d2559af4319462d39dab37df1f904a4d13 SHA512 147c9dbd6abf9a17778eafa36f1cd85b0f769e6acbae06d67d0aa8b9c8b940f78e115d13d277d4269ea44c9ad6dbe75228da9878d9eebb233cb354f3d548089f
 DIST s-nail-14.9.19.tar.xz 792952 BLAKE2B 6d21f48862edaee2f0c6c37e61378551365d3e5169ee4cb6c64e05e35c977b6b14b7ae2a24201df305c723ab0bbd2b6873b04126014840ad50128c45a1375161 SHA512 53c8cf7449afc3e99029ad54ed9c63edefce8ca00cd32dab138c34a7ced7d16852e45e5ad3949b2b8d7baa17421ce38079405781517cdbd3cb67d773bad561f8
-EBUILD s-nail-14.9.16.ebuild 1956 BLAKE2B d863d36e1b9b5a8164afc49ce147233a13333468d0de60cde58103ffd986413f235c3dbe9f7e2deb2116672f9cb5f03b1e48a6b501c51f03c391a142cf2672b5 SHA512 bdb76297446f5348a9478005b2ed563437943cb1b95c15763dbbf60747fc84a820f53f8fac4f44072d91a90b80d4f65e71c797cc36d56b9760d19a0c6baca91c
+DIST s-nail-14.9.22.tar.xz 799296 BLAKE2B 4db1b74be9de38d8879b00852545840aa50022f44efc42bc338575111e391db527ba850033a9f25e6d0269f68673a13bbdcd2609c0e74fb88c409040be2d165b SHA512 016e3403fbb3d9954c160690184545fdb4fc384ffb13b146ac8b60b40e43ad1b1a8967f4660904d40a99071eb1addf2b1dd98b06c6033a1a886379c05fc0c9be
 EBUILD s-nail-14.9.19.ebuild 1956 BLAKE2B d863d36e1b9b5a8164afc49ce147233a13333468d0de60cde58103ffd986413f235c3dbe9f7e2deb2116672f9cb5f03b1e48a6b501c51f03c391a142cf2672b5 SHA512 bdb76297446f5348a9478005b2ed563437943cb1b95c15763dbbf60747fc84a820f53f8fac4f44072d91a90b80d4f65e71c797cc36d56b9760d19a0c6baca91c
+EBUILD s-nail-14.9.22.ebuild 1889 BLAKE2B 4909eb0d5ee25ced511b186a00696b83b766f55c08379b119dc8ecf8892b420dae6231a824983da36c76327bac07fafb73e69a6e2d2f98e2f86e1da19b55aa12 SHA512 d0fcf4bfdeda5e9f0026abdbffc45d278d23fc98a53a9a6e49381b4b39cbc71e1ffa5e4589e6b879fa2e42684456e372f49a2d2184f300e9ed09f5ae83c5e3b4
 MISC metadata.xml 827 BLAKE2B 60255cc3fe6eacd232600dc62ec110994d63025c0a378dc0853cf6111ec087859274a158e1a9719ae7853eb0b752e806b1c3ad3304256cba2c75ad21a7bda059 SHA512 0c0d5ece2c20d666bca54d14288ecf0bf61fcb7c3d0b65145c77f353f24382c35643eae9ac7b6d48657b795dbdbe7256d8b0ad4dcf54c55888cc289ed9e67d55
diff --git a/mail-client/s-nail/s-nail-14.9.16.ebuild b/mail-client/s-nail/s-nail-14.9.16.ebuild
deleted file mode 100644
index 6b9ee67fadc5..000000000000
--- a/mail-client/s-nail/s-nail-14.9.16.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://www.sdaoden.eu/code.html"
-DESCRIPTION="Enhanced mailx-compatible mail client based on Heirloom mailx (nail)"
-LICENSE="BSD BSD-4 ISC RSA"
-
-SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="idn kerberos libressl net ssl"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	virtual/libiconv
-	idn? ( net-dns/libidn2 )
-	net? (
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-		kerberos? ( virtual/krb5 )
-	)
-	!mail-client/mailx
-	!net-mail/mailutils
-	!mail-client/nail
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/awk"
-
-src_configure() {
-	local confopts=(
-		CC=$(tc-getCC)
-		EXTRA_CFLAGS=-std=c99
-		strip=/bin/true
-		OPT_AUTOCC=no
-		VAL_PREFIX="${EPREFIX}"/usr
-		VAL_SYSCONFDIR="${EPREFIX}"/etc
-		VAL_MTA="${EPREFIX}/usr/sbin/sendmail"
-		VAL_MAIL='/var/spool/mail'
-		VAL_PAGER=less
-		$(usex idn VAL_IDNA=idn2 OPT_IDNA=no)
-		VERBOSE=1
-	)
-
-	if use net; then
-		confopts+=( OPT_TLS=$(usex ssl require no)
-			OPT_GSSAPI=$(usex kerberos require no)
-		)
-	else
-		confopts+=( OPT_NET=no )
-	fi
-
-	tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
-
-	emake "${confopts[@]}" config
-}
-
-src_compile() {
-	emake build
-}
-
-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}" install
-
-	dodoc INSTALL NEWS README THANKS
-
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail
-	dosym s-nail /usr/bin/mailx
-	dosym mailx /usr/bin/mail
-	dosym mailx /usr/bin/Mail
-
-	dosym s-nail.1 /usr/share/man/man1/mailx.1
-	dosym mailx.1 /usr/share/man/man1/mail.1
-	dosym mailx.1 /usr/share/man/man1/Mail.1
-}
diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild b/mail-client/s-nail/s-nail-14.9.22.ebuild
new file mode 100644
index 000000000000..92dae32d1948
--- /dev/null
+++ b/mail-client/s-nail/s-nail-14.9.22.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://www.sdaoden.eu/code.html"
+DESCRIPTION="Enhanced mailx-compatible mail client based on Heirloom mailx (nail)"
+LICENSE="BSD BSD-4 ISC RSA"
+
+SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="idn kerberos net ssl"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	virtual/libiconv
+	idn? ( net-dns/libidn2 )
+	net? (
+		ssl? ( dev-libs/openssl:0= )
+		kerberos? ( virtual/krb5 )
+	)
+	!mail-client/mailx
+	!net-mail/mailutils
+	!mail-client/nail
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/awk"
+
+src_configure() {
+	local confopts=(
+		CC=$(tc-getCC)
+		EXTRA_CFLAGS=-std=c99
+		strip=/bin/true
+		OPT_AUTOCC=no
+		VAL_PREFIX="${EPREFIX}"/usr
+		VAL_SYSCONFDIR="${EPREFIX}"/etc
+		VAL_MTA="${EPREFIX}/usr/sbin/sendmail"
+		VAL_MAIL='/var/spool/mail'
+		VAL_PAGER=less
+		$(usex idn VAL_IDNA=idn2 OPT_IDNA=no)
+		VERBOSE=1
+	)
+
+	if use net; then
+		confopts+=( OPT_TLS=$(usex ssl require no)
+			OPT_GSSAPI=$(usex kerberos require no)
+		)
+	else
+		confopts+=( OPT_NET=no )
+	fi
+
+	tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
+
+	emake "${confopts[@]}" config
+}
+
+src_compile() {
+	emake build
+}
+
+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}" install
+
+	dodoc INSTALL NEWS README THANKS
+
+	dodir /bin
+	dosym ../usr/bin/mailx /bin/mail
+	dosym s-nail /usr/bin/mailx
+	dosym mailx /usr/bin/mail
+	dosym mailx /usr/bin/Mail
+
+	dosym s-nail.1 /usr/share/man/man1/mailx.1
+	dosym mailx.1 /usr/share/man/man1/mail.1
+	dosym mailx.1 /usr/share/man/man1/Mail.1
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index ab48bda612b9..e6894ebd0b01 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -68,7 +68,74 @@ DIST thunderbird-78.8.0-uz.xpi 586600 BLAKE2B fbe31d8a104bbd3c3900c449bbac350144
 DIST thunderbird-78.8.0-vi.xpi 674601 BLAKE2B 4ffcd7e4015a24b72b2c6e63bc3be529900bced5e1ab42f82f9a8e7c7a1ebf1218b5cb36025318f7c774e135951476226d924223754626ddbb3e9cd59418eea4 SHA512 9bdf8e207003bfc9b82919794d7c8d94dc27d4acef4527fce2dafcbd8721f92c63fff72ae0f59f8f44d16d993e85a8c32672a62be8767172027565b1026c324a
 DIST thunderbird-78.8.0-zh-CN.xpi 687183 BLAKE2B 87e0d1b874cb21eef72b3cd53faeb5cd660fa39a0e9779e4c83321f25fa94c7c43b1ba3b268b33b9c637af671cfcdac03f8128f7edf371f5d8afe2a1e6422f66 SHA512 cc9a7ea3cf683c91066072121b1686057bbaf55d5e43a63deefbf40df8a14491e37d3c361babb38fbb839ac24aa31ff2a0cc9dbb48848a4bcd2047371fcc7bb7
 DIST thunderbird-78.8.0-zh-TW.xpi 687626 BLAKE2B a4a0c70b226b1f0672b25dd467d2000270042f5d474ef257dc56973949f06fbca51c1a8b520860762a9feec04c3d65ab4af537fff702affea38a7c724921b7e1 SHA512 e98b5772218608e5355635a80dc49156ccc18297c59368e5e4a6c5a40b3716b240e67e9ec3f69b8f230b8e7ed4b32cb6073743e843242d67e16c11937adab50a
+DIST thunderbird-78.8.1-af.xpi 548350 BLAKE2B 5f500ac162f5dcf34abc7ae79fc2734856482b8f1265d746367ec3ec78077b0beaae65fb2da770ca4a5076f954919d6e5c632e3fda8059223135a47b08480044 SHA512 e5c4a6894d8bf7e32f884efb8d96dc100962632ea9175febf1cb5d456c5d8439d8919b1dc3fdd970fd221a88f57893acf655ad64040014953fd670cebd974216
+DIST thunderbird-78.8.1-ar.xpi 648604 BLAKE2B 591792bf93b16f79e79e2fdb726ade85ded8c2166068194a15bd29a8cb673a908a846ffba9dd43e57a37d1d8d6c2eec83177ab416ffe6d00e46cefbd426d336b SHA512 5f77f0789a4bfed84604372f77a7907c5ec2b7ad1e09c6be3ec2caaa9616270b4316e7df73becaf08fd458dd730a077d5a004af6b44e5d6aac516ee2b5d70323
+DIST thunderbird-78.8.1-ast.xpi 561260 BLAKE2B 31441d0d894cc4d593a52e7688c19f377e787aef0815a35c2044cd55ddc6582e4f526176fa63da5f4ebf70a3b5465b0ddc5f16de92d9578e2e9bfc053f2ed29c SHA512 ab1ecede6ac20ec7ee75a9c644d2bda0f694fa85780b51f3ae8295e3c8dde2b4cb92260230d658bc0f41e5b810b768c679eb5e6b94cedd492eb86611363c08cc
+DIST thunderbird-78.8.1-be.xpi 666670 BLAKE2B 8f43fae8ba987674682772d3401b7a8d4e4cf18cc6aa46de1a71513c31e87c47449c0293ae3c00cf1db32205c3ea3b6baf4eb19d226867127b131fa453d5965c SHA512 a99d0b907674714dc00a5e993ff67ce46903e0b5f3a116da14295097ad18c8b042394485359ac5eb71aa692537b7c952709cb56c4f0d0d832e6f9fb6c46471e2
+DIST thunderbird-78.8.1-bg.xpi 672425 BLAKE2B fa994f69e5b012d03f63f82470a888fe140cf62c03071efeef53d96e51d9a06af0ff3cb26d4b4cda7b608b7cc9fd9fc138f78040d79112339c7a18245af071cc SHA512 a6a6b5811a9155ae7bb173de2acacd4185221b3a1780a00f528df892593e680b9e962bd711120bfe6786ad9b7964fdad2df7222c896f09580259295d76c51a69
+DIST thunderbird-78.8.1-br.xpi 604526 BLAKE2B caed4bcc95aef06b0f3fe0226b8b14c7d9053ba55d5750c359c44716c4b45dceb8d33e51a3c63f769eae0b3478c45e67526bb6361d2831a6e76bf27995347067 SHA512 44f1e9ccd1857809ca485b1c75a340efc5524b1dbbe6dc072de0103125475f8777bfb605d42afaf2a0b89d345409c01316d846b3acc89b36c10ef44eab9b2883
+DIST thunderbird-78.8.1-ca.xpi 620449 BLAKE2B d8c12bb0f4451135ffafda658ef7e8c1e889e06021b45bbebad1a2bf7dd112a3676d9e46aef26762b25c4a13413d05843e8c3781813ca1053b2ab17b61e33ed0 SHA512 14f1ab8b6117f077f86f22c4ce57159849342db02eca271044d7658962980a670e22435cace796ada45fdbf61921796f804afe88084eae21c82b8cb09784cbbf
+DIST thunderbird-78.8.1-cak.xpi 635653 BLAKE2B acf27e372940263c2b06afc51cfd9e9060d5d3b7b6494a249c54b30a8fc5284b9fd7a5f9c787afcf904e6abf63e2f565f1f183e5b343d35f31c2a4212ef1c548 SHA512 1e02d5f4282b015b3090c8954066872fbf1456c820126389fb5f62dca545c12895c1a383857fa3b2d48dbe45691a10fb17da4caf7c224d8a28240bdc1f490e5c
+DIST thunderbird-78.8.1-cs.xpi 635347 BLAKE2B be52108c3a6e8a94533d5428c67407793b98b62c2258be560332be033a0a11f51f16569e70720da3d0ccfba33f255c78629bc1e741e7498e97c5a8bd68182527 SHA512 a63e5aaba15350978f9da72885a2b1e817a0934fc3f3aa87b2cb7125601befa703770dce2c870580992515992fbe80d3655bda90a3ea073c1d7658fcede783ec
+DIST thunderbird-78.8.1-cy.xpi 646246 BLAKE2B 1f01125a73186320663ee3b8eae3a2a17697c0ef08bdbf2a7d8ad168c54d72040e1e8afedf63229e06593814d76ae3d612ab24517c93d9fec92acef91e339dfb SHA512 fde9c3131e245461ac865fc2866bb74552af4853ccaa14a4f7ead9921bd29e9ffcb70de84549e531f9682a2e40b27ef10e0a8f1701573f66bb2d034a3a459036
+DIST thunderbird-78.8.1-da.xpi 620990 BLAKE2B db044e228bf88a0d3b9b24a1a0cdceb9490ee20521d217003d3a8aad065ab339aef23d2776c88ff46a36898fb8bc7d04b8ba1e10a0ee59b8e97c3ca0aebe6a9c SHA512 a97a7af8cacd95e650fc90464fba1e9223c13002e3198e8544ea46bdacab765dc6f6b0d2b9768fe676a5c273cc639a0323f41313f478284e68d145bb7c5eb398
+DIST thunderbird-78.8.1-de.xpi 665202 BLAKE2B 1bc25070b2c59f2382462090dac3225a3acac5fd615ca4f440c71e189df56c24009202183cb72111b8c398b2feff0cc97160d3ef72e1d6d7d3a7327a8ce85b15 SHA512 314c26d7578f86cfc0fab808d53fcedeb906265f7e75ea7b8400f5de9f01764e434227eedadd0c8a298b9936327166bb42f1e6dd054f1c11240c58787f2503e5
+DIST thunderbird-78.8.1-dsb.xpi 666783 BLAKE2B 27fa70624759ddf9400ebe105c408b681718878816e799ada72d70a127961f4e42c28cb787202d33fff2ac0f9efbb6d0a1066731c332bea261cc0be2e9b46773 SHA512 f976f8238f99f470c3ba608377c371146009dd5d1be8ff15610287b467ea1109815e81b623d35a25b5ceaae2dcd0ddf9e1cc0860d4bfd1333f3e1db9d0bbcf91
+DIST thunderbird-78.8.1-el.xpi 774453 BLAKE2B 796a7e603f12c1d1ef6146c81f97b9ee867924edf848f4b21f90f2bb85f15501b4a6fa77ce6e2d7f24b820340b8f9cf2b7cf5672910774db804bfe9de13cd021 SHA512 53247e8a7cbb158495fb4fc5f0fc6282e04647f7b39c57c108e0e083e23e8f9e5df1c3cf4efe8adeeb30290785ccb19be298bfc3513a2618530f7f78fcb5e459
+DIST thunderbird-78.8.1-en-CA.xpi 611774 BLAKE2B d7387ec772767db43fb235ade9012a793e14d40435956b8028e1ff66287cacd8cbe96fd8b76292bd4cc6aae002b546864785adace5514389dc249c30feb6d7ad SHA512 262687f4805605e2962252c34d382c0ce106363f55ecfbac1dd88574065f21e2f0d600dd64bc7ba18b945d9edcd5ec29cb835a26440fe53518a91a1289f12a64
+DIST thunderbird-78.8.1-en-GB.xpi 611177 BLAKE2B 8d2919d40fa25341baadda73cdb90ec7e06d7ef74091f6c90e687e7bc607680d5cf128e24fe35a6db2211e5d09756005aa44cfdf0eb2787e7dbabe6865e97148 SHA512 388034965f8e3b2544e02d644f98717007c9f4b94d0ba36a96f06b4fe1abe126bf516c773aecbfae1fef4c50a9be34f9501ebbb1bc6a68911c44c5d9dc942e8f
+DIST thunderbird-78.8.1-es-AR.xpi 657796 BLAKE2B 735feebb38d0e27066d4df9ab6472c383d92ddbd1738f88c3f9dc553229ea3ac04486e0d211e01fffdfae002689b641ee1f05c4f7a43cf3d51b61c0a8eb067bf SHA512 6dd23a62aca0a3cda52b8a2ce7b46e9254b3139ca2bf87516c79bb675b907e24203e490973299bf44715652f53dc1f088b11f920495f8723a12dbd34c5ce1310
+DIST thunderbird-78.8.1-es-ES.xpi 569805 BLAKE2B 646886fc52c8af0d6e5db10a6457e2ff6a43e469532cd43e96be7dc64ef3d91cad0747fe87cb1eabc7b1f3dec23ece1b3528cf7a3fb1321512152d6627a30592 SHA512 429b7ca28412b6fa30184cfe08885a586a8b25a7da2d81cf619b8c8268b233e85a9d2149d8883968362125ee16948c70cc0e342c91cb64a891208278b21c2f4a
+DIST thunderbird-78.8.1-et.xpi 597730 BLAKE2B ce18bbd02f9d91c2ce1e797ff8991a8a376887ff09751db0ca01ca04317b600de8d1eced4a8375f0720298f1785ae43552e3e7bc4a72170d3e75d8c91515f187 SHA512 2b8114d86265cdc434e36aebb5530119da120c84b15e08146a95f94ba76e461297b007ee010c120c5f05ef72b4d85a7152263fbe6e3a87914b42901280ddbae1
+DIST thunderbird-78.8.1-eu.xpi 632963 BLAKE2B fc2f198e58aa23e9ae6704ef4d995d588131e1875039d2fc8b12a34ccdd16c98cb3f56b5e152946225ff6991426acdd1fe2ff00d131f0c2b38c6a5fa6c055918 SHA512 c10e643a228a43596281f4d5c8f544259fd6d7ad99be6cc128911ea3b8b960c6a349a8c786cb2729a422e1628bf2af36bfc854b8ee7b623aa46a0d0626155ae3
+DIST thunderbird-78.8.1-fa.xpi 639749 BLAKE2B 8592188a4bc50e8937984457ec6ca1c77c7fea10231c491cae18b67f6e0228e493f7a81a8cc87fc542bccae9066bfe839927b5bc0679f40383252cf32e6eff1a SHA512 772397b3ae9c6f1e5c50c05d687e92b629525ae4d30e78c10dfb6afd17bb01187b5d02dce0a84e19e09b6c4b01982afb6b111a28456abc9fcc2ee0f8778e15c9
+DIST thunderbird-78.8.1-fi.xpi 642441 BLAKE2B 056b20ed9a6c54186bd9e00d634764b31f0c81e55cbd146d02f1aff6f814d443f2a69ad441f5934987bfb33aeb8d087fbdb3b242ff463e991907345d55a2de5b SHA512 71fae224654e032d0d3d52c63d4e69b0e3de105014cbe096147fee6e67002108f53932a62a1df756424e2ae4e1cd64a4aaef55895fa29e4c51d483f432a2a211
+DIST thunderbird-78.8.1-fr.xpi 669491 BLAKE2B e5891d777888f04b0116662a3646d35dbe0b7cf3d238f0d19ede0ae055ab3964b75715bec46b3c16dd5eaecbfa05ac73637a567138cbc43bc9d0f9148fbb6cb5 SHA512 0a57c85e2ae821e1fb6f51a8fa6c1ebe8d56919943e2c3842e7bc815f497d7f40a7307cbbe20f01411144ffeef7b772ae56eeb8cb86d45b9f7207818776dbce7
+DIST thunderbird-78.8.1-fy-NL.xpi 653081 BLAKE2B 630990939f338a8dbc6459eab4414da8866559092bb7ffe3aeed2c0faafb27c814762c25b0dad25e4d84626f127b65c9f2237e90233653fee9893dedc3d6f7f8 SHA512 e4d5a240ae3c15a1a1059236bda269ea40d58656ad4f1dad9b2fef0473d3e35ae1c29e0629f7284b76997b6a5b54fec37e5805e09a50c43d0275a2d7b602001e
+DIST thunderbird-78.8.1-ga-IE.xpi 600712 BLAKE2B 94cb35753adb4a44c60aa153d91bc1685a2773aeee963485c09de9681760bfa4ab408395de0661eabd38e169fe154912f599e2c44a4be33607874566907a2fec SHA512 d6ba4b286557a529b0206d7d12d5b653437e6a6119d5c83375f1a1bbbee2e06936fe7dc2de134caf5668a049a64be80222708d94e723ff72a2e5b3769e516e87
+DIST thunderbird-78.8.1-gd.xpi 609387 BLAKE2B 94160f15271084ef6ec6b1116602e5e766424a7514415f90be6623bd8740e9ae4f9b8341f19ea3db3cd43cc49893d213a645671aeb71279caef1582b05239923 SHA512 f5992009185a7e930de7a7f71859bc5d5cb019df98ce1cb4e4a19936c14fd642e5f2667b6bd1cfc6b1788b52072a7901b4e687ed93689eda66bb47534b03a56f
+DIST thunderbird-78.8.1-gl.xpi 615717 BLAKE2B d62165bfd54e3b460783c9d7ea291feb820a1be6f7fd43048dcfc3d6752b93a3ff590b5cb0d42ab66025862859e0d53b0ff76bdc12353c3403714b73d2dabcdf SHA512 53c2c559024df96d42ef4b1679c6d20fa529905f24e9614098cb4888e07d36d87fca305aad5e825613bc088e91172cf68c982b1db1ccc277965ef2882905a718
+DIST thunderbird-78.8.1-he.xpi 640498 BLAKE2B 4ec18360e6f54c014c1839c2aba0baf7d5ffbf53a9c9584f1e60bcf0127888962cd836c3a8b9aeca6f5d199d427943fe7ca095adc9e17a06708a1916a9b3445c SHA512 a83ddd38c33211a8875718ac922ff15df858f572cb6cbb8fe0b58412a277f744796168ab099dae28c24867200cd350961c0e4923e7de66db441f69d939723376
+DIST thunderbird-78.8.1-hr.xpi 629035 BLAKE2B 1e075eaa726fc24474f1da002b46fd49ade671da4c7a75fe593d2a34c510fe0280820d5199223195430c23ae53275fe7e1f9c968c02358a8f6f755589581ef3f SHA512 7de4674f1d421b718884c23939f52358beebfcce4e50df4b8706386241208901464d375ed9b6b3e85a950371bf0999a102691008f8715364ab94a596f864ea59
+DIST thunderbird-78.8.1-hsb.xpi 668605 BLAKE2B 2fc8aa7b99c43cba72dfc4a41836fca9a2076a75d0b1204d8d91d802870a1ece56020599608afacc9c4a01dae586ffe931068533cc032966c5dfd61464721dcf SHA512 0a9354721e1f2a680a7e578b2b5696aa674b101f82a8f691ad482bd28d08c6181185aef373d0e0b8efbabb8d5821706450323b000c59739b63d5e06ef3929fb1
+DIST thunderbird-78.8.1-hu.xpi 679834 BLAKE2B 5342790f8d4f8e50b237c5f1b35977de2db81a17f2e23f6077952250156a809ffb6bbe8f91e081b2972db3e23b43e9fe8c9941d21a483373b045de5673c9d785 SHA512 77fec037c715383ad7a68a3f6995431633ca519f973c7ed738537db771c7f1ba1fb24d694413f59173418d8f15e5b67bd46f888a5c5dd92b3457cb06a9d6e134
+DIST thunderbird-78.8.1-hy-AM.xpi 713322 BLAKE2B 4ef7d634a18877d5d59fe6d31918ffeb8dc75d6bc0d3f6765e5f37f8a061fb4e30c9f1e350941ab72d1329e1456b26598f16d0c457b142d07e3245a9816c461b SHA512 d9a45ff151cc8526d58f9ff439596c5bd56b7f7a076224588747c0438819837b1a4209f141e4681f65ccd32ba16e46bfcf9c5767e9ad9e2a531e6b101a180343
+DIST thunderbird-78.8.1-id.xpi 620675 BLAKE2B 7d754dc9d88680e6f23e88036db09059e6d854de616e6e0e81b88306411db2dae105079153005707564b2b9b75be6bf4733d7923980abe203e117aa9eb88b32c SHA512 81716fd41cc15d0a9abb22a0182958aa029adc07b181b806e01d020feb246d06f6150f66d7598cbb758888c0f0ec70f1d157eb1f63a7fb8b2a9176dd7038c706
+DIST thunderbird-78.8.1-is.xpi 581647 BLAKE2B b6e068e718ef2c1a0b81c8e710b3e462ee47942db969ce6ca4efa9f9ccc4f4164282b9ad2c7b52f663cf25e56fd87a5240307d4f142cd138482ffb9b599cf38d SHA512 46d63a393b549363d764e8de404b68378496114146864f30c4e97f97dbdebf851d30eb8da69beef10e20bcf8684380ee85eb3e8a842eb9f238d95559102d0dd1
+DIST thunderbird-78.8.1-it.xpi 572961 BLAKE2B 017bcc789d9ef9d0ff88bbff0de22fa6db20da9d5f02b78be584beefafc829983537386c24492f64b8e636e0f63b9dad56754cafceb42efbbfe5cc09b793e089 SHA512 9f1a74f0de48e683bd05eb6b9d6ad03efa65243bce1f6372ee12033d2a4053d1ea0c98ed698bc565efbd39df6a27bb165315df8bdb094730dcc19339809d3bbb
+DIST thunderbird-78.8.1-ja.xpi 722459 BLAKE2B 212cc1af42e1aa822088bf399ca2162986146454391ba410c9c05bff601bf7a2d05b58b9f600676c7c6df6b1d44f2fa8d0608dc8497dc08ae5016a3a39b45de2 SHA512 f6a2bdf804fcedfa4dd8069e66a62e55ca5503d6765698de5d72cf4756289870ec71e3ee562a1846d825c68d49c2a8ce93463d5535c854165483b2f0aa05293f
+DIST thunderbird-78.8.1-ka.xpi 717013 BLAKE2B c076c83fa6a911477c6b181ea4f01d71f61a641152a368b1cc658a4e8ea4aef343fad930c9701ec938aedd75b2879d6026acd3dde98dfb00603a31924ff82fbb SHA512 b4b01227f7f9a5ed338826e1a8bd3a82ecb0898cd853abc17b262165070532c8eb92b50ab57ca3de6ac7ebdb566add550f5562e41604b26643727f3466e2b03c
+DIST thunderbird-78.8.1-kab.xpi 651926 BLAKE2B 8ef3415b8cea9cc4dc453c279e701b28eb41faf78a546e046dc0bdd829a42b4603ab03478b5e41f18c6f630edef53026480c404f22e5193cb0098e66970021f5 SHA512 9f555b77b4b5f5d978daecbf41675a57a3f1151a5b0946119b0794d17d497f816a4a9ebc7c125abaf3f907413048e583595a889f1e00ca646c8054c9524fce8a
+DIST thunderbird-78.8.1-kk.xpi 720466 BLAKE2B 726ffd3012a3340aeac08b66f33e2847477bfbe33205926ab75aa3c6ad266502929b78bfda9f3270679379f8f10d41d1fd16fd7089a3adc50c4364b8e9680fdb SHA512 72cc25ef03b1625bc3bdec89d99f5afec52896dc3e923d5b8845fe65dd5eec60718d33eb04bb32482c93580ea73385be5348246c206bd1fa130b87ef6b181549
+DIST thunderbird-78.8.1-ko.xpi 688205 BLAKE2B 2671f42fd77bde1ce03aa3d7adda4a3c1ddf5215581975c65d5bcf5ab2e7392e82b4bd838c5a9672892f290df1c70ec992bd31e8a94d0d1b54c570e1ecaa889b SHA512 88078b489a9d6ea0edf80fdd98a5b291a9589c55e244d068be01e6f7abccc20c5d101bbeb660947c93b62e9969bb4db9b7dc4926fa8c5e730f5790655151b226
+DIST thunderbird-78.8.1-lt.xpi 660283 BLAKE2B 1415ee3607c4b7151b096ad796f6eec38fe62e7f40df44c88be70ca90cd4b2b195b7ca3f3a4276e169b346526981848ec5556d195e873a1abf6c3f65afe054ea SHA512 e7284ede9a124f6ad2ef9e6ee328e5bafe963be43887a230708d8abdca57cad8e4a3309d0001f69c2e120619131ddb3d79a3ae82232d0a60189e20320d8f90d7
+DIST thunderbird-78.8.1-ms.xpi 572174 BLAKE2B 5a7788ef89cb2310ab73979508401ebc4b456160c6cf94c6ce175d60b5b4523ea66b4b243a2e7e168599472d678037bef3623555db4132172156fab7d6c689cf SHA512 c4539592155fa051da5af8a2271b7eb2696f9182a53fb2493db6893c6af12cae08d30a45079215b5f7fe6984116592b11e0c1b3e1e68ae9b0d49204515ab449b
+DIST thunderbird-78.8.1-nb-NO.xpi 637236 BLAKE2B d6e5a5f44cabc5358537ac9b35c9ed40cab8d08d245c4aca6f6b7c274cdd821091b307ae3b88a0e0eb2f81a80bfdf9a169f0589b47429494a46a78039930a72a SHA512 744e9b029b069762f63ea12543c85eef1e56314040bfe2950d5bdd8469bed5f31192509f1cc4ff7a2a1cc624067eb9cc911134746aba7c8ec076e7284df79472
+DIST thunderbird-78.8.1-nl.xpi 644356 BLAKE2B 5cb45bc48a5f19d38335bacd60ac33f88a09a1f49e25de02deb07fea808ec8b019614f5e69001b55a489c31cd81488971b74d19da81477721fed861ae3c42a91 SHA512 7ecdecd2f7dbe332ada1d17f99b6de9929a4f488af9ab98ada4db280af7507598116bf444e3c845246240ea95dcdf54aeb761a8032ee960f2b78a5933cb0c7b7
+DIST thunderbird-78.8.1-nn-NO.xpi 640691 BLAKE2B 76f30cafebd85f5bc625494e07c01c311c5647a5a3bda72cfdbff6cd0504c5b0259fc7bed6512a12a19e6bc13e8a9510a44fcd722240e866857ca99711dab2e3 SHA512 b8e15ddec6f906c8f8a108439c61ad9c3f2aca166e6574c4dd69043e6b4a395bf48dd97866453641dc05a847669f5486e21c2fab82cca87a2937528c9d55a2f0
+DIST thunderbird-78.8.1-pa-IN.xpi 633226 BLAKE2B a9e18890c32f5e969bd4317ea5567466ea9d645cdac5f71adaf735373bd9fbb3ba2cd78b87db7d16e3dc819ecc817b596279bc0e4bd8668518d40c5043371300 SHA512 7f6337b58e9e6f50088508a3830ee389e2881c557148a25b129cae88ab8b59b72b68c8fc2ed2a569ac03f586a628c16c0d64f592dfec1b3da3bb75c485b155ab
+DIST thunderbird-78.8.1-pl.xpi 637121 BLAKE2B 8b2950fe0fa4a356f89ebaa2038bc42926dc1d5d30800838615b1c702d293017afef2a9ca6fc1e2360b7bd0ffe50aab5f89fa119cd73cdf79fd48ded384d30ee SHA512 57ce48d26938d244f49c114980fca32a96f619e2b7f464891b8c14a2f3221fe25171ce2b912856158c494f19300a64920a9007b02c7d511b0b6fe0fc70759aec
+DIST thunderbird-78.8.1-pt-BR.xpi 649418 BLAKE2B 44f570beda3d65dacbd08872605fa54ea6bf955f1a226d4312cc00745e99c7b5c3d777edb2ffcfc46c7a3b0efd8d2011f258d0f0b55bc3168a0f364cacf2bf8f SHA512 61808cc790e9e45c63ee63d5a0a155ab5cf68a6acf1d415c2485f6d92a56583079b65b5fe8e41ad7e9df8dab7536d2366b21c4aa77756569f66270bbc5ef50c1
+DIST thunderbird-78.8.1-pt-PT.xpi 655498 BLAKE2B bb8d1288c4feb9f23677c5f9a1860f4fe43afe3971197552bd4ab04855a4dfb23c314a7271bb215b6bd6fe5ea1610f4ead35032a7f7cdea03e80019b63c6a12f SHA512 726f5ee8d7d1869c4a209094d9f3cd37638458497b54b2f9e4a59c3a0872f01f513e8098dbf57bd3e5a86d9a830d88aff1317380a99075e7a900c948c1395c83
+DIST thunderbird-78.8.1-rm.xpi 646534 BLAKE2B 12650a4db6deb68eaa29211069d132567fa1546d150324c1bfb165fe906b5d16a2273974d0c5269e3662176bad91e448abcf24dd1e5bc745e08621bebc7b19d5 SHA512 d645dc76c3f6940ad926f07fda7b53403107c453f303c773deff9c3531ba49b6d4f397121a6b3c0f48f12c949df2312ed5d64aff368fe28bfe4fb5e3fc020e26
+DIST thunderbird-78.8.1-ro.xpi 662633 BLAKE2B ad99e324f02286a0d8cd69d66fb5595bcf740e1cad7b3e93ede28f81f37927b4766d39e6758a9976d7d4e1bbf43151772d91cb1b55308c33d368af56c7f0d10c SHA512 bf54de92c1f8731d8a2180eebb3e9df2d60c66ca87acac45b60afb484478ac97246d1620f551a51a2a5821319c4cb3decf9b5b53e1c89f1ffd82fdd726bca83e
+DIST thunderbird-78.8.1-ru.xpi 756197 BLAKE2B 749f0e9f2ad188add600aa99ec5a92604a37d90b5ff37aa3f02fafa4f433d9eb60e9c42d98354730ca2ef1c06229e48e0615cc0f5fc6c1d958537bc1b87fda5b SHA512 88506d70a15eca7dbfb04761396d14bc1b387edd37c39820a7c0fc67f5de6883978c277f5b059c8f8518281dae61df09b4cb1218d8af1f7da1c6f653474d4f17
+DIST thunderbird-78.8.1-si.xpi 651102 BLAKE2B 47c7edc91262805b9a7b1eef11e96c19bbac32e6ba1e98c223e81661d02a9846aec099a634f17dd0f0416f326f544463a0f7008e528323464cca6f6870716db6 SHA512 99f448b236cc687912e43a5bb488f3bc1336ce8f01a72e948bdced5ecd9ecb3475224af208eef1d214e9447cb150afb2b41669550a61cb346488c45696bc529b
+DIST thunderbird-78.8.1-sk.xpi 643224 BLAKE2B c39bb3bb6c8e7809c63f77e8551a382449d3a75f7981c39dac977d345324afd38ff4f7e100cad6fdf998a20a8e5a04b78c2ebe02abda95905209e00a38e13c4b SHA512 e8554e8421f51c1e514b2413ee64b3c90ecad912781cdc297be30b95fb43b3f759f923cbd4b9ec376226666a30b3d2bc614b5fd53e6aefdad4eb11000fcaa019
+DIST thunderbird-78.8.1-sl.xpi 632388 BLAKE2B b49fc0ac88a83d9bafdeeee89a4059428c814bafd5ec565eaf369e7a2ca2a509dd9d29da494bc8fd227f0701feba66fb64dd124d48d410044389d47dd8c1cb24 SHA512 a42a693ef5d411f4e8b13730e20d396c66a5ed8c077608b86585f0b2136b76ddb73096ac9407c3b63ace5de5830607a04d6fad06952e3c94c4a88c183958c66e
+DIST thunderbird-78.8.1-sq.xpi 657824 BLAKE2B cdd17b669d81dc4bbe2e6daf51902fb665df7f8899a7de75be48f96dd35ef53094a66db1c35808c98bb07f083979fa0745d35c295668f5206bb0f0c685544d2a SHA512 f2bcaacdc1bf026c22fc4cde95dc2a5473ed6e6a99bcefb439efa608a4f6a2a87ed28155a75b518fbc84b535c640514119759cc59263a3f8d0cbaf038f814fc0
+DIST thunderbird-78.8.1-sr.xpi 683110 BLAKE2B aeae86c7978383582f631d3d7f78e8cbb124e979d92ac33fb17280970cb29ad6b4ad2eeceb0cead85fd5ba8aa083100b341ff8810acd5a4c897b1902d0d569d2 SHA512 bce05fcb1557bc83199a8f9ef83847bdf20c60ee3afcb5e25d9a974a3daf2703e08ae82bce136b2addc89a5249192805227b97e4dfd05dd1fecb75defe612fdd
+DIST thunderbird-78.8.1-sv-SE.xpi 648862 BLAKE2B 7efb20c7a0a924ede50c0068b6a0acece96a7840677035cd79e4953fe373eaf2ed294060d5aa8a558030354ed83e04c4ae7aca022cc3135f28364eea1944e588 SHA512 16c46860daab93c1350e9d7aba442bfabd9ee69df94cc9239afb7214c28ae2e7f3a7983fa60867dcd8631ba33cc2c5af4b38f3bd67863a754f563a2922f4a34c
+DIST thunderbird-78.8.1-th.xpi 712036 BLAKE2B e5935f7d82bae7b185465ca43ae61f2a71cb5ea1d48349519af4e5d6547e429b3b2d62a8a53eb041248bbe2f0dec155ccb25f88f981a3d6c5c49b22b09d9596f SHA512 cb9578adb5364e3c0eb290c672c3f171e5c0fca0152857f90f1bcd8e2b3fc8497ff100a778f028942e86bfb127129892b177eaa87942af3574cfc622f4b3fd40
+DIST thunderbird-78.8.1-tr.xpi 649070 BLAKE2B 873927a7ce7419692949298003b83db471382b24e3baca4313092ee83d02df097b6ae17da1fea65d1142e62125e81f665ebeff672cc87cb59c396f62176049ae SHA512 8f8afc401592e89202dff50777db0ef8b24cfee6aab6d082e2453cd85c02ca4b23647fe561cb2dc6efb1becae1aa98f7fdd4713ccc042a0993ca8be4b32e48cc
+DIST thunderbird-78.8.1-uz.xpi 586596 BLAKE2B 063839b8ffe5eeeef1b6bfb09a303e5b7932dbb2b679434a0c4363b21f1d147bcb5621d6cc5dc64af194fad652148afed269c2cab5f7b142d31e0accd29ff141 SHA512 9d3abdb4566f820bc190c65b4c9b8fe407c7fbfc0d361a637333fbe7b135fe60cf6858a0269ced9510ef7c2378d803d737c24fc3cd964af0f0d6ddf05e57c93f
+DIST thunderbird-78.8.1-vi.xpi 674607 BLAKE2B 4e9171f411c664f28acf7cf5dfc592c22527f69a27b532bf475ea62f35c39d196e6a08ae0cac5cbb1bb27030c8069069c58c0ec0225e47dc076b7969c44efafe SHA512 95c9b9c4bf973a9b09aff80fc480509d17c487cd32a087befe810eda8169778e723fa6eff09bca13aca5e8a1b87566e3913d1eb11c03593a4c55e9ae3ca1113e
+DIST thunderbird-78.8.1-zh-CN.xpi 687180 BLAKE2B f280eb1c9255c51a3e0e9a3fece514bc65c219cc6665ec0013af78073420c2fbefb342293817bbba422011889e0389af4984855fe57c549e60a3ca43761bd46f SHA512 67636461fedbaa03c78f3e8015cb423c9186459fdb7dc4ebfc23b6b8caa079d873a726ec875036afbb9458cea84b959f1242e2fe9917a4d53b55b428172dacb5
+DIST thunderbird-78.8.1-zh-TW.xpi 687625 BLAKE2B 6ccafd9cb5d2991143dead267bb7515ec23d8d9e491ec694641dfa182eb2f49b104553a9e918557edee2f0a85993526ca43c2a2ea6b15bd3a9a54b35b2235a53 SHA512 86e3f9c6fa84268ed79568cdb3003fee3420f2f8205492fd87eee972bbda94556f2e3c8d241bd028b174834f84f957738e0ef1f238a963c49aa589b5d9563aed
 DIST thunderbird-bin_i686-78.8.0.tar.bz2 68251310 BLAKE2B caf9fcff16701892f52af6224341b7f7d25c90c7e8f31fb0b628e0624fe70f8ca48cb0b9405a1174c148528da5ade3590b44d5c0e47f921f6472509d3acb1c06 SHA512 5cf0bd3c7e72e077d8e4f8570e68a6e9a3644f77ef311e1d4af8657c38f122b09becb5f2fb4f66b77c808e8713efd1816f075e42920d3b37ebb9949a75b8db28
+DIST thunderbird-bin_i686-78.8.1.tar.bz2 68210803 BLAKE2B 05ba9cb1b965f3494804387a442daf9a8a9dcbca97aaa2f53243a403e344307c7dadec389d00b3af470aa5bff222ac946a666f6a4afbd4c79186c223dbb24e08 SHA512 1d0bd3deee03fe42fc411baa6fba230a2e747e775d125f7c5a5738377200b34efe88cabb356e6e59aa3e0e8db649ab16c6b19d89a3dab17f8b5df75f7326b621
 DIST thunderbird-bin_x86_64-78.8.0.tar.bz2 65386410 BLAKE2B 2ee6e42f95d7390728cda599bb6499ba0bcc1b1d6056d5ca83c3e5030b9dcde4ed52e7a831988e67380b2139daa8bac82f28422a5c53ed120fc71eb8a7ca53d4 SHA512 c226fd32ec0aa430f549d4d394e521587491ebdbe4fd66e4b21c37bbe47d8bc0c50a9e7bc79dade1bca1728794dfaf2492c3ec46082dc026a4a14dddb210141d
+DIST thunderbird-bin_x86_64-78.8.1.tar.bz2 65303564 BLAKE2B 466300d2a738151100935e625388a78bb487ad1862145dd1f7ed11c44fe9ade82133e5857823054eba3191cf9ac9e7efb4514630a5684a4e186aa5fe263e7c93 SHA512 c68838bcdd7075cb3c253a2c1231fe85d8d767cce75f4f76009c69dc845fdaa0e30fbe94a6f3b7227339006b7c88b77128f16ec348c3e6fbdd516ede828b97f7
 EBUILD thunderbird-bin-78.8.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
+EBUILD thunderbird-bin-78.8.1.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.8.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.8.1.ebuild
new file mode 100644
index 000000000000..908f3ef026b2
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.8.1.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
+	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^} (bin)"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r1 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index a770b817845d..9b23d3f3d252 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -72,5 +72,71 @@ DIST thunderbird-78.8.0-vi.xpi 674601 BLAKE2B 4ffcd7e4015a24b72b2c6e63bc3be52990
 DIST thunderbird-78.8.0-zh-CN.xpi 687183 BLAKE2B 87e0d1b874cb21eef72b3cd53faeb5cd660fa39a0e9779e4c83321f25fa94c7c43b1ba3b268b33b9c637af671cfcdac03f8128f7edf371f5d8afe2a1e6422f66 SHA512 cc9a7ea3cf683c91066072121b1686057bbaf55d5e43a63deefbf40df8a14491e37d3c361babb38fbb839ac24aa31ff2a0cc9dbb48848a4bcd2047371fcc7bb7
 DIST thunderbird-78.8.0-zh-TW.xpi 687626 BLAKE2B a4a0c70b226b1f0672b25dd467d2000270042f5d474ef257dc56973949f06fbca51c1a8b520860762a9feec04c3d65ab4af537fff702affea38a7c724921b7e1 SHA512 e98b5772218608e5355635a80dc49156ccc18297c59368e5e4a6c5a40b3716b240e67e9ec3f69b8f230b8e7ed4b32cb6073743e843242d67e16c11937adab50a
 DIST thunderbird-78.8.0.source.tar.xz 353232724 BLAKE2B 3c691393e0dbc71f345557632c734138cb7e603ffadbc364837c3fb759be07bac3f8b022b3e1261a7d850fc33bb917d7bb8fe314ea4c39dec6286d882f1c7f00 SHA512 c7d31ab6b2863c14fe7e11df4e805ca0ecd1f6e6b5e7d5ec73939500c5125faeec213b4df25f23a5f152345027926356b7df47efcfa60ff0f9e5b825119f0e51
+DIST thunderbird-78.8.1-af.xpi 548350 BLAKE2B 5f500ac162f5dcf34abc7ae79fc2734856482b8f1265d746367ec3ec78077b0beaae65fb2da770ca4a5076f954919d6e5c632e3fda8059223135a47b08480044 SHA512 e5c4a6894d8bf7e32f884efb8d96dc100962632ea9175febf1cb5d456c5d8439d8919b1dc3fdd970fd221a88f57893acf655ad64040014953fd670cebd974216
+DIST thunderbird-78.8.1-ar.xpi 648604 BLAKE2B 591792bf93b16f79e79e2fdb726ade85ded8c2166068194a15bd29a8cb673a908a846ffba9dd43e57a37d1d8d6c2eec83177ab416ffe6d00e46cefbd426d336b SHA512 5f77f0789a4bfed84604372f77a7907c5ec2b7ad1e09c6be3ec2caaa9616270b4316e7df73becaf08fd458dd730a077d5a004af6b44e5d6aac516ee2b5d70323
+DIST thunderbird-78.8.1-ast.xpi 561260 BLAKE2B 31441d0d894cc4d593a52e7688c19f377e787aef0815a35c2044cd55ddc6582e4f526176fa63da5f4ebf70a3b5465b0ddc5f16de92d9578e2e9bfc053f2ed29c SHA512 ab1ecede6ac20ec7ee75a9c644d2bda0f694fa85780b51f3ae8295e3c8dde2b4cb92260230d658bc0f41e5b810b768c679eb5e6b94cedd492eb86611363c08cc
+DIST thunderbird-78.8.1-be.xpi 666670 BLAKE2B 8f43fae8ba987674682772d3401b7a8d4e4cf18cc6aa46de1a71513c31e87c47449c0293ae3c00cf1db32205c3ea3b6baf4eb19d226867127b131fa453d5965c SHA512 a99d0b907674714dc00a5e993ff67ce46903e0b5f3a116da14295097ad18c8b042394485359ac5eb71aa692537b7c952709cb56c4f0d0d832e6f9fb6c46471e2
+DIST thunderbird-78.8.1-bg.xpi 672425 BLAKE2B fa994f69e5b012d03f63f82470a888fe140cf62c03071efeef53d96e51d9a06af0ff3cb26d4b4cda7b608b7cc9fd9fc138f78040d79112339c7a18245af071cc SHA512 a6a6b5811a9155ae7bb173de2acacd4185221b3a1780a00f528df892593e680b9e962bd711120bfe6786ad9b7964fdad2df7222c896f09580259295d76c51a69
+DIST thunderbird-78.8.1-br.xpi 604526 BLAKE2B caed4bcc95aef06b0f3fe0226b8b14c7d9053ba55d5750c359c44716c4b45dceb8d33e51a3c63f769eae0b3478c45e67526bb6361d2831a6e76bf27995347067 SHA512 44f1e9ccd1857809ca485b1c75a340efc5524b1dbbe6dc072de0103125475f8777bfb605d42afaf2a0b89d345409c01316d846b3acc89b36c10ef44eab9b2883
+DIST thunderbird-78.8.1-ca.xpi 620449 BLAKE2B d8c12bb0f4451135ffafda658ef7e8c1e889e06021b45bbebad1a2bf7dd112a3676d9e46aef26762b25c4a13413d05843e8c3781813ca1053b2ab17b61e33ed0 SHA512 14f1ab8b6117f077f86f22c4ce57159849342db02eca271044d7658962980a670e22435cace796ada45fdbf61921796f804afe88084eae21c82b8cb09784cbbf
+DIST thunderbird-78.8.1-cak.xpi 635653 BLAKE2B acf27e372940263c2b06afc51cfd9e9060d5d3b7b6494a249c54b30a8fc5284b9fd7a5f9c787afcf904e6abf63e2f565f1f183e5b343d35f31c2a4212ef1c548 SHA512 1e02d5f4282b015b3090c8954066872fbf1456c820126389fb5f62dca545c12895c1a383857fa3b2d48dbe45691a10fb17da4caf7c224d8a28240bdc1f490e5c
+DIST thunderbird-78.8.1-cs.xpi 635347 BLAKE2B be52108c3a6e8a94533d5428c67407793b98b62c2258be560332be033a0a11f51f16569e70720da3d0ccfba33f255c78629bc1e741e7498e97c5a8bd68182527 SHA512 a63e5aaba15350978f9da72885a2b1e817a0934fc3f3aa87b2cb7125601befa703770dce2c870580992515992fbe80d3655bda90a3ea073c1d7658fcede783ec
+DIST thunderbird-78.8.1-cy.xpi 646246 BLAKE2B 1f01125a73186320663ee3b8eae3a2a17697c0ef08bdbf2a7d8ad168c54d72040e1e8afedf63229e06593814d76ae3d612ab24517c93d9fec92acef91e339dfb SHA512 fde9c3131e245461ac865fc2866bb74552af4853ccaa14a4f7ead9921bd29e9ffcb70de84549e531f9682a2e40b27ef10e0a8f1701573f66bb2d034a3a459036
+DIST thunderbird-78.8.1-da.xpi 620990 BLAKE2B db044e228bf88a0d3b9b24a1a0cdceb9490ee20521d217003d3a8aad065ab339aef23d2776c88ff46a36898fb8bc7d04b8ba1e10a0ee59b8e97c3ca0aebe6a9c SHA512 a97a7af8cacd95e650fc90464fba1e9223c13002e3198e8544ea46bdacab765dc6f6b0d2b9768fe676a5c273cc639a0323f41313f478284e68d145bb7c5eb398
+DIST thunderbird-78.8.1-de.xpi 665202 BLAKE2B 1bc25070b2c59f2382462090dac3225a3acac5fd615ca4f440c71e189df56c24009202183cb72111b8c398b2feff0cc97160d3ef72e1d6d7d3a7327a8ce85b15 SHA512 314c26d7578f86cfc0fab808d53fcedeb906265f7e75ea7b8400f5de9f01764e434227eedadd0c8a298b9936327166bb42f1e6dd054f1c11240c58787f2503e5
+DIST thunderbird-78.8.1-dsb.xpi 666783 BLAKE2B 27fa70624759ddf9400ebe105c408b681718878816e799ada72d70a127961f4e42c28cb787202d33fff2ac0f9efbb6d0a1066731c332bea261cc0be2e9b46773 SHA512 f976f8238f99f470c3ba608377c371146009dd5d1be8ff15610287b467ea1109815e81b623d35a25b5ceaae2dcd0ddf9e1cc0860d4bfd1333f3e1db9d0bbcf91
+DIST thunderbird-78.8.1-el.xpi 774453 BLAKE2B 796a7e603f12c1d1ef6146c81f97b9ee867924edf848f4b21f90f2bb85f15501b4a6fa77ce6e2d7f24b820340b8f9cf2b7cf5672910774db804bfe9de13cd021 SHA512 53247e8a7cbb158495fb4fc5f0fc6282e04647f7b39c57c108e0e083e23e8f9e5df1c3cf4efe8adeeb30290785ccb19be298bfc3513a2618530f7f78fcb5e459
+DIST thunderbird-78.8.1-en-CA.xpi 611774 BLAKE2B d7387ec772767db43fb235ade9012a793e14d40435956b8028e1ff66287cacd8cbe96fd8b76292bd4cc6aae002b546864785adace5514389dc249c30feb6d7ad SHA512 262687f4805605e2962252c34d382c0ce106363f55ecfbac1dd88574065f21e2f0d600dd64bc7ba18b945d9edcd5ec29cb835a26440fe53518a91a1289f12a64
+DIST thunderbird-78.8.1-en-GB.xpi 611177 BLAKE2B 8d2919d40fa25341baadda73cdb90ec7e06d7ef74091f6c90e687e7bc607680d5cf128e24fe35a6db2211e5d09756005aa44cfdf0eb2787e7dbabe6865e97148 SHA512 388034965f8e3b2544e02d644f98717007c9f4b94d0ba36a96f06b4fe1abe126bf516c773aecbfae1fef4c50a9be34f9501ebbb1bc6a68911c44c5d9dc942e8f
+DIST thunderbird-78.8.1-es-AR.xpi 657796 BLAKE2B 735feebb38d0e27066d4df9ab6472c383d92ddbd1738f88c3f9dc553229ea3ac04486e0d211e01fffdfae002689b641ee1f05c4f7a43cf3d51b61c0a8eb067bf SHA512 6dd23a62aca0a3cda52b8a2ce7b46e9254b3139ca2bf87516c79bb675b907e24203e490973299bf44715652f53dc1f088b11f920495f8723a12dbd34c5ce1310
+DIST thunderbird-78.8.1-es-ES.xpi 569805 BLAKE2B 646886fc52c8af0d6e5db10a6457e2ff6a43e469532cd43e96be7dc64ef3d91cad0747fe87cb1eabc7b1f3dec23ece1b3528cf7a3fb1321512152d6627a30592 SHA512 429b7ca28412b6fa30184cfe08885a586a8b25a7da2d81cf619b8c8268b233e85a9d2149d8883968362125ee16948c70cc0e342c91cb64a891208278b21c2f4a
+DIST thunderbird-78.8.1-et.xpi 597730 BLAKE2B ce18bbd02f9d91c2ce1e797ff8991a8a376887ff09751db0ca01ca04317b600de8d1eced4a8375f0720298f1785ae43552e3e7bc4a72170d3e75d8c91515f187 SHA512 2b8114d86265cdc434e36aebb5530119da120c84b15e08146a95f94ba76e461297b007ee010c120c5f05ef72b4d85a7152263fbe6e3a87914b42901280ddbae1
+DIST thunderbird-78.8.1-eu.xpi 632963 BLAKE2B fc2f198e58aa23e9ae6704ef4d995d588131e1875039d2fc8b12a34ccdd16c98cb3f56b5e152946225ff6991426acdd1fe2ff00d131f0c2b38c6a5fa6c055918 SHA512 c10e643a228a43596281f4d5c8f544259fd6d7ad99be6cc128911ea3b8b960c6a349a8c786cb2729a422e1628bf2af36bfc854b8ee7b623aa46a0d0626155ae3
+DIST thunderbird-78.8.1-fa.xpi 639749 BLAKE2B 8592188a4bc50e8937984457ec6ca1c77c7fea10231c491cae18b67f6e0228e493f7a81a8cc87fc542bccae9066bfe839927b5bc0679f40383252cf32e6eff1a SHA512 772397b3ae9c6f1e5c50c05d687e92b629525ae4d30e78c10dfb6afd17bb01187b5d02dce0a84e19e09b6c4b01982afb6b111a28456abc9fcc2ee0f8778e15c9
+DIST thunderbird-78.8.1-fi.xpi 642441 BLAKE2B 056b20ed9a6c54186bd9e00d634764b31f0c81e55cbd146d02f1aff6f814d443f2a69ad441f5934987bfb33aeb8d087fbdb3b242ff463e991907345d55a2de5b SHA512 71fae224654e032d0d3d52c63d4e69b0e3de105014cbe096147fee6e67002108f53932a62a1df756424e2ae4e1cd64a4aaef55895fa29e4c51d483f432a2a211
+DIST thunderbird-78.8.1-fr.xpi 669491 BLAKE2B e5891d777888f04b0116662a3646d35dbe0b7cf3d238f0d19ede0ae055ab3964b75715bec46b3c16dd5eaecbfa05ac73637a567138cbc43bc9d0f9148fbb6cb5 SHA512 0a57c85e2ae821e1fb6f51a8fa6c1ebe8d56919943e2c3842e7bc815f497d7f40a7307cbbe20f01411144ffeef7b772ae56eeb8cb86d45b9f7207818776dbce7
+DIST thunderbird-78.8.1-fy-NL.xpi 653081 BLAKE2B 630990939f338a8dbc6459eab4414da8866559092bb7ffe3aeed2c0faafb27c814762c25b0dad25e4d84626f127b65c9f2237e90233653fee9893dedc3d6f7f8 SHA512 e4d5a240ae3c15a1a1059236bda269ea40d58656ad4f1dad9b2fef0473d3e35ae1c29e0629f7284b76997b6a5b54fec37e5805e09a50c43d0275a2d7b602001e
+DIST thunderbird-78.8.1-ga-IE.xpi 600712 BLAKE2B 94cb35753adb4a44c60aa153d91bc1685a2773aeee963485c09de9681760bfa4ab408395de0661eabd38e169fe154912f599e2c44a4be33607874566907a2fec SHA512 d6ba4b286557a529b0206d7d12d5b653437e6a6119d5c83375f1a1bbbee2e06936fe7dc2de134caf5668a049a64be80222708d94e723ff72a2e5b3769e516e87
+DIST thunderbird-78.8.1-gd.xpi 609387 BLAKE2B 94160f15271084ef6ec6b1116602e5e766424a7514415f90be6623bd8740e9ae4f9b8341f19ea3db3cd43cc49893d213a645671aeb71279caef1582b05239923 SHA512 f5992009185a7e930de7a7f71859bc5d5cb019df98ce1cb4e4a19936c14fd642e5f2667b6bd1cfc6b1788b52072a7901b4e687ed93689eda66bb47534b03a56f
+DIST thunderbird-78.8.1-gl.xpi 615717 BLAKE2B d62165bfd54e3b460783c9d7ea291feb820a1be6f7fd43048dcfc3d6752b93a3ff590b5cb0d42ab66025862859e0d53b0ff76bdc12353c3403714b73d2dabcdf SHA512 53c2c559024df96d42ef4b1679c6d20fa529905f24e9614098cb4888e07d36d87fca305aad5e825613bc088e91172cf68c982b1db1ccc277965ef2882905a718
+DIST thunderbird-78.8.1-he.xpi 640498 BLAKE2B 4ec18360e6f54c014c1839c2aba0baf7d5ffbf53a9c9584f1e60bcf0127888962cd836c3a8b9aeca6f5d199d427943fe7ca095adc9e17a06708a1916a9b3445c SHA512 a83ddd38c33211a8875718ac922ff15df858f572cb6cbb8fe0b58412a277f744796168ab099dae28c24867200cd350961c0e4923e7de66db441f69d939723376
+DIST thunderbird-78.8.1-hr.xpi 629035 BLAKE2B 1e075eaa726fc24474f1da002b46fd49ade671da4c7a75fe593d2a34c510fe0280820d5199223195430c23ae53275fe7e1f9c968c02358a8f6f755589581ef3f SHA512 7de4674f1d421b718884c23939f52358beebfcce4e50df4b8706386241208901464d375ed9b6b3e85a950371bf0999a102691008f8715364ab94a596f864ea59
+DIST thunderbird-78.8.1-hsb.xpi 668605 BLAKE2B 2fc8aa7b99c43cba72dfc4a41836fca9a2076a75d0b1204d8d91d802870a1ece56020599608afacc9c4a01dae586ffe931068533cc032966c5dfd61464721dcf SHA512 0a9354721e1f2a680a7e578b2b5696aa674b101f82a8f691ad482bd28d08c6181185aef373d0e0b8efbabb8d5821706450323b000c59739b63d5e06ef3929fb1
+DIST thunderbird-78.8.1-hu.xpi 679834 BLAKE2B 5342790f8d4f8e50b237c5f1b35977de2db81a17f2e23f6077952250156a809ffb6bbe8f91e081b2972db3e23b43e9fe8c9941d21a483373b045de5673c9d785 SHA512 77fec037c715383ad7a68a3f6995431633ca519f973c7ed738537db771c7f1ba1fb24d694413f59173418d8f15e5b67bd46f888a5c5dd92b3457cb06a9d6e134
+DIST thunderbird-78.8.1-hy-AM.xpi 713322 BLAKE2B 4ef7d634a18877d5d59fe6d31918ffeb8dc75d6bc0d3f6765e5f37f8a061fb4e30c9f1e350941ab72d1329e1456b26598f16d0c457b142d07e3245a9816c461b SHA512 d9a45ff151cc8526d58f9ff439596c5bd56b7f7a076224588747c0438819837b1a4209f141e4681f65ccd32ba16e46bfcf9c5767e9ad9e2a531e6b101a180343
+DIST thunderbird-78.8.1-id.xpi 620675 BLAKE2B 7d754dc9d88680e6f23e88036db09059e6d854de616e6e0e81b88306411db2dae105079153005707564b2b9b75be6bf4733d7923980abe203e117aa9eb88b32c SHA512 81716fd41cc15d0a9abb22a0182958aa029adc07b181b806e01d020feb246d06f6150f66d7598cbb758888c0f0ec70f1d157eb1f63a7fb8b2a9176dd7038c706
+DIST thunderbird-78.8.1-is.xpi 581647 BLAKE2B b6e068e718ef2c1a0b81c8e710b3e462ee47942db969ce6ca4efa9f9ccc4f4164282b9ad2c7b52f663cf25e56fd87a5240307d4f142cd138482ffb9b599cf38d SHA512 46d63a393b549363d764e8de404b68378496114146864f30c4e97f97dbdebf851d30eb8da69beef10e20bcf8684380ee85eb3e8a842eb9f238d95559102d0dd1
+DIST thunderbird-78.8.1-it.xpi 572961 BLAKE2B 017bcc789d9ef9d0ff88bbff0de22fa6db20da9d5f02b78be584beefafc829983537386c24492f64b8e636e0f63b9dad56754cafceb42efbbfe5cc09b793e089 SHA512 9f1a74f0de48e683bd05eb6b9d6ad03efa65243bce1f6372ee12033d2a4053d1ea0c98ed698bc565efbd39df6a27bb165315df8bdb094730dcc19339809d3bbb
+DIST thunderbird-78.8.1-ja.xpi 722459 BLAKE2B 212cc1af42e1aa822088bf399ca2162986146454391ba410c9c05bff601bf7a2d05b58b9f600676c7c6df6b1d44f2fa8d0608dc8497dc08ae5016a3a39b45de2 SHA512 f6a2bdf804fcedfa4dd8069e66a62e55ca5503d6765698de5d72cf4756289870ec71e3ee562a1846d825c68d49c2a8ce93463d5535c854165483b2f0aa05293f
+DIST thunderbird-78.8.1-ka.xpi 717013 BLAKE2B c076c83fa6a911477c6b181ea4f01d71f61a641152a368b1cc658a4e8ea4aef343fad930c9701ec938aedd75b2879d6026acd3dde98dfb00603a31924ff82fbb SHA512 b4b01227f7f9a5ed338826e1a8bd3a82ecb0898cd853abc17b262165070532c8eb92b50ab57ca3de6ac7ebdb566add550f5562e41604b26643727f3466e2b03c
+DIST thunderbird-78.8.1-kab.xpi 651926 BLAKE2B 8ef3415b8cea9cc4dc453c279e701b28eb41faf78a546e046dc0bdd829a42b4603ab03478b5e41f18c6f630edef53026480c404f22e5193cb0098e66970021f5 SHA512 9f555b77b4b5f5d978daecbf41675a57a3f1151a5b0946119b0794d17d497f816a4a9ebc7c125abaf3f907413048e583595a889f1e00ca646c8054c9524fce8a
+DIST thunderbird-78.8.1-kk.xpi 720466 BLAKE2B 726ffd3012a3340aeac08b66f33e2847477bfbe33205926ab75aa3c6ad266502929b78bfda9f3270679379f8f10d41d1fd16fd7089a3adc50c4364b8e9680fdb SHA512 72cc25ef03b1625bc3bdec89d99f5afec52896dc3e923d5b8845fe65dd5eec60718d33eb04bb32482c93580ea73385be5348246c206bd1fa130b87ef6b181549
+DIST thunderbird-78.8.1-ko.xpi 688205 BLAKE2B 2671f42fd77bde1ce03aa3d7adda4a3c1ddf5215581975c65d5bcf5ab2e7392e82b4bd838c5a9672892f290df1c70ec992bd31e8a94d0d1b54c570e1ecaa889b SHA512 88078b489a9d6ea0edf80fdd98a5b291a9589c55e244d068be01e6f7abccc20c5d101bbeb660947c93b62e9969bb4db9b7dc4926fa8c5e730f5790655151b226
+DIST thunderbird-78.8.1-lt.xpi 660283 BLAKE2B 1415ee3607c4b7151b096ad796f6eec38fe62e7f40df44c88be70ca90cd4b2b195b7ca3f3a4276e169b346526981848ec5556d195e873a1abf6c3f65afe054ea SHA512 e7284ede9a124f6ad2ef9e6ee328e5bafe963be43887a230708d8abdca57cad8e4a3309d0001f69c2e120619131ddb3d79a3ae82232d0a60189e20320d8f90d7
+DIST thunderbird-78.8.1-ms.xpi 572174 BLAKE2B 5a7788ef89cb2310ab73979508401ebc4b456160c6cf94c6ce175d60b5b4523ea66b4b243a2e7e168599472d678037bef3623555db4132172156fab7d6c689cf SHA512 c4539592155fa051da5af8a2271b7eb2696f9182a53fb2493db6893c6af12cae08d30a45079215b5f7fe6984116592b11e0c1b3e1e68ae9b0d49204515ab449b
+DIST thunderbird-78.8.1-nb-NO.xpi 637236 BLAKE2B d6e5a5f44cabc5358537ac9b35c9ed40cab8d08d245c4aca6f6b7c274cdd821091b307ae3b88a0e0eb2f81a80bfdf9a169f0589b47429494a46a78039930a72a SHA512 744e9b029b069762f63ea12543c85eef1e56314040bfe2950d5bdd8469bed5f31192509f1cc4ff7a2a1cc624067eb9cc911134746aba7c8ec076e7284df79472
+DIST thunderbird-78.8.1-nl.xpi 644356 BLAKE2B 5cb45bc48a5f19d38335bacd60ac33f88a09a1f49e25de02deb07fea808ec8b019614f5e69001b55a489c31cd81488971b74d19da81477721fed861ae3c42a91 SHA512 7ecdecd2f7dbe332ada1d17f99b6de9929a4f488af9ab98ada4db280af7507598116bf444e3c845246240ea95dcdf54aeb761a8032ee960f2b78a5933cb0c7b7
+DIST thunderbird-78.8.1-nn-NO.xpi 640691 BLAKE2B 76f30cafebd85f5bc625494e07c01c311c5647a5a3bda72cfdbff6cd0504c5b0259fc7bed6512a12a19e6bc13e8a9510a44fcd722240e866857ca99711dab2e3 SHA512 b8e15ddec6f906c8f8a108439c61ad9c3f2aca166e6574c4dd69043e6b4a395bf48dd97866453641dc05a847669f5486e21c2fab82cca87a2937528c9d55a2f0
+DIST thunderbird-78.8.1-pa-IN.xpi 633226 BLAKE2B a9e18890c32f5e969bd4317ea5567466ea9d645cdac5f71adaf735373bd9fbb3ba2cd78b87db7d16e3dc819ecc817b596279bc0e4bd8668518d40c5043371300 SHA512 7f6337b58e9e6f50088508a3830ee389e2881c557148a25b129cae88ab8b59b72b68c8fc2ed2a569ac03f586a628c16c0d64f592dfec1b3da3bb75c485b155ab
+DIST thunderbird-78.8.1-pl.xpi 637121 BLAKE2B 8b2950fe0fa4a356f89ebaa2038bc42926dc1d5d30800838615b1c702d293017afef2a9ca6fc1e2360b7bd0ffe50aab5f89fa119cd73cdf79fd48ded384d30ee SHA512 57ce48d26938d244f49c114980fca32a96f619e2b7f464891b8c14a2f3221fe25171ce2b912856158c494f19300a64920a9007b02c7d511b0b6fe0fc70759aec
+DIST thunderbird-78.8.1-pt-BR.xpi 649418 BLAKE2B 44f570beda3d65dacbd08872605fa54ea6bf955f1a226d4312cc00745e99c7b5c3d777edb2ffcfc46c7a3b0efd8d2011f258d0f0b55bc3168a0f364cacf2bf8f SHA512 61808cc790e9e45c63ee63d5a0a155ab5cf68a6acf1d415c2485f6d92a56583079b65b5fe8e41ad7e9df8dab7536d2366b21c4aa77756569f66270bbc5ef50c1
+DIST thunderbird-78.8.1-pt-PT.xpi 655498 BLAKE2B bb8d1288c4feb9f23677c5f9a1860f4fe43afe3971197552bd4ab04855a4dfb23c314a7271bb215b6bd6fe5ea1610f4ead35032a7f7cdea03e80019b63c6a12f SHA512 726f5ee8d7d1869c4a209094d9f3cd37638458497b54b2f9e4a59c3a0872f01f513e8098dbf57bd3e5a86d9a830d88aff1317380a99075e7a900c948c1395c83
+DIST thunderbird-78.8.1-rm.xpi 646534 BLAKE2B 12650a4db6deb68eaa29211069d132567fa1546d150324c1bfb165fe906b5d16a2273974d0c5269e3662176bad91e448abcf24dd1e5bc745e08621bebc7b19d5 SHA512 d645dc76c3f6940ad926f07fda7b53403107c453f303c773deff9c3531ba49b6d4f397121a6b3c0f48f12c949df2312ed5d64aff368fe28bfe4fb5e3fc020e26
+DIST thunderbird-78.8.1-ro.xpi 662633 BLAKE2B ad99e324f02286a0d8cd69d66fb5595bcf740e1cad7b3e93ede28f81f37927b4766d39e6758a9976d7d4e1bbf43151772d91cb1b55308c33d368af56c7f0d10c SHA512 bf54de92c1f8731d8a2180eebb3e9df2d60c66ca87acac45b60afb484478ac97246d1620f551a51a2a5821319c4cb3decf9b5b53e1c89f1ffd82fdd726bca83e
+DIST thunderbird-78.8.1-ru.xpi 756197 BLAKE2B 749f0e9f2ad188add600aa99ec5a92604a37d90b5ff37aa3f02fafa4f433d9eb60e9c42d98354730ca2ef1c06229e48e0615cc0f5fc6c1d958537bc1b87fda5b SHA512 88506d70a15eca7dbfb04761396d14bc1b387edd37c39820a7c0fc67f5de6883978c277f5b059c8f8518281dae61df09b4cb1218d8af1f7da1c6f653474d4f17
+DIST thunderbird-78.8.1-si.xpi 651102 BLAKE2B 47c7edc91262805b9a7b1eef11e96c19bbac32e6ba1e98c223e81661d02a9846aec099a634f17dd0f0416f326f544463a0f7008e528323464cca6f6870716db6 SHA512 99f448b236cc687912e43a5bb488f3bc1336ce8f01a72e948bdced5ecd9ecb3475224af208eef1d214e9447cb150afb2b41669550a61cb346488c45696bc529b
+DIST thunderbird-78.8.1-sk.xpi 643224 BLAKE2B c39bb3bb6c8e7809c63f77e8551a382449d3a75f7981c39dac977d345324afd38ff4f7e100cad6fdf998a20a8e5a04b78c2ebe02abda95905209e00a38e13c4b SHA512 e8554e8421f51c1e514b2413ee64b3c90ecad912781cdc297be30b95fb43b3f759f923cbd4b9ec376226666a30b3d2bc614b5fd53e6aefdad4eb11000fcaa019
+DIST thunderbird-78.8.1-sl.xpi 632388 BLAKE2B b49fc0ac88a83d9bafdeeee89a4059428c814bafd5ec565eaf369e7a2ca2a509dd9d29da494bc8fd227f0701feba66fb64dd124d48d410044389d47dd8c1cb24 SHA512 a42a693ef5d411f4e8b13730e20d396c66a5ed8c077608b86585f0b2136b76ddb73096ac9407c3b63ace5de5830607a04d6fad06952e3c94c4a88c183958c66e
+DIST thunderbird-78.8.1-sq.xpi 657824 BLAKE2B cdd17b669d81dc4bbe2e6daf51902fb665df7f8899a7de75be48f96dd35ef53094a66db1c35808c98bb07f083979fa0745d35c295668f5206bb0f0c685544d2a SHA512 f2bcaacdc1bf026c22fc4cde95dc2a5473ed6e6a99bcefb439efa608a4f6a2a87ed28155a75b518fbc84b535c640514119759cc59263a3f8d0cbaf038f814fc0
+DIST thunderbird-78.8.1-sr.xpi 683110 BLAKE2B aeae86c7978383582f631d3d7f78e8cbb124e979d92ac33fb17280970cb29ad6b4ad2eeceb0cead85fd5ba8aa083100b341ff8810acd5a4c897b1902d0d569d2 SHA512 bce05fcb1557bc83199a8f9ef83847bdf20c60ee3afcb5e25d9a974a3daf2703e08ae82bce136b2addc89a5249192805227b97e4dfd05dd1fecb75defe612fdd
+DIST thunderbird-78.8.1-sv-SE.xpi 648862 BLAKE2B 7efb20c7a0a924ede50c0068b6a0acece96a7840677035cd79e4953fe373eaf2ed294060d5aa8a558030354ed83e04c4ae7aca022cc3135f28364eea1944e588 SHA512 16c46860daab93c1350e9d7aba442bfabd9ee69df94cc9239afb7214c28ae2e7f3a7983fa60867dcd8631ba33cc2c5af4b38f3bd67863a754f563a2922f4a34c
+DIST thunderbird-78.8.1-th.xpi 712036 BLAKE2B e5935f7d82bae7b185465ca43ae61f2a71cb5ea1d48349519af4e5d6547e429b3b2d62a8a53eb041248bbe2f0dec155ccb25f88f981a3d6c5c49b22b09d9596f SHA512 cb9578adb5364e3c0eb290c672c3f171e5c0fca0152857f90f1bcd8e2b3fc8497ff100a778f028942e86bfb127129892b177eaa87942af3574cfc622f4b3fd40
+DIST thunderbird-78.8.1-tr.xpi 649070 BLAKE2B 873927a7ce7419692949298003b83db471382b24e3baca4313092ee83d02df097b6ae17da1fea65d1142e62125e81f665ebeff672cc87cb59c396f62176049ae SHA512 8f8afc401592e89202dff50777db0ef8b24cfee6aab6d082e2453cd85c02ca4b23647fe561cb2dc6efb1becae1aa98f7fdd4713ccc042a0993ca8be4b32e48cc
+DIST thunderbird-78.8.1-uz.xpi 586596 BLAKE2B 063839b8ffe5eeeef1b6bfb09a303e5b7932dbb2b679434a0c4363b21f1d147bcb5621d6cc5dc64af194fad652148afed269c2cab5f7b142d31e0accd29ff141 SHA512 9d3abdb4566f820bc190c65b4c9b8fe407c7fbfc0d361a637333fbe7b135fe60cf6858a0269ced9510ef7c2378d803d737c24fc3cd964af0f0d6ddf05e57c93f
+DIST thunderbird-78.8.1-vi.xpi 674607 BLAKE2B 4e9171f411c664f28acf7cf5dfc592c22527f69a27b532bf475ea62f35c39d196e6a08ae0cac5cbb1bb27030c8069069c58c0ec0225e47dc076b7969c44efafe SHA512 95c9b9c4bf973a9b09aff80fc480509d17c487cd32a087befe810eda8169778e723fa6eff09bca13aca5e8a1b87566e3913d1eb11c03593a4c55e9ae3ca1113e
+DIST thunderbird-78.8.1-zh-CN.xpi 687180 BLAKE2B f280eb1c9255c51a3e0e9a3fece514bc65c219cc6665ec0013af78073420c2fbefb342293817bbba422011889e0389af4984855fe57c549e60a3ca43761bd46f SHA512 67636461fedbaa03c78f3e8015cb423c9186459fdb7dc4ebfc23b6b8caa079d873a726ec875036afbb9458cea84b959f1242e2fe9917a4d53b55b428172dacb5
+DIST thunderbird-78.8.1-zh-TW.xpi 687625 BLAKE2B 6ccafd9cb5d2991143dead267bb7515ec23d8d9e491ec694641dfa182eb2f49b104553a9e918557edee2f0a85993526ca43c2a2ea6b15bd3a9a54b35b2235a53 SHA512 86e3f9c6fa84268ed79568cdb3003fee3420f2f8205492fd87eee972bbda94556f2e3c8d241bd028b174834f84f957738e0ef1f238a963c49aa589b5d9563aed
+DIST thunderbird-78.8.1.source.tar.xz 352875768 BLAKE2B cbc099669575a198d7c0ef1663848327f52fe1fe30473122075dd4e5e4327c006e03ef6b5bb9e741c782276dd5c8b43fbec16d8a11369c684a252241ec3ca931 SHA512 5158f7663acf3d00f45b457d1c172dcc95978d6782775faa4ec3995d3a799dfce668302e2c4b963a5607add831314fac76d516e45863a1971fbd4a6b0c4bdb10
 EBUILD thunderbird-78.8.0.ebuild 31626 BLAKE2B 3eec6f7960f024e5138eff2052dde15340b822363a3aa871ca53faea5494093eafee5462eb8d4786a4c733307811c42f23a876c1342624d51bd83d8f20f582d3 SHA512 e63d4d08622c911f1f132f6b4efc840e4c0293710841b954cff5f4c5bbe03d618cb395963df80f809bbe886bcbd3e704a96eb316d4655185204f48a7fbf2a5ea
+EBUILD thunderbird-78.8.1.ebuild 31626 BLAKE2B 3eec6f7960f024e5138eff2052dde15340b822363a3aa871ca53faea5494093eafee5462eb8d4786a4c733307811c42f23a876c1342624d51bd83d8f20f582d3 SHA512 e63d4d08622c911f1f132f6b4efc840e4c0293710841b954cff5f4c5bbe03d618cb395963df80f809bbe886bcbd3e704a96eb316d4655185204f48a7fbf2a5ea
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.8.1.ebuild b/mail-client/thunderbird/thunderbird-78.8.1.ebuild
new file mode 100644
index 000000000000..3289668057eb
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-78.8.1.ebuild
@@ -0,0 +1,1108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-78esr-patches-10.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free
+	hardened hwaccel jack lto +openh264 pgo pulseaudio selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.21.0
+	virtual/pkgconfig
+	>=virtual/rust-1.41.0
+	|| (
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			sys-devel/llvm:9
+			clang? (
+				=sys-devel/lld-9*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )
+	!<x11-plugins/enigmail-2.2"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
+	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			# temp fix for https://bugs.gentoo.org/768543
+			# we can assume that rust 1.{49,50}.0 always uses llvm 11
+			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
+			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
+			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
+
+			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
+				local version_llvm_rust="11"
+			else
+				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+			fi
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=comm/mail
+	mozconfig_add_options_ac '' --enable-calendar
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
+	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+}
-- 
cgit v1.2.3