gentoo (leap year) resync : 29.02.2020

10 files changed, 232 insertions, 842 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 5df1fbde01d4..e0c2eea16d54 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index d0ed7e06c2bc..506a83d8a2b0 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,9 @@
 AUX claws-mail-3.17.4-libetpan_pkgconfig.patch 4483 BLAKE2B b28520c658214e9f6ad4bd0d48835e29f8b37aa7b3915add2d71b8ee7dc3366c38db1de9272dfe8e48588cebf748e6c844f04bc721fe577f66288b849e5c7054 SHA512 39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
 DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
+DIST claws-mail-3.17.5.tar.xz 6290944 BLAKE2B b060d4513ecd61ba8589d701970c733b683d93b03beb22e37669e9856797f6d0d404c09a49f0a1d9c8a576807806ec22959079c9ff79786d226ea6b6f3817904 SHA512 a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f
 EBUILD claws-mail-3.17.3-r1.ebuild 5891 BLAKE2B 0d5e4c97676a4f074cce701666a0744224b11092cb637739d183fc80b835fd3f5a208c137e8787794708fafaf187ecebdb51d53681bf368eaa30d056ea19b53d SHA512 624598ef01d2fa3171eb768f4a2d79b58ed13f8a63596de96d70da0e9d311f7f0eba56f7bb423c0c2d74f72b0feb9671a4e1afb8ec0eb0a3f01b95ccdacd484e
 EBUILD claws-mail-3.17.4.ebuild 6127 BLAKE2B b33b8175dedba9349720b24c42b5be50a54b0669c0b6e1136de624f66c007390e215d01ef6e53dfc61696ebe5442fb9b1255af27068a0616982f12b4f1b6fb23 SHA512 f3b4cd871bcb28dd41f4cbb1af7c78c9f19ccb7d7299c5ffb4487beaa3fd5bbe562a14fce41991910d2471c346a58c325b39c702db4a5378fc49369c44fc3b4e
+EBUILD claws-mail-3.17.5.ebuild 5999 BLAKE2B 21fa578a3ba5b876c1fe910f9fb22f6d8feb6825f9d88ddbc97d1d769f9c66b650f49c3d6423485b56f67020cffa370be592b26a24f6140865d5cca5597d06ad SHA512 df4a8a143617eace486bdf4c21f2564cb6b48b371c1cc860baa62e7ccbacb512b1e45c54bd67fa8d606a709212ac25204c772e7b5bd7138fa5a11e0eaf663f59
 EBUILD claws-mail-9999.ebuild 6062 BLAKE2B f18d83a542cd21c3be36fc30096f26b065502f9a8e9ed789735076104527a65878125c7b00a5d604bdf51e82b59c83482dbe8b3054e0994234ff857925656f12 SHA512 5785f50095538796aa4e654afbe9969f9d4fd5ea4b629303ebc0448887c9f41b370ff5d42e8e575ef3f83164cf82fc2ccf0f460a894ba93ed6a49b5fd0daf861
 MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051
diff --git a/mail-client/claws-mail/claws-mail-3.17.5.ebuild b/mail-client/claws-mail/claws-mail-3.17.5.ebuild
new file mode 100644
index 000000000000..7e410960f2d3
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.17.5.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools desktop python-single-r1 xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/"
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
+else
+	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND="
+	dev-libs/nettle:=
+	net-mail/ytnef
+	sys-libs/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	x11-libs/pango
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0:=
+		>=net-misc/curl-7.9.7
+	)
+	dbus? (
+		>=dev-libs/dbus-glib-0.60
+		sys-apps/dbus
+	)
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	dillo? ( www-client/dillo )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	litehtml? (
+		>=dev-libs/glib-2.36:2
+		>=dev-libs/gumbo-0.10
+		net-misc/curl
+		media-libs/fontconfig
+	)
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pda? ( >=app-pda/jpilot-0.99 )
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-1.0.0:= )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3
+	)
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable dillo dillo-plugin)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable litehtml litehtml_viewer-plugin)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pda jpilot)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools || die
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
+	xdg_pkg_postinst
+}
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index 6ed0efe1b319..bb8a48026244 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -2,7 +2,7 @@ AUX s-nail-14.9.15-havenet.patch 6648 BLAKE2B e5c47d116f78eb007b86b5c907782c8c77
 DIST s-nail-14.9.13.tar.xz 734416 BLAKE2B b23de9c32357d5b88ecb723dc875d3366b2b4c57dd654a4f2422e8bb81b781a76568eb0955990d4166f034bf40459fa5d2992da6e7f2b403a641a4d4c0c1e200 SHA512 6467846fab5752c708886ba7a66cd2038effc0cf8d72e2feb670283cf1d5436c27037087eeaa201c074964476ff0c213cffe74169fb03089ebf964fcc766e6ea
 DIST s-nail-14.9.15.tar.xz 757180 BLAKE2B 9d3efe43e6f1f4486bb66bb0060a6b656097c4b6d95e5f22e209e7464bd92bc9cf42a36009d674a3ee032ab32f64ecef2aa0cc1b09519a7760bf5d1145e35c5d SHA512 ca95c544890a13b475fb12f882a172942f29517319956eccab1fbc2a67625fe53e3f0cc10c31daac98e28bb1fae48364d80db9ec35f0e6cc71d748290a2635df
 DIST s-nail-14.9.16.tar.xz 790052 BLAKE2B c12dcb3e0f412b34a3f3214ad3be05095ac5045932f5605b59a21ae953c0edb2619cdff1c67249a2ff8a02d809af08d2559af4319462d39dab37df1f904a4d13 SHA512 147c9dbd6abf9a17778eafa36f1cd85b0f769e6acbae06d67d0aa8b9c8b940f78e115d13d277d4269ea44c9ad6dbe75228da9878d9eebb233cb354f3d548089f
-EBUILD s-nail-14.9.13.ebuild 1935 BLAKE2B d6a22d55c96af91e1d73527421e0e4330f120eaf616647f6584022322e5d43bda9d440376829321d4aa5c449453711ea1937fd0749e2d807deaa57b1ee990be6 SHA512 bd5093554a5467ec80e1fe391123f32799487ef9a90823b891199c443db19928e646b6eb01adf5600638ae8d5b1310b557a7d6f05cc6e716d4ce3261942bb6b2
-EBUILD s-nail-14.9.15.ebuild 2009 BLAKE2B 737eb36cfae90f8b5ca02490878d6230d04472d68b55f79e248698aa293e1a7c540c695bd065caef390500edb3fc9e20adb5a77ac15a0b2573f5b52b70c024c1 SHA512 b2576216c3ecdef61ff5260a2d3c5f5ee1fb49d023fe261fbf9a9b015b3ada6aed05d423a3d75c367371065060d25a9310fa733f3d8731e55eb73726c5587728
-EBUILD s-nail-14.9.16.ebuild 1957 BLAKE2B 0e9dc8206bcd73fdf8e904403eebee99562784da737031a1b547149fef9742ed64c431c5c0b197144cf15ec2de96483f47580754b213a7ed405da0b962e97c71 SHA512 7b8b486b2277dc32cd1b412b4eefd166361e419f7d6ae87d7a9a122a4dd573f442f3444dc7cf1dee90199a06c48c51cfd910ca10db4ed1257dd0375fbab52286
+EBUILD s-nail-14.9.13.ebuild 1934 BLAKE2B 4df4f94243e63bddf317a5a32ac4fe523a8f8f36dfe77e5f2cc08184fe26ad729e3fa93edf0d5aa9b33afbff07cdfbdf3173dea13b6cfae03578afcecb3294d9 SHA512 116dd1747d0eaedbc61bedc2fada066b488211f012a965b74da4a99aa2225b224501f074e9d12613702d2df6a0c2fe99459ea90ffb5866d421054c16f3478ef8
+EBUILD s-nail-14.9.15.ebuild 2008 BLAKE2B 4f673a15e4e802d11ed75c213fa17fd5cf8e9e17f71c4741b662a0d18a94a3cb22bb4acc5cd68d246a38af273653af97f647d893157194948ef1dc56a6598a91 SHA512 c40ff0901c8a6cd7b6015b3ff68b8762ec4d6695bc6abd47e05b2d4643b95c44dadae1f55b45bc17b61e0dd7e0ebac1217bd7a0f02704d6643d924a5b758e568
+EBUILD s-nail-14.9.16.ebuild 1956 BLAKE2B ecab893af91a78cd8ba08cc1bc734931935db426fdfbef69fbff710f28c3a23f0fa4845aff6f0cdac5f9c75fe0bca2b9bdeb05a6d03098abd30a49dce5a70c32 SHA512 49ca56976ae588febd3a8c85d239cd41a137902661fbb9ec49f82e74f4a6be61ee92f328edd165a2b7c33ba677076f3f4a9742d49839dfbc021302465eaafe42
 MISC metadata.xml 827 BLAKE2B 60255cc3fe6eacd232600dc62ec110994d63025c0a378dc0853cf6111ec087859274a158e1a9719ae7853eb0b752e806b1c3ad3304256cba2c75ad21a7bda059 SHA512 0c0d5ece2c20d666bca54d14288ecf0bf61fcb7c3d0b65145c77f353f24382c35643eae9ac7b6d48657b795dbdbe7256d8b0ad4dcf54c55888cc289ed9e67d55
diff --git a/mail-client/s-nail/s-nail-14.9.13.ebuild b/mail-client/s-nail/s-nail-14.9.13.ebuild
index 2155941b9356..3920bb828772 100644
--- a/mail-client/s-nail/s-nail-14.9.13.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,7 @@ src_compile() {
 	emake build
 }
 
-src_install () {
+src_install() {
 	# Use /usr/sbin/sendmail by default and provide an example
 	cat <<- EOSMTP >> nail.rc
 
diff --git a/mail-client/s-nail/s-nail-14.9.15.ebuild b/mail-client/s-nail/s-nail-14.9.15.ebuild
index 7ca0db136c29..fdfff8e88c9e 100644
--- a/mail-client/s-nail/s-nail-14.9.15.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,7 +66,7 @@ src_compile() {
 	emake build
 }
 
-src_install () {
+src_install() {
 	# Use /usr/sbin/sendmail by default and provide an example
 	cat <<- EOSMTP >> nail.rc
 
diff --git a/mail-client/s-nail/s-nail-14.9.16.ebuild b/mail-client/s-nail/s-nail-14.9.16.ebuild
index a07cebd9c701..2ab1bbc671bf 100644
--- a/mail-client/s-nail/s-nail-14.9.16.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.16.ebuild
@@ -64,7 +64,7 @@ src_compile() {
 	emake build
 }
 
-src_install () {
+src_install() {
 	# Use /usr/sbin/sendmail by default and provide an example
 	cat <<- EOSMTP >> nail.rc
 
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index d1cca4425753..56b0dca8fbcb 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -67,60 +67,6 @@ DIST thunderbird-52.9.1-vi.xpi 637163 BLAKE2B 95c18bab7d30dea4a8b2241290175c77a2
 DIST thunderbird-52.9.1-zh-CN.xpi 593611 BLAKE2B 441b5332a08daca64282a8d4233c7d9dc2008c80c1ebeaf4d125d5c804755509b9b67dda3423cc9b9a9af3d29b386bb621b231e426bdd89879e2e620f2106dea SHA512 db0c8a338df861a43563c70fd73768a5db730ce39e7a8400de44ccada3edac1f7e3736edee5cff439df76ff17f2b4838701e95fa739f5aa04463539516a86f0b
 DIST thunderbird-52.9.1-zh-TW.xpi 595728 BLAKE2B 8e2f6bdb65418ae837cef54f042eb8aa8ae32e952cece4e3a5a8cd13a4ac99a56495b7cca900d7ecd10d82ab77ed334a8e27eba8d49aca066bd2bb7d7182deb4 SHA512 24f48563439450751066d49f609ac4df9d7e31d7cea36ce8f2ad8f38b04fc4d1be99d50463700c4ea2963948b0ec1c1b5323cada6a3b1480f1debe52d50c4f1e
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
-DIST thunderbird-68.4.2-ar.xpi 617168 BLAKE2B 1f83991e715254b57ec26d3c76d1a962109776d3cec920b6e26613adaf4b8186313c81a40124ed98167d5a1b77dcfa5122d626ac9e7bc8a77bbed5099e56323a SHA512 0df1c7fac96fdc7dd2c4814e17ba32f03151b071d0b5a72a28f2294534c6765744d0ab3446e7158b19028fa71bf2e358d62162f5156b39b5380d2cd22688545e
-DIST thunderbird-68.4.2-ast.xpi 551299 BLAKE2B ba43a7a65b6de616ea39b1314475cb445e862aef8cecfddde10827c0d3bef346607ce24055b6aeb99d7ab56a675b0b5287ff6e84dc0e1f98edd1436911dc73dd SHA512 96a34eeda73650fdf6080b49069ea19caadf34e33fe51f9b3faeecd50c2f63d3e79ee71d9c8709aeebb269a5c2fdb9e6424df3d4a4145879297c3f031cd6f6b2
-DIST thunderbird-68.4.2-be.xpi 646281 BLAKE2B 417eb03a8d2d4a745d639365eca1df5e1345bb74f76a79f30da4e7c61f6e66036f2e1f2a9e61e318b085cf7c70a41e8d28bf72a261c4d0092dbf80ff9f816341 SHA512 a214048352fb4ce73de59a5bd8cfc3344b7b1f30da5da05bf0f4dd7cb30573abefbf475a8854c0553ecadd8f4219cba346d2d5bcfe56bdd18d698792e8a67ccd
-DIST thunderbird-68.4.2-bg.xpi 646228 BLAKE2B f5e0a21b1c94fd5f8e08784d4ef1c92f55e59a29c1e17679c20fb6bd8717d734fa33c9fb97969a0aa1e2b6483b1d77bed35766565efa36d59b9b097db5576423 SHA512 e9e09116aa1ae12aa8b44f326cf3592f62bec8938758ad02dc25db0d96b028d946ec2d6c3cd2fb61a32387c1ac4909d9fbb72af94ec7f4188a238691abc6249c
-DIST thunderbird-68.4.2-br.xpi 574852 BLAKE2B 9b4b394cc00b182d9f848369e7ea4574276e62c1c5846362fbff5a0951a4f3a6a14f1b8cb1cf2259aba0179357238fbec07f9b4cdee67f5c50dbc2498b7115c5 SHA512 30973f106cd8865017f0c0e6ad999d668dacf82fded859d0c97de822857f4191dd36d9a68edde7ef9d3be34d3bdfe324b49455b2632ac9928ed0fb282a006836
-DIST thunderbird-68.4.2-ca.xpi 578440 BLAKE2B 204369a0f1a4215c16e7f7b76518841a55b3e12a771a86ca990138a5718f6107042d585aee77880e5181fdc8c7635574c1375282639f8f00748bc2156a5f3262 SHA512 9d939f26cf2e6e2466677375e1beb3837a152c399376bd7dbb517e4c17b4fd2ef5894e716c629e28400800d01436018833eea2a3dbeae5db4c4ba0e72757c615
-DIST thunderbird-68.4.2-cs.xpi 603043 BLAKE2B 9901117c208d50a1dffbcd4a8739687048b8497187decf806b81420e676027e58549d282316e9f4dbc1001e822ffa864f49917a5319fc5cd2a4dad6d33e9db6d SHA512 73d5d0f9a2f6be098466ac246277e7dee3046863acfeebd838221c9138cb4e1a0c6247762a1e563b2f100c8c3684be9c1089b4b0bdf7bd5488b541df3ca1cc53
-DIST thunderbird-68.4.2-cy.xpi 589902 BLAKE2B eb042998e28c3c4ca1b00e97a54455407dbd054a399447e9cd2dfad51a9dda0f48bd702105cbdae392dafbfab8cded044a53ceecd3b06a1a7bd0b710169edf07 SHA512 3efe01e383064f44a2a1bba7a17b31f8c16e73e80dfc89d61b05ae7b8103711a55d541f58916ccf982052ca44dc539e93d52e8400844c292f37a17b0a322f4f2
-DIST thunderbird-68.4.2-da.xpi 588349 BLAKE2B 5464deec8183bc360498bb8137727d9f9c7d57b9c501f9ba7d60e56788b4e6b8e66c2558a075966f3f0317c031f1f6d68997d7ed574c4328f476d1d9002e4634 SHA512 effe18da210d4ca99d3f6f23de473474eb0b37e11c6c9ec93488da6c9710bdaf5298f447c96ac2549231e9229012d77a05c9cdf0e346463133f30648a39aa304
-DIST thunderbird-68.4.2-de.xpi 597805 BLAKE2B 5529de6251eafc14894a04f8c67e8cd21416b4a4d98f9d2bbb7379f466b50af53d7c100a7415f8b1293fa60face4afa1830392d9f571214155b67cb73ce0af9c SHA512 09c8811eab43b463c764dec75f655021085d922c2aa1d32a302818951bed9fef4567efd69f2e1a7fadc5c0df8680fcf5598f51741bdc56d265c75179eb40444c
-DIST thunderbird-68.4.2-el.xpi 699224 BLAKE2B 744bc52ce9246830fc875e32a33dacebcf68b68ef07f90ccd7770b3f6c3c02028e8faf0bcc1f7cbcfd432363c4aff9d471c14dc770b575a6fd491a60e282b104 SHA512 b9d20f5368d0d4b9ca76a2390107a6014707fc71ce86b57375f2e8f67b1b61889a3e99672a4eff512100945e0b5a977a8beaca0ab50e01e5ec168046913f3e34
-DIST thunderbird-68.4.2-en-GB.xpi 556403 BLAKE2B 26a9b94e537a5aa50427516ac5dc33b1f55b994a6a13da425eacaf60d3be6dd2df03dd8a954acc2b40e19dddc1d28996dd3e15a968110b92c32facc6933c7bdf SHA512 e1e3cf10caa190393250468ac647e79cee9c79f570b1d31106e75e3bbb3e13a53917e0ccea6738eccabe2fdf3130eb8f2a0395d685621cb81841e117d91a9bc9
-DIST thunderbird-68.4.2-es-AR.xpi 596552 BLAKE2B be837ed7409136655b626e6f2d128b847c7c2a98ee04a38aa72e3419846eb40412d482cf04c059870ec4d657e7c3113dd81149db705d86310f3ea82a2c89c64c SHA512 f95635dc14881e586817b02e2cb5b5127c082e03aace90c558342be19a49265165ad46fb636168c4c587fa03bbea53b0b796c963b3fe51222ae8205d01215556
-DIST thunderbird-68.4.2-es-ES.xpi 518352 BLAKE2B 222ec41143bb34384b9137dc51e4ca7c04e7c7b7502f5cae8213eafacbcb09dc6cdcacdc4acaa5e96a97308d4d0a32f5b1e5d09907b400d82796c38217280388 SHA512 2b55612fd65d5d2dee57447a4c08217bcd9fee13b298f37338c3d2601e90f7fd63c621d6bcdeafbf49a135e554c00eacaac5fa9622ff8cfa0bcda7fe34312e7e
-DIST thunderbird-68.4.2-et.xpi 573582 BLAKE2B 022d0d6d048dad220bb098e57765a5c5d22905e85c7d86b312a05b40ac3b1f0bff35f53eeb3432d2d967ffff81995f5420ba70734607631ae27b9fd100888dbe SHA512 2f4410bb6f65d2b06e79d1c3b791f2a68dcd0e4d1595f0cdbb0b13aa87af08f70c28c8c99dd81e9e24f461143c6b164930a5479fda9198a3cd6de676d41f2a0d
-DIST thunderbird-68.4.2-eu.xpi 579945 BLAKE2B 1c285048f8f2ef363520021eda3ba00e12699cf0138e2ef92d0a3bddb40222261e00ac9a7350f559d90be2e1c1859ddfdd0cdaa0479482ccb2928ddc845b4401 SHA512 86bff933ceb2681c36f04b96afd775be7ffb2405df594f6d95c263ff3ddcf6bec759d1d094ab4907d63cd4c0bc6206c1464d3314c6b140cc3eb546ca03b37c67
-DIST thunderbird-68.4.2-fi.xpi 578418 BLAKE2B c3d7de085323318d0686c8acc6a6b48a2c6c85a2ed73076e111c576e89fb8fdf2df26977c0068f93c734c81d39660fff3bd19544618d7c0950276bd061ee355b SHA512 11e9f616a65e3a2955fd250cf21bc96b8fad6bc177e1f2756f28c01dfffaa4c9e3614cd8207416ad9b25dc8746b3fb59e81a4c8fcec1456cdaf91b64e957019c
-DIST thunderbird-68.4.2-fr.xpi 607811 BLAKE2B 3625de63d7309428442535676030ecfef15d7e0c36e4d2dadb93a6e095db1f6d0f6d6cf7fd0ea389a3498c71ce05b80513446c282da7bc1950b2fd342798152e SHA512 6f38e0c14c2dd26dbde3a3ba2e5b52a6b7d705cc0eb600091c7d060d40c97bdcefbf3d711c43c4f1bc93a614694b69db4ffae4dd1914b43aeb52f7b98ee337fb
-DIST thunderbird-68.4.2-fy-NL.xpi 594467 BLAKE2B c39110a70c70af61d3cb1c223580ab296315d832aa7837ec51d617756239fbdf77ed0f364570df05c92f834ca8d9f65d007e7896589606d3b843e42cd6a0e901 SHA512 2f47116181b874f05ea2cb08a55ebe96a0e336cef33f66186ab3720d50dd8c79aa97cc829ccca56caf0bae16abf434d016b9b2a6d1d0b039aff7bc6bd9554f25
-DIST thunderbird-68.4.2-ga-IE.xpi 588710 BLAKE2B 31c087521ce6db6ad230b13a0b2eccf2a1d1ad036567cea67f4cbac39c09b65850776dd4fedaf9d5978d5eacc89d057e1f9967e18d5714ca8c467b2bb2fecd3e SHA512 6f5d1d1319fe359a554dcd8a1542dff7603c02c26dc83558c388bbcf0b205ffa2c118b37fe4a290e3ba5138c53a249e24606f508380c2f055524c881d093c008
-DIST thunderbird-68.4.2-gd.xpi 587110 BLAKE2B 430ad128b3eec58b519f6dca6fe3a1756d82669ffc071f7afb4e45f111ecb09fa7ef0a22e2bee08ff56795021d6d3a9240c76700041b20aaae79dc77a27a6a7f SHA512 0f6492f46dfb2ebe941bb763395b73a5b19b7c13a320016a5a4be92f07d1d4f7481ab8d3ce0d978818b2070f6cd8889b0ca47a3353687a5b2bcd364af9ba6b98
-DIST thunderbird-68.4.2-gl.xpi 568397 BLAKE2B 3a60fad2022021e7bda9a9bc07e0b356fa244f3a8cfa49866cecada6639a958b77f77368572a8d13987e0b64a42f228695c5ff1fb230bdd74a21f3e6acfc5345 SHA512 a44a3db4bb9bbd4c2a9f7ef01700349bba87cf732bd284996437a44549eb4623f1638b64d209dfab56f11b08d8d8ae25bc81df941358b775323757e63164cf8a
-DIST thunderbird-68.4.2-he.xpi 604788 BLAKE2B e5b6450d2c7c45ab9795e9e8483c3601446b65b700fcf97e4ab06d855330eb9d5ef324f26fa88f4bd226b1e9a37eb6fa1d567f26192743ba3b8742536d515197 SHA512 4c66728abac99eb2a5931d861ab21618f5d5e5a4d137c57e87de1a53e69460aa0b7c21dbe84919c7204b5f7d3650a030885b4c5c98a317a3337efd59ea68d4e1
-DIST thunderbird-68.4.2-hr.xpi 583784 BLAKE2B d50b9acb226eaaa2277c5b132606c678f03d24eea0bdec1a865743acb971d2e608bf894364d43addd5e272bc9434e1c167edcdc4dbc7eb999efa7e11a7d85940 SHA512 4e8b5b8fab2e033f41c461bba511d14906d635373a3fce25c4ad32b504ab12f8ed27ce2c8079b44da95e623d3d8a19195ed6a6d4e86b2918df42d1ec256cacaa
-DIST thunderbird-68.4.2-hsb.xpi 616035 BLAKE2B c3ef13a73282b20e1bf117f7588c4da9eab2920e9bb904718ca30a15056160bea7c3c983a406a46f521e9aec570abdfb04724348d471a6b63562081a774d43d0 SHA512 10dcdd72454765e3d10d74ddfed76097127fed03cd7bc112e81ad2199cf87194da04c8bb010e0574a93f32c982e953c2420c5728bb12edb3c51c89061b81ea97
-DIST thunderbird-68.4.2-hu.xpi 618154 BLAKE2B 74fe9264e817f5640c11646343770989c011646a1c4c0fe047c39b36da92ad7c4db7ee5e6011a3d176eeaaa0df30894fb04d248e61d66710ff3e61679054e801 SHA512 76fd2b99aa553f02910fab54419f6def8c912078d226ae926e6cec90317c5c4384900e6e553c42a70391534b962c1cce38e2bff48775fa2c3a6e1df6d49afcc0
-DIST thunderbird-68.4.2-hy-AM.xpi 631979 BLAKE2B d9c8632f3611de9107bcc6ee2500c83ff78120a444b1d63fdf25c0b153096bdd48624c61ee65bf179f162609815979a5d5a9d3f3d40e53177ecb2592472bcba4 SHA512 c6266bf93028521ffeb4a33d20dbde11ec7fb68c5ffe782b36a4a11e0c7958deb9e1b1f12078b056298064882f61967a9e88241cfbd714517fe63b6f3d3f2099
-DIST thunderbird-68.4.2-id.xpi 567748 BLAKE2B f21a529c507d46e2decddad2e010fe9a2dd8d139b569173826ee7d49920254983cf2520bbb3aac5b8bedbf24078c4507352d1ccf953c2c33a14e38f87ecfc51a SHA512 38f410527be776dc1c6a138efbe162b99fbe3ec6f3c4a6053658b1de0965a1bb7fd47d998f5dd9b9cb949972b26b2c7f8f0216d1591cda9110824e37db5b7adb
-DIST thunderbird-68.4.2-is.xpi 575439 BLAKE2B 5347d7fce83c0df3ee77ea3e937f31d4835402e95fdc728329db053659108c11c52fda40413b5e0a824b7266e3b52ac9d28bf3fee55ffae1ec578e4dc93e80c4 SHA512 8e5f0bdd5db04d027aa592c789c098d7a94c7c6f2a962741b1df75aeaf6e971782db27323822279f971c90a00fc7004d39fc0169a0e8f82bbf97098b94bbe7a2
-DIST thunderbird-68.4.2-it.xpi 489520 BLAKE2B bb27f5a7523b6786d0ff35f58cf13d39ee655026137de21e0eb13f0a81e7fdb48446b9646b9876002c433dc6e737615002281f4f38e357baef8fd59762007b01 SHA512 9cf9d240c819c8ff87189f00f50a03d9c5f6f932a8d8e181a42949f4589b92fdbd314d79f67af47fe8f44afff06333756936093bbcfb93ec14d47b556d3d28fa
-DIST thunderbird-68.4.2-ja.xpi 643575 BLAKE2B 5678be69a0eb83e4ebf7431547d26be89fe11d2bef134b5203eab45cea6df064b16c083d2b1ad1bd749f9bd414c7fe74b19b50f850af8d26b071f8d95f9fa126 SHA512 04d90d7b2143e5045ac34d04d526aa8c315e0df118e4b634bbc341d96afd302195ea8d04b07405aeab2d8aa72305e3a0ec9b6b8d9473869bf56e12f77ea45207
-DIST thunderbird-68.4.2-ko.xpi 620531 BLAKE2B f6033eb4ff1baeec00ed5da2ce5aab14a78f4091702c22badbaf921f0f2c33579747c0ff27d0156b7b1b6ae7ca6866aa478ce68a396060411b256c728cc7bd99 SHA512 165b19b36a9fcbbbab8474297f8263d1c3f1dd58c71ad5a43803b24a7e3450b5fe41583111628e93a22edab37a35f96330553b327ff4e34d1f577c529f2b9a67
-DIST thunderbird-68.4.2-lt.xpi 603846 BLAKE2B 508b905eb7ab4da0f5ca156e34329c5b2041eb7bbde780e2a5196861c5fc04e7217b41275c8b85bbe175b99c47fbc846a7eb3bce2a2cede9ae10d318a7ca1a5a SHA512 1d9b05b7f882a46556a0d3039011140c512daa8c40bf1405dd88a6b9a36424052335a869d476af2cea135345f18da4573c72ef2a92811a24ecfacabf719596fb
-DIST thunderbird-68.4.2-nb-NO.xpi 574022 BLAKE2B eb54e836182952756c031e8f527737b08b1ca53e5ca1ab7ce640cfcfcbe63c45edfe72c412a1c26d4032ceb4f5f8cb519cbe00c8e02153f63352ab5fc03a5ba8 SHA512 d093bf6ce5373b5ddb1349c9ee27da6402a6e75a6f828a6d04a11b40f1b760dde3a14933b17fb2798df1ad58f1122f7e2eea240844cb870a810d57f20f901a38
-DIST thunderbird-68.4.2-nl.xpi 581355 BLAKE2B 71b43415cffc9bd11a3288406d9591f375153cca1013df25d85d89f5a34f6573281f850b4867b88bdf2e1cd2ea72e17cbcf103f306f3f895c90c2d80fda5a7ba SHA512 d08b56695c98f84b11ce874603dcb0df721f97493500c66038b4e04490737b953f4fc71bf5080f35316ce97f3ba61b98e2103a5413daf8129fdb5b5836c014a3
-DIST thunderbird-68.4.2-nn-NO.xpi 574951 BLAKE2B e878470e476b32d229cb2aa21691e0b2995297858c651ede3c83c5ef139d8bb4b164aa729b67d60608db3d7cb39a1e0feb03cc3ad097c4714cbcd761440b3e19 SHA512 79d1220859d82788f7bb96a375c33174e418319ec5e0925c71d516f308195cb1f27dbd112e26e479fffe56e0bfa0786f4fc9c01a2bf966f6171473d286f9220c
-DIST thunderbird-68.4.2-pl.xpi 576085 BLAKE2B 894bd4f8158f83ff2758b881a6edd2e6e9775080075a8d5b3266ba4da9cf2967b271054e8b706ff054372949e1f0d2cb5c0d064c8b2dd9f2db90ce377772f16d SHA512 9b0244dfb221bbd47358f14aec4d845bedc6084696f1fcf7c769e8cbd2f54e00a15fbc0936c4d1984cb7375545abda62c77eb2260421095e49919b35f0dcaa41
-DIST thunderbird-68.4.2-pt-BR.xpi 589838 BLAKE2B 6a0f9b4b37c2160b5bf8d4b9e2b88d792a04334aceec92a3b4821c38fbdeb1181791aedc95b23bb82d77401a7ec23fe983620b4c733a19c46e39c266679408fa SHA512 11a432eeac8eaff92d8943d60bb3716bd79d50c44d4b666c09b4f05127099190619778cad9d2dd08ab3a12c2795cd026c2798f973bf94e315b85cf10bc59d609
-DIST thunderbird-68.4.2-pt-PT.xpi 588103 BLAKE2B a6c2d781b476fd88f9fcbbe94744ffe3322b30bc66a45de00c4691e73e629f84155de1e7d8f4d5149bb2cea117321bfdee3de3024683b32e2f41e78408b3f6a9 SHA512 785a1ed6070dc49b25cf322d390feb5aa04f6af4516a5d96f4e76cde6b25ff3bf17e2cb3397e5405e4e1decb4cb65130efa6140d9999d47e818a9430ee2fb0f8
-DIST thunderbird-68.4.2-rm.xpi 578049 BLAKE2B 0abe1841d27727303ea18d6a5e3f4ee5f3fd78eb2f74a8e0cc8ef7dcc7cc01771261e8d03b729d677f59413c8388f5c893d1ce3051420f95889716a9e9151623 SHA512 1b2c026b4831b6d91a029a7fece728ee3db03a3a0df902d1c3f3be1334f123ba4e2b22a4c9df7063fc8e68ec9b31941d6ec07555ce55af0437e74a4824296af7
-DIST thunderbird-68.4.2-ro.xpi 594842 BLAKE2B b73b8c8babf812c2616b99ee1e967ab5251f777b49705d79fab257aa718ed7783069250c6e217867b17f833bb7b6fa8a9993c1d058e9df17e4f32c4c60badc5f SHA512 9d13e85fa0ecc5784dc0a50d89059af790a723e886a875133df9413ae2c85f12c1e4b5be4e67db4b9f3fdb095cbcbd7d92a3504b1dbba35c904e85360bb00926
-DIST thunderbird-68.4.2-ru.xpi 683326 BLAKE2B a503f389f3f4f24dfa115c2b421570db84e997583e4e1c5e679635ffbe64a1aa74d0613785a335423037fa837674cb9fa22587e63b2e9937859008049fdd8f32 SHA512 360fff287cbd20779d14fb25e5c89989a88154fbdc87cd65213a68bfcf72e131c5d4937367180d097d4b713e6972f4502da63567c9a3776603279690c5b34e55
-DIST thunderbird-68.4.2-si.xpi 637404 BLAKE2B 7b6404d1b0c8ba9d2e7b0240cb8862b3398a110a1da1f79a7c4c001a78936c10f32103acb6f04d036f3d770477a6dd55966e9656e33bc7783381c62bd0509493 SHA512 1f970aa9e8566b484c853560c5b6847e97bfd57baa5f01d5f0807738fe30f626ba0f717d28e2fee544231df784a9673b37d51b3e241e6f1dca5b21df954a9b81
-DIST thunderbird-68.4.2-sk.xpi 609753 BLAKE2B fa08a7d5b73cd395b07fe5e7873f2ebddf0297197cd4dc3ab7e6f0cb4480cef5e72356f7ec1aa7fab98cdd28633418a1997399da42d1c55e43618ecce54362c5 SHA512 97ba9c390fd1b8798a2893f1057f3f3132cdace1c38fa7d1d8efbb66c02e20b8bdecf8044a38ad33388f04241ae4e6d8a3d797016b1c3811581806cf808c4186
-DIST thunderbird-68.4.2-sl.xpi 590628 BLAKE2B fceebfb5b89ef3d56ddc29ca2821417905e84174186b8f2c13067d48a3aa637d298041de8fe59f1e1e8e57ac0d2e5ff2ddf8f94c278f74ace0ab4707bd627b29 SHA512 8311653c552998e5d2e24e6c9bc2e0750a41dacc288809bcb7bbf5f7f51e1bd86826c980434f7acda7e5daad3036c3e262fe19ded3a52785accbbfe7fde0d035
-DIST thunderbird-68.4.2-sq.xpi 598899 BLAKE2B 34af4e5b86f59c045c5723904da52f77b94f816dc9200f2c7ff5b6b91e40c4e299ca74f67fb8bfc6fa01166eb44a94689ca7d5bf9a2a465b1f587839c7e3bdc4 SHA512 19160021edb1b54c38ee50b8e8d23feaa956d4f095f6c15d04b475b8fdc221db41f62933bcf15707ca0f3dd7cca808915a003ab2867260cdcae6c2be17ccc607
-DIST thunderbird-68.4.2-sr.xpi 624896 BLAKE2B 77b8f27b2a1234e6f4c621ddfa0eb3bf67a9dd64b3e6d927732dcb8850029d14a38da3c3c615b7dd9eae35d1b17ecc35185d6fbfbea520d8f0c0690e0d025391 SHA512 e2ca9c94ff07a0598d65962604a6d980dc6b318849688613334384319d34574220e7c7a6b682eaa66b182e5e64b7ad0509db8399883fd8b58323ebaeb18bc5f8
-DIST thunderbird-68.4.2-sv-SE.xpi 591596 BLAKE2B 1fc14e2d8612fbafca9ca29cc8f5d98e35d54486f384e2680229ad8df59edc24602bd819bcab987eb2861aae52f8457e581af29e8d6ecc1a8ad2fc7c6d0ae1e5 SHA512 84709e8540e75b37bdae40a5ba3f3f34b2ca020a6796709db2929a3ae13e47f486f9305099a32ba097375ae56d2be4df8c014a1938663555d3500cbf877864dc
-DIST thunderbird-68.4.2-tr.xpi 599707 BLAKE2B a9878349ebb409b589f3b444b8eaf1c2a235c24982652843747f9a12b9704e60dcbe0f17fb942cd55111fb85145f98ad9c3d3f81eba694812731a4d5e974a7d9 SHA512 9e6c890d6c8916e79568f75116b3086956cd43252d95c1634e04083da32c007854d96fb96da52ba1c3ff1d07de9300148c2ac715945112930ad265f87e5df3fd
-DIST thunderbird-68.4.2-uk.xpi 671454 BLAKE2B 776baad26d9f0119520baf3909bfcd297b0666d10ba912fc3a2b02b77dff2eca81c69dab603b1b5a5b86cb1e4a7771fc4b55be978145bbaefc6bbb664805dc2b SHA512 3c6032b4c73797a9e2564e238a7561e21d0b6af242f12792aef2d8208ce722efb85a33aaeb04dbcba17711f14b3af00969212f9abb89e9a365629f0cee4fd36e
-DIST thunderbird-68.4.2-vi.xpi 623422 BLAKE2B 2614a7f2de3d82740a6bd193cbcece9868da3763d0edc03973f6d0d2042c6e675cf6d3230a0fce462d03ca3a3d5c58f2e0294638c190298ecffcc974f62e283f SHA512 0db1b95b2ad15c7c6c76dea4e3d340e68fe90ad8b1776b5e5a77774b4c4d39b552ca317051e8e9fc7f091f30297eac8db932a28ef0b2db09067a5187643293c5
-DIST thunderbird-68.4.2-zh-CN.xpi 626819 BLAKE2B eee863bf3a214a28a6fee5de35fcabaa2378e804f7acd732c516f496157556eed14dc77593c52ea9438e2fefe9963a8a172d717a0d74caec5d9c266ff8a8f73d SHA512 563d463ee183ea5b268ed0281f7de9df689fa09a5acb4847135fcf6047f698147c5d5d8c1893ecf38723afbc929b5f1fb96884c3fccd4344d7015120436b5ad8
-DIST thunderbird-68.4.2-zh-TW.xpi 627476 BLAKE2B 9ba886b296690ccbb4326c80b662d08e81eb20aeaf8d7db12e08906df3ebe84b53ca918a926aa62a4206c03a281ba728d8e270e54d4c0970fb572c9e39f80796 SHA512 d482853f15e45c174f4d42134af91767df9e7658742a847090c6b06439c0fe5f8d9520162718e759fc9f98fd70493cddf83d05e42ab39ba5040865cbe42b4643
-DIST thunderbird-68.4.2.source.tar.xz 330801416 BLAKE2B 481c51722478a2e4e855eae9beded4d527007b4f6bf6880934ca48ed1a79d1661076cb62f22815ea2365c119556b726e018715dca4091358e6afa3609c6c55d4 SHA512 3dae593bfa328a64c05bbb6b84a80fb492876cd11bede4969f25ca74cd4051592aa600087c9df9e11e36d6e02c7299f629d8c3a214d84412c967d6468f6330c1
 DIST thunderbird-68.5.0-ar.xpi 617166 BLAKE2B 5091401f6b38f29c4111a6116137dbf50659be5678475a603651facc4bce86bb528823b5946df804a13565a23391fba9c945a76c57e9e5eb0bd3908789789244 SHA512 98bc51f8fc9f05468bead19c756a2a2e762e8116da3e5220c3fd199eab03102f0ce48a1360775887e3b74362d5943c784012aab79fc7ea6249cfafb3196f70c0
 DIST thunderbird-68.5.0-ast.xpi 551297 BLAKE2B 90d90199a994d028f1b828a19799090965e86ce07e155ebc8da2d3a47c537c5413d3cd1fa7b3d0656136ced575b22e45f7c6e508029211326b001968b3535534 SHA512 c040de577a16a62a8e5df2d8df852221c766e4269f23c38431a1ca841fc308d5cb42e26cfb16a70c08e21fc433b8ee2f1ad3fd858b87c7db844330c9d99296ce
 DIST thunderbird-68.5.0-be.xpi 646279 BLAKE2B 4e6ddca8b65711ca3f74658e0c1d1f36b4f0ffea7de9da54b4fbacde5595610287963bcd1bb6fd0417237cc370e32bb49f249e37a79ce55c46494517b4d343d8 SHA512 f6df4a046790d587bee2f2e67b30fb09b837277b12ffaae1c0ee77f7e208f2a4782a761bd2318f60feb1f25945a7c375fc9e56a92ca8c777ed6a36264bfc71de
@@ -176,6 +122,5 @@ DIST thunderbird-68.5.0-zh-CN.xpi 626818 BLAKE2B 181c86c15a161862a7d797e4e43921b
 DIST thunderbird-68.5.0-zh-TW.xpi 627474 BLAKE2B e3e8bdd577d776ea01114c56fe9778170ba68948c23e2081a7c7779846e2c39420d10957d853b4ec84b3f9fbd22e4c203111ac4b9e4cabb87c1d77762cea57de SHA512 e3c4593fa1dbf2f3cb5527d76bcf33f9a7291134285d0623c7a0f1a7c4ccdcba64bdb2f6c9cd547836c9fb8339789d928a6a14d95e6557ff78fdd053d84c7d5c
 DIST thunderbird-68.5.0.source.tar.xz 331328840 BLAKE2B e0f654132ca9d3bd921a29a71288524640ec698f762a3235bba9b1493292b4ceffd006d567891ede42175c36894a78a23e22dd8432047b3e1bc64593368b2a4b SHA512 bb58a398f24d89eac5b1816f9d16edadbe65cdac6542e1f6798424c7ea18eb2d4ca46bb03f54c8c365e67d1dec44d3dfb36fbe4f85afe9ad80fbcc1f2984084b
 EBUILD thunderbird-52.9.1.ebuild 10471 BLAKE2B 5fae71657b2c422ea54ca1e8f14fc1d762ae4997e7b207ccf38307cd368afc7bd108ec88bfba4cff20eaa1b5721c89ff44b85cdb654a2f532eedc4de72fc40c4 SHA512 71af60f486107c6bc87d1cfdce98a2de171cd8e5b9ba885a31ae6440ce0e34c0dbcdf3b2fd5a5cffc7ff97dbb06a07d309c1a396f5fde91d30cda8be2e743911
-EBUILD thunderbird-68.4.2.ebuild 24973 BLAKE2B 7935128c93a72efff4b289af360df38a27406b14cc539620a361abacf3a169872f68644c8e9362dca1a4d824907c83d6710c7bb05d249050e5697309bc8949af SHA512 8cd3ba22bcefad9174f84f135fc7ab48074d49a501738d64e1500b668b5bb959d53d81af045a255571fc5f97c578f522874ff9cb90a393918123e61487f01f2d
-EBUILD thunderbird-68.5.0.ebuild 24975 BLAKE2B 48cfed8f4f5aa16e849479ba8842d14750e9609ed6b7aad0091baca0cc6582405774d262b248c6a1b669884f30ee87c1bd155db40ebfb478d25460a1361c9455 SHA512 f47210b0d1335269b96a4c065596a7cbbd54e5af08cd624d7e6292778da39025c30156e81fe9f28606f5ecd4bbf6e5c1583de7d79de1ebda67ae5f594f394d0a
+EBUILD thunderbird-68.5.0.ebuild 24973 BLAKE2B 7935128c93a72efff4b289af360df38a27406b14cc539620a361abacf3a169872f68644c8e9362dca1a4d824907c83d6710c7bb05d249050e5697309bc8949af SHA512 8cd3ba22bcefad9174f84f135fc7ab48074d49a501738d64e1500b668b5bb959d53d81af045a255571fc5f97c578f522874ff9cb90a393918123e61487f01f2d
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.4.2.ebuild b/mail-client/thunderbird/thunderbird-68.4.2.ebuild
deleted file mode 100644
index e288efad627c..000000000000
--- a/mail-client/thunderbird/thunderbird-68.4.2.ebuild
+++ /dev/null
@@ -1,777 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="6.2.5"
-MOZ_LIGHTNING_GDATA_VER="4.4.1"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-68.0-patches-12"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=9
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
-	+gmp-autoupdate hardened jack lightning lto cpu_flags_arm_neon pgo
-	pulseaudio selinux startup-notification +system-av1 +system-harfbuzz
-	+system-icu +system-jpeg +system-libevent +system-sqlite
-	+system-libvpx +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
-	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
-	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
-	${PATCH_URIS[@]}"
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx multiprocessing
-
-CDEPEND="
-	>=dev-libs/nss-3.44.1
-	>=dev-libs/nspr-4.21
-	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
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.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.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/rust-1.34.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-REQUIRED_USE="wifi? ( dbus )
-	pgo? ( lto )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "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 --host-root "=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 --host-root "=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 "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			die "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	# 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 \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use lto || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	# Apply firefox patchset then apply thunderbird patches
-	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
-	rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
-	eapply "${WORKDIR}/firefox"
-	pushd "${S}"/comm &>/dev/null || die
-	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
-	popd &>/dev/null || die
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	local n_jobs=$(makeopts_jobs)
-	if [[ ${n_jobs} == 1 ]]; then
-		einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
-		export MAKEOPTS=-j2
-	fi
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/comm/mail/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# 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.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Bug 689358
-			append-cxxflags -flto
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	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-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Other tb-specific settings
-	mozconfig_annotate '' --with-user-appdir=.thunderbird
-	mozconfig_annotate '' --enable-ldap
-	mozconfig_annotate '' --enable-calendar
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Copy our preference before omnijar is created.
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon
-	if ! use bindist; then
-		icon_path="${S}/comm/mail/branding/thunderbird"
-		icon="${PN}-icon"
-
-		domenu "${FILESDIR}"/icon/${PN}.desktop
-	else
-		icon_path="${S}/comm/mail/branding/nightly"
-		icon="${PN}-icon-unbranded"
-
-		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
-			${PN}.desktop
-
-		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
-			"${ED}"/usr/share/applications/${PN}.desktop
-	fi
-
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}"/default48.png "${icon}".png
-	# Install icons for menu entry
-	sizes="16 22 24 32 48 256"
-	for size in ${sizes}; do
-		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
-	done
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	local emid
-	# stage extra locales for lightning and install over existing
-	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
-	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
-		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-	mkdir -p "${T}/${emid}" || die
-	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
-	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
-	doins -r "${T}/${emid}"
-
-	if use lightning; then
-		# move lightning out of distribution/extensions and into extensions for app-global install
-		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
-		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
-		# stage extra locales for gdata-provider and install app-global
-		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
-			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
-		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
-		mkdir -p "${T}/${emid}" || die
-		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
-		# manifest.json does not allow the addon to load, put install.rdf in place
-		# note, version number needs to be set properly
-		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
-		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
-		insinto ${MOZILLA_FIVE_HOME}/extensions
-		doins -r "${T}/${emid}"
-	fi
-
-	# thunderbird and thunderbird-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
-	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
-	# Required in order to use plugins and even run thunderbird on hardened.
-	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; 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_desktop_database_update
-	xdg_icon_cache_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; 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
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-68.5.0.ebuild b/mail-client/thunderbird/thunderbird-68.5.0.ebuild
index 4494ddbfc6d3..e288efad627c 100644
--- a/mail-client/thunderbird/thunderbird-68.5.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.5.0.ebuild
@@ -36,7 +36,7 @@ LLVM_MAX_SLOT=9
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="https://www.mozilla.org/thunderbird"
 
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free