12 files changed, 1575 insertions, 273 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index f470065a82e9..b1ad951ef270 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b72baec5bbe3..30cd2796f231 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,9 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
-DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
 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-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
 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
-EBUILD mutt-2.0.2.ebuild 8030 BLAKE2B c4c0be2976d82764751382bb3ee8f752eb0a4e7dc1a8a08c7628baff56c35609f6cc38c0fc680856c4fd8b08c36dd0c349c5f8259f399911f981d3354e8f9570 SHA512 943d41ce9e79a04a8e01cffd3e09c0ec22302f580c5a33e2a3568597e8973f1bb7ec967d598729221ddb570bb45d3b17aeb4732a416892edc1adc0d7a681b034
-EBUILD mutt-2.0.4-r1.ebuild 8036 BLAKE2B 49a6ade204d7ea7b43be989c75635eac33c16f5f97ef5e8bb0858258a13d43affcb8938db6040ac47ea2e19c02091cf91244be4b1c05e1da72bbea111eef1cb3 SHA512 69a929fdcbc851265e5f886680e6c79a4e7a389acb99e128c798714747326d0b3321789eaf7fff07e9b1c79bd072dba16f1f06953edebf81e0259c9a21a27251
+EBUILD mutt-2.0.4-r1.ebuild 8030 BLAKE2B be5718af60862f5ea645ab8a4a830b1d1c5517a5b3b27d518a61f4360e69610d66304b8b3493ae317287c3dc1df768e12d706e1dbdbe338e6d519c0d41318f4a SHA512 8e8da2f046426d4215b595345de625690378267e40fe34908d33db6f835e80d37c04157ade179b5aece54e92b734649e4c3573a63ccde2f49033e400925744e4
 EBUILD mutt-2.0.5.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.2.ebuild b/mail-client/mutt/mutt-2.0.2.ebuild
deleted file mode 100644
index b5c1a188f270..000000000000
--- a/mail-client/mutt/mutt-2.0.2.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# 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/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
index 5131f8871a13..955b557c9d0b 100644
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	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"
+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="
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index f320547ab4cd..7a507b0dbab5 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -3,4 +3,4 @@ DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLA
 EBUILD neomutt-20201127-r1.ebuild 3902 BLAKE2B c319c745a1e5e6e3ac6d8112a15d1e5dad8cbeb351e0248947186d85f5be4d3c8cd7dbb7736e8f9584d7570c5354b544e9096e3cc75b84ffe61b2e912b67b264 SHA512 c50796b7093e7ea8ba4197214f088034b0860af8d10930476ab30b35e53019ed3aff15a3bfa1ea2525dc408dfdaa781c0588b1fe380c24c556c22b12b179a0e8
 EBUILD neomutt-20201127.ebuild 3893 BLAKE2B 4adc997b079b216529697ae0dd46947fcb8a01b068aeff3c8eae4c9e6b48a9151228160a87e159aa96f897c8f636425930507323834862d052730040eb7b66a7 SHA512 1c6caa40884d8c1daeda009ce81098f61acde8c4cef0cfd29c87465f7b7610138c946f5f4e429fe9d81161bca909f476bea08942c4c61d190b5529b8f30c8e1f
 EBUILD neomutt-99999999.ebuild 3896 BLAKE2B ab8ff53e93d1e91099beccc09fcc96729e0884cefd1020ccf810eb4a0697604db40f3266696b3f231f1e9f7cb0ce5d9ae76ee30bc521a768fadfe44f958f8057 SHA512 3be81472b254249a438fd356263fef7bd6bd153f10a47450537594f0f1ddee874e630d52fd62b3b6569dab0ee96996122066b5245860e44ad19947b5f2ee4a49
-MISC metadata.xml 1207 BLAKE2B d952b478eb3e513307c58ea2d47dc2b208e00213deaf2d8d0878bea451c5eba117f16f596e2e7ee77a81e5ea7e8e431e0410ee292b527be89470e3530b1f55d9 SHA512 bcaeaea3b9d33cf92de7851f4f843e61c833b5ad09ff7899c999787c3caa57d8b3f77a2903ffab72f6938ca87899926eaf026bbf25bc9e74b66f21720a447c41
+MISC metadata.xml 1287 BLAKE2B a60b6e9c0b731c9d42d89cf0992074a0d015ba35bf8153c2f77b27b67b56205f8676afb6d4e477dd6be7de1c7716b463c50ea4850705616452158d7b232b3b52 SHA512 87c81c3f14a4670bc14cbe556d99fec370450f68a757b7c0985f81555692dad9fb966c7b11ffb721942f2193b8de37fb2130fe91be7fcf7d824277c9c54346ed
diff --git a/mail-client/neomutt/metadata.xml b/mail-client/neomutt/metadata.xml
index f0b7a7e03387..2fbef90b636b 100644
--- a/mail-client/neomutt/metadata.xml
+++ b/mail-client/neomutt/metadata.xml
@@ -27,4 +27,7 @@
 		<flag name="smime-classic">Build classic-smime backend to support
 			S/MIME</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">neomutt/neomutt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index c648bda2e0b9..9b5dc99d5bee 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,7 +1,7 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.10-complete.tar.gz 7043181 BLAKE2B aa442c9e4fb4d31bc9ddd77d888637d9d7afb8ac6c264ca5d378bd7bfc160f2f31379fae208638b2f79e6127add83f0254d1526e22c2ca24656b31ee75dc695e SHA512 e0a661ae5b928ce2c93129775d32a679ad2512ca4af21e8dd1711d38a62818ff9ee1e1fc922aae68e0a8bca034ca780fc3e3e988731a2ce9b2190b2c1d8e08a6
 DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
-EBUILD roundcube-1.4.10.ebuild 2274 BLAKE2B 19056b64fd44f1dc2bbe30105b022ee28852dc0413b5aa2c759c5563446a2838b46aa0ecd039621b07f43f425529edd6896b3e4193cc9d2c9777216cb05b05b2 SHA512 4a59ffc29e7ab69dec776ccca749dab9ac839b9cfbad63aa2a5d986c9f30e59a1d618d1f44cbbacc6572b143544835af55e0ba11a9295aecea75c0d3ba5b4592
+EBUILD roundcube-1.4.10.ebuild 2272 BLAKE2B ff467e66c84492af33462c4f26b896344b43ae10585ad551afc105e8fe76e0878bac85b98adf17c0fed649509e3cb2c77e5670a4589510364cdecfe97085d606 SHA512 2a8d669a627042f377f61ee1b742e39a59cf2e3b65f3f8497106624970a5e3a1001b5d1d4d57cf0e7a2a1224244da58eb228c04d29c371b310cc34612320f5d6
 EBUILD roundcube-1.4.8.ebuild 1790 BLAKE2B f0a5eee97457dd146f29c07d36b5208993d7afda3b9962cdd80bf1d457ca04cb3350f4af52a25477a44a9ff3c4c9ba8c8fd69c126ae2d81a306b0c0e4fc38cfa SHA512 451278b41b88d8b5f100187d9d95cd123cb6ea04a00a4e4f7d19b06ac92775972035d06e9bf0f3c85ae18baff50641f7c4e06be3f9f17d8b30570e1c21a9d989
 EBUILD roundcube-9999.ebuild 2278 BLAKE2B b24a78ee7af91a78d4f9083634444e6f7a5d85d730862a23a76b68b9cb4d34f0ab991c031a5a3df5fc3e500ce24f778904c3e9bec73d177b19050231f97564db SHA512 3b53bc1aee8b1521ac094cc3421b8a92b1e295fcaf1edcd6b40f3fda4d67c765ac4a52a4e6b5fbc59c6f5097a51ae1ae61fa8f1f2de24fbb2508e1fefe8143be
 MISC metadata.xml 997 BLAKE2B 60bf23d71ef0014f432b1f09779263618f12eb2de5adb51e14b6c491d69c7a6b15d92f050d145d83d6ba0a6fc04b67906477ff1b6ce34d69c0ccf90cc2aaff1f SHA512 ed338883744882344de018e49854eaf1e6fdaf4af5a15cde8baabea5f315ff2904c1d161499ba68ba988e355336b962c1d6dcc64b550f2ef8875ece77f97ae83
diff --git a/mail-client/roundcube/roundcube-1.4.10.ebuild b/mail-client/roundcube/roundcube-1.4.10.ebuild
index 2b983aea987c..cb9a6709c782 100644
--- a/mail-client/roundcube/roundcube-1.4.10.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.10.ebuild
@@ -91,6 +91,6 @@ pkg_postinst() {
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
 	fi
 }
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 997722ff0167..5229735560aa 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -68,7 +68,74 @@ DIST thunderbird-78.6.1-uz.xpi 586602 BLAKE2B c26dce6fe52528780f8840efa097392c2b
 DIST thunderbird-78.6.1-vi.xpi 674605 BLAKE2B 7db83cf29596b955a8a2f8376bbe3322d5fdacf84d661832603131639ddb4373a35f9810b2442dac4e5a920f189b2f44762c6e966b07e1c2867fde3528f115df SHA512 70b226b35e671956d2eab2d95cc15cf401f2339a74de5cacb6fa1de982ebcbb0b1642f83cf5cbcf64ca6b2c6ebd958f4aed33cf267ff7a52c248f6bd1ab6eff4
 DIST thunderbird-78.6.1-zh-CN.xpi 687175 BLAKE2B 08b9baf8e1e2090f579c7b1b480162654d4387a502e0ff7e74970ac737f1e1d0cee291a2979cb6ebe4e5baf7ea1245cba3a2d1d25612e5be5b33bb3be491d7c9 SHA512 d99d17ed9b4151c5cb948f36296f550110e953f912d5f7cff2133e8447b3eaae23b261abff356d81035d0a4624443f0eff71d34324c884d14d561893405305c5
 DIST thunderbird-78.6.1-zh-TW.xpi 687623 BLAKE2B 389a13ee623a350cdea95e00e6ed63f79f5096e846395126934ce5a77edab8e404aa77ac9ba6b12154a409c95dd68589eeeda4e5cd5dd792fdddc29be4cedf73 SHA512 e9f71faab7cfe04661298acf021562fec28f58aad1d5da244573c6dc561065a7c2dbd2e89dba965a31f279627b209a6d45dd109be4aa7c5fd5520b7828153ce3
+DIST thunderbird-78.7.0-af.xpi 548349 BLAKE2B d729644b8d01795f868328482fd5084b6faeccbb0b837435aec69ca7e09bec2a6c276705c58f95dc5052a16a8242f7f6f9ed20cf5203bec22aaa9c3e6927cdf0 SHA512 aae82d4e50226f67967a3a5ed9ebcb464e50ee8a663301fa63b907eec55bf851778599bb5fb8394d9d8779e3a14741c76fc2041a842d6428f84b21899c01e860
+DIST thunderbird-78.7.0-ar.xpi 648607 BLAKE2B 8f5e7f17e33e2890f0a74873669f0d5944305da475f13d16fb5a5a5fb80661a0a76b34891996e1d3d1d4fcfcfe762b69f7962743124a799765430ce144689c0e SHA512 46eb357273c79a3077d91086bea0795bb03fda771812f905fb9ab8d76a06cb735f73eb314ae044a1c92d31492616da8b58b6910eb61e21b5cb807e7e3aec1578
+DIST thunderbird-78.7.0-ast.xpi 561261 BLAKE2B 9c1a26af7207101d0d553957cd860e547398c8cc984127178ab585f8e9a8784a0d56e8328072780575661c03811ed8f0e54f03d401f2766933409f4ae5e05029 SHA512 2c8f16d8d58f0219d52954b4a327fb21edd4dd3c6e88d991d162f6f5a1b712a041e7fbe1f83a00af67f19465bc0827a8c1728dc1c1706cc01e022bc728b184a5
+DIST thunderbird-78.7.0-be.xpi 666671 BLAKE2B 7cc7d7d20493fb7b1fdb29554b05afba088e2098d5518dd40938070524150cbb70623e5a8cf7380312bc344993860b0fb97209ff63178d686080ad88405a2b43 SHA512 17e94de33e10a35d9111c49eeaa6b73776e88777f11398c6145b8449e6fdb1a538b0df2eb5abf632a4b46fdf2b3a1bcc6827e0eb8bb2b43bbca9098e1e9a32e1
+DIST thunderbird-78.7.0-bg.xpi 672414 BLAKE2B b0e4e47bd8016ec328cf731fd1b039e19cbd991ec9c0fe533342e3e242ef7ba733670d8bede5e7508e6fb0ee2fb9afa6b7a90d5604bc52e711ddc9d575ee18fb SHA512 e50cd129c09b497d09ec890ac93e53b90cbc46867c2fab6c3a6efef36b8119494ab004136de1c9b9b49f57451c7d1b79889f91e4b51a7c852bb14d9b0604ac71
+DIST thunderbird-78.7.0-br.xpi 604532 BLAKE2B 3d3302c3a108e6cb81d19f717df42998d6a6e2a0d3684d8d6702e22dbf3eace666e262e6ba0487b2dd7a2d0e3bd193b09a47065f3bea5b193ae46e5e3e5ea8b6 SHA512 314bbaa80b29fbcbd724eef1796c6090629297d35966caee32f6bdbfbeeecc53fe15dc4509f96787fe8af264933c29c8bd68afc29c90411d508f6be467ae93a0
+DIST thunderbird-78.7.0-ca.xpi 620448 BLAKE2B 66626511a05c24ccecd5fe9eec27e31b655a418857aeec61f69b51338f7c6736192b150bfe18fcac91fa7a2f1d60cbc7e12a5c2a5a134c84caca7a563d48a619 SHA512 c5ed332b1b0cfb67e2a07443e6be5ac439d4d34eac1c9064a76267589a99cb21a728ee64ee3e35939b097bb2b5095361841b15f0ab8b5365e8c993a0112a22ed
+DIST thunderbird-78.7.0-cak.xpi 635648 BLAKE2B 9cea8038a09725239d0a0c4809250b6c5feccded3cf0b7011070e94adc137a072435e3c718194fdf5d9d800082a5d3a3ada22f9f0c5c02df64e973703ce93253 SHA512 be37fab0363a6f35ead6f622c197af899bfa7f0cc4e7c0dfe106153ae88b1f7e8b76345032dc62ac2931aa9fc01f6f07f89980aa3918c4839d9c41e629dca89f
+DIST thunderbird-78.7.0-cs.xpi 635346 BLAKE2B baaf078dc4767d7316240b37489be7f4f400ab5d683047e816d1d00642c3ce0be807fadd503468297b00309e73c8eb6b85dc8e8e258311527c384a7e2163bb7d SHA512 f62da5ccd4e75fae19753b9175a94ef8212735219309fc0a132db9256c5a59238d4522a8c12817ab2d4d886f68caabf63a66a7a8368c7515d8973be4db70776b
+DIST thunderbird-78.7.0-cy.xpi 646241 BLAKE2B 8c447575278e617a2768458318daad380b3a8162dd6fefe57423711ef85e23c3e0bc2b7bfc189ae612b2c8183876f949366801416e4bc6e8727a091b89ceb57f SHA512 e76d50997157e8dbc32c7d861e9a30209f9c03e3506562050275550cb16e748093504f8cc812a07f8da47b9b6d8b8328d2a71d66fbca97ada432d645fc2b01e1
+DIST thunderbird-78.7.0-da.xpi 620987 BLAKE2B 26087703cfb0d2533fb0ec1464e7a39ef7145f4cd4f16a493166270b39b455f922b999e642958608cea73730182229ce665e58985713f85d078ec94307896934 SHA512 54dddbcd396aa7404a7ac9fcf90997d96a833cc301744019ba201c55409f351a4b69784dc3cce03a87e62cb2c8690a52536d4dca019bef9a24a902e69988d0be
+DIST thunderbird-78.7.0-de.xpi 665190 BLAKE2B bd87547931523a981ba8d106b68b82d4b09e69de5a91b603b31e0c3ff8e9b39467298a0c2081f129e754a7941a100bf74ca0534462d717665e0a2f757e326671 SHA512 66a1691878667285f388f0728a92e92328c37bdd558d7df78f0ff638a967921185380dd2a307180b5b478830ccfe62094789c8dc0336833abbed3e4a55b539c3
+DIST thunderbird-78.7.0-dsb.xpi 666765 BLAKE2B 28c7e5fede005928d1e8bf324a4b5d52ffd9068969a46fb37fd187574b6e90d843c0139f3ad174e48eff6eecf33e88aae205fc80fb5f01b6843c7018311bdd00 SHA512 cf5cbd9ca03c78601f9b0f59ec75c8edbdea6d44c8b420a9d70900d4467701a6de40c26fb91681129c3ca04e997f118c967916a277075e30b5166b3df95bde1c
+DIST thunderbird-78.7.0-el.xpi 774455 BLAKE2B 0b6c997419288a112c9e711047a2b87f358790889f3522dd24a740a97d036c5818b5968802cf6716ad057806917e4ed42dfe87aa436de0827915a049f83f6540 SHA512 75be9791ddab68dee817ccf473232c8539256a468ed8b60112866804a9ce28f6df882c9d9f1c9205048a4e37608d10d664f3aecc68086570a0ade129b59b4b9f
+DIST thunderbird-78.7.0-en-CA.xpi 611770 BLAKE2B 30e05c1ad01eda00b79cc7159baa6014600169138808014fdf7b6bd1081e29fb97df7365fc6c6e6f8240d474c28ad12b7969b462ac8e040915b31d78622d2549 SHA512 5d595d3ac04dea4fab462212351961842201e66518fef027580a27bfe54bc63fab5ac3cd2a291dffdfbcff6c0c2a831be5d862bf28c05baa7ebe83c535daee1c
+DIST thunderbird-78.7.0-en-GB.xpi 611188 BLAKE2B 8a951858f29fc009719fc3a00459e8fb62571eb6a9078bfc23f84cd47a818c2f2df645f74d471c24a6a5c2fa7892e47290e7cde834f385fb5406e81429958308 SHA512 760173b34b2ba2356267806acd0afb91b9eeebe494219076f28cf6aaf60839e55c31fac13e12c154c20a010f8221a66d713d44ef70cb29b9a76219dec55126dd
+DIST thunderbird-78.7.0-es-AR.xpi 657787 BLAKE2B 3619485a7f95548fc5260fb878e3c50942887a71cfd79eeeec1ce91d549f558bdd35c42746c623acea469b7dc50cb90950168a99884f7585caa4e48f4f2c3836 SHA512 c8411955f23ddcec630af93973371f5cdf9ddf7ddfa268ba6ec8b159a18346d036e42d365a44157e6b5272ec54712f0a7417bfb8ba90504f091cecef13c542c8
+DIST thunderbird-78.7.0-es-ES.xpi 569803 BLAKE2B 963f579afefc24ef22a38b00705f20eae2d360c2b2ac4d4c0128a8fb853b1c45fcb62ebc0265b99cbdf5d14b4fc0042e1ba7f42b6a4e004475c4ce39da7e0c95 SHA512 e04e386b37cece87c874e6fddb45825fc44c1e334a4799e3bce3e5c0b26d089cbafdd62569a780624dbf5cc9bfa79f30032d4aabc8e4f97eb10b15fb1a893c5a
+DIST thunderbird-78.7.0-et.xpi 597741 BLAKE2B 42940384cb3a7b3d241469830aa1744a227a24f159489d89dadb1de1abb5b86842a6c6c2f9ce0c1b7cc4c9353f27d041fa14a25579b50826d1c8b4568ad8c890 SHA512 d220237a1430271be4201c33f528b3f9d4c10bf6598b160f007a72ba306e50cd8eb3e1cb4ad82e5a451af0fe9636158512d91296df919ef31664740813c1b1d6
+DIST thunderbird-78.7.0-eu.xpi 632960 BLAKE2B a54ab4936a2d21c811edcb9e0f640cad8e58493f4c22d5fb99911cac98cf772d2afc70ad08e9a0dce177487971eafbb2e1722ee1cd94656e0445334775aaae5e SHA512 cd03f32cb6f9417716acd03fc9024fb1cd82df57edf9cbc357f50d5f4f966813e16c2a5239765751eeed28a2c67cf9014c928aa54a54f33c468f36aab6e865db
+DIST thunderbird-78.7.0-fa.xpi 639760 BLAKE2B 883286b912121b85cc48dae6f4157e04cfd2f71060fddb5efda56914b066e7e7a5368828a343fecd609f824d07545744cd882d641d04f7a7c9a0dc82a1ab5617 SHA512 703cb57cbc8c7c45cf04739496740e8d76724a62308fe4da289dcf8201e765903d5d05d221dbc80f302d22a5a727cd68df138db2de3ccf3b90eb594fc0adf85c
+DIST thunderbird-78.7.0-fi.xpi 642450 BLAKE2B ca959991b52fab75cec84f37cae3080a849ade92481ce00685d7c148afd85b3411e900f397840cdbf75eaa3e9bfb159cfed9e61c83adaa702fc723e493cb35a2 SHA512 2c88ffd7bbb7ed51b49dedaf7bba910a68c72acce20add7774de0f58c0e418164d97a3578cfd13c231dafaa79d7bcbcdb2cafc052d63efff376f03081e9b722c
+DIST thunderbird-78.7.0-fr.xpi 669492 BLAKE2B 4e1f7a82f4ba292f6f34616af2f50a94191f9e19a75b1e387d32f9e37c95b7f2a043309ebaa33c7169b09509468ed17620217175eed534a1ff62d919765c7b28 SHA512 7c2745f182205ed84bf3cd79b6b730d7d2f4bd6e9dc0fa9c05f2f3cb2667baf5cbe4f39ada4a22e785dd2a1e5420206d8a5268259b181008ac5e14b4f650f6e0
+DIST thunderbird-78.7.0-fy-NL.xpi 653085 BLAKE2B 8b9838fb20330d39c7fc56aeebbe6a688055f0662518f2956da6d3a7e68e1be1280702f246a2d8d4b6e70c8183f4b017e6d988a95b9173df16d3fdf5cb4187fc SHA512 0fd3ca348ac46c30674195c39a15fc66fea5d05f7696596e07d8c143e8e3eb495b3194a74f7bc32ca056d2fc6b0495739be125dd677ac96234658e5bb5db4799
+DIST thunderbird-78.7.0-ga-IE.xpi 600707 BLAKE2B a3e44f938ed0f47de8b2cc4ef8261e793d24a893fbdaab937af5857d871d51b47b2da7f0af81608907bc695f3c2209c16c72ed1693e3f01a6ae97af912724ea0 SHA512 44512989d82ae5d9d325bc3e2c3b4a4b576dbcbefbf1aebe532d13fac8522ac3a08fbaaae5b4a66c14b1306718fed3d989edd4ce8b5866f41078c8c78dea1869
+DIST thunderbird-78.7.0-gd.xpi 609384 BLAKE2B ba7e155f35106cc1e36622d9c04198140667ba0ed8c577679b84e878c1e9cca82f313d9816ee0b8df65514eca42f73ae8bdb40b7a335e86e255b3ac993ab0777 SHA512 d6834bc72b618339936c15f7800ac0d4e86b8891041f93572703131cfbfb206536760ac7f180ed74aa2907e7698780c4622c374a2dd0835225a3468c797f543c
+DIST thunderbird-78.7.0-gl.xpi 615722 BLAKE2B 70ed1724451b1e1f564a505264e77310a06b1c1b9c0125b8e1fea7203e91fa8c4c51773a7720e43073d87d7f64ed9c87a7c60b6f1c3c5495cf9a53d49ee44677 SHA512 fd6a368250f4a1a51df0053a3b77e846f4b18665e0ffc076117027065494d2040d63244a89b9b788a171fa4da73ed0fb407c148382317bd8c4a788f20c67d79b
+DIST thunderbird-78.7.0-he.xpi 640491 BLAKE2B 213b2ac4b0a9aa937f6acf7a1622428ad044a5fdff957a3b6f349bacad6e7936d643a277398be2bb70de413da1e9c037b186ed84c3c7f8bf59210ebc15f7d7f4 SHA512 1f5a3f82819a545d0db8e5d8529f7ee105d40d21bc0f0ea0aa731793a28e4374cc8bd58c0ed74551e290c3eb679c6dea3aeaf36c2561b486b6e444c3ad53c4b6
+DIST thunderbird-78.7.0-hr.xpi 629032 BLAKE2B 31aa555b7aeb7f333c93093c77a3b2c20880b53c77ad98bf6adc7ea7c4c2d2cd0674722629cd32c44e12b1a51a04aeac1969edd842460df0e4541d0b8c292fb9 SHA512 b56ad357ba8c76df0941f78a137d25f94b1ffdc125d7f261dab4752559bc1fd54356e38494f0c1551e1767742a68d357ea11991916ec226cede0aebd19f6e8f8
+DIST thunderbird-78.7.0-hsb.xpi 668600 BLAKE2B b2f6b40757ae694f8e01f4ca5558efff9ae241ae540dfa8fc4d2f0c88a5e1086a5f8a996e4c85ab6db878a0a240b74bf661efa37e387ea3e2fc56aa55f366a3e SHA512 385fa1061f1b9fbf122cd0ddb1a97336dd9c272e875979f4d8601db8518be1e673e01895c692f93c7e7cee16edd175c45d68097067eab1fb9b7aeb2c7d7886e5
+DIST thunderbird-78.7.0-hu.xpi 679836 BLAKE2B 633bd951400eea9221ea5ba3c181a08dec1c97fd331d7eda70bcb381cd6882d8cf92cc9766b9ab5cd72b0af1c4e1e09c4f275c321959eef20c0d674e15dc9b86 SHA512 8d9b2583a17caa711bfc7a2308c05641a3ee210b95d358f2de3c0ecdf2c7d103d4a1e9b7c09d13143d527d9592f5cc61477d3e95f520b21b0633cc97c2643029
+DIST thunderbird-78.7.0-hy-AM.xpi 713331 BLAKE2B 0a2e7589e776761183d87307bfcf5c3c567f97b665c33854a487aaf5534eef01cd4ef2d39cba577599b619982f0bf2d4fd6852e777e41bc46c2fed02775b89d5 SHA512 5eb7566b8ebd680a028e636ed5851aa74957eb33187e640d7e0da71bc89d4246cf49a510baa12143827e1cfc23f4e7355f6e3351c3cc86e5de3f7982b10bdb43
+DIST thunderbird-78.7.0-id.xpi 620679 BLAKE2B f0f30fc59739dc32527233cf72560b1e9b7d7482fccc6c2085c8253e55a5eac75ea5de302553dbf8ee7a4498859849180cec7f6c8faefafe4a1d0b6732b13207 SHA512 d3115d72df2957a31cba44b570fd7d0700ece87c5add41ae80b1634baa575d8884cf3b6a8ea11b0b062d0d3d4fec6e506a03379733a33916060907fdf8cdd94c
+DIST thunderbird-78.7.0-is.xpi 581651 BLAKE2B 10094369b0b457e697ccad06dc444ff12d3a21c785716c2bfa4f63fcd65eb834cb6199c1393adb138e10687582dd7f616c4841145079e3a0c9f009db9ba71b39 SHA512 9a5b5bcb7242e37154ef6f46141a72133e7159f705e4c2676e627753fb62a32638cb86d3ee5ec361123112707a3904f3695c8894b27ce40652a3c94dc0a0c262
+DIST thunderbird-78.7.0-it.xpi 572960 BLAKE2B 5599905012d7e698fe3268f2f6a28cf6319b97d91e167e50829be3522d43da831ba96aa1640651721da2ad5204422a7addc4c245b707560ff902de60db2720fe SHA512 9c0b758184dd1c53af798bc0fea55c64a3f030c085ee407afdbbbda9c9f55c0114f1ab9249d35bd8286cccbe458e844c01530313c26c69500cb5aa2615396783
+DIST thunderbird-78.7.0-ja.xpi 722456 BLAKE2B e6beee82c636720f630ab55c7e94c85f01bf4392dd0ac382fea928054dfa41031ed03944ae30dfec1d5cc71bf72d5cc63390af368ebe464f6ae1b5f1d719663b SHA512 4f3b1c107204348209b3bcac63678adca11031ed1dc503023e08578af332f1a6e92e2dab37b90d5e9b04c461a72b059d8d6e05e852aa0b7bb650707c7a8091db
+DIST thunderbird-78.7.0-ka.xpi 717019 BLAKE2B 33d07769e816a87042696468084856190aa75e7acf37237d8afca2384cd9807c096025a75830663ce93480526e0345af3d17c60c3d07a2e8af0ee63b3355d9c8 SHA512 a1600e9870f17acb28abeb8d571e56c32e2ab23cacc521abccaef64a5e6bb88bdcd1d2b23979381d660cda0784093b47e720f1ad7d671d863abefb87f61ef56b
+DIST thunderbird-78.7.0-kab.xpi 651912 BLAKE2B b3be6bbda49548a8c6f91b12c2372943615a8b4e6b675ea7822ade262f7a5cc0c1168c99a2da827a8fb9d02658f968b67458812080f8993f53d5570a9a097ac8 SHA512 cd31eacc4ba0136b91662c480ddb38320d42b533480f89734d2f008eadb5c3781fa4a7718e0782bb9a6c9b2750554bc24987b6439ea8e38aafe1e1d128bde129
+DIST thunderbird-78.7.0-kk.xpi 720473 BLAKE2B 06a7a6a83746c154842ba9b373c8dc98f6765e08f0a4e7ad323a2bf2ee9519ab12153cd516ce2b68eceb51d444482b6730d73852581f231115d1aaf5149642fc SHA512 daf93514c2b6475eb693188046fa9b8b5a0b739ec2d7fde8a0d943b12d9929d99ae3b181aa9bf267087a9d93ac9ff5a8740ca0e04fc0fa2b427f1c9ca5673fc1
+DIST thunderbird-78.7.0-ko.xpi 688206 BLAKE2B 102bf8854957f926e27a8c9f63884f4e942bdb33a30b61b53259f423f47aeeb6e14a59a2b79e40e8bbeac085f674d20eb156a009d55fe5981610fdff282e2693 SHA512 6dcb96099fd88bf72ea4f464211e89757b5345b1fe234392287bf8ecd0f95a405f27c8642e0031279771c9dfbdc0f6c20535f49063424eb51b7331e765477eed
+DIST thunderbird-78.7.0-lt.xpi 660301 BLAKE2B ce942cac2e7e462e4c96935440d6c6a1a3f63221a7e8fa24858878d105b43b14be4a420b884c0b048de2badf5de2297d290bb50fbd6908d1867d84717378f54b SHA512 8f468ae676edbcf4bc90c4ac8f96fa26f9ac5d3d6d5c6466151b4aa0e148f0017685df7ffbe0fc86e40313c3edd196b48b532d773c160c54fc0cd27221d633f9
+DIST thunderbird-78.7.0-ms.xpi 572173 BLAKE2B 8bc69d0a10ddb8d16c673c131abd73e8db62f09508739980024ed5a8284578a02b9e6b1f5f5fab997f36fee30b907678a3324e03978adcdbc91735a16b7406d0 SHA512 5070b8a336b66b0aa9d31c3473cb92c2ff59d75925d19c31eb84ef3409a160605c9bff0fc741759ce8e7dd51db8f9392f8490f642159abd8cfbaaf8cd00d9a10
+DIST thunderbird-78.7.0-nb-NO.xpi 637241 BLAKE2B b01b24f7c33ba711919ea760b00bc96966b6f62a39f0a5dd6b2dc0402ed39c38c768a9a65dbbcb4691563f7d3ce438d5cd701c537e68ee6561c25a599d559eb0 SHA512 5a5adedd3370287485e38fbef50b2bdd0baecac5f467c540f74337923046b6e46c36090271f9a3c252885e30fc403a88379e3a4a09e526f3a77f1fc53a307290
+DIST thunderbird-78.7.0-nl.xpi 644365 BLAKE2B 953397c1d54cbee99c2766c80c239464634a610536d007c97957721b6a519e1f325ad680d526720d16508ce80315d200701914dbab4261c9084262d2ff6475ef SHA512 3516f7e4d46d7151cd1f0500eedde9c3e131d3defdfd601f34e012f41e713528446f3af7db4dd2a05eacba015325761a242584c2b65de6185a1f50243e98bd8e
+DIST thunderbird-78.7.0-nn-NO.xpi 640691 BLAKE2B 2aae52adb833b52f35c0c6bd74155ebe45ab0cee56bb62fec438b5ab4a0fc87b0d492ef37532cfdca116000933a25a8010102495d462339d36edc5dd6e5d187f SHA512 bcf90707d5f71689335d4dd29330165dc6f1e7f5e74ca83d22d242568b2b30de013e710f64c434aa80321167dc3067fd468e280d8dfaf947598f8d34647536fb
+DIST thunderbird-78.7.0-pa-IN.xpi 633219 BLAKE2B 56e1812b9929b771ec27797c8dc763b810c22a14403b38c86cc935eeb6839de32e8909c0992a717cd528bb7ea7fc2ca3be804d6de3399a29dd221c080a5c2753 SHA512 dff98ba26ed27568a482e62843c1e3b74edc6baba686e8efcb9d90fb37585caf14891fe115ca9767907fbb313bb714b0ece21bed0b49fe19fef7a8210ac6ac6f
+DIST thunderbird-78.7.0-pl.xpi 637115 BLAKE2B 42053fef36adce057ee10420a32d78e55aa0ae66af5b714bcd7d498327602781b5c935a3b01b740cc070bab936429e2230b7f41d3d023659eab2869baf056047 SHA512 f6662a43dbffda267f470d70e8532ec93cfd8741ec4d20f2ea1449e22925e93d6e6ce209e0db0f89733c1eef60538e866ef48c1c5536d3c5763ea71aa8c612f3
+DIST thunderbird-78.7.0-pt-BR.xpi 649418 BLAKE2B 973d9c1e7cab14a2d144ff47c397cb1bd1ef23e3f4b4bfea245e8c0b2ec24cdf3587065004c24e2f68ad0e35e787dfe9da050a025766a88428bc2794846ca213 SHA512 d82c4aa7258633b0eedf1a55f0417e88876cbf3c8ad2f6af5ec2f9880196e9685d37c8945a675c00fdb72f3e7b4a9180bffa15efb48b905d22467a4485b116e3
+DIST thunderbird-78.7.0-pt-PT.xpi 655494 BLAKE2B 388c8acb08b024de1cc9b195a2e9a0e18c2087fa63622c01e9978917070eeb605b77c64a166e1d38d3126c8174aa06b84c8d20947332e5c50af44f966f407008 SHA512 07e63b237ed40a75aad8093eff19d1a52a34b8cb1b92cb4e1c874d754842cc9257e2fc4fd199c9097b830b37c3c8c646fd5c56d8ee7c81153fab8d00460755c4
+DIST thunderbird-78.7.0-rm.xpi 646536 BLAKE2B edf06521fb2d5bfab957d9d3486aa9a1cb4e330e0e7fedffb24cd010bd3986bca58dd594f2f224cd8dda6a665f81e710f1bb49616b05eac62a6606a399cf4eef SHA512 ad198963e587b8228549822e7800320dc8d87f6e753424320cb910160d540ebae3aac7b74d14b76ffc976d46aaed9eabaadd0bd05a469ee5475b7e76c822c167
+DIST thunderbird-78.7.0-ro.xpi 662635 BLAKE2B 260c489575ca1c750e5b61c3344ca4f4de839ed020c00c9a6a10e78818ed9f4cd967c926c3e52c03db7031ad8ff32c8ae8fda6081988362b91bb2c8fe596d003 SHA512 5318ad999dec2e219d08f609aef312f2641fbbdf90c9e3d960b6e8adc59380575b2b3a4ade9f67fe130fddaeb807ac862862d0324f8093a5893a07e087882b2d
+DIST thunderbird-78.7.0-ru.xpi 756190 BLAKE2B c33ae63079a3881710c62fbf60233829010a1a950e1350aeb2937da6b8c1dfb6379278f2a7e9b4c5e34d229f182cae920bec659239a1129d8f4d2a52e0f74011 SHA512 c3b969a1de384b4e35db3bcaca1d9b79e7b6b75c864d44dcb969ac50272364749dccd7adc069138ea46d0a08b41f02832b35b594f169e1da6ced72b5959de95e
+DIST thunderbird-78.7.0-si.xpi 651100 BLAKE2B 9dda1b13e617f65e7e9043adcd636cc488d14cd97b5f6d5987a8af25a5197b38066e1c78875203ceb35ebedcd2a567bd05cf6b0a9f613184113c9a90c73e51a9 SHA512 10284670d5bb2d10661cbabe7b2e05731ca03b19163b6472d4600f979d49b51ffcc6c12a308ec5a9a1f796d7eb9a1fb960d74dcc4d0eb13085c9d81451949b12
+DIST thunderbird-78.7.0-sk.xpi 643221 BLAKE2B f647b6a0bc811c1f35d939aec5af8246853fbe70d83288ee2ea3b97ab64fb5d07125db281b59d989ff9ac3107108900c68eb594f9116b4ce33161155666195f5 SHA512 c63b27b2f67b80fdb6e9b4d928505b1722f26950b5b99bfcd511d6fafae2e6df141d31329b8440193b8d7eb4db182c0c90ab8a2d01dadbbde4194caf4edae71d
+DIST thunderbird-78.7.0-sl.xpi 632385 BLAKE2B 1696a083a5301505b17d927bb394ab7b3681e01ed23248c9ef4bbf85c21319117452bc36359909b2b866b1cc98776dec37ced5b7d39cb17ab81f9c4a30e4b973 SHA512 abb5a67c25146e6b9c65db70dd42eeed909b6008b63fcf02e705beb86d66ba4fc9ee883972cf2aeb6d47526c5e906d2d68be7c868c463dadc0bba84c17e2687b
+DIST thunderbird-78.7.0-sq.xpi 657820 BLAKE2B 55ba61d131faa8369d3cf4be386f3f4fd24e8128967bebbcea44e54350bfd859b7e9572f81fb5835982dbfee6698b3485a827940ee291b739cf194ecbe93b181 SHA512 89709ef8815630f9e397d04640d5a84bf0299786fd5af0103d5a08f6c7f3aecd028255d7ed311bdf4ed81d36ee60731336a20aa6fd4fef6e0b6d16ba3308b216
+DIST thunderbird-78.7.0-sr.xpi 683115 BLAKE2B 89c6fbb349704c38b0b695e7da3a2742e85ac8860157835aebf06b47e3ea1b21c16f864b8af537b8c1d1a1bf1ad62860d8d54a32197743f1c5a3b4226bceb32d SHA512 6d9025096227897d4812e72a13bf6943ecd0f06680d83064726311603cf29c019855a1745aab2ef66f3f335269f0d2a0e9f46d55ea4a4318bdc8a68268356cec
+DIST thunderbird-78.7.0-sv-SE.xpi 648871 BLAKE2B 55a512ae4320290ac02d5997b2ffe070411630a67d514039de44ccef27208e95a88de08d3d79e7dd92d62d5b6b160d788bff1567666edce28e61555f8ee3e01e SHA512 41e8e66c5aa024924fa4639299316947c8b7cf944e8301f26032d5cdcef9d8c0556cd28d6cae75b63647f0643ce8ccd25f13e930f1cf0103732c47691a5a3a54
+DIST thunderbird-78.7.0-th.xpi 712035 BLAKE2B 0d8349133ac3b7054f90d96ade1967fd56a00c65058c0df21b9be6a6c13bf745de9ad3da36789f48a88f0a7a094ded5f4c232aa5c988685451e9fa9dad2abbc5 SHA512 cf8324d242395b24df5b7ff5f51cea46037937b65346910a110b1110d89846cc08c4a0a85bd0a08d06c61e89f45da12fcb61933295414caeeb46346e4c3ad5c9
+DIST thunderbird-78.7.0-tr.xpi 649065 BLAKE2B 90d7cd9aac8b3ee0b6d176ce3c5cc5910cafa8bc6a3b0b8d0474ebaa7a0c36114d44ff916e6372e4f9f2792a1d189da3c8db3cb81f901031be72e6b95e70e287 SHA512 4e35e4c5fa6153a61fba453f956e595a331ba0b0c9afa52f3210bc3c0db404602fc9c89b1ee634b1b2da693ee41156fa9e1e8614c9efa06011d71f1882d77a49
+DIST thunderbird-78.7.0-uz.xpi 586592 BLAKE2B 51d868a58bfd7a94e4d86fa1ef18d5f2b99c67fe7693c37f9367b1771544333be73b2512e97771846c0ddb74306f2f71918728b28d0a9fd618d624964496f1c0 SHA512 a7508277fae2bd6bb2c222e2b0e6528495b7463dad8ead89d61409802f98b3d81dee553dc5a6af5f3a867b219f96e4de8c16dd340e2525b834983dad91dcc045
+DIST thunderbird-78.7.0-vi.xpi 674602 BLAKE2B 82417b1cfa49e7ca162baf70bbea4b768613b6de2641e10183eb5bc23b97a2c007c1fcb9775cf05ef1a33e62d1ee328908a8d55d92cf43949e009012e5d30ba4 SHA512 4e428ff8b0598ed38d7f26e736db67b30b727fa0b6bc9c35de7d323a22b029af8fa8eafd495922e551883bc06794edf554785c8febc6e090cc5168f1937ee3ea
+DIST thunderbird-78.7.0-zh-CN.xpi 687176 BLAKE2B a38b3ac31c79cec6fa93cd72af7f3e6f20666bf157defc8063beb09313cbb62720e24724337342baf9d5b2ef3330a09e7666802d23824d14b1e68714ab9ff816 SHA512 eecf33fb400128a5f949a4a62043ce45f352ace129b2e6cda5361563ab852a986e84335b2ffcd566ed0f1913519e3ed61f0b7c32d481695c83fa32af003d20ad
+DIST thunderbird-78.7.0-zh-TW.xpi 687616 BLAKE2B 025519461319a34c7d81e0c8b7bdc94ab85a7e2fc5fb5851457f09efaa85cfa755a6629d6a14c16cd8949607cb79e8f8ffed9798c3445eda2141d61ed3241c39 SHA512 67a0f5f0f57cc7a87764289332090f7ed6b42ba834175cce5402e40f1d963c2166e8fa76ad34dbc943cc450e558d205ca245e12b1fa0b3dc5162d384bb60cef1
 DIST thunderbird-bin_i686-78.6.1.tar.bz2 68072388 BLAKE2B 43f8017461a951a246b199ad25e6df257ed99e3c406e33521b02a8645acd6f7ca233e85bdfeabb0e57ebe2c5ec819865c199c3e6af85d3c983b287df00d74648 SHA512 fd96478c330c24ff12007bba2073b1f9087a9728f89a9f7f691ce176487131d041e5b9c2bfabf30f4b9a8682059573f72bfaba1a36b29ee8921c11521b1ec83c
+DIST thunderbird-bin_i686-78.7.0.tar.bz2 68337776 BLAKE2B 744257f065097f9b7f510b2a690367ef138c581dc4cba3913df5ee2e6441d3868d1e807a901ad52c9c3834fa5d4efd12e41762e82621a911202e0b95d208b80b SHA512 9eb5722c31c016f69756fe3c3952d1e13a75464d8beb57fff50a9c3d65a4b32c355c407609a5114e47b6f7401f37c94aefb997b6ed4a57dbbc99f0fa510fff4e
 DIST thunderbird-bin_x86_64-78.6.1.tar.bz2 65170633 BLAKE2B 8732ac39df004ba4f1339765a35da49fc06876485ae55b6741a995fe25a60b08969e17b8450316e006f37bd74bde0e5af0379092f7682d9ef92bace91607f5e1 SHA512 2f395fdf93ba81c412cbe1b54da1f681a17195139993ba9aaadb694b98fe9efaee088899aaf77ce5702d1eb7c5172ba7759ae7bd696e3cf476df9cf70570180a
+DIST thunderbird-bin_x86_64-78.7.0.tar.bz2 65165934 BLAKE2B ec78c5b4ba24f5e23673696ecc8c939fd7117d565fbeb015a87a3548a962a8f70b5309f054b73dbe07aef89ffc095303ee9d00666c3ddb79f759cdb932812243 SHA512 3e10e14fd0688352d6f12767b1b3fae58fa7bb045d98acc90b260ddc0060dd3bdf47ef78da1cb028d20c18982421675b4c0663617bc90ed890ef3ec6828383ea
 EBUILD thunderbird-bin-78.6.1.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
+EBUILD thunderbird-bin-78.7.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.7.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.7.0.ebuild
new file mode 100644
index 000000000000..908f3ef026b2
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.7.0.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 3b133b6bc552..a0e0c0584ce0 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -72,5 +72,71 @@ DIST thunderbird-78.6.1-vi.xpi 674605 BLAKE2B 7db83cf29596b955a8a2f8376bbe3322d5
 DIST thunderbird-78.6.1-zh-CN.xpi 687175 BLAKE2B 08b9baf8e1e2090f579c7b1b480162654d4387a502e0ff7e74970ac737f1e1d0cee291a2979cb6ebe4e5baf7ea1245cba3a2d1d25612e5be5b33bb3be491d7c9 SHA512 d99d17ed9b4151c5cb948f36296f550110e953f912d5f7cff2133e8447b3eaae23b261abff356d81035d0a4624443f0eff71d34324c884d14d561893405305c5
 DIST thunderbird-78.6.1-zh-TW.xpi 687623 BLAKE2B 389a13ee623a350cdea95e00e6ed63f79f5096e846395126934ce5a77edab8e404aa77ac9ba6b12154a409c95dd68589eeeda4e5cd5dd792fdddc29be4cedf73 SHA512 e9f71faab7cfe04661298acf021562fec28f58aad1d5da244573c6dc561065a7c2dbd2e89dba965a31f279627b209a6d45dd109be4aa7c5fd5520b7828153ce3
 DIST thunderbird-78.6.1.source.tar.xz 351971732 BLAKE2B e66049bdad344a8aa1d95828fb257aad2fa4f425bd64abfb77629f0257d11317ab4f2ca9f04cd1a3a584dd9a3e7dd2a13c861960c72fb1c94809cebdebbbbf26 SHA512 672f9ce2716114e83d3feaa7f322a405946731d540b5a9781249eba951cbf865af73ce67654e1c47e93828b0d792c1ff6a36d7ce26aee7af7bfc8cd715a8f977
+DIST thunderbird-78.7.0-af.xpi 548349 BLAKE2B d729644b8d01795f868328482fd5084b6faeccbb0b837435aec69ca7e09bec2a6c276705c58f95dc5052a16a8242f7f6f9ed20cf5203bec22aaa9c3e6927cdf0 SHA512 aae82d4e50226f67967a3a5ed9ebcb464e50ee8a663301fa63b907eec55bf851778599bb5fb8394d9d8779e3a14741c76fc2041a842d6428f84b21899c01e860
+DIST thunderbird-78.7.0-ar.xpi 648607 BLAKE2B 8f5e7f17e33e2890f0a74873669f0d5944305da475f13d16fb5a5a5fb80661a0a76b34891996e1d3d1d4fcfcfe762b69f7962743124a799765430ce144689c0e SHA512 46eb357273c79a3077d91086bea0795bb03fda771812f905fb9ab8d76a06cb735f73eb314ae044a1c92d31492616da8b58b6910eb61e21b5cb807e7e3aec1578
+DIST thunderbird-78.7.0-ast.xpi 561261 BLAKE2B 9c1a26af7207101d0d553957cd860e547398c8cc984127178ab585f8e9a8784a0d56e8328072780575661c03811ed8f0e54f03d401f2766933409f4ae5e05029 SHA512 2c8f16d8d58f0219d52954b4a327fb21edd4dd3c6e88d991d162f6f5a1b712a041e7fbe1f83a00af67f19465bc0827a8c1728dc1c1706cc01e022bc728b184a5
+DIST thunderbird-78.7.0-be.xpi 666671 BLAKE2B 7cc7d7d20493fb7b1fdb29554b05afba088e2098d5518dd40938070524150cbb70623e5a8cf7380312bc344993860b0fb97209ff63178d686080ad88405a2b43 SHA512 17e94de33e10a35d9111c49eeaa6b73776e88777f11398c6145b8449e6fdb1a538b0df2eb5abf632a4b46fdf2b3a1bcc6827e0eb8bb2b43bbca9098e1e9a32e1
+DIST thunderbird-78.7.0-bg.xpi 672414 BLAKE2B b0e4e47bd8016ec328cf731fd1b039e19cbd991ec9c0fe533342e3e242ef7ba733670d8bede5e7508e6fb0ee2fb9afa6b7a90d5604bc52e711ddc9d575ee18fb SHA512 e50cd129c09b497d09ec890ac93e53b90cbc46867c2fab6c3a6efef36b8119494ab004136de1c9b9b49f57451c7d1b79889f91e4b51a7c852bb14d9b0604ac71
+DIST thunderbird-78.7.0-br.xpi 604532 BLAKE2B 3d3302c3a108e6cb81d19f717df42998d6a6e2a0d3684d8d6702e22dbf3eace666e262e6ba0487b2dd7a2d0e3bd193b09a47065f3bea5b193ae46e5e3e5ea8b6 SHA512 314bbaa80b29fbcbd724eef1796c6090629297d35966caee32f6bdbfbeeecc53fe15dc4509f96787fe8af264933c29c8bd68afc29c90411d508f6be467ae93a0
+DIST thunderbird-78.7.0-ca.xpi 620448 BLAKE2B 66626511a05c24ccecd5fe9eec27e31b655a418857aeec61f69b51338f7c6736192b150bfe18fcac91fa7a2f1d60cbc7e12a5c2a5a134c84caca7a563d48a619 SHA512 c5ed332b1b0cfb67e2a07443e6be5ac439d4d34eac1c9064a76267589a99cb21a728ee64ee3e35939b097bb2b5095361841b15f0ab8b5365e8c993a0112a22ed
+DIST thunderbird-78.7.0-cak.xpi 635648 BLAKE2B 9cea8038a09725239d0a0c4809250b6c5feccded3cf0b7011070e94adc137a072435e3c718194fdf5d9d800082a5d3a3ada22f9f0c5c02df64e973703ce93253 SHA512 be37fab0363a6f35ead6f622c197af899bfa7f0cc4e7c0dfe106153ae88b1f7e8b76345032dc62ac2931aa9fc01f6f07f89980aa3918c4839d9c41e629dca89f
+DIST thunderbird-78.7.0-cs.xpi 635346 BLAKE2B baaf078dc4767d7316240b37489be7f4f400ab5d683047e816d1d00642c3ce0be807fadd503468297b00309e73c8eb6b85dc8e8e258311527c384a7e2163bb7d SHA512 f62da5ccd4e75fae19753b9175a94ef8212735219309fc0a132db9256c5a59238d4522a8c12817ab2d4d886f68caabf63a66a7a8368c7515d8973be4db70776b
+DIST thunderbird-78.7.0-cy.xpi 646241 BLAKE2B 8c447575278e617a2768458318daad380b3a8162dd6fefe57423711ef85e23c3e0bc2b7bfc189ae612b2c8183876f949366801416e4bc6e8727a091b89ceb57f SHA512 e76d50997157e8dbc32c7d861e9a30209f9c03e3506562050275550cb16e748093504f8cc812a07f8da47b9b6d8b8328d2a71d66fbca97ada432d645fc2b01e1
+DIST thunderbird-78.7.0-da.xpi 620987 BLAKE2B 26087703cfb0d2533fb0ec1464e7a39ef7145f4cd4f16a493166270b39b455f922b999e642958608cea73730182229ce665e58985713f85d078ec94307896934 SHA512 54dddbcd396aa7404a7ac9fcf90997d96a833cc301744019ba201c55409f351a4b69784dc3cce03a87e62cb2c8690a52536d4dca019bef9a24a902e69988d0be
+DIST thunderbird-78.7.0-de.xpi 665190 BLAKE2B bd87547931523a981ba8d106b68b82d4b09e69de5a91b603b31e0c3ff8e9b39467298a0c2081f129e754a7941a100bf74ca0534462d717665e0a2f757e326671 SHA512 66a1691878667285f388f0728a92e92328c37bdd558d7df78f0ff638a967921185380dd2a307180b5b478830ccfe62094789c8dc0336833abbed3e4a55b539c3
+DIST thunderbird-78.7.0-dsb.xpi 666765 BLAKE2B 28c7e5fede005928d1e8bf324a4b5d52ffd9068969a46fb37fd187574b6e90d843c0139f3ad174e48eff6eecf33e88aae205fc80fb5f01b6843c7018311bdd00 SHA512 cf5cbd9ca03c78601f9b0f59ec75c8edbdea6d44c8b420a9d70900d4467701a6de40c26fb91681129c3ca04e997f118c967916a277075e30b5166b3df95bde1c
+DIST thunderbird-78.7.0-el.xpi 774455 BLAKE2B 0b6c997419288a112c9e711047a2b87f358790889f3522dd24a740a97d036c5818b5968802cf6716ad057806917e4ed42dfe87aa436de0827915a049f83f6540 SHA512 75be9791ddab68dee817ccf473232c8539256a468ed8b60112866804a9ce28f6df882c9d9f1c9205048a4e37608d10d664f3aecc68086570a0ade129b59b4b9f
+DIST thunderbird-78.7.0-en-CA.xpi 611770 BLAKE2B 30e05c1ad01eda00b79cc7159baa6014600169138808014fdf7b6bd1081e29fb97df7365fc6c6e6f8240d474c28ad12b7969b462ac8e040915b31d78622d2549 SHA512 5d595d3ac04dea4fab462212351961842201e66518fef027580a27bfe54bc63fab5ac3cd2a291dffdfbcff6c0c2a831be5d862bf28c05baa7ebe83c535daee1c
+DIST thunderbird-78.7.0-en-GB.xpi 611188 BLAKE2B 8a951858f29fc009719fc3a00459e8fb62571eb6a9078bfc23f84cd47a818c2f2df645f74d471c24a6a5c2fa7892e47290e7cde834f385fb5406e81429958308 SHA512 760173b34b2ba2356267806acd0afb91b9eeebe494219076f28cf6aaf60839e55c31fac13e12c154c20a010f8221a66d713d44ef70cb29b9a76219dec55126dd
+DIST thunderbird-78.7.0-es-AR.xpi 657787 BLAKE2B 3619485a7f95548fc5260fb878e3c50942887a71cfd79eeeec1ce91d549f558bdd35c42746c623acea469b7dc50cb90950168a99884f7585caa4e48f4f2c3836 SHA512 c8411955f23ddcec630af93973371f5cdf9ddf7ddfa268ba6ec8b159a18346d036e42d365a44157e6b5272ec54712f0a7417bfb8ba90504f091cecef13c542c8
+DIST thunderbird-78.7.0-es-ES.xpi 569803 BLAKE2B 963f579afefc24ef22a38b00705f20eae2d360c2b2ac4d4c0128a8fb853b1c45fcb62ebc0265b99cbdf5d14b4fc0042e1ba7f42b6a4e004475c4ce39da7e0c95 SHA512 e04e386b37cece87c874e6fddb45825fc44c1e334a4799e3bce3e5c0b26d089cbafdd62569a780624dbf5cc9bfa79f30032d4aabc8e4f97eb10b15fb1a893c5a
+DIST thunderbird-78.7.0-et.xpi 597741 BLAKE2B 42940384cb3a7b3d241469830aa1744a227a24f159489d89dadb1de1abb5b86842a6c6c2f9ce0c1b7cc4c9353f27d041fa14a25579b50826d1c8b4568ad8c890 SHA512 d220237a1430271be4201c33f528b3f9d4c10bf6598b160f007a72ba306e50cd8eb3e1cb4ad82e5a451af0fe9636158512d91296df919ef31664740813c1b1d6
+DIST thunderbird-78.7.0-eu.xpi 632960 BLAKE2B a54ab4936a2d21c811edcb9e0f640cad8e58493f4c22d5fb99911cac98cf772d2afc70ad08e9a0dce177487971eafbb2e1722ee1cd94656e0445334775aaae5e SHA512 cd03f32cb6f9417716acd03fc9024fb1cd82df57edf9cbc357f50d5f4f966813e16c2a5239765751eeed28a2c67cf9014c928aa54a54f33c468f36aab6e865db
+DIST thunderbird-78.7.0-fa.xpi 639760 BLAKE2B 883286b912121b85cc48dae6f4157e04cfd2f71060fddb5efda56914b066e7e7a5368828a343fecd609f824d07545744cd882d641d04f7a7c9a0dc82a1ab5617 SHA512 703cb57cbc8c7c45cf04739496740e8d76724a62308fe4da289dcf8201e765903d5d05d221dbc80f302d22a5a727cd68df138db2de3ccf3b90eb594fc0adf85c
+DIST thunderbird-78.7.0-fi.xpi 642450 BLAKE2B ca959991b52fab75cec84f37cae3080a849ade92481ce00685d7c148afd85b3411e900f397840cdbf75eaa3e9bfb159cfed9e61c83adaa702fc723e493cb35a2 SHA512 2c88ffd7bbb7ed51b49dedaf7bba910a68c72acce20add7774de0f58c0e418164d97a3578cfd13c231dafaa79d7bcbcdb2cafc052d63efff376f03081e9b722c
+DIST thunderbird-78.7.0-fr.xpi 669492 BLAKE2B 4e1f7a82f4ba292f6f34616af2f50a94191f9e19a75b1e387d32f9e37c95b7f2a043309ebaa33c7169b09509468ed17620217175eed534a1ff62d919765c7b28 SHA512 7c2745f182205ed84bf3cd79b6b730d7d2f4bd6e9dc0fa9c05f2f3cb2667baf5cbe4f39ada4a22e785dd2a1e5420206d8a5268259b181008ac5e14b4f650f6e0
+DIST thunderbird-78.7.0-fy-NL.xpi 653085 BLAKE2B 8b9838fb20330d39c7fc56aeebbe6a688055f0662518f2956da6d3a7e68e1be1280702f246a2d8d4b6e70c8183f4b017e6d988a95b9173df16d3fdf5cb4187fc SHA512 0fd3ca348ac46c30674195c39a15fc66fea5d05f7696596e07d8c143e8e3eb495b3194a74f7bc32ca056d2fc6b0495739be125dd677ac96234658e5bb5db4799
+DIST thunderbird-78.7.0-ga-IE.xpi 600707 BLAKE2B a3e44f938ed0f47de8b2cc4ef8261e793d24a893fbdaab937af5857d871d51b47b2da7f0af81608907bc695f3c2209c16c72ed1693e3f01a6ae97af912724ea0 SHA512 44512989d82ae5d9d325bc3e2c3b4a4b576dbcbefbf1aebe532d13fac8522ac3a08fbaaae5b4a66c14b1306718fed3d989edd4ce8b5866f41078c8c78dea1869
+DIST thunderbird-78.7.0-gd.xpi 609384 BLAKE2B ba7e155f35106cc1e36622d9c04198140667ba0ed8c577679b84e878c1e9cca82f313d9816ee0b8df65514eca42f73ae8bdb40b7a335e86e255b3ac993ab0777 SHA512 d6834bc72b618339936c15f7800ac0d4e86b8891041f93572703131cfbfb206536760ac7f180ed74aa2907e7698780c4622c374a2dd0835225a3468c797f543c
+DIST thunderbird-78.7.0-gl.xpi 615722 BLAKE2B 70ed1724451b1e1f564a505264e77310a06b1c1b9c0125b8e1fea7203e91fa8c4c51773a7720e43073d87d7f64ed9c87a7c60b6f1c3c5495cf9a53d49ee44677 SHA512 fd6a368250f4a1a51df0053a3b77e846f4b18665e0ffc076117027065494d2040d63244a89b9b788a171fa4da73ed0fb407c148382317bd8c4a788f20c67d79b
+DIST thunderbird-78.7.0-he.xpi 640491 BLAKE2B 213b2ac4b0a9aa937f6acf7a1622428ad044a5fdff957a3b6f349bacad6e7936d643a277398be2bb70de413da1e9c037b186ed84c3c7f8bf59210ebc15f7d7f4 SHA512 1f5a3f82819a545d0db8e5d8529f7ee105d40d21bc0f0ea0aa731793a28e4374cc8bd58c0ed74551e290c3eb679c6dea3aeaf36c2561b486b6e444c3ad53c4b6
+DIST thunderbird-78.7.0-hr.xpi 629032 BLAKE2B 31aa555b7aeb7f333c93093c77a3b2c20880b53c77ad98bf6adc7ea7c4c2d2cd0674722629cd32c44e12b1a51a04aeac1969edd842460df0e4541d0b8c292fb9 SHA512 b56ad357ba8c76df0941f78a137d25f94b1ffdc125d7f261dab4752559bc1fd54356e38494f0c1551e1767742a68d357ea11991916ec226cede0aebd19f6e8f8
+DIST thunderbird-78.7.0-hsb.xpi 668600 BLAKE2B b2f6b40757ae694f8e01f4ca5558efff9ae241ae540dfa8fc4d2f0c88a5e1086a5f8a996e4c85ab6db878a0a240b74bf661efa37e387ea3e2fc56aa55f366a3e SHA512 385fa1061f1b9fbf122cd0ddb1a97336dd9c272e875979f4d8601db8518be1e673e01895c692f93c7e7cee16edd175c45d68097067eab1fb9b7aeb2c7d7886e5
+DIST thunderbird-78.7.0-hu.xpi 679836 BLAKE2B 633bd951400eea9221ea5ba3c181a08dec1c97fd331d7eda70bcb381cd6882d8cf92cc9766b9ab5cd72b0af1c4e1e09c4f275c321959eef20c0d674e15dc9b86 SHA512 8d9b2583a17caa711bfc7a2308c05641a3ee210b95d358f2de3c0ecdf2c7d103d4a1e9b7c09d13143d527d9592f5cc61477d3e95f520b21b0633cc97c2643029
+DIST thunderbird-78.7.0-hy-AM.xpi 713331 BLAKE2B 0a2e7589e776761183d87307bfcf5c3c567f97b665c33854a487aaf5534eef01cd4ef2d39cba577599b619982f0bf2d4fd6852e777e41bc46c2fed02775b89d5 SHA512 5eb7566b8ebd680a028e636ed5851aa74957eb33187e640d7e0da71bc89d4246cf49a510baa12143827e1cfc23f4e7355f6e3351c3cc86e5de3f7982b10bdb43
+DIST thunderbird-78.7.0-id.xpi 620679 BLAKE2B f0f30fc59739dc32527233cf72560b1e9b7d7482fccc6c2085c8253e55a5eac75ea5de302553dbf8ee7a4498859849180cec7f6c8faefafe4a1d0b6732b13207 SHA512 d3115d72df2957a31cba44b570fd7d0700ece87c5add41ae80b1634baa575d8884cf3b6a8ea11b0b062d0d3d4fec6e506a03379733a33916060907fdf8cdd94c
+DIST thunderbird-78.7.0-is.xpi 581651 BLAKE2B 10094369b0b457e697ccad06dc444ff12d3a21c785716c2bfa4f63fcd65eb834cb6199c1393adb138e10687582dd7f616c4841145079e3a0c9f009db9ba71b39 SHA512 9a5b5bcb7242e37154ef6f46141a72133e7159f705e4c2676e627753fb62a32638cb86d3ee5ec361123112707a3904f3695c8894b27ce40652a3c94dc0a0c262
+DIST thunderbird-78.7.0-it.xpi 572960 BLAKE2B 5599905012d7e698fe3268f2f6a28cf6319b97d91e167e50829be3522d43da831ba96aa1640651721da2ad5204422a7addc4c245b707560ff902de60db2720fe SHA512 9c0b758184dd1c53af798bc0fea55c64a3f030c085ee407afdbbbda9c9f55c0114f1ab9249d35bd8286cccbe458e844c01530313c26c69500cb5aa2615396783
+DIST thunderbird-78.7.0-ja.xpi 722456 BLAKE2B e6beee82c636720f630ab55c7e94c85f01bf4392dd0ac382fea928054dfa41031ed03944ae30dfec1d5cc71bf72d5cc63390af368ebe464f6ae1b5f1d719663b SHA512 4f3b1c107204348209b3bcac63678adca11031ed1dc503023e08578af332f1a6e92e2dab37b90d5e9b04c461a72b059d8d6e05e852aa0b7bb650707c7a8091db
+DIST thunderbird-78.7.0-ka.xpi 717019 BLAKE2B 33d07769e816a87042696468084856190aa75e7acf37237d8afca2384cd9807c096025a75830663ce93480526e0345af3d17c60c3d07a2e8af0ee63b3355d9c8 SHA512 a1600e9870f17acb28abeb8d571e56c32e2ab23cacc521abccaef64a5e6bb88bdcd1d2b23979381d660cda0784093b47e720f1ad7d671d863abefb87f61ef56b
+DIST thunderbird-78.7.0-kab.xpi 651912 BLAKE2B b3be6bbda49548a8c6f91b12c2372943615a8b4e6b675ea7822ade262f7a5cc0c1168c99a2da827a8fb9d02658f968b67458812080f8993f53d5570a9a097ac8 SHA512 cd31eacc4ba0136b91662c480ddb38320d42b533480f89734d2f008eadb5c3781fa4a7718e0782bb9a6c9b2750554bc24987b6439ea8e38aafe1e1d128bde129
+DIST thunderbird-78.7.0-kk.xpi 720473 BLAKE2B 06a7a6a83746c154842ba9b373c8dc98f6765e08f0a4e7ad323a2bf2ee9519ab12153cd516ce2b68eceb51d444482b6730d73852581f231115d1aaf5149642fc SHA512 daf93514c2b6475eb693188046fa9b8b5a0b739ec2d7fde8a0d943b12d9929d99ae3b181aa9bf267087a9d93ac9ff5a8740ca0e04fc0fa2b427f1c9ca5673fc1
+DIST thunderbird-78.7.0-ko.xpi 688206 BLAKE2B 102bf8854957f926e27a8c9f63884f4e942bdb33a30b61b53259f423f47aeeb6e14a59a2b79e40e8bbeac085f674d20eb156a009d55fe5981610fdff282e2693 SHA512 6dcb96099fd88bf72ea4f464211e89757b5345b1fe234392287bf8ecd0f95a405f27c8642e0031279771c9dfbdc0f6c20535f49063424eb51b7331e765477eed
+DIST thunderbird-78.7.0-lt.xpi 660301 BLAKE2B ce942cac2e7e462e4c96935440d6c6a1a3f63221a7e8fa24858878d105b43b14be4a420b884c0b048de2badf5de2297d290bb50fbd6908d1867d84717378f54b SHA512 8f468ae676edbcf4bc90c4ac8f96fa26f9ac5d3d6d5c6466151b4aa0e148f0017685df7ffbe0fc86e40313c3edd196b48b532d773c160c54fc0cd27221d633f9
+DIST thunderbird-78.7.0-ms.xpi 572173 BLAKE2B 8bc69d0a10ddb8d16c673c131abd73e8db62f09508739980024ed5a8284578a02b9e6b1f5f5fab997f36fee30b907678a3324e03978adcdbc91735a16b7406d0 SHA512 5070b8a336b66b0aa9d31c3473cb92c2ff59d75925d19c31eb84ef3409a160605c9bff0fc741759ce8e7dd51db8f9392f8490f642159abd8cfbaaf8cd00d9a10
+DIST thunderbird-78.7.0-nb-NO.xpi 637241 BLAKE2B b01b24f7c33ba711919ea760b00bc96966b6f62a39f0a5dd6b2dc0402ed39c38c768a9a65dbbcb4691563f7d3ce438d5cd701c537e68ee6561c25a599d559eb0 SHA512 5a5adedd3370287485e38fbef50b2bdd0baecac5f467c540f74337923046b6e46c36090271f9a3c252885e30fc403a88379e3a4a09e526f3a77f1fc53a307290
+DIST thunderbird-78.7.0-nl.xpi 644365 BLAKE2B 953397c1d54cbee99c2766c80c239464634a610536d007c97957721b6a519e1f325ad680d526720d16508ce80315d200701914dbab4261c9084262d2ff6475ef SHA512 3516f7e4d46d7151cd1f0500eedde9c3e131d3defdfd601f34e012f41e713528446f3af7db4dd2a05eacba015325761a242584c2b65de6185a1f50243e98bd8e
+DIST thunderbird-78.7.0-nn-NO.xpi 640691 BLAKE2B 2aae52adb833b52f35c0c6bd74155ebe45ab0cee56bb62fec438b5ab4a0fc87b0d492ef37532cfdca116000933a25a8010102495d462339d36edc5dd6e5d187f SHA512 bcf90707d5f71689335d4dd29330165dc6f1e7f5e74ca83d22d242568b2b30de013e710f64c434aa80321167dc3067fd468e280d8dfaf947598f8d34647536fb
+DIST thunderbird-78.7.0-pa-IN.xpi 633219 BLAKE2B 56e1812b9929b771ec27797c8dc763b810c22a14403b38c86cc935eeb6839de32e8909c0992a717cd528bb7ea7fc2ca3be804d6de3399a29dd221c080a5c2753 SHA512 dff98ba26ed27568a482e62843c1e3b74edc6baba686e8efcb9d90fb37585caf14891fe115ca9767907fbb313bb714b0ece21bed0b49fe19fef7a8210ac6ac6f
+DIST thunderbird-78.7.0-pl.xpi 637115 BLAKE2B 42053fef36adce057ee10420a32d78e55aa0ae66af5b714bcd7d498327602781b5c935a3b01b740cc070bab936429e2230b7f41d3d023659eab2869baf056047 SHA512 f6662a43dbffda267f470d70e8532ec93cfd8741ec4d20f2ea1449e22925e93d6e6ce209e0db0f89733c1eef60538e866ef48c1c5536d3c5763ea71aa8c612f3
+DIST thunderbird-78.7.0-pt-BR.xpi 649418 BLAKE2B 973d9c1e7cab14a2d144ff47c397cb1bd1ef23e3f4b4bfea245e8c0b2ec24cdf3587065004c24e2f68ad0e35e787dfe9da050a025766a88428bc2794846ca213 SHA512 d82c4aa7258633b0eedf1a55f0417e88876cbf3c8ad2f6af5ec2f9880196e9685d37c8945a675c00fdb72f3e7b4a9180bffa15efb48b905d22467a4485b116e3
+DIST thunderbird-78.7.0-pt-PT.xpi 655494 BLAKE2B 388c8acb08b024de1cc9b195a2e9a0e18c2087fa63622c01e9978917070eeb605b77c64a166e1d38d3126c8174aa06b84c8d20947332e5c50af44f966f407008 SHA512 07e63b237ed40a75aad8093eff19d1a52a34b8cb1b92cb4e1c874d754842cc9257e2fc4fd199c9097b830b37c3c8c646fd5c56d8ee7c81153fab8d00460755c4
+DIST thunderbird-78.7.0-rm.xpi 646536 BLAKE2B edf06521fb2d5bfab957d9d3486aa9a1cb4e330e0e7fedffb24cd010bd3986bca58dd594f2f224cd8dda6a665f81e710f1bb49616b05eac62a6606a399cf4eef SHA512 ad198963e587b8228549822e7800320dc8d87f6e753424320cb910160d540ebae3aac7b74d14b76ffc976d46aaed9eabaadd0bd05a469ee5475b7e76c822c167
+DIST thunderbird-78.7.0-ro.xpi 662635 BLAKE2B 260c489575ca1c750e5b61c3344ca4f4de839ed020c00c9a6a10e78818ed9f4cd967c926c3e52c03db7031ad8ff32c8ae8fda6081988362b91bb2c8fe596d003 SHA512 5318ad999dec2e219d08f609aef312f2641fbbdf90c9e3d960b6e8adc59380575b2b3a4ade9f67fe130fddaeb807ac862862d0324f8093a5893a07e087882b2d
+DIST thunderbird-78.7.0-ru.xpi 756190 BLAKE2B c33ae63079a3881710c62fbf60233829010a1a950e1350aeb2937da6b8c1dfb6379278f2a7e9b4c5e34d229f182cae920bec659239a1129d8f4d2a52e0f74011 SHA512 c3b969a1de384b4e35db3bcaca1d9b79e7b6b75c864d44dcb969ac50272364749dccd7adc069138ea46d0a08b41f02832b35b594f169e1da6ced72b5959de95e
+DIST thunderbird-78.7.0-si.xpi 651100 BLAKE2B 9dda1b13e617f65e7e9043adcd636cc488d14cd97b5f6d5987a8af25a5197b38066e1c78875203ceb35ebedcd2a567bd05cf6b0a9f613184113c9a90c73e51a9 SHA512 10284670d5bb2d10661cbabe7b2e05731ca03b19163b6472d4600f979d49b51ffcc6c12a308ec5a9a1f796d7eb9a1fb960d74dcc4d0eb13085c9d81451949b12
+DIST thunderbird-78.7.0-sk.xpi 643221 BLAKE2B f647b6a0bc811c1f35d939aec5af8246853fbe70d83288ee2ea3b97ab64fb5d07125db281b59d989ff9ac3107108900c68eb594f9116b4ce33161155666195f5 SHA512 c63b27b2f67b80fdb6e9b4d928505b1722f26950b5b99bfcd511d6fafae2e6df141d31329b8440193b8d7eb4db182c0c90ab8a2d01dadbbde4194caf4edae71d
+DIST thunderbird-78.7.0-sl.xpi 632385 BLAKE2B 1696a083a5301505b17d927bb394ab7b3681e01ed23248c9ef4bbf85c21319117452bc36359909b2b866b1cc98776dec37ced5b7d39cb17ab81f9c4a30e4b973 SHA512 abb5a67c25146e6b9c65db70dd42eeed909b6008b63fcf02e705beb86d66ba4fc9ee883972cf2aeb6d47526c5e906d2d68be7c868c463dadc0bba84c17e2687b
+DIST thunderbird-78.7.0-sq.xpi 657820 BLAKE2B 55ba61d131faa8369d3cf4be386f3f4fd24e8128967bebbcea44e54350bfd859b7e9572f81fb5835982dbfee6698b3485a827940ee291b739cf194ecbe93b181 SHA512 89709ef8815630f9e397d04640d5a84bf0299786fd5af0103d5a08f6c7f3aecd028255d7ed311bdf4ed81d36ee60731336a20aa6fd4fef6e0b6d16ba3308b216
+DIST thunderbird-78.7.0-sr.xpi 683115 BLAKE2B 89c6fbb349704c38b0b695e7da3a2742e85ac8860157835aebf06b47e3ea1b21c16f864b8af537b8c1d1a1bf1ad62860d8d54a32197743f1c5a3b4226bceb32d SHA512 6d9025096227897d4812e72a13bf6943ecd0f06680d83064726311603cf29c019855a1745aab2ef66f3f335269f0d2a0e9f46d55ea4a4318bdc8a68268356cec
+DIST thunderbird-78.7.0-sv-SE.xpi 648871 BLAKE2B 55a512ae4320290ac02d5997b2ffe070411630a67d514039de44ccef27208e95a88de08d3d79e7dd92d62d5b6b160d788bff1567666edce28e61555f8ee3e01e SHA512 41e8e66c5aa024924fa4639299316947c8b7cf944e8301f26032d5cdcef9d8c0556cd28d6cae75b63647f0643ce8ccd25f13e930f1cf0103732c47691a5a3a54
+DIST thunderbird-78.7.0-th.xpi 712035 BLAKE2B 0d8349133ac3b7054f90d96ade1967fd56a00c65058c0df21b9be6a6c13bf745de9ad3da36789f48a88f0a7a094ded5f4c232aa5c988685451e9fa9dad2abbc5 SHA512 cf8324d242395b24df5b7ff5f51cea46037937b65346910a110b1110d89846cc08c4a0a85bd0a08d06c61e89f45da12fcb61933295414caeeb46346e4c3ad5c9
+DIST thunderbird-78.7.0-tr.xpi 649065 BLAKE2B 90d7cd9aac8b3ee0b6d176ce3c5cc5910cafa8bc6a3b0b8d0474ebaa7a0c36114d44ff916e6372e4f9f2792a1d189da3c8db3cb81f901031be72e6b95e70e287 SHA512 4e35e4c5fa6153a61fba453f956e595a331ba0b0c9afa52f3210bc3c0db404602fc9c89b1ee634b1b2da693ee41156fa9e1e8614c9efa06011d71f1882d77a49
+DIST thunderbird-78.7.0-uz.xpi 586592 BLAKE2B 51d868a58bfd7a94e4d86fa1ef18d5f2b99c67fe7693c37f9367b1771544333be73b2512e97771846c0ddb74306f2f71918728b28d0a9fd618d624964496f1c0 SHA512 a7508277fae2bd6bb2c222e2b0e6528495b7463dad8ead89d61409802f98b3d81dee553dc5a6af5f3a867b219f96e4de8c16dd340e2525b834983dad91dcc045
+DIST thunderbird-78.7.0-vi.xpi 674602 BLAKE2B 82417b1cfa49e7ca162baf70bbea4b768613b6de2641e10183eb5bc23b97a2c007c1fcb9775cf05ef1a33e62d1ee328908a8d55d92cf43949e009012e5d30ba4 SHA512 4e428ff8b0598ed38d7f26e736db67b30b727fa0b6bc9c35de7d323a22b029af8fa8eafd495922e551883bc06794edf554785c8febc6e090cc5168f1937ee3ea
+DIST thunderbird-78.7.0-zh-CN.xpi 687176 BLAKE2B a38b3ac31c79cec6fa93cd72af7f3e6f20666bf157defc8063beb09313cbb62720e24724337342baf9d5b2ef3330a09e7666802d23824d14b1e68714ab9ff816 SHA512 eecf33fb400128a5f949a4a62043ce45f352ace129b2e6cda5361563ab852a986e84335b2ffcd566ed0f1913519e3ed61f0b7c32d481695c83fa32af003d20ad
+DIST thunderbird-78.7.0-zh-TW.xpi 687616 BLAKE2B 025519461319a34c7d81e0c8b7bdc94ab85a7e2fc5fb5851457f09efaa85cfa755a6629d6a14c16cd8949607cb79e8f8ffed9798c3445eda2141d61ed3241c39 SHA512 67a0f5f0f57cc7a87764289332090f7ed6b42ba834175cce5402e40f1d963c2166e8fa76ad34dbc943cc450e558d205ca245e12b1fa0b3dc5162d384bb60cef1
+DIST thunderbird-78.7.0.source.tar.xz 353095828 BLAKE2B 2406a8fdc9f3718f47f35b426a0476d20861ff02fc57841f4cb469b1517ba4b35409c8ce624321b25fc5032cb9b08d51548bee880a82392eb0bd4a40a79125de SHA512 feee821eaf1f18e48f9b6f88dfa0ccf1fdb9b7087d5a0a1a284e4c8b931fdf765f9b34d80fa26fdc0f4f3b8a8d7ff0eb66ff093defa18999ff8b7082bba5c85d
 EBUILD thunderbird-78.6.1.ebuild 29421 BLAKE2B c52ed7d3d8f8ed1233556749f2219f5e687df42960af5bd542cbb1cb5358d55830506d10e195083cd8857a12c0c4069f2fa3e2f0bd697c26bf1465b87fff4dce SHA512 e3e888edb35d8ec2fe708f81089872c2dbb9a7ab6c33ab1d333230e1034b8ac5d05cf9a1fc3a70350289bbc2ab8b6c5e399a140ce653e4ab2eaa74a590ebb8f2
+EBUILD thunderbird-78.7.0.ebuild 29422 BLAKE2B 3c5f89ed0bcdeedee3caf84e36977d0f5bc5f0fc020cad009efc7bf5961ac4b7489290ca347bd92ab39b5cfb42a9aed7b7571e2c7c9fa901e77333076db3aaec SHA512 dfef4e313cd863cf0f9d215e760b2daffaf127d9e1d714e5c87f849eecbd16bf593c9ddab5b4447d99233cd91ddf603c31a313c74974ad0f3e2fa46fba57491f
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.7.0.ebuild b/mail-client/thunderbird/thunderbird-78.7.0.ebuild
new file mode 100644
index 000000000000..a2a84129fc2a
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-78.7.0.ebuild
@@ -0,0 +1,1056 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-78esr-patches-07.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="x86? ( lto? ( clang ) )
+	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!"
+
+			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!"
+
+			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
+
+		# 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
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	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
+
+	# 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-location-service-api-keyfile="${S}/api-google.key" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google 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 CFLAGS:    ${CFLAGS}"
+	einfo "Build CXXFLAGS:  ${CXXFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# 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
+}