gentoo resync : 11.05.2021

8 files changed, 12 insertions, 1700 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index b074c5e33c04..e97e293f939e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 2e35213ecd3c..e6c052bf580c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,6 @@
 AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
-DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
-DIST mutt-2.0.6.tar.gz 5294825 BLAKE2B 28891cc13b7e356308f43d3198d1c9ef64b262f3653db4cad4b8d319a02d9aba73654f0992a82f2566dd2c46e0b923b37acff4fadbf47d78112e9860b0d3d460 SHA512 dd1273cf35853b844a41db4e1405fcffdc566727e9a42eed1fc04f0640106d482ef6b213a348ce18f1fda67775265d62de0442247d88e2b1f9ce90e9c4e6e1b6
 DIST mutt-2.0.7.tar.gz 5299366 BLAKE2B 587679d3580a55084312b4bd26083c85fb1b3d07b4a08ea5e2081f475d37a0e283ecfd647555519fc6deccb4bdfdd46234ede4669a9abc6fc2cde778f76bf656 SHA512 1eb689fb9e6aa3cf0bcd0b696c25477cd04b74d8ec93404df071de6dc051e46bbad88131cdf610eb01df4789984707f3791366ae2fda28de2d2739aeb9d34e30
-DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
-DIST mutt-gentoo-2.0.6-patches-r0.tar.xz 26460 BLAKE2B 5c5f0ce53a2be28a0cc79415c07dcaf65b4e0c815c257f33604718f2402f401f5e51345bb92893d9be1eb85cf371aff90f96b72a48e05140fdee4fd384e14778 SHA512 b06b55a236347a79503ac028df9b3ccfd424ea9f4fc6c5dc2e829650f48f70f0e82cb5a992948a4d5b5df2a9f899c3af3ad65139fc68a7858fc50cc68f001732
 DIST mutt-gentoo-2.0.7-patches-r0.tar.xz 26416 BLAKE2B dd03fd2a29f4c2e8681c4413ca430b65beb2036b73fa95430f5f06e7c2948fb4e3256be89d922646731245672cb2900d6b7ce6bda16cb9306d5531064cfaf8a1 SHA512 cb72df8f6fa3436f134f66772f82ba95ebc92462cf145d21e01ad5b277f13294948c1d03c9c6671e58c655776a6112f2af065df79a56a135ab70c28b37e43334
-EBUILD mutt-2.0.4-r1.ebuild 7940 BLAKE2B 839c381dba3e86ffdc8b4e4350861751adf88b2237535da1cb238c911223ea7f79280825a9453bd8769ce3fed7157ae5f0c77bcd6f17942a257a4c75a68d52a1 SHA512 36c6648ed52d69bba1bd597b0c65fbcd3174d97618649e70900b5eb370eb46a1193ba0b412e09ea78835064ae1bbda31be05f393215a8cfb62a6d076fce3de17
-EBUILD mutt-2.0.6.ebuild 7946 BLAKE2B 4874afe58992b64f7beab5852f37026bdd24030f1a78fc46956762cb31df6d4907694ba28a0a5acd5f516ef8a3c885c5848181bb52c3e124e3442ca4f00b4168 SHA512 223aa026390335ae61815c8a787035ca3f3f373977046caeeb03578eff719db550d7c14eadc8f968337c524a72fdcac0eedccee42818dd211b5e07593fda9a37
-EBUILD mutt-2.0.7.ebuild 7868 BLAKE2B 3c7e86b542d5d28c90e227b84d11cbdd11535e4e898dd952d51ea02a1563adc82c9480472431c977263bde4956b81ac21db9e8c239ca5971b746681a5b84ffd4 SHA512 3882754c9b15eb71cc2b684d5ff94e82dee65b2a88ad75babe34ba92bf16809c7aad9a0eaa60e821686e6affbb0e1777e8c3975dd34252ce2ff4c89983eac17b
+EBUILD mutt-2.0.7.ebuild 7867 BLAKE2B 90a99efa6b98975bfb2b82407f51ba8187a780e780139f580d90ba8294e4defafaadb7c0b326eef89b9b3ce7e26c8c738a5b90dbcf2ac5a8b3736c8f938342c7 SHA512 48c0ed350e53959f5137ce975535bdf131801578b2c269253b470affce3f6adf2ebce823f708d05ae969055532ce06402d6f55fc2ca2e5cc8069fb5df3d100ee
 MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.4-r1.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
deleted file mode 100644
index 75406cb03c5b..000000000000
--- a/mail-client/mutt/mutt-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit epatch flag-o-matic autotools
-
-PATCHREV="r1"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos +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? ( >=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/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.6.ebuild b/mail-client/mutt/mutt-2.0.6.ebuild
deleted file mode 100644
index a3813e615518..000000000000
--- a/mail-client/mutt/mutt-2.0.6.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit epatch 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 +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? ( >=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/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.7.ebuild b/mail-client/mutt/mutt-2.0.7.ebuild
index 546199182017..0c29057fb2b1 100644
--- a/mail-client/mutt/mutt-2.0.7.ebuild
+++ b/mail-client/mutt/mutt-2.0.7.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/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 45ed3e1d32dc..50b234e687de 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,71 +7,6 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-12.tar.xz 67840 BLAKE2B d85abdbb54a252852badac50866cf5b5009c050ec4aa80ae2454eef2719e80f3442f5a74ec58d3c36531539042830427cd85507b708c1d5b36ea44dd0cef60b7 SHA512 4445c0880fc234c3838394483ce986e4e222260a99427069ba9c55b56fcd49a485ec916ee6aa2629f922390e92bfcd78028e30cc2e62fad9bc080ae45b26ba2e
-DIST thunderbird-78.10.0-af.xpi 548355 BLAKE2B 49e5bacdaffb4e1d2c4141061f9f0e095b37c34a4ea33173bb82fb88a8d1fb5ace0d13d56ed267472910abd56e5149f8498dce09c01f2a15ae8eee6920d63023 SHA512 e5e6f8a90e6f1f12dc7d56e868a6cb44e95ebba472c2a31ccfe0c2030d0dde31fdc0a01cacc5fde69030445818c7acde2cf116fe413374bc8ee542b7ba682cf6
-DIST thunderbird-78.10.0-ar.xpi 648616 BLAKE2B be0bf69acebd95157b025057f8a0003094cd005d59e9e0b4366200dbd0ea492ea4b36f43110b21f0f53db29c543e29ede8206668a430a7f408ab81645ebf76e9 SHA512 c51e1e9d344336f221a132ec23550b76379fd96135555058d0c19c88d7ecb4b401cb54a795aa2a8b612d326b2d286139bdeaeb237f6726da0f87b6d6b7115ffc
-DIST thunderbird-78.10.0-ast.xpi 561264 BLAKE2B 37e65c964d91ba4c8c27fab202c1b5dc7698ea1794e2a1e6ece9b02e3ccc982e2a90e476319c1c8d2f3935135fd66324af27529edab45c35457bf36ec0f10492 SHA512 259d83f86a32b2eb2aa026da28e158ca56ae02c29aaaf907e6fb144a4927ac67ecaf194d428d05c89a9cc471c7d7e45fd261448ff17f5420986622666dc16d36
-DIST thunderbird-78.10.0-be.xpi 666668 BLAKE2B f7c1ca9fe79f034321048e816fe253199b02e29833f6535f75bf6c86cdeae18ecba8d5309fe5cf4a0f8b856143919a40f69c38fb8706078b4b0e574ac94af453 SHA512 d36d133063e1b3e9c8e2d6fea125301f07d4c1c43d05c655f8f1826ba189909f73c7eead1cb381bf17a408c4edb353846db3d77e6543318d0b8475acf07250da
-DIST thunderbird-78.10.0-bg.xpi 672417 BLAKE2B 5ed4b177271da077342011058c206b3d5a2a0291e72ac6a465433b5c011a22a176a467c575ae6877a36cc8aeab0a48e2271e7d4bd6038e4e59c3544f85d90ee2 SHA512 2899af9cee4360b9084496ed099115680fb4a23353ad00ad5f3cf54fb1bbfd9facccf63d7f35ee61f7c8614526cabd549effabc77212c5efb6f1621a78d64466
-DIST thunderbird-78.10.0-br.xpi 604528 BLAKE2B d4d105906b369c75cf6d68a28f3ac95f276d55d395ddd17467208e6bb4f340015d31e12cf714eec107794c43a8884bd4bdd95b101f6492610101cfcfdf3521c3 SHA512 bf0d5ed14b6b7f3f36c668919af0932fd4d526682a7c0874badea67a0720b64da2ed81965834510e0bc27c4d6e25913aa357733b6bae6798a38e7d6ed69025fd
-DIST thunderbird-78.10.0-ca.xpi 620451 BLAKE2B 4c249496380312dc7cb6f443193c8866c92f07f0e8e3b2cf3d15c591c0d369cc569bacc9340a60b30ab7c41342053764ae09ad77e29e582a9d1dc23a322a05e0 SHA512 2571253fb57d552e2269b14878d72968328e92822d35bdca434463faa27ff4dff635a232e981a2d00f1a1647b584dd660ed030fe5aff168aecf3ef34cad574e1
-DIST thunderbird-78.10.0-cak.xpi 635642 BLAKE2B 0ece33784c48b41ff30728782998a1e2fb30289943583ea0abeb94fc8e112891c19c3c694f4a98d6e4051c88714b27040e4616837ae5f328fd475b68c0f17f46 SHA512 aa288b9c2c98a12437fc9b95663ed406f4f489dc4470e60f8fd6fd167be93a635c75bf095bf476d46bc74803e6f63dcd8e1b8cda819baa1b506e27b3b831f553
-DIST thunderbird-78.10.0-cs.xpi 635350 BLAKE2B 38d3534d607dde4aaa7273e0ec76337ce9371fc3c96c36433b8db30b4288a832f69b72d0769bf289ba2dc50f08468e7a43c97c169c758ba1e48c752e4904838b SHA512 fd9479b513ada61820aa0f9ca321ff04ffe5cf309c7068cd8efd143215f90234137aaf0f7a4eb01898c579feae757994c4c340da0a41eb938d95c07632782804
-DIST thunderbird-78.10.0-cy.xpi 646245 BLAKE2B 359893128631cf8706b222d309cc96c84a875513232300bf271b3906bebee97fd6708b78e044921a21eb2213070e50f13cb24ccec35db710573d087f0e96aab8 SHA512 631c9c2fdf7fa8710418c8c1bb872a89fb973cea5a939380fac64b4668e2bee2b84d5aaab97bbf37aed5b5da045d666dbc2a11826791fbccea94a20e80e52fc0
-DIST thunderbird-78.10.0-da.xpi 620994 BLAKE2B 5924cbe29e90a804d8e81fb64938d3de4158224520f8dff205883c47a77b744f70112714310dd45fcf756bc9180d51300248f2c422da08e64225a11520f6c280 SHA512 708204df6ceab6f52dfd047056d76b4181088bf43636fcb7834a90bb5410b00ed9a3949d8691e15b733fc8724d6d62419986f72a813ddd8bce0e188abba59169
-DIST thunderbird-78.10.0-de.xpi 665197 BLAKE2B 605e31e1b2ea8378cb2989cbd1854892a7b363a760a871d7b2db69245ea406bef4a71d309797ed4676f9bbbc8213dc3a8baa003e9858f6dcc57a5ec4fff2c5b5 SHA512 250448121f80c6719a1449e00c4e91a7754767853502f11f0aa38ae3014ab90aa6e0d2fb4d4150e29da5a0ca5488e1a7992f83f6820dde18cffc3936d9c2464e
-DIST thunderbird-78.10.0-dsb.xpi 666774 BLAKE2B a5ee761b6ce33fbe58a426a5be0161dff6da80581e93e6759ff273fbf4778e2c53680a63df3fe31e20c5847f85148ba5979e7fe26f57b78d6aa563d221634ae0 SHA512 85c795b898b4a89e516b9a0055b6edf2802be090be9df5cd0899121cf561acdcbe7af11f2769c2e99eb1149cff02e517edc3b157a8f356fb66bb36221ac6db1e
-DIST thunderbird-78.10.0-el.xpi 774452 BLAKE2B ca4270c9d847e2c7397c2c490ee508f16c449e53099df5bf336f477130e438bc96f9a21c15d478472536f23add9ae4a2cd15142b588b4e2c4619ed1399b35651 SHA512 578c9b5c92f392b5349d0114872f33a63f25ddc24e08a1ebdbe0fe384a4d08af6836c5b4566f7d803e1367ed112fc4c6f0d086096f4f331acf673d0860990ef6
-DIST thunderbird-78.10.0-en-CA.xpi 611775 BLAKE2B a3671be630bb88726ff3177fa928c9729208b17419eb66819c55ed8a2a7f0ba2d0c04607991d38955a81b0ea77dcb0d9469e03191476222a3c4504fc400f06fa SHA512 cbeeeb6fc0ffee8f6abd819989029387affb22b6d3506ff1ce97f4b4b7228876fbc21f1ae83a59e79b5fb7ec9bdeaab541924b5bdb35402c9c2de1b7bb4416ce
-DIST thunderbird-78.10.0-en-GB.xpi 611190 BLAKE2B 2db932b5264a228c3201a05b47ebbc6d61006d15e15d72f114d4a255860b9d26bb11e7fba23c660c82821f474f3237785102a9b908ca254526ce0f1cd41be30a SHA512 fc55f90eb4ed1b347dee710b23189714d1333cff57b41770f9b35d485813b7e10d0110085d407f16611c2428225bbe927a3fc865fecb69a15ca65e208fdc1c70
-DIST thunderbird-78.10.0-es-AR.xpi 657789 BLAKE2B 559c27fee94a724d5033233dfabe09f7093836405a70072ebe5b01d460a409b7f0a0fc9ca0c563705ebe6c5d422d5f7d61150fadc7423d8aa5437f03ae1610cb SHA512 8621c5f47271158fc80944cc0162f1103f0d4ddc9cfc222f4bd6f00b85126677dd7f10c45630ada994932b326f734ab3822d204b43e59e4ec5c3f4f178adbf14
-DIST thunderbird-78.10.0-es-ES.xpi 569802 BLAKE2B 42094bd9364dc36895536abc6412bca7d191d472e3068632760b9ae83c2cb81ea15023e6a72b257520f5644f63540142984a56e9f158b281cb7dd1d553944afd SHA512 5d790a9a6171b47fb9a103451e66e7a64fa3b7bdaafcfc9289eea81724fe00f48576476b21ec9f0e77bd4077d868a5e865e69320fac609d91f78904607738630
-DIST thunderbird-78.10.0-et.xpi 597734 BLAKE2B 80e1095d758347076857b7dfffc35c2a28802aa7f64962d4b7d15a4142048c2a1f32840667c32d2f3592cc47598d979878760744d3522a64780f4ae62470c73e SHA512 155c7166ac22a1a278f35dba8cd63feb57fb5361df8950d1df6f208eb0bf50215ccde5141308e4989412836733e5c37db224a30e01b2f9d2fab52d286b35b268
-DIST thunderbird-78.10.0-eu.xpi 632968 BLAKE2B 9b191d56c110a63d81cd86569f6523521ce00c0869d1528ef51db24bb1cd4165881ae876dd684e24bd0a6e51f68c4a7df3508d33d917348e572496c443108636 SHA512 0455c75a62a08fda3face543f1291844af61e931912c74235f5b14109fae30ff7d67aa6e7d36087304ad0c4f27a9d741c32a94ffcd54a89a28a365896316a218
-DIST thunderbird-78.10.0-fa.xpi 639751 BLAKE2B 2c40090e975f096e890217376775b02be8dc4a84d3cb8a1651444ad39fc3d85fd7995d64540ab609f7dd4c4681424c3bd5db7b6700f54a5837715612b3521c41 SHA512 cdfef4c144138f2b01b2bcd9b2cfa1ff7b60cabd904c5858777bb40047db9e81dddec06a8a8fa6823de72b914fe275144a40fe419b2ab28c4639682bafb05cec
-DIST thunderbird-78.10.0-fi.xpi 642445 BLAKE2B 55d42ea558d0115379df256e0185950cbc8e800691261a4a0d2434f201268c07c10d0b310960abc421609f2aef0e39981a79b4f6830875ed81b9eb3064eef926 SHA512 8c1d047be3876f58f877b4da7fc4a0309019b7d1cdc591e2207c08a811569da5928c1b9ad365971b16c51e44e46acb82357f9a5a4e5e14e6dd31c01a37ace1e9
-DIST thunderbird-78.10.0-fr.xpi 669495 BLAKE2B 2e0bce335524619f0460be5264a60600578bc6906f41395a4391df7e1c81e3ce4c873ccd4b4fff9cf29a56126149fc1f1dfcb4a93c533ccdc70bd3e361589fe4 SHA512 6b7b7c184a0def75e4c1f81f1fe6c7ef0637facbdb2f68c5541b4d3b95b548fe4d613cf7e804df268cdc68a9443304ac19fc26867dc59ac9bffdae6f81786dfa
-DIST thunderbird-78.10.0-fy-NL.xpi 653074 BLAKE2B 2dde3aed88c13209248637de4a9a6acb78d6f709b0a98676fe3adf1c38ae5f74b532971bc58059ed94c0658e16f4a345bafb65c1742f2404312274e39bcf94af SHA512 f02d9d28185683bf3d1e27f952f661d19b9b65de932d1e77e9cf50203964f859e4de650027d170912d730203dfdbd9658ecd0060a8b776c9bf2feea412f652d5
-DIST thunderbird-78.10.0-ga-IE.xpi 600705 BLAKE2B 3649fadf80acb54cc2f73518c14805dd1c46445698b0c3792f2721f1a8c22755332c5dfa7f74045016b181f2ae213531de9fe0fed6903dc2d8f9a9e9c90acb0e SHA512 13fa52ff3a3a619ae5e1e44581b25c291610b74196c3e580fb154ad21a5778611d5a78dcda78e04f0de834d4edcdd964b5ef49182723e32a8706ec01ecb62acd
-DIST thunderbird-78.10.0-gd.xpi 609376 BLAKE2B 38f940000acc16f2e7de4c1a314ebe12366c7540d4efb6b3c982b30ee37575180577bed759ff0bef1cbb9e66b6546deaea51af7c672d1aac4deadd7873b6b9a5 SHA512 fc830e3eb327cabec0ea4ed71bc51db465f073f2c7d7832f3c1176c066b37f6d1ab82fd1a342bc2d884b774c5896812e25e0184951ed3bbf68880136aeee969e
-DIST thunderbird-78.10.0-gl.xpi 615727 BLAKE2B b25534ae4c9997deb7950e04f90e9ced3a9a49c1d53a430a1237e2caa17b0cccc1e5d9b1956654f977ef482a3ccd96b8e23938933897e94a9dd60e0f2b7d73f6 SHA512 b0303def5df18fe698f89b9a1e94c9e6e4265ac957cbcb8bc6ebadfcedd6a871a6516d7095d8b1ddf4e0f1f0b1cd672407a7e6a45aa13a4fce5f99030c1e21bb
-DIST thunderbird-78.10.0-he.xpi 640500 BLAKE2B ef0a9d20ba6636642eaa4fb6b09c2433191f0594694a79404071e849dc918ad5c4d25dfbda70926c0627222b5bf6af573bfc091156ef2c5ac5c20917556f01af SHA512 4718d0e322d3eacb9871c8a5e12bd8a0dfd3183895b205fdf0bde9a4203baa59d1b0715a48b5441966a400df2c7e5020403d4c65d925df403c01689a32d14262
-DIST thunderbird-78.10.0-hr.xpi 629036 BLAKE2B 8e870ece7ee27cad2d35367718b1bf84fad9a6b8bb4c53f4c35fcb98cf5f63042953271e718c9e0887fff100a849dc1523e3610992f9a51ab63503b8501efb08 SHA512 28eb102f038d0a4ffe52c9d658282156f9b0bca185cff5d5ac43224f739e4e898f22e2d5ad5ed3288eb6534e0834bc71b03f4a23a30aa21d33599a66f75855c7
-DIST thunderbird-78.10.0-hsb.xpi 668607 BLAKE2B 957d37421c7ac264f6eece936adb0252a9108678212182cda54748cc6fc5d570cff9d419d170a78f7bdd82098cf7eae0845580db78f1b44b60697d8316f7dd72 SHA512 6a31824bad43c17c2f8b543f59bc095475c8ab8d3999d2324fbb74a4b1300530d79968827cd2a5733fc8f085f9b4cf2d8a3ff6a16ecbaca7c2b654b9aa7940c3
-DIST thunderbird-78.10.0-hu.xpi 679834 BLAKE2B 5350e84d919d10cec08d349cd1f964cc4419e7ff0125325a86cbf2838cb60c6c86a0845b572559a7b8c36cab823aafaa56036542314be4b3491bac4bcd341756 SHA512 5c8b553c4b10f0626e5e7f6be2aa2ed0baf32f1d1f607c5f97db6f86c539786d1b9d9fab7d7d821092f86b1460cea598f4f234a98e0324c56c02311d252f46b2
-DIST thunderbird-78.10.0-hy-AM.xpi 713325 BLAKE2B e37f16a953fc80e6035861d5f8f25b097c7bdecb3341124f47a84995c57591f8cf131e8d878e49d8690bf116ab96d8a29d4b0fe30ab136f7847ee16cc9ca0095 SHA512 365ce4fb3ca26fc27303a9210da3a5fefa334282b12400d5752ac026c4104c33c39c95edb7c0ffa77c230c625edc183313f9bc8e24b2868c47b66eab97391265
-DIST thunderbird-78.10.0-id.xpi 620671 BLAKE2B 48aaf300f4fbf08d95fd06194b4b032cf6ef39f71d31e77b2954c6e00689851f295db60195905f01a9c6a9bdfcab4cc79c7b889f4b23ae081846fcc12f7e4a1c SHA512 3b267a8eb4d651f0f1f04aa79504116fabdeee1be79394830b8f209c88f1e6bb74038b0c91002f616cfea8dae8d5a6ab5390033c50826f81e608e5946d46ff7c
-DIST thunderbird-78.10.0-is.xpi 581647 BLAKE2B 864ac0eeba224c77c8984bb95b0ca9b231d9e1447c8d19b6ee672d45804c1d1f7d52c6e89283bf9fc86136bd23584f4764998145b9192bd546ff207f4178087f SHA512 4d3485d91cd713f6424149029075168d31fa2f47fe008734a61337e998d2aa956bcf2c459a378a21fee2aede3845de78302c1b47696cdfebc7ab2910e9f28c31
-DIST thunderbird-78.10.0-it.xpi 572957 BLAKE2B 3052e9f0736e921b93897e140c86713a5c276dfe439f561516ba77ad02c937d2f2303cda931e9609faa89410c2d7d121e7f995b5d2c3ce2785923333aee79280 SHA512 1d7f8fcdd45407ab4a577a2bb75c857bc4fcca1d2a58db527f6ab224fcecac9c771100a5c6e9dfb6787bcddca37b8eb56fe4918c0e80eac05cb776a4b0d62447
-DIST thunderbird-78.10.0-ja.xpi 722450 BLAKE2B 49a7af6210aac40419beca691b7da2560ef6df705cc32ef18ca223671824478cf4a6dc447344b07d97e82e29116fd966a1d5f62641f95f04d1cf5c2e21608851 SHA512 e5b3e88d5d5ef590ddcde3d21fa54ff6c865c4ff9451246552693c8a37f1af94bd6a52a8db218556d9cf41722aa76abe8cb888814aa547c2957ac6d9a35b5cbf
-DIST thunderbird-78.10.0-ka.xpi 717013 BLAKE2B ed1163207034e5112de50b7cb627987bcf846a227612842780be07bb2af23391cb05174811dcea818036e186a2217621bfcb7b6dce9dda916138a3ca3663700a SHA512 f6af6ee31c66bbe07384cd7886455d35549e71d4777e108e3658fa043b87090ef7d92abdd80f31dd6a62b1da7b8d67fb3dedafb11d4e14147c397eb46f883f72
-DIST thunderbird-78.10.0-kab.xpi 651911 BLAKE2B b29312d3f43923197cf32f5ae6244d9c2b55691435123210910e26697001ceb5b9e0ab94288c000f7f871df3458890de88a0263e568d32bc9785fa8ed21ef0f5 SHA512 35bfadbb172402b7915388b38034a3e4a42272298b55c0f46bf8e801392579ca204618786f2f3eb962cf1574d16b4e47619a545ffa9d0c5e210be3a147b164e2
-DIST thunderbird-78.10.0-kk.xpi 720472 BLAKE2B dbebe14d2a95382937b5969b0eae0a1ec071ab3001e948a1aea01eaa9349a91bca12253c2402a44ab4842e80891f3329456d9bff7d890cf07e5af24c0bda6f58 SHA512 aa1d797daf4a13e913da2ac9af6ec077dbd84cda015172e4e334fc876772df6d6c26c0a095602d478b48385659496206fbcc34972b25b8b1ea86cc30dda3da8c
-DIST thunderbird-78.10.0-ko.xpi 688210 BLAKE2B 89864568aa9dcc3ca10145892f10ba170f9a90ac0afa4990ed849213c26b4c227ec46f60d64d836eaa3e7d70f925d8eabe280f4ddfe1457377aa997e4c9580a3 SHA512 263e23d0b98fae98439e73720a21980e4b6c37b3b5819ff8db19a2a601f3ebebd5cdc8633b73a7b1f1599910985f25bf790c1ab4b24122f34fd1b557c9d6dc88
-DIST thunderbird-78.10.0-lt.xpi 660302 BLAKE2B 8f7f6495156d20f2d6173cf5e735fce55affd9944a6aeedc79cb4614d2b28443431c86c1a5952ee180dffe125b4f6d906b81858621131fd6d29c68a02a9a228e SHA512 6bf626f584ab755a31ed9cb35fb3e57181b0f0c3f2fae710e611dd9444354622e95a10c408331dada36ffa5373b85d6c131fb955332cb2522fc50c514cbd15db
-DIST thunderbird-78.10.0-ms.xpi 572172 BLAKE2B 044b5edc135dc9a93fd1e62b5eeeb82ecc0a7b3d7e5944755f5a9daf0f2e73cfa3f5581d1ad5082686fabd3474b3608f13b6bc82a4a6e0ea1dece8040d130485 SHA512 772c6db0d4adfe614a6eac255a757f430c1b480b88629337bb092dbb6b78cb326ecc354ec50290c84ff1138a515fa8fbb801fb77dbd200b4bc218523b021205c
-DIST thunderbird-78.10.0-nb-NO.xpi 637236 BLAKE2B ae8d2d9096455f66aba852295d28b92ad231d7e5440b2fd336721612705c930a823a9823c0b3c3d5aca927e394de73076d7b4ac5b5a2d12ab18e30ba22e9e030 SHA512 53ae14cb551c4d6d238f0a38d3cd6dee8505ec57ea0b3ec847495c69c76052788042ab28c34a2bea9c293df1972277ffb625f4860ada695f381de213dd96405c
-DIST thunderbird-78.10.0-nl.xpi 644354 BLAKE2B f4b3b4d8d7ae2a49cca4a7bee26c37e6c7309aa07ae4127b1848e840958ba0548b45ae937fe3a437893b19bf0ff9d77b7b9391369e6d96c25310ed7aacb5a0d9 SHA512 b1f39bb5c83eb2fc53aea164277cccee19c1077bda40b02a8cd9e9fd57e03e42f0bb534cc386b36101e868b9f55fee50bc900e82db2aecde6436fa5e6b209194
-DIST thunderbird-78.10.0-nn-NO.xpi 640683 BLAKE2B 3b72a3c9b8a24599b34776532fb0f91c656ac8751f2737e47e004244da3dbbf6cb0b737d446e51d70e02ccee3d9b4e460ac0298c7d078142f48f6e8c95fceeda SHA512 967ae35146e6e91c159f902e24d769fa30cc9a8067550e21e263b67f0b041c41683bc45204a92cbb9b32ccd947ab0b42f969354b51e34c4995f819f797faa669
-DIST thunderbird-78.10.0-pa-IN.xpi 633215 BLAKE2B c057000c2fdd05f433b1d18d793ebd34e014051b674329a1ad3f31e0beb8a118b6d70a4cea0573423a436e48536a87e14ce5ae481544ffc94b4c6c2ca08db1d1 SHA512 fec657e8ee870fb1a279fe9e732c70456724e46bcf7fcab5b6f9dbc5cdc0d54e1067a240e8d9f9d7346280f04d36fc16c18b33ae798f7a461e3055f4f94cfeb7
-DIST thunderbird-78.10.0-pl.xpi 637120 BLAKE2B 036f60e4fdf7b1b30b7a2ee50ea4886e875c7e7cbe49adea21fd539c488bc5553cb0c9bf10eca0f8e64137352757a4c1f6f9ceda26183a37ddf681d769d72398 SHA512 41c74a9c6bbb1000f1328292a9fe74c17c07a407fbd2d5a74e4ce5f3213700a7ecc41e64cc0e809e799fd6aa2a169479c06f135415fa3824029787f2e3597f8b
-DIST thunderbird-78.10.0-pt-BR.xpi 649417 BLAKE2B d9af18cf999e4c8a3d469b74e29973e1e21ea0f909754d8c36fcb3a1945a777b9158b2212d866e2410a6287d5571edef71b938917085f4eff9024541e2c9d3db SHA512 275ac5185fced3828d31c8f178bc73ce5c406baff2af5b79b376af30403a33543bc2aa1f741f9fe25a0a6b3f8eaf816b931e544130c0d5a172eae486cbbd9287
-DIST thunderbird-78.10.0-pt-PT.xpi 655499 BLAKE2B cc8d84b30d483842beff63d344c613c1f3a716f99ce8b2243e333871890434d8c033bb504d39aee00981f09e30dd1b9e1facdf4b737e1450307aeafffcc03d04 SHA512 45bc9d57694ae500474b02853a272a5a880fb831c0f26537698383370eb942be7a9062eea08e832bb5dd54b0dec20461f99c76a6249fb2fbde9c0af1a7b7170b
-DIST thunderbird-78.10.0-rm.xpi 646527 BLAKE2B 01f70b4b3570f24e32707ccbf2ac23ee6dfad2818931177177fe9529404f8ec997e15cb006d9fef28043b521bb2a89b97a3adf9f78297d0f37863ce95f85e106 SHA512 17ddf55f2a1eee7d8ad4e6d755db1922e35250bf0b3b7a2ac6d0f5275ba5b1ca7c65f29a01e5c7360516df40eee1a4ffd58bc312e7d7e59ae98fe1b236f17590
-DIST thunderbird-78.10.0-ro.xpi 662633 BLAKE2B ce3fe3349f4b34195d3e46cf9352b54d9656245e7196e74a6bd5bcf5f78f79840b3df418fe17a1faf63c5077e8b7d36bfd9ae6366636e6219c77f51f00cdd701 SHA512 ac12e7581ca8819b4638d02993b46a4091e3bad265d7a43f714939546ba1bf1c825fdf2ec792aceb779cd919a850ffb3859b3141ced7610515006b2735dfeb30
-DIST thunderbird-78.10.0-ru.xpi 756193 BLAKE2B 7e6f71c726dcee661926f9bf41edad7914f439318b3323e68ff0db9c941f46f9e433ca3124f6837904ceecb0933d75c6157b876f00e6457f080e85ea0107344f SHA512 187f52982c7047e85988f877325b52533cb905d75e5f050e8db4f0bae3532dec032e3b7ac520679ae893b57a83dc56ea557beade2a22ebe6dcacd48d1b217721
-DIST thunderbird-78.10.0-si.xpi 651103 BLAKE2B 08968d40d9682451925601b5554d885732dabd5995d28453d0e5e1257605a59eeccb2ae4d2d9e4da98375619fe5e4076146f3eb854f8928b9edb39a576ade232 SHA512 ace32746050a4f7b1e55cc6c858ec090deedbbd4dfdf8dfa949517057fd88d5eeb3f8498754d7875395006b605adcc4d612d291357caa647ad00f3e4b3052117
-DIST thunderbird-78.10.0-sk.xpi 643226 BLAKE2B 848e2ba712c1e5326f57a9b9757158c91fde825fd8fa139b74cc234a402f8611435cd99026753279a5fbe58fd532b975571d60d9330917e064b7cd26ae13caca SHA512 a3ac82eca9b7586f8940b313712482404e0a9d502a85f124cb46b7c32e86362e6ec2236de857d62da5fc88a9f092311237398e039980665f62966dbd5b87f107
-DIST thunderbird-78.10.0-sl.xpi 632383 BLAKE2B ed131dce27a221a1cf9dcec8e31281b11a9084fde4cc9451ff7688c2a85d03bc8a0a3538a8442078b3b7b50bc9b50f90b1ca572d8b1a0bd16d14b987b4fbcc10 SHA512 d783f5bfe68a3c4ce6471c57b34b3a4fd6bc20f41951195cd07df46f2e1a93b62bdc9faec338e972eadd453409b4d6aecd049f322d18f850e5d4f44576d3b78c
-DIST thunderbird-78.10.0-sq.xpi 657807 BLAKE2B 0f76fcdf748f0a83f077737f1121cde47c548412dddccdcfc1120e79645a21ae71eb497175cf75d1e8b1bc29bcd5af61fbd84a61f4cc2781469f016a208a06ce SHA512 ec11ccb87a4f2c2c6fac7352f10a1d1165c0c6128b218c86f78f9f5d2c3bff7493dd7bd4edd372118e062d18e10843922918297879c61d2a3fb4a262c4c5d239
-DIST thunderbird-78.10.0-sr.xpi 683099 BLAKE2B 9e04d2ca8045705bf3b7161fa127d87842ce7169af1959ea0f2c5958772aaeb554d5da032a6bba7a0598b98a095148354e197c29f13f575439af58220bebf31d SHA512 c1d4304d85af76618dcc894c3ddd6c0811f22117c6057a84dfa4d5882a2dcd356748bc55e4bd0005ab76fff3e75da328d8f74713d75ee272ed8682722b84f852
-DIST thunderbird-78.10.0-sv-SE.xpi 648861 BLAKE2B 40803b0e80e97634996f36896c3120bc875e0cc8ef0f68cd965c61a309aa289606ec57203dd0cc76538e033515df2747f50414f064036a9a898b1c511d5f08e4 SHA512 8e248a0e92d6e274a5535c5f0a10ebb5de2251c95f6de7a6acffb0aa78fcd7f29ecd62db083380dc51057a20de4abc1e41f74867413e32a63f9cfe6b29aee409
-DIST thunderbird-78.10.0-th.xpi 712032 BLAKE2B 98c23a6871a3290f153dfd388400b3ee8b647d3f80defcfadf07e908261dbabe648dad49b2ff97b3632a720788fe64f21be982d90fd60d0c2c576a8491d992fc SHA512 c4a9af4c2999764dfe9c3ffbcf26b0755dc5f77175e43083d98541779fb559e6fb9f71834f2024927bfacf889500eb71fb7ac27d2456fc2f903bb8087d674ede
-DIST thunderbird-78.10.0-tr.xpi 649073 BLAKE2B 68d0ae770eb73e2f03b2417f4c869d08beaa2e0a6bcde6bb694f120b04e96dd0bf90092114bc8c53a0c576803e59b43e4adeaadd33e4a815d9d4cdf63a6b1374 SHA512 a53c5ba7f0f11fdd90ba1bc25a823efa02f539981dd3d23e9ac499f94df07771cc66df66e5e86dd41d883d95881062c53f4a33034ce31e003298e2adfd2409c9
-DIST thunderbird-78.10.0-uz.xpi 586595 BLAKE2B e94f4a17e15bc1e6309b610965b2c1c92d15d0582b8664e74f3d25d26390f3dc5973d739db5c78f84fdcd19f251c1043c9255936665bb6a5928fe81569120b8e SHA512 0963d315fd5a59fad3e91e50ba9843652ef0bff2ab9d59d66bd818de59bea3013d99b918a53596758969a54f1a587f34881909b3b87afcbcf6a2ce5d9a29b873
-DIST thunderbird-78.10.0-vi.xpi 674602 BLAKE2B e87d7cbe0f7bcede042861068b0ee060a21cfbd080540bb7327f63cf1639b14f7aab0d1656fb97fdacfb24ff57666203dee5c0d02ad09a64e2936acf45646aab SHA512 ccc7d1ec0e8d040b7299ea3ffa3f64da838656e7c48c9a39dc7665e2c2cd9c0aced89272a676500a3da2d95779e3753450d992a2083265eead4afd2234a405b2
-DIST thunderbird-78.10.0-zh-CN.xpi 687175 BLAKE2B cd16a66fa0f52392085d1ed41b52506d551fb493cb20ec8594f97f9447ffafa48fbe50653c2db21299bf44907418a283047dd74726963b4f36e4311e9f974a7d SHA512 b090dd30644c8c54898f1857c00e3e35f8d9e28705534d60b10039ccb102986353ad38501bd59150f870012194de274f933113b583098acf47389bb16fc99b55
-DIST thunderbird-78.10.0-zh-TW.xpi 687615 BLAKE2B f03053699d420ddbafdca131278ef53daaa5dc9c79fbf2f759114aa2aecfa96b2cc484c131c88f7f2e55adff3119181690cca4578aadc692c8d74f41c4199bae SHA512 a4ada20993753092e39a473cca575d32b1d4fbe87547199930486fc3f8ae8fba7727030f91a7e04970a887280aba3508e5e834cdbf89b7040c3b35b148d89093
-DIST thunderbird-78.10.0.source.tar.xz 351422752 BLAKE2B b5944ff04ddebb8ba6c4da439acd5b985863d858c10aa726e407b1a3fb4e5529935d5932ea3b4e22080b83de640a2830cebc2fbbcac72212a91cbcb851535de2 SHA512 89c8bc9f76335093f7a43c9980da3f4436c1fa0ed3ffd9c0a2d9648749ad7ab427e2aede2b20ee9143748c828bdd417b5b6cf06e73597dee3a745ef28143ee2d
 DIST thunderbird-78.10.1-af.xpi 548349 BLAKE2B 65465d2753f769c924a1c59e38d37ef73068c5b0528f37331316dd08816bc9c2ef2d9ee5419e1ddc8ce67c4322b6aeae8f6a240f4e44188627087b6db467a3b6 SHA512 f61d62d6ff0b5c6b651cd5bc57444bad772295c0b1f7ab66864f913009756442d1247cd75ac8af0fb6b6d82dffbac4db70f927a8469c638078a3b9bd587a4c17
 DIST thunderbird-78.10.1-ar.xpi 648607 BLAKE2B f472727e8a3c41a3322275f07a9f2787990528b45157aaa43004a06d1686e557a2a3588ec39638139c84977622afeeca6794caa5e2ab7ddd99d62d03090095c0 SHA512 ebe8b2897a228acd80736edcbbbd6dfe4458ba8bc5728847556148e82f99fc78e63a326f8783a1c7f0ca6823c723cd2199f0f01d7c00783072bea2b926ff9bc0
 DIST thunderbird-78.10.1-ast.xpi 561260 BLAKE2B 3c6c52141a9656362229f6284f3620da372eb5d19275d29cf019487cbb261be8756ae692650254c8377e9ab185c2bbe83124c03d1478aa7de4db9178e8ba4b70 SHA512 7c69196f50a6eb8972a52232f1e654d0ae35ccaef5807d99c2f53f5bc685cbc9980d22e597246721529006a98784da071984d74c71a4b86b9869cb5b59e807ca
@@ -137,6 +72,5 @@ DIST thunderbird-78.10.1-vi.xpi 674610 BLAKE2B f14923a00644e107072179603d06c072c
 DIST thunderbird-78.10.1-zh-CN.xpi 687177 BLAKE2B 43da21f8faf74f9392ede14bdc8bdc7ba741724cbfae91ab6dcd9e3a8ad41e834355a3069e52acfdbf5bb3685f53e275cc4aeddfb987939ebfb6b1329384cb01 SHA512 2275a1e189d806f98c59a19231ed03683aed60bc08969cbcd9d3650b9b545ba3f2cc143b536a6689bb9b14c930048cda85d038267de3a75d44c3132dc474238b
 DIST thunderbird-78.10.1-zh-TW.xpi 687622 BLAKE2B d3ff5da0323d6529a142ca20d29ce06397fb6761282ee6f4b8dc03ea4a79874f9db5856e5980de8cb7b2e68332b3589121768c1abefe9a9e5af29dc1cbafec68 SHA512 b4f85ca2ae438265fa9fdd99910d292937e78687a74cf12cc33e1a693e38cb76820a0e0c45f50de39cd2c4a3b911b5988eddbedb52a15379121590c9383ffac0
 DIST thunderbird-78.10.1.source.tar.xz 354316236 BLAKE2B 756f471de37e96f9e9733864747b5d9270dbd67592e02b3632f80d815af95ce421a913f3f8d9454d5b5885e5506a6dad36f7b7c20ab46c371a5ba594cc51e681 SHA512 fffae4bcf2411834a86b5d1fd7c3fa8dbc32763061de4afef44ec95d55a8c4ab94576f54bd8b8c9aef22e0c4a09b48a381ba2ddafc31be60ef79b81e6835e4db
-EBUILD thunderbird-78.10.0.ebuild 31480 BLAKE2B 179a685ec984807814100591465a07e79a5aad36510bce42f4804a4deb76f65b9691dfa1d215218702a7ab837c5095497d9ade02cbd0417dddf2764e268b6378 SHA512 aecd59b0416b29acb39855325ae3fc062683e6cae2048f2b39dce4b245f7eedfe75569d5e604001f52e001773b27d94c5d8fca7284dbec927e17f648dde2c66f
-EBUILD thunderbird-78.10.1.ebuild 31480 BLAKE2B 179a685ec984807814100591465a07e79a5aad36510bce42f4804a4deb76f65b9691dfa1d215218702a7ab837c5095497d9ade02cbd0417dddf2764e268b6378 SHA512 aecd59b0416b29acb39855325ae3fc062683e6cae2048f2b39dce4b245f7eedfe75569d5e604001f52e001773b27d94c5d8fca7284dbec927e17f648dde2c66f
+EBUILD thunderbird-78.10.1.ebuild 31630 BLAKE2B 227b267e62ed103e0fad65d4d0ac65882e7d50267f2a0d3e12e4fa90db57a35f6ca5e0d5c60ea6dc083167f9a8b3b5b9db03e3e11e11ac712cc1199c37543414 SHA512 84338299e8f7def1e467795864bb1db4db2a88e6f264bc44b9079c667bedb7d06a329b9849037ae710db30e74656230a6ce9607c0fe80add1f8fada310c0ebb9
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.10.0.ebuild b/mail-client/thunderbird/thunderbird-78.10.0.ebuild
deleted file mode 100644
index 152bd8350aaa..000000000000
--- a/mail-client/thunderbird/thunderbird-78.10.0.ebuild
+++ /dev/null
@@ -1,1100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-12.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
-	multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free
-	hardened hwaccel jack lto +openh264 pgo pulseaudio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-	mozconfig_add_options_ac '' --enable-calendar
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-}
diff --git a/mail-client/thunderbird/thunderbird-78.10.1.ebuild b/mail-client/thunderbird/thunderbird-78.10.1.ebuild
index 152bd8350aaa..b2bba3955d0a 100644
--- a/mail-client/thunderbird/thunderbird-78.10.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-78.10.1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 FIREFOX_PATCHSET="firefox-78esr-patches-12.tar.xz"
 
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -77,6 +77,14 @@ BDEPEND="${PYTHON_DEPS}
 	>=virtual/rust-1.41.0
 	|| (
 		(
+			sys-devel/clang:12
+			sys-devel/llvm:12
+			clang? (
+				=sys-devel/lld-12*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:11
 			sys-devel/llvm:11
 			clang? (