Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-30 12:37:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-30 12:37:28 +0100
commit: be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
tree: f82923fbca262493e83dd1382e561a2fae24cc46 /mail-client
parent: 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent: 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)
27 files changed, 650 insertions, 1129 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e06b4f8e32d6..151d9e5f036e 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index e94adc0d7f11..1b2d7f0ec629 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,7 +1,8 @@
 AUX alpine-2.21.1-nopam.patch 704 BLAKE2B 2a388b75246de1282686d3b229ea2841a930eeef3c9080303e544c9430c34546c179e8a4b0f6b700f3f532a10a203929047922c5ad6e918537011df5c9bd1cdd SHA512 4c5690a96137c303350ef515f3f382160b4045612df8c1ad63a7b72de040f13e33c8aa21e34858d8b33124c4f58dd7a19edcd40c8f49b95e9bbb0746973bcf46
+AUX alpine-2.22-cc.patch 537 BLAKE2B 0f916be9bf91d8f9c347c9325d20a13e8ffdc462f050d0e7adc0f90b8371844bc615182a178fac145d95dfbe425c20e211606558e56158e2dc3723875df96c44 SHA512 ba694fc876b2ca32b0ff068e6153768fd117c0f9ea26d1fffb35a1640cd38882667d58c7678300917c17a23076e2a4cb0111992b4e42d07b22c2e328d69713e0
 DIST alpine-2.22.tar.xz 6336604 BLAKE2B 65cab2000b6c606c002efcca6e731d2c87329b4685dec81d202e95598b4302175137ea84f079af1f766a6ef99d0b2cb51132e12539bea7f4d24954bb48af7bea SHA512 7737dce02ac94170948df7fccb61380c6cb101190e37f5b3ba281d573f54df1db24569d177b460f49bfff381a922be2e4b0f3a0f1a213d88a64d361aedc3c4f1
 DIST alpine-843b2f1.tar.gz 7490140 BLAKE2B 13ac5ef43dd729a7cf21b44dcd6feace3e1813672aec537fd05d5ff90b67bec145ceef71cfcf35b0cb7e250bb307556f5dcf8ebb024bc6366fd0ace0a7c41161 SHA512 106caa7bfe86fd5e82554ba68b9ee579cd8495bcd0dfbf82d9d75da2df3bd292d42d67af8ec737091f2a820b2555c25bbf0058c9c7bb5de5f950b570ffc25c4d
 EBUILD alpine-2.21.1-r1.ebuild 2237 BLAKE2B c02014289238b00a5ead8661e567bf1c3f7f9ca22f9a02553a04df3c21ee0eb983c6bc242ed19f33f91308a09d7699e6b8586b1c3bce2f841df10f5beb04f441 SHA512 270c1d9efc406fb547d5d2221791cb8e2112852b03f0e56b39833f5c4f2d97feb35f7709ff56903e01b96f22fc2cf93caa020f1615c3d9b929f4244ad74677a2
 EBUILD alpine-2.21.1-r2.ebuild 2218 BLAKE2B 4bcd38548dfec570422978a2b6ad3db07ad7f1738b066f03c8ea6fa265741971844dbf73a8630e2b5f70a88b00c305b77e985c1c8aa27bdcd984d142d27f7b86 SHA512 2a1d67cddee558988a19a16c2726101ebefc37b9f5287e45d4c7c8ea6d8f06ec862a37fb4806590b8b51d94fc30e0f6a6961fe88a768bf4ed7c867b618530ae9
-EBUILD alpine-2.22.ebuild 1958 BLAKE2B c42e7bfc13f865abbbd2ab8aa0568746acf1b7df06c422ee7346fae623a96f95d14d7f08994dbaa7ac5c551618b3e72c1910f5b5990248d3f0478e2f4f943ef8 SHA512 c894531026c73cdd8a1124711cf6fb8928c979aa793541ba18a7454596ad70cdae07cc20a111d3ef819d624ab5b45f0689d71fbb1f3261a3375c0c313f27a66b
+EBUILD alpine-2.22.ebuild 2060 BLAKE2B 5f58202d66033d9417c2d9eec597e2cef12c04c7d7953490fd680782d2a843afdea6791bbe2a2cb265ccff3934c55221f5495b7c656289874b64f6fd83fb78ce SHA512 6685cbdb825260de2da09d8a23c06be390235346aa93d411cdabe9741dff45c10399b4693baa3bd30355591de59b7dfc77e5e847924d5f24ae226645569d5301
 MISC metadata.xml 647 BLAKE2B 4086af8d509f84060de872fb72550c418d9b73883474ee873192540e0e05a2cc0fb9792c727137edcc08c3d16ed0af7964d5dc5dd82a58adcc85198e9862453c SHA512 d4a2cb5a4519c12cb75441e7418c34d96b320281d503f9ff2ce94050a88e2d5ac476ccb46c325ca35d459c0bf1c56932755cb7b919d27ea253c13f4b40d035ce
diff --git a/mail-client/alpine/alpine-2.22.ebuild b/mail-client/alpine/alpine-2.22.ebuild
index 75f6d6673383..66f123bdd622 100644
--- a/mail-client/alpine/alpine-2.22.ebuild
+++ b/mail-client/alpine/alpine-2.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
 
 DEPEND=">=sys-libs/ncurses-5.1:0=
@@ -27,9 +27,15 @@ RDEPEND="${DEPEND}
 	app-misc/mime-types
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-cc.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf
+	tc-export CC RANLIB AR
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
 }
 
 src_configure() {
diff --git a/mail-client/alpine/files/alpine-2.22-cc.patch b/mail-client/alpine/files/alpine-2.22-cc.patch
new file mode 100644
index 000000000000..87132bdd6b51
--- /dev/null
+++ b/mail-client/alpine/files/alpine-2.22-cc.patch
@@ -0,0 +1,24 @@
+--- ./imap/tools/Makefile	2020-04-19 23:45:13.080083548 +0200
++++ ./imap/tools/Makefile	2020-04-19 23:45:24.525083844 +0200
+@@ -21,7 +21,6 @@
+ #              Internet: MRC@CAC.Washington.EDU
+ 
+ 
+-CC=cc
+ RM=rm -f
+
+
+--- ./imap/src/osdep/unix/Makefile	2020-04-19 23:54:55.454098598 +0200
++++ ./imap/src/osdep/unix/Makefile	2020-04-19 23:54:55.454098598 +0200
+@@ -132,10 +132,8 @@
+
+ # Commands possibly overridden by the individual port
+
+-ARRC=ar rc
+-CC=cc
++ARRC=$(AR) rc
+ LN=ln -s
+-RANLIB=ranlib
+
+
+ # Standard distribution build parameters
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 27c2393a8644..dca695163dc0 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -5,7 +5,7 @@ DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3
 DIST claws-mail-3.17.5.tar.xz 6290944 BLAKE2B b060d4513ecd61ba8589d701970c733b683d93b03beb22e37669e9856797f6d0d404c09a49f0a1d9c8a576807806ec22959079c9ff79786d226ea6b6f3817904 SHA512 a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f
 EBUILD claws-mail-3.17.3-r1.ebuild 5892 BLAKE2B 6ace3c80c1465921a0718c2d9abec187608835249cab7fa2aed8e709a2e83d30fd933287aa8a0f515d4710933f58da41086668ba1054d19ff6cce9c55a945ff2 SHA512 fcc528b4380f9511841f9a024efdf1ce355095fca55cde70bcc3c477f5a9ff9c17a9d33c06e57ab3eeed11fe8d193438ec9146eddfd8034c4f74ced6c4de1afe
 EBUILD claws-mail-3.17.4.ebuild 6128 BLAKE2B a8bbe77f764e1a252c2eac623e6124e1e49e05eadc644aa30220bd6adde0516c7b04d7e95b5ab6ca4c39fcb0519de7223ab256540b4a93f3ae2f4d059070066d SHA512 c2890076a8062647e612f1c4a1b0147cacab9a4e9a5be0454c880339f3df421a5c47631cd33368689fa0bd874617d20b57e8e6771b9e196dc9cdc1ba00990e93
-EBUILD claws-mail-3.17.5-r1.ebuild 6065 BLAKE2B bf44fd0b6372435e284bd7a7c686b82a083a51b490eb2a82b45f7aad7a4c980c56b745621417c74c375cfd7340dac94b35cf7258f5c7d037ef0ed48931dbddaf SHA512 4c46ba0c5c6f9e833a9534c8ee063831456709d5da0fd91fad0a3b08ab58effa22a8e69c677c33df5c5f28344eddcd4c044eddee1fcc173d262b3ee772fb382c
+EBUILD claws-mail-3.17.5-r1.ebuild 6063 BLAKE2B 3c2c00f3ca52287c24d4a629573f6c1bb8d85090d4d3ba38f1975f3cd7492c071664d1b2a134bc20575e2d2a0b739931639f9e00fb26a136a5fd943899800d61 SHA512 35bf32085792bfc84ddd8edf3c88b98fda9ed92a32aa08c5d189c220cfe508de72d7b1772a22d7d280edb0d11ecd6a5e88e49dc1289f602e1c2011524471820a
 EBUILD claws-mail-3.17.5.ebuild 6000 BLAKE2B f07895af3680a0af89facce448983b921c9ead3641e074e65e2ce78194e810ecc6be15b5cc02733b678d851665394780cbc71ce88bdfe2b6a9b1a201ab9d5889 SHA512 d26f5f55937a03653a42db6fd0061de95e59e5c756c53a1ead108b7ac04eff7ed489e64fa9e67eccfbd68adbb88da7663dfd68c296d9670cd1e3477c2e4d55f6
 EBUILD claws-mail-9999.ebuild 6128 BLAKE2B d6b064906515c19db383615700b95c5f8d59deb4b42d25b972341fcdf56667d92557a74a5f117dbae503f8217f1cbc7053f01b8662d6a6cd79449e72eac5fac7 SHA512 8173a34a2c184f53c791239921ef22b2fed83dd97617e348359410854aab9e43bbb4152ed6ec4e1023b48788edc331e6435888967dbea97477aed8e50ed73038
 MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051
diff --git a/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild
index e00884c0c0fe..f7c9b9aac7bc 100644
--- a/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
 else
 	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 SLOT="0"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 693796e89907..2bf8e07d9e94 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,9 +1,10 @@
 AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
+AUX 3.34.4-CVE-2020-11879.patch 4256 BLAKE2B efe57b53f04908ed5ff83da42a759428b68cef0ceeeee158cdc9792e4af9f31654621742db3ae5a15f30ba68409cfbe775d09d7893cc9dbac0328b5c092f3695 SHA512 7484974c557eb084055b80f45f03d0d7f40084bdaf53cd90dd1f62efea250801eb99f6a35befd9e19c3c44e0b2d1ddc0db299d3063ca2045b7421bfcbba27c76
 DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
 DIST evolution-3.34.4.tar.xz 11964640 BLAKE2B 48b58208064633236be32f44ff49f8718e110d1ab1aa311b3652affb3b5793b9f6775519191a9480efef731c9f14ff269d65dacbd8d411b30be64daaf953c4b5 SHA512 54ff4b191237b291e3e008ca8691624ac0af35bae096c20615ac5a51be033c97ea28be6629362a3676bee9285afab666c4624cfcca536bf5255ecd38dcf3ac58
-EBUILD evolution-3.32.5-r1.ebuild 4547 BLAKE2B 23783f5d3f1036ba73e1b0143c83eb32bc92328148306892609adcc1057a5dbd04793c50a94180072ffe7685c84a3f65ea19debcd71046a012a3fde071589cce SHA512 1d5d94eb9b9dcddfa86527874de77e3f3e0477d20a6f0db85eca6e8369e44931fdf041fa57da437b69b1ed05a0fc503c460994b7937590f3075b6e5b8577d6ee
-EBUILD evolution-3.32.5-r2.ebuild 4644 BLAKE2B a3ec95f9139190dbf6320c9d8b4b90fd40104877df539925d109b9c04b6d096b8de4a5687a06107d350fd3ff25915e3856ec709ec5b275fbb26195c207245c5c SHA512 4d71cbdeb3dc03d908b2d24e7f62bf920cc1cb33ff60fe12c3107179304c3cacd1d79cf74ec9d0ea468246c518bb65957674a3fadebdc9dd113e161409f060e2
-EBUILD evolution-3.34.4.ebuild 4389 BLAKE2B 8976ff4f739d6cfdba5c49e863b2bc8fb82d2cb72c474cb90d816805353f83295a6dbb5514a5444f9623da0ef6f3e0aba0ffdab784cc5d4ff281bfa51291c679 SHA512 a59922c5ee99202f668b339db2f5e219504193e07b1a080324464c4d9f89ea3ce0aa8b07f6ce451f20d9a106a0b8a51a414757be747c4e4499c9df548ace484d
+EBUILD evolution-3.32.5-r2.ebuild 4636 BLAKE2B db044f7101258192838c9984bf714378ffac3040d4598141fa600fb08ea77e25a7dcfcee34d5826ff5c616e942501c4539e8a13bb73c642446fc67e0d9e7cd75 SHA512 48900d1036f9468db58c548dd17cf91f559f78d835f0fa529811a602821f70eb581ceb2e20cd9a01e15c1b3edfe83507e0e1bdeedf15cf8acd04072291154cda
+EBUILD evolution-3.34.4-r1.ebuild 4430 BLAKE2B 038126aa987508944b795cc8ac73f48f24c0006cba40d9522058ed621422a7ce1f1587067e86493aade42351400023e16070abe1028e10e9aa112aac8871b3f6 SHA512 d027de5fef0f850d815c6e09b6ace58675dae79af7cf2fcd6da23f460feef7df305d8ecbe1acf8f8e55a54cb9ca5d1ec3131ad9c49dcbea440625abc449a2ba8
+EBUILD evolution-3.34.4.ebuild 4383 BLAKE2B 404ba5b3ee03be264b22fe229a1b3942d73f8133bd8a8f4384038529fe22cad71ba92aa75d6e2b920bf1a7cefe7da518c6b4cb7ee5900d2793e8d1b241862eb6 SHA512 54e9f216e5cd2c22259dee1abeb37d7cd04a853dfea629b3c317b182fd4d805733a2e29411dae936db6ab1778ea9576bb47c90bdab19d9aa7e538c8bd0c60cae
 MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.32.5-r2.ebuild b/mail-client/evolution/evolution-3.32.5-r2.ebuild
index cfb14b38415c..4dc92b18e571 100644
--- a/mail-client/evolution/evolution-3.32.5-r2.ebuild
+++ b/mail-client/evolution/evolution-3.32.5-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/evolution-3.32.5-r1.ebuild b/mail-client/evolution/evolution-3.34.4-r1.ebuild
index b36e4e069f30..8428ec7d8069 100644
--- a/mail-client/evolution/evolution-3.32.5-r1.ebuild
+++ b/mail-client/evolution/evolution-3.34.4-r1.ebuild
@@ -14,27 +14,26 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
 # dconf explicitely needed for backup plugin
 # gnome-desktop support is optional with --enable-gnome-desktop
 # automagic libunity dep
+# >=webkit-gtk-2.26.4-r1 and >=gspell-1.8 to ensure all use enchant:2
+# TODO: Adjust webkit-gtk dep to actually be that once it's keyworded for needed arches
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.6.0:0
+	>=app-text/enchant-2.2.0:2
 	>=dev-libs/glib-2.46:2[dbus]
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	<gnome-extra/evolution-data-server-3.33
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/libsoup-2.42:2.4
 	>=net-libs/webkit-gtk-2.16.0:4
-	!=net-libs/webkit-gtk-2.26.3-r1:4
-	<net-libs/webkit-gtk-2.26.4-r1:4
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gdk-pixbuf-2.24:2
 	>=x11-libs/gtk+-3.22:3
@@ -44,11 +43,11 @@ COMMON_DEPEND="
 	>=app-text/iso-codes-0.49
 	dev-libs/atk
 	gnome-base/dconf
-	>=dev-libs/libical-3.0.2:=
 	x11-libs/libSM
 	x11-libs/libICE
 
 	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
 	geolocation? (
 		>=media-libs/libchamplain-0.12:0.12[gtk]
 		>=media-libs/clutter-1.0.0:1.0
@@ -56,7 +55,8 @@ COMMON_DEPEND="
 		>=sci-geosciences/geocode-glib-3.10.0
 		x11-libs/mx:1.0 )
 	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( <app-text/gtkspell-3.0.10:3 )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
 		>=dev-libs/nss-3.11:= )
@@ -75,9 +75,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
 	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
 	!gnome-extra/evolution-exchange
 "
 
@@ -97,9 +95,8 @@ file from /usr/share/applications if you use a different browser)."
 # call; if needed, set them after cmake-utils_src_prepare call, if that works
 
 src_prepare() {
-	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
-	eapply "${FILESDIR}"/${PV}-webkitgtk-2.26-compat.patch # Don't use with 3.34, it should be compatible without this hack.
 	cmake-utils_src_prepare
+	eapply "${FILESDIR}"/${PV}-CVE-2020-11879.patch
 	gnome2_src_prepare
 }
 
@@ -112,14 +109,14 @@ src_configure() {
 		-DWITH_OPENLDAP=$(usex ldap)
 		-DENABLE_SMIME=$(usex ssl)
 		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=1
+		-DWITH_ENCHANT_VERSION=2
 		-DENABLE_CANBERRA=ON
 		-DENABLE_AUTOAR=$(usex archive)
 		-DWITH_HELP=ON
 		-DENABLE_YTNEF=OFF
 		-DWITH_BOGOFILTER=$(usex bogofilter)
 		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GTKSPELL=$(usex spell)
+		-DENABLE_GSPELL=$(usex spell)
 		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
 		-DENABLE_WEATHER=$(usex weather)
 		-DENABLE_CONTACT_MAPS=$(usex geolocation)
diff --git a/mail-client/evolution/evolution-3.34.4.ebuild b/mail-client/evolution/evolution-3.34.4.ebuild
index 32bffc06770b..15ea8d66bcea 100644
--- a/mail-client/evolution/evolution-3.34.4.ebuild
+++ b/mail-client/evolution/evolution-3.34.4.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/files/3.34.4-CVE-2020-11879.patch b/mail-client/evolution/files/3.34.4-CVE-2020-11879.patch
new file mode 100644
index 000000000000..8415f3a2617d
--- /dev/null
+++ b/mail-client/evolution/files/3.34.4-CVE-2020-11879.patch
@@ -0,0 +1,122 @@
+From 6489f20d6905cc797e2b2581c415e558c457caa7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 12 Feb 2020 18:59:52 +0100
+Subject: [PATCH] I#784 - Warn about and limit what can be attached using
+ mailto: URI
+
+Closes https://gitlab.gnome.org/GNOME/evolution/issues/784
+---
+ src/composer/e-msg-composer.c | 58 +++++++++++++++++++++++++++++------
+ src/e-util/e-system.error.xml |  7 ++++-
+ 2 files changed, 54 insertions(+), 11 deletions(-)
+
+diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c
+index e4c9ac095e..cd3168d882 100644
+--- a/src/composer/e-msg-composer.c
++++ b/src/composer/e-msg-composer.c
+@@ -4761,7 +4761,8 @@ handle_mailto (EMsgComposer *composer,
+ 	gchar *header, *content, *buf;
+ 	gsize nread, nwritten;
+ 	const gchar *p;
+-	gint len, clen;
++	gint len, clen, has_attachments = 0;
++	gboolean has_blacklisted_attachment = FALSE;
+ 
+ 	table = e_msg_composer_get_header_table (composer);
+ 	view = e_msg_composer_get_attachment_view (composer);
+@@ -4844,22 +4845,36 @@ handle_mailto (EMsgComposer *composer,
+ 			} else if (!g_ascii_strcasecmp (header, "attach") ||
+ 				   !g_ascii_strcasecmp (header, "attachment")) {
+ 				EAttachment *attachment;
++				GFile *file;
+ 
+ 				camel_url_decode (content);
+-				if (file_is_blacklisted (content))
+-					e_alert_submit (
+-						E_ALERT_SINK (e_msg_composer_get_editor (composer)),
+-						"mail:blacklisted-file",
+-						content, NULL);
+ 				if (g_ascii_strncasecmp (content, "file:", 5) == 0)
+ 					attachment = e_attachment_new_for_uri (content);
+ 				else
+ 					attachment = e_attachment_new_for_path (content);
+-				e_attachment_store_add_attachment (store, attachment);
+-				e_attachment_load_async (
+-					attachment, (GAsyncReadyCallback)
+-					e_attachment_load_handle_error, composer);
++				file = e_attachment_ref_file (attachment);
++				if (!file || !g_file_peek_path (file) ||
++				    !g_file_test (g_file_peek_path (file), G_FILE_TEST_EXISTS) ||
++				    g_file_test (g_file_peek_path (file), G_FILE_TEST_IS_DIR)) {
++					/* Do nothing, simply ignore the attachment request */
++				} else {
++					has_attachments++;
++
++					if (file_is_blacklisted (content)) {
++						has_blacklisted_attachment = TRUE;
++						e_alert_submit (
++							E_ALERT_SINK (e_msg_composer_get_editor (composer)),
++							"mail:blacklisted-file",
++							content, NULL);
++					}
++
++					e_attachment_store_add_attachment (store, attachment);
++					e_attachment_load_async (
++						attachment, (GAsyncReadyCallback)
++						e_attachment_load_handle_error, composer);
++				}
+ 				g_object_unref (attachment);
++				g_clear_object (&file);
+ 			} else if (!g_ascii_strcasecmp (header, "from")) {
+ 				/* Ignore */
+ 			} else if (!g_ascii_strcasecmp (header, "reply-to")) {
+@@ -4883,6 +4898,29 @@ handle_mailto (EMsgComposer *composer,
+ 
+ 	g_free (buf);
+ 
++	if (has_attachments && !has_blacklisted_attachment) {
++		const gchar *primary;
++		gchar *secondary;
++
++		primary = g_dngettext (GETTEXT_PACKAGE,
++			"Review attachment before sending.",
++			"Review attachments before sending.",
++			has_attachments);
++
++		secondary = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE,
++			"There had been added %d attachment. Make sure it does not contain any sensitive information before sending the message.",
++			"There had been added %d attachments. Make sure they do not contain any sensitive information before sending the message.",
++			has_attachments),
++			has_attachments);
++
++		e_alert_submit (
++			E_ALERT_SINK (e_msg_composer_get_editor (composer)),
++			"system:generic-warning",
++			primary, secondary, NULL);
++
++		g_free (secondary);
++	}
++
+ 	merge_always_cc_and_bcc (table, to, &cc, &bcc);
+ 
+ 	tov = destination_list_to_vector (to);
+diff --git a/src/e-util/e-system.error.xml b/src/e-util/e-system.error.xml
+index ddcf989fda..02facb7d26 100644
+--- a/src/e-util/e-system.error.xml
++++ b/src/e-util/e-system.error.xml
+@@ -1,6 +1,11 @@
+ <?xml version="1.0"?>
+ <error-list domain="system">
+-  <error type="error" id="generic-error">
++  <error id="generic-error" type="error">
++    <primary>{0}</primary>
++    <secondary>{1}</secondary>
++  </error>
++
++  <error id="generic-warning" type="warning">
+     <primary>{0}</primary>
+     <secondary>{1}</secondary>
+   </error>
+-- 
+2.24.1
+
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index 295d557900d8..5f1597a42ce2 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,5 +1,9 @@
 AUX mailx-8.1.2.20050715-offsetof.patch 1566 BLAKE2B 0878d9f3b639e292e1cfc69676c3e8b3ef68627764828f89fb252c72ac8133162fc4bda234ed1a82487a39306efbead9406b2dc750548deea3fb4c767ddc26c1 SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea
+AUX mailx-8.1.2.20180807-fno-common.patch 7481 BLAKE2B e847c7865c2346bfaeae2a32539aae3e5a73452073253af52615f3791285e822bbb96174dfabc97daec576a36d7d9ec7a2e9fc94b7372aea8efa08c363095f5f SHA512 37a5ed4b1b31eecd05d8a05b59aec9f8cba78cda838bd2ce06ed3f6c7a4f1e586223207e9ebdbd2cf952bab1dcbf06466aa61c61bcf0527fd57bc0b018acfe85
 DIST bsd-mailx_8.1.2-0.20160123cvs-4.debian.tar.xz 45768 BLAKE2B 7e5ae62dee742502ea86c55803615f67b2be082b0fe3e6dbf5f64ca7b63fa79014195f4c2262ffaba23624677227df4a94d3966611e9de4bf491f52e050c88b9 SHA512 79d822b4e0e9796970e96f656814cf835fe522d2e33b79484257af50e631a264f6fae99e225d96fa37f50d7ce9f3b9e9577ddb361a27c6e59af8db4736250c19
 DIST bsd-mailx_8.1.2-0.20160123cvs.orig.tar.bz2 76715 BLAKE2B c6491cd88e99b62184da60cc6f8a42aac5f7f5a828c80c05d3dc4493c77727e553b916cb646dade38214d3a6738c084559764abb812a1dfe1fcce2e4d6a04960 SHA512 b66dd0fc5a150c0e1068b9aedda8425c73be7ac7e22d91f2c52de3f2d416016886f46dd54ec5024c0cd4c7e736aee7bdb68d9117f9b2b455fc42d05e1a677373
+DIST bsd-mailx_8.1.2-0.20180807cvs-1.debian.tar.xz 47916 BLAKE2B 6776dc1705383438e4249269f38a0db963731580ce4df3a2f6fddb112495db3225608b97718cd3916e7bb40b71d0338e6d262416a42b60ba19a6f4a8e1c8627e SHA512 3c99c5be121ecb37f2495b885e2a00290173b16578da100bb7955f86c7e76b8a8cd6bf8f936c1f00b906611e8649c0a6a25089b647d7f5ebcea8c8df3f334e28
+DIST bsd-mailx_8.1.2-0.20180807cvs.orig.tar.xz 79684 BLAKE2B 2846cd752472a193f89f7672d6a61de9759beea5530484c75ae4703335afc22a833226a87141853e4fbb2c951f9818ff35c8b79349b8a7a9a77f7788c6569bab SHA512 7a33d35934b0a98660732259d3132235ed14cd6843e79edd5683b668c3a550b45f0664021af35c219043640c20ce5aa34eaaf6dc275dc7e83aaed44853d008c9
 EBUILD mailx-8.1.2.20160123.ebuild 1252 BLAKE2B c0dbe3c57cbe7c344f7516b84f9195534456269078403ffa7d7394b817bf0011f312ff4c198244f43af815d81a8486287358b430f606759442d6b3e9903e56f8 SHA512 00e923afa6639b52ba0e46c35a2e41d58f176718f7bd4bd0e24248758ebd8f85f42f8c8a7e5fe9b5ca75ddd162c86ac183d6a5882d1625203fde91150149719a
+EBUILD mailx-8.1.2.20180807.ebuild 1303 BLAKE2B eb3d131506919d528b6afc41f2aba8ac666ebac1feb7afa7b570605787937f99277c554453b043b336b20c77388b3a56ef21e680c54b65f3c23fa2b1993c45df SHA512 6bac51e74ee5bac15ad4e71f07a450056af0abef5e0b7474e6c0d7ccab6f219b29bcae92db0386ce8bcb7f278ac04e58db783439df2679d57dd5dd36bdb0b296
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch b/mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch
new file mode 100644
index 000000000000..cfde60d1d576
--- /dev/null
+++ b/mail-client/mailx/files/mailx-8.1.2.20180807-fno-common.patch
@@ -0,0 +1,156 @@
+--- a/glob.h
++++ b/glob.h
+@@ -37,48 +37,48 @@
+  * A bunch of global variable declarations lie herein.
+  * def.h must be included first.
+  */
+-int	msgCount;			/* Count of messages read in */
+-int	rcvmode;			/* True if receiving mail */
+-int	sawcom;				/* Set after first command */
+-int	senderr;			/* An error while checking */
+-int	edit;				/* Indicates editing a file */
+-int	readonly;			/* Will be unable to rewrite file */
+-int	noreset;			/* String resets suspended */
+-int	sourcing;			/* Currently reading variant file */
+-int	loading;			/* Loading user definitions */
+-int	cond;				/* Current state of conditional exc. */
+-FILE	*itf;				/* Input temp file buffer */
+-FILE	*otf;				/* Output temp file buffer */
+-int	image;				/* File descriptor for image of msg */
+-FILE	*input;				/* Current command input file */
+-char	mailname[PATHSIZE];		/* Name of current file */
+-char	prevfile[PATHSIZE];		/* Name of previous file */
+-char	*homedir;			/* Path name of home directory */
+-char	*myname;			/* My login name */
+-off_t	mailsize;			/* Size of system mailbox */
+-int	lexnumber;			/* Number of TNUMBER from scan() */
+-char	lexstring[STRINGLEN];		/* String from TSTRING, scan() */
+-int	regretp;			/* Pointer to TOS of regret tokens */
+-int	regretstack[REGDEP];		/* Stack of regretted tokens */
+-char	*string_stack[REGDEP];		/* Stack of regretted strings */
+-int	numberstack[REGDEP];		/* Stack of regretted numbers */
+-struct	message	*dot;			/* Pointer to current message */
+-struct	message	*message;		/* The actual message structure */
+-struct	var	*variables[HSHSIZE];	/* Pointer to active var list */
+-struct	grouphead	*groups[HSHSIZE];/* Pointer to active groups */
+-struct	ignoretab	ignore[2];	/* ignored and retained fields
+-					   0 is ignore, 1 is retain */
+-struct	ignoretab	saveignore[2];	/* ignored and retained fields
+-					   on save to folder */
+-struct	ignoretab	ignoreall[2];	/* special, ignore all headers */
+-char	**altnames;			/* List of alternate names for user */
+-int	debug;				/* Debug flag set */
+-int	screenwidth;			/* Screen width, or best guess */
+-int	screenheight;			/* Screen height, or best guess,
+-					   for "header" command */
+-int	realscreenheight;		/* the real screen height */
+-int	uflag;				/* Are we in -u mode? */
+-sigset_t intset;			/* Signal set that is just SIGINT */
++extern int	msgCount;			/* Count of messages read in */
++extern int	rcvmode;			/* True if receiving mail */
++extern int	sawcom;				/* Set after first command */
++extern int	senderr;			/* An error while checking */
++extern int	edit;				/* Indicates editing a file */
++extern int	readonly;			/* Will be unable to rewrite file */
++extern int	noreset;			/* String resets suspended */
++extern int	sourcing;			/* Currently reading variant file */
++extern int	loading;			/* Loading user definitions */
++extern int	cond;				/* Current state of conditional exc. */
++extern FILE	*itf;				/* Input temp file buffer */
++extern FILE	*otf;				/* Output temp file buffer */
++extern int	image;				/* File descriptor for image of msg */
++extern FILE	*input;				/* Current command input file */
++extern char	mailname[PATHSIZE];		/* Name of current file */
++extern char	prevfile[PATHSIZE];		/* Name of previous file */
++extern char	*homedir;			/* Path name of home directory */
++extern char	*myname;			/* My login name */
++extern off_t	mailsize;			/* Size of system mailbox */
++extern int	lexnumber;			/* Number of TNUMBER from scan() */
++extern char	lexstring[STRINGLEN];		/* String from TSTRING, scan() */
++extern int	regretp;			/* Pointer to TOS of regret tokens */
++extern int	regretstack[REGDEP];		/* Stack of regretted tokens */
++extern char	*string_stack[REGDEP];		/* Stack of regretted strings */
++extern int	numberstack[REGDEP];		/* Stack of regretted numbers */
++extern struct	message	*dot;			/* Pointer to current message */
++extern struct	message	*message;		/* The actual message structure */
++extern struct	var	*variables[HSHSIZE];	/* Pointer to active var list */
++extern struct	grouphead	*groups[HSHSIZE];/* Pointer to active groups */
++extern struct	ignoretab	ignore[2];	/* ignored and retained fields
++					   0 is ignore, 1 is retain */
++extern struct	ignoretab	saveignore[2];	/* ignored and retained fields
++					   on save to folder */
++extern struct	ignoretab	ignoreall[2];	/* special, ignore all headers */
++extern char	**altnames;			/* List of alternate names for user */
++extern int	debug;				/* Debug flag set */
++extern int	screenwidth;			/* Screen width, or best guess */
++extern int	screenheight;			/* Screen height, or best guess,
++					   for "header" command */
++extern int	realscreenheight;		/* the real screen height */
++extern int	uflag;				/* Are we in -u mode? */
++extern sigset_t intset;			/* Signal set that is just SIGINT */
+ 
+ /*
+  * The pointers for the string allocation routines,
+@@ -87,7 +87,7 @@
+  * twice as much, and so on.
+  */
+ #define	NSPACE	25			/* Total number of string spaces */
+-struct strings {
++extern struct strings {
+ 	char	*s_topFree;		/* Beginning of this area */
+ 	char	*s_nextFree;		/* Next alloctable place here */
+ 	unsigned s_nleft;		/* Number of bytes left here */
+--- a/main.c
++++ b/main.c
+@@ -36,6 +36,51 @@
+ #include "extern.h"
+ #include <locale.h>
+ 
++int	msgCount;			/* Count of messages read in */
++int	rcvmode;			/* True if receiving mail */
++int	sawcom;				/* Set after first command */
++int	senderr;			/* An error while checking */
++int	edit;				/* Indicates editing a file */
++int	readonly;			/* Will be unable to rewrite file */
++int	noreset;			/* String resets suspended */
++int	sourcing;			/* Currently reading variant file */
++int	loading;			/* Loading user definitions */
++int	cond;				/* Current state of conditional exc. */
++FILE	*itf;				/* Input temp file buffer */
++FILE	*otf;				/* Output temp file buffer */
++int	image;				/* File descriptor for image of msg */
++FILE	*input;				/* Current command input file */
++char	mailname[PATHSIZE];		/* Name of current file */
++char	prevfile[PATHSIZE];		/* Name of previous file */
++char	*homedir;			/* Path name of home directory */
++char	*myname;			/* My login name */
++off_t	mailsize;			/* Size of system mailbox */
++int	lexnumber;			/* Number of TNUMBER from scan() */
++char	lexstring[STRINGLEN];		/* String from TSTRING, scan() */
++int	regretp;			/* Pointer to TOS of regret tokens */
++int	regretstack[REGDEP];		/* Stack of regretted tokens */
++char	*string_stack[REGDEP];		/* Stack of regretted strings */
++int	numberstack[REGDEP];		/* Stack of regretted numbers */
++struct	message	*dot;			/* Pointer to current message */
++struct	message	*message;		/* The actual message structure */
++struct	var	*variables[HSHSIZE];	/* Pointer to active var list */
++struct	grouphead	*groups[HSHSIZE];/* Pointer to active groups */
++struct	ignoretab	ignore[2];	/* ignored and retained fields
++					   0 is ignore, 1 is retain */
++struct	ignoretab	saveignore[2];	/* ignored and retained fields
++					   on save to folder */
++struct	ignoretab	ignoreall[2];	/* special, ignore all headers */
++char	**altnames;			/* List of alternate names for user */
++int	debug;				/* Debug flag set */
++int	screenwidth;			/* Screen width, or best guess */
++int	screenheight;			/* Screen height, or best guess,
++					   for "header" command */
++int	realscreenheight;		/* the real screen height */
++int	uflag;				/* Are we in -u mode? */
++sigset_t intset;			/* Signal set that is just SIGINT */
++
++struct strings stringdope[NSPACE];
++
+ static void	usage(void);
+ 	int	main(int, char **);
+ 
diff --git a/mail-client/mailx/mailx-8.1.2.20180807.ebuild b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
new file mode 100644
index 000000000000..48401bc46945
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20180807.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DP="bsd-${PN}_${PV%.*}-0.${PV##*.}cvs"
+DPT="${DP}.orig.tar.xz"
+DPP="${DP}-1.debian.tar.xz"
+
+DESCRIPTION="The $ mail program, which is used to send mail via shell scripts"
+HOMEPAGE="https://www.debian.org/"
+SRC_URI="http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPT}
+	http://http.debian.net/debian/pool/main/b/bsd-${PN}/${DPP}"
+
+S="${WORKDIR}/${DP/_/-}.orig"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND=">=net-libs/liblockfile-1.03
+	dev-libs/libbsd
+	virtual/mta
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
+
+src_prepare() {
+	eapply "${WORKDIR}/debian/patches"
+	eapply "${FILESDIR}/${PN}-8.1.2.20050715-offsetof.patch"
+	eapply "${FILESDIR}/${PN}-8.1.2.20180807-fno-common.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin mail
+
+	doman mail.1
+
+	dosym mail /usr/bin/Mail
+	dosym mail /usr/bin/mailx
+	dosym mail.1 /usr/share/man/man1/Mail.1
+
+	insinto /usr/share/mailx/
+	doins misc/mail.help misc/mail.tildehelp
+	insinto /etc
+	doins misc/mail.rc
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index ac9ae1233c0b..a4b45fd3b96a 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -5,6 +5,7 @@ DIST neomutt-20191129.tar.gz 3227652 BLAKE2B 50c598d83a53048cec14787b7b05a7e9e3d
 DIST neomutt-20191207.tar.gz 3229018 BLAKE2B 44c3674d28abeef26614b1b05978417ffb2e4e1e88c7bd5902f0af87b5d06e9b9145a2d589258ccfec8de5e15f7b904ef309627a105c476a88328d698c16cbe9 SHA512 77faa95e6f6065a62c69814cae2c0dbc56083ec1d99524bedcec6672816223f2b6bd7e4478f916cf00e774a504fd73288857a9e79606ccf1a99601f29734c5f1
 DIST neomutt-20200313.tar.gz 3295200 BLAKE2B 78d0f3a01f44c1bae8d3a99b86e799216e545674c5966364c347f8fc9ff0ef0b085ce44d0ade72e885b55ff47220d3931e22fe0b04a9cfbac639159a55377aa0 SHA512 989bff6e0748e76664ee0df8fa49f71d5c2ce7c9493441d9c080b34a5ddaef2870ec6aa665f8c2dbb290f16a578328efe92722f50389911cd9393181106a3116
 DIST neomutt-20200320.tar.gz 3304719 BLAKE2B 5301a48f08857e390b204a62588895bb00623b4f82b58fb6a056b3f4e1ebe1476caf5b63c48ef175094245b69f2feac9fcf5b1d9c448a4875667a29037e46bba SHA512 6f47b29e2c941c3f47e3916f2fdb5e9a7cdac0221c88f9e5df1914cf6d28f7ae0ec63e0a20b271300771e073908714d2ab4c14646b617c26d48f91071ed344b2
+DIST neomutt-20200417.tar.gz 3322435 BLAKE2B c0f4dc53d1f6c922c9d0bd77d5caf94d9b67db26ab88c9cb6409dc5e483b7d239bb1b66a473a95348a9bcef406ce7e47ffb9d7ea76098b06fb14f27b7cf941c5 SHA512 d23c2d72b6c783246e799fb14f9d2c6484580123766a33784fee065bdb23066a1178fd1ab0e1cc8d7f90d39a2a04950dcc70ed1a1d405676472fdc6e819dac17
 EBUILD neomutt-20180716.ebuild 3278 BLAKE2B 02747c8e7443aa7a57c4a9d24f71698f897a1f720cd95e3386544e0b9cbb96e3527f4d4cc96a9a23bcb6e74cfc9a7b04123ed5c9e0888a85231dc3ce633cd18c SHA512 4f8d617c55d0af52170ca62b97c1910c5d536e6284d4457fdfddc403b830d8bd980715e63b4af1fa35a00a8e120813c8b989562ef8d5047d8ea28325d40a5f7c
 EBUILD neomutt-20191102.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
 EBUILD neomutt-20191111.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
@@ -12,5 +13,6 @@ EBUILD neomutt-20191129.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703
 EBUILD neomutt-20191207.ebuild 3288 BLAKE2B 1c9ce15dbb02312f19bc18fc7e88d1901703fc5379329a8c8aff74cbdf3be07f8557d6d66e5abb9a2a70e1de05cf7b1a1aba317f0b64d357955b69e3d75ec08c SHA512 9e6e628095b69caf3a326a57482324c88d2430d4cd15e0e0e3c8cc2c779b2ea7e6ece1f8e563c3a1d5125099fc14ef8193515a4764b312e084f85ef53d99bdd2
 EBUILD neomutt-20200313.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-20200320.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
+EBUILD neomutt-20200417.ebuild 3288 BLAKE2B c26fc42209d85f0344e742949375e3f587a9fba5df3f7b2b7e4dcfc0128752e98f58477900248beb3c57f07a0c7ae86ba235c884be410a3481277c66f5a9ed0d SHA512 82b8953bc95bb28576fe60fba5b070ef343ceb773dc85209230f9569e4ed9bef30214c0b498176fa09835406b19f40cc91656e9f5c3b0459f1ddf3d07e60a951
 EBUILD neomutt-99999999.ebuild 3315 BLAKE2B bdf80e05854de6e592eda4e51eb9874d90a5d0d8e33ceff4480d0335822ddbfd5e850bf9ab2050932b2cb4b2a29d326d564f6f507fd5e6a8b021f6049b87bdd5 SHA512 530d4387fe1d89cf6681b9040548d9213afbc44a89e1e0bb97da21a3702f89df11bd5f2c4e2b6321a99f34210df48e2874a6dda1c29e43f6110f46bf0c6b528d
 MISC metadata.xml 1402 BLAKE2B 03ec31bb9fed5d920a22ed5bf855130e7bd538f8eac24aecdcc5cdfd4980a3328f150dd6e957acec286c96f86fca6a8d69a933e496c7fe7c9fc4d0ce5653bcc9 SHA512 cf8dd5e2317a64c7f8c69c2e39436099917e0f6edc0cb6708d9c6c2f46d50c5d897a09d08a4afff81dc3d3beb3886be45c92d7882f2b1a6de3c947f0cd0314a0
diff --git a/mail-client/neomutt/neomutt-20200417.ebuild b/mail-client/neomutt/neomutt-20200417.ebuild
new file mode 100644
index 000000000000..d195e95a243e
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200417.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17 )
+	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0 )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+		libressl? ( dev-libs/libressl )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl
+	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 )
+"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one – here neomuttrc.5
+	# (neomutt.1 already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > doc/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
+		emake -f doc/Makefile.fakedoc doc/neomutt.1
+		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
+		doman doc/neomutt.1 doc/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+}
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 1355c89989b0..06c842f1252b 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -7,10 +7,12 @@ DIST roundcubemail-1.3.9-complete.tar.gz 5521697 BLAKE2B 4689bb43ff02b99a9b2b06d
 DIST roundcubemail-1.4.0-complete.tar.gz 6997256 BLAKE2B b19a2d049512ceb53b3844f4680ed061044d2d142bef322c067b381e3be57ecb3181cac4f2492a162da1417fefb4028c36d34dae4bf9064c97568f681bd0c78b SHA512 274372793f1f3af761702f8972f6360f8c8e64a705ff96f1432f6a520d24c9ca0e8ccc3933f26433f1c864bd6c381066fc9eb48bf97e9497b4cbff855412d811
 DIST roundcubemail-1.4.1-complete.tar.gz 6998687 BLAKE2B ff33e512bb202d37d77ae2a4c7820f1061598bee1eb01bed5f15b25ad0e27c0cfe3611b44d451982491b702abcf6d7ae1bc88cbd303bc9a2573fc79efc54bec5 SHA512 0c8e09e93c86aad0f3e3a5a81c5e9ad8ab8aee101ae8ebb78d29556575db94a51a07cbf955ec79235425a961427b826ad27fae750b8eae785eedd195161dabed
 DIST roundcubemail-1.4.2-complete.tar.gz 7006013 BLAKE2B f92b94de3ce58cd145ce3d30875902d44410cb039176be5c2d09a23741b08405b21107b03a0ae302cfdf5a845a49cf044f13a09b582f291639648aac3b2f4c81 SHA512 3f705bc38b44a0b7ea3241b0222f607b040ec01c8ea400b6b6222fbe346570c5f3450e5a188bab99ea171481453eb3f5b1e7457070ace1144558ec662a4273bb
+DIST roundcubemail-1.4.3-complete.tar.gz 7028284 BLAKE2B c53efbee437960339c6e80a1fd2affff8ae8dfebd886cf029fc081d16c7874f0b6ea7fa03edb54276384dbf9d3948d84a6869f97cf3ce6bf27c52d50ba76ca56 SHA512 c65359473d08a46dbd42894c2758a46209491fc421ee58ab5b1c0d0d56e3fec8b2f43d01b18cb8934589cbee7e7abfda2c8efbf02b3521790d7b45ed6dc88a1e
 EBUILD roundcube-1.3.10.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.3.8.ebuild 2426 BLAKE2B 3028d0e6f300d6eaa7d1cda1ec854b2a3f1149dc5a56e29a89a4de71e3e4b1f2f8d927f5f89cc202e78dfa34d603f58430aee493c03c11cfb9edd7636503b298 SHA512 60d2e8bbf22312f9f81a6ade6628e7ed67ca771ba914e8045cabd2786941c13fb0b363575d6b2edfb9f847e92f255b0441535d12655f08588fd479611e2eca9a
 EBUILD roundcube-1.3.9.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.4.0.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
 EBUILD roundcube-1.4.1.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
 EBUILD roundcube-1.4.2.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
+EBUILD roundcube-1.4.3.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.4.3.ebuild b/mail-client/roundcube/roundcube-1.4.3.ebuild
new file mode 100644
index 000000000000..6d3b3ede4e45
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.4.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index fd29b6f06321..d55b6b627e5b 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -114,59 +114,6 @@ DIST thunderbird-60.9.1-uk.xpi 684182 BLAKE2B b964c0c4b82362d5c82a7f39a5a7319a5c
 DIST thunderbird-60.9.1-vi.xpi 637210 BLAKE2B 5677487708a657b1dc0584ab3975a45407fc1a22474be0ab0af534643bf5dadbdb2b5511b5aeacd46f9f9a3524fa1dcc70065c97f80f7d352998b31ee0c0a27d SHA512 199d05c6c44fd64efd94e5faa5a8d74732da4ee1cdf1975a7e11143589e7660ec602a4acd71ead3027ee27e23639f0268fcd525e3ffb0dd10840d3b321dc3d77
 DIST thunderbird-60.9.1-zh-CN.xpi 626310 BLAKE2B d480da15430837a5f3093d9269f8f9d058a897ded8066d0d2fe3e308e208f30bc2a57b73a4c3ff80988b5053833020f936532a8a15974a5a3e9969b6ecdb82ef SHA512 af1f65d0dec16812209ac72b1a5561118d2e2a80fa286df2ec545db9794181db75a0d56e39843bc2d7429d2a5d609ec30611a92589e89e8b7ae7bc8dceb5bcc4
 DIST thunderbird-60.9.1-zh-TW.xpi 626218 BLAKE2B fc7830951630ee6339bc13aad7dab0d5a1a211f39c0916c7bc9aacfe186b857997f882f0bf0a48d6f9574e4ef98a8d40a12279231258bcffa9a8d4f4e206c143 SHA512 a033b5551546aaa10a3cb92b8f0505a4cd7df7bddaeed36328548cf86d4271594be74838a91b4ce3ade5202ffcb5832e1164bcc89d1d5d192cdae357d379f1cf
-DIST thunderbird-68.6.0-ar.xpi 617167 BLAKE2B eb36b9f8188aef46b188e2fd4c7f13a83b1ebda6dec6d53e4641d899f231c6fece97ae377d746581e1c2106bfa6b0263a221756c39df4fe35945c46bf81fc6e1 SHA512 abc0811dd99aea220ba4d2fe2feb4a5ff20a237289a861cf612f7c71379a24dd156cf20da1f717c466482204cd5c890cb7fd1fe741d4be403cbd1bc8ba380df6
-DIST thunderbird-68.6.0-ast.xpi 551298 BLAKE2B 662dc56ae91fa87b2690613357487524d41683f99cbcfeaf412eb22de78e6ed071cb33ec69dd101f74c889332571ab60a8c282b3e55a181cce01a9a0b85ab468 SHA512 ca6a2378eeb938bbb9527d45f02dc52eaff8a0527d5b7b687af95264ff85a0bf48630e8a8bb60a43d9b673702454d00cbeba2d1a86e50802e10306b66065903c
-DIST thunderbird-68.6.0-be.xpi 646281 BLAKE2B 7d028c3211b5441dac86e9dde34cc2d8c96940c1bc7aca7a5fbab7c5b3b65d1a39a3db1a9e18d9741d767cd19563f411e996b79d54794696f91e4314391dd154 SHA512 6bb519a0804383f9872bc5fd8cc6489201fe68c29ea8a2480af40d5dcb476c6ba3c83ba8671dce0782715d364776c048e662121a60caec11e5a055ce5ac5d12b
-DIST thunderbird-68.6.0-bg.xpi 646227 BLAKE2B 38f5699ec54027abe74a1e72a51ce3db8abc11027263b7bd936d0ce33835843cad4f95720012e368420096b3be30e0a5b732655640b8edef5959551ca8a34dd4 SHA512 fc2e89bc91f893192a6a31e09f34df2a95b3d20c05ca9f32f798921405a6eba57f4e938ddebfb46b80cb8a3bddfb4c207a6a92aad84b2fb99f5e2970c16fe9fe
-DIST thunderbird-68.6.0-br.xpi 574851 BLAKE2B 7e7eae4704f30aad650e986ca04f260bb9c731ea27dd40a12d81054a654af62064a82024cdf3f760c71f90d2e75af9372d041b8da3375673664c9ca3176df4f4 SHA512 6586cda1498892dd1ed42090705906eabf9e143db55fcbc67424f05d5a8986103751c6c7be79fdce4a2f441addc8577729fa6c62a14edc47974cc3d21a26d158
-DIST thunderbird-68.6.0-ca.xpi 578439 BLAKE2B b181630e11241a445bdcf4a5de201f00dcdb01e0437e447479a0447c5498bb23f82fe6989fa6555db064e44540841be9316cdc182071a1582e5a9508396d51c1 SHA512 fe63575feb74f92d9e628dee99c8ce204276d5641b866633a973ce802de31b976ae4fe3ffb232c14a0dc2b020482db8ebc39c0aeaa3e7af2bf878873a23ee04d
-DIST thunderbird-68.6.0-cs.xpi 603041 BLAKE2B 1fc68a87144c5c670ab56f097777b9b57030e3d879c7a59c09b1732a4e088ebd08fcb5a92d65bc545bb572c6d2482681c9c625b73134c3b0f3799c175e37d0ba SHA512 42aca6079cbed98985fce3af577853f078752c54aefa69148521c1bf36eac9a6fff8765ebee1678b210d21cd403d8e572d522135654587225806c7bcd87d0f79
-DIST thunderbird-68.6.0-cy.xpi 589902 BLAKE2B 3429f7e7f3684686b5fdb55f6316113cc0d49e73ed3664ea90e47de6de9c273772335756ab973d37e446a8cdb8d34458ab898c88cbb5c3a84698ec08c889db50 SHA512 dc7b08685fd5fa0f1900cbb8a97909a5d7fbeb3eb01cc529239aac829610e605e8b1b36b25e3850ff42b127a7e74eb730550fd45d3558d1133bf3f890db39671
-DIST thunderbird-68.6.0-da.xpi 588349 BLAKE2B 63f12bc02a746101d4db06b1c1c3da4cf7bbd0583fe95ba08cff6eb904deb8bf575220d701dc0f1699540bf858ccb75175241ec0350e0c6cb3b8f51806ecd5ef SHA512 757711a15b0c4e961eae7671819d3c10d94fb6af93a3dc2be79001699c134b2dd85d80ccc179bbb18a11b331a122dff6cc06354c8c7d781c55b36fa959de00de
-DIST thunderbird-68.6.0-de.xpi 597804 BLAKE2B f118da2b889d3f0f4d14a8e10262186261f940d42029736f014d87e906d2e5ddbf84c08f1f51fe05bcaa23b75a956004d84acdb08e7f0ed4e36ae47e798a780a SHA512 f8100c657f5f4f80447e1291be579debcb41983c9eb05f0b3bed2838fbe72f5cd26ea0e23adc87697b1667686f0fe395bc88c313c62ea3270d11494ee6519e85
-DIST thunderbird-68.6.0-el.xpi 699222 BLAKE2B 3355e672aceb9944745653fb17af60a56da6373608b770caf356a7416a63abc8dd6bb8c3d6f2307984615d5cea281a5c7cde63fa3e51f8ec19991b69ed19a3ae SHA512 53ed071ec8c9729873637fa8a63ded9952339c5a30b801ce2b1450ceee5e6ab90e086e90eb97ef82aebc19216e0aa9d2ce5e5cc11905a5a1cd95d7827378ecae
-DIST thunderbird-68.6.0-en-GB.xpi 556403 BLAKE2B 8610198ae53b028b614ee98d7300c01a77f7f56942592707640ba2bdb1154dfd1d1836bcd4010542317360e7a7bb2e9d0127051724584e8d63bacf8eef90b375 SHA512 e9fcf8910dfe8d8168b876493613150d8212a6346846637ab56404c223caea4002033b596e0366c1a3a4e1cd10b1fd753f10fad74fdee4dc45cc2312af4824ad
-DIST thunderbird-68.6.0-es-AR.xpi 596552 BLAKE2B 8cc14c41f6fbc690f6d3f9e03f709bbd07a70dc857dd49402955a2037d07f10c4b6e9ddc84feb65fc0248e299717376aaa2e2d53f73369a1ee27101048f18a1e SHA512 f2bbcb80555524c9ab734a9dd2c33cc5d75c66feefb24243e5c6f2258434c720c2af66948252a0b36bd61fc27d606b337b3dac37911378b55b52823ceaec4756
-DIST thunderbird-68.6.0-es-ES.xpi 518351 BLAKE2B 6c474d29acf5880ed4b14e3c2c3012153bb5f61744bf1a87ef057627f9c5967a484a63ca6614926308b5e3d49f2daa3e5cc624cb6f7514000cfbd3464f284353 SHA512 53601e91c5e1d82120b059cfc748e397ac6d5f359c975cdb153d6c248cf48a360c07d3a7b51fd19213248fca1a305389a28b7605244ae5285ea09d378171602a
-DIST thunderbird-68.6.0-et.xpi 573579 BLAKE2B f901c5584db9afcf2bb33f78acc8f840d24dea1fcfd6625b041812889ab2826ecc83f22e58a7b66e9eb295653da72453c646baa3891c8cc834f2e53f18bc3831 SHA512 05be97ec4828b705733991dac75c6f9f98a2a06e2e29246cdfe8a988d4b5ae107a65ce9a9ce00bb0acb11cae178bd4ce4bc04a1fbb5996612eb4de3b7a741380
-DIST thunderbird-68.6.0-eu.xpi 579945 BLAKE2B ac7fc46d9effa651aef5863e6f78ac21a8ddccb2cb5d99a7d84b22536d031167e74b75e7c11b451f9fafde8eb2e6ec1e35b7ae3feb83a462fa88e629274525fe SHA512 d59872a6fb05cac301bc3b0b70aae5695271afa2df7417e3ab558ea4096c91beae99f8524df79329f167de336bcc3c50f60c3b8bb37c1d635d4f805ebf81ad0a
-DIST thunderbird-68.6.0-fi.xpi 578418 BLAKE2B 3f20bcc1c7ec159a14b2fa3fabdf0f158d8c05840153c8ca48217dc4f52379806228ee9fc0c133cb70c169df1b5ca962fd98cb5bfeaa6a544bb184b55fd4fe39 SHA512 6d4c8cc0dea68876256dcc91d0fd4ac033c6ce368160c037f0d18794c8aa8ccbb68c763bc0a2b25ef91fdea4e3066cac97ee32be2ed1311567ee5d66b97465ca
-DIST thunderbird-68.6.0-fr.xpi 607809 BLAKE2B aa1cc2eeae461f336671b250fee17f0beaaf4e99dd763066d58380407cdbe3087086367f9fa30906fc97fd786f9604c2798264d2d1f9e3999fecee6f62a8db0d SHA512 1db0b5b31afe969e389cb4175dca9e590b907e7da24d5605f79da71d4adaae5e46a96bbc72cfa36870ae947f6c829b9106e27d9b329c5ab2af449795af37a28b
-DIST thunderbird-68.6.0-fy-NL.xpi 594467 BLAKE2B e47a49cac17f6c8a608ea1b2d2ba317a324fe211524576be677d361ed8e341393c9eec0a21566cbb1d66f1cbc87b9e3f6204995ef675b517840236290a1ccbd5 SHA512 049086887f57c4089ac95e9338b3964be9a4f4db527bef09acfedfea11bba80cc5e7d76712479017397f2c2d02d245d8e5f6beb07bc158e64a817c7a735cb22e
-DIST thunderbird-68.6.0-ga-IE.xpi 588709 BLAKE2B 4e45ef7a68ad0a32df69561ff3ead03ef0b0ce0a6908259fd7c6823c312ba09d1e57278371e13f7303087aface235ae194c8cf0ef18d0db6922a6884b308be6d SHA512 f3d678a6a4ad0928aeae8d9d3d02678321dc2df510391fd7db29c070395f302b9fa48979ab298ad72a3f7508974c2a5b516e07184569f5866b8356658d7cc523
-DIST thunderbird-68.6.0-gd.xpi 587110 BLAKE2B dfec38910da63eaae0569a52ce2fd7ca34e72feee1fedc87e18ca50e2b7d518fdd3ac4c67978dfad3aa1d0577a815d56160eae0641c7606316adc49c5f903a51 SHA512 c07d1836dc50626204269d3d971aa6a26b2a3c2664a17eb726e7bb936867993b28f238c8896dd43ccfd12e8a68025bc219d1c08809f357b928d4de228131207a
-DIST thunderbird-68.6.0-gl.xpi 568395 BLAKE2B b0160bfa099487e2d963d1a858b05e486e04dba64850a35446426c5f563ca3252952dababeba33fe5a172d289046087117400658416b25201142257f0600ae7f SHA512 83674fdf49b68c5d1464d74c47850c246b19c5e17e4f4500ed5de6e5761f375af86e767e80aca8f09883e22cbf309b95fc6ad81c33423c1a74775a83f4872d55
-DIST thunderbird-68.6.0-he.xpi 604787 BLAKE2B 1f2d95105dd260d7b28ffd7b8e417897f1454409623446882159a52e6e0f3e94708873a17fb8d6cedc45ffe0f7aa1025dafc90221cf754bac2e3ebafdac23642 SHA512 e0bf4ac5f343bbe0124fc91e6b98c3b0508b83651d8bd3fd58692e94eeec36c991dd4e665a89411af259ebe1a41582e6f4a6214427ba2ddc25b81f10fad3e314
-DIST thunderbird-68.6.0-hr.xpi 583783 BLAKE2B 370bfc6291a52fb896ce2fb46c472569aaa44499bca878ed1602662c5ecae9c8203a64eed5952d10a25a5729ce56fdf30590a0cca933c1c48076d91a553c374f SHA512 f2d1d8e5875b5aed177ac8b6756aa323f10e708c47b3c2e3be92305bba31e4e97a908b73d7b44ac04766967c88243ab28e948fb7ad6800e05b404775df1a9351
-DIST thunderbird-68.6.0-hsb.xpi 616035 BLAKE2B dda16baa337e85925684f7d0246303e850983396928e4f419ae3abdb867a548b392f597d1d95bd8a6222244a1bc3540f29b1cf70fa031a98d5211f66bdfbcc8f SHA512 6046bec73e322669b91eb58356459e142019a525729fefb71da04b6899f2b95c21fde0926a8cb847a5ff456cf84cad2643ca3c28ce1661bdd7ea520e17be6fd4
-DIST thunderbird-68.6.0-hu.xpi 618154 BLAKE2B 4d40954a24343120e0d0458fd3e6ab0c4ca0e1722b91d1378e7a27beaa522c11b5ac026acfe6f15589bca76dc7bdf8e5d5c11cad4195e883c8285db0945db43f SHA512 4b9a40929898147881400e474c77a1b02e19fa4d17d5309be703b810621c4fba87e8dfcffa0663f9626d50c93a989faff55c8305e7a9c83f9d9dd3eeea7805fe
-DIST thunderbird-68.6.0-hy-AM.xpi 631979 BLAKE2B 984ee4490872d6def91d44e67d67a7c2edbe6d52175bf3c6dfd1e0a9a925b5cd67bf0571315a65baab04c6617a7d73eb66cac6fe7c8237389e84478d5d707137 SHA512 c1a24a1d25e03bad4b2af319dae43562876b1a181b6ea5669432d10b294791f67fea0249da27b0bbdfef6bd4346e81caf5f771f443f5c16b047712b75f41e1fb
-DIST thunderbird-68.6.0-id.xpi 567748 BLAKE2B 36436b79199959c9a18071e50052a02d4e23799e4e083f5b147ec4a872b563df3bd9bff70fbb76a49592a63f2b37c8b0bc28c9afa6f20ff8f41ee509962e1959 SHA512 4e861d25c041084991c5bb7e2bbce9dd5e066349cc7ed39270b2991257486f9d8d5fdec22ee02ce9c3e8ee7cff23510c14e6f4b019ad5c8c9374584812066317
-DIST thunderbird-68.6.0-is.xpi 575440 BLAKE2B 92fe8051ec8ec3c2bd7d2509607e3d6b088aabff858734f8640408df339a0e9b2f9a31f01d931ed221948372e1d805c22dd2b2e335a52d0e44297a132c46ad56 SHA512 5afba9073ed93a521d662a3da18952a0cdd032a9af257ae0b244075b6a18cb6ff158349d1ff353d478919706550c349cae06e55083b6db9c8e93e30fe9a12586
-DIST thunderbird-68.6.0-it.xpi 489520 BLAKE2B 396b23270780ef587427b942bcbb5407be26301473c82f40eedf9734bcc94b558d8842efe06cdd6deebd070f22300ff8c1e6c43d2e5ee06444597505a08bbef2 SHA512 427686204e43609848c70b1a2e672d4f00930ba6faf3ceebc998a992c18e0092ce55fa8e00ce128cce913c99b8787e416ebcb58e5ece99f9f93563ae30aa8aa1
-DIST thunderbird-68.6.0-ja.xpi 643575 BLAKE2B 8a107e88506245c44e3e3b5880d59dc613607b0e3f9982f680901b636cc06b2fd8a4aa8af7f19968f2a30d278781001082b65c9764232efb9c35a2817701f83e SHA512 20624a5686a96ceac2e64c535e34bcdae0f64805809ed20dd6464f7261d34b96e81a4aa76f30a1c21e09d2e3e1ea6ba2c180b5ca2ac03658482127d034b3cef8
-DIST thunderbird-68.6.0-ko.xpi 620529 BLAKE2B b8f1768870dd34bf8ed3f7b130aaa3e032753ef8b621bf6aa8072f0aa4f4d204afa8f49adb3bc02d4dd705d033d9e124a98db8e36036a075faf507df86c2cfd1 SHA512 1099cddd0438794fca1121d4e2a207ac21ac736523876150617e58351ed47c1cb9e16ead079cf96d7894ebb8386bd6f9890a11007a9b6b221a33d0a3acbece8d
-DIST thunderbird-68.6.0-lt.xpi 603845 BLAKE2B 58720ab642a07306abc5c2ea59bdfaa20f60d2f6a2387927b6477170d4230e9ab1c5dcb328a1dec12959156f5164b09c51c632696287dea654d7ea585b8298d1 SHA512 473b5ebbacfc2ef049073d90909f3bd91777dc16adfa08f4e90063642c277b6bbbc5e8cdae2009963602f99210c5c8b441e8ac55121b5b5ff5facce35665058f
-DIST thunderbird-68.6.0-nb-NO.xpi 574021 BLAKE2B f826b9a5c916621c23d4d69ba1658c484307e88c28e69a080596a0892687883bd81f77070467b4b9a8b61e9bf23cbb5635155401ea695013157da98cc3863de6 SHA512 9dbcfaddd4d24b39f2d41eadf723ffc7a4509d909fa3706b0448892f02be08c3e74a55c4f301b11bfb06e4b51dc83675c43b77eb8643852aedf9845a8fca2d6a
-DIST thunderbird-68.6.0-nl.xpi 581354 BLAKE2B 83c79b550241f994b94d0de1a5b08ed483a81fecaa1ce9885d1c363002a18565dbda06cb5e19f6940c444dbad03cd2688e7a97172c4357561abb5c6017dc9612 SHA512 5cedaef8edc1d63e3806eb36114da16e9b0dbbd1103faa70ad7d9cc3549be9907d262dbdef06d92491cada1f138faab2569639a65a9bb35049a2c2a3bef05ee5
-DIST thunderbird-68.6.0-nn-NO.xpi 574949 BLAKE2B f52d7da972942421bad168151e604420952ba75141dd688a664e57636ddbeaa1eb369aa87bd9d56e4b1fe6fb59471a3a52df7b115dd007d4e4845d5e94d7a3d5 SHA512 56c7bd2b019a9bbcc445d7ef2b1d4ca198cc356a14798d2f0c732e5585a19446cc93a67c3429dbc9c0186b7166aaeb53d445eaadb3316af60f1ce901655147d0
-DIST thunderbird-68.6.0-pl.xpi 576084 BLAKE2B 8612400142433682aeafa89eb72a9f9c3225fa076d78732e5ca0e92336fdc8a494ed3911a69d1cd7f9a7de7d3ea75f71723ee74c23373dd154864103db81d22c SHA512 9f8d8ddfdadd95e4345965487d875d6332c1b4bc393c2ddbba47064cd195c746455a940703a01c8ab5c591438a6239c4fb3da2ca1bdcc8e784b9e32fb73771e6
-DIST thunderbird-68.6.0-pt-BR.xpi 589836 BLAKE2B d768bda1f05e2f34436987c19d1a4993b05724c73df977d8c2c3517b010e1789ba71184a95a7ca88158bea6ad1c065ef828d529024a952803c4292a86ed07214 SHA512 4878a308ac73a5b00234444957435016507efc3f53f4583d8ac56e8f185712e83da63b26b4ac21232d5da4d384a2d121bc74074905f335a50a208b1b91708240
-DIST thunderbird-68.6.0-pt-PT.xpi 588102 BLAKE2B 1d9bdbf50de4e7ae715ab24771510cc7c192cd4ecd295248d45ad0d4466576f272324048fa31b5068b0c0ce558c71af606a7eb347c3a5b8f058f75a1c9e93d24 SHA512 144dfa3999df65d02f0b95bbab74691b7d44e8614a8cf661ea5b1c6327a735ee09fcb92eac25feb5006d69a61eb619829f37dcf40eef320d56dcccccc90ce531
-DIST thunderbird-68.6.0-rm.xpi 578048 BLAKE2B cfcc42e25df3f1821903315f9d515dba7beb46842333db1056f0ec2b74b5c2932f2f05e62dba2fd0a1b6a5d5dab9f215abc627f05006e8c0b9a7fc9bb39989e9 SHA512 59c78c5c9dc9ed3e179ae84ac1d55e95dc419116b8224723efd9b4f62aa0106f2af676aca72fd2515f9d2ce9c2257e58dbaa4782e990cda91e95ab4be7f3d736
-DIST thunderbird-68.6.0-ro.xpi 594840 BLAKE2B 6ccc4dd23945bfd4053e145f547af4fb1b9c04f540f49770ffa663a0e294ca584ba60542b10e34d271cb23a6a96a6ebc645e9eccaede0052ff73c64682c12906 SHA512 cc32801ecc234a42e9c7f71ddc25542dc3248db318f9aef22134ef5eeb13d52d5281d1f394fdf1c7fba9254dcc9c4e4b5d7983486558355ae285ed49700a1a4e
-DIST thunderbird-68.6.0-ru.xpi 683326 BLAKE2B dc99d34cb9df41cf484cb64e54f0076db1aa417c2e0967b43450bacbe105db055f1b5b43bb3428b46637297c163939c17ced564e17ecf35245a0dc7ce632b925 SHA512 b5322eae8d346b94d9ed886a26c8fc245863070b0b499b018e65c39e1dbd31a45bbacb31ff8266300ad4900d5a5c87da910bf7beef1983f102238a4fd0bea076
-DIST thunderbird-68.6.0-si.xpi 637404 BLAKE2B f83b37f0950f20f826f89419ef7740d7e1f0a7beab7507ad527e24ae0f6522695ea4bc950c1548566c880e32fb5f0d0c1e4b9093d2bc611f8f5db1980c2f69d5 SHA512 2d1c7ab69231349ce36899e9016f478f5020dba8fac19491ac94521390c56d8e03fcb3d351b9f95b934c9d8b2cf0b0dcbe37a41104f9a7e75c2da7a6ceca4128
-DIST thunderbird-68.6.0-sk.xpi 609753 BLAKE2B 91423553d38b6276586e6324f2332fd770fbdc3e2a45610cc224d513e096a35ba8d6897c552a30be63381ee2a4936fe46c3453188ade449a8bef38e8226a77c2 SHA512 44bc2a67698667ad3a5051c375ba83c86d0360bdbe7ac957a53d6433384c098710ad0fdfca3bf3f42fe461611c8c04e40c0200f082815b23b7c744d703025324
-DIST thunderbird-68.6.0-sl.xpi 590628 BLAKE2B 6b4594024a4120f6671d22f695d5c25c20e9b1390c87445e0f4dfc59616072587370230c04b631a24c11dc6e9978c6e1bc88eb95ce930aaf0eafb7547a15500c SHA512 2c5ca40f4e9474a97f49d9fa03e956710147761c5d46f01812d31c791e9a2dbec3eb2ec2d85d0fa15d524f7484e963e4db9fda2ae3bf0fcd0ed15ebcef7d9d84
-DIST thunderbird-68.6.0-sq.xpi 598899 BLAKE2B ce329032fcb73c6c63b14ba8387f63a5e10ee7f9c1ff6b5934c1c3ca2edc7f57962b15f8d9da30e3a1249ade03f8ce650a1a6798563a9a170b2bdbb1deb7e924 SHA512 17b40ab24c92cf92cbddb5dc44b32bd4c2e175b0df52d4a9211d079f7d7f64ebb334e756848f20a666633a1417c03bce587975bac0c2f0e426be42377f9a65a5
-DIST thunderbird-68.6.0-sr.xpi 624895 BLAKE2B 12be0ccf4ffcd9b342e10fb71bc9125c7c362cec4ecc08502480b880da60a4ee9666f19e169b8a7a55b2147e11e15a9d772723c1296a90e8c336626ec085d0f0 SHA512 d23860ce69c8efec7a97c017b19034980b071c3d9052bf8869fb0795f70ef2c31f96ee6140f2855fe3e3c83041973ef7e3c03363307515ed3efc0e4ae0d00977
-DIST thunderbird-68.6.0-sv-SE.xpi 591595 BLAKE2B 5ad28c60610cca05ac5a0e35689ab19a00a45670ebafe0fd545b4e7f2b2f4b97d82b83bec641088d8cabf0894ce19f38594c5669fcdb2ab58d25ae72a3194cb5 SHA512 6ca50aeae25dbb54a94d2cb4e2eb6ed6b12ef4f9a70de3ca82ab2f6ecf900d852f4c0c7a1bcbd2810ad466455bb56d1156cd5ff0602e4ff59dfa350d72c0f904
-DIST thunderbird-68.6.0-tr.xpi 599707 BLAKE2B a559378bc53d77d0a078448b7c969f1b80a6ca58beb0ef21ad6a0421414e1bfe29bd7cff3429ea8cd8c5bafae86dc277126891d7ea3e879e54696bc20e48e45a SHA512 8c03c3d9f1f74229ea1bc2701de92e07f866aff61daa0031ed7425e80b5853cd94a62d3b34330088a1fcd32627d1d136b2f89fb9a555453699e888e4800215fd
-DIST thunderbird-68.6.0-uk.xpi 671453 BLAKE2B 98e2e5cb75384d828b5ddf39933ac6bb6ae585591440dadf1181390b6bd115bb1dfe465a7d69ed53f25b868071307af0f2d4a4e9ed34d60d2d1cc92b06cc6973 SHA512 0fddabad83ade542c545ed793a0b1deebf3a862b28367c00a9082977a77c231840671c0ceecd120d0750bbb9647894b0a9cb60388a29a624c9fa3d0e451e0ae1
-DIST thunderbird-68.6.0-vi.xpi 623421 BLAKE2B 2c447c68582f5392176e22605fff3d809555856c2813bee9fccd46e2c4c08897fbeb1ce91cafecf29d0c2c9f6333fd020646177bfe8ccb599c1963804bbc9980 SHA512 5b338f2f05c704554962a14864c41120dbda185827270cc273e90118eab966afdfe363e610a3a828935ac275865d29eae8aaf3cc4d05501804a8e97c370c8fb0
-DIST thunderbird-68.6.0-zh-CN.xpi 626820 BLAKE2B 71ee573160f757d94481cb583e4defca47b6f1618f51af7980c17bdcbef3af6d0e684239a5d3022c6dadaba091a3dd0d38090279e8fcee31c2f5fd1cd9aa3141 SHA512 e2ebed4e9b21e073cc0c09e2e7a79627cf5d1dd5a3bc0cf31892eec339a3763bb2e80e013940fc21375495d861b152aebf4e045ba905c2bff9a2cf21182b0a56
-DIST thunderbird-68.6.0-zh-TW.xpi 627476 BLAKE2B 41fccc4c6f60f782b812a3622d21fcfe993d1473031077e23f3031d3eb03b4d6dae799754a96067d3a3437ec20a44f2eb77bfaf1b2158824cf7bcb5de42c517b SHA512 1e1ddecf4dc8f25fffeeb4ca5f759ee243db84cb74c9aca6af4dc0c39541e4e4a97c53f97bde8132645503ee8aec2fcc24bedba99405a2e4206d25c72e6cdee9
 DIST thunderbird-68.7.0-ar.xpi 617169 BLAKE2B 383913959eb715b75e048d3244c00676af99e043f575a168eab698b49fe165fb2ae1258f8d991b3710fb3c8fbd7737118e5fa0f960ab14139902a2b0dd6a1042 SHA512 303669b6a8e27d08ce40bd6c5d70b9516110caf4012559263166b890ac37c94873a4377deacb1a888f2e2407ef7cda75c16e06df70e95323557061a2035ade22
 DIST thunderbird-68.7.0-ast.xpi 551299 BLAKE2B d1512027a8ea3f390d4e9aec3c431a5a015c32e9df1140102c63d4405e8629d8196f6557a4f777385a8185dd68c0f7d15b42d2de026a13723cbe65f986ad883b SHA512 0ce499f794fdd0543f8d45c3caca50202f87edde1accc6b82d2f560fc7559772eede3700242040597af7cfee8252a9b23d5c2aa534a53cfc2a634a9608081c0e
 DIST thunderbird-68.7.0-be.xpi 646280 BLAKE2B 5f841fe907361dcf0e9379a81b65453a8d0cae84e13f45b45572d91dcc0e5b3281419ec99eb8a8442e6c06e9fc17f17f0202556151ecb8b91360bca23cb6da61 SHA512 4504169a324374be237b0ea42eb40582f29f076e852a052ad340b43df0c1bf63bf5eddc513e3b53bb56d064af814a6ce142210cb605ec57040b2878d5c2b1b52
@@ -222,14 +169,11 @@ DIST thunderbird-68.7.0-zh-CN.xpi 626820 BLAKE2B 4cc9ff32c4ad28a8204d2efa2af7e7c
 DIST thunderbird-68.7.0-zh-TW.xpi 627476 BLAKE2B 691aeae9654c206a74c91cfa046a9c00836dba6ab22bd5c6f2baa320d9935adf65d40407bc3092c14b72244a75f61bad880c938468f48b3008c22e9f24b8a17b SHA512 f1f94129f28eda53327a49b509fc76cf950fe0cf75976cc4ad83bce064b0002156d5002474fe3244f6723e8addf446448d36828dfa3aef9e55abc031859518a5
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.9.1.tar.bz2 52700511 BLAKE2B 9852b88de97e439729ec9cfbbcf2aaf942e0992ea5f05fb8a3ff715a1e4ac8138769e7336ac826afdc90971277be5702af846753e0deb24f01133297a4d828dd SHA512 707d48e10ce34363a339ce7db40d4a5b3ad2e56401ab335edf916ebf74e46fa3d81364f2cdeedc8f0f5829adbcb1ba56001399bd278a249d71827c93dd171b9a
-DIST thunderbird-bin_i686-68.6.0.tar.bz2 58143741 BLAKE2B 19956f7a1e6bf118692bdbaf14dde553af4c157872341339d0a6bc49eb3b09bc87110a1af77edacebd2dce5634453d75451103caf7956b9a7cb87f6b21a398ef SHA512 2a93646dfe69131d51d600511450f3cce267f11e51bcbba8a648baf1af1ebea57d43ae63c05cb138e74fac574cd76b55e07a86b98e7cb27e26575a777ad80934
 DIST thunderbird-bin_i686-68.7.0.tar.bz2 58166797 BLAKE2B 8be7959a011baa4a52e7456afe703140effa82bc09dc75cb34c8c06ce590ce5c026f4ed94c8b58b755d1e77b2878449ebfb547f33c7258635b8597a34d30569b SHA512 18309ddef56d0e7e50f3b5895e1c21c206b432da141c7517f9220686ada6523f7b0181e98a6722205bfe09d9023c4d2beeeb11ad60a7b6ec4242441bd60afcd0
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.9.1.tar.bz2 50500044 BLAKE2B 37bdc0437cc955db334535a04eb484277fff5a2bdd3c6ee06b04a1d642677ef368272e446f59c8d84aaef7f7715e7fdeb75e05be678c5d5fb594085cba9b6a32 SHA512 109ae1a376a6e65ede652c85fda7ebd497b781717cef65d0e0462a4c3d76dcca69163b96acaf1259e347ede8826a647dea3c739c2cf38f214c2628f2b9b7fe19
-DIST thunderbird-bin_x86_64-68.6.0.tar.bz2 55480227 BLAKE2B 62b9b6e74ae24c242d86cbfc1f2d5615dc9019392e6987e55c831f8a699a9c1988d01bf81d3f429ca4046eeaf1cb5680d8de87627e8eb8c4703d3dd225b050d8 SHA512 0db0b36b095355d080d985df6547264a3df136d11ce828872dcc3b19c24a3156f521e1657c68059ba31de806f18a3d285275eaeecdb076344996bf8f6731bae6
 DIST thunderbird-bin_x86_64-68.7.0.tar.bz2 55565431 BLAKE2B f2aace326b230d8a50d89c0ad26d58d662e4cb1607bff65bd2852d67bb52aa5e175466ee29ce6d2133c20c46e0c6edf03c4cd4585dae62879a825e00ee2bacdd SHA512 583e9a08aff1d3e4be47e5a9f31b7595109e25a4062a36e8640468a354e29a47f389062db5fa134af6c231af5fb1caaa31368584fa662105100419a64134f0ac
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.9.1.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
-EBUILD thunderbird-bin-68.6.0.ebuild 5278 BLAKE2B dc066614db0691d184628b78941fabad41245bf74b15ff5db3bd9efddfc43ee321fc2e3f76fe508119d0bfa0de9baee9a7a5850273cf2b5b0de484517e75e290 SHA512 94fbb50d6ec8b348c883ed8b3ada3530d20a19d2540bc9f06a5f9cc088bd31370ed28d45080d3da629ea91ae562518ef2c4a27ec3fdbc8c86c1ad08310c3a746
 EBUILD thunderbird-bin-68.7.0.ebuild 5278 BLAKE2B dc066614db0691d184628b78941fabad41245bf74b15ff5db3bd9efddfc43ee321fc2e3f76fe508119d0bfa0de9baee9a7a5850273cf2b5b0de484517e75e290 SHA512 94fbb50d6ec8b348c883ed8b3ada3530d20a19d2540bc9f06a5f9cc088bd31370ed28d45080d3da629ea91ae562518ef2c4a27ec3fdbc8c86c1ad08310c3a746
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.6.0.ebuild
deleted file mode 100644
index 4fdf8bc9f318..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-68.6.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=""
-MOZ_LIGHTNING_VER="68.0b6"
-
-# Can be updated using scripts/get_langs.sh from 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
-MOZ_PN="${PN/-bin}"
-MOZ_PV="${PV/_beta/b}"
-MOZ_PV="${MOZ_PV/_rc/rc}"
-
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
-
-inherit eutils multilib pax-utils xdg-utils nsplugins mozlinguas-v2
-
-DESCRIPTION="Thunderbird Mail Client"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
-	https://dev.gentoo.org/~juippis/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz"
-# the below only works when upstream releases the xpi with all locales bundled
-#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
-HOMEPAGE="https://www.thunderbird.net/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
-
-DEPEND="app-arch/unzip
-	app-arch/zip"
-
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	>=media-libs/alsa-lib-1.0.16
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10:2
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	crashreporter? ( net-misc/curl )
-	selinux? ( sec-policy/selinux-thunderbird )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/pingsender
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-}
-
-src_prepare() {
-	default
-
-	# Lightning
-	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
-	local emxpi="${S}/distribution/extensions/${emid}.xpi"
-	if [[ ! -f "${emxpi}" ]]; then
-		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
-	else
-		ebegin "Add localization to Lightning ..."
-		# hide warning regarding extra bytes at beginning or within zipfile
-		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
-		rm -f "${emxpi}" || die
-
-		# Install language packs for calendar
-		mozlinguas_xpistage_langpacks \
-			"${WORKDIR}/${emid}" \
-			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
-		# roll a .xpi that mimicks what upstream would roll
-		pushd "${WORKDIR}/${emid}" &>/dev/null || die
-		zip -9 -q -r "${emxpi}" * || die
-		popd &>/dev/null || die
-		eend 0
-	fi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	local size sizes icon_path icon name
-	sizes="16 22 24 32 48 128"
-	icon_path="${S}/chrome/icons/default"
-	icon="${PN}-icon"
-	name="Thunderbird"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
-	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
-
-	# Install language packs
-	MOZEXTENSION_TARGET="distribution/extensions" \
-		mozlinguas_src_install
-
-	# Create /usr/bin/thunderbird-bin
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	newbin - thunderbird-bin <<- _EOF_
-		#!/bin/sh
-		unset LD_PRELOAD
-		LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
-		exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-	_EOF_
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
-
-	# Plugins dir
-	share_plugins_dir
-
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index e2bdccd3f5d3..980d5a7f4c3f 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.6.0-ar.xpi 617167 BLAKE2B eb36b9f8188aef46b188e2fd4c7f13a83b1ebda6dec6d53e4641d899f231c6fece97ae377d746581e1c2106bfa6b0263a221756c39df4fe35945c46bf81fc6e1 SHA512 abc0811dd99aea220ba4d2fe2feb4a5ff20a237289a861cf612f7c71379a24dd156cf20da1f717c466482204cd5c890cb7fd1fe741d4be403cbd1bc8ba380df6
-DIST thunderbird-68.6.0-ast.xpi 551298 BLAKE2B 662dc56ae91fa87b2690613357487524d41683f99cbcfeaf412eb22de78e6ed071cb33ec69dd101f74c889332571ab60a8c282b3e55a181cce01a9a0b85ab468 SHA512 ca6a2378eeb938bbb9527d45f02dc52eaff8a0527d5b7b687af95264ff85a0bf48630e8a8bb60a43d9b673702454d00cbeba2d1a86e50802e10306b66065903c
-DIST thunderbird-68.6.0-be.xpi 646281 BLAKE2B 7d028c3211b5441dac86e9dde34cc2d8c96940c1bc7aca7a5fbab7c5b3b65d1a39a3db1a9e18d9741d767cd19563f411e996b79d54794696f91e4314391dd154 SHA512 6bb519a0804383f9872bc5fd8cc6489201fe68c29ea8a2480af40d5dcb476c6ba3c83ba8671dce0782715d364776c048e662121a60caec11e5a055ce5ac5d12b
-DIST thunderbird-68.6.0-bg.xpi 646227 BLAKE2B 38f5699ec54027abe74a1e72a51ce3db8abc11027263b7bd936d0ce33835843cad4f95720012e368420096b3be30e0a5b732655640b8edef5959551ca8a34dd4 SHA512 fc2e89bc91f893192a6a31e09f34df2a95b3d20c05ca9f32f798921405a6eba57f4e938ddebfb46b80cb8a3bddfb4c207a6a92aad84b2fb99f5e2970c16fe9fe
-DIST thunderbird-68.6.0-br.xpi 574851 BLAKE2B 7e7eae4704f30aad650e986ca04f260bb9c731ea27dd40a12d81054a654af62064a82024cdf3f760c71f90d2e75af9372d041b8da3375673664c9ca3176df4f4 SHA512 6586cda1498892dd1ed42090705906eabf9e143db55fcbc67424f05d5a8986103751c6c7be79fdce4a2f441addc8577729fa6c62a14edc47974cc3d21a26d158
-DIST thunderbird-68.6.0-ca.xpi 578439 BLAKE2B b181630e11241a445bdcf4a5de201f00dcdb01e0437e447479a0447c5498bb23f82fe6989fa6555db064e44540841be9316cdc182071a1582e5a9508396d51c1 SHA512 fe63575feb74f92d9e628dee99c8ce204276d5641b866633a973ce802de31b976ae4fe3ffb232c14a0dc2b020482db8ebc39c0aeaa3e7af2bf878873a23ee04d
-DIST thunderbird-68.6.0-cs.xpi 603041 BLAKE2B 1fc68a87144c5c670ab56f097777b9b57030e3d879c7a59c09b1732a4e088ebd08fcb5a92d65bc545bb572c6d2482681c9c625b73134c3b0f3799c175e37d0ba SHA512 42aca6079cbed98985fce3af577853f078752c54aefa69148521c1bf36eac9a6fff8765ebee1678b210d21cd403d8e572d522135654587225806c7bcd87d0f79
-DIST thunderbird-68.6.0-cy.xpi 589902 BLAKE2B 3429f7e7f3684686b5fdb55f6316113cc0d49e73ed3664ea90e47de6de9c273772335756ab973d37e446a8cdb8d34458ab898c88cbb5c3a84698ec08c889db50 SHA512 dc7b08685fd5fa0f1900cbb8a97909a5d7fbeb3eb01cc529239aac829610e605e8b1b36b25e3850ff42b127a7e74eb730550fd45d3558d1133bf3f890db39671
-DIST thunderbird-68.6.0-da.xpi 588349 BLAKE2B 63f12bc02a746101d4db06b1c1c3da4cf7bbd0583fe95ba08cff6eb904deb8bf575220d701dc0f1699540bf858ccb75175241ec0350e0c6cb3b8f51806ecd5ef SHA512 757711a15b0c4e961eae7671819d3c10d94fb6af93a3dc2be79001699c134b2dd85d80ccc179bbb18a11b331a122dff6cc06354c8c7d781c55b36fa959de00de
-DIST thunderbird-68.6.0-de.xpi 597804 BLAKE2B f118da2b889d3f0f4d14a8e10262186261f940d42029736f014d87e906d2e5ddbf84c08f1f51fe05bcaa23b75a956004d84acdb08e7f0ed4e36ae47e798a780a SHA512 f8100c657f5f4f80447e1291be579debcb41983c9eb05f0b3bed2838fbe72f5cd26ea0e23adc87697b1667686f0fe395bc88c313c62ea3270d11494ee6519e85
-DIST thunderbird-68.6.0-el.xpi 699222 BLAKE2B 3355e672aceb9944745653fb17af60a56da6373608b770caf356a7416a63abc8dd6bb8c3d6f2307984615d5cea281a5c7cde63fa3e51f8ec19991b69ed19a3ae SHA512 53ed071ec8c9729873637fa8a63ded9952339c5a30b801ce2b1450ceee5e6ab90e086e90eb97ef82aebc19216e0aa9d2ce5e5cc11905a5a1cd95d7827378ecae
-DIST thunderbird-68.6.0-en-GB.xpi 556403 BLAKE2B 8610198ae53b028b614ee98d7300c01a77f7f56942592707640ba2bdb1154dfd1d1836bcd4010542317360e7a7bb2e9d0127051724584e8d63bacf8eef90b375 SHA512 e9fcf8910dfe8d8168b876493613150d8212a6346846637ab56404c223caea4002033b596e0366c1a3a4e1cd10b1fd753f10fad74fdee4dc45cc2312af4824ad
-DIST thunderbird-68.6.0-es-AR.xpi 596552 BLAKE2B 8cc14c41f6fbc690f6d3f9e03f709bbd07a70dc857dd49402955a2037d07f10c4b6e9ddc84feb65fc0248e299717376aaa2e2d53f73369a1ee27101048f18a1e SHA512 f2bbcb80555524c9ab734a9dd2c33cc5d75c66feefb24243e5c6f2258434c720c2af66948252a0b36bd61fc27d606b337b3dac37911378b55b52823ceaec4756
-DIST thunderbird-68.6.0-es-ES.xpi 518351 BLAKE2B 6c474d29acf5880ed4b14e3c2c3012153bb5f61744bf1a87ef057627f9c5967a484a63ca6614926308b5e3d49f2daa3e5cc624cb6f7514000cfbd3464f284353 SHA512 53601e91c5e1d82120b059cfc748e397ac6d5f359c975cdb153d6c248cf48a360c07d3a7b51fd19213248fca1a305389a28b7605244ae5285ea09d378171602a
-DIST thunderbird-68.6.0-et.xpi 573579 BLAKE2B f901c5584db9afcf2bb33f78acc8f840d24dea1fcfd6625b041812889ab2826ecc83f22e58a7b66e9eb295653da72453c646baa3891c8cc834f2e53f18bc3831 SHA512 05be97ec4828b705733991dac75c6f9f98a2a06e2e29246cdfe8a988d4b5ae107a65ce9a9ce00bb0acb11cae178bd4ce4bc04a1fbb5996612eb4de3b7a741380
-DIST thunderbird-68.6.0-eu.xpi 579945 BLAKE2B ac7fc46d9effa651aef5863e6f78ac21a8ddccb2cb5d99a7d84b22536d031167e74b75e7c11b451f9fafde8eb2e6ec1e35b7ae3feb83a462fa88e629274525fe SHA512 d59872a6fb05cac301bc3b0b70aae5695271afa2df7417e3ab558ea4096c91beae99f8524df79329f167de336bcc3c50f60c3b8bb37c1d635d4f805ebf81ad0a
-DIST thunderbird-68.6.0-fi.xpi 578418 BLAKE2B 3f20bcc1c7ec159a14b2fa3fabdf0f158d8c05840153c8ca48217dc4f52379806228ee9fc0c133cb70c169df1b5ca962fd98cb5bfeaa6a544bb184b55fd4fe39 SHA512 6d4c8cc0dea68876256dcc91d0fd4ac033c6ce368160c037f0d18794c8aa8ccbb68c763bc0a2b25ef91fdea4e3066cac97ee32be2ed1311567ee5d66b97465ca
-DIST thunderbird-68.6.0-fr.xpi 607809 BLAKE2B aa1cc2eeae461f336671b250fee17f0beaaf4e99dd763066d58380407cdbe3087086367f9fa30906fc97fd786f9604c2798264d2d1f9e3999fecee6f62a8db0d SHA512 1db0b5b31afe969e389cb4175dca9e590b907e7da24d5605f79da71d4adaae5e46a96bbc72cfa36870ae947f6c829b9106e27d9b329c5ab2af449795af37a28b
-DIST thunderbird-68.6.0-fy-NL.xpi 594467 BLAKE2B e47a49cac17f6c8a608ea1b2d2ba317a324fe211524576be677d361ed8e341393c9eec0a21566cbb1d66f1cbc87b9e3f6204995ef675b517840236290a1ccbd5 SHA512 049086887f57c4089ac95e9338b3964be9a4f4db527bef09acfedfea11bba80cc5e7d76712479017397f2c2d02d245d8e5f6beb07bc158e64a817c7a735cb22e
-DIST thunderbird-68.6.0-ga-IE.xpi 588709 BLAKE2B 4e45ef7a68ad0a32df69561ff3ead03ef0b0ce0a6908259fd7c6823c312ba09d1e57278371e13f7303087aface235ae194c8cf0ef18d0db6922a6884b308be6d SHA512 f3d678a6a4ad0928aeae8d9d3d02678321dc2df510391fd7db29c070395f302b9fa48979ab298ad72a3f7508974c2a5b516e07184569f5866b8356658d7cc523
-DIST thunderbird-68.6.0-gd.xpi 587110 BLAKE2B dfec38910da63eaae0569a52ce2fd7ca34e72feee1fedc87e18ca50e2b7d518fdd3ac4c67978dfad3aa1d0577a815d56160eae0641c7606316adc49c5f903a51 SHA512 c07d1836dc50626204269d3d971aa6a26b2a3c2664a17eb726e7bb936867993b28f238c8896dd43ccfd12e8a68025bc219d1c08809f357b928d4de228131207a
-DIST thunderbird-68.6.0-gl.xpi 568395 BLAKE2B b0160bfa099487e2d963d1a858b05e486e04dba64850a35446426c5f563ca3252952dababeba33fe5a172d289046087117400658416b25201142257f0600ae7f SHA512 83674fdf49b68c5d1464d74c47850c246b19c5e17e4f4500ed5de6e5761f375af86e767e80aca8f09883e22cbf309b95fc6ad81c33423c1a74775a83f4872d55
-DIST thunderbird-68.6.0-he.xpi 604787 BLAKE2B 1f2d95105dd260d7b28ffd7b8e417897f1454409623446882159a52e6e0f3e94708873a17fb8d6cedc45ffe0f7aa1025dafc90221cf754bac2e3ebafdac23642 SHA512 e0bf4ac5f343bbe0124fc91e6b98c3b0508b83651d8bd3fd58692e94eeec36c991dd4e665a89411af259ebe1a41582e6f4a6214427ba2ddc25b81f10fad3e314
-DIST thunderbird-68.6.0-hr.xpi 583783 BLAKE2B 370bfc6291a52fb896ce2fb46c472569aaa44499bca878ed1602662c5ecae9c8203a64eed5952d10a25a5729ce56fdf30590a0cca933c1c48076d91a553c374f SHA512 f2d1d8e5875b5aed177ac8b6756aa323f10e708c47b3c2e3be92305bba31e4e97a908b73d7b44ac04766967c88243ab28e948fb7ad6800e05b404775df1a9351
-DIST thunderbird-68.6.0-hsb.xpi 616035 BLAKE2B dda16baa337e85925684f7d0246303e850983396928e4f419ae3abdb867a548b392f597d1d95bd8a6222244a1bc3540f29b1cf70fa031a98d5211f66bdfbcc8f SHA512 6046bec73e322669b91eb58356459e142019a525729fefb71da04b6899f2b95c21fde0926a8cb847a5ff456cf84cad2643ca3c28ce1661bdd7ea520e17be6fd4
-DIST thunderbird-68.6.0-hu.xpi 618154 BLAKE2B 4d40954a24343120e0d0458fd3e6ab0c4ca0e1722b91d1378e7a27beaa522c11b5ac026acfe6f15589bca76dc7bdf8e5d5c11cad4195e883c8285db0945db43f SHA512 4b9a40929898147881400e474c77a1b02e19fa4d17d5309be703b810621c4fba87e8dfcffa0663f9626d50c93a989faff55c8305e7a9c83f9d9dd3eeea7805fe
-DIST thunderbird-68.6.0-hy-AM.xpi 631979 BLAKE2B 984ee4490872d6def91d44e67d67a7c2edbe6d52175bf3c6dfd1e0a9a925b5cd67bf0571315a65baab04c6617a7d73eb66cac6fe7c8237389e84478d5d707137 SHA512 c1a24a1d25e03bad4b2af319dae43562876b1a181b6ea5669432d10b294791f67fea0249da27b0bbdfef6bd4346e81caf5f771f443f5c16b047712b75f41e1fb
-DIST thunderbird-68.6.0-id.xpi 567748 BLAKE2B 36436b79199959c9a18071e50052a02d4e23799e4e083f5b147ec4a872b563df3bd9bff70fbb76a49592a63f2b37c8b0bc28c9afa6f20ff8f41ee509962e1959 SHA512 4e861d25c041084991c5bb7e2bbce9dd5e066349cc7ed39270b2991257486f9d8d5fdec22ee02ce9c3e8ee7cff23510c14e6f4b019ad5c8c9374584812066317
-DIST thunderbird-68.6.0-is.xpi 575440 BLAKE2B 92fe8051ec8ec3c2bd7d2509607e3d6b088aabff858734f8640408df339a0e9b2f9a31f01d931ed221948372e1d805c22dd2b2e335a52d0e44297a132c46ad56 SHA512 5afba9073ed93a521d662a3da18952a0cdd032a9af257ae0b244075b6a18cb6ff158349d1ff353d478919706550c349cae06e55083b6db9c8e93e30fe9a12586
-DIST thunderbird-68.6.0-it.xpi 489520 BLAKE2B 396b23270780ef587427b942bcbb5407be26301473c82f40eedf9734bcc94b558d8842efe06cdd6deebd070f22300ff8c1e6c43d2e5ee06444597505a08bbef2 SHA512 427686204e43609848c70b1a2e672d4f00930ba6faf3ceebc998a992c18e0092ce55fa8e00ce128cce913c99b8787e416ebcb58e5ece99f9f93563ae30aa8aa1
-DIST thunderbird-68.6.0-ja.xpi 643575 BLAKE2B 8a107e88506245c44e3e3b5880d59dc613607b0e3f9982f680901b636cc06b2fd8a4aa8af7f19968f2a30d278781001082b65c9764232efb9c35a2817701f83e SHA512 20624a5686a96ceac2e64c535e34bcdae0f64805809ed20dd6464f7261d34b96e81a4aa76f30a1c21e09d2e3e1ea6ba2c180b5ca2ac03658482127d034b3cef8
-DIST thunderbird-68.6.0-ko.xpi 620529 BLAKE2B b8f1768870dd34bf8ed3f7b130aaa3e032753ef8b621bf6aa8072f0aa4f4d204afa8f49adb3bc02d4dd705d033d9e124a98db8e36036a075faf507df86c2cfd1 SHA512 1099cddd0438794fca1121d4e2a207ac21ac736523876150617e58351ed47c1cb9e16ead079cf96d7894ebb8386bd6f9890a11007a9b6b221a33d0a3acbece8d
-DIST thunderbird-68.6.0-lt.xpi 603845 BLAKE2B 58720ab642a07306abc5c2ea59bdfaa20f60d2f6a2387927b6477170d4230e9ab1c5dcb328a1dec12959156f5164b09c51c632696287dea654d7ea585b8298d1 SHA512 473b5ebbacfc2ef049073d90909f3bd91777dc16adfa08f4e90063642c277b6bbbc5e8cdae2009963602f99210c5c8b441e8ac55121b5b5ff5facce35665058f
-DIST thunderbird-68.6.0-nb-NO.xpi 574021 BLAKE2B f826b9a5c916621c23d4d69ba1658c484307e88c28e69a080596a0892687883bd81f77070467b4b9a8b61e9bf23cbb5635155401ea695013157da98cc3863de6 SHA512 9dbcfaddd4d24b39f2d41eadf723ffc7a4509d909fa3706b0448892f02be08c3e74a55c4f301b11bfb06e4b51dc83675c43b77eb8643852aedf9845a8fca2d6a
-DIST thunderbird-68.6.0-nl.xpi 581354 BLAKE2B 83c79b550241f994b94d0de1a5b08ed483a81fecaa1ce9885d1c363002a18565dbda06cb5e19f6940c444dbad03cd2688e7a97172c4357561abb5c6017dc9612 SHA512 5cedaef8edc1d63e3806eb36114da16e9b0dbbd1103faa70ad7d9cc3549be9907d262dbdef06d92491cada1f138faab2569639a65a9bb35049a2c2a3bef05ee5
-DIST thunderbird-68.6.0-nn-NO.xpi 574949 BLAKE2B f52d7da972942421bad168151e604420952ba75141dd688a664e57636ddbeaa1eb369aa87bd9d56e4b1fe6fb59471a3a52df7b115dd007d4e4845d5e94d7a3d5 SHA512 56c7bd2b019a9bbcc445d7ef2b1d4ca198cc356a14798d2f0c732e5585a19446cc93a67c3429dbc9c0186b7166aaeb53d445eaadb3316af60f1ce901655147d0
-DIST thunderbird-68.6.0-pl.xpi 576084 BLAKE2B 8612400142433682aeafa89eb72a9f9c3225fa076d78732e5ca0e92336fdc8a494ed3911a69d1cd7f9a7de7d3ea75f71723ee74c23373dd154864103db81d22c SHA512 9f8d8ddfdadd95e4345965487d875d6332c1b4bc393c2ddbba47064cd195c746455a940703a01c8ab5c591438a6239c4fb3da2ca1bdcc8e784b9e32fb73771e6
-DIST thunderbird-68.6.0-pt-BR.xpi 589836 BLAKE2B d768bda1f05e2f34436987c19d1a4993b05724c73df977d8c2c3517b010e1789ba71184a95a7ca88158bea6ad1c065ef828d529024a952803c4292a86ed07214 SHA512 4878a308ac73a5b00234444957435016507efc3f53f4583d8ac56e8f185712e83da63b26b4ac21232d5da4d384a2d121bc74074905f335a50a208b1b91708240
-DIST thunderbird-68.6.0-pt-PT.xpi 588102 BLAKE2B 1d9bdbf50de4e7ae715ab24771510cc7c192cd4ecd295248d45ad0d4466576f272324048fa31b5068b0c0ce558c71af606a7eb347c3a5b8f058f75a1c9e93d24 SHA512 144dfa3999df65d02f0b95bbab74691b7d44e8614a8cf661ea5b1c6327a735ee09fcb92eac25feb5006d69a61eb619829f37dcf40eef320d56dcccccc90ce531
-DIST thunderbird-68.6.0-rm.xpi 578048 BLAKE2B cfcc42e25df3f1821903315f9d515dba7beb46842333db1056f0ec2b74b5c2932f2f05e62dba2fd0a1b6a5d5dab9f215abc627f05006e8c0b9a7fc9bb39989e9 SHA512 59c78c5c9dc9ed3e179ae84ac1d55e95dc419116b8224723efd9b4f62aa0106f2af676aca72fd2515f9d2ce9c2257e58dbaa4782e990cda91e95ab4be7f3d736
-DIST thunderbird-68.6.0-ro.xpi 594840 BLAKE2B 6ccc4dd23945bfd4053e145f547af4fb1b9c04f540f49770ffa663a0e294ca584ba60542b10e34d271cb23a6a96a6ebc645e9eccaede0052ff73c64682c12906 SHA512 cc32801ecc234a42e9c7f71ddc25542dc3248db318f9aef22134ef5eeb13d52d5281d1f394fdf1c7fba9254dcc9c4e4b5d7983486558355ae285ed49700a1a4e
-DIST thunderbird-68.6.0-ru.xpi 683326 BLAKE2B dc99d34cb9df41cf484cb64e54f0076db1aa417c2e0967b43450bacbe105db055f1b5b43bb3428b46637297c163939c17ced564e17ecf35245a0dc7ce632b925 SHA512 b5322eae8d346b94d9ed886a26c8fc245863070b0b499b018e65c39e1dbd31a45bbacb31ff8266300ad4900d5a5c87da910bf7beef1983f102238a4fd0bea076
-DIST thunderbird-68.6.0-si.xpi 637404 BLAKE2B f83b37f0950f20f826f89419ef7740d7e1f0a7beab7507ad527e24ae0f6522695ea4bc950c1548566c880e32fb5f0d0c1e4b9093d2bc611f8f5db1980c2f69d5 SHA512 2d1c7ab69231349ce36899e9016f478f5020dba8fac19491ac94521390c56d8e03fcb3d351b9f95b934c9d8b2cf0b0dcbe37a41104f9a7e75c2da7a6ceca4128
-DIST thunderbird-68.6.0-sk.xpi 609753 BLAKE2B 91423553d38b6276586e6324f2332fd770fbdc3e2a45610cc224d513e096a35ba8d6897c552a30be63381ee2a4936fe46c3453188ade449a8bef38e8226a77c2 SHA512 44bc2a67698667ad3a5051c375ba83c86d0360bdbe7ac957a53d6433384c098710ad0fdfca3bf3f42fe461611c8c04e40c0200f082815b23b7c744d703025324
-DIST thunderbird-68.6.0-sl.xpi 590628 BLAKE2B 6b4594024a4120f6671d22f695d5c25c20e9b1390c87445e0f4dfc59616072587370230c04b631a24c11dc6e9978c6e1bc88eb95ce930aaf0eafb7547a15500c SHA512 2c5ca40f4e9474a97f49d9fa03e956710147761c5d46f01812d31c791e9a2dbec3eb2ec2d85d0fa15d524f7484e963e4db9fda2ae3bf0fcd0ed15ebcef7d9d84
-DIST thunderbird-68.6.0-sq.xpi 598899 BLAKE2B ce329032fcb73c6c63b14ba8387f63a5e10ee7f9c1ff6b5934c1c3ca2edc7f57962b15f8d9da30e3a1249ade03f8ce650a1a6798563a9a170b2bdbb1deb7e924 SHA512 17b40ab24c92cf92cbddb5dc44b32bd4c2e175b0df52d4a9211d079f7d7f64ebb334e756848f20a666633a1417c03bce587975bac0c2f0e426be42377f9a65a5
-DIST thunderbird-68.6.0-sr.xpi 624895 BLAKE2B 12be0ccf4ffcd9b342e10fb71bc9125c7c362cec4ecc08502480b880da60a4ee9666f19e169b8a7a55b2147e11e15a9d772723c1296a90e8c336626ec085d0f0 SHA512 d23860ce69c8efec7a97c017b19034980b071c3d9052bf8869fb0795f70ef2c31f96ee6140f2855fe3e3c83041973ef7e3c03363307515ed3efc0e4ae0d00977
-DIST thunderbird-68.6.0-sv-SE.xpi 591595 BLAKE2B 5ad28c60610cca05ac5a0e35689ab19a00a45670ebafe0fd545b4e7f2b2f4b97d82b83bec641088d8cabf0894ce19f38594c5669fcdb2ab58d25ae72a3194cb5 SHA512 6ca50aeae25dbb54a94d2cb4e2eb6ed6b12ef4f9a70de3ca82ab2f6ecf900d852f4c0c7a1bcbd2810ad466455bb56d1156cd5ff0602e4ff59dfa350d72c0f904
-DIST thunderbird-68.6.0-tr.xpi 599707 BLAKE2B a559378bc53d77d0a078448b7c969f1b80a6ca58beb0ef21ad6a0421414e1bfe29bd7cff3429ea8cd8c5bafae86dc277126891d7ea3e879e54696bc20e48e45a SHA512 8c03c3d9f1f74229ea1bc2701de92e07f866aff61daa0031ed7425e80b5853cd94a62d3b34330088a1fcd32627d1d136b2f89fb9a555453699e888e4800215fd
-DIST thunderbird-68.6.0-uk.xpi 671453 BLAKE2B 98e2e5cb75384d828b5ddf39933ac6bb6ae585591440dadf1181390b6bd115bb1dfe465a7d69ed53f25b868071307af0f2d4a4e9ed34d60d2d1cc92b06cc6973 SHA512 0fddabad83ade542c545ed793a0b1deebf3a862b28367c00a9082977a77c231840671c0ceecd120d0750bbb9647894b0a9cb60388a29a624c9fa3d0e451e0ae1
-DIST thunderbird-68.6.0-vi.xpi 623421 BLAKE2B 2c447c68582f5392176e22605fff3d809555856c2813bee9fccd46e2c4c08897fbeb1ce91cafecf29d0c2c9f6333fd020646177bfe8ccb599c1963804bbc9980 SHA512 5b338f2f05c704554962a14864c41120dbda185827270cc273e90118eab966afdfe363e610a3a828935ac275865d29eae8aaf3cc4d05501804a8e97c370c8fb0
-DIST thunderbird-68.6.0-zh-CN.xpi 626820 BLAKE2B 71ee573160f757d94481cb583e4defca47b6f1618f51af7980c17bdcbef3af6d0e684239a5d3022c6dadaba091a3dd0d38090279e8fcee31c2f5fd1cd9aa3141 SHA512 e2ebed4e9b21e073cc0c09e2e7a79627cf5d1dd5a3bc0cf31892eec339a3763bb2e80e013940fc21375495d861b152aebf4e045ba905c2bff9a2cf21182b0a56
-DIST thunderbird-68.6.0-zh-TW.xpi 627476 BLAKE2B 41fccc4c6f60f782b812a3622d21fcfe993d1473031077e23f3031d3eb03b4d6dae799754a96067d3a3437ec20a44f2eb77bfaf1b2158824cf7bcb5de42c517b SHA512 1e1ddecf4dc8f25fffeeb4ca5f759ee243db84cb74c9aca6af4dc0c39541e4e4a97c53f97bde8132645503ee8aec2fcc24bedba99405a2e4206d25c72e6cdee9
-DIST thunderbird-68.6.0.source.tar.xz 339643212 BLAKE2B 9e1b94ce03d724a94dc5d00ce3112ec2acc9d55412de3e4e8429d4edf5b222076b1cd4ae91d5ff35165c8ce958659c87251d7243f907129507da0281c3d1780c SHA512 3502cc42b594eebf3511219ae8e7fb8a13594534abfe7a40ec32e5a3f60343cfab7c652b161a5f33af46bd5e6f096e3abd4a407c8b307ce4693089b471a42c3e
 DIST thunderbird-68.7.0-ar.xpi 617169 BLAKE2B 383913959eb715b75e048d3244c00676af99e043f575a168eab698b49fe165fb2ae1258f8d991b3710fb3c8fbd7737118e5fa0f960ab14139902a2b0dd6a1042 SHA512 303669b6a8e27d08ce40bd6c5d70b9516110caf4012559263166b890ac37c94873a4377deacb1a888f2e2407ef7cda75c16e06df70e95323557061a2035ade22
 DIST thunderbird-68.7.0-ast.xpi 551299 BLAKE2B d1512027a8ea3f390d4e9aec3c431a5a015c32e9df1140102c63d4405e8629d8196f6557a4f777385a8185dd68c0f7d15b42d2de026a13723cbe65f986ad883b SHA512 0ce499f794fdd0543f8d45c3caca50202f87edde1accc6b82d2f560fc7559772eede3700242040597af7cfee8252a9b23d5c2aa534a53cfc2a634a9608081c0e
 DIST thunderbird-68.7.0-be.xpi 646280 BLAKE2B 5f841fe907361dcf0e9379a81b65453a8d0cae84e13f45b45572d91dcc0e5b3281419ec99eb8a8442e6c06e9fc17f17f0202556151ecb8b91360bca23cb6da61 SHA512 4504169a324374be237b0ea42eb40582f29f076e852a052ad340b43df0c1bf63bf5eddc513e3b53bb56d064af814a6ce142210cb605ec57040b2878d5c2b1b52
@@ -176,6 +122,5 @@ DIST thunderbird-68.7.0-zh-CN.xpi 626820 BLAKE2B 4cc9ff32c4ad28a8204d2efa2af7e7c
 DIST thunderbird-68.7.0-zh-TW.xpi 627476 BLAKE2B 691aeae9654c206a74c91cfa046a9c00836dba6ab22bd5c6f2baa320d9935adf65d40407bc3092c14b72244a75f61bad880c938468f48b3008c22e9f24b8a17b SHA512 f1f94129f28eda53327a49b509fc76cf950fe0cf75976cc4ad83bce064b0002156d5002474fe3244f6723e8addf446448d36828dfa3aef9e55abc031859518a5
 DIST thunderbird-68.7.0.source.tar.xz 339588604 BLAKE2B a623374aa00b577110d01b1c2c77064b16afc6d283150b81367eae74d33c7ecee9ebdb7866e5d9d69e9d28d9ec503ef1890ffaaac8835954e6b7591e0a3e473f SHA512 fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f
 EBUILD thunderbird-52.9.1.ebuild 10471 BLAKE2B 5fae71657b2c422ea54ca1e8f14fc1d762ae4997e7b207ccf38307cd368afc7bd108ec88bfba4cff20eaa1b5721c89ff44b85cdb654a2f532eedc4de72fc40c4 SHA512 71af60f486107c6bc87d1cfdce98a2de171cd8e5b9ba885a31ae6440ce0e34c0dbcdf3b2fd5a5cffc7ff97dbb06a07d309c1a396f5fde91d30cda8be2e743911
-EBUILD thunderbird-68.6.0.ebuild 25024 BLAKE2B 71de4099de52d22d6aa9c219eb119b50432134bf118a85d134c142a49c8224c8ceedc9ec0bcce11cca6c5bc2731b30d74ed1a415b6ad24c3c9a723f75df2312b SHA512 5aea0667ebf2d390571746fcf7de3c77c19902515d2cdaeb936cf59bcfcc2f8dd4a2724bd480e22742252a2a65747dadf86125a0245119ffadd130baf1383d34
-EBUILD thunderbird-68.7.0.ebuild 25026 BLAKE2B d14780d1a174887737512c3b21b76d42d5110745e5e78ab40fca5bc2b68b84306d65df08a7e24c8c75920e750d189f7d7862b439dd92b0629faa1e4a561ad536 SHA512 ac2478e9c944f92eb43a6c4643705663188fd20c12252a8e418114095a7c01d9d6222c0d1d5b965ee257dc15b883e806c709b62c04f243b42a83b056d2a41dcf
+EBUILD thunderbird-68.7.0.ebuild 25026 BLAKE2B 88c5f1367186d44dba11c9cbbfa42e5d077a2ba783a2f7c57a2b4e63080c7456e6883057efb13ec42d879bbe3479cf8dc23e2bb774140b19574b2090f2fcc002 SHA512 e2a053776d21702f011597b77bfc0ca6b683add67682811ecee6f6262f86b0aff6763862cd9ab9403941b9261f7dd9b469c24fa07e95859f9eec6c42fd41d11f
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.6.0.ebuild b/mail-client/thunderbird/thunderbird-68.6.0.ebuild
deleted file mode 100644
index 1be152dda498..000000000000
--- a/mail-client/thunderbird/thunderbird-68.6.0.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=10
-
-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:10
-			!clang? ( sys-devel/llvm:10 )
-			clang? (
-				=sys-devel/lld-10*
-				sys-devel/llvm:10[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			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] )
-			)
-		)
-	)
-	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
-	MOZEXTENSION_TARGET="distribution/extensions" 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.7.0.ebuild b/mail-client/thunderbird/thunderbird-68.7.0.ebuild
index 815f88ec8d96..eddbdf4a6959 100644
--- a/mail-client/thunderbird/thunderbird-68.7.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.7.0.ebuild
@@ -8,7 +8,7 @@ MOZ_ESR=""
 MOZ_LIGHTNING_VER="6.2.5"
 MOZ_LIGHTNING_GDATA_VER="4.4.1"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
@@ -36,7 +36,7 @@ LLVM_MAX_SLOT=10
 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
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index d2ac87270155..a2832c689eb3 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,7 +1,8 @@
 AUX trojita-0.7-gpg-tests.patch 1465 BLAKE2B f336368c8166987dc096991a0855a05d83374b7d509dbd8b39e7a12f6f8b14b86c6405ea55882192601163cee9eadaf9ab306bfbdcae347857bf4dc2f3c5908a SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb
 AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db4b84f7a5dbc67ea0494b188d9ff79ccf096faaedc6a179167bc9394ced0203e9df69cc6368694e885fbb61836 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1
 AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
+AUX trojita-0.7-qt-5.15.patch 774 BLAKE2B 0c1de7d7eebc9782d2e3e889365b283b3c5c82b7d792f167783857e8544f29f0a29284923a9b5f2974a5dbf8b9b3e6147c14654d78a57b67b8151407a63863b6 SHA512 42d45246c49ae99d9a49ed2c2186042427c8ea35b84123c876951f1d9ddcf9236acd14fd36e592041296ca6f6200e20eca786c967dade37bf8be8148dd7b3cca
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
-EBUILD trojita-0.7-r2.ebuild 1937 BLAKE2B 1997e18e832f849041c5f157e1755b14804682a836f93cd5a27360df5f99a4188dfc26505b063a57b2c5c4c828f8b566bf27347d80c20e963c9595e0e30d696b SHA512 70bffb1b5b4c73f253aedd41288e5674cf143d1123c0549334a8c75a4326d3006d471ffa869a3e1ec05185ba66f57d2baae9e406b2cee8a7474e29ce8d6e002e
-EBUILD trojita-9999.ebuild 1791 BLAKE2B 31082327b84b8dbf4266e4e53130295e6feb6a671670ad9b52689d197fab024b7d115e85279dfe91f2561bc7e4aafa3b5a0d8054e3eb7e228e1a6b21eefe6766 SHA512 2cbb459fd5a63e23877de16465af805f83c84c5c5543a0a6b4060aac3c5ddc65e2fcb51844471806f85f7381f2c11aaaf18c78564c826a80dfe4317b87a9b099
+EBUILD trojita-0.7-r2.ebuild 1732 BLAKE2B 4fe9fbd095244f6ca733b7fd7437669d671e96bc288161510f1c523f008abe061df3412d2303099a7511ffff96a5873cb69d8ac4b7bed7ff3176f89306c1fc17 SHA512 614426f9fe99c130354991db3fb4f1f986df2329912edbdd91a1bf201a40ea5eae8a05105f675d136a00563aea397e6ec1140f49c3a296a4b360f490dd565079
+EBUILD trojita-9999.ebuild 1791 BLAKE2B 13bf1d7c29c274cc473948fc40058de9757d6ad51911767c29c961303510f52d6f215365d90ad7d8e0085be610d4edc25df07e443757678f4ff71a8f245de14e SHA512 8f3e67e677262e29a2d26996d741f2fa4685f9c480791e95eb5d925c37dfcc2d3316b5129e0fc677951f0b174ae89e53e35223a6cbc9620f85fea5b16d0cc945
 MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.15.patch b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch
new file mode 100644
index 000000000000..f6ce4cc938d4
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch
@@ -0,0 +1,28 @@
+From 2869c385e72932cbed7398742b8a4d5e3feda765 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 24 Mar 2020 13:14:43 +0100
+Subject: Fix build with Qt 5.15.0
+
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef
+---
+ src/Gui/Window.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
+index 65ba246..8d74874 100644
+--- a/src/Gui/Window.cpp
++++ b/src/Gui/Window.cpp
+@@ -32,6 +32,7 @@
+ #include <QKeyEvent>
+ #include <QMenuBar>
+ #include <QMessageBox>
++#include <QPainterPath>
+ #include <QProgressBar>
+ #include <QRegularExpression>
+ #include <QScopedPointer>
+-- 
+cgit v1.1
+
diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild
index 19df3d885167..f2648fcf92b8 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/"
-if [[ ${PV} != 9999 ]]; then
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
+	inherit git-r3
+else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 	KEYWORDS="amd64 x86"
 fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	zlib? ( virtual/pkgconfig )
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -38,9 +43,7 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
 	test? ( dev-qt/qttest:5 )
-	zlib? ( virtual/pkgconfig )
 "
 
 DOCS=( README LICENSE )
@@ -49,14 +52,15 @@ PATCHES=(
 	"${FILESDIR}/${P}-gpgme.patch"
 	"${FILESDIR}/${P}-gpg-tests.patch"
 	"${FILESDIR}/${P}-qt-5.11b3.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# the build system is taking a look at `git describe ... --dirty` and
 	# gentoo's modifications to CMakeLists.txt break these
-	sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check"
+	sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check"
 }
 
 src_configure() {
@@ -70,23 +74,9 @@ src_configure() {
 		-DWITH_ZLIB=$(usex zlib)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	virtx cmake_src_test
 }
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index a6f81504d4eb..672e67f6cd69 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.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
@@ -18,9 +18,9 @@ HOMEPAGE="http://trojita.flaska.net/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password pim +spell test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-30 12:37:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-30 12:37:28 +0100
commit	be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch)
tree	f82923fbca262493e83dd1382e561a2fae24cc46 /mail-client
parent	7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff)
parent	6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff)