summaryrefslogtreecommitdiff
path: root/mail-client
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
commit21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
treee1810a4b135afce04b34862ef0fab2bfaeb8aeca /mail-client
parent7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
gentoo resync : 15.01.2020
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/Manifest.gzbin4396 -> 4390 bytes
-rw-r--r--mail-client/alot/Manifest15
-rw-r--r--mail-client/alot/alot-0.3.7-r1.ebuild85
-rw-r--r--mail-client/alot/alot-0.5.1.ebuild88
-rw-r--r--mail-client/alot/alot-0.6.ebuild89
-rw-r--r--mail-client/alot/alot-0.7.ebuild89
-rw-r--r--mail-client/alot/alot-0.8.1.ebuild7
-rw-r--r--mail-client/alot/alot-9999.ebuild (renamed from mail-client/alot/alot-0.7-r1.ebuild)69
-rw-r--r--mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch28
-rw-r--r--mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch266
-rw-r--r--mail-client/alot/files/9999-0001-remove-non-working-test.patch31
-rw-r--r--mail-client/alpine/Manifest8
-rw-r--r--mail-client/alpine/alpine-2.00-r7.ebuild4
-rw-r--r--mail-client/alpine/alpine-2.21.1-r1.ebuild4
-rw-r--r--mail-client/alpine/alpine-2.21.1-r2.ebuild4
-rw-r--r--mail-client/alpine/alpine-2.21.1.ebuild4
-rw-r--r--mail-client/evolution/Manifest7
-rw-r--r--mail-client/evolution/evolution-3.30.5.ebuild153
-rw-r--r--mail-client/evolution/evolution-3.32.5-r1.ebuild (renamed from mail-client/evolution/evolution-3.32.4.ebuild)5
-rw-r--r--mail-client/evolution/evolution-3.32.5.ebuild154
-rw-r--r--mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch26
-rw-r--r--mail-client/geary/Manifest10
-rw-r--r--mail-client/geary/files/0.12.4-fix-cancellable.patch25
-rw-r--r--mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch32
-rw-r--r--mail-client/geary/files/geary-0.12-libdir.patch54
-rw-r--r--mail-client/geary/files/geary-0.12-use-upstream-jsc.patch511
-rw-r--r--mail-client/geary/geary-0.12.4.ebuild83
-rw-r--r--mail-client/geary/geary-3.32.0-r1.ebuild90
-rw-r--r--mail-client/geary/geary-3.34.2-r1.ebuild (renamed from mail-client/geary/geary-3.34.2.ebuild)86
-rw-r--r--mail-client/kube/Manifest2
-rw-r--r--mail-client/kube/kube-0.7.0-r1.ebuild4
-rw-r--r--mail-client/mutt/Manifest4
-rw-r--r--mail-client/mutt/mutt-1.13.1.ebuild2
-rw-r--r--mail-client/s-nail/Manifest2
-rw-r--r--mail-client/s-nail/s-nail-14.9.16.ebuild92
-rw-r--r--mail-client/thunderbird-bin/Manifest168
-rw-r--r--mail-client/thunderbird-bin/thunderbird-bin-68.2.2.ebuild182
-rw-r--r--mail-client/thunderbird-bin/thunderbird-bin-68.4.1.ebuild (renamed from mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild)2
-rw-r--r--mail-client/thunderbird/Manifest165
-rw-r--r--mail-client/thunderbird/thunderbird-68.2.2.ebuild778
-rw-r--r--mail-client/thunderbird/thunderbird-68.4.1.ebuild (renamed from mail-client/thunderbird/thunderbird-68.3.0.ebuild)6
-rw-r--r--mail-client/trojita/Manifest2
-rw-r--r--mail-client/trojita/trojita-9999.ebuild8
43 files changed, 681 insertions, 2763 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index c7ed45a7c1c6..ad4857b161ba 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
Binary files differ
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index d764c16f8de3..38f9fda61687 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1,14 +1,7 @@
-AUX 0.5.1-0001-Don-t-install-test-suite.patch 907 BLAKE2B 8da05928083e7878aabd0889c3b2aae924d46b8a7ac9b862f56947fb9b056e1910ee8cfaa1c4d4827beea352667f86779d2608327faf3bf4e67b113404775942 SHA512 1f3940927e4a7edb43e8b96a9c105deb75d47bd4dd643c80b422be028c53d4bc77a27c435a10ac07f6e062a27d704c5ffc6abc28b490a1b767efac4e50100ceb
AUX 0.8.1-0001-remove-non-working-test.patch 1001 BLAKE2B e4ac8575683c32d15250ef0bd0ead027314aa5dae7e0b0f42a0c7ca1d5dbe0c562bccbddb2787b41634432c9ed5aff273642584e26509d11f56702624339a52f SHA512 5f2cc4c51eee1a9bb2c48e9101a1f031b2e0704373c175cbb4a6cdf6649864aa8279fc483f593a3e5fb757d4cc99d3e9b942d439f6f3b5c2c9962433a08b0831
-DIST alot-0.3.7.tar.gz 1475759 BLAKE2B d14ba03f86dfb04f16644f27286e6a7314d0559b345d0430226d45430e99f5ed72eb35cad9c576bf88cdccbc83c5265eb09a30efb2254b79d6b85e5a30ef5a49 SHA512 a0b7e5a7b77f8cdee38c273eec2822bee2e7c409ab4b8803817a49d679dd53ff29750ba7f8a9214368cc7b0b17bd76a40b0263b4701b2ef695c7669316b1b116
-DIST alot-0.5.1.tar.gz 1490645 BLAKE2B fd63ff7191fba3ee7fa3cf362cad9d684513fd6180263a2b888ee2cc00d55ca5442e273ed1b4e4012106db67404715eff4302ea25b89343ca0f467953402de33 SHA512 0194f163724fc5485aa89fe5354d16bdfdd3f539f6f3cfdb715e61835f3e632b8ac0daed44983a95c20eb0244c44c1d7801d262a5fd16ad63c3efd046e05b787
-DIST alot-0.6.tar.gz 1527183 BLAKE2B 60e06d806bf5bfacdec485c3bcde6a5473bce2093abcc20d5e105b40f6d78bf93773c3b54311fdbbb632abe724a410d8941cfb0018842ee445ccea64c73a5033 SHA512 300b99d4919dd59d569de49195e33a3224bc28fbddf0b2aa6e3b419e030a22ec2d9acf389d67eb062cad9f2cd85f019cd6dff23e724491718e246397e70ed059
-DIST alot-0.7.tar.gz 1539283 BLAKE2B 33e77f815c4f83fc08f1834a89a984309c1d4b89454d9bb0df625d00725c64769ce4989fa8df8f38d40d1c35fb78202880fedc0a0a5e7134f1938a03c79e7721 SHA512 542827c94e6cfc57699613b352527582dc2e365d957ba6b7e835584e8b83d0704452acd5ab8e4e1e408c283ec3400a8bbe465b2a8fad9f95fb330328c4fe81f8
+AUX 0.8.1-0002-changed-expired-test-keys.patch 16640 BLAKE2B 5bf18589c4a3b1f16a6d49c243cb5bd314947c31e26fd7517b76436656cb56bf2213daa60ba6f2e1fdc200cba2946a690492bfceef0abe9bbdbb214ebc3f81cf SHA512 ec8e4925965573b33694e9ee466b363e8b0a2c984f8c6027944bbb951d58f501125af76c6a813c43175694b937f7191451eea660e15bdbd69bba1387d999dfb2
+AUX 9999-0001-remove-non-working-test.patch 1017 BLAKE2B 4a12441ff229af7fa0cb58e0e68775bb418afcd621487b46eaa1ce2411eaaa388df26ac04db8dc7c5b5c7342a75f1df70ee8241e60e1da5c28a89a741455250a SHA512 1aa122c884ce7899ad0fe5a99c5acb298fbb20b1ad5df8d264bb133c8f8c439c26cdb0694aa4d61b1b37de72bbe7ef2951d09a11283dbdeeaad103015e48e354
DIST alot-0.8.1.tar.gz 220342 BLAKE2B 019f41f1f1fe73aa17a309a73b12883cbbae6a232d912d0e328b3862fc4e8e49ea6a3d0b6e2921ecb4d6ee8a58a9f6826facd7ff4cd6fafc17f6f5fe0195dd2c SHA512 bca4a01636594f0e71c6ea260d74cf26e74dfd7aca1ea7801714b4aaf9602ae7737769e77e3af0363ed2701df1494e0f87ce85b58c47a6380ad1a9098f8501d4
-EBUILD alot-0.3.7-r1.ebuild 1824 BLAKE2B 30ff26b9847099731b551c48da9e0c47f73168628ab156c0d596ecb11a4f1b672013c988e6a291e68647f7a7dd6c1bcbc89f5126c9f252457b8b76bb10189201 SHA512 b422278386cdfdc4ad1c4e853945ed680428b1cce9ca11ac251733aa86269515cf66320feedb1dcc8afb3b85145c45f9c2325e94b8968cb184df2ff4161961ae
-EBUILD alot-0.5.1.ebuild 1990 BLAKE2B 87adf5637dbb42c6090bafae548d78349e5c9a3cd8fd0385f22887816cf0aeff0308550098b0999ffb79b340f2d5cdcbeb82e6703e051d5f0b3a994bc985bd68 SHA512 d6ffc51bc52e1a55916c09ebf9eff276d27a2469c36dcf35ea9bed4d1480150be3f1d709622013d376ec86bf69fa6d92ca1151160534df082b940a90e9d0d92a
-EBUILD alot-0.6.ebuild 2462 BLAKE2B 702a18133d948f1d19701cd7927cc751c4e560cd5cedfd553d10f7ad2ccdda227139024530050f7f9a813a003ea8d18b68ff1c23b8482d9a4bcf53edce6cfc12 SHA512 1cf34c14c5b785aa00c73f58edc26541cbd5f5c70cd2ff43c65dc8e6ede65729f0527ce49ddc6adfba2d0f5fbd14175b8c11bb1041dff93b569e39c7c9197543
-EBUILD alot-0.7-r1.ebuild 2448 BLAKE2B 6c43724238b23874af78476ae2a4f2968e900a9a778d903726771af3e9b1395ef81c9d624e710555413a2371b0620ae48a22d28f10c1ff52d1168cb5ad277836 SHA512 eb18097730ff2670757ea0bf5eb00c260e413e824fbc7bc2dc879b8f3a61949c6dfed57a768eef1f00a45b7b1138775ff53ff07a58a3cf16a4f0a57048477935
-EBUILD alot-0.7.ebuild 2462 BLAKE2B 702a18133d948f1d19701cd7927cc751c4e560cd5cedfd553d10f7ad2ccdda227139024530050f7f9a813a003ea8d18b68ff1c23b8482d9a4bcf53edce6cfc12 SHA512 1cf34c14c5b785aa00c73f58edc26541cbd5f5c70cd2ff43c65dc8e6ede65729f0527ce49ddc6adfba2d0f5fbd14175b8c11bb1041dff93b569e39c7c9197543
-EBUILD alot-0.8.1.ebuild 1935 BLAKE2B dc6ffef7f576f2f53bd29c673830e48f7696555502ce5d2bafedd3313d76c3b08752f28c7618d984cd70dacd92d30ce5f6f818d3149b1076a903f49aedbd845a SHA512 90d7dffa8a6d350bac188ebfcfba69d30e8213170e8b105d2bc12b5b055084bfec0a467327dbe11068019782bea844e467daa89f4e57e049636967106627f7f7
+EBUILD alot-0.8.1.ebuild 1998 BLAKE2B 46501085e4f147292300691f35ebf3b820ab96ce746db455808e5b588887a5a792b3d49b9e6f8c3f7bc793ede8eba09a4f3d92a001005e85adfe05d2ef6c8bfa SHA512 1f89490c9213c1ad24b1b221029ac1f1c68b1cd2382fb8ceba852b86248f77e5cc07928e07e5bf1df5034e53f2e6a5f07fc8a1ac2859cd56f9147933ef415efa
+EBUILD alot-9999.ebuild 2045 BLAKE2B 0f85a8e030bb6b1b3f3a965a999eaa9a689b55ebf50e6c901d628bf700089b876170933c58521e7dea24f2c271a5db971c9ceb154a13552efad4e95912061779 SHA512 2abc76010858f5e9ba171b4678950727ea6df88540e4b4a6956a38faa863b70c183b50c243352dff54d7eac9793cf5f19dd95fc8e6f1e219b167c421e34474ad
MISC metadata.xml 828 BLAKE2B f6a639fc8922f7c50e2ac449edb16e17abb622c3f39ab055d13db4cc81db074dfee37fff81ba043574fce37a8d9db426184c0e6d50c9dbc0f8124f72de8741fb SHA512 3300e7f9f49bd40cfb9cbbb4917b88edad34a03bc0b69699d79ad8b120800433b27b74b65207292602f54157496056c59caf4bbcc50b9fc94ca50e59ddaccbd4
diff --git a/mail-client/alot/alot-0.3.7-r1.ebuild b/mail-client/alot/alot-0.3.7-r1.ebuild
deleted file mode 100644
index e5de9377b0a5..000000000000
--- a/mail-client/alot/alot-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="${HOMEPAGE}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- "
-RDEPEND="
- >=dev-python/configobj-4.6.0[${PYTHON_USEDEP}]
- dev-python/pygpgme[${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-10.2.0
- >=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
- net-mail/mailbase
- >=net-mail/notmuch-0.13[crypt,python]
- "
-
-ALOT_UPDATE=""
-
-pkg_setup() {
- if has_version "<${CATEGORY}/${PN}-0.3.2"; then
- ALOT_UPDATE="yes"
- fi
-}
-
-src_prepare() {
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
- -e '1i# -*- coding: utf-8 -*-' -i || die
-
- distutils-r1_src_prepare
-
- local md
- for md in *.md; do
- mv "${md}" "${md%.md}"
- done
-}
-
-src_compile() {
- distutils-r1_src_compile
-
- if use doc; then
- pushd docs || die
- emake html
- popd || die
- fi
-}
-
-src_install() {
- distutils-r1_src_install
-
- dodir /usr/share/alot
- insinto /usr/share/alot
- doins -r extra
-
- if use doc; then
- dohtml -r docs/build/html/*
- fi
-}
-
-pkg_postinst() {
- if [[ ${ALOT_UPDATE} = yes ]]; then
- ewarn "The syntax of theme-files and custom tags-sections of the config"
- ewarn "has been changed. You have to revise your config. There are"
- ewarn "converter scripts in /usr/share/alot/extra to help you out with"
- ewarn "this:"
- ewarn ""
- ewarn " * tagsections_convert.py for your ~/.config/alot/config"
- ewarn " * theme_convert.py to update your custom theme files"
- fi
-}
diff --git a/mail-client/alot/alot-0.5.1.ebuild b/mail-client/alot/alot-0.5.1.ebuild
deleted file mode 100644
index fde61c5f8263..000000000000
--- a/mail-client/alot/alot-0.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="${HOMEPAGE}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
- "
-RDEPEND="
- >=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
- >=dev-python/pygpgme-0.2[${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-10.2.0[${PYTHON_USEDEP}]
- >=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
- net-mail/mailbase
- >=net-mail/notmuch-0.13[crypt,python]
- "
-PATCHES=( "${FILESDIR}"/0.5.1-0001-Don-t-install-test-suite.patch )
-
-ALOT_UPDATE=""
-
-pkg_setup() {
- if has_version "<${CATEGORY}/${PN}-0.3.2"; then
- ALOT_UPDATE="yes"
- fi
-}
-
-src_prepare() {
- find "${S}" -name '*.py' -print0 | xargs -0 -- sed \
- -e '1i# -*- coding: utf-8 -*-' -i || die
-
- distutils-r1_src_prepare
-
- local md
- for md in *.md; do
- mv "${md}" "${md%.md}"
- done
-}
-
-src_compile() {
- distutils-r1_src_compile
-
- if use doc; then
- pushd docs || die
- emake html
- popd || die
- fi
-}
-
-src_install() {
- distutils-r1_src_install
-
- dodir /usr/share/alot
- insinto /usr/share/alot
- doins -r extra
-
- if use doc; then
- dohtml -r docs/build/html/*
- fi
-}
-
-pkg_postinst() {
- if [[ ${ALOT_UPDATE} = yes ]]; then
- ewarn "The syntax of theme-files and custom tags-sections of the config"
- ewarn "has been changed. You have to revise your config. There are"
- ewarn "converter scripts in /usr/share/alot/extra to help you out with"
- ewarn "this:"
- ewarn ""
- ewarn " * tagsections_convert.py for your ~/.config/alot/config"
- ewarn " * theme_convert.py to update your custom theme files"
- fi
-}
diff --git a/mail-client/alot/alot-0.6.ebuild b/mail-client/alot/alot-0.6.ebuild
deleted file mode 100644
index 9ac4153a9cdc..000000000000
--- a/mail-client/alot/alot-0.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="https://github.com/pazz/alot/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
- "
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
- >=app-crypt/gpgme-1.9.0[python,${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-10.2.0[${PYTHON_USEDEP}]
- >=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
- net-mail/mailbase
- >=net-mail/notmuch-0.13[crypt,python]
- "
-
-python_prepare_all() {
- find "${S}" -name '*.py' -exec sed -e '1i# -*- coding: utf-8 -*-' -i '{}' +
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- emake -C docs html
- HTML_DOCS=( docs/build/html/. )
- fi
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/alot
- doins -r extra
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- echo
- elog "If you are new to Alot you may want to take a look at"
- elog "the user manual:"
- elog " https://alot.readthedocs.io/en/latest/"
- echo
- else
- local rv
- for rv in ${REPLACING_VERSIONS} ; do
- if [[ "0.3.2" == "${rv}" ]]; then
- ewarn ""
- ewarn "The syntax of theme-files and custom tags-sections of the config"
- ewarn "has been changed. You have to revise your config. There are"
- ewarn "converter scripts in /usr/share/alot/extra to help you out with"
- ewarn "this:"
- ewarn ""
- ewarn " * tagsections_convert.py for your ~/.config/alot/config"
- ewarn " * theme_convert.py to update your custom theme files"
- break;
- fi
- if [[ "0.5.1" == "${rv}" ]]; then
- ewarn ""
- ewarn "Since 0.6 version the GPG engine has switched to app-crypt/gpgme"
- ewarn "to use GPG signing operations, you can pass the key id has arg"
- ewarn "or setup the gpg_key value in your config file, see"
- ewarn " https://alot.readthedocs.io/en/latest/usage/crypto.html?highlight=gpg"
- ewarn ""
- break;
- fi
- done
- fi
-}
diff --git a/mail-client/alot/alot-0.7.ebuild b/mail-client/alot/alot-0.7.ebuild
deleted file mode 100644
index 9ac4153a9cdc..000000000000
--- a/mail-client/alot/alot-0.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="https://github.com/pazz/alot/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
- "
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
- >=app-crypt/gpgme-1.9.0[python,${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-10.2.0[${PYTHON_USEDEP}]
- >=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
- net-mail/mailbase
- >=net-mail/notmuch-0.13[crypt,python]
- "
-
-python_prepare_all() {
- find "${S}" -name '*.py' -exec sed -e '1i# -*- coding: utf-8 -*-' -i '{}' +
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- emake -C docs html
- HTML_DOCS=( docs/build/html/. )
- fi
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/alot
- doins -r extra
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- echo
- elog "If you are new to Alot you may want to take a look at"
- elog "the user manual:"
- elog " https://alot.readthedocs.io/en/latest/"
- echo
- else
- local rv
- for rv in ${REPLACING_VERSIONS} ; do
- if [[ "0.3.2" == "${rv}" ]]; then
- ewarn ""
- ewarn "The syntax of theme-files and custom tags-sections of the config"
- ewarn "has been changed. You have to revise your config. There are"
- ewarn "converter scripts in /usr/share/alot/extra to help you out with"
- ewarn "this:"
- ewarn ""
- ewarn " * tagsections_convert.py for your ~/.config/alot/config"
- ewarn " * theme_convert.py to update your custom theme files"
- break;
- fi
- if [[ "0.5.1" == "${rv}" ]]; then
- ewarn ""
- ewarn "Since 0.6 version the GPG engine has switched to app-crypt/gpgme"
- ewarn "to use GPG signing operations, you can pass the key id has arg"
- ewarn "or setup the gpg_key value in your config file, see"
- ewarn " https://alot.readthedocs.io/en/latest/usage/crypto.html?highlight=gpg"
- ewarn ""
- break;
- fi
- done
- fi
-}
diff --git a/mail-client/alot/alot-0.8.1.ebuild b/mail-client/alot/alot-0.8.1.ebuild
index 809ff797b5ab..7594d4ca93e0 100644
--- a/mail-client/alot/alot-0.8.1.ebuild
+++ b/mail-client/alot/alot-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1
@@ -23,7 +23,7 @@ RDEPEND="
dev-python/python-magic[${PYTHON_USEDEP}]
>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
>=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
- dev-python/twisted[${PYTHON_USEDEP}]
+ >=dev-python/twisted-18.4[${PYTHON_USEDEP}]
net-mail/mailbase
>=net-mail/notmuch-0.27[crypt,python]
"
@@ -38,6 +38,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+ "${FILESDIR}/${PV}-0002-changed-expired-test-keys.patch"
)
python_compile_all() {
diff --git a/mail-client/alot/alot-0.7-r1.ebuild b/mail-client/alot/alot-9999.ebuild
index ab4df39fe3b8..50fe8ee1241a 100644
--- a/mail-client/alot/alot-0.7-r1.ebuild
+++ b/mail-client/alot/alot-9999.ebuild
@@ -1,44 +1,50 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 vcs-snapshot
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/pazz/alot/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
HOMEPAGE="https://github.com/pazz/alot"
-SRC_URI="https://github.com/pazz/alot/tarball/${PV} -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
- "
RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
>=app-crypt/gpgme-1.9.0[python,${PYTHON_USEDEP}]
+ >=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/twisted[${PYTHON_USEDEP}]
- >=dev-python/urwid-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
>=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
+ >=dev-python/twisted-18.4[${PYTHON_USEDEP}]
net-mail/mailbase
- >=net-mail/notmuch-0.13[crypt,python]
+ >=net-mail/notmuch-0.27[crypt,python]
+ "
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
"
-python_prepare_all() {
- find "${S}" -name '*.py' -exec sed -e '1i# -*- coding: utf-8 -*-' -i '{}' +
-
- distutils-r1_python_prepare_all
-}
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+ )
python_compile_all() {
if use doc; then
@@ -47,6 +53,10 @@ python_compile_all() {
fi
}
+src_test() {
+ esetup.py test
+}
+
python_install_all() {
distutils-r1_python_install_all
@@ -56,33 +66,22 @@ python_install_all() {
pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]] ; then
- echo
+ elog ""
elog "If you are new to Alot you may want to take a look at"
elog "the user manual:"
elog " https://alot.readthedocs.io/en/latest/"
- echo
+ elog ""
else
local rv
for rv in ${REPLACING_VERSIONS} ; do
- if [[ "0.3.2" == "${rv}" ]]; then
- ewarn ""
- ewarn "The syntax of theme-files and custom tags-sections of the config"
- ewarn "has been changed. You have to revise your config. There are"
- ewarn "converter scripts in /usr/share/alot/extra to help you out with"
- ewarn "this:"
- ewarn ""
- ewarn " * tagsections_convert.py for your ~/.config/alot/config"
- ewarn " * theme_convert.py to update your custom theme files"
- break;
- fi
- if [[ "0.5.1" == "${rv}" ]]; then
+ if ver_test "${rv}" -le "0.5.1"; then
ewarn ""
ewarn "Since 0.6 version the GPG engine has switched to app-crypt/gpgme"
ewarn "to use GPG signing operations, you can pass the key id has arg"
ewarn "or setup the gpg_key value in your config file, see"
ewarn " https://alot.readthedocs.io/en/latest/usage/crypto.html?highlight=gpg"
ewarn ""
- break;
+ break
fi
done
fi
diff --git a/mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch b/mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch
deleted file mode 100644
index cbe0bedb4be5..000000000000
--- a/mail-client/alot/files/0.5.1-0001-Don-t-install-test-suite.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8af6cea015eeea61a3421b4f98ee4ba12f6c9b17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 29 May 2017 12:10:15 +0100
-Subject: [PATCH] Don't install test suite
-
-See
-<http://setuptools.readthedocs.io/en/latest/setuptools.html?highlight=find_packages#using-find-packages>
-for example patterns.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index a3f6f90..b4533f7 100755
---- a/setup.py
-+++ b/setup.py
-@@ -11,7 +11,7 @@ setup(name='alot',
- author_email=alot.__author_email__,
- url=alot.__url__,
- license=alot.__copyright__,
-- packages=find_packages(),
-+ packages=find_packages(exclude=["tests.*", "tests"]),
- package_data={'alot': [
- 'defaults/alot.rc.spec',
- 'defaults/notmuch.rc.spec',
---
-2.12.2
-
diff --git a/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch b/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch
new file mode 100644
index 000000000000..97b719abfbac
--- /dev/null
+++ b/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch
@@ -0,0 +1,266 @@
+diff --git a/tests/static/gpg-keys/ambig1-pub.gpg b/tests/static/gpg-keys/ambig1-pub.gpg
+index 8bc893d6e..88d10835b 100644
+--- a/tests/static/gpg-keys/ambig1-pub.gpg
++++ b/tests/static/gpg-keys/ambig1-pub.gpg
+@@ -6,25 +6,25 @@ T2ajgXj1lJ+ZiULHRlSmBoA2blFeABE4PRgef+x6aDJpMtODWG/2NaWw/gFn6kqS
+ OGyqMp0nM3OHeEwZAjf+n1f07wqJHK+m1V3I2rY4wm5LST0kZXJGYFDfjaTuTOOC
+ yPMyhWoqJ/CCWavO47MRdYrlM6qUbVBTQ8DSBGZO2yuF/ILLICC8d/ODGva+kNDq
+ Bm4PmYvVrB0osfxMXVBaxezwOKkDiE3w4fOXABEBAAG0GWFtYmlnIDxhbWJpZ0Bl
+-eGFtcGxlLmNvbT6JAVQEEwEIAD4WIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCWWZd
+-fAIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRBVk3r7sVYkXXte
+-B/sGzTrrHk7da9GqLtJPYPiI4uckInb7xcxOANd2MMO27ZdBcy+77tdVNDmGnmUP
+-W1KW0APTL5JL8XNo39r7eKGfp66g6qF8Lto/X22DIyv5tld1XARwXt5z19P/oA9F
+-BTwSkqP/pWg5rYJwSmZwNdYF+kFTTokTxZgXDVfQcDa4qnPRy4wZSoiQewE3itdn
+-fwexxuhXmS406UPLBhmFItGH4BThk0z5b0EVLt1zvff6q1po3hlcZr+2u71WvYzF
+-ufJfWQr5xo6PX1Po16Da5Pz+mnuaz7vT+i3RwLo1wOsu7rXNAAVzg3VstGKAobGE
+-ix+ET7uB05xJLFLt6jlVg2ChuQENBFlmXXwBCADLAS1JN3UykZbL3JCiatPe6Ce6
+-ErkzEwnECJxTyg2UqsrQJ/SdPRCJ8wyQ0jWBezn/4MNCiJoacPR+YVo6CVi/R/Kc
+-7qfiqxVp5mfxSf4qpbC1esZ0L20VdhUnWKc+YvSUhGPIe73ruiDVXt+QnyZiLm9B
+-niUNaEL/j8GI9o5J6y2v3IQJwO9cmVKuQa2aE1c9zG4ZxIrzlgrI8bF2jcm/olx6
+-a1X55TsqQEA/CEl5tsyr5gOBa/4qXc1STUCZthEKffbDsSH+8d+26Y7Qw201BWWQ
+-6Hx/8jnyaKzmP+ANymG2Bj4lioEY96Qu6vzzQ4RwUvkcJB6K1Osr/diwhkeJABEB
+-AAGJATwEGAEIACYWIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCWWZdfAIbDAUJA8Jn
+-AAAKCRBVk3r7sVYkXY01CACDoMkoAYNeCa43g11zywczl4ZyGLQuDD1BomKP3Jur
+-58sNo6OjYd0bRSUtn6V7vPKaMIm1b+VF2L9/c0Oia807yr+7h36XoriTas1iAqkp
+-gx3ZQ06daenq/074edPvnrknzYpnzCZM5SQcyCTU6QPgLU2rNZAl75CH2SfpY0SK
+-HUMHjiD+HKueNrAstqsY1DJdO+aQDdYxLJxuax2003+qriX0hDp0X7Nym4v+cd1X
+-xgsVMkqFIYkwJXUlooMRLAb1ifkUEiezsr5i5iudwrsIb7WjcDEXOFSHRXpT63z0
+-glpUupwfhHcODTOmIgyhrfbmN60eiEcojfSdMsWi2ktr
+-=sqEe
++eGFtcGxlLmNvbT6JAU4EEwEIADgCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AW
++IQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCXTAbegAKCRBVk3r7sVYkXQZbB/9jM/OE
++Gtf6XSb00w+1u70q2BFNKKZWYeCH50rIOljeC4rAEp+GBToTpFnxZwtoXZGLh2SD
+++DVZCeHupJBsC9E7qv3hM2VjyJE14JCAvyj+S2LHhF1Yr9PLApUAQLqvPCtXvCF5
++Qr4fC3QxpzWLghPllrW3oTPeaXOu/EXDRWN4ctYqEeluuKsLsZf71BVtKoUAifpI
++j/yt2qo3fcNC3/wnDdgBn/qpZhm6mj69WN597HRkn3clmxPasa5cOHkaqohVuHTk
++2oYDZH8YWbhzjhobfHWPo/2k8SpACTb98JS9tiG8cpeQ+74fG0r1CF0AHPGGyXkV
++mxKMOBOQ+X7HM5aEuQENBFlmXXwBCADLAS1JN3UykZbL3JCiatPe6Ce6ErkzEwnE
++CJxTyg2UqsrQJ/SdPRCJ8wyQ0jWBezn/4MNCiJoacPR+YVo6CVi/R/Kc7qfiqxVp
++5mfxSf4qpbC1esZ0L20VdhUnWKc+YvSUhGPIe73ruiDVXt+QnyZiLm9BniUNaEL/
++j8GI9o5J6y2v3IQJwO9cmVKuQa2aE1c9zG4ZxIrzlgrI8bF2jcm/olx6a1X55Tsq
++QEA/CEl5tsyr5gOBa/4qXc1STUCZthEKffbDsSH+8d+26Y7Qw201BWWQ6Hx/8jny
++aKzmP+ANymG2Bj4lioEY96Qu6vzzQ4RwUvkcJB6K1Osr/diwhkeJABEBAAGJATYE
++GAEIACACGwwWIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCXTAboQAKCRBVk3r7sVYk
++Xe3ZCACD1TGV9es49NnyfSBZ3kSJIOFT6uD7akjHTqsDEet+kpufP7jVsL3mZ3MY
++8WV4VC9KW+VgPgWGMLDIiTNrQ240XFXhiGs+W45Nf9EdS1o7f9yQwskIERd0ZNJq
++kJ4AoHyz4zVS0+krSqrMWHUkjrbVwS80/kc08yTrBos+spDeDsSn6x9Ebrs5n4gW
++6xeKHvJXAJWU/wsgU6t47BWD6aX4pbh3SG/umrWHJ6oiM2zPMvP4D5vxXyHj3guf
++0yqm4SG125KECJt/Jy/YdIwu7ksppLxY5mD517iBwEZnd8QY/jRa/V2rLJltL8AT
++wRUHSm/4vOCLTuZsDm0ZmWcdNNYO
++=CY00
+ -----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/static/gpg-keys/ambig1-sec.gpg b/tests/static/gpg-keys/ambig1-sec.gpg
+index 35be3bcbb..96aee9ae1 100644
+--- a/tests/static/gpg-keys/ambig1-sec.gpg
++++ b/tests/static/gpg-keys/ambig1-sec.gpg
+@@ -19,39 +19,39 @@ hoshLC15VwmspXy3g3YQlvuB0NlJaaqlQy9Q+MUeyrKbxWweUn12SqtcG6yV+/hy
+ zHX6VcaAinar0/l9lHHnthHWy520gDMEAJC8NI6kgQIfLCLGTzmDeOmTpcvRZrFV
+ Q7l0AnWvTK5KQHdkrbjz4HjN0yhmmwgquFi9ZAjSfjuvetggQ1d3/X50XyEBM25K
+ h4XNoWaTPdoh9PkUkfLipj3b703dzAgI5tFlXQuYgPfi5mj/P+tNCOITDz92Z3H3
+-i+RITGJOL9/DO2e0GWFtYmlnIDxhbWJpZ0BleGFtcGxlLmNvbT6JAVQEEwEIAD4W
+-IQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCWWZdfAIbAwUJA8JnAAULCQgHAgYVCAkK
+-CwIEFgIDAQIeAQIXgAAKCRBVk3r7sVYkXXteB/sGzTrrHk7da9GqLtJPYPiI4uck
+-Inb7xcxOANd2MMO27ZdBcy+77tdVNDmGnmUPW1KW0APTL5JL8XNo39r7eKGfp66g
+-6qF8Lto/X22DIyv5tld1XARwXt5z19P/oA9FBTwSkqP/pWg5rYJwSmZwNdYF+kFT
+-TokTxZgXDVfQcDa4qnPRy4wZSoiQewE3itdnfwexxuhXmS406UPLBhmFItGH4BTh
+-k0z5b0EVLt1zvff6q1po3hlcZr+2u71WvYzFufJfWQr5xo6PX1Po16Da5Pz+mnua
+-z7vT+i3RwLo1wOsu7rXNAAVzg3VstGKAobGEix+ET7uB05xJLFLt6jlVg2ChnQOY
+-BFlmXXwBCADLAS1JN3UykZbL3JCiatPe6Ce6ErkzEwnECJxTyg2UqsrQJ/SdPRCJ
+-8wyQ0jWBezn/4MNCiJoacPR+YVo6CVi/R/Kc7qfiqxVp5mfxSf4qpbC1esZ0L20V
+-dhUnWKc+YvSUhGPIe73ruiDVXt+QnyZiLm9BniUNaEL/j8GI9o5J6y2v3IQJwO9c
+-mVKuQa2aE1c9zG4ZxIrzlgrI8bF2jcm/olx6a1X55TsqQEA/CEl5tsyr5gOBa/4q
+-Xc1STUCZthEKffbDsSH+8d+26Y7Qw201BWWQ6Hx/8jnyaKzmP+ANymG2Bj4lioEY
+-96Qu6vzzQ4RwUvkcJB6K1Osr/diwhkeJABEBAAEAB/kBPUh7fz8QSBdEqBCqdpj5
+-fS8+FVjT4Idof87XWUtkozPzbszl/gkYozgP1Rx6/Jl+Z33zGmSElQtBj3KY/Bxy
+-esCtgCFkJmldStvht3qE8zIEZ77mMcCi+fccgkSF83R6G6Y5P7ZFtvuqr/DFt7xw
+-X5pR0NOX6InBHmJFogf1iXG5aOgyHvxL68QJetvJu58K4RHg2uWyoRt0b6xwL06/
+-bqH9NM0ITjlOf+qKyf6/69B2PnKVKrkobzP8t3nh4te00xHSLlxFFWGHXGACDa/Q
+-KkVdeDCFPJSjh4lqKVl4DAAUxmf3rxkRvg1bU+8kX+xDhw1MLIZ2VmH4SgGDkOZJ
+-BADg94tSFyXekWEhEdNypeHdcb//sLRv9L7Z2tQ+xKksymBvIMEXSEWUTO6nFF5O
+-gtURsn2tm1qX8u52wok4avbndtQjEpJ/EqXuIFdJ0vsCPnZPEzcRy9fhii0EDKuA
+-rzpM1Wats+M45X+TzxHmEeBXF/z30qvMoHdOuRLiQIdXKwQA5wIOYVA9r92fCs08
+-ar/hfhGHKray8P7aOTN4pSR4E5CjjIDArHw0aVsk0oY6MgqxnMC/f57HH7LgM8MR
+-etqBUuNoJzI+3YoQdqVi4Cdgs/8WDMvibOCPxiiXVsVLS0gYUTN8sJpLy9dLxzr3
+-f+m9GFHGAjviRbJGOxGbTOXVQhsD/0l9vKvlS76/Rm3GCeo5kaqDVjt/Zh4YwLwy
+-OcnQFafOVS2vpNH1A3LCBxUFqXjpyrnXhCDfblbwsPe2y8T28jFWUInvzNqOjKHi
+-awYD1mSywF/YR67cO51ZrbL/6lJv0TiGvN5n5PKBWrXoYcRDwUdM2Qq238b4TqGq
+-+ZlnbXV4SU2JATwEGAEIACYWIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCWWZdfAIb
+-DAUJA8JnAAAKCRBVk3r7sVYkXY01CACDoMkoAYNeCa43g11zywczl4ZyGLQuDD1B
+-omKP3Jur58sNo6OjYd0bRSUtn6V7vPKaMIm1b+VF2L9/c0Oia807yr+7h36XoriT
+-as1iAqkpgx3ZQ06daenq/074edPvnrknzYpnzCZM5SQcyCTU6QPgLU2rNZAl75CH
+-2SfpY0SKHUMHjiD+HKueNrAstqsY1DJdO+aQDdYxLJxuax2003+qriX0hDp0X7Ny
+-m4v+cd1XxgsVMkqFIYkwJXUlooMRLAb1ifkUEiezsr5i5iudwrsIb7WjcDEXOFSH
+-RXpT63z0glpUupwfhHcODTOmIgyhrfbmN60eiEcojfSdMsWi2ktr
+-=r1WA
++i+RITGJOL9/DO2e0GWFtYmlnIDxhbWJpZ0BleGFtcGxlLmNvbT6JAU4EEwEIADgC
++GwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AWIQTdGYYoCadXOnQFj/JVk3r7sVYk
++XQUCXTAbegAKCRBVk3r7sVYkXQZbB/9jM/OEGtf6XSb00w+1u70q2BFNKKZWYeCH
++50rIOljeC4rAEp+GBToTpFnxZwtoXZGLh2SD+DVZCeHupJBsC9E7qv3hM2VjyJE1
++4JCAvyj+S2LHhF1Yr9PLApUAQLqvPCtXvCF5Qr4fC3QxpzWLghPllrW3oTPeaXOu
++/EXDRWN4ctYqEeluuKsLsZf71BVtKoUAifpIj/yt2qo3fcNC3/wnDdgBn/qpZhm6
++mj69WN597HRkn3clmxPasa5cOHkaqohVuHTk2oYDZH8YWbhzjhobfHWPo/2k8SpA
++CTb98JS9tiG8cpeQ+74fG0r1CF0AHPGGyXkVmxKMOBOQ+X7HM5aEnQOYBFlmXXwB
++CADLAS1JN3UykZbL3JCiatPe6Ce6ErkzEwnECJxTyg2UqsrQJ/SdPRCJ8wyQ0jWB
++ezn/4MNCiJoacPR+YVo6CVi/R/Kc7qfiqxVp5mfxSf4qpbC1esZ0L20VdhUnWKc+
++YvSUhGPIe73ruiDVXt+QnyZiLm9BniUNaEL/j8GI9o5J6y2v3IQJwO9cmVKuQa2a
++E1c9zG4ZxIrzlgrI8bF2jcm/olx6a1X55TsqQEA/CEl5tsyr5gOBa/4qXc1STUCZ
++thEKffbDsSH+8d+26Y7Qw201BWWQ6Hx/8jnyaKzmP+ANymG2Bj4lioEY96Qu6vzz
++Q4RwUvkcJB6K1Osr/diwhkeJABEBAAEAB/kBPUh7fz8QSBdEqBCqdpj5fS8+FVjT
++4Idof87XWUtkozPzbszl/gkYozgP1Rx6/Jl+Z33zGmSElQtBj3KY/BxyesCtgCFk
++JmldStvht3qE8zIEZ77mMcCi+fccgkSF83R6G6Y5P7ZFtvuqr/DFt7xwX5pR0NOX
++6InBHmJFogf1iXG5aOgyHvxL68QJetvJu58K4RHg2uWyoRt0b6xwL06/bqH9NM0I
++TjlOf+qKyf6/69B2PnKVKrkobzP8t3nh4te00xHSLlxFFWGHXGACDa/QKkVdeDCF
++PJSjh4lqKVl4DAAUxmf3rxkRvg1bU+8kX+xDhw1MLIZ2VmH4SgGDkOZJBADg94tS
++FyXekWEhEdNypeHdcb//sLRv9L7Z2tQ+xKksymBvIMEXSEWUTO6nFF5OgtURsn2t
++m1qX8u52wok4avbndtQjEpJ/EqXuIFdJ0vsCPnZPEzcRy9fhii0EDKuArzpM1Wat
++s+M45X+TzxHmEeBXF/z30qvMoHdOuRLiQIdXKwQA5wIOYVA9r92fCs08ar/hfhGH
++Kray8P7aOTN4pSR4E5CjjIDArHw0aVsk0oY6MgqxnMC/f57HH7LgM8MRetqBUuNo
++JzI+3YoQdqVi4Cdgs/8WDMvibOCPxiiXVsVLS0gYUTN8sJpLy9dLxzr3f+m9GFHG
++AjviRbJGOxGbTOXVQhsD/0l9vKvlS76/Rm3GCeo5kaqDVjt/Zh4YwLwyOcnQFafO
++VS2vpNH1A3LCBxUFqXjpyrnXhCDfblbwsPe2y8T28jFWUInvzNqOjKHiawYD1mSy
++wF/YR67cO51ZrbL/6lJv0TiGvN5n5PKBWrXoYcRDwUdM2Qq238b4TqGq+ZlnbXV4
++SU2JATYEGAEIACACGwwWIQTdGYYoCadXOnQFj/JVk3r7sVYkXQUCXTAboQAKCRBV
++k3r7sVYkXe3ZCACD1TGV9es49NnyfSBZ3kSJIOFT6uD7akjHTqsDEet+kpufP7jV
++sL3mZ3MY8WV4VC9KW+VgPgWGMLDIiTNrQ240XFXhiGs+W45Nf9EdS1o7f9yQwskI
++ERd0ZNJqkJ4AoHyz4zVS0+krSqrMWHUkjrbVwS80/kc08yTrBos+spDeDsSn6x9E
++brs5n4gW6xeKHvJXAJWU/wsgU6t47BWD6aX4pbh3SG/umrWHJ6oiM2zPMvP4D5vx
++XyHj3guf0yqm4SG125KECJt/Jy/YdIwu7ksppLxY5mD517iBwEZnd8QY/jRa/V2r
++LJltL8ATwRUHSm/4vOCLTuZsDm0ZmWcdNNYO
++=eVf4
+ -----END PGP PRIVATE KEY BLOCK-----
+diff --git a/tests/static/gpg-keys/ambig2-pub.gpg b/tests/static/gpg-keys/ambig2-pub.gpg
+index e52e2f62c..29f2f4e4e 100644
+Binary files a/tests/static/gpg-keys/ambig2-pub.gpg and b/tests/static/gpg-keys/ambig2-pub.gpg differ
+diff --git a/tests/static/gpg-keys/ambig2-sec.gpg b/tests/static/gpg-keys/ambig2-sec.gpg
+index a71581315..e2fd4566c 100644
+Binary files a/tests/static/gpg-keys/ambig2-sec.gpg and b/tests/static/gpg-keys/ambig2-sec.gpg differ
+diff --git a/tests/static/gpg-keys/pub.gpg b/tests/static/gpg-keys/pub.gpg
+index c94f951d9..0d2f8a568 100644
+--- a/tests/static/gpg-keys/pub.gpg
++++ b/tests/static/gpg-keys/pub.gpg
+@@ -6,25 +6,25 @@ yXM63iIqNbWTOzp52RtuNXFilXOabH3yZstBF8yn65uGm66CIdCJ8hOYZNhXVQGv
+ wL3oh57PyNqlS6WXwkAVO8ZrRJQJP76ReSfvLKPaRwvPyuH0HD2A8U6gzbh+qVZl
+ UbDOwkka7C8yJV29805dT03bNPP0FKvo53xlzHVquO58AlCnhx3xT2+mg2TEwp4N
+ /Kz5E3PIm2njZLUS029vw83NNu04nRomzcO7ABEBAAG0HHRlc3QgdXNlciA8dGVz
+-dEBleGFtcGxlLmNvbT6JAVQEEwEIAD4WIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUC
+-WWUloQIbAwUJA8JnAAULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAAKCRAZdOxV+8LW
+-YDSiB/wNRzFSYRVOEhYYvgXCs14ca6HR5kxt07ei7ztp8D2rg8jxA+8pEzCtTnZb
+-GYZ4tnKCenKuRCsfxBI5pY/mwVT9TFfOY9umDyq471cn0Qx6Tt3lj1KhAJNnhtLJ
+-a/FQ9vPLQ4gghDeagw7FiS92xDsWsfkAouYAdBuUGgR8lu+vRHNCh/qh7KiBqtQX
+-wfGJb+ZCq4iXfFsU20TLZ0LZdIf1nRK1QWATI4d93t0zimvUVLSxK/A7xiwG0W+i
+-4SRGYeIy5ImCTa4gIFDw3C7fFeyhI4pzWz5I7iAKO6WJ6n+wMzi8aJMkApHZUbKY
+-HosXHR/IesA+wpBMLzc56N/NcwPsuQENBFllJaEBCADPqqyFwZVgvHPwG1GOPM5O
+-py2zb4hsgryOzNhddzVHzGD5pKyJsJiHrS+wOkIXMxvCfx0d1DL4vkwwsRMJND+0
+-7T2fFCQXYqsGq36vyf/XgofUYrZVTQaBqRJ1IubD6n1kM+OljPLXyT2BhRuJbP40
+-LFTBminndrMg55AkI4Sh8t/TIgwZtaxmzYrb94CNoK8Q/pEzFhMVe+0XlbyXn1x1
+-fxnnmuHUeZP8lC9jdVIFBxYnGK3vcG0xmtHjE5wYiQ38+/IS+nn/zrs6OWpXF+L6
+-UQE/53N0dG+tSWQ3kDv6HyAZCJRR2npkN4n0Ngq3Wx0fRgg0BnyZV2DsNeu1Mj3F
+-ABEBAAGJATwEGAEIACYWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCWWUloQIbDAUJ
+-A8JnAAAKCRAZdOxV+8LWYE0oB/9wLNmdC0psG3kMDWT9JBqo2Js/VXXBcjiRbErk
+-5uX0/FIqaM/HiP6AeXVp6w1NBOoQCH7tQKJ8Q0r4yh7Gi9W/qzlajFAAFVMtufq3
+-2D7qy73NRwhAqFJeJVco/iRjEBzTDi48wtfxhFQDRAaqwDKoasNBxkhBk3fENaEc
+-kk8H03CfUx42gk7MBRt5jFIlN+/cNXxrdcz6XeGAPLOoqE+il+5+C/7slNMuDAV/
+-6s/1DsYZ7C+jOycM6lMXaAkdveueXtOq9yaytmpjIysfmZIaXyahBxbRMvQtBAAR
+-eHTTrfhhS03FwT0YdioRcxNAHGW+Iltjrq3eygCmAilEBIAb
+-=DLcu
++dEBleGFtcGxlLmNvbT6JAU4EEwEIADgCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgEC
++F4AWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCXTAb1AAKCRAZdOxV+8LWYPloB/0T
++NbC7wLiSyQJWSgwkQYH125G6pbMGY1u8JzoaBjnk5mwCvckvsxy6Z8Ubaav/dlMp
++rJcicMAvWKL6vpdTl4MaDi4cY+9jCe8CGzMbHx0PsvPIKIKsYTUDeFPQxDe0nrnl
++se5EzUFXL5TLtddfLl5QeGeVh9Q8egCuCCqlKAjyncO0tmLZNLf8ZcJoyiTV6Re6
++j7Xr5vvYnAEUEIVoUcH9zlxXnmbuZBqS82pzUWkJWeh+Aeh2BdZsCQ+FgRmvgNGo
++Ilre0VenEhSJg/7kBZc1AgRCFKHwTh++RHtU74aP0SzglISjCdMwtdKLMmEhFRHZ
++av01bAUP0bwcfRb/g2CwuQENBFllJaEBCADPqqyFwZVgvHPwG1GOPM5Opy2zb4hs
++gryOzNhddzVHzGD5pKyJsJiHrS+wOkIXMxvCfx0d1DL4vkwwsRMJND+07T2fFCQX
++YqsGq36vyf/XgofUYrZVTQaBqRJ1IubD6n1kM+OljPLXyT2BhRuJbP40LFTBminn
++drMg55AkI4Sh8t/TIgwZtaxmzYrb94CNoK8Q/pEzFhMVe+0XlbyXn1x1fxnnmuHU
++eZP8lC9jdVIFBxYnGK3vcG0xmtHjE5wYiQ38+/IS+nn/zrs6OWpXF+L6UQE/53N0
++dG+tSWQ3kDv6HyAZCJRR2npkN4n0Ngq3Wx0fRgg0BnyZV2DsNeu1Mj3FABEBAAGJ
++ATYEGAEIACACGwwWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCXTAb2wAKCRAZdOxV
+++8LWYNPvB/4/laOoi36KUkBupd0VFUpir5WDITnHxDyiNhPGr/YYEihOES1Dhmwt
++scELxmdhRNISrqf32xYYs9r32i+FiMlWJG3piCF73t9q3KIO1KB+knHRt3s5MUH/
++qC0cL9BocDy+6f9Mu7UlVc1ez+zBv/nnQa9V8BWysFiQmUnpZLo4eAn6fx+ovaB3
++uR0e6j7gj+IW8Hu9QBbANYI6LTLVVtRFeVm+UO38E23bOHuBjjXYamDj4TswRJJf
++9DgYX9rsdU0gtCuVWsAVMF3acnAUkvz02nvpSC3EL9kX5QGezwv+IcntCNLZmaC4
++qcaF/tTP9obCKwxXJFmj0b2PaQEtZ/1y
++=q1xQ
+ -----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/static/gpg-keys/sec.gpg b/tests/static/gpg-keys/sec.gpg
+index f00b017f5..acd4e0a9b 100644
+--- a/tests/static/gpg-keys/sec.gpg
++++ b/tests/static/gpg-keys/sec.gpg
+@@ -19,39 +19,39 @@ Zjue2U8RmgwmLnecUT4qQQcyWWQzM5wLFcMkIeTl8lJa/MOEEqLGgeKllzJApKkB
+ E6atGeZRt51/yMRL0K3HwWfHrsPdVo0D/3mVvs8Jlq/IHPVLfUSOl9xmE+LALeL1
+ hMZx6TBjYYk528lBV+JLS7w5twqvyN/U7PxadX5bwrVJoovssyOh9IpkHcBzL6CY
+ hT6vEZXiLjYPYeRuYBGW1kRkQmlPpNsNDJTFQ9Mve0QYldPLgFEbzZgnid2siWDn
+-uRe34gzXP5drNti0HHRlc3QgdXNlciA8dGVzdEBleGFtcGxlLmNvbT6JAVQEEwEI
+-AD4WIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCWWUloQIbAwUJA8JnAAULCQgHAgYV
+-CAkKCwIEFgIDAQIeAQIXgAAKCRAZdOxV+8LWYDSiB/wNRzFSYRVOEhYYvgXCs14c
+-a6HR5kxt07ei7ztp8D2rg8jxA+8pEzCtTnZbGYZ4tnKCenKuRCsfxBI5pY/mwVT9
+-TFfOY9umDyq471cn0Qx6Tt3lj1KhAJNnhtLJa/FQ9vPLQ4gghDeagw7FiS92xDsW
+-sfkAouYAdBuUGgR8lu+vRHNCh/qh7KiBqtQXwfGJb+ZCq4iXfFsU20TLZ0LZdIf1
+-nRK1QWATI4d93t0zimvUVLSxK/A7xiwG0W+i4SRGYeIy5ImCTa4gIFDw3C7fFeyh
+-I4pzWz5I7iAKO6WJ6n+wMzi8aJMkApHZUbKYHosXHR/IesA+wpBMLzc56N/NcwPs
+-nQOYBFllJaEBCADPqqyFwZVgvHPwG1GOPM5Opy2zb4hsgryOzNhddzVHzGD5pKyJ
+-sJiHrS+wOkIXMxvCfx0d1DL4vkwwsRMJND+07T2fFCQXYqsGq36vyf/XgofUYrZV
+-TQaBqRJ1IubD6n1kM+OljPLXyT2BhRuJbP40LFTBminndrMg55AkI4Sh8t/TIgwZ
+-taxmzYrb94CNoK8Q/pEzFhMVe+0XlbyXn1x1fxnnmuHUeZP8lC9jdVIFBxYnGK3v
+-cG0xmtHjE5wYiQ38+/IS+nn/zrs6OWpXF+L6UQE/53N0dG+tSWQ3kDv6HyAZCJRR
+-2npkN4n0Ngq3Wx0fRgg0BnyZV2DsNeu1Mj3FABEBAAEAB/oD+AKREdiNfzyF/7eo
+-zL+yoB5O+hg03rDE1+RgsOkLRLwruTp07TOVEDnDl/FwaREkP/KqAcaxm01wdsni
+-2KVJC2mskyF3cvLKz1c9+9HQaBW5eON8MNspejY4l+CqKN6ZniZBITb46ccrpQQY
+-NcWL8Lbz9kLLwih9Pf+yuR0NTUKpmdii3WANE0bolNTXEe0M2df8f5uG5a8tQEHL
+-FXTNFmWxJNIjZkWPc9ezczmJ3JtvEoHcLPTz1SCqAIcp1/ZC0YWVQWRVomeXfhTS
+-Fsps1/2qhItIzWyAcZntwlNbjOYHMSVgo1OVrKsMLgGk6XKM2+IpvG6ABx+z7AaU
+-UW6hBADfosc/Fn1ZoeE+6B7ceHhtjAqsReqSkuS/1U5cN5BKmx0xfrLbOUqdPeBr
+-VpdsmIfFV+rD67d35APrFELGvojOxo/6/kBfOdjMYjKhlzUGuYTen4qjkCxf/27d
+-1ji8nPl/VRAynAfZ4HdhNaTpM81JIgq5LnWZRwKvteeOj+pzEQQA7bhF54pR/drT
+-+jmYyOSpgkE3/WIqKxLY+cP6hC0dTGb2i5uXvp2NZppxTqt9UtuN3oSWra6HXf6T
+-bXmlxnUOopdzI5TiqGk4aoWE7obwwY12FaVTwdHyJ561JbtS+iBJygi2WV/Vpbn2
+-/ijxBsFdFqkJOnS8RdixViV/04UjN3UD/REGfH9krzvGknuWHo5T6q1JXaNwfKDm
+-XTmtakDlzidMs1jDr9S/HeujPBJvtuIqWRZHn0TYCEnb7ZwSZpTOmcwH12WFKcj6
+-HUHQR5MrfXhWBk5nvMyVFiLueylBmxfaIRvGgkYELWXtGjvlSn9K0Mb48sYZAQXU
+-BhtgSu9icPdVSwiJATwEGAEIACYWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCWWUl
+-oQIbDAUJA8JnAAAKCRAZdOxV+8LWYE0oB/9wLNmdC0psG3kMDWT9JBqo2Js/VXXB
+-cjiRbErk5uX0/FIqaM/HiP6AeXVp6w1NBOoQCH7tQKJ8Q0r4yh7Gi9W/qzlajFAA
+-FVMtufq32D7qy73NRwhAqFJeJVco/iRjEBzTDi48wtfxhFQDRAaqwDKoasNBxkhB
+-k3fENaEckk8H03CfUx42gk7MBRt5jFIlN+/cNXxrdcz6XeGAPLOoqE+il+5+C/7s
+-lNMuDAV/6s/1DsYZ7C+jOycM6lMXaAkdveueXtOq9yaytmpjIysfmZIaXyahBxbR
+-MvQtBAAReHTTrfhhS03FwT0YdioRcxNAHGW+Iltjrq3eygCmAilEBIAb
+-=T5TK
++uRe34gzXP5drNti0HHRlc3QgdXNlciA8dGVzdEBleGFtcGxlLmNvbT6JAU4EEwEI
++ADgCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AWIQT3QJHUEz+H1WtdNDwZdOxV
+++8LWYAUCXTAb1AAKCRAZdOxV+8LWYPloB/0TNbC7wLiSyQJWSgwkQYH125G6pbMG
++Y1u8JzoaBjnk5mwCvckvsxy6Z8Ubaav/dlMprJcicMAvWKL6vpdTl4MaDi4cY+9j
++Ce8CGzMbHx0PsvPIKIKsYTUDeFPQxDe0nrnlse5EzUFXL5TLtddfLl5QeGeVh9Q8
++egCuCCqlKAjyncO0tmLZNLf8ZcJoyiTV6Re6j7Xr5vvYnAEUEIVoUcH9zlxXnmbu
++ZBqS82pzUWkJWeh+Aeh2BdZsCQ+FgRmvgNGoIlre0VenEhSJg/7kBZc1AgRCFKHw
++Th++RHtU74aP0SzglISjCdMwtdKLMmEhFRHZav01bAUP0bwcfRb/g2CwnQOYBFll
++JaEBCADPqqyFwZVgvHPwG1GOPM5Opy2zb4hsgryOzNhddzVHzGD5pKyJsJiHrS+w
++OkIXMxvCfx0d1DL4vkwwsRMJND+07T2fFCQXYqsGq36vyf/XgofUYrZVTQaBqRJ1
++IubD6n1kM+OljPLXyT2BhRuJbP40LFTBminndrMg55AkI4Sh8t/TIgwZtaxmzYrb
++94CNoK8Q/pEzFhMVe+0XlbyXn1x1fxnnmuHUeZP8lC9jdVIFBxYnGK3vcG0xmtHj
++E5wYiQ38+/IS+nn/zrs6OWpXF+L6UQE/53N0dG+tSWQ3kDv6HyAZCJRR2npkN4n0
++Ngq3Wx0fRgg0BnyZV2DsNeu1Mj3FABEBAAEAB/oD+AKREdiNfzyF/7eozL+yoB5O
+++hg03rDE1+RgsOkLRLwruTp07TOVEDnDl/FwaREkP/KqAcaxm01wdsni2KVJC2ms
++kyF3cvLKz1c9+9HQaBW5eON8MNspejY4l+CqKN6ZniZBITb46ccrpQQYNcWL8Lbz
++9kLLwih9Pf+yuR0NTUKpmdii3WANE0bolNTXEe0M2df8f5uG5a8tQEHLFXTNFmWx
++JNIjZkWPc9ezczmJ3JtvEoHcLPTz1SCqAIcp1/ZC0YWVQWRVomeXfhTSFsps1/2q
++hItIzWyAcZntwlNbjOYHMSVgo1OVrKsMLgGk6XKM2+IpvG6ABx+z7AaUUW6hBADf
++osc/Fn1ZoeE+6B7ceHhtjAqsReqSkuS/1U5cN5BKmx0xfrLbOUqdPeBrVpdsmIfF
++V+rD67d35APrFELGvojOxo/6/kBfOdjMYjKhlzUGuYTen4qjkCxf/27d1ji8nPl/
++VRAynAfZ4HdhNaTpM81JIgq5LnWZRwKvteeOj+pzEQQA7bhF54pR/drT+jmYyOSp
++gkE3/WIqKxLY+cP6hC0dTGb2i5uXvp2NZppxTqt9UtuN3oSWra6HXf6TbXmlxnUO
++opdzI5TiqGk4aoWE7obwwY12FaVTwdHyJ561JbtS+iBJygi2WV/Vpbn2/ijxBsFd
++FqkJOnS8RdixViV/04UjN3UD/REGfH9krzvGknuWHo5T6q1JXaNwfKDmXTmtakDl
++zidMs1jDr9S/HeujPBJvtuIqWRZHn0TYCEnb7ZwSZpTOmcwH12WFKcj6HUHQR5Mr
++fXhWBk5nvMyVFiLueylBmxfaIRvGgkYELWXtGjvlSn9K0Mb48sYZAQXUBhtgSu9i
++cPdVSwiJATYEGAEIACACGwwWIQT3QJHUEz+H1WtdNDwZdOxV+8LWYAUCXTAb2wAK
++CRAZdOxV+8LWYNPvB/4/laOoi36KUkBupd0VFUpir5WDITnHxDyiNhPGr/YYEihO
++ES1DhmwtscELxmdhRNISrqf32xYYs9r32i+FiMlWJG3piCF73t9q3KIO1KB+knHR
++t3s5MUH/qC0cL9BocDy+6f9Mu7UlVc1ez+zBv/nnQa9V8BWysFiQmUnpZLo4eAn6
++fx+ovaB3uR0e6j7gj+IW8Hu9QBbANYI6LTLVVtRFeVm+UO38E23bOHuBjjXYamDj
++4TswRJJf9DgYX9rsdU0gtCuVWsAVMF3acnAUkvz02nvpSC3EL9kX5QGezwv+Icnt
++CNLZmaC4qcaF/tTP9obCKwxXJFmj0b2PaQEtZ/1y
++=wBTO
+ -----END PGP PRIVATE KEY BLOCK-----
diff --git a/mail-client/alot/files/9999-0001-remove-non-working-test.patch b/mail-client/alot/files/9999-0001-remove-non-working-test.patch
new file mode 100644
index 000000000000..7d0be5bee47a
--- /dev/null
+++ b/mail-client/alot/files/9999-0001-remove-non-working-test.patch
@@ -0,0 +1,31 @@
+From 513d05f198c9d8d7502dd1f536d1ee20845814f0 Mon Sep 17 00:00:00 2001
+From: Guillaume Seren <guillaumeseren@gmail.com>
+Date: Fri, 3 May 2019 18:17:05 +0200
+Subject: [PATCH] Remove non working test
+
+Some test are not working + fix for master
+---
+ tests/commands/test_global.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/tests/commands/test_global.py b/tests/commands/test_global.py
+index 94ad0672..379f87b8 100644
+--- a/tests/commands/test_global.py
++++ b/tests/commands/test_global.py
+@@ -121,13 +121,6 @@ class TestExternalCommand(unittest.TestCase):
+ await cmd.apply(ui)
+ ui.notify.assert_not_called()
+
+- @utilities.async_test
+- async def test_no_spawn_no_stdin_attached(self):
+- ui = utilities.make_ui()
+- cmd = g_commands.ExternalCommand('test -t 0', refocus=False)
+- await cmd.apply(ui)
+- ui.notify.assert_not_called()
+-
+ @utilities.async_test
+ async def test_no_spawn_stdin_attached(self):
+ ui = utilities.make_ui()
+--
+2.24.1
+
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 6353796a642d..459e083dde12 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -8,8 +8,8 @@ DIST alpine-2.00-chappa-115-all.patch.gz 212705 BLAKE2B 99c21a7b74a4ea04c3bb5494
DIST alpine-2.00.tar.bz2 5222673 BLAKE2B 38a9cd1fe3e291119b889bca0d304333cdf9ad8c63bc7923ea0735d3528c933b7d4dfe70bb353fe7b6047dafdaee3218a35e561f542b6ac763b60cb986509371 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2
DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
DIST alpine-843b2f1.tar.gz 7490140 BLAKE2B 13ac5ef43dd729a7cf21b44dcd6feace3e1813672aec537fd05d5ff90b67bec145ceef71cfcf35b0cb7e250bb307556f5dcf8ebb024bc6366fd0ace0a7c41161 SHA512 106caa7bfe86fd5e82554ba68b9ee579cd8495bcd0dfbf82d9d75da2df3bd292d42d67af8ec737091f2a820b2555c25bbf0058c9c7bb5de5f950b570ffc25c4d
-EBUILD alpine-2.00-r7.ebuild 2681 BLAKE2B eeef58cd6d584933bd099eaa1af9410f17bc78d280e329fd0f0e5a787565ef0c582adf81bed5e8080b1aeeb92fd28823c978a9580275ef5ef07f77e480719842 SHA512 cd2655334569b2c6b55220562ccaf6dfb348ca6bd9b4e5f5ce5cb6435832c169bb55aed6e9492f98fbe1e71faf8fdde5ac1436af2fa9db606ac2d43527d448c0
-EBUILD alpine-2.21.1-r1.ebuild 2236 BLAKE2B 7d07cf9514084d756342741a5f340be66379af128a4b779571d7ce1efa6ccdbef77e626022ddd22efae7d63ef9da1af8a7cda2649c8e21985ba4ebeee3092513 SHA512 028c6bc83e5d73cc884795ea13653537b9fd00ed81f412a0235de12d479b55621f085d877447256e90da81f8afdd4cfa18933701ee48551960d3826eefdff275
-EBUILD alpine-2.21.1-r2.ebuild 2219 BLAKE2B 3b2596d67ecb30f9959356e8a74a2d8bc4516723b3fa57a226e34574d8732037d0d68c79c4d94871617967f1a970346405389ccb3bff961165f65c4deb231ad1 SHA512 6ea45a6167c0a8acc11d92038fdb15e63b391b3bc6c8afed004dd6381e9a9a9243631ceb55da90e06281eabdd8dd1cf67e9f7824a46ea648fb6450bde3280afd
-EBUILD alpine-2.21.1.ebuild 1997 BLAKE2B 78aaffebf416ca172151f8fcf1fc721550ea89c210c95a0b9d2ff5aebe4fd49ca4a0f8b970cfd8fba525a60660f2cb596c9cba67c06d0855bf5a89240b27e459 SHA512 53772f745778305d9fde413bfad52e0e28f3938ce1e589cbfbaabb081eb225b630bf3c5778b2b105dd61563b4dc28001b36eb101722fcc755c71a6f605d64682
+EBUILD alpine-2.00-r7.ebuild 2680 BLAKE2B 8220e2aa1a2850aff527bc81c0b4a623b83407aa93d612bc4972893b81d1b26d1d477ef8a0b59abafa27d618b82ad76efb35c130bff4ecda9c6cfd771e9e5061 SHA512 5efc56179e0da112d32082806a869e2527580a4d40d03be8dcfe6b37c900fc0b95f0388c716f2e6d85b0aa6c054ed75afaef80ede417031c7fca1698d26f65da
+EBUILD alpine-2.21.1-r1.ebuild 2235 BLAKE2B 5dcc7a462c981e29b1d00d8df5d0c73b44fa18dfb8be9e75ca07d027dbcf5d78c839bcfb7809dfd4e2adf0c7c6a27d51bfda4adf74bd2f1b3ecb75658497d086 SHA512 e47d31105895b50b758fbd8d9888fd66b7db0ba2f5c564e04bf368caf5cc14c3e25d3f66d364bcfe731ec9158c0b2c28b24bd9fe7d49f466eb83660e1a7d7bf7
+EBUILD alpine-2.21.1-r2.ebuild 2218 BLAKE2B 4bcd38548dfec570422978a2b6ad3db07ad7f1738b066f03c8ea6fa265741971844dbf73a8630e2b5f70a88b00c305b77e985c1c8aa27bdcd984d142d27f7b86 SHA512 2a1d67cddee558988a19a16c2726101ebefc37b9f5287e45d4c7c8ea6d8f06ec862a37fb4806590b8b51d94fc30e0f6a6961fe88a768bf4ed7c867b618530ae9
+EBUILD alpine-2.21.1.ebuild 1996 BLAKE2B 06531876a0e78e697f5493d115dbbca63c0ff76ff0fd0cc6fbdf3e7ed8d6ab051a1869b4850cc51e5cfe53ea2294827286a47b70c0fdb8c26f1b22c3ce4261db SHA512 1be41b58ce9ad7d741eabe5b355cda4c32ff1b2faac73ba11fb8b4d5f278895789b9687723f288dee594ba2805d78539460470e22b5e227b9fefe18b9df9eb14
MISC metadata.xml 731 BLAKE2B 56450ee7efb0663450b32b746f06718440e8b722ed72ad7b7ae5d3f100bf4930bcac1d3aa5bc198bfff6081da220020dcda7ef857409313cb050a51d6f6099cc SHA512 27adca82690095f965b98b31fb175f4215f4585ad8144fab2d3f519f2c6edc77b92f1f335ef832d0bfa99b31713e3064717e8cab75880eb44aada9fed49aaab9
diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild
index 7b8a26440ba6..138fdc96cddc 100644
--- a/mail-client/alpine/alpine-2.00-r7.ebuild
+++ b/mail-client/alpine/alpine-2.00-r7.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=6
@@ -6,7 +6,7 @@ inherit eutils flag-o-matic autotools multilib toolchain-funcs
CHAPPA_PL=115
DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="https://www.washington.edu/alpine/ https://repo.or.cz/alpine.git/"
+HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz
-> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
diff --git a/mail-client/alpine/alpine-2.21.1-r1.ebuild b/mail-client/alpine/alpine-2.21.1-r1.ebuild
index 8eda461f3e56..9da32fd2f795 100644
--- a/mail-client/alpine/alpine-2.21.1-r1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools toolchain-funcs
DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="https://www.washington.edu/alpine/ https://repo.or.cz/alpine.git/"
+HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
GIT_COMMIT="843b2f16abfd949e09b1c5465387b1b0f724994a"
MY_P="${PN}-${GIT_COMMIT::7}"
SRC_URI="https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
diff --git a/mail-client/alpine/alpine-2.21.1-r2.ebuild b/mail-client/alpine/alpine-2.21.1-r2.ebuild
index cd4168685904..4cec97ed419d 100644
--- a/mail-client/alpine/alpine-2.21.1-r2.ebuild
+++ b/mail-client/alpine/alpine-2.21.1-r2.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
@@ -6,7 +6,7 @@ EAPI=7
inherit autotools toolchain-funcs
DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="https://www.washington.edu/alpine/ https://repo.or.cz/alpine.git/"
+HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
GIT_COMMIT="843b2f16abfd949e09b1c5465387b1b0f724994a"
MY_P="${PN}-${GIT_COMMIT::7}"
SRC_URI="https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
diff --git a/mail-client/alpine/alpine-2.21.1.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index d8dcafb309aa..e8f94db8e4d6 100644
--- a/mail-client/alpine/alpine-2.21.1.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools toolchain-funcs vcs-snapshot
DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="https://www.washington.edu/alpine/ https://repo.or.cz/alpine.git/"
+HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
GIT_COMMIT="672d6838a9babf2faeb9f79267525a4ab9d20b14"
SRC_URI="https://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 20fe891086c0..edba0782729f 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,9 +1,6 @@
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
-DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9 SHA512 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1
-DIST evolution-3.32.4.tar.xz 11793452 BLAKE2B bb009a5881cca6724b804a1203d393003f92ef9f6a8fa9692fc42344224b0b2f5def5c05160d46bbf7f76b9ae9bfa1737f78207aee7038540f410df57f7a76cd SHA512 a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931
+AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
DIST evolution-3.32.5.tar.xz 11793908 BLAKE2B 798b49e3ab8b34be85263d876a4fde86bb63374c017ec43f8f3742246308bd023e4bdb0c943c1a96ad7866f09023e8c2df561e4f168730bb32b256e4e400dd23 SHA512 b77715d290ad3727a68416d425a19a0d10b5ebab69538d702008bc158fa70ea8bdb43f8cc55ebdf913f88ccf408df31ff5919ae5ccd3e94eeecd0f9f97592f96
-EBUILD evolution-3.30.5.ebuild 4255 BLAKE2B 3f1267b948e040eaec90fd2196d852c621b7a46f0ebcb968a06aeb83fa7072219cf85fea42d130bf65f5a02c95ae667e89c163972b33f4bd9b7602c683d6f7b7 SHA512 2455a3faf8b3b57b2570f90ccb1c6ce96c4ddf1da76720641ab1b7d4ca6d1d888cbbe7f3dad614a8d117ef22a09e1140e749e3aa5e64b53ad28cd4af88b7bb5e
-EBUILD evolution-3.32.4.ebuild 4306 BLAKE2B 806403fabcac64fb0256989088e5aa8997f24c2c5e021c94bbe6fd3eda2a3098bf0f66336843b574056306496605c3108055616f4534e6b9c6cb05fbfa9fcb0e SHA512 1b1dc13722d1344daf5dd606e2a49f8f08f0796c8f435ad2f36123381584d55d92edabfe7e8eaf3f4a825ae9f3a06cb838b07237f74e748f4a5b024110526ca0
-EBUILD evolution-3.32.5.ebuild 4309 BLAKE2B 32fb6c7172dca0a3883ab32c5496dc39cc0ff37c5dd972b2ef0eae055edb28a59768281fb2aae16464147997004c92ef5356947588b38ccdcb0c311f5c1975ad SHA512 3ead9c0be00fe4169b60f0644111d426852b46564bfe3a88573fcded727b6ad7934d35ab4244df8b040abf33e7ad085d6ad1d7786446c8c095d9124abc71351e
+EBUILD evolution-3.32.5-r1.ebuild 4429 BLAKE2B 9352aa6ad32bfb84b2052e4cb30003dbed363fe8e23ab64a6d7f27ba00b9af7ce312484d8c2bf2608afca664ffc741012737079ea0ec7ec0632422ae1aee94c7 SHA512 5fbfb5524987fdf675c9a9604c8b5ce97fdf7cd387a68066a5a28df4e42653ed8b8a32d21ee222c81e8e6ef920b495df12ad80d6e5b83b6fe009135229e5be38
MISC metadata.xml 1077 BLAKE2B b13424249bbf1c221b3d0981de923917fe7fd873666626104f28a528bd44a40011202b397992a32ed62886c7b637160ae61d4a323d37248c222d3b179b2cccf1 SHA512 0308a366fd296da924b5ab466d90acb4bd18b868769d06726bd7de94d92d88ac70d97c1eb8ce99ad493d45c528d0fd6d222b2eb9880cdac48d05859d1ec7709c
diff --git a/mail-client/evolution/evolution-3.30.5.ebuild b/mail-client/evolution/evolution-3.30.5.ebuild
deleted file mode 100644
index 4fd7868ca237..000000000000
--- a/mail-client/evolution/evolution-3.30.5.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-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"
-
-# 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
-COMMON_DEPEND="
- >=app-crypt/gcr-3.4:=[gtk]
- >=app-text/enchant-1.6.0:0
- >=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?]
- >=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/libsoup-2.42:2.4
- >=net-libs/webkit-gtk-2.16.0:4
- >=x11-libs/cairo-1.9.15:=[glib]
- >=x11-libs/gdk-pixbuf-2.24:2
- >=x11-libs/gtk+-3.22:3
- >=x11-libs/libnotify-0.7:=
- >=x11-misc/shared-mime-info-0.22
-
- >=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] )
- geolocation? (
- >=media-libs/libchamplain-0.12:0.12[gtk]
- >=media-libs/clutter-1.0.0:1.0
- >=media-libs/clutter-gtk-0.90:1.0
- >=sci-geosciences/geocode-glib-3.10.0
- x11-libs/mx:1.0 )
- ldap? ( >=net-nds/openldap-2:= )
- spell? ( app-text/gtkspell:3 )
- ssl? (
- >=dev-libs/nspr-4.6.1:=
- >=dev-libs/nss-3.11:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
- ytnef? ( net-mail/ytnef )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3 )
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- bogofilter? ( mail-filter/bogofilter )
- highlight? ( app-text/highlight )
- spamassassin? ( mail-filter/spamassassin )
- !gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake-utils_src_prepare call, if that works
-
-src_prepare() {
- cmake-utils_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # Use NSS/NSPR only if 'ssl' is enabled.
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DENABLE_SCHEMAS_COMPILE=OFF
- -DENABLE_GTK_DOC=$(usex gtk-doc)
- -DWITH_OPENLDAP=$(usex ldap)
- -DENABLE_SMIME=$(usex ssl)
- -DENABLE_GNOME_DESKTOP=ON
- -DWITH_ENCHANT_VERSION=1
- -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_TEXT_HIGHLIGHT=$(usex highlight)
- -DENABLE_WEATHER=$(usex weather)
- -DENABLE_CONTACT_MAPS=$(usex geolocation)
- -DENABLE_YTNEF=$(usex ytnef)
- -DENABLE_PST_IMPORT=OFF
- -DWITH_GLADE_CATALOG=OFF
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_test() {
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Problems with prelink:
- # https://bugzilla.gnome.org/show_bug.cgi?id=731680
- # https://bugzilla.gnome.org/show_bug.cgi?id=732148
- # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
- echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
- doenvd "${T}"/99${PN}
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.32.4.ebuild b/mail-client/evolution/evolution-3.32.5-r1.ebuild
index f122a35d124b..6d1cc407d28c 100644
--- a/mail-client/evolution/evolution-3.32.4.ebuild
+++ b/mail-client/evolution/evolution-3.32.5-r1.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=6
@@ -94,7 +94,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}"/${PV}-gtk-doc-fix{1,2}.patch
+ 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
gnome2_src_prepare
}
diff --git a/mail-client/evolution/evolution-3.32.5.ebuild b/mail-client/evolution/evolution-3.32.5.ebuild
deleted file mode 100644
index f320eaad3ff2..000000000000
--- a/mail-client/evolution/evolution-3.32.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-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"
-
-# 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
-COMMON_DEPEND="
- >=app-crypt/gcr-3.4:=[gtk]
- >=app-text/enchant-1.6.0:0
- >=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?]
- >=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/libsoup-2.42:2.4
- >=net-libs/webkit-gtk-2.16.0:4
- >=x11-libs/cairo-1.9.15:=[glib]
- >=x11-libs/gdk-pixbuf-2.24:2
- >=x11-libs/gtk+-3.22:3
- >=x11-libs/libnotify-0.7:=
- >=x11-misc/shared-mime-info-0.22
-
- >=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] )
- geolocation? (
- >=media-libs/libchamplain-0.12:0.12[gtk]
- >=media-libs/clutter-1.0.0:1.0
- >=media-libs/clutter-gtk-0.90:1.0
- >=sci-geosciences/geocode-glib-3.10.0
- x11-libs/mx:1.0 )
- ldap? ( >=net-nds/openldap-2:= )
- spell? ( app-text/gtkspell:3 )
- ssl? (
- >=dev-libs/nspr-4.6.1:=
- >=dev-libs/nss-3.11:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
- ytnef? ( net-mail/ytnef )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3 )
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- bogofilter? ( mail-filter/bogofilter )
- highlight? ( app-text/highlight )
- spamassassin? ( mail-filter/spamassassin )
- !gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# 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
- cmake-utils_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # Use NSS/NSPR only if 'ssl' is enabled.
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DENABLE_SCHEMAS_COMPILE=OFF
- -DENABLE_GTK_DOC=$(usex gtk-doc)
- -DWITH_OPENLDAP=$(usex ldap)
- -DENABLE_SMIME=$(usex ssl)
- -DENABLE_GNOME_DESKTOP=ON
- -DWITH_ENCHANT_VERSION=1
- -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_TEXT_HIGHLIGHT=$(usex highlight)
- -DENABLE_WEATHER=$(usex weather)
- -DENABLE_CONTACT_MAPS=$(usex geolocation)
- -DENABLE_YTNEF=$(usex ytnef)
- -DENABLE_PST_IMPORT=OFF
- -DWITH_GLADE_CATALOG=OFF
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_test() {
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Problems with prelink:
- # https://bugzilla.gnome.org/show_bug.cgi?id=731680
- # https://bugzilla.gnome.org/show_bug.cgi?id=732148
- # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
- echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
- doenvd "${T}"/99${PN}
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch b/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
new file mode 100644
index 000000000000..192f4d0d3d8c
--- /dev/null
+++ b/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
@@ -0,0 +1,26 @@
+From 66aeb5aeb4065f6a5482d10bacbe370de2e49b7f Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 29 Dec 2019 15:47:32 +0200
+Subject: [PATCH] Add env var workaround for WebKitGTK-2.26 compatibility
+
+---
+ src/shell/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/shell/main.c b/src/shell/main.c
+index abc140d55f..cd671fd89a 100644
+--- a/src/shell/main.c
++++ b/src/shell/main.c
+@@ -607,6 +607,9 @@ main (gint argc,
+ * it already set, thus he/she can override the Evolution's default. */
+ g_setenv ("WEBKIT_DISABLE_COMPOSITING_MODE", "1", FALSE);
+
++ /* Workaround issues with WebKitGTK 2.26 */
++ g_setenv ("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", FALSE);
++
+ /* FIXME WK2 - Look if we still need this it looks like it's not. */
+ /* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=683548 */
+ g_type_ensure (WEBKIT_TYPE_WEB_VIEW);
+--
+2.20.1
+
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index e71f04549ccb..dbe603c578b1 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,10 +1,4 @@
-AUX 0.12.4-fix-cancellable.patch 1001 BLAKE2B 2c72ce0b32d92bec4e0053b54ca3e17485d64f25f4a24c29cadf47c9edd1593a6b6811328e2cdf60bca438cb808185de3be4e1554d55a3df71c2dd09ea800690 SHA512 4c3ae1076eea3b83e707fb2f74d66f32188728d3f057c67a2754c388241753d024f62a7ecafe7f557b555d328fc765e14d2729a822d26613d61966edf304199a
-AUX geary-0.12-libdir.patch 2742 BLAKE2B bd931c4577630001998a9b444226690002a81773351b81a158dafb2031c30ca000831710055d248b408e70700aa2d27195f94f384a3b25713636b8547216fa6f SHA512 8a136e702b036d976201bd67c5e5759ba4c28a5f73c04e2cdb32890d7fe0d4f6c9b6879a08bb2d2ba71fbbf60a5262dabc93928288e937ad9b1b40554bffd13b
-AUX geary-0.12-use-upstream-jsc.patch 18753 BLAKE2B 818c36ed24c7a0cfdee0679e41243c8ace7a966947c64561808587ccc7bf2a8558a48b3245a494f82553d9fd4bbf712be00efc74531cd21547f9445cb56208a8 SHA512 40fce0b4098ab13adf6f2db0f6bf4fe419f77ee159074928d7e44d103d989ac86de609df7bb8d13e47e87986fceed0e5ec92365913ae24daba148769ec82d5b5
-DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c
-DIST geary-3.32.0.tar.xz 2228056 BLAKE2B b9ee9e48fb901aa8fe8ef291b8332ac222d7581d1700170aa605071698ea0d8b698511c6e372c9a5056c3d7bf4885ec84aa389f7558fdd00cb4eeb43d745ee39 SHA512 eec6a552fe87c74d364d7242631f6ddfb6cfe35dc4f634ec7aa80342f9e02439255a2a4b12b0f88ee6369962058bbbdc64c390189bd6480a225685ad52cb68f8
+AUX 3.34.2-fix-ytnef-automagic.patch 1049 BLAKE2B ae3de0dfeb13ddfb7fe73b72321bc374666edfe4dcf44e9a9f4338efff801137f6ba0f10d32c8532ed0c4d926bf8a8f0ee94bf2b5a53b903ec3f676baba8b4d0 SHA512 a14e61d0f0201074b3c476cdbfd4bf994f1660a2ca28147071fe84ad7ad36fa77cb003b30d6ebf03496bc5cb045f4dc5e4ec08341b13b0bf767d5f36212f5952
DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
-EBUILD geary-0.12.4.ebuild 2195 BLAKE2B a33f75b13f693671d5efea769caea8d16e622f18fcc72016af69f562d4bad3bac33c9a8cdfca265242a25acea6785feb5903f59ca9d39801b8394d3ff11e11da SHA512 b1242bafe73a2247c577e08084ed2d9a6b7b276c90b5dc354e25a44bacd1839f18b9760dc69702c9b3792bdc73cf1844cd286944c9259635f6ab3f354337d75f
-EBUILD geary-3.32.0-r1.ebuild 2071 BLAKE2B 5e73549b214c11f019b0ecb1826f5a99c2f4060949f2347952f4062069c848113a6d5ab3b5dc760753257783f3563c5499e2edfc67ab54adbd777c57a8be85a7 SHA512 5c0f666a0548458d396a378851300481ba6445318dac29db09fe0d18f67b02c686fb27505c7a70bb1c9a5f3501619ae8379a128fb592466a9333ed4395c9e6d7
-EBUILD geary-3.34.2.ebuild 2124 BLAKE2B d3339a5ebdac99fa2f7f320ea08dc77c02aa9232988028d99b073ce254e2c49701d608c2b3110908d53a49bf77f0219caa5dcc182eb40a38dbcbf2d3dec69351 SHA512 82cffc1646f839f6cf81869b672b5ca4012ee66d4ab3b04d69760dc7c9516149095825d64d93906be3e04c1af4551d107c2fdb5b7c5e43f67e56ddbbf640b13c
+EBUILD geary-3.34.2-r1.ebuild 2329 BLAKE2B 229aeae7885ced009ca956b36a29a03495c17723785964439c1e93520ad0e848b01917f71752c3a6636deeb036c6ad49930ddb03d2ce0d402cc6e5748cb4cc5a SHA512 693634244f721095be537eb30816ea77db41fe01ea69e493160deb2d793fad14ed0d07dbc7251cf899f4937e5df0e3eb85ba3e1d66198ceed1f719ea561706dc
MISC metadata.xml 379 BLAKE2B de51f9dc4d75156955aa9f9d16396c237f9d0b9f130927806fb9f1de02566d5177a5eee7745bd487713af9c5320501fd47ff56d05b7d4dc906be0968328950f9 SHA512 8236050dbebf0f0e023e12280f6d62326817f142175c388eadb90963d2d7dc79a5efbcc7b4d705fc9c1de8276fafff228ef2c5392fe4aa53ea63cfbad03948c3
diff --git a/mail-client/geary/files/0.12.4-fix-cancellable.patch b/mail-client/geary/files/0.12.4-fix-cancellable.patch
deleted file mode 100644
index 6549bd0d622a..000000000000
--- a/mail-client/geary/files/0.12.4-fix-cancellable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 27 Nov 2018 14:53:56 +0100
-Subject: [PATCH] Actually use error variable to check for IOError.CANCELLED
-
----
- src/client/application/geary-controller.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
-index 3e6c8fcb..6bfeaab9 100644
---- a/src/client/application/geary-controller.vala
-+++ b/src/client/application/geary-controller.vala
-@@ -2599,7 +2599,7 @@ public class GearyController : Geary.BaseObject {
- yield do_empty_folder_async(emptyable, cancellable);
- } catch (Error err) {
- // don't report to user if cancelled
-- if (cancellable is IOError.CANCELLED)
-+ if (err is IOError.CANCELLED)
- return;
-
- ErrorDialog dialog = new ErrorDialog(main_window,
---
-2.18.1
-
diff --git a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
new file mode 100644
index 000000000000..dccc40aab8c1
--- /dev/null
+++ b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
@@ -0,0 +1,32 @@
+From 91f78fb411bc2bf1e2269ceab02740e9cb969c9b Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 26 Dec 2019 19:28:07 +0200
+Subject: [PATCH] build: Fix automagic dependency on ytnef library
+
+It would be best to use meson feature option type for ytnef and unwind,
+but for now fix the automagic dependency on ytnef with the existing
+meson_options.txt setup.
+It was adding ytnef to list of dependencies unconditionally, and then
+also if tnef-support was enabled. So if the option was disabled, but the
+pkg-config file was present, it would still link to it surprisingly.
+Just remove the unconditional addition to dep, and rely on the already
+existing conditional addition to deps.
+---
+ src/engine/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/engine/meson.build b/src/engine/meson.build
+index cb61c2aa..23b5fa48 100644
+--- a/src/engine/meson.build
++++ b/src/engine/meson.build
+@@ -325,7 +325,6 @@ geary_engine_dependencies = [
+ gmime,
+ libmath,
+ libxml,
+- libytnef,
+ posix,
+ sqlite
+ ]
+--
+2.20.1
+
diff --git a/mail-client/geary/files/geary-0.12-libdir.patch b/mail-client/geary/files/geary-0.12-libdir.patch
deleted file mode 100644
index 8e84ffa018b2..000000000000
--- a/mail-client/geary/files/geary-0.12-libdir.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -up geary-0.12.0/src/client/application/geary-application.vala.orig geary-0.12.0/src/client/application/geary-application.vala
---- geary-0.12.0/src/client/application/geary-application.vala.orig 2017-10-02 11:53:11.000000000 +0200
-+++ geary-0.12.0/src/client/application/geary-application.vala 2017-10-04 09:06:00.563953050 +0200
-@@ -7,6 +7,7 @@
- // Defined by CMake build script.
- extern const string _INSTALL_PREFIX;
- extern const string _GSETTINGS_DIR;
-+extern const string _LIB_SUFFIX;
- extern const string _SOURCE_ROOT_DIR;
- extern const string _BUILD_ROOT_DIR;
- extern const string GETTEXT_PACKAGE;
-@@ -28,6 +29,7 @@ public class GearyApplication : Gtk.Appl
- public const string VERSION = Geary.Version.GEARY_VERSION;
- public const string INSTALL_PREFIX = _INSTALL_PREFIX;
- public const string GSETTINGS_DIR = _GSETTINGS_DIR;
-+ public const string LIB_SUFFIX = _LIB_SUFFIX;
- public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;
- public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR;
-
-@@ -302,12 +304,12 @@ public class GearyApplication : Gtk.Appl
- * Returns the directory containing the application's WebExtension libs.
- *
- * If the application is installed, this will be
-- * `$INSTALL_PREFIX/lib/geary/web-extension`, else it will be
-+ * `$INSTALL_PREFIX/lib$LIB_SUFFIX/geary/web-extension`, else it will be
- */
- public File get_web_extensions_dir() {
- File? dir = get_install_dir();
- if (dir != null)
-- dir = dir.get_child("lib").get_child("geary").get_child("web-extensions");
-+ dir = dir.get_child("lib" + LIB_SUFFIX).get_child("geary").get_child("web-extensions");
- else
- dir = File.new_for_path(BUILD_ROOT_DIR).get_child("src");
- return dir;
-diff -up geary-0.12.0/src/CMakeLists.txt.orig geary-0.12.0/src/CMakeLists.txt
---- geary-0.12.0/src/CMakeLists.txt.orig 2017-10-02 11:53:11.000000000 +0200
-+++ geary-0.12.0/src/CMakeLists.txt 2017-10-04 09:06:00.565953028 +0200
-@@ -567,6 +567,7 @@ set(CFLAGS
- ${DEPS_CFLAGS}
- ${DEPS_CFLAGS_OTHER}
- -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
-+ -D_LIB_SUFFIX=\"${LIB_SUFFIX}\"
- -D_BUILD_ROOT_DIR=\"${CMAKE_BINARY_DIR}\"
- -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\"
- -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
-@@ -745,7 +746,7 @@ OPTIONS
-
- add_library(geary-web-process MODULE ${WEB_PROCESS_VALA_C})
- target_link_libraries(geary-web-process PRIVATE ${DEPS_LIBRARIES} geary-engine)
--install(TARGETS geary-web-process LIBRARY DESTINATION lib/geary/web-extensions)
-+install(TARGETS geary-web-process LIBRARY DESTINATION lib${LIB_SUFFIX}/geary/web-extensions)
-
- # Console app
- #################################################
diff --git a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
deleted file mode 100644
index c7965ccf3159..000000000000
--- a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-commit a0b1827298dc3210ad0ad16b09cff3507c3ad333
-Author: Thomas Moschny <thomas.moschny@gmx.de>
-Date: Sat Jul 14 12:33:47 2018
-
- Squashed commit of the following:
-
- commit e091f24b00ec421e1aadd5e360d1550e658ad5ef
- Author: Michael James Gratton <mike@vee.net>
- Date: Sun May 20 19:07:56 2018 +1000
-
- Clean up JS util API courtesy the new bindings.
-
- commit 0d966950a2cba888873cd3a7f4f42bb7a017dc6d
- Author: Rico Tzschichholz <ricotz@ubuntu.com>
- Date: Mon Apr 23 19:56:18 2018 +0200
-
- Adjust to upstream javascriptcore-4.0 bindings
-
- commit 5d0f711426d76f878cf9b71f7e8f785199c7cde1
- Author: Rico Tzschichholz <ricotz@ubuntu.com>
- Date: Thu Jun 22 15:01:19 2017 +0200
-
- bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 vapi
-
-diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata
-deleted file mode 100644
-index f3e72e8..0000000
---- a/bindings/metadata/Soup-2.4.metadata
-+++ /dev/null
-@@ -1,3 +0,0 @@
--AuthDomain.accepts skip
--AuthDomain.challenge skip
--
-diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata
-deleted file mode 100644
-index 3e3044f..0000000
---- a/bindings/metadata/WebKit2-4.0.metadata
-+++ /dev/null
-@@ -1,15 +0,0 @@
--
--JavascriptResult
-- .get_global_context nullable=false unowned=true
-- .get_value nullable=false unowned=true
--
--//Forward upstream
--Download
-- .failed#signal.error type="WebKit.DownloadError"
--PrintOperation
-- .failed#signal.error type="WebKit.PrintError"
--WebResource
-- .failed#signal.error type="GLib.Error"
--WebView
-- .load_failed#signal.error type="GLib.Error"
-- .show_option_menu#signal skip
-diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
-deleted file mode 100644
-index a994a77..0000000
---- a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
-+++ /dev/null
-@@ -1,5 +0,0 @@
--namespace WebKit {
-- namespace DOM {
-- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
-- }
--}
-diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata
-deleted file mode 100644
-index c496dba..0000000
---- a/bindings/metadata/WebKit2WebExtension-4.0.metadata
-+++ /dev/null
-@@ -1,9 +0,0 @@
--DOM* parent="WebKit.DOM" name="DOM(.+)"
--
--DOMEventTarget.add_event_listener skip
--_ContextMenu skip
--_ContextMenuItem skip
--
--Frame.get_javascript_* nullable=false unowned=true
--
--DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc"
-diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi
-deleted file mode 100644
-index d152ce2..0000000
---- a/bindings/vapi/javascriptcore-4.0.vapi
-+++ /dev/null
-@@ -1,155 +0,0 @@
--/*
-- * Copyright 2017 Michael Gratton <mike@vee.net>
-- *
-- * This software is licensed under the GNU Lesser General Public License
-- * (version 2.1 or later). See the COPYING file in this distribution.
-- */
--
--[CCode (cprefix = "JS",
-- gir_namespace = "JavaScriptCore",
-- gir_version = "4.0",
-- lower_case_cprefix = "JS_",
-- cheader_filename = "JavaScriptCore/JavaScript.h")]
--namespace JS {
--
-- [CCode (cname = "JSContextRef")]
-- [SimpleType]
-- public struct Context {
--
-- [CCode (cname = "JSEvaluateScript")]
-- public Value evaluate_script(String script,
-- Object? thisObject,
-- String? sourceURL,
-- int startingLineNumber,
-- out Value? exception);
--
-- [CCode (cname = "JSCheckScriptSyntax")]
-- public Value check_script_syntax(String script,
-- String? sourceURL,
-- int startingLineNumber,
-- out Value? exception);
--
-- }
--
-- [CCode (cname = "JSGlobalContextRef")]
-- [SimpleType]
-- public struct GlobalContext : Context {
--
-- [CCode (cname = "JSGlobalContextRetain")]
-- public bool retain();
--
-- [CCode (cname = "JSGlobalContextRelease")]
-- public bool release();
--
-- }
--
-- [CCode (cname = "JSType", has_type_id = false)]
-- public enum Type {
--
-- [CCode (cname = "kJSTypeUndefined")]
-- UNDEFINED,
--
-- [CCode (cname = "kJSTypeNull")]
-- NULL,
--
-- [CCode (cname = "kJSTypeBoolean")]
-- BOOLEAN,
--
-- [CCode (cname = "kJSTypeNumber")]
-- NUMBER,
--
-- [CCode (cname = "kJSTypeString")]
-- STRING,
--
-- [CCode (cname = "kJSTypeObject")]
-- OBJECT
-- }
--
-- [CCode (cname = "JSObjectRef")]
-- [SimpleType]
-- public struct Object {
--
-- [CCode (cname = "JSObjectMakeFunction")]
-- public Object.make_function(String? name,
-- [CCode (array_length_pos=1.5)]
-- String[]? parameterNames,
-- String body,
-- String? sourceURL,
-- int startingLineNumber,
-- out Value? exception);
--
-- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)]
-- public Value call_as_function(Context ctx,
-- Object? thisObject,
-- [CCode (array_length_pos=2.5)]
-- Value[]? arguments,
-- out Value? exception);
--
-- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
-- public bool has_property(Context ctx, String property_name);
--
-- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)]
-- public Value get_property(Context ctx,
-- String property_name,
-- out Value? exception);
--
-- }
--
-- [CCode (cname = "JSValueRef")]
-- [SimpleType]
-- public struct Value {
--
-- [CCode (cname = "JSValueGetType", instance_pos = 1.1)]
-- public Type get_type(Context context);
--
-- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)]
-- public bool is_boolean(Context ctx);
--
-- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)]
-- public bool is_number(Context ctx);
--
-- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)]
-- public bool is_object(Context ctx);
--
-- [CCode (cname = "JSValueIsString", instance_pos = 1.1)]
-- public bool is_string(Context ctx);
--
-- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)]
-- public bool to_boolean(Context ctx);
--
-- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)]
-- public double to_number(Context ctx, out Value exception);
--
-- [CCode (cname = "JSValueToObject", instance_pos = 1.1)]
-- public Object to_object(Context ctx, out Value exception);
--
-- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)]
-- public String to_string_copy(Context ctx, out Value exception);
--
-- }
--
-- [CCode (cname = "JSStringRef")]
-- [SimpleType]
-- public struct String {
--
-- [CCode (cname = "JSStringCreateWithUTF8CString")]
-- public String.create_with_utf8_cstring(string str);
--
-- [CCode (cname = "JSStringGetLength")]
-- public int String.get_length();
--
-- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")]
-- public int String.get_maximum_utf8_cstring_size();
--
-- [CCode (cname = "JSStringGetUTF8CString")]
-- public void String.get_utf8_cstring(string* buffer, int bufferSize);
--
-- [CCode (cname = "JSStringRetain")]
-- public void String.retain();
--
-- [CCode (cname = "JSStringRelease")]
-- public void String.release();
--
-- }
--
--}
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1e4213f..e0bebdf 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES
- gio-2.0
- glib-2.0
- gmime-2.6
-- javascriptcore-4.0
-+ javascriptcoregtk-4.0
- libxml-2.0
- posix
- sqlite3
-@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES
- geary-engine
- gee-0.8
- gtk+-3.0
-- javascriptcore-4.0
-+ javascriptcoregtk-4.0
- libsoup-2.4
- webkit2gtk-web-extension-4.0
- )
-@@ -618,7 +618,6 @@ add_definitions(${CFLAGS})
- set(VALAC_OPTIONS
- --vapidir=${CMAKE_BINARY_DIR}/src
- --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
-- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
- --target-glib=${TARGET_GLIB}
- --thread
- --debug
-@@ -650,38 +649,6 @@ set_property(
- )
- target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn)
-
--# WebKit2GTK VAPI generation
--#################################################
--add_custom_target(webkit2gtk-vapi
-- DEPENDS
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi"
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
--)
--add_custom_command(
-- OUTPUT
-- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi
-- DEPENDS
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata"
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
-- WORKING_DIRECTORY
-- "${CMAKE_SOURCE_DIR}/bindings/metadata"
-- COMMAND
-- vapigen --library=webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2-4.0.gir
--)
--add_custom_command(
-- OUTPUT
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
-- DEPENDS
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata"
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala"
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
-- WORKING_DIRECTORY
-- "${CMAKE_SOURCE_DIR}/bindings/metadata"
-- COMMAND
-- vapigen --library=webkit2gtk-web-extension-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2WebExtension-4.0.gir WebKit2WebExtension-4.0-custom.vala
--)
--
- # Client library (static lib used for building client and unit tests)
- #################################################
-
-@@ -698,7 +665,7 @@ OPTIONS
- )
-
- add_library(geary-client STATIC ${CLIENT_VALA_C})
--add_dependencies(geary-client resource_copy webkit2gtk-vapi)
-+add_dependencies(geary-client resource_copy)
- target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine)
-
- # Main client application binary
-diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala
-index 588d39b..d851235 100644
---- a/src/client/conversation-viewer/conversation-web-view.vala
-+++ b/src/client/conversation-viewer/conversation-web-view.vala
-@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView {
-
- private void on_deceptive_link_clicked(WebKit.JavascriptResult result) {
- try {
-- JS.GlobalContext context = result.get_global_context();
-+ unowned JS.GlobalContext context = result.get_global_context();
- JS.Object details = WebKitUtil.to_object(result);
-
- uint reason = (uint) Geary.JS.to_number(
-diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
-index 319e28a..45a27c4 100644
---- a/src/client/util/util-webkit.vala
-+++ b/src/client/util/util-webkit.vala
-@@ -18,8 +18,8 @@ namespace WebKitUtil {
- */
- public bool to_bool(WebKit.JavascriptResult result)
- throws Geary.JS.Error {
-- JS.GlobalContext context = result.get_global_context();
-- JS.Value value = result.get_value();
-+ unowned JS.GlobalContext context = result.get_global_context();
-+ unowned JS.Value value = result.get_value();
- if (!value.is_boolean(context)) {
- throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object");
- }
-@@ -59,12 +59,12 @@ namespace WebKitUtil {
- */
- public string as_string(WebKit.JavascriptResult result)
- throws Geary.JS.Error {
-- JS.GlobalContext context = result.get_global_context();
-- JS.Value js_str_value = result.get_value();
-+ unowned JS.GlobalContext context = result.get_global_context();
-+ unowned JS.Value js_str_value = result.get_value();
- JS.Value? err = null;
- JS.String js_str = js_str_value.to_string_copy(context, out err);
- Geary.JS.check_exception(context, err);
-- return Geary.JS.to_string_released(js_str);
-+ return Geary.JS.to_native_string(js_str);
- }
-
- /**
-diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
-index ee89139..1f478a6 100644
---- a/src/client/web-process/web-process-extension.vala
-+++ b/src/client/web-process/web-process-extension.vala
-@@ -87,10 +87,9 @@ public class GearyWebExtension : Object {
- bool should_load = false;
- WebKit.Frame frame = page.get_main_frame();
- // Explicit cast fixes build on s390x/ppc64. Bug 783882
-- JS.GlobalContext context = (JS.GlobalContext)
-- frame.get_javascript_global_context();
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
- try {
-- JS.Value ret = execute_script(
-+ unowned JS.Value ret = execute_script(
- context, "geary.allowRemoteImages", int.parse("__LINE__")
- );
- should_load = ret.to_boolean(context);
-@@ -106,8 +105,7 @@ public class GearyWebExtension : Object {
- private void remote_image_load_blocked(WebKit.WebPage page) {
- WebKit.Frame frame = page.get_main_frame();
- // Explicit cast fixes build on s390x/ppc64. Bug 783882
-- JS.GlobalContext context = (JS.GlobalContext)
-- frame.get_javascript_global_context();
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
- try {
- execute_script(
- context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__")
-@@ -123,8 +121,7 @@ public class GearyWebExtension : Object {
- private void selection_changed(WebKit.WebPage page) {
- WebKit.Frame frame = page.get_main_frame();
- // Explicit cast fixes build on s390x/ppc64. Bug 783882
-- JS.GlobalContext context = (JS.GlobalContext)
-- frame.get_javascript_global_context();
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
- try {
- execute_script(
- context, "geary.selectionChanged();", int.parse("__LINE__")
-@@ -136,20 +133,18 @@ public class GearyWebExtension : Object {
-
- // Return type is nullable as a workaround for Bug 778046, it will
- // never actually be null.
-- private JS.Value? execute_script(JS.Context context, string script, int line)
-+ private unowned JS.Value? execute_script(JS.Context context, string script, int line)
- throws Geary.JS.Error {
- JS.String js_script = new JS.String.create_with_utf8_cstring(script);
- JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__");
- JS.Value? err = null;
- try {
-- JS.Value ret = context.evaluate_script(
-+ unowned JS.Value ret = context.evaluate_script(
- js_script, null, js_source, line, out err
- );
- Geary.JS.check_exception(context, err);
- return ret;
- } finally {
-- js_script.release();
-- js_source.release();
- }
- }
-
-diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
-index 4d22429..a98d798 100644
---- a/src/engine/util/util-js.vala
-+++ b/src/engine/util/util-js.vala
-@@ -10,6 +10,16 @@
- */
- namespace Geary.JS {
-
-+#if !VALA_0_42
-+ // Workaround broken version of this in the vala bindings. See Bug
-+ // 788113.
-+ [CCode (cname = "JSStringGetUTF8CString")]
-+ private extern size_t js_string_get_utf8_cstring(
-+ global::JS.String js,
-+ [CCode (array_length_type = "gsize")] char[] buffer
-+ );
-+#endif
-+
- /**
- * Errors produced by functions in {@link Geary.JS}.
- */
-@@ -72,7 +82,7 @@ namespace Geary.JS {
- global::JS.String js_str = value.to_string_copy(context, out err);
- Geary.JS.check_exception(context, err);
-
-- return Geary.JS.to_string_released(js_str);
-+ return to_native_string(js_str);
- }
-
- /**
-@@ -101,12 +111,15 @@ namespace Geary.JS {
- /**
- * Returns a JSC {@link JS.String} as a Vala {@link string}.
- */
-- public inline string to_string_released(global::JS.String js) {
-- int len = js.get_maximum_utf8_cstring_size();
-- string str = string.nfill(len, 0);
-- js.get_utf8_cstring(str, len);
-- js.release();
-- return str;
-+ public inline string to_native_string(global::JS.String js) {
-+ size_t len = js.get_maximum_utf8_cstring_size();
-+ uint8[] str = new uint8[len];
-+#if VALA_0_42
-+ js.get_utf8_cstring(str);
-+#else
-+ js_string_get_utf8_cstring(js, (char[]) str);
-+#endif
-+ return (string) str;
- }
-
- /**
-@@ -125,11 +138,8 @@ namespace Geary.JS {
- global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name);
- global::JS.Value? err = null;
- global::JS.Value prop = object.get_property(context, js_name, out err);
-- try {
-- Geary.JS.check_exception(context, err);
-- } finally {
-- js_name.release();
-- }
-+ Geary.JS.check_exception(context, err);
-+
- return prop;
- }
-
-@@ -157,7 +167,7 @@ namespace Geary.JS {
-
- throw new Error.EXCEPTION(
- "JS exception thrown [%s]: %s"
-- .printf(err_type.to_string(), to_string_released(err_str))
-+ .printf(err_type.to_string(), to_native_string(err_str))
- );
- }
- }
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index afcca95..7517b3d 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -56,7 +56,7 @@ set(TEST_PACKAGES
- glib-2.0
- gmime-2.6
- gtk+-3.0
-- javascriptcore-4.0
-+ javascriptcoregtk-4.0
- libsoup-2.4
- webkit2gtk-4.0
- )
diff --git a/mail-client/geary/geary-0.12.4.ebuild b/mail-client/geary/geary-0.12.4.ebuild
deleted file mode 100644
index a19a5f7c62e9..000000000000
--- a/mail-client/geary/geary-0.12.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.42"
-# Keep cmake-utils at the end
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- >=dev-libs/glib-2.42:2
- >=x11-libs/gtk+-3.14.0:3[introspection]
- >=net-libs/webkit-gtk-2.10.0:4=[introspection]
- app-text/iso-codes
- >=dev-db/sqlite-3.12:3
-
- >=net-libs/libsoup-2.48:2.4[introspection]
- >=dev-libs/libgee-0.8.5:0.8=[introspection]
- >=x11-libs/libnotify-0.7.5[introspection]
- >=media-libs/libcanberra-0.28
- >=dev-libs/gmime-2.6.17:2.6
- >=app-crypt/libsecret-0.11[introspection,vala]
- >=dev-libs/libxml2-2.7.8:2
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- >=app-text/enchant-1.6:0
-"
-RDEPEND="${DEPEND}
- gnome-base/dconf
- gnome-base/gsettings-desktop-schemas
-" # org.gnome.desktop.interface clock-format global setting usage
-# gnome-doc-utils for xml2po for TRANSLATE_HELP option
-DEPEND="${DEPEND}
- sys-devel/gettext
- dev-util/intltool
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- virtual/pkgconfig
- $(vala_depend)
-"
-
-src_prepare() {
- eapply "${FILESDIR}"/geary-0.12-libdir.patch
- eapply "${FILESDIR}"/geary-0.12-use-upstream-jsc.patch
- eapply "${FILESDIR}"/${PV}-fix-cancellable.patch
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die
-
- local i
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DICON_UPDATE=OFF
- -DDESKTOP_UPDATE=OFF
- -DDESKTOP_VALIDATE=OFF
- -DTRANSLATE_HELP=ON
-
- -DNO_FATAL_WARNINGS=ON
- -DGSETTINGS_COMPILE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DVAPIGEN="${VAPIGEN}"
- )
-
- cmake-utils_src_configure
-}
diff --git a/mail-client/geary/geary-3.32.0-r1.ebuild b/mail-client/geary/geary-3.32.0-r1.ebuild
deleted file mode 100644
index dd806a26e5b3..000000000000
--- a/mail-client/geary/geary-3.32.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
-SLOT="0"
-
-IUSE="unwind"
-
-KEYWORDS="~amd64"
-
-# for now both enchants work
-# FIXME: add valadoc support
-
-DEPEND="
- >=dev-libs/glib-2.54:2
- >=x11-libs/gtk+-3.22.26:3[introspection]
- >=net-libs/webkit-gtk-2.20:4=[introspection]
- app-text/iso-codes
- >=dev-db/sqlite-3.12:3
-
- >=net-libs/libsoup-2.48:2.4[introspection]
- net-libs/gnome-online-accounts
-
- >=dev-libs/libgee-0.8.5:0.8=[introspection]
- >=x11-libs/libnotify-0.7.5[introspection]
- >=media-libs/libcanberra-0.28
- >=dev-libs/gmime-2.6.17:2.6
- >=app-crypt/libsecret-0.11[introspection,vala]
- >=dev-libs/libxml2-2.7.8:2
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- app-text/enchant
- >=dev-libs/folks-0.11:0
- dev-libs/json-glib
- unwind? ( >=sys-libs/libunwind-1.1:7 )
-"
-RDEPEND="${DEPEND}
- gnome-base/dconf
- gnome-base/gsettings-desktop-schemas
-"
-# org.gnome.desktop.interface clock-format global setting usage
-# gnome-doc-utils for xml2po for TRANSLATE_HELP option
-DEPEND="${DEPEND}
- sys-devel/gettext
- dev-util/desktop-file-utils
- virtual/pkgconfig
- $(vala_depend)
-"
-
-src_prepare() {
- local i
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
-
- vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- # appstream_util & desktop_file_validate doesn't seem to
- # doing anything useful for an actual release, maybe for 9999?
- local emesonargs=(
- -Dlibunwind_optional=$(usex unwind false true)
- -Dpoodle=true
- )
-
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/mail-client/geary/geary-3.34.2.ebuild b/mail-client/geary/geary-3.34.2-r1.ebuild
index 2ba8bb3a81c4..bdeb8150e879 100644
--- a/mail-client/geary/geary-3.34.2.ebuild
+++ b/mail-client/geary/geary-3.34.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
VALA_MIN_API_VERSION="0.44"
-inherit gnome.org gnome2-utils meson vala xdg
+inherit gnome.org gnome2-utils meson vala virtualx xdg
DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
@@ -12,78 +12,84 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
SLOT="0"
-IUSE="unwind +ytnef"
+IUSE="ytnef"
KEYWORDS="~amd64 ~x86"
# for now both enchants work
# FIXME: add valadoc support
+# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it.
+# If not, it could be compiled against 2.24 and then webkit-gtk upgraded and
+# geary not rebuilt, ending up in geary issues #558 and #559 still.
DEPEND="
- >=dev-libs/appstream-glib-0.7.10
>=dev-libs/glib-2.54:2
- >=gui-libs/libhandy-0.0.9:0.0=
- >=x11-libs/gtk+-3.22.26:3[introspection]
- >=net-libs/webkit-gtk-2.20:4=[introspection]
- app-text/gspell[vala]
- app-text/iso-codes
+ >=x11-libs/gtk+-3.24.7:3
+ >=net-libs/webkit-gtk-2.26:4=
+ >=dev-libs/gmime-2.6.17:2.6
>=dev-db/sqlite-3.12:3
- >=net-libs/libsoup-2.48:2.4[introspection]
+ >=dev-libs/appstream-glib-0.7.10
+ app-text/enchant
+ >=dev-libs/folks-0.11:0
+ >=app-crypt/gcr-3.10.1:0=
+ >=dev-libs/libgee-0.8.5:0.8=
net-libs/gnome-online-accounts
-
- >=dev-libs/libgee-0.8.5:0.8=[introspection]
- >=x11-libs/libnotify-0.7.5[introspection]
+ app-text/gspell
+ app-text/iso-codes
+ >=dev-libs/json-glib-1.0
>=media-libs/libcanberra-0.28
- >=dev-libs/gmime-2.6.17:2.6
- >=app-crypt/libsecret-0.11[introspection,vala]
+ >=gui-libs/libhandy-0.0.9:0.0=
+ >=app-crypt/libsecret-0.11
+ >=net-libs/libsoup-2.48:2.4
+ >=sys-libs/libunwind-1.1:7
>=dev-libs/libxml2-2.7.8:2
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- app-text/enchant
- >=dev-libs/folks-0.11:0
- dev-libs/json-glib
- unwind? ( >=sys-libs/libunwind-1.1:7 )
ytnef? ( >=net-mail/ytnef-1.9.3 )
"
-
+RDEPEND="${DEPEND}
+ gnome-base/gsettings-desktop-schemas
+"
BDEPEND="
- sys-devel/gettext
- dev-util/desktop-file-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
virtual/pkgconfig
+
$(vala_depend)
+ x11-libs/gtk+:3[introspection]
+ net-libs/webkit-gtk:4[introspection]
+ app-crypt/gcr:0[introspection,vala]
+ dev-libs/libgee:0.8[introspection]
+ app-text/gspell[vala]
+ app-crypt/libsecret[introspection,vala]
+ net-libs/libsoup:2.4[introspection,vala]
"
-RDEPEND="${DEPEND}
- gnome-base/dconf
- gnome-base/gsettings-desktop-schemas
-"
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-ytnef-automagic.patch # https://gitlab.gnome.org/GNOME/geary/merge_requests/390
+)
src_prepare() {
- local i
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
-
vala_src_prepare
xdg_src_prepare
}
src_configure() {
- # appstream_util & desktop_file_validate doesn't seem to
- # doing anything useful for an actual release, maybe for 9999?
local emesonargs=(
- -Dlibunwind_optional=$(usex unwind false true)
- -Dtnef-support=$(usex ytnef true false)
+ -Dvaladoc=false
+ -Dcontractor=false
-Dpoodle=true
+ -Dlibunwind_optional=false # TODO: Automagical if optional=true
+ $(meson_use ytnef tnef-support)
+ -Dprofile=default
)
meson_src_configure
}
+src_test() {
+ virtx meson_src_test
+}
+
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index b164ee2167f0..d0057a852624 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1,5 +1,5 @@
AUX kube-0.7.0-require-cxx14.patch 1178 BLAKE2B 8a5cc7253df28f2da7cd211802f340106f56fe5ee97d53959ed30470158fe8ebdd24781d0bcf21b62449ab6a99e62e5d864412ef8e6f9374c0bf1201a7b73aeb SHA512 8023b089fd46f6c47d93f485539d582d18e2332638db274bb69432bb2592b601461889c0542c618f2b521d8cd38ce6b37e61444e3699be1e7dc1b13b99127d01
AUX kube-0.7.0-tests-optional.patch 1778 BLAKE2B 27c16346086039f8604f47ca1f54dec51f553633cc1a96594ab8c99cf6ae58dcfe06f9599276e27aad6b9cf335f9bb682f2972264a2ae2f873a4d101c2ddb021 SHA512 0e018d404437a00c5a8d673d1e6db76af810c7e97e6a2d19bdb884d592fe09ccccb0c35d91c314c95dccf44b3d8f67881038590d2ea181ba87f366cb05690599
DIST kube-0.7.0.tar.xz 627968 BLAKE2B 3dcdbd3a26c7940e360a8a97039ae832dd0e143b0a595f7a5dc30ddf20b41d0fdb3132bb6aa26d0322dac66fd1a6b0adc52e684c76205066d751a0b3067b3a5a SHA512 48ca740e54393da4aaa9b662860a479f2d9458f1d2da0fce3efa7091ccabc56d7e4778b9df994d53c3bcd6f26a367280337e785da6f0a34bd31e81c764fcd8ad
-EBUILD kube-0.7.0-r1.ebuild 1514 BLAKE2B ffc3f515bd886523df862322532e842b55d5f565bc0357944da7c903a8b347a5b1f89eebbc8d3cd283efd83019616dc52553bf610b41123f6181f3b2aa255fab SHA512 466359e239e5cd4ede4615f2a764e6297e8b98c95f8b046814a4683e9d3eff77beef56f12a493d99d428f73598ff2fb0923bef901239953ec63c0ddd7b361f49
+EBUILD kube-0.7.0-r1.ebuild 1502 BLAKE2B 126ef86ee0dfd9572b6533c73c1670b17def99f1bebefca1b11a336882694ebbda0a1905cd2daf677072718192c18d43c82069ddbadf4514b33085d0587ce512 SHA512 dbdc97609d8e97f7fa36d2d50fc02c41c7c72787fca7b68100e18b5733379ee350eda5253548d7f26ccde6a53f090f597bf1f71e01822cd7586350a41be239e9
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild b/mail-client/kube/kube-0.7.0-r1.ebuild
index 78e5b56d0627..fa227d0bc5e9 100644
--- a/mail-client/kube/kube-0.7.0-r1.ebuild
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Mail client based on KDE Frameworks"
HOMEPAGE="https://kube-project.com"
@@ -47,7 +47,7 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
sed -e "/find_package.*Qt5/s/ Concurrent//" \
-i {extensions/api,framework}/src/CMakeLists.txt || die
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 41dbef5bc2e7..11cf1d5ed6fe 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -9,11 +9,11 @@ DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543
DIST mutt-gentoo-1.11.4-patches-r0.tar.xz 107064 BLAKE2B f8ad915fd0ceea729fdc14719e69c43751e75fd4afc9f19460d15493fd97baee9606703d7d6a8239a34b2c0d6f2458fc007277933bbc724b6a8588bb7514decd SHA512 57714259f802efe54e21cd23560bb158777b50320604db0a8ff8a47c25166a873d13d64b03eba4cb1c5067a586e7c64d9d0ba84ddbe0e179745e92d704a55cd1
DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe74d70a630954511a38331c3e8e958ef7f6459b3bf8548211ee920fe238085c6481c03633cec21e7ae70c1473c89914ce720bd7c21 SHA512 feffbd49ad8156e226e7d4dc56b1c976f3f2a0f8dc3551c11696d5653342b91b4406a494d6081b969fe8267bf09a441a4f3c5a0014d108000e55c985aaafa596
DIST mutt-gentoo-1.12.2-patches-r1.tar.xz 106720 BLAKE2B 788735757dd4cf8c1d9fe09350eaf4780b1e90f1e1d9bf39c98ee03255b9b84847a387402940d1a05e4be2b8684688216ea62f564c40715cd6ccf4bebaeebdc0 SHA512 ec8c0989bff2008e6df0c43a8e833fb4f463993eacb1cbdd11722a6c49bb400804c80f74ac0073883a050f352a65d2743c4aebc882a2cd7db369a4e214a95701
-DIST mutt-gentoo-1.13.1-patches-r0.tar.xz 35888 BLAKE2B fc84e40794e0d1a66226c84423ddfa61deb5eea8bd87d8c6b611aebb049f8e100dda96e49dfd4f42e284ced8cf99e6aac38d72433cfad6c378e3fcf34ecedc57 SHA512 7f8045075df8e14ca8a163d9c2e0f7047dfb783e40086dc47b0c2c27a5e094f5e50f9df34d3eda935f9679339212c150579f747a85cdb4341e2f6eeaa2f1db7b
+DIST mutt-gentoo-1.13.1-patches-r1.tar.xz 36044 BLAKE2B 7caf7dc1e905bc09b72e69bf33819674dfcaf04fcc4db93955d0702559c85bcc886d7a5fd79dc59c7298771ac918ad78fa187ea3f7fbdadcd4e0af474952fdfb SHA512 ae4a078840aacff2ce5c5df03c7d3ebbfb1014816e7289776c446df3a693a76587aae670f567af0e824e603aeaa52eaff978f90c87bede8878fcc29a1995e7e6
EBUILD mutt-1.10.1.ebuild 9155 BLAKE2B 49b5576d721a9ad68e947e904a6e464dd18282ed9077601fcb209f259da364324b03c031067966673f6999da42c6907b5d4221a241db2f377288ceca79499ec6 SHA512 777929da223e49ab2fde78024009015203ebdad6aff9d954a9930ef108eff1025306cba2ff4187bdbdbc13e670060c6771d29c463ad3af189e42fd0d2ce6f2a5
EBUILD mutt-1.11.4.ebuild 9394 BLAKE2B c5ce202ae5350d5c86c4e45f3ab1c30a33c1451bf5bad16076799feea6160e26ca765617c0801102f224a4ff511ef28bae72108635a63b32461b44574aab504b SHA512 f826f54b9f508b20605689e306954c22b2928f4eba9b7b2aadab6ff362ffd79088f3ab076a7462004cace8b0def8a3ebbc2b59fe2b1e60200ec84f2734ec9294
EBUILD mutt-1.12.1.ebuild 9432 BLAKE2B ed526a801f5dbe3aa4ccc18baec4acb897d94723601c203538c4ce2ed1a1a6e171203f84b8048fdd1cd9f1b6d9fd04a21b527025b6658d8799774d440e1055a9 SHA512 1c46e2ce78b6326a931f33ab01422713c5126d06bf3bb09912fb784ca4390d92d884d64db64396a5c87004a3da87bf90291c13ce2a374fcdda598e1ae41edfb3
EBUILD mutt-1.12.2-r1.ebuild 9432 BLAKE2B ded23934158fc034c03c20537d7bcee864eb377ad1eeb207489be14cc3d9d002e06266905ca4b285359ceae237c47e3adae36540c5bf7c4bb79baf17f0203708 SHA512 bff57f1cc021db6870e34e4b73f6f9fbc52292ff85e0bf6cc6877d64b2d0752ea56b7f217c250373f1ea6043a4604e083d8f7b9e45093ffd883013a4a735910a
EBUILD mutt-1.12.2-r2.ebuild 8682 BLAKE2B a7ed03d38f8c3de2ec00915906f3cce024801303fd0c83afa57cb62add7585198d706d519f5217f686c48d270ac5732d23b29daa27e5e87288f819471e2cde25 SHA512 c87a76711ba98e17b85c85cfed4b8ce87ae2a49f07b838d6f6e8c25509b10f15457b33d2a070ae29ec1997b07450c5736ca3a95c25d5b81e8aa3bbdf6b1d6e1d
-EBUILD mutt-1.13.1.ebuild 7936 BLAKE2B 7ad5aee8ae967dd666ed6ea9919b2053fde4f1d25d0f10e7ff9c1c318bece8ceae707ca8ea31b0e0c857e6f72bd1a49f877093a8e318732076db592318c4471e SHA512 5321971e589eb19abb7cf71a5636f17290e9f0bbe0476979a6a07900cb9883affd36605dec5073de0a0f8b754c79d1555d7df733a03630d86b185c25e7953d70
+EBUILD mutt-1.13.1.ebuild 7936 BLAKE2B b36cb9a925ee418245c54d5390e002d3232fc04a2a0590cfe5f2d985823743b6358c9bd1eb85a4bd38eea60dcf419a6d396cf28ded63f066676d0cc96beb39f6 SHA512 51ea7b6e919fccf8e3135a9d8a90253ec1c6921b6c64674167d9e89a926d52b05661a8f974b7344ffb2f3485c8b0dd5c78429f8a03e59e91bd82057f19ec536b
MISC metadata.xml 1633 BLAKE2B 86c5eea8025bff6323e0ac1f703839caf87e868dfb934f6d42e5265bc31da40fa55145ca474174163feba2863e65ea53e22c1de811703d262f195ad89b17648b SHA512 2248ee20a23502741fbd1b1cc9d7d9cc60f88864e70ccb5729fee6448297146599b073c5124ffe04653ef04faffae532ba5a7d906bb515e6f399be8e7ef06368
diff --git a/mail-client/mutt/mutt-1.13.1.ebuild b/mail-client/mutt/mutt-1.13.1.ebuild
index 4cd23e5423af..cede0e80d77b 100644
--- a/mail-client/mutt/mutt-1.13.1.ebuild
+++ b/mail-client/mutt/mutt-1.13.1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index a5325e7323ba..75dbed87ed1e 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,6 +1,8 @@
AUX s-nail-14.9.15-havenet.patch 6648 BLAKE2B e5c47d116f78eb007b86b5c907782c8c77e61dedb9dbc98e10d2a2975409c6495c0c370a82108cf5832737cc75b5e0bba268cf97703a6e41c7fa207e24bf83a8 SHA512 3f5cbfe1b8b1450150e7b17a700693ae9083944e9a096aae08af9b08ceae3b3c46d240528a3ccdea579353406a2b5328b506668e54488455aaac9aad70dc1c00
DIST s-nail-14.9.13.tar.xz 734416 BLAKE2B b23de9c32357d5b88ecb723dc875d3366b2b4c57dd654a4f2422e8bb81b781a76568eb0955990d4166f034bf40459fa5d2992da6e7f2b403a641a4d4c0c1e200 SHA512 6467846fab5752c708886ba7a66cd2038effc0cf8d72e2feb670283cf1d5436c27037087eeaa201c074964476ff0c213cffe74169fb03089ebf964fcc766e6ea
DIST s-nail-14.9.15.tar.xz 757180 BLAKE2B 9d3efe43e6f1f4486bb66bb0060a6b656097c4b6d95e5f22e209e7464bd92bc9cf42a36009d674a3ee032ab32f64ecef2aa0cc1b09519a7760bf5d1145e35c5d SHA512 ca95c544890a13b475fb12f882a172942f29517319956eccab1fbc2a67625fe53e3f0cc10c31daac98e28bb1fae48364d80db9ec35f0e6cc71d748290a2635df
+DIST s-nail-14.9.16.tar.xz 790052 BLAKE2B c12dcb3e0f412b34a3f3214ad3be05095ac5045932f5605b59a21ae953c0edb2619cdff1c67249a2ff8a02d809af08d2559af4319462d39dab37df1f904a4d13 SHA512 147c9dbd6abf9a17778eafa36f1cd85b0f769e6acbae06d67d0aa8b9c8b940f78e115d13d277d4269ea44c9ad6dbe75228da9878d9eebb233cb354f3d548089f
EBUILD s-nail-14.9.13.ebuild 1935 BLAKE2B d6a22d55c96af91e1d73527421e0e4330f120eaf616647f6584022322e5d43bda9d440376829321d4aa5c449453711ea1937fd0749e2d807deaa57b1ee990be6 SHA512 bd5093554a5467ec80e1fe391123f32799487ef9a90823b891199c443db19928e646b6eb01adf5600638ae8d5b1310b557a7d6f05cc6e716d4ce3261942bb6b2
EBUILD s-nail-14.9.15.ebuild 2009 BLAKE2B 737eb36cfae90f8b5ca02490878d6230d04472d68b55f79e248698aa293e1a7c540c695bd065caef390500edb3fc9e20adb5a77ac15a0b2573f5b52b70c024c1 SHA512 b2576216c3ecdef61ff5260a2d3c5f5ee1fb49d023fe261fbf9a9b015b3ada6aed05d423a3d75c367371065060d25a9310fa733f3d8731e55eb73726c5587728
+EBUILD s-nail-14.9.16.ebuild 1957 BLAKE2B 53cf1513a1c3fc9c9a67aa99559f43a46ef6c24ef696b4f7454e0261811f2aba02f7067bb63e8e02ec3a5ed0cf4562799b2f7e6e00bb58e7dc1d0dcacd18df60 SHA512 f1524e1720ff68953ec0e731ea3792dcba8bb6ce9fad48cd899393c11d57dfab849a4cde666637683c702d91587f5b578556391d25f78ef7879ace52dff60956
MISC metadata.xml 827 BLAKE2B 60255cc3fe6eacd232600dc62ec110994d63025c0a378dc0853cf6111ec087859274a158e1a9719ae7853eb0b752e806b1c3ad3304256cba2c75ad21a7bda059 SHA512 0c0d5ece2c20d666bca54d14288ecf0bf61fcb7c3d0b65145c77f353f24382c35643eae9ac7b6d48657b795dbdbe7256d8b0ad4dcf54c55888cc289ed9e67d55
diff --git a/mail-client/s-nail/s-nail-14.9.16.ebuild b/mail-client/s-nail/s-nail-14.9.16.ebuild
new file mode 100644
index 000000000000..4d70d4c9573f
--- /dev/null
+++ b/mail-client/s-nail/s-nail-14.9.16.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://www.sdaoden.eu/code.html"
+DESCRIPTION="Enhanced mailx-compatible mail client based on Hierloom mailx (nail)"
+LICENSE="BSD BSD-4 ISC RSA"
+
+SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="idn kerberos libressl net ssl"
+
+RDEPEND="
+ sys-libs/ncurses:0=
+ virtual/libiconv
+ idn? ( net-dns/libidn2 )
+ net? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ kerberos? ( virtual/krb5 )
+ )
+ !mail-client/mailx
+ !net-mail/mailutils
+ !mail-client/nail
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/awk"
+
+src_configure() {
+ local confopts=(
+ CC=$(tc-getCC)
+ EXTRA_CFLAGS=-std=c99
+ strip=/bin/true
+ OPT_AUTOCC=no
+ VAL_PREFIX="${EPREFIX}"/usr
+ VAL_SYSCONFDIR="${EPREFIX}"/etc
+ VAL_MTA="${EPREFIX}/usr/sbin/sendmail"
+ VAL_MAIL='/var/spool/mail'
+ VAL_PAGER=less
+ $(usex idn VAL_IDNA=idn2 OPT_IDNA=no)
+ VERBOSE=1
+ )
+
+ if use net; then
+ confopts+=( OPT_TLS=$(usex ssl require no)
+ OPT_GSSAPI=$(usex kerberos require no)
+ )
+ else
+ confopts+=( OPT_NET=no )
+ fi
+
+ tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
+
+ emake "${confopts[@]}" config
+}
+
+src_compile() {
+ emake build
+}
+
+src_install () {
+ # Use /usr/sbin/sendmail by default and provide an example
+ cat <<- EOSMTP >> nail.rc
+
+ # Use the local sendmail (/usr/sbin/sendmail) binary by default.
+ # (Uncomment the following line to use a SMTP server)
+ #set smtp=localhost
+
+ # Ask for CC: list too.
+ set askcc
+ EOSMTP
+
+ emake DESTDIR="${D}" install
+
+ dodoc INSTALL NEWS README THANKS
+
+ dodir /bin
+ dosym ../usr/bin/mailx /bin/mail
+ dosym s-nail /usr/bin/mailx
+ dosym mailx /usr/bin/mail
+ dosym mailx /usr/bin/Mail
+
+ dosym s-nail.1 /usr/share/man/man1/mailx.1
+ dosym mailx.1 /usr/share/man/man1/mail.1
+ dosym mailx.1 /usr/share/man/man1/Mail.1
+}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 34c13725a3a7..5f02f56a653b 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -114,122 +114,66 @@ 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.2.2-ar.xpi 617164 BLAKE2B 9c241614721d5802cbf612e7f5a21b1416bf40848d1fe9bb5611be74c013efafa2843856d6ab5a00bf9d1dd9c249a8517dda07ddf4434d5d597d496311e0fc31 SHA512 751310b75772d6a028d2866e7c9397ff2157f1069912533393f0eec44b713d1140a754cf01ceec98d961c0d2e99eeef8c15ecb1cdd8f99390531b9ae91602d67
-DIST thunderbird-68.2.2-ast.xpi 551297 BLAKE2B d67cb8b324f1161ea0e6dd423923b5caea40c2a40797b63edc871e85040a778565b827ddfec1f339c6627a2175ff62e14e1f27d6eab7bc088d0db97e63cee38d SHA512 70c39b128df9d30d109959ef939cf80d29ff26d8c08c8cd7b28e7509bff7f70059955b394fca24362026fe1df0ab93908f288736514e58728c1663f91b9774d3
-DIST thunderbird-68.2.2-be.xpi 646279 BLAKE2B 26f55579d80abd3fe0797ee7d8719c541a45124111b8855d0aebbceff38fbe69b5add1784640c305cd1bd25acae81525ea69c1b9ad259f82eb27513cc2d934cc SHA512 bd3e01aa4767e68b6e77f5556464cff3fc32e415bf713b4ccaaf20305057e988e6286ba55ed57ff9a6d80869e383c4fdd8233d777437b75151ad2b7763b3e0f3
-DIST thunderbird-68.2.2-bg.xpi 646226 BLAKE2B c73fc55c51123fb959ac4a72bd7658322f246ce76f8cec363b9058bb98505acce0c161d0343523cd95ba15dfa046dc688800e367be221e8ee0cc5fdc9ed7ad0e SHA512 b4d6754e774cc84c62729fee44a6b8f1779726bf9566a3e83babf389d7c1386d4a843c8e9cc8462d4e37b0152c8778004526290429085d8fdc575bcbc010c668
-DIST thunderbird-68.2.2-br.xpi 574851 BLAKE2B 1685362672e0fffa0bc2cd7c6f749f6d502454acb8fea13272977ed79840e01f2d9b5ecca981d704455710a2096b918a0cc91c0dc559c8fa28f2f16abbf16259 SHA512 ad22ff063fa03298aeff11468f9e1e5dbc4c011f09eecb447670c7c13b784f65571149b4cdca60fb4af570d24ab500b8807f7270384d5e9f4d47b31336c3b480
-DIST thunderbird-68.2.2-ca.xpi 578438 BLAKE2B 2d74f61f842511f44d3f4cfa250630c055fbe27106819ba033d10923d2d13072069d4fab6aceb7f13a8079733bac7cf6a28861ec4ab946323078c69915977d91 SHA512 aa87b07d24d458b630a663125836eb1aebde27202a674e392d0b38805b632f169b75530642d7c5d9972cfe0adb2704130e06fc7df6c031b9f7151f3173a4af6f
-DIST thunderbird-68.2.2-cs.xpi 603041 BLAKE2B fe8014571155ac829a7171a69543077b4bd1b0a4fc69067243ff811bff04d2e16e5a9e09b486d81f74de12be3f979c0edd305917851a89803f93a4b59bcf25be SHA512 647229741fd329aea4b6eea6f22c5f87a6bedd572abaaca0fe8ebad87d0f383b2a3e68fd481277093dfe01b48e895f8c3643673f0aa1edf4aba6285c3a1afd0c
-DIST thunderbird-68.2.2-cy.xpi 589901 BLAKE2B cba6f2e3cb668e2c0f4e1961c009f3f6e02358a1d616d39fc679ab7ca91c13cf1f6921d0f73c095f846628b4485849588c03cb97ba301c721aa1294820479f00 SHA512 f2c188c650ec4856a728a443f9a17c36424c2bd782b436a0faa1cfbf10e86038ece967a2ddadd6b6273acc665832c79ce2095d5c980ea0e647a8f2068148e1d8
-DIST thunderbird-68.2.2-da.xpi 588348 BLAKE2B 15e90b3b3e06df14a0895ecaf9152ca484f4cc92079df28828ec8321c4746d5783c1c4384a37e51ca3111fb63687967c99025f16ba639682f14f33fb4de6c819 SHA512 b68c46f4e7961a0894a5304c0bb71d57e997f24bbfa77d20a7218ace19d8f393edd484cbdb046c0c79dcfcdd2162b03a57c93c003796e4bd965a7498404562b8
-DIST thunderbird-68.2.2-de.xpi 597802 BLAKE2B a15a4ca6a8269d287f93d3855d3441c99b8856fb59171237d08c8f9afae34b1fcd9559f08145b3df7cff9263fcc383aefc6aca300508a4621cb0ab1caa698374 SHA512 c6ca9374d67e5b6009d1ca070d984ac4246f15b5fb20c7bb8291ba801724c448db51dac05fcfb2c8907e1b6b6541a51abdd198c6ebd13b0176e852339ef9466d
-DIST thunderbird-68.2.2-el.xpi 699223 BLAKE2B bdc299c0872724118127a16e3402ba1285af765cb92f28e729effed63644001f35e5165e7d2909e2011c65db45c829c0f509e09ed72a8394f3eec032d6a9c4d1 SHA512 77d234822d0a87d83b5312d791542cffa1e31f045908a9fb7b92032dbcae139a0b1b24083bec04cd4e9a88851ea855c5c9d7c807eae5310ff0d993467428badc
-DIST thunderbird-68.2.2-en-GB.xpi 556402 BLAKE2B b0533af1bc0d32288d3a606b3ef40e0e8c1155c3ed8f6fa5943d72ae2519b3e96ea5af29179bcbaf0269cb431b22e435865cc32e9a3996dccef5335061d7c51c SHA512 49cd5803bb1c287ae3a4cfa374f64964adb3c1ba95437d472ae3883dc46303bc11022a4407515f1e2b564eb3c079b5c013c90f5192e531909f52dd9c37aeb865
-DIST thunderbird-68.2.2-es-AR.xpi 596550 BLAKE2B b4771b661ec447854078d57ab0d76eec9475ba60e984bb5131671e44d5351b952fcc7593d6c5d5f14a2ccae1ff96b3482a716cd0fe60b7fc4a1b106c80fe1dab SHA512 001c4f60cf155d050935b00c70eef7d62c1a8fb330aa6fa8bbf1b442d04a19e62c3bcdc481de3b79bad2a37a7909cc7d4d33a7f73d066aeee02dbe7a60b596a1
-DIST thunderbird-68.2.2-es-ES.xpi 518351 BLAKE2B ea31698e96f66f083b2e465addc89ab3cd0d87a21e03828512fc2b8583b9838265f2cbe3b496bcc4fb88af000a568aead419baa078b425fd6616aa42e5b5d696 SHA512 1b9f2d9c0f77814e8d39033b338610609bc91d73e594d24d091d2ffc60fae0409abda7329a4ffc030afc019711e0efc49d261a45bfe91d28fef3faa3edc1c653
-DIST thunderbird-68.2.2-et.xpi 573580 BLAKE2B 1ac94dc7b4c20457185658d642e0992f5bd3fce54bc3ae29117927f156060a41b65ddebc3117d3888a36c20469c707859c815227cfb866df4fe1ed301ae01313 SHA512 57997e5bca9bea1d863db0d0eb043b05c331917cd044321615d2537b0947b5481b7b714dcdd28754d9133249b4a0ebfd973a5c6825af0563d6fb2dcae68fe892
-DIST thunderbird-68.2.2-eu.xpi 579944 BLAKE2B 4d75057110258dfac4313c0a6583bcb21fd76db48631ffd243091354d0b4ba86aa94a801925102e091ebf97c7573176d3d6411dbc0a9f2764628dd0b108fb19d SHA512 3047dcbc46c023d1897b724243f4993820b0e4f9380c355c075e1237151f699359a998d371ca7441201cf4cd1060b9b241caa5a8b7c18503f7e5035be32776d7
-DIST thunderbird-68.2.2-fi.xpi 578416 BLAKE2B adcae84f5bdd25387c9053f52860f6b5e09b2816cd8628983de18a531ce51436f43ca4a72cd2b55960097df537b056e68f2e8b4d201aa9654c710c20a022f05e SHA512 b6dcf0624c84bf19192caabcdcc4b22fc9946d1b3541613dfd23c31041e039dd24208db550fec36c5e85d4807c4efcaab4b949936848297bac1bf43049525a09
-DIST thunderbird-68.2.2-fr.xpi 607809 BLAKE2B 2dfb08d9de21e885cf1863e3340a7b2dc67c98ad408e129592c70f6a6aaaa9b81a9dccfaeab91b89ab77b64627dea6bbc078313e3ee6def319398719cc89573e SHA512 acf16ebab0eed05b99ec55e0a47d6a43817be6e25b55b1b5b99ac0c766e4e9c7d1cbde5631b320c6b9e57c7274a755d3ac8efbcdde5568038f4400fedaea59b8
-DIST thunderbird-68.2.2-fy-NL.xpi 594466 BLAKE2B 4615677160a4d3c8197d6fcf26561513a3cf473ae127f02a37654c2e420cb1c6de7b542fd73adcf14286221209832a0d3e52a30a850dccf3502613dcf3452386 SHA512 ca3f459a782e43edd36cf8f446e3c364cd93c9a3d724f45ebe73e36e5e6fbb460311d3652fb0a88e82ca9b819e5c90be4102ca39ab33da5ab87673a539136346
-DIST thunderbird-68.2.2-ga-IE.xpi 588709 BLAKE2B c7141c8f672324e36e712adb03b5d613e894b5f2540261238b61cd11c8fb2d851f8a17d80c51aeaa97864bc4c9290ee824fe7c9fa1865123bc25eed218bba6b6 SHA512 1cfe403df401b3d6fb0de4ade1eaf545c917023b287cd87d5392a0a9cbf802b84c7ef90a667cccffefe7e9662843b5df1e52f366e06f564ba22cb47aa63b74f0
-DIST thunderbird-68.2.2-gd.xpi 587108 BLAKE2B 2729261acc0ef9a671d6284328dab07606a746c301cf1ec76704b98a0a72a528ca167bb86a3b8e0727a14fedc85070d1e8f6967a5bef3d59260fb2b69d90b623 SHA512 b206f8a11c021ce38bd80ebee47f6e541802b0adbb3ee2350524ced62d096db7757db637b3b0e53adf43a03376d792c35d9740b84ad10371689f71911d96d97b
-DIST thunderbird-68.2.2-gl.xpi 568395 BLAKE2B 53a3a758802d5b0f65699c0008de4240026500a5b531ac12383a06d6a8e1b5cae0f5a257d03726cfbdf4cde93fd561698128cd798ef2b9fbba4b08538dbbeced SHA512 a1257e57ec4f2dcf27d0f48b4e06c7b2cc8e8712eb68f0d8bd7ec51d2800b8f28208a94228c010525beddd8cae8a55751d9c280c44d1184692cbe9872fcc38ee
-DIST thunderbird-68.2.2-he.xpi 604786 BLAKE2B 9957413334fe3d645f65f792f89a6070dfcea97deb7562ea102baacd65b44ad920d85b2a49f4d62a82fc9cb3550f53b3f70bfacb2735cd806728fa2024ee25fd SHA512 627aecba77024e47f178acacb90f47672e61b4974482a4c647d578205f22bf18c87a4701ebdf6c1912eb3c12c99129d1cf08814eb39c379b8db0e174269e356c
-DIST thunderbird-68.2.2-hr.xpi 583782 BLAKE2B f9cb82fe1941d238b914ab86e1fea9f56b62ca54462f6ed06cec0565ba48198d70eb68277ad5bb1d8e9b5ab3ec5162ff5402c54e021cc921613ec926600293d7 SHA512 267f10ab9e6fe45a66a4b86f42e46d5d79a568f1d237d4e0efc175cdd8754c0bb2b676a9f2fa8ac07da6fd2949dcb0ef378f04a29a25bab4a621f07e532c511e
-DIST thunderbird-68.2.2-hsb.xpi 616034 BLAKE2B 9841109ea8794b0422f7968ae1e857274b96c985102aa233361d37570144ad4b4911c6226ef5b914eaa0a025c49ab4bd4b385a12b37bdbebaa4037ab652f304c SHA512 7cfc5ed7db2b8a25f30e4346862befb50d902fc83fb111040c238308a347ef44c92d7ec2f7e8a456ca024fc02d268d49ee65ad3c62e7f59bd22e12b32ae40ce9
-DIST thunderbird-68.2.2-hu.xpi 618153 BLAKE2B 80377f937fc9874b8b9bf65a882bfdc0abce827a32b155fb99252492657b7d32f345cd0e8db13f7050660b82899f0f9591e36f8d23582084f90c354f25bc578d SHA512 6bf5c5d7f65b1eb54aad1ac7e4bae899ed4a7b6fc3bc5070071150eedf2294f8a48eb94beed6f79fdaec819b40ec079d21f2283e0afe97b8fef47c6f7a05134b
-DIST thunderbird-68.2.2-hy-AM.xpi 630522 BLAKE2B 61685a681309428cd7c6f0359a7227fcb6712afa4b0d069c21aab120783826bca7b529d7f939655bb074b2852d381f5fbef757306c15b788b1e791f51155103c SHA512 c52fdde76e05c154ac5f40ef17f040311347a367387f25bf5c7b4a691d38c9eb98e157a640ab3f3a25c2adc19c7cac650471ae95cc4c97a76289a9057aedcd27
-DIST thunderbird-68.2.2-id.xpi 567746 BLAKE2B 8acc16378fe4c43c1370412a8fae81bde4857a199fd29f72dfc3780921a8c3e0d6f5d60c0098b5ee9c585f7a8d9f7025fb172ba211556525df2d378f9dce2b66 SHA512 639fc48c6dd4827477868205e5e83bbd059abdb04d9d66305fa19ced20befbb78299737079267ab487581c2728ae5f0f028cef5f65213cd6f477b3cce0a52c3e
-DIST thunderbird-68.2.2-is.xpi 575439 BLAKE2B ac38e8dd4a0ef66c7e7e1e6fd19b37a96a873838261f619d57abdcacd58012054d201fa5f33d4dfb88c5fad78be1383c4b19d91955c916acb48d3f9470cdb8c7 SHA512 4d3fc6d846b547fa1f43102a24858d0934700fb94b9c755715c040470731402d278c695a57eaaa2211669278e26aa91e1c0404b027dcfa81ebefed200fef8201
-DIST thunderbird-68.2.2-it.xpi 489519 BLAKE2B 0b6a7ee731fb7941694ff87fa9e4b588d772b760c335283458a3f18368f115318e1553004bbe6bf8f354959c4dd3b15a1731c4b3989ca3a1192baedc05250958 SHA512 b23149ee8f1bc99ad8a62daae2d5560abf7ccd506dd65e955cc4251f1cf0a5e39ca7609a070f66617883b9ca643e023bb1e45ff7c523e41bedd2b017819e892a
-DIST thunderbird-68.2.2-ja.xpi 643574 BLAKE2B 12305f8201e75acbf7e84e8bd2d4f6d4ee50b2672e491d8c241895bf7ab1b81f7cb1c4b8f09d4567bc2c368d192db7d32f63d4b53299e1effeedfb357be3c219 SHA512 8b2019e74f323447571686f0e97e4bbbc3e9973b25e91b5604a3becadeddf3f03c2bdaca29ae0bec88121a23c12d737b199c17efe05d3add448e5dc94ef59cd9
-DIST thunderbird-68.2.2-ko.xpi 620528 BLAKE2B c4c196521661d3ac2c44004d6de36ac203db15e124f056905627f1f9c721d558bca2b8cc8fd72ff24ad779b14d38ddefea56f56462c702735f8dadaabfca7edf SHA512 c6a6b964eba1a9132d6c4d64d142071f8da60566373e1ff6e7335a379f6233d2935fad49775ff5c9a06934b13698022a5d9f6c015ee8dc7e960f3de495bc9e3a
-DIST thunderbird-68.2.2-lt.xpi 603844 BLAKE2B 6582c6ffb7cee0a49601aeef088279eddb2ea71803027b474b377ce8d985b935b02b3148d42c386e5571bac3e1703f016d8c80660b27cd876d2aceef2bc1b5e0 SHA512 b5b79b34c140816a8ce31aaad0d4f6830096e37888819a18aea10d44401b7b889cf4871c915ed8d32bb26dfae45366b0228a1caeac21db78bc549cf877702305
-DIST thunderbird-68.2.2-nb-NO.xpi 574019 BLAKE2B e062c51eeff5f693c4076afc0b536c77ff6ff98da1cc7f8363049b0a7eae27a15c0012a5efa50395cbb6256170afe2e52a29dc6f71f96677c04e58d4ce301081 SHA512 144a2c75479dbb76bb3d2a1ad3520bcc08aa9ef97373d831e552424a7ea0a47dfdfcd5a4b9815c65df6ebc73e359091326702f440b45dc79ba4a2f6c8f442fab
-DIST thunderbird-68.2.2-nl.xpi 581354 BLAKE2B 9b3cd9f3ddaa20bbe2e05aac07da5db1ced6cdb248a54ba7ccd8588890e7702b327a9f9c61b6e292ad2429e76eb15845d6efd34fb494d410ff6df8ee85d3c79f SHA512 2fcf5681efc36f73181d927b94782075a774f06cf5b5949caf8ae17481b299c8a63ce6c5ec3c1f2f9ed3eaea8e02638177b229adcdd58fb7aae92fc5ff4a4688
-DIST thunderbird-68.2.2-nn-NO.xpi 574947 BLAKE2B 8c2fbb9f70ba4a969f76a8421c4fc39aae78def3e86f2323c8d53ce938a709b41b189ba7c4e9b3b3e819acc9b03cd3b9fb71df8ad11157ce4c189a45c6b37e0f SHA512 4abdeefcfbfada72b459437a19f72f390dd03989fc057c6d375132527f4c298ed6fcd5b9aa9705976b6fb163de7d8581a7958c18c5626487b697e7e8d132e02b
-DIST thunderbird-68.2.2-pl.xpi 576084 BLAKE2B e9517677ce1eea31135d5edcf92355e94b74655433b10e0e1c3f410c5e4ccf388f82a0ff886477b73759bc4596f11f4f3e61f81ef32b3671b3e59c3f8efd3ce1 SHA512 ccb03e1b18ac2226cfd40e854697121f0710c8955afedc32efb4182d1f846bf15c4988dc18a8a8710f3c0812697956dc890efa3ff8afdf819c6cb96af7dbc7fd
-DIST thunderbird-68.2.2-pt-BR.xpi 589835 BLAKE2B a03592a60d33883cee4c2a324cf52b3055358fbd4a60f5d9fd8ec76b7e85b3a6a7267634643636e4ccd743cc062ae2ee71dfdabd0668a0fa656190b71240733b SHA512 6955ec5002e3ae0f411e2ef641be457a0476bc14662d24f180db8067cb13cb1f82248bf08bef70382e34d40dda02798f379aef54119de250ef2715e58168ad1d
-DIST thunderbird-68.2.2-pt-PT.xpi 588100 BLAKE2B f0d4338aabcd7f6a8c40ee15a7a4acd7b81dd6b2609fe153c266c130abe9c2bb41e75545ffe984e0350ef6dfb9d6d946167b5b8bbd427be36b5a3a3a2bc63803 SHA512 3cd8186f492b06e5c7374bd7f6974d96b0e291deaf4d74a13d9411387e71f1ea25e0aeeb8c146d8244ca69f137112ca61883a2b99fe3f978a67dd05ace3b5fae
-DIST thunderbird-68.2.2-rm.xpi 578048 BLAKE2B e257e69809a4a541bb479777cd602d0c03afac7949b494c484dcb495954a5628938f9c51d7ee4dad251646f86e7d69dea55e69af930810685ddd7c2e68e6ab0e SHA512 a3fe6f53206e35589c6c63431ea661f086a1fe588d6bbf33a2331ec3814dda9f0e70f1da3110fa39ba4aa6a141c3c17021749fece2c65c690e079b062b3589b5
-DIST thunderbird-68.2.2-ro.xpi 594840 BLAKE2B 68f39e47f9764680409852c4e4f12ddf044ce85e91cb6cda7a6882f949d1332fd5f4b40765a8bd25595731c4fb8b35e34506457067194142281b9442df94793f SHA512 9a5ab66c2ca6bf55597c9d28a264e403a77065ee0de2cc9903343165865d5d76e804b5fedb58d07a23b0cc710292a9b193d60fccf01628872c94b7b2dbd3b5cf
-DIST thunderbird-68.2.2-ru.xpi 683324 BLAKE2B dbf6ee21fc68ba08fbf2046f09d5ea2124df81129c716742aacb08621ace4e5123b5b50bff1a1e2a98ee11b5624770e21eb0cf87c0ff48e7d4d3185666f4f4bd SHA512 c5f7226a648daf6ed3e1e44d219f26cc3c991b8ef299b29a8e267c7ca4bb8da60b4e93b3a8f0fd77b9887d8803933539abfaf9be59a3b4986c526917296c21ae
-DIST thunderbird-68.2.2-si.xpi 637404 BLAKE2B 9c2f6338d2d2042cef81b98bb3dd91ee1e271a5b2d9f25f1c217f2eb365277ff500fa84045e940524dcbca4e1d0ee7a759de7a18186e6351111a8c91f3037c6e SHA512 46219b4e19767b1cf2d6e7f9a2a00a10bc2a60feead67531c64b6ef6c4cc7a6136d0e7c2e1dd9a879fe2a3f0fce311cac0e508239c579bd0f8eccd76aecb717d
-DIST thunderbird-68.2.2-sk.xpi 609751 BLAKE2B 4e305568ca189ca8e1a3ead7d5137dd23f28a04381b4d40b42d9e8b34ba4536c1a8d8bad4ff15446e835a0129db1945fa031d452ede73c5cc66adf8f27dc0097 SHA512 6c53639ccb3d645f7ad8760b5372521204299bd2b4e477ab33ee9dd193af1ed2028f138944613e4f05c9615318183bed91c384ad9a2571030eb02021eae0aa3b
-DIST thunderbird-68.2.2-sl.xpi 590627 BLAKE2B 5feb5883f89684ff100b6a38aa5aac0454ca062a0af162bfd3a74a367a07b960bc9286d8fb78e835a48f88e7fc7391d92790d7ff456c3a0ce84345b3a040f8c2 SHA512 fed6d4e780d122529c7164bbec07d04b81dc374b44cc156d70d1353cf4f3d321a3c3dae33f71f028069e710578a31a6287392cb4cfbe10779a241e8ea2726f61
-DIST thunderbird-68.2.2-sq.xpi 598898 BLAKE2B 3d89133ec517b1790cb81295d46d9f9cba344f50fc0717c729655fc4a34e42f9e53f42164da898e5b562bcc7298467268bfa6a9bc6012bcc310acf00505f6213 SHA512 db2cc0657e71c03f6cf4668f950b4d2739ebaa7eef01a21146639225fff0a627d71fa4155b1d7830ace8008d342b282730785e89c2c11e1a1b48d0e1d54c0852
-DIST thunderbird-68.2.2-sr.xpi 624895 BLAKE2B ffca8df7e7004b7687ca9c69fcdc4a3333f144588f308ddfb58b9c6417c80aa3100f10781a8a93ab021bd91319d304b9c9068208086d25769a500ccc7f0bf51d SHA512 a6a8bad2bd3d234be269f4d36802b2253d17eed20c1e2fa8056f3d6fea155a4027409cc6c735c3b496c84a8432c6aba0abe49d0096dbbfe3c1c932c6e589ef0d
-DIST thunderbird-68.2.2-sv-SE.xpi 591594 BLAKE2B 38243595e5555db6457a38c2ec8716084a4ef5ce660e864fbf93e97dd0970d7c686aef6462d5850a930316f78002caced0e818e9b69d60c8e9b56f7904e57ed6 SHA512 c9fd588754e99247c767038bf833b82ce8f01d288f961bb5314f0aa634be954feadbce2965f2a879c0682bbe4e82d5da4514976b0fd5d370dcbb510f278265db
-DIST thunderbird-68.2.2-tr.xpi 599706 BLAKE2B ff4fc3bc17197c2c5798ea46d54c87576ff4a5c420b751b44ece906aa6188ee677fd15018c239a97428b635eb1becd4a95fb2fdc349b4ba73deccafbf2756221 SHA512 340ff1145ca10b828ba6eb584c98247949bec467a748e31e2d691bc3960a66b805a772b048ff0f96a69fb7d4ef1c47dd3200ab26388d8a0f5e9a03e403037f14
-DIST thunderbird-68.2.2-uk.xpi 671452 BLAKE2B 06996c4bf847d33491a92c7282deafb4eb24cc34cf4b4fa4823e0165a889f0ebca0c34744083ba36bfd502fbdf268bf8ef9b6c6a4c2215fd82dea6af6504119c SHA512 3e6498afaf10cbe2fe36c807440d2d56ac19a4af308d7aab98960d4f992c705b23560f3728bb74a7b24794240491dae208061c6161eb507067a593d717aafc84
-DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e1bf1a0ac6133d2d5e6ee4254d20e0726a81d8d6c1ec01d2e50e5b1e0d0ac6dfba0e1c05e5bbb57cf857b3a9230db4a SHA512 b613ffafe4fc240d82f50b086f186e4149835a168c8a931fa5547e1ee87e930d1fbbbef90045bab1264f810aee51f7dda492fa133b0f6f89d274a4bd349171f5
-DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
-DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
-DIST thunderbird-68.3.0-ar.xpi 617166 BLAKE2B 81e86d3aa7dcf0e59f2746e92a8673a325325016206ae528b7aee7b710115fcea8b6b5cc7a27721069f4f5d047e8537956ea1c7c42c598f54f9e90544789f485 SHA512 eef8b1830ec2fce91c1adf8c3c6dcaa632de94d7ce7e48724d0026c4105a4b8e057b5bac62207ae24ad8733a8621e0ae9a13f1cb94d92d84f7eb0423eb23ac8a
-DIST thunderbird-68.3.0-ast.xpi 551298 BLAKE2B 30417f8854fe6d08e3cf6e8c0926734cf5197dda8075b413bfd86ffe441cfdef8a9cc60910a7bd30c02c79ae5534af7abb8dae77850d3eae4f35e85c49a216fe SHA512 08e6486b25e715991aeb28c3ee47f0216b1183d7aee7883f314e6b24c32ef34a6529dc960ea8452d2d3798ee7f24cf588a536a69d019d1f6fc85a101dcf5610a
-DIST thunderbird-68.3.0-be.xpi 646279 BLAKE2B 52285690a1891766dfe56a6f8f4aca8bd5b31f3e66d7a091eb74336ea35490e9258ad16908cd4ef519415518162a330708b9bb00b4b423b4426f25c01ea04a84 SHA512 d5d2cf16dadb1a3db3d4b5d00819142cd1e2b9fd6e2b908739f82f85c89c7af8813e68fbb3a382cd319b15107b9f948b54147bc777245db9ccbf1f149db72dde
-DIST thunderbird-68.3.0-bg.xpi 646226 BLAKE2B e2f0322c6d2eff45d93615b8a8bc6bece96cff3e908946703c37c2b03a7b8d1360ed520efde966720dab0eced6028e20c369d1ec400a5419126b8c89272a058b SHA512 99e8af121c42fdcd1fe734ef472e4eac6b5d1df8ff461f89dfb8a055a7fc8f7663cd99c0b2633ed719028014ebc0ffc80eb31267061ec8008874bcfb908e7dea
-DIST thunderbird-68.3.0-br.xpi 574850 BLAKE2B f9e8866b9839bada5fdb9f23c1e77fa70a0e0ccb17e73be6e0fa7f4119c329345ba35d09e82b073cc6c1a3bd6e04870dbec526d51d301588cb450e16c40421b2 SHA512 5b44fc79fd7adec90192b4b426e5a00d836f61d7c2271ba3276d4adbe761dad267d921760807316300ff74651953ef5be93bba80a3b24955e27e9fdda9d21e8b
-DIST thunderbird-68.3.0-ca.xpi 578439 BLAKE2B 479cda688b7756105e5e1b9063228fae6e357e635927e438fd20ccf71a80746aefaadfa897204378142f8af60c5904515b41747c1ee839cffd5099fec692c6a0 SHA512 0238989d3f310784cdf53a95b6ef1c873a241922f89cc8c66261e1f002e9f04d7f25d3234cf42979fe23841200af6f3af871122a471e4b8717ec9db5538a73e2
-DIST thunderbird-68.3.0-cs.xpi 603041 BLAKE2B af4ee01bfed89227b64c075191df822d5040a3c411bf6b303fe835419615b1aec1512188eb04f52780d826586d1d689d0b586affc2c3aed35d2526fc994987bf SHA512 bfb30e99456197158c1a715d2f468c97d990361916fc82f79cd28e94433ed2d669645d1285e8f614d8b19c9506a861ee9258fae0a28f90d59b871ae5b1277be9
-DIST thunderbird-68.3.0-cy.xpi 589901 BLAKE2B 08aed0d086b847c28e1845a06fd97700965d5c3325758c3959b045d1142df8c3be645e647b4f216d8e950ee064fa66ccdead3d35192443b000ef8965e920e3a4 SHA512 8d5ff3e083a9d22f03eda8d1e987f180d93b80c35920fc3a6596326cf202e449c808b01cfec2e9af84fbec496de679b92d53797c6fcf94f7c3bbab3b025c1f97
-DIST thunderbird-68.3.0-da.xpi 588349 BLAKE2B c7aac916287b574d9295e4010db7fa63a97b327c56aeb598e6781d8cec6d0ebd55d9cd02cc1e2e111d53ee377faf517f7b9cb754abee3d2a230bd03c3ae1a8bb SHA512 e1e1fe202bc0331b6ce6d34b590bc3baded447a4b1498e2219ac775a1a61403db391b30e2cc88bc3f84a29b539bb007880e194117c4a3779eb6a5ffd5ce4fd9a
-DIST thunderbird-68.3.0-de.xpi 597803 BLAKE2B 5e399b0c8ecf45d837437d9c1bb4d5bb2c8e8f4af027673fcfa25425371f109c39b67143effb44b866e614e175118c72f8d7d0dcd7afcd98c6ae6481343da02e SHA512 540a3d998a9e075dc0de3a82268b1c7e892b407a31be1fc4d0ac0af368306194ee4a86c191ee12ee024cb3268e9c77aed8e48462e36b4aca74dcd1be7d2b6cb5
-DIST thunderbird-68.3.0-el.xpi 699221 BLAKE2B eec5d10d16c84714f2a98b8ab25ad7a99bcedeabfecb217d3d17d353bb3b3b5569a7a7c0d6c260654a95e17fd9280ce62ad025adae0fb8b88f5a09a71a0fb1c9 SHA512 222687f2a4dfee344d06c3d66ec8f3718a9f59542889e4092de7e75873c03864b2fb820d8a268669b28d9e73532a35070e214a62bacbe47d1cd82c00651d18c3
-DIST thunderbird-68.3.0-en-GB.xpi 556402 BLAKE2B 95a1d459925ada987a3980e8745f885468574be08f448011750eb444053eb8863e8ddc03099c3226345430d12c6cffecd605d275043ec1fa599327addb26fc64 SHA512 45c7329aae7456e8dbb2a83db398e191f2589d518877af7762bb60dda8003cf7a04bb25e49d0155fee5fede87847d68075e8047b1ad11e251358fe7f8851b4b3
-DIST thunderbird-68.3.0-es-AR.xpi 596551 BLAKE2B 7b42bc7e3dc42c04bb52ee0f3282c42ba6c88208d474a6db345bc985f627949f6b5c7ed9b3fb55d13f229e5f60d80fe3dd73e801986ca67b5bc5ca4ba2c9b5a8 SHA512 c344fba459bfaae9dd09e89990832795c7f96335e4a15387bef172971e5952f231198a374e3c113fdd47be3d06c6d0101fa9dfd56cc31e592fef2990425df4d0
-DIST thunderbird-68.3.0-es-ES.xpi 518350 BLAKE2B 5fda6fe7f2ef0975ce9e239789e222eb1f28a80b9e39139bd180716aa5f675526932c584f73c43ffc742c8095aa30b28d425ab2dbd866a68433bdc4e3c8e4009 SHA512 118deaca4f293e611634d18d91662423573848b5e7a1cbf235f5c99b1914697c10b225ce2a72eb8b68f79f2416670b9dae1c0c562ba5c4f48783a4cc3c86bf92
-DIST thunderbird-68.3.0-et.xpi 573580 BLAKE2B 1e2aa2442b9222d1dc4d425a3178d6bbce27414fd1704b085d36a8c541671af9f5fe6f41669b7f9b130326cf473649d0321a21721214cecac2af642d63a70931 SHA512 8e1e07a3d824bb2bbfd5a1c631f561dae133026f853525bac9c4a6947a84ff4c287e724c8799dbb59cc06f73d90acb2a5809bb8cc279f20e7c90d7e8cfcef939
-DIST thunderbird-68.3.0-eu.xpi 579944 BLAKE2B d69724f69720613f82ca2471764ec9e664f9eebeffb95053517173f5eca7868e4477ba6706996afbd9a3f068db18387e054a9a770196b02461274cb2398069a4 SHA512 6986925ba9292815732d7e905e621011abe86f6b38605257e9497855033595a1d3175885cc54b6843d515732630bc5e4f4990ddbcfce371fefa1f98f8e80553e
-DIST thunderbird-68.3.0-fi.xpi 578417 BLAKE2B e14604c80a020b2d7ea789510a6d44114a1348390a2bd3094e526e9adee5f2bd031cbd6a8d1bddd766fc6c81b3d6ee12281af85c4fca6d85ebc6f277b222629a SHA512 2dc58cabd19dfd338f6e0331cd3b9b786096c368e706172a1863b06b9ae70cb56b858910e9da7e64fe33c4ac99f6c7fa35cc2beb138c1ace382b40cdb6e65792
-DIST thunderbird-68.3.0-fr.xpi 607809 BLAKE2B c204b9602918bffc8507283be28cd8c430a37320e30f9ea1911a5c2101a227cf7e61c22257da68c0bfa31a9e8bbc31dbd7a0b90ec3a47f6dc41918363b998b0c SHA512 5e9504b0285b2b5cf7f24a5080af49ec6826d65c528e68a3fae8114296a08b0a27edeabb0b2e023813ac07bfb81a13bcbce650fdc0e8e143f0226429e4aa808d
-DIST thunderbird-68.3.0-fy-NL.xpi 594466 BLAKE2B 800f464cf2db9ff8c3e80f224637b7c13a109b21f1d1c864d3aadda923cfbf722f7213a03438e263f2ab35e6d40a5e62f2aff89cb467982ec837132aacae747f SHA512 221a25f721207248567c85369cc13956ed0383fb9e5d39ead8e8680280970922e33ef719d674f3eca2aa6eba2b38086a9e4d17044bc9e6e1d0094f3276817b9f
-DIST thunderbird-68.3.0-ga-IE.xpi 588708 BLAKE2B 7ed184030e233c2a2454ccce81399830f8a352ab485e31f13a6ef2bcd0013810c05c1248989f155631a55a4c7565e6a1cef38ccec9383ca47e26c5666409c55a SHA512 544f1c28f0e3b92b32a999d08b98afff592f5266c9ba6bf2d1e4a9d931cf8fccd0eba0cc302ca60dd792449ee7545e153afa5d0d02247630675cfa5a070fc97a
-DIST thunderbird-68.3.0-gd.xpi 587108 BLAKE2B 9670e3bafc8aa5687ef3001a42e84f9eab2e172f689bbe73b29e4d9483969b5401b0a6c94ddcaf2659e769ed26e43422ff0952ad5cf82f084126816b52df844a SHA512 f501fb064b42e3d76e184899a8e5844b529c98153416c0496ebe07ca98bce90af52ffb6a7718587b8c4eb193b48a5f414f718845bf021a6dd2068d9f44560365
-DIST thunderbird-68.3.0-gl.xpi 568395 BLAKE2B c9de15881f5fccfcb8ff3126f9d7d53b805efd56a40791c3385ddf2085d897065b1cedd69a88ebf18a75a7fae4aab69bd8b0d1795bfc35e5dd39b4ecb793699f SHA512 383cff75476af0cb186254668f41d5141f8f211e776e26e5acd63a004ac798488774149c6218908b002e29e8bf0428dca82e6980200bab3c2e56ddad6a71f247
-DIST thunderbird-68.3.0-he.xpi 604786 BLAKE2B b14342ebb77aacb071196f0d4877a71c0429878cb2888742bf1d12c22a8b55cd9f32478e6d0dbb1c7911375d8a78f19aa39f75037345e8b091b6172d4ad646d7 SHA512 df4d77f6b6a71da7e4fbdf0599fff72aa59c2f366880018d6733b8e5ec02a520db2b9e036e02c6d0469d0a70ecb6d68746cd833f61c1d669a0ad403ea1143ff6
-DIST thunderbird-68.3.0-hr.xpi 583783 BLAKE2B f1975b0db4b4ced78365b6ba899552d1caf7d3e0a2af3f92d17ddd343d1dbd6d177ef91ebd29f548fcdbbb59602ba45d3a0056b1f98eec2591456f30b3125db4 SHA512 1545275fcaac9a6f76de634f6c3dc87579df8ac1600fb4eec937fc1425107007cac500225a56cec696e3d42d4fce4f505a277dcdaf31d04189c19f1912147c84
-DIST thunderbird-68.3.0-hsb.xpi 616033 BLAKE2B ad43045ce5b0c6c78c3f486a0d605d01e075f84aacb16651008654ebcacc2f5a62069dd62846380b96a0972cbd4efaa3d4cd41a57e300657bbcc49bbbc1d5b6d SHA512 51f4b53b82bd091e78c91e4cb1a1d7912ff01b9e28aaf7cb8b72ab2d6769bb147c249236563764532e44e42dfc733e467fae4d1277f11133cf00c5ff788aa20a
-DIST thunderbird-68.3.0-hu.xpi 618153 BLAKE2B 71e613cf955e75196f2768bd26d5f152189c9b0a1d4a715d58591d9e6bdb03a7fb11e523ce5cbf62085d50e7685ec700e86cb170860b68ef940346b847ecfa35 SHA512 3334539638c7bf627d71163b1d2cd22f23c380c5c041a2c1da613dbdb373b8e77deb1fff4ad5ae645bde3d076febf7a4287da1b2db7a53f87582f89189ddec7a
-DIST thunderbird-68.3.0-hy-AM.xpi 630522 BLAKE2B facb4ef4218a13defbb5ae768167af672981dd96ebbf0d51ff2dd684f2df13a4c37bdab30e639203c86fdbae50167a1e459d1b2cbc43e44e1d170dae55a2172f SHA512 704d58e597809ebbd36f947be136044e6cb00e0e1453b1308e53e4bf6f81c3be6ab021b2877fd6efd25cb9b2c2429a3c0def7e530420975e221bd720f68db61a
-DIST thunderbird-68.3.0-id.xpi 567746 BLAKE2B e52cb1c3fd595c1f6da9f84b63acf489476c35ff7a1f0ffd4090e59332adcb3a313bf799cb17dd85648874a5f26a4b5df1ba77a366eae5503450ab5338b181bd SHA512 4f611802354100e7ddc2a8c229deca1263213c33dd03abc00fb156af8f88a63b9f4f6212bba5e9e92ec9914f366af9380527e7e9c4adcb28512e1ee81cc60d9e
-DIST thunderbird-68.3.0-is.xpi 575439 BLAKE2B 9e9f62fa1db1cdb0e82e403e10a4197c17f039c293cf8a997ac1ac47a8f7f7a7b8881889b1180eef40def6117ee96c0e336725e42edbe5a16fea32e03431fccd SHA512 cf2eb20457709c4ef3597945efcb4629737fc6099ec5a40d627a36a4f74981010c9aafa2b15951319330f2a11c393f9092c909cbeb603c75edb1e3d8f8495b9b
-DIST thunderbird-68.3.0-it.xpi 489517 BLAKE2B 8b93474ff218f9edbada61065f82023852e51da8dd2ec244140b92d3bc29780c8b5e409b515d50bda2e3f0e0613134446261b44ef10209704e4d85475402b4d1 SHA512 c6a2583e5462b00846779ffc0ddef2833050ca4a4b3ad00310eca9169102e7e8914f482facfdf8f3c466d0b0ef49871a66cb040e9371cb54588497276c548153
-DIST thunderbird-68.3.0-ja.xpi 643574 BLAKE2B a9824ccc6a0c0fd319d2c2fea7f2c27f44d3c0fc6e1dbc2a2a729c1248f52e09badd15d29621ce9ceaaf675f65469b0836ed7a4a5554f016a465ba779f4b574c SHA512 d267b54fb2bd8448d7af659a363fdb9c622ea2ebd52377a1ca2e590be968350e9f2ac3d654821a90c835fb0f24454335cbab14d8088acb43ad3f1d9abeab83a3
-DIST thunderbird-68.3.0-ko.xpi 620527 BLAKE2B 5631ae1e44a0bd5c5ee44879aab50c35eefee28b74a18741f100631b942baaaf7902639c7ba1cd2905c9341bc67eb463d49fb39b996c4ac0e72839c5b96099da SHA512 166faf8d5e8592339d2f5fa357f7853ef903cb9f95918141129729a8831344fd8dc4d1aa7209b99d4ad71ef01958829414a0e77b94cf1010a98752b073e556f5
-DIST thunderbird-68.3.0-lt.xpi 603844 BLAKE2B 0e4ea29e0ba7b82852aa35ce0d47ac6e0a8a388bec9b5e532d41dec8cccfe169e3a15dd6212d6e7896fd93bf16f186337048948c4912978ccbc8c9df41b83a46 SHA512 06383a5eed292280c32280e631d72f9f26f451689651fd2f559c47205848b7b092ede326fd31f86bdad4c9e1bc093e83b6e3dbd8a02a9f0034d708736f61b77c
-DIST thunderbird-68.3.0-nb-NO.xpi 574020 BLAKE2B 752f053aa132439df58cc616f550e9ffa5809517c29c51c2c560d006768088f25e16be5c8247a75b2ced36a2125f3842dd2aab0091f707d80149cf14d35e4e6e SHA512 5ccf2e9e75f8d4b9761f7ce74305334ead26d9f44269a62f71c4085166dd4ed6b1af9e6147e3362b85cbc3d4cca409b1ffaa66b73682064af2113dbede3b9787
-DIST thunderbird-68.3.0-nl.xpi 581354 BLAKE2B 9e8f41d64a6c6ec581b22ce72a0d4326d1e5a61f2d2cb388874a08456196e41adaa76bb1889fd99681c32b40ea681f6ac403026c15d2d1abfac91252467e0616 SHA512 3d0e0ec787e78d69e3126dd52b1732f2e8e28c03d6173e96fb098cc24efc275a0706ff7c2dc58c275b934934aa7e24b6682f37067408b1228029439fd0609b49
-DIST thunderbird-68.3.0-nn-NO.xpi 574948 BLAKE2B 965223512bb4b923dbbb2d2dc7bde978d78c412bc0ca03a80a40adaf4e4e391e25ab66f266c1896b786b9178cffc51684dc0f69918488598defad88bdf716a9a SHA512 6e1e094588bfb1fd79188ef6334c5a2bd8617f2fb244ad8b8b14f925d1ba91614a565c6fcd8db56dc1d0404294d815d4411c096fdce7f464ba3195334aef53dd
-DIST thunderbird-68.3.0-pl.xpi 576084 BLAKE2B 1363605c702178199ab23e60b206617cbd72ec2ed8c5c2f2b28e301c4d7507c5a90bac427d440b71b5393c12e1f590dafbd267bd613fc8a8772842787548fbfb SHA512 89b54b8266e18b5696502d1ba6cab8e53bd1444f9677270e6fcbba597d73f0cc684b6f5ffe17f37064f4205bbad7b8ce559ae16b18e2825eb009cabc612a1fc4
-DIST thunderbird-68.3.0-pt-BR.xpi 589835 BLAKE2B c1e88c5907bbdfcb2a0e2fa97bb4abd56bd595bd7967d8fb5c1e2207624c0d7e2d8d06e81e5d08790eb56a3b21f923216d72194c43c4958180141d276ba884fc SHA512 d215892fd20f4f74bc9408de37e0caef2b53d4f9106fb8a9e751c247338a79d6b54957f104cb0172ced70ee86f199bd546d46ea7a38b98190bc82099ef123f7f
-DIST thunderbird-68.3.0-pt-PT.xpi 588101 BLAKE2B afe21532c5b6e3df6e9d21737f18495c0a17199f23d3598ed7f062de14c26577a75564b58121e6b3ed5b1e1d272a45d123210c9452e9550a894ebcf1f1317929 SHA512 aeeac645c17e62c233a737a1d673e229655d0f3e4768a52ce2657723b1874852c714a2f48a76a5db558870bd4645457afd9b38d6d3b3580450114db889e14fa3
-DIST thunderbird-68.3.0-rm.xpi 578048 BLAKE2B dcca59d4743ded7c7a8e90812135ed0ba1d73dfd8bbbcbe87d4553f4f3f01c5dfaac07dd5486b95db11b231822646fcaeb0ce363e85d04218784102cb03b080e SHA512 62f35e9cfc070f211a06c863e089365f773e40f4624905704c6a16db64a312e1560691b90db0a27ac029c41aff58c343af8b7441290d241eb394a53c11891376
-DIST thunderbird-68.3.0-ro.xpi 594840 BLAKE2B 2bb66a8532587711aea456e488f59e9e7cd8493bc8b56d95a9c541395709c6893738275579dde826bd006aa45ce57d963345372644aa8cf75f4da5fe0025a7b2 SHA512 3eef81b97a7f5cb1efb84a1685cc1cd023f2c2bd35f8a285fdb7bee56eddd0a12750aec38d3aa067a79dd32807ce997bb6694bf727eeff9dc55f2faac3d5fcbc
-DIST thunderbird-68.3.0-ru.xpi 683325 BLAKE2B 046b48b78753b9e421d3fa1e38115f433af12d6d9e48182656ca1de7142f7857b53bcfa464065da82a7c7caa35a61e8b02d14c84cbf22cc827e5e710240275e9 SHA512 31ab532dfc99df92f97d0b818477f23ed06fa3967de418f756c26c02a4a270b501560fca359bf91c61ec643e1ac3c185cbd49bb74f6dc194a9856af4d6bad76e
-DIST thunderbird-68.3.0-si.xpi 637404 BLAKE2B 288fa89fd0384127adb4308fd4243420ceb3fa8bbbac2e5e2aab374f820b393a8d23dc9cf806450635364b0b5c670ea8fd082a14bcb8db95f69d700021a0e7e9 SHA512 a2cb64f388a3a1f43585d8ed213718d10f88456a7e98ece05999850afb38490a05f7c8ee6ebf67565b0054217260c23782928370e6830c02c5abb869226629bd
-DIST thunderbird-68.3.0-sk.xpi 609751 BLAKE2B b370af76d4feb8286281c1b224813ccf77ae1881e6d305fc4477a59f4d3bb49e27bd52af80c7b02ed0f79f48094463d68062d092dfb81e21e12803db851d204e SHA512 148d483cb276d145c290789371a7473fc6df168866adb9c19ed9ed77c01214ff164271ea799021d2f50562c51703e0dacf5f4ea2d24019ab77d539440cc71fca
-DIST thunderbird-68.3.0-sl.xpi 590627 BLAKE2B cdf9222020d50262a11650d43f4b41b2fc40057bbc9b8bd7d1c9c58350b945d2dc70c6f854ca156270f765ef15b560f50d3709875df0f162342b95ff42e90cfe SHA512 982989131ed30d2765a140861208db58a8b87dc04c89da687d8e1e534b3221980a470c8944875bc4dabeec42258b705730ad31d9b7ed7b3bb8403bf8344006ae
-DIST thunderbird-68.3.0-sq.xpi 598899 BLAKE2B 42b9540a34a2ab14d5cbfb5b69b303edbb11c5597426b5af7d0936f0971e77c1397a7c9fc19aadf59929730247215f1ad27eb984622039f0a29eadb2ae1d3a67 SHA512 9c154f646af00d5ffe880f9bb32e185746cfa7edc9163b9081a201c4a94bf6be77e6d9d8926ffa08ea42987b7fe3c81d4927b5a4b7cdeccb66120d81a3be75b8
-DIST thunderbird-68.3.0-sr.xpi 624895 BLAKE2B 6316b26f8f9f604cd0a374ad4a39a2cc637420dab452e583a4a419061033658ea7bf60bb8e2355a0b6c6a08f295c50f85fce835362f050f5804cc8aea6115e5f SHA512 70b2aa3be55fb87c54e3d1b5ac237b5130784261060a24f824f1bc5df2777238b1d60f9493cd381876c0faa102414f6aff7ecd873f767e9cbcd1080d771a0815
-DIST thunderbird-68.3.0-sv-SE.xpi 591594 BLAKE2B 80919193b0cbad15f45995692c3600c89ae354f46e3d914c0cdb380fcd09a6b79e4c05c39c1a873a2e5ee24c8c3d72e03813e32c328e20b707e86920901d0fe4 SHA512 54132d25d21f4703415f222e1cae92f70052b6a59b8322fd14fae39a3bb34e4cb88f76011052bba583c770e14bc98535e45f79a50820da2ca853b7682d71b3b5
-DIST thunderbird-68.3.0-tr.xpi 599706 BLAKE2B adfbb20401c27fea4615f4dbf51b0b58a928d111c8c720bfdd03581d68077ca6de405f51d4a6e46acb6089df318ce93080ffb890ce6605d38c589d138f11f31a SHA512 2fd9ad18c6756fafd2227f258c1511df9d7b34715640c4e6b2473b4e3b0cdf1952f995d5ae1caabcfc7c9d3714e03c1d91a2e7c5cecaa16e4adb485bbe22f0b4
-DIST thunderbird-68.3.0-uk.xpi 671452 BLAKE2B 8d9d86cf679e873d5d185609dda6f73932bfb704a912549c9377d8bc445fef76bc40e1d24f5e3e0dc2b1c9d42347e91dba14d15f2b42600deb0c07266599b42c SHA512 21f24d163a8c250b3d329f152f0fa0ff8a5c69835810a81640cfaadce01a1b8214f7644719f1f63d531eac7cabee8e04d3beb55b826c4829033b1b01c98a9be2
-DIST thunderbird-68.3.0-vi.xpi 623422 BLAKE2B 33c456c98384ba76c83013a2ead8f15783dff7a12a33104a5576d111b4417afdc4908ad17d74651acc6601f5dcf59ebe1dd2c62dd829126ef124d52786454b4a SHA512 d6f9fe7daaf2552acec59c924daaf55bd5690ef83e0c9e0b1090c73bdf85ea5675ae5ed58858ec90a04b347c224fb13c588cbf25d601b9ddbc6fdb18ca780dea
-DIST thunderbird-68.3.0-zh-CN.xpi 626818 BLAKE2B ee3f4579e747a1e3938adc81ccc11512d12e3c928bd91353c61d2f0cb89ad76d06a154ec6e33a75f1e39609dcb51e7045e0a314975607f7f28231a7436e45ac9 SHA512 c42ea1b005a40ce56d8f7e40ee66e978f5a9fed68087ffc1e14f489cd585ff0522d084cdf9c1be2d34b615c23b97aa1e392775963f85c2c1a5fa9b06260b5024
-DIST thunderbird-68.3.0-zh-TW.xpi 627474 BLAKE2B c23263e7fe4674d4dd74a6caf10f67d94f35421fd9dee8449c39ac6d1384fb0f8cebd848f18f59fc3d8352ef0e47439167c5e1cc65cc4730ac669ca2b4e247a4 SHA512 b244d06d4a30ee404caa18cea07882eea3b3ac87315b376a669b4fe33129df641f9eabb4e7a304dbc2c2f8698814ab19471ca729f02fd8c40269c09d1cf85a2e
+DIST thunderbird-68.4.1-ar.xpi 617168 BLAKE2B d2672daa723f3b899659d36e42c5a8ee0d49112f9fedad9ecca8d5365eeb0fd192bf24f0c99abb0364937b501fa25fa5c741a4d669d60caa460d7924467b5f3b SHA512 a805ab02f3e7b047e1ded7d1970d9f7f8fa4372a2850c63b2a225512667c0ee5b0cc6267eb23fbd343025667a9ccf1042f689ec02e7a0560b1a6f731a59436b0
+DIST thunderbird-68.4.1-ast.xpi 551299 BLAKE2B c867545fc334b57e7617dbf2b7b5d2d81e6c67a2f87926336b831bccc953672bf0a9333f45ba8406ee585f4240b34d85a90878606a323435c668be276243fa29 SHA512 8feafb855cb83011bc9496a20b6183e026d71f7c807d533814f103ab8d8c67b57af18b40a9279504a66930756c399c2a75d81349d95829ef317b4590884399e6
+DIST thunderbird-68.4.1-be.xpi 646281 BLAKE2B af008b19f3e2d36889bf95469225b33fe44153900e4ff7cac3f102ea1327543677dc6f2339f9dd653bca4d870a91201992d6b95e2d5d008d646ad51c696b8296 SHA512 b8fdde6cfb5a363983cd866fb62ca75e3f8b153235659a69be0004c8d655cf30f254bbcd722bb6f476633a8a1e4dc51e9e1faa16aab3331666610f155ed63536
+DIST thunderbird-68.4.1-bg.xpi 646227 BLAKE2B cfe1f5934183193542667f2c3838b4ef1bbacca10c25e2c8ea0cc3dc5089651388b4aaef3a6ed01734bc0d607a61d40147c00e656e345e87a578cc00aee74d39 SHA512 2693b6545abbef7717505a8b250581c258afbbba1baa014e322c49e1f9450fd8cf89f3061e65cc2ab311776c316833be729912220e62749e52db19939608aaea
+DIST thunderbird-68.4.1-br.xpi 574852 BLAKE2B 141a8b61d0b5fbc68fa174e3dc5d4b9978cc455e887f3d2a27b2842705ecf090f0eda000d713736362119cede9681ec9592c265ded04c3567fd53ad58cf41543 SHA512 e669b4ec3a4d06454f0a7487b50ed3594c0e207803ac3a0ad23b0ba96e5217baf4f629c7477f126ec5845ee81a75ead4c2531a7d30fc2c05d2de91f8eb09f4fb
+DIST thunderbird-68.4.1-ca.xpi 578440 BLAKE2B 222faf8f6871dfb54927348b56c43c280b88d4fed790ae35105ba991c5b462cf64f90dcc32f948b8a718fc8d1cf06e1247202aa153b9595e66a8a7b6fb0b48b3 SHA512 394582b25d04441087f6192e540718791771f03a729a43fc0cea0b0efdc01931eb8ad6ff3415d606111d2dbbb0b8fa6dc81b11a7648eb7c48b551d4d48d2f643
+DIST thunderbird-68.4.1-cs.xpi 603042 BLAKE2B fda7a35cd6496f8f7377904af45c6a97376260e4ec9e880c3bca76b3a7fcb98d281a85710e148410d16d94f818084ed111cf8604fb21dbc0ba3f45e554b6f055 SHA512 10bdabdc91c8802506998a2465b6715cc70a6740a715b6d1fbaadee7d5310a2d7fbef7407ac458da561b2156051e6e21eb16bd0a6578807240602308a9d2f55d
+DIST thunderbird-68.4.1-cy.xpi 589902 BLAKE2B f8e4c345721db52c26f9360d12a14ca05fd2dfc9a4aa40db9c32329711ead1f607938a90fd4e58173dc9665e2592bb126938cf8c7167f17d1cfdb58ed9e2dfd2 SHA512 ad08a053c5f166010dd9eeb39653492681fe3d3b10cee3feb0d8ce4f8fe0a7e4c6cba410e86364e1680b722190b7952fec29a651d38ec537e6f24b3cd12bd766
+DIST thunderbird-68.4.1-da.xpi 588350 BLAKE2B 54454f40620f559033827fc2f25af329b61574b4207048403059cbca4868437d02a25c32ed727d8d024f971f5b5c039efd0f35cf887ea7a86122f25d52e6e50f SHA512 a9e92e7195a67d7fd89ee4bcedf34593a74770c0667efa7a8cd51808e626baa671bed285fd4314b20040e92e71f2b1d495347b001330561df1dacbef1cd9cdac
+DIST thunderbird-68.4.1-de.xpi 597805 BLAKE2B b13109c02d84b218ae50441a87bbd09fdfa616f85bb8654d20acbdd6914787cb498e236c0a7a26e4ec1377a4619de993692647127ab88f6366a3053319e828ba SHA512 e8bd7f46cbba624d81626d3290b533c6105d9dbeacfb35b5ecb1fda57e95dfb01b12661c5d5201fa69bf3204033b2514e5cbee0b72bf3f06f87ea0b8de7cdfe2
+DIST thunderbird-68.4.1-el.xpi 699224 BLAKE2B 9631a6a2541b61ad98e83fab4798fc430219b924c813fdfb662ff44d6f60685879549668d79b7caac9f8d1494aa6e4e75266fc79ac8a3422d6010dabf6be9bba SHA512 6bf4dfd5e218eb1c321eab240b3b6b4a8e6574318ad29fd4a97faa28f42050d458eed94bdba07a3f5393226da3cdb4c2cbe0d4613bd678badc9c3ef361a74739
+DIST thunderbird-68.4.1-en-GB.xpi 556404 BLAKE2B 52ab2aecef8c9cb3ba0164c3e57b55cff6912f5defe0bc1f3d92efe9386082b85ca9640f5a1c6ce3bbfd569fa90b8211cdb6a6bb40bbc51d94c79ab844efa7e4 SHA512 0b89f6f575101a80edf9c564b53af7d884a7247d53955ba0aece5307c0b31a00a0f04f2e6f71fa261ed5865cecadce21a7fa17a16d0264a8d6e753a5cca60285
+DIST thunderbird-68.4.1-es-AR.xpi 596552 BLAKE2B d73c67b05aad5d07bb35d661cc46239c909a2d046a46b68c987744935ff9fe7a81bb1b4189b093fa9a072059078d21752888cfa67f84ef7a24fa5092a8796601 SHA512 78efbbf2bb5105d12ec33ebff31ba6258d154032452f62862f174c4ec3bdc74eb8fdc5bb92391276b64d38e9d61c41aa02b7479f7fbada3a9dca5572da9adfcd
+DIST thunderbird-68.4.1-es-ES.xpi 518351 BLAKE2B 5c933a68c44acab013e3e7124c9826a01cd8afce6593aba19ee66e1ecc004017cfc82fe432ecb484a0cd9c7861a704b2cab814562c5cc17ffe12812fb3cf6c6c SHA512 ba8517f180adab4ce35775e38ac65736d136a567f0d05c57cb4246c9eec87bbf3b97c6a221c3aff62dbda78831fbbb820940528e3b4be4d27f54b6edd4ad109b
+DIST thunderbird-68.4.1-et.xpi 573582 BLAKE2B 27d2bc030cf2957afd7fe825e6814b7980c0c9f8b8e4c6eb3369921b93406fca22f1ff8f08ea7ce1638e6aec9d9da7eaaaee1c5b52cb94a923d11116c474e59f SHA512 1e52260ae3c5660000fcbfa3fc716a83c3444025dcfad002ef5e10f6bdfdde28ebc606c5f416a3e10f59aea1822676b2bb430fbc5f29f693d5878549e3b98160
+DIST thunderbird-68.4.1-eu.xpi 579945 BLAKE2B c83a9c5efe5a55ae197e8177617f10870bc2a14fcf6216e0a28ce3956e7d7b089510d8400e4ee4d5d0c40fcd6db85466f84a95472026b57de50191be50501e8d SHA512 73103348a32f31a5930f68546b5fba2a6c47940c15c0f4a7ce43839723f130d5770b6f2d98f856f1693a7b5753f327778245b6284b902bfab3f9a79728622f70
+DIST thunderbird-68.4.1-fi.xpi 578419 BLAKE2B 6080cb043bcb863f70229bc8e323149d0f7538103ba188d41421190315454e363aaf80e9c29d148b0b638d1932e078da2aaa2ed1b7bc95870d74d0999f7ac3d8 SHA512 9380164c2173bb1495145986c5fcbcfe983974b890cc140c919bd97285c634b169c818110138184179dd45a0ed8a0ccac855733a69e91f2d9243197adca1b019
+DIST thunderbird-68.4.1-fr.xpi 607810 BLAKE2B b50999859712501ad65f0238dbef32bab2f9cfc4a4220bb88960e12c7813c4a35dcfcba0f1745275cc1bd1ba2ff1c41ab69e1eb03cf923753c25af9ca0a15a0d SHA512 9866a32481be4df00a0f2520457de1fde39ce3061a724d4db763ca5fa98250e46551d6ea1b8db34a2262a764f03ffe73250540588d04d559ca78032ef2753475
+DIST thunderbird-68.4.1-fy-NL.xpi 594467 BLAKE2B d8ebe42a35658e3028cb93d2794b46344accfab77cee88305517f22935103906265fa15b32e6e2fc7288471fa914aa56f97d9907326ee0c053dc6ae9cf182de6 SHA512 443fe9b0a1acb572f1f729f573175653411cf57d74ab7f77d3f9c16838f2e928f2e789f09b3577be8de51d74fc820d1a12d6daa23b1e668b91d5254ddd69bd6b
+DIST thunderbird-68.4.1-ga-IE.xpi 588710 BLAKE2B 78650b4a080ebd01c808643c1ed6c7e41f50f6cb96082bc620111493e32b2bf1a61d0ad81944bf9be36142f50143fb86aba1e1a780cc67c58ac4dc887a999c8a SHA512 a60f3638856697dc4bc4a12873e4eca158bd567f5a09a4b03f9346e66428ba4d794efeed7caa3d8ccd9d395d8805d666408e99a18e40f5664e190386026e0ea1
+DIST thunderbird-68.4.1-gd.xpi 587110 BLAKE2B 15032b5827e3d5ae7a16bd1085481c14612d06b2a69f5a7fb62b44513b3dad24b944195cfe6e12cc7af96d42715c16895100e9e11ca408c2f11b9b63d211ddde SHA512 1874bc6f53b5b2f0fb11eec617c5302bd99f392856376326946a2adeeffae90bfef93533e6fa3c6afb480bb1986aa6c2d60ee4390c46815f66bc2a36fbc37a30
+DIST thunderbird-68.4.1-gl.xpi 568396 BLAKE2B ec09a2f090cf0cc0c3b4638a4d8a8ba2d5cf0a294a6669e3e8b660ca2347df0523fa46d56ccaebcc295c07c209595d6833d1c9a298fe113fda5f54d1c7e1e33b SHA512 05a5bbe409425427f7cbe915d2bc232d65824e5e0988630926a137860878b83d38c175c39b57958e656aed82a2e937f51fc837fd775443adf68f4943fed49d07
+DIST thunderbird-68.4.1-he.xpi 604787 BLAKE2B 3a085c98399b16b3e98b46d38af6d32330ac5e5f5d558f035b71d2ab68cca913132d0816cb958033be7791e132a477b1081198c54dfae95d8efab57faf73668a SHA512 edfa2bd9cfd1029e6b6c9a43b96f0ac1f544b61c2f3b560e65d9007aa03df7b59bf5f08f1a2b9ea30134159abca4f26634ea07d59778d67b0cf0c7938f5e9523
+DIST thunderbird-68.4.1-hr.xpi 583784 BLAKE2B 42e4cade236225d191f9caa44d8ebedda6825108246bf0e524c3cd433376c3f21f13ee40f0b9fbf5c70fc127340f8482ed61e3db71857a950f6b7ff5ad3a7944 SHA512 5a2794728bb22e3dc599276e95e008f423cba622f8a6e9ae65ad93fd37325317b9f74d0563ad6a3eead9c04d530df46c780fa0bb876f43b2f6c6823a2ff4eb39
+DIST thunderbird-68.4.1-hsb.xpi 616035 BLAKE2B 614e9ba0e778e6f7b9d0053b2955bf53efd944e8ab33fcb632f992215bfd4870ace017c874691ed8a6118da0840676dd02798744e7c41539e7f04974e403c263 SHA512 a0e8fcafb650d47402d6ffc15368f038bf3ce8fc684975fda1d7cb0c0c38679c246202ca2a7b217edad179217d688a04f448873a8ee1fdff1214a9220ae4240d
+DIST thunderbird-68.4.1-hu.xpi 618154 BLAKE2B 0a6889d403d0d6ab5662cee85af71a729f8a301e249caebd56ffd2534e62d80716891bcdd8c8ff4c6ce398a07e2c14ad62dfaa6a25ed1ba358d3c3157a125c9a SHA512 48eb5c66ff7c224a43b7d7932c5d39fc676a35bc39aa002281c687dccf34f5fdcac55aabc4f1fc15590e1892805b39fb49b706506e4b65d0f261e55d9384f61d
+DIST thunderbird-68.4.1-hy-AM.xpi 631977 BLAKE2B 347b809e188111ff98a65c3136facac23442e44f4686715defebb6e8d009686d5cac1dc7834ec81c3abf5916a50544dbe52c7760dfcc279a7d7ffc1772fba90b SHA512 4b52bffdab94b2d20ab80a7e1e48acc9f78496adfaecd1f89da12ee96ee23cd3e8983b5ed2227fab29e85ea480b173a9aecf4d7fb3fa1577d266fefad10e862f
+DIST thunderbird-68.4.1-id.xpi 567748 BLAKE2B 295ef6e7b161f9b4d564cf0c484a62e3061a44ea6afa693fd8cc314fa713de81c21621452d319878296787238cec6cd478b02c8cb25bd5917e16bca41a8dd304 SHA512 c940fed7dcb95fb3093276bff3069149a469b85a65df26c58b0beb5fc4d875091bfc3216be9db0be9ce0102da12059fffa845d749748245f396461dbaf2ed7e6
+DIST thunderbird-68.4.1-is.xpi 575440 BLAKE2B b6d402367d540200ec9f8894c062c5eb445c7b118b76df5ac29e06d99223a715c7986f549059f4641ea6a938ad841f696bd90b3b629be82320d3da412a8c8107 SHA512 f89c03981f8d2e901047109fb74fe834ef3bc559aca565e6b1616c3ede06c442ef6a426e908adeb94ef26f03d125a4383d0b304babe66734f900390416001e53
+DIST thunderbird-68.4.1-it.xpi 489519 BLAKE2B db2bf0d9ede55eb9a5498aaa2b1b8ce793462fc23c1369d5cb3963890e345725b1f8934c5b69b9edaded84bb8b24ad3d27932f13f9bd514c8eb2818261d9b683 SHA512 cdd9d520fb9d188f8af7f22dcb37b7611fe4ced2387a345dbb777f4840934c30e564d609214df00d0b1205865f1ae4bc0938f883643d1a61036c7e870f2b4f1f
+DIST thunderbird-68.4.1-ja.xpi 643576 BLAKE2B 74422ce9ec425a2e33a7ee91626566db7a709c03108eb64426d42e58a7ad54970a046acb09eb8d2a8868cc45770483113187a963cd2f1cb1ba551d97292ddc2f SHA512 bdfc41e4401dd64a8213d937ecba45fcb376e6aebd6fdf34cb5257966d4fa93a3102f0409045eccc24467d249ca51519466969b8370b30ca8bb38721aa807597
+DIST thunderbird-68.4.1-ko.xpi 620531 BLAKE2B fbe2966f8952558b6b2022d8d9dff872c7e08a74876208a44de3bacfde59bd6aaf928d45031edd000ead0cc785df78e4117d4a82943c965d43098220a6d3a6b1 SHA512 258bc22cf918701d9491f4e105d33047a9b072fe02a039ecdb6df482de9c72b6cd628a5f7cd09b3ad5d6551d5e7aa0e879b1b75537c85da6a950aefb6e363ad0
+DIST thunderbird-68.4.1-lt.xpi 603846 BLAKE2B a3604648faa1687ac14d326716521d54a07cb72f034b87f1eaefa978944b28c073893b39a6949078c2c6717f844b68f64cc9bc85ef644cfda3e55d744c06f4bb SHA512 bf6e4921876212debf9707aa83f91907ce6d6537a1d240f789f797d18082ea229f16f75b484252bd99398243e7f1c4cd66d600ef747345ce7ea2301d455f790a
+DIST thunderbird-68.4.1-nb-NO.xpi 574022 BLAKE2B 8dbcfa37d7fd24199fe1451620069db71495b34107fb548f8206fb240ce0d2e9faa96e16bd64b577ddbccdaffaa76ff199f82d0f5033cca132b81195bed16f75 SHA512 ea197e592fce9e81c4ad752dccf480f2bc70aef9f2625a1178b24ce4b6f3db728864b6fe6823425bcce8d6e7cc82a805063b351697568252db1478d790ccdf45
+DIST thunderbird-68.4.1-nl.xpi 581356 BLAKE2B a3c6027a1d369d0ad10d46c1d287208ebf96fceae4a9de4449aee80a2d6e9491085db62709198cd071930055fa3fb7ab6e2c0a253cd94f40314344fa121f024a SHA512 0a73a591d33b45b95cb5eed23783899767fcf2b3a07f34695194de02c541bc1d707721e0c187c3e8cd8aba648090dc58aa4ef7487ab7ea9fe5562a51da67c1df
+DIST thunderbird-68.4.1-nn-NO.xpi 574950 BLAKE2B ce13d468fc2cd23281f1c4654ff1033f3021cd83594be2dc00457116cb27e0ba2ffe4febb4147ba1e84bd7aecfede3c2baed276c8c4520615e83cb1e294a79db SHA512 d36a779d6bcd7d6b0f3be63cb6da53f4509490bc78944af947020ac008bb978389d556ef27c6f01f714e5f31eaac9b0baff5246bc5b5794e7cd71eeb2246b6f7
+DIST thunderbird-68.4.1-pl.xpi 576086 BLAKE2B 128eb1fe7ba9e1fc9bbe20c012ca46bf591105c88afb7d2d624ebb036ee71314d98884eee42f6750f875af7b3833e6766d894b7cd82165f22d790a7bcd629bf8 SHA512 63c0a636baa339eced598c1d61135e05f6c4d1edc673ed50da8079b08c69e473ec3d165e28f6648ba764d0226baa7d491be2d8635ab5b4b03d478f3365cb7db3
+DIST thunderbird-68.4.1-pt-BR.xpi 589837 BLAKE2B 57e55ee8f941548fb3f15b419831c71db08f036eb9e1431341409715f6843d88d01f1d57a2f00a17367241f78dfd795fcf97f71391b45fd9ccd2921072b048d1 SHA512 5b40a0ad405e08cff5f070f2eb174e9392f667456693f6ac71838a70fd06be06847ea7c1dd03ee21338b51173fd5cef4c08974c1d0a2bc6392a8684ab6ab2b7c
+DIST thunderbird-68.4.1-pt-PT.xpi 588103 BLAKE2B 923dcdefb2ed67c05aeb3b3de5b82a2b53dcf8ce5f9f2820aa6c3eb7d49fdc82c2c170eabdb9803a8dec9bf9407bcd10d5a5307d1b9fefd8f153c9e76422a5df SHA512 0016a2757cac66b88ff631b98255ea5bbda4997c7026f0868d2d31a50d2be288998198f081fa6b26215ab957465b68c1db29616f2ceed706574b91a4364931e4
+DIST thunderbird-68.4.1-rm.xpi 578049 BLAKE2B e9cbc030562f22cc2e2aa02a5ce5dfa6bdfb6e7694e05708637ee3ef388397f2cdfce231d2715713e53c5df575278ff7cea0be58c1a6d0d80d1ab42f39fea2f3 SHA512 843f1125fa9f32f3d6e937346f01e0f304dbcbae714ab716d184a7a3c8c925b21f40f47201c70566a3d5501c98e43609f84f02ab4dd98bcc5da35b76e04cd8ff
+DIST thunderbird-68.4.1-ro.xpi 594840 BLAKE2B a7b587c4b4366b18e703f7ebeed880c9afbfdb08f61aebc286803c224769fa95e3c9fad5c4213956af288fe590f747b8d1f63a3840de0a0a13864158f6a87385 SHA512 a88f86c2d6750845eb659d5592b6361f2421cd28fc6bf718e82bf85e53507d7b78197c93bad000a60ddbe03395481694e929da13cf7e280e4e9702451777d785
+DIST thunderbird-68.4.1-ru.xpi 683326 BLAKE2B 2a3ae7d110d6406f47a1d9ca80f6138efea2c9d9b4b5d8794d8bb01ed1ffc7096fc9bfccf9035de75863b2b4d828e3397717910b2886b8513c6949aca70f4022 SHA512 7479337690453338458dbced49d6bf324bc0226c90f5713a4472aedaa4c66f4c3c70c3d43efb51bb32d19ca08792ca71f066f2c80c75a087030268ddec7463d6
+DIST thunderbird-68.4.1-si.xpi 637405 BLAKE2B f6bcc83eb887c5a8548fbc3882b93ce84fedfb6dab67284dec07ded1b22b272bc9892816b25c3c9e55ff1662009a7d3c0e8ddecdaacd03130279c499989dc113 SHA512 109d19433901168e500c739ba0abb2c5d44337361fcb63db4ed4345a7c9c715154c1636e6a2e366618e91784e32afa1b73e203cd18f4e652926cce4769bea02f
+DIST thunderbird-68.4.1-sk.xpi 609753 BLAKE2B 6c01e7d93e67dbcabdc7569c423b838011e78ba9bfdf4eeaafa3627bd954175bfcc25f7a06bc0b5a4ebe12e4e161cef2d530e5fe829f4ffcef7e58b52adf6121 SHA512 f906d12fc743129bfa22240f5eee34643b238f9970be3ca6e1c25e690bdc6f8ea173a371947b145ad44b75063ec649d05289b07fdd23da3133b0463affaa8415
+DIST thunderbird-68.4.1-sl.xpi 590628 BLAKE2B 2aab0e201f9801dc6b2f7fdf872216c47ecb343f501eea98d5cf8bf2cef72df0a866f1be49066fe80e022d43e1a6ee14011926c1e75c5bad6f69475cb16952cd SHA512 30729bdab58bad72d1a5ecaee6708ad62285a17ca72e9ba9b06429920226c20c84324b24395e6c4d406d90bea48e66e1ce041bb6d5e587ec0033d352152f4355
+DIST thunderbird-68.4.1-sq.xpi 598900 BLAKE2B e176f299a20fe9a5b7df21aa38ec1a733200788ef83ae014ef952ae406ad1b881a01cdbcad0de6ab58045df18a95f402fb96a36441ed817c2fc6442bc8681138 SHA512 73e3f10d0d597bd636f841df4795b6dc5cbfcd61b7a39c20a5cbfc3408ec6faf38fa34813869d9a45cf10f6ebce56aa9632c2005447a18de65935a01b9591df3
+DIST thunderbird-68.4.1-sr.xpi 624897 BLAKE2B 19fd888c98be9aba9a52234911d47ed76e6a104df540470870cc4425415f2dab942be83b868ffa34a14266a48d96c61b9f60a6c7af4df0691b77c7e8b1392b3a SHA512 2c025c3ff23dde25a74774c988d55b99202681b60179f648416f93a2893fa06f6acbbe964d02695f769e8888ef2abbcd6f2c984b8669a99689fc67eef0deb44f
+DIST thunderbird-68.4.1-sv-SE.xpi 591596 BLAKE2B 5eb7f988c447bc290642a530b74b15fa8b9daf9da8c68d97871a29c8900de928fda66f45ed673d5a18a9faba300d946558f07cd51392964e1001ed991ef063b4 SHA512 8a120498981ac4f2cdbeee9e8345773837b86f63d5e8004935d772ba5a4155f3fc96b27ff996dc33982af69152ac6a24c076b03023a453f4e39ab088c062d732
+DIST thunderbird-68.4.1-tr.xpi 599707 BLAKE2B 825a45e33b3dc1927396358283ca06aa73e785bfec526247db53c669f5cd89cfff9bcd5be133570f6e03c333ebc2ee10f9f361fd064b0b76058b19436e3879af SHA512 176de8ec4c3ebae6562d3820c1e0a75da6b7917b1767d4c7b4906f5a088311552c3114fff129cd5b9203cde4cd7faf8877a637c59781aaa6f1a6d8060fe29975
+DIST thunderbird-68.4.1-uk.xpi 671454 BLAKE2B dd67fb1efc856507f0e066fcf71b796b315a059e4a7c1d740621112fcb6ef438ad1101bc867d579c58ad61a724e5271f875a374c129d535fc62fa70908b7ebdf SHA512 e9f5be395cfa557d2ea387a7a8f9ae2cab0756fb07d229bbb878856e5819dc92697b1d2e7b23a100b3361b641e5b69f2b8ce5fea15a672929da2ed258a47978a
+DIST thunderbird-68.4.1-vi.xpi 623422 BLAKE2B 544b281c5711ea0020aa8aab0e9774fb0bc0bb1942b59ff51a43895801cc5c4a68956ae5e00c3466d391aec06bdffdfb3b7612a3d173cff4d0eb6212b2f0414d SHA512 49bcdb6b8cb987a3d30cc20107669eeefe27b9434255becca15cbe11e4ab34d80b76299b38b368fa9b3d485af128e980157f0bd0b864d2f5d85a1a47006f7e51
+DIST thunderbird-68.4.1-zh-CN.xpi 626820 BLAKE2B ba734f30a4ab8f6a870b7b12118db701f36d551e607723632419aec8ecd5e20a4adcab810c197922f390d944d09903c73ee16c9bea99afcbc2feb7adf67326ce SHA512 9404956545e739a2ebb4a08062f9f7f3a54ee73fb1a5bcdc604ad83bdda6838dc68acffd8e68ed9ec65f443114cf2d56bc467ba04222b4cf52e97e9b4b3baa0d
+DIST thunderbird-68.4.1-zh-TW.xpi 627476 BLAKE2B 964a8163102ee15f7815198d5e66ec16cc16e4b5bb8c63bac18b3a0fb95958d78d8158aeca0fcaaf3b45230a6a983de5209f8face36d21a4f199de87c83352dd SHA512 8085ca8cb1e976c541c1423d83289f372bf439d82c7b65d81d9b10408f45768293aefe4bb30e83fd5f2b20dfdeca8b522191d5e226bed9d40f94fe1746d5e31e
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.2.2.tar.bz2 57255096 BLAKE2B a3f8c2b52d0c4366f016cbe566c01faaf92ea715383951d69a1d1060e023dec83cc49baaf439d0cb4600e23edcde1f5396c457ddae1ae8c9f57797de0a16cbc4 SHA512 cde3ac5e798a9471ea6108a4d4e333eeecede61af22b63723aa849b9a3aaf6fceea5dcd4be73bceab1bef28030fb264573264b93d52caa44105d11b3531d3427
-DIST thunderbird-bin_i686-68.3.0.tar.bz2 57943234 BLAKE2B 2ea917ce9eac5e50f51852083635eb1e33de76fb8b0aa4027f7e6a876b2d50125d2ebebc72d4891428be2cb2bec4f957e6172f40fd80c595c7dc2c330482773e SHA512 9173c566663b1e2e00e60538019e35b663ab14a54b1c2ff7a37c9897f83015975bee0296831d95ba34b51e9fd65ae3ec5c967edceed5fc79e3cad904ee4d2e9b
+DIST thunderbird-bin_i686-68.4.1.tar.bz2 57953438 BLAKE2B 772584f0f5115d8a15c6334725dc3448a6c417768d6718297e3efd0d36f9b37540fef29a26c0e0354d37cf14f2470d2ff208ba66dcaefefed83bc526dc198487 SHA512 4e3b5cb47677550812a7b3db0155965bceb1cd23d4847612c59b2d58d3f8bd3ec0ac38218685c40725911c80fd295b2a7ec17973b7905693bdcc75a460af10c4
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.2.2.tar.bz2 54734632 BLAKE2B b501663dd64c82d08b67dfaa2b7afefbad3d5df34c4a3be646bbe3155d14e89fd6e33eaad40ada45cb4684f8eea239de00773b13e25c68b2bf31f7d91a8975ec SHA512 3c410d90e2157fce862b189f566774dfe141947a562a5e3a5781896ad1d0ba3ef7b978557fadb94f69108aa1e3674339dc0ef2189f6cdf251285fcae04de909c
-DIST thunderbird-bin_x86_64-68.3.0.tar.bz2 55368896 BLAKE2B cf001a82c9b357c66cea573245d2398fc8861626da586c413dbde6c8452fe73288e1742b595cea163ac04cea8ae80b66e5e875cbbc420998a8f0de8d9c2aef60 SHA512 1dfdbcc84d1df6c7e1864b26f2fe25c253d6108f3661280fc29cff1ae77d42962322b224f3fc9f409a17e28167f38293427c5c1bd8fad674bb70c2019368ef13
+DIST thunderbird-bin_x86_64-68.4.1.tar.bz2 55550087 BLAKE2B dff4a4393bd2198e4f1a6499a073c351b82870f467a70e441fc089670e7eb9620ab06c68422b6304c85e0674cd08dd21544af76ff3553cd87b8bca4fe14de581 SHA512 6ed7dab93bc18edaddf0ffb0dfd868f20a6a6aab1ef687ef54b814647514804492afd680cdcb6b3445c2a5b85032455800d822ddedda1e1c94b70be05b1ee029
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.2.2.ebuild 5278 BLAKE2B 93d3cff46a616317a25905015f66236fffe5aa5233caa8a9c0c6947fb8ec3f33d919097cc2b7b5d4562859df1766cb94eaae28020f918a2ae74b41209932f55d SHA512 bc3e1a00d4dda52228883f0dec8a44801c89d7df35e5f1725cec4886696088faffc5b7f0671a785ea3620b269c8f87e8e7113b1fd08d6ee45dc5d8659461ad64
-EBUILD thunderbird-bin-68.3.0.ebuild 5278 BLAKE2B 93d3cff46a616317a25905015f66236fffe5aa5233caa8a9c0c6947fb8ec3f33d919097cc2b7b5d4562859df1766cb94eaae28020f918a2ae74b41209932f55d SHA512 bc3e1a00d4dda52228883f0dec8a44801c89d7df35e5f1725cec4886696088faffc5b7f0671a785ea3620b269c8f87e8e7113b1fd08d6ee45dc5d8659461ad64
+EBUILD thunderbird-bin-68.4.1.ebuild 5278 BLAKE2B dc066614db0691d184628b78941fabad41245bf74b15ff5db3bd9efddfc43ee321fc2e3f76fe508119d0bfa0de9baee9a7a5850273cf2b5b0de484517e75e290 SHA512 94fbb50d6ec8b348c883ed8b3ada3530d20a19d2540bc9f06a5f9cc088bd31370ed28d45080d3da629ea91ae562518ef2c4a27ec3fdbc8c86c1ad08310c3a746
MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.2.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.2.2.ebuild
deleted file mode 100644
index fa8c278a92e8..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-68.2.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 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-bin/thunderbird-bin-68.3.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.4.1.ebuild
index fa8c278a92e8..4fdf8bc9f318 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-68.3.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-68.4.1.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=6
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 13ddf9a06c61..d192c00bbc0d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -68,115 +68,60 @@ 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.2.2-ar.xpi 617164 BLAKE2B 9c241614721d5802cbf612e7f5a21b1416bf40848d1fe9bb5611be74c013efafa2843856d6ab5a00bf9d1dd9c249a8517dda07ddf4434d5d597d496311e0fc31 SHA512 751310b75772d6a028d2866e7c9397ff2157f1069912533393f0eec44b713d1140a754cf01ceec98d961c0d2e99eeef8c15ecb1cdd8f99390531b9ae91602d67
-DIST thunderbird-68.2.2-ast.xpi 551297 BLAKE2B d67cb8b324f1161ea0e6dd423923b5caea40c2a40797b63edc871e85040a778565b827ddfec1f339c6627a2175ff62e14e1f27d6eab7bc088d0db97e63cee38d SHA512 70c39b128df9d30d109959ef939cf80d29ff26d8c08c8cd7b28e7509bff7f70059955b394fca24362026fe1df0ab93908f288736514e58728c1663f91b9774d3
-DIST thunderbird-68.2.2-be.xpi 646279 BLAKE2B 26f55579d80abd3fe0797ee7d8719c541a45124111b8855d0aebbceff38fbe69b5add1784640c305cd1bd25acae81525ea69c1b9ad259f82eb27513cc2d934cc SHA512 bd3e01aa4767e68b6e77f5556464cff3fc32e415bf713b4ccaaf20305057e988e6286ba55ed57ff9a6d80869e383c4fdd8233d777437b75151ad2b7763b3e0f3
-DIST thunderbird-68.2.2-bg.xpi 646226 BLAKE2B c73fc55c51123fb959ac4a72bd7658322f246ce76f8cec363b9058bb98505acce0c161d0343523cd95ba15dfa046dc688800e367be221e8ee0cc5fdc9ed7ad0e SHA512 b4d6754e774cc84c62729fee44a6b8f1779726bf9566a3e83babf389d7c1386d4a843c8e9cc8462d4e37b0152c8778004526290429085d8fdc575bcbc010c668
-DIST thunderbird-68.2.2-br.xpi 574851 BLAKE2B 1685362672e0fffa0bc2cd7c6f749f6d502454acb8fea13272977ed79840e01f2d9b5ecca981d704455710a2096b918a0cc91c0dc559c8fa28f2f16abbf16259 SHA512 ad22ff063fa03298aeff11468f9e1e5dbc4c011f09eecb447670c7c13b784f65571149b4cdca60fb4af570d24ab500b8807f7270384d5e9f4d47b31336c3b480
-DIST thunderbird-68.2.2-ca.xpi 578438 BLAKE2B 2d74f61f842511f44d3f4cfa250630c055fbe27106819ba033d10923d2d13072069d4fab6aceb7f13a8079733bac7cf6a28861ec4ab946323078c69915977d91 SHA512 aa87b07d24d458b630a663125836eb1aebde27202a674e392d0b38805b632f169b75530642d7c5d9972cfe0adb2704130e06fc7df6c031b9f7151f3173a4af6f
-DIST thunderbird-68.2.2-cs.xpi 603041 BLAKE2B fe8014571155ac829a7171a69543077b4bd1b0a4fc69067243ff811bff04d2e16e5a9e09b486d81f74de12be3f979c0edd305917851a89803f93a4b59bcf25be SHA512 647229741fd329aea4b6eea6f22c5f87a6bedd572abaaca0fe8ebad87d0f383b2a3e68fd481277093dfe01b48e895f8c3643673f0aa1edf4aba6285c3a1afd0c
-DIST thunderbird-68.2.2-cy.xpi 589901 BLAKE2B cba6f2e3cb668e2c0f4e1961c009f3f6e02358a1d616d39fc679ab7ca91c13cf1f6921d0f73c095f846628b4485849588c03cb97ba301c721aa1294820479f00 SHA512 f2c188c650ec4856a728a443f9a17c36424c2bd782b436a0faa1cfbf10e86038ece967a2ddadd6b6273acc665832c79ce2095d5c980ea0e647a8f2068148e1d8
-DIST thunderbird-68.2.2-da.xpi 588348 BLAKE2B 15e90b3b3e06df14a0895ecaf9152ca484f4cc92079df28828ec8321c4746d5783c1c4384a37e51ca3111fb63687967c99025f16ba639682f14f33fb4de6c819 SHA512 b68c46f4e7961a0894a5304c0bb71d57e997f24bbfa77d20a7218ace19d8f393edd484cbdb046c0c79dcfcdd2162b03a57c93c003796e4bd965a7498404562b8
-DIST thunderbird-68.2.2-de.xpi 597802 BLAKE2B a15a4ca6a8269d287f93d3855d3441c99b8856fb59171237d08c8f9afae34b1fcd9559f08145b3df7cff9263fcc383aefc6aca300508a4621cb0ab1caa698374 SHA512 c6ca9374d67e5b6009d1ca070d984ac4246f15b5fb20c7bb8291ba801724c448db51dac05fcfb2c8907e1b6b6541a51abdd198c6ebd13b0176e852339ef9466d
-DIST thunderbird-68.2.2-el.xpi 699223 BLAKE2B bdc299c0872724118127a16e3402ba1285af765cb92f28e729effed63644001f35e5165e7d2909e2011c65db45c829c0f509e09ed72a8394f3eec032d6a9c4d1 SHA512 77d234822d0a87d83b5312d791542cffa1e31f045908a9fb7b92032dbcae139a0b1b24083bec04cd4e9a88851ea855c5c9d7c807eae5310ff0d993467428badc
-DIST thunderbird-68.2.2-en-GB.xpi 556402 BLAKE2B b0533af1bc0d32288d3a606b3ef40e0e8c1155c3ed8f6fa5943d72ae2519b3e96ea5af29179bcbaf0269cb431b22e435865cc32e9a3996dccef5335061d7c51c SHA512 49cd5803bb1c287ae3a4cfa374f64964adb3c1ba95437d472ae3883dc46303bc11022a4407515f1e2b564eb3c079b5c013c90f5192e531909f52dd9c37aeb865
-DIST thunderbird-68.2.2-es-AR.xpi 596550 BLAKE2B b4771b661ec447854078d57ab0d76eec9475ba60e984bb5131671e44d5351b952fcc7593d6c5d5f14a2ccae1ff96b3482a716cd0fe60b7fc4a1b106c80fe1dab SHA512 001c4f60cf155d050935b00c70eef7d62c1a8fb330aa6fa8bbf1b442d04a19e62c3bcdc481de3b79bad2a37a7909cc7d4d33a7f73d066aeee02dbe7a60b596a1
-DIST thunderbird-68.2.2-es-ES.xpi 518351 BLAKE2B ea31698e96f66f083b2e465addc89ab3cd0d87a21e03828512fc2b8583b9838265f2cbe3b496bcc4fb88af000a568aead419baa078b425fd6616aa42e5b5d696 SHA512 1b9f2d9c0f77814e8d39033b338610609bc91d73e594d24d091d2ffc60fae0409abda7329a4ffc030afc019711e0efc49d261a45bfe91d28fef3faa3edc1c653
-DIST thunderbird-68.2.2-et.xpi 573580 BLAKE2B 1ac94dc7b4c20457185658d642e0992f5bd3fce54bc3ae29117927f156060a41b65ddebc3117d3888a36c20469c707859c815227cfb866df4fe1ed301ae01313 SHA512 57997e5bca9bea1d863db0d0eb043b05c331917cd044321615d2537b0947b5481b7b714dcdd28754d9133249b4a0ebfd973a5c6825af0563d6fb2dcae68fe892
-DIST thunderbird-68.2.2-eu.xpi 579944 BLAKE2B 4d75057110258dfac4313c0a6583bcb21fd76db48631ffd243091354d0b4ba86aa94a801925102e091ebf97c7573176d3d6411dbc0a9f2764628dd0b108fb19d SHA512 3047dcbc46c023d1897b724243f4993820b0e4f9380c355c075e1237151f699359a998d371ca7441201cf4cd1060b9b241caa5a8b7c18503f7e5035be32776d7
-DIST thunderbird-68.2.2-fi.xpi 578416 BLAKE2B adcae84f5bdd25387c9053f52860f6b5e09b2816cd8628983de18a531ce51436f43ca4a72cd2b55960097df537b056e68f2e8b4d201aa9654c710c20a022f05e SHA512 b6dcf0624c84bf19192caabcdcc4b22fc9946d1b3541613dfd23c31041e039dd24208db550fec36c5e85d4807c4efcaab4b949936848297bac1bf43049525a09
-DIST thunderbird-68.2.2-fr.xpi 607809 BLAKE2B 2dfb08d9de21e885cf1863e3340a7b2dc67c98ad408e129592c70f6a6aaaa9b81a9dccfaeab91b89ab77b64627dea6bbc078313e3ee6def319398719cc89573e SHA512 acf16ebab0eed05b99ec55e0a47d6a43817be6e25b55b1b5b99ac0c766e4e9c7d1cbde5631b320c6b9e57c7274a755d3ac8efbcdde5568038f4400fedaea59b8
-DIST thunderbird-68.2.2-fy-NL.xpi 594466 BLAKE2B 4615677160a4d3c8197d6fcf26561513a3cf473ae127f02a37654c2e420cb1c6de7b542fd73adcf14286221209832a0d3e52a30a850dccf3502613dcf3452386 SHA512 ca3f459a782e43edd36cf8f446e3c364cd93c9a3d724f45ebe73e36e5e6fbb460311d3652fb0a88e82ca9b819e5c90be4102ca39ab33da5ab87673a539136346
-DIST thunderbird-68.2.2-ga-IE.xpi 588709 BLAKE2B c7141c8f672324e36e712adb03b5d613e894b5f2540261238b61cd11c8fb2d851f8a17d80c51aeaa97864bc4c9290ee824fe7c9fa1865123bc25eed218bba6b6 SHA512 1cfe403df401b3d6fb0de4ade1eaf545c917023b287cd87d5392a0a9cbf802b84c7ef90a667cccffefe7e9662843b5df1e52f366e06f564ba22cb47aa63b74f0
-DIST thunderbird-68.2.2-gd.xpi 587108 BLAKE2B 2729261acc0ef9a671d6284328dab07606a746c301cf1ec76704b98a0a72a528ca167bb86a3b8e0727a14fedc85070d1e8f6967a5bef3d59260fb2b69d90b623 SHA512 b206f8a11c021ce38bd80ebee47f6e541802b0adbb3ee2350524ced62d096db7757db637b3b0e53adf43a03376d792c35d9740b84ad10371689f71911d96d97b
-DIST thunderbird-68.2.2-gl.xpi 568395 BLAKE2B 53a3a758802d5b0f65699c0008de4240026500a5b531ac12383a06d6a8e1b5cae0f5a257d03726cfbdf4cde93fd561698128cd798ef2b9fbba4b08538dbbeced SHA512 a1257e57ec4f2dcf27d0f48b4e06c7b2cc8e8712eb68f0d8bd7ec51d2800b8f28208a94228c010525beddd8cae8a55751d9c280c44d1184692cbe9872fcc38ee
-DIST thunderbird-68.2.2-he.xpi 604786 BLAKE2B 9957413334fe3d645f65f792f89a6070dfcea97deb7562ea102baacd65b44ad920d85b2a49f4d62a82fc9cb3550f53b3f70bfacb2735cd806728fa2024ee25fd SHA512 627aecba77024e47f178acacb90f47672e61b4974482a4c647d578205f22bf18c87a4701ebdf6c1912eb3c12c99129d1cf08814eb39c379b8db0e174269e356c
-DIST thunderbird-68.2.2-hr.xpi 583782 BLAKE2B f9cb82fe1941d238b914ab86e1fea9f56b62ca54462f6ed06cec0565ba48198d70eb68277ad5bb1d8e9b5ab3ec5162ff5402c54e021cc921613ec926600293d7 SHA512 267f10ab9e6fe45a66a4b86f42e46d5d79a568f1d237d4e0efc175cdd8754c0bb2b676a9f2fa8ac07da6fd2949dcb0ef378f04a29a25bab4a621f07e532c511e
-DIST thunderbird-68.2.2-hsb.xpi 616034 BLAKE2B 9841109ea8794b0422f7968ae1e857274b96c985102aa233361d37570144ad4b4911c6226ef5b914eaa0a025c49ab4bd4b385a12b37bdbebaa4037ab652f304c SHA512 7cfc5ed7db2b8a25f30e4346862befb50d902fc83fb111040c238308a347ef44c92d7ec2f7e8a456ca024fc02d268d49ee65ad3c62e7f59bd22e12b32ae40ce9
-DIST thunderbird-68.2.2-hu.xpi 618153 BLAKE2B 80377f937fc9874b8b9bf65a882bfdc0abce827a32b155fb99252492657b7d32f345cd0e8db13f7050660b82899f0f9591e36f8d23582084f90c354f25bc578d SHA512 6bf5c5d7f65b1eb54aad1ac7e4bae899ed4a7b6fc3bc5070071150eedf2294f8a48eb94beed6f79fdaec819b40ec079d21f2283e0afe97b8fef47c6f7a05134b
-DIST thunderbird-68.2.2-hy-AM.xpi 630522 BLAKE2B 61685a681309428cd7c6f0359a7227fcb6712afa4b0d069c21aab120783826bca7b529d7f939655bb074b2852d381f5fbef757306c15b788b1e791f51155103c SHA512 c52fdde76e05c154ac5f40ef17f040311347a367387f25bf5c7b4a691d38c9eb98e157a640ab3f3a25c2adc19c7cac650471ae95cc4c97a76289a9057aedcd27
-DIST thunderbird-68.2.2-id.xpi 567746 BLAKE2B 8acc16378fe4c43c1370412a8fae81bde4857a199fd29f72dfc3780921a8c3e0d6f5d60c0098b5ee9c585f7a8d9f7025fb172ba211556525df2d378f9dce2b66 SHA512 639fc48c6dd4827477868205e5e83bbd059abdb04d9d66305fa19ced20befbb78299737079267ab487581c2728ae5f0f028cef5f65213cd6f477b3cce0a52c3e
-DIST thunderbird-68.2.2-is.xpi 575439 BLAKE2B ac38e8dd4a0ef66c7e7e1e6fd19b37a96a873838261f619d57abdcacd58012054d201fa5f33d4dfb88c5fad78be1383c4b19d91955c916acb48d3f9470cdb8c7 SHA512 4d3fc6d846b547fa1f43102a24858d0934700fb94b9c755715c040470731402d278c695a57eaaa2211669278e26aa91e1c0404b027dcfa81ebefed200fef8201
-DIST thunderbird-68.2.2-it.xpi 489519 BLAKE2B 0b6a7ee731fb7941694ff87fa9e4b588d772b760c335283458a3f18368f115318e1553004bbe6bf8f354959c4dd3b15a1731c4b3989ca3a1192baedc05250958 SHA512 b23149ee8f1bc99ad8a62daae2d5560abf7ccd506dd65e955cc4251f1cf0a5e39ca7609a070f66617883b9ca643e023bb1e45ff7c523e41bedd2b017819e892a
-DIST thunderbird-68.2.2-ja.xpi 643574 BLAKE2B 12305f8201e75acbf7e84e8bd2d4f6d4ee50b2672e491d8c241895bf7ab1b81f7cb1c4b8f09d4567bc2c368d192db7d32f63d4b53299e1effeedfb357be3c219 SHA512 8b2019e74f323447571686f0e97e4bbbc3e9973b25e91b5604a3becadeddf3f03c2bdaca29ae0bec88121a23c12d737b199c17efe05d3add448e5dc94ef59cd9
-DIST thunderbird-68.2.2-ko.xpi 620528 BLAKE2B c4c196521661d3ac2c44004d6de36ac203db15e124f056905627f1f9c721d558bca2b8cc8fd72ff24ad779b14d38ddefea56f56462c702735f8dadaabfca7edf SHA512 c6a6b964eba1a9132d6c4d64d142071f8da60566373e1ff6e7335a379f6233d2935fad49775ff5c9a06934b13698022a5d9f6c015ee8dc7e960f3de495bc9e3a
-DIST thunderbird-68.2.2-lt.xpi 603844 BLAKE2B 6582c6ffb7cee0a49601aeef088279eddb2ea71803027b474b377ce8d985b935b02b3148d42c386e5571bac3e1703f016d8c80660b27cd876d2aceef2bc1b5e0 SHA512 b5b79b34c140816a8ce31aaad0d4f6830096e37888819a18aea10d44401b7b889cf4871c915ed8d32bb26dfae45366b0228a1caeac21db78bc549cf877702305
-DIST thunderbird-68.2.2-nb-NO.xpi 574019 BLAKE2B e062c51eeff5f693c4076afc0b536c77ff6ff98da1cc7f8363049b0a7eae27a15c0012a5efa50395cbb6256170afe2e52a29dc6f71f96677c04e58d4ce301081 SHA512 144a2c75479dbb76bb3d2a1ad3520bcc08aa9ef97373d831e552424a7ea0a47dfdfcd5a4b9815c65df6ebc73e359091326702f440b45dc79ba4a2f6c8f442fab
-DIST thunderbird-68.2.2-nl.xpi 581354 BLAKE2B 9b3cd9f3ddaa20bbe2e05aac07da5db1ced6cdb248a54ba7ccd8588890e7702b327a9f9c61b6e292ad2429e76eb15845d6efd34fb494d410ff6df8ee85d3c79f SHA512 2fcf5681efc36f73181d927b94782075a774f06cf5b5949caf8ae17481b299c8a63ce6c5ec3c1f2f9ed3eaea8e02638177b229adcdd58fb7aae92fc5ff4a4688
-DIST thunderbird-68.2.2-nn-NO.xpi 574947 BLAKE2B 8c2fbb9f70ba4a969f76a8421c4fc39aae78def3e86f2323c8d53ce938a709b41b189ba7c4e9b3b3e819acc9b03cd3b9fb71df8ad11157ce4c189a45c6b37e0f SHA512 4abdeefcfbfada72b459437a19f72f390dd03989fc057c6d375132527f4c298ed6fcd5b9aa9705976b6fb163de7d8581a7958c18c5626487b697e7e8d132e02b
-DIST thunderbird-68.2.2-pl.xpi 576084 BLAKE2B e9517677ce1eea31135d5edcf92355e94b74655433b10e0e1c3f410c5e4ccf388f82a0ff886477b73759bc4596f11f4f3e61f81ef32b3671b3e59c3f8efd3ce1 SHA512 ccb03e1b18ac2226cfd40e854697121f0710c8955afedc32efb4182d1f846bf15c4988dc18a8a8710f3c0812697956dc890efa3ff8afdf819c6cb96af7dbc7fd
-DIST thunderbird-68.2.2-pt-BR.xpi 589835 BLAKE2B a03592a60d33883cee4c2a324cf52b3055358fbd4a60f5d9fd8ec76b7e85b3a6a7267634643636e4ccd743cc062ae2ee71dfdabd0668a0fa656190b71240733b SHA512 6955ec5002e3ae0f411e2ef641be457a0476bc14662d24f180db8067cb13cb1f82248bf08bef70382e34d40dda02798f379aef54119de250ef2715e58168ad1d
-DIST thunderbird-68.2.2-pt-PT.xpi 588100 BLAKE2B f0d4338aabcd7f6a8c40ee15a7a4acd7b81dd6b2609fe153c266c130abe9c2bb41e75545ffe984e0350ef6dfb9d6d946167b5b8bbd427be36b5a3a3a2bc63803 SHA512 3cd8186f492b06e5c7374bd7f6974d96b0e291deaf4d74a13d9411387e71f1ea25e0aeeb8c146d8244ca69f137112ca61883a2b99fe3f978a67dd05ace3b5fae
-DIST thunderbird-68.2.2-rm.xpi 578048 BLAKE2B e257e69809a4a541bb479777cd602d0c03afac7949b494c484dcb495954a5628938f9c51d7ee4dad251646f86e7d69dea55e69af930810685ddd7c2e68e6ab0e SHA512 a3fe6f53206e35589c6c63431ea661f086a1fe588d6bbf33a2331ec3814dda9f0e70f1da3110fa39ba4aa6a141c3c17021749fece2c65c690e079b062b3589b5
-DIST thunderbird-68.2.2-ro.xpi 594840 BLAKE2B 68f39e47f9764680409852c4e4f12ddf044ce85e91cb6cda7a6882f949d1332fd5f4b40765a8bd25595731c4fb8b35e34506457067194142281b9442df94793f SHA512 9a5ab66c2ca6bf55597c9d28a264e403a77065ee0de2cc9903343165865d5d76e804b5fedb58d07a23b0cc710292a9b193d60fccf01628872c94b7b2dbd3b5cf
-DIST thunderbird-68.2.2-ru.xpi 683324 BLAKE2B dbf6ee21fc68ba08fbf2046f09d5ea2124df81129c716742aacb08621ace4e5123b5b50bff1a1e2a98ee11b5624770e21eb0cf87c0ff48e7d4d3185666f4f4bd SHA512 c5f7226a648daf6ed3e1e44d219f26cc3c991b8ef299b29a8e267c7ca4bb8da60b4e93b3a8f0fd77b9887d8803933539abfaf9be59a3b4986c526917296c21ae
-DIST thunderbird-68.2.2-si.xpi 637404 BLAKE2B 9c2f6338d2d2042cef81b98bb3dd91ee1e271a5b2d9f25f1c217f2eb365277ff500fa84045e940524dcbca4e1d0ee7a759de7a18186e6351111a8c91f3037c6e SHA512 46219b4e19767b1cf2d6e7f9a2a00a10bc2a60feead67531c64b6ef6c4cc7a6136d0e7c2e1dd9a879fe2a3f0fce311cac0e508239c579bd0f8eccd76aecb717d
-DIST thunderbird-68.2.2-sk.xpi 609751 BLAKE2B 4e305568ca189ca8e1a3ead7d5137dd23f28a04381b4d40b42d9e8b34ba4536c1a8d8bad4ff15446e835a0129db1945fa031d452ede73c5cc66adf8f27dc0097 SHA512 6c53639ccb3d645f7ad8760b5372521204299bd2b4e477ab33ee9dd193af1ed2028f138944613e4f05c9615318183bed91c384ad9a2571030eb02021eae0aa3b
-DIST thunderbird-68.2.2-sl.xpi 590627 BLAKE2B 5feb5883f89684ff100b6a38aa5aac0454ca062a0af162bfd3a74a367a07b960bc9286d8fb78e835a48f88e7fc7391d92790d7ff456c3a0ce84345b3a040f8c2 SHA512 fed6d4e780d122529c7164bbec07d04b81dc374b44cc156d70d1353cf4f3d321a3c3dae33f71f028069e710578a31a6287392cb4cfbe10779a241e8ea2726f61
-DIST thunderbird-68.2.2-sq.xpi 598898 BLAKE2B 3d89133ec517b1790cb81295d46d9f9cba344f50fc0717c729655fc4a34e42f9e53f42164da898e5b562bcc7298467268bfa6a9bc6012bcc310acf00505f6213 SHA512 db2cc0657e71c03f6cf4668f950b4d2739ebaa7eef01a21146639225fff0a627d71fa4155b1d7830ace8008d342b282730785e89c2c11e1a1b48d0e1d54c0852
-DIST thunderbird-68.2.2-sr.xpi 624895 BLAKE2B ffca8df7e7004b7687ca9c69fcdc4a3333f144588f308ddfb58b9c6417c80aa3100f10781a8a93ab021bd91319d304b9c9068208086d25769a500ccc7f0bf51d SHA512 a6a8bad2bd3d234be269f4d36802b2253d17eed20c1e2fa8056f3d6fea155a4027409cc6c735c3b496c84a8432c6aba0abe49d0096dbbfe3c1c932c6e589ef0d
-DIST thunderbird-68.2.2-sv-SE.xpi 591594 BLAKE2B 38243595e5555db6457a38c2ec8716084a4ef5ce660e864fbf93e97dd0970d7c686aef6462d5850a930316f78002caced0e818e9b69d60c8e9b56f7904e57ed6 SHA512 c9fd588754e99247c767038bf833b82ce8f01d288f961bb5314f0aa634be954feadbce2965f2a879c0682bbe4e82d5da4514976b0fd5d370dcbb510f278265db
-DIST thunderbird-68.2.2-tr.xpi 599706 BLAKE2B ff4fc3bc17197c2c5798ea46d54c87576ff4a5c420b751b44ece906aa6188ee677fd15018c239a97428b635eb1becd4a95fb2fdc349b4ba73deccafbf2756221 SHA512 340ff1145ca10b828ba6eb584c98247949bec467a748e31e2d691bc3960a66b805a772b048ff0f96a69fb7d4ef1c47dd3200ab26388d8a0f5e9a03e403037f14
-DIST thunderbird-68.2.2-uk.xpi 671452 BLAKE2B 06996c4bf847d33491a92c7282deafb4eb24cc34cf4b4fa4823e0165a889f0ebca0c34744083ba36bfd502fbdf268bf8ef9b6c6a4c2215fd82dea6af6504119c SHA512 3e6498afaf10cbe2fe36c807440d2d56ac19a4af308d7aab98960d4f992c705b23560f3728bb74a7b24794240491dae208061c6161eb507067a593d717aafc84
-DIST thunderbird-68.2.2-vi.xpi 623420 BLAKE2B 525e23ae74eacc1b78b06b6cb29b56bd5e1bf1a0ac6133d2d5e6ee4254d20e0726a81d8d6c1ec01d2e50e5b1e0d0ac6dfba0e1c05e5bbb57cf857b3a9230db4a SHA512 b613ffafe4fc240d82f50b086f186e4149835a168c8a931fa5547e1ee87e930d1fbbbef90045bab1264f810aee51f7dda492fa133b0f6f89d274a4bd349171f5
-DIST thunderbird-68.2.2-zh-CN.xpi 626818 BLAKE2B 0a49f945a8dc075f11e25f61abc529924ec813b746e7afaae6bcb2c83d87b6bf2718fd406eb6f9931ba45920e8eb0407997864dc7d7936de361c55dbecd2521b SHA512 22991c78f7ba9323fedf8ffc3242cc0abeda05cc6f0da8515dd80ac4869f0c0a9b1445affbbef8c9f82db5039551c35982179cbf6507195d1e02bd7739f905a7
-DIST thunderbird-68.2.2-zh-TW.xpi 627474 BLAKE2B 67f886442be27be6b4a48f1827b677faf81fe1ced1b99716118c07274c1a8dc0a2fc39f7b0fe0ff533b7ffc645ea317ac9fcf871a2a1d8a373840ef2b66a58f7 SHA512 3c69f5d799cbe50222ae22c30c4cab9a75eaa0340c46713bc6f439ff2c4d4f9625bf03bf2fff5813e553151208ee0cb2ed17f1e4bda81a49025d820b8ac4d6b9
-DIST thunderbird-68.2.2.source.tar.xz 334809520 BLAKE2B e532d8b48ea0872fc69a7b2fe418dca551b5dedf6276671dffb72ce5270fdcc7d63ef835ff4ddf92b870305267fc52dbbd3f3d00f154debd308b9a569ef00422 SHA512 96c9d7b7820091896b174e2c7924e426fa0fd2e6edfa8268ab502c1292a7456d3d864f97976cced0a5e9587bfa2dd92023df1a52f989729a92e0ca604e5ab5eb
-DIST thunderbird-68.3.0-ar.xpi 617166 BLAKE2B 81e86d3aa7dcf0e59f2746e92a8673a325325016206ae528b7aee7b710115fcea8b6b5cc7a27721069f4f5d047e8537956ea1c7c42c598f54f9e90544789f485 SHA512 eef8b1830ec2fce91c1adf8c3c6dcaa632de94d7ce7e48724d0026c4105a4b8e057b5bac62207ae24ad8733a8621e0ae9a13f1cb94d92d84f7eb0423eb23ac8a
-DIST thunderbird-68.3.0-ast.xpi 551298 BLAKE2B 30417f8854fe6d08e3cf6e8c0926734cf5197dda8075b413bfd86ffe441cfdef8a9cc60910a7bd30c02c79ae5534af7abb8dae77850d3eae4f35e85c49a216fe SHA512 08e6486b25e715991aeb28c3ee47f0216b1183d7aee7883f314e6b24c32ef34a6529dc960ea8452d2d3798ee7f24cf588a536a69d019d1f6fc85a101dcf5610a
-DIST thunderbird-68.3.0-be.xpi 646279 BLAKE2B 52285690a1891766dfe56a6f8f4aca8bd5b31f3e66d7a091eb74336ea35490e9258ad16908cd4ef519415518162a330708b9bb00b4b423b4426f25c01ea04a84 SHA512 d5d2cf16dadb1a3db3d4b5d00819142cd1e2b9fd6e2b908739f82f85c89c7af8813e68fbb3a382cd319b15107b9f948b54147bc777245db9ccbf1f149db72dde
-DIST thunderbird-68.3.0-bg.xpi 646226 BLAKE2B e2f0322c6d2eff45d93615b8a8bc6bece96cff3e908946703c37c2b03a7b8d1360ed520efde966720dab0eced6028e20c369d1ec400a5419126b8c89272a058b SHA512 99e8af121c42fdcd1fe734ef472e4eac6b5d1df8ff461f89dfb8a055a7fc8f7663cd99c0b2633ed719028014ebc0ffc80eb31267061ec8008874bcfb908e7dea
-DIST thunderbird-68.3.0-br.xpi 574850 BLAKE2B f9e8866b9839bada5fdb9f23c1e77fa70a0e0ccb17e73be6e0fa7f4119c329345ba35d09e82b073cc6c1a3bd6e04870dbec526d51d301588cb450e16c40421b2 SHA512 5b44fc79fd7adec90192b4b426e5a00d836f61d7c2271ba3276d4adbe761dad267d921760807316300ff74651953ef5be93bba80a3b24955e27e9fdda9d21e8b
-DIST thunderbird-68.3.0-ca.xpi 578439 BLAKE2B 479cda688b7756105e5e1b9063228fae6e357e635927e438fd20ccf71a80746aefaadfa897204378142f8af60c5904515b41747c1ee839cffd5099fec692c6a0 SHA512 0238989d3f310784cdf53a95b6ef1c873a241922f89cc8c66261e1f002e9f04d7f25d3234cf42979fe23841200af6f3af871122a471e4b8717ec9db5538a73e2
-DIST thunderbird-68.3.0-cs.xpi 603041 BLAKE2B af4ee01bfed89227b64c075191df822d5040a3c411bf6b303fe835419615b1aec1512188eb04f52780d826586d1d689d0b586affc2c3aed35d2526fc994987bf SHA512 bfb30e99456197158c1a715d2f468c97d990361916fc82f79cd28e94433ed2d669645d1285e8f614d8b19c9506a861ee9258fae0a28f90d59b871ae5b1277be9
-DIST thunderbird-68.3.0-cy.xpi 589901 BLAKE2B 08aed0d086b847c28e1845a06fd97700965d5c3325758c3959b045d1142df8c3be645e647b4f216d8e950ee064fa66ccdead3d35192443b000ef8965e920e3a4 SHA512 8d5ff3e083a9d22f03eda8d1e987f180d93b80c35920fc3a6596326cf202e449c808b01cfec2e9af84fbec496de679b92d53797c6fcf94f7c3bbab3b025c1f97
-DIST thunderbird-68.3.0-da.xpi 588349 BLAKE2B c7aac916287b574d9295e4010db7fa63a97b327c56aeb598e6781d8cec6d0ebd55d9cd02cc1e2e111d53ee377faf517f7b9cb754abee3d2a230bd03c3ae1a8bb SHA512 e1e1fe202bc0331b6ce6d34b590bc3baded447a4b1498e2219ac775a1a61403db391b30e2cc88bc3f84a29b539bb007880e194117c4a3779eb6a5ffd5ce4fd9a
-DIST thunderbird-68.3.0-de.xpi 597803 BLAKE2B 5e399b0c8ecf45d837437d9c1bb4d5bb2c8e8f4af027673fcfa25425371f109c39b67143effb44b866e614e175118c72f8d7d0dcd7afcd98c6ae6481343da02e SHA512 540a3d998a9e075dc0de3a82268b1c7e892b407a31be1fc4d0ac0af368306194ee4a86c191ee12ee024cb3268e9c77aed8e48462e36b4aca74dcd1be7d2b6cb5
-DIST thunderbird-68.3.0-el.xpi 699221 BLAKE2B eec5d10d16c84714f2a98b8ab25ad7a99bcedeabfecb217d3d17d353bb3b3b5569a7a7c0d6c260654a95e17fd9280ce62ad025adae0fb8b88f5a09a71a0fb1c9 SHA512 222687f2a4dfee344d06c3d66ec8f3718a9f59542889e4092de7e75873c03864b2fb820d8a268669b28d9e73532a35070e214a62bacbe47d1cd82c00651d18c3
-DIST thunderbird-68.3.0-en-GB.xpi 556402 BLAKE2B 95a1d459925ada987a3980e8745f885468574be08f448011750eb444053eb8863e8ddc03099c3226345430d12c6cffecd605d275043ec1fa599327addb26fc64 SHA512 45c7329aae7456e8dbb2a83db398e191f2589d518877af7762bb60dda8003cf7a04bb25e49d0155fee5fede87847d68075e8047b1ad11e251358fe7f8851b4b3
-DIST thunderbird-68.3.0-es-AR.xpi 596551 BLAKE2B 7b42bc7e3dc42c04bb52ee0f3282c42ba6c88208d474a6db345bc985f627949f6b5c7ed9b3fb55d13f229e5f60d80fe3dd73e801986ca67b5bc5ca4ba2c9b5a8 SHA512 c344fba459bfaae9dd09e89990832795c7f96335e4a15387bef172971e5952f231198a374e3c113fdd47be3d06c6d0101fa9dfd56cc31e592fef2990425df4d0
-DIST thunderbird-68.3.0-es-ES.xpi 518350 BLAKE2B 5fda6fe7f2ef0975ce9e239789e222eb1f28a80b9e39139bd180716aa5f675526932c584f73c43ffc742c8095aa30b28d425ab2dbd866a68433bdc4e3c8e4009 SHA512 118deaca4f293e611634d18d91662423573848b5e7a1cbf235f5c99b1914697c10b225ce2a72eb8b68f79f2416670b9dae1c0c562ba5c4f48783a4cc3c86bf92
-DIST thunderbird-68.3.0-et.xpi 573580 BLAKE2B 1e2aa2442b9222d1dc4d425a3178d6bbce27414fd1704b085d36a8c541671af9f5fe6f41669b7f9b130326cf473649d0321a21721214cecac2af642d63a70931 SHA512 8e1e07a3d824bb2bbfd5a1c631f561dae133026f853525bac9c4a6947a84ff4c287e724c8799dbb59cc06f73d90acb2a5809bb8cc279f20e7c90d7e8cfcef939
-DIST thunderbird-68.3.0-eu.xpi 579944 BLAKE2B d69724f69720613f82ca2471764ec9e664f9eebeffb95053517173f5eca7868e4477ba6706996afbd9a3f068db18387e054a9a770196b02461274cb2398069a4 SHA512 6986925ba9292815732d7e905e621011abe86f6b38605257e9497855033595a1d3175885cc54b6843d515732630bc5e4f4990ddbcfce371fefa1f98f8e80553e
-DIST thunderbird-68.3.0-fi.xpi 578417 BLAKE2B e14604c80a020b2d7ea789510a6d44114a1348390a2bd3094e526e9adee5f2bd031cbd6a8d1bddd766fc6c81b3d6ee12281af85c4fca6d85ebc6f277b222629a SHA512 2dc58cabd19dfd338f6e0331cd3b9b786096c368e706172a1863b06b9ae70cb56b858910e9da7e64fe33c4ac99f6c7fa35cc2beb138c1ace382b40cdb6e65792
-DIST thunderbird-68.3.0-fr.xpi 607809 BLAKE2B c204b9602918bffc8507283be28cd8c430a37320e30f9ea1911a5c2101a227cf7e61c22257da68c0bfa31a9e8bbc31dbd7a0b90ec3a47f6dc41918363b998b0c SHA512 5e9504b0285b2b5cf7f24a5080af49ec6826d65c528e68a3fae8114296a08b0a27edeabb0b2e023813ac07bfb81a13bcbce650fdc0e8e143f0226429e4aa808d
-DIST thunderbird-68.3.0-fy-NL.xpi 594466 BLAKE2B 800f464cf2db9ff8c3e80f224637b7c13a109b21f1d1c864d3aadda923cfbf722f7213a03438e263f2ab35e6d40a5e62f2aff89cb467982ec837132aacae747f SHA512 221a25f721207248567c85369cc13956ed0383fb9e5d39ead8e8680280970922e33ef719d674f3eca2aa6eba2b38086a9e4d17044bc9e6e1d0094f3276817b9f
-DIST thunderbird-68.3.0-ga-IE.xpi 588708 BLAKE2B 7ed184030e233c2a2454ccce81399830f8a352ab485e31f13a6ef2bcd0013810c05c1248989f155631a55a4c7565e6a1cef38ccec9383ca47e26c5666409c55a SHA512 544f1c28f0e3b92b32a999d08b98afff592f5266c9ba6bf2d1e4a9d931cf8fccd0eba0cc302ca60dd792449ee7545e153afa5d0d02247630675cfa5a070fc97a
-DIST thunderbird-68.3.0-gd.xpi 587108 BLAKE2B 9670e3bafc8aa5687ef3001a42e84f9eab2e172f689bbe73b29e4d9483969b5401b0a6c94ddcaf2659e769ed26e43422ff0952ad5cf82f084126816b52df844a SHA512 f501fb064b42e3d76e184899a8e5844b529c98153416c0496ebe07ca98bce90af52ffb6a7718587b8c4eb193b48a5f414f718845bf021a6dd2068d9f44560365
-DIST thunderbird-68.3.0-gl.xpi 568395 BLAKE2B c9de15881f5fccfcb8ff3126f9d7d53b805efd56a40791c3385ddf2085d897065b1cedd69a88ebf18a75a7fae4aab69bd8b0d1795bfc35e5dd39b4ecb793699f SHA512 383cff75476af0cb186254668f41d5141f8f211e776e26e5acd63a004ac798488774149c6218908b002e29e8bf0428dca82e6980200bab3c2e56ddad6a71f247
-DIST thunderbird-68.3.0-he.xpi 604786 BLAKE2B b14342ebb77aacb071196f0d4877a71c0429878cb2888742bf1d12c22a8b55cd9f32478e6d0dbb1c7911375d8a78f19aa39f75037345e8b091b6172d4ad646d7 SHA512 df4d77f6b6a71da7e4fbdf0599fff72aa59c2f366880018d6733b8e5ec02a520db2b9e036e02c6d0469d0a70ecb6d68746cd833f61c1d669a0ad403ea1143ff6
-DIST thunderbird-68.3.0-hr.xpi 583783 BLAKE2B f1975b0db4b4ced78365b6ba899552d1caf7d3e0a2af3f92d17ddd343d1dbd6d177ef91ebd29f548fcdbbb59602ba45d3a0056b1f98eec2591456f30b3125db4 SHA512 1545275fcaac9a6f76de634f6c3dc87579df8ac1600fb4eec937fc1425107007cac500225a56cec696e3d42d4fce4f505a277dcdaf31d04189c19f1912147c84
-DIST thunderbird-68.3.0-hsb.xpi 616033 BLAKE2B ad43045ce5b0c6c78c3f486a0d605d01e075f84aacb16651008654ebcacc2f5a62069dd62846380b96a0972cbd4efaa3d4cd41a57e300657bbcc49bbbc1d5b6d SHA512 51f4b53b82bd091e78c91e4cb1a1d7912ff01b9e28aaf7cb8b72ab2d6769bb147c249236563764532e44e42dfc733e467fae4d1277f11133cf00c5ff788aa20a
-DIST thunderbird-68.3.0-hu.xpi 618153 BLAKE2B 71e613cf955e75196f2768bd26d5f152189c9b0a1d4a715d58591d9e6bdb03a7fb11e523ce5cbf62085d50e7685ec700e86cb170860b68ef940346b847ecfa35 SHA512 3334539638c7bf627d71163b1d2cd22f23c380c5c041a2c1da613dbdb373b8e77deb1fff4ad5ae645bde3d076febf7a4287da1b2db7a53f87582f89189ddec7a
-DIST thunderbird-68.3.0-hy-AM.xpi 630522 BLAKE2B facb4ef4218a13defbb5ae768167af672981dd96ebbf0d51ff2dd684f2df13a4c37bdab30e639203c86fdbae50167a1e459d1b2cbc43e44e1d170dae55a2172f SHA512 704d58e597809ebbd36f947be136044e6cb00e0e1453b1308e53e4bf6f81c3be6ab021b2877fd6efd25cb9b2c2429a3c0def7e530420975e221bd720f68db61a
-DIST thunderbird-68.3.0-id.xpi 567746 BLAKE2B e52cb1c3fd595c1f6da9f84b63acf489476c35ff7a1f0ffd4090e59332adcb3a313bf799cb17dd85648874a5f26a4b5df1ba77a366eae5503450ab5338b181bd SHA512 4f611802354100e7ddc2a8c229deca1263213c33dd03abc00fb156af8f88a63b9f4f6212bba5e9e92ec9914f366af9380527e7e9c4adcb28512e1ee81cc60d9e
-DIST thunderbird-68.3.0-is.xpi 575439 BLAKE2B 9e9f62fa1db1cdb0e82e403e10a4197c17f039c293cf8a997ac1ac47a8f7f7a7b8881889b1180eef40def6117ee96c0e336725e42edbe5a16fea32e03431fccd SHA512 cf2eb20457709c4ef3597945efcb4629737fc6099ec5a40d627a36a4f74981010c9aafa2b15951319330f2a11c393f9092c909cbeb603c75edb1e3d8f8495b9b
-DIST thunderbird-68.3.0-it.xpi 489517 BLAKE2B 8b93474ff218f9edbada61065f82023852e51da8dd2ec244140b92d3bc29780c8b5e409b515d50bda2e3f0e0613134446261b44ef10209704e4d85475402b4d1 SHA512 c6a2583e5462b00846779ffc0ddef2833050ca4a4b3ad00310eca9169102e7e8914f482facfdf8f3c466d0b0ef49871a66cb040e9371cb54588497276c548153
-DIST thunderbird-68.3.0-ja.xpi 643574 BLAKE2B a9824ccc6a0c0fd319d2c2fea7f2c27f44d3c0fc6e1dbc2a2a729c1248f52e09badd15d29621ce9ceaaf675f65469b0836ed7a4a5554f016a465ba779f4b574c SHA512 d267b54fb2bd8448d7af659a363fdb9c622ea2ebd52377a1ca2e590be968350e9f2ac3d654821a90c835fb0f24454335cbab14d8088acb43ad3f1d9abeab83a3
-DIST thunderbird-68.3.0-ko.xpi 620527 BLAKE2B 5631ae1e44a0bd5c5ee44879aab50c35eefee28b74a18741f100631b942baaaf7902639c7ba1cd2905c9341bc67eb463d49fb39b996c4ac0e72839c5b96099da SHA512 166faf8d5e8592339d2f5fa357f7853ef903cb9f95918141129729a8831344fd8dc4d1aa7209b99d4ad71ef01958829414a0e77b94cf1010a98752b073e556f5
-DIST thunderbird-68.3.0-lt.xpi 603844 BLAKE2B 0e4ea29e0ba7b82852aa35ce0d47ac6e0a8a388bec9b5e532d41dec8cccfe169e3a15dd6212d6e7896fd93bf16f186337048948c4912978ccbc8c9df41b83a46 SHA512 06383a5eed292280c32280e631d72f9f26f451689651fd2f559c47205848b7b092ede326fd31f86bdad4c9e1bc093e83b6e3dbd8a02a9f0034d708736f61b77c
-DIST thunderbird-68.3.0-nb-NO.xpi 574020 BLAKE2B 752f053aa132439df58cc616f550e9ffa5809517c29c51c2c560d006768088f25e16be5c8247a75b2ced36a2125f3842dd2aab0091f707d80149cf14d35e4e6e SHA512 5ccf2e9e75f8d4b9761f7ce74305334ead26d9f44269a62f71c4085166dd4ed6b1af9e6147e3362b85cbc3d4cca409b1ffaa66b73682064af2113dbede3b9787
-DIST thunderbird-68.3.0-nl.xpi 581354 BLAKE2B 9e8f41d64a6c6ec581b22ce72a0d4326d1e5a61f2d2cb388874a08456196e41adaa76bb1889fd99681c32b40ea681f6ac403026c15d2d1abfac91252467e0616 SHA512 3d0e0ec787e78d69e3126dd52b1732f2e8e28c03d6173e96fb098cc24efc275a0706ff7c2dc58c275b934934aa7e24b6682f37067408b1228029439fd0609b49
-DIST thunderbird-68.3.0-nn-NO.xpi 574948 BLAKE2B 965223512bb4b923dbbb2d2dc7bde978d78c412bc0ca03a80a40adaf4e4e391e25ab66f266c1896b786b9178cffc51684dc0f69918488598defad88bdf716a9a SHA512 6e1e094588bfb1fd79188ef6334c5a2bd8617f2fb244ad8b8b14f925d1ba91614a565c6fcd8db56dc1d0404294d815d4411c096fdce7f464ba3195334aef53dd
-DIST thunderbird-68.3.0-pl.xpi 576084 BLAKE2B 1363605c702178199ab23e60b206617cbd72ec2ed8c5c2f2b28e301c4d7507c5a90bac427d440b71b5393c12e1f590dafbd267bd613fc8a8772842787548fbfb SHA512 89b54b8266e18b5696502d1ba6cab8e53bd1444f9677270e6fcbba597d73f0cc684b6f5ffe17f37064f4205bbad7b8ce559ae16b18e2825eb009cabc612a1fc4
-DIST thunderbird-68.3.0-pt-BR.xpi 589835 BLAKE2B c1e88c5907bbdfcb2a0e2fa97bb4abd56bd595bd7967d8fb5c1e2207624c0d7e2d8d06e81e5d08790eb56a3b21f923216d72194c43c4958180141d276ba884fc SHA512 d215892fd20f4f74bc9408de37e0caef2b53d4f9106fb8a9e751c247338a79d6b54957f104cb0172ced70ee86f199bd546d46ea7a38b98190bc82099ef123f7f
-DIST thunderbird-68.3.0-pt-PT.xpi 588101 BLAKE2B afe21532c5b6e3df6e9d21737f18495c0a17199f23d3598ed7f062de14c26577a75564b58121e6b3ed5b1e1d272a45d123210c9452e9550a894ebcf1f1317929 SHA512 aeeac645c17e62c233a737a1d673e229655d0f3e4768a52ce2657723b1874852c714a2f48a76a5db558870bd4645457afd9b38d6d3b3580450114db889e14fa3
-DIST thunderbird-68.3.0-rm.xpi 578048 BLAKE2B dcca59d4743ded7c7a8e90812135ed0ba1d73dfd8bbbcbe87d4553f4f3f01c5dfaac07dd5486b95db11b231822646fcaeb0ce363e85d04218784102cb03b080e SHA512 62f35e9cfc070f211a06c863e089365f773e40f4624905704c6a16db64a312e1560691b90db0a27ac029c41aff58c343af8b7441290d241eb394a53c11891376
-DIST thunderbird-68.3.0-ro.xpi 594840 BLAKE2B 2bb66a8532587711aea456e488f59e9e7cd8493bc8b56d95a9c541395709c6893738275579dde826bd006aa45ce57d963345372644aa8cf75f4da5fe0025a7b2 SHA512 3eef81b97a7f5cb1efb84a1685cc1cd023f2c2bd35f8a285fdb7bee56eddd0a12750aec38d3aa067a79dd32807ce997bb6694bf727eeff9dc55f2faac3d5fcbc
-DIST thunderbird-68.3.0-ru.xpi 683325 BLAKE2B 046b48b78753b9e421d3fa1e38115f433af12d6d9e48182656ca1de7142f7857b53bcfa464065da82a7c7caa35a61e8b02d14c84cbf22cc827e5e710240275e9 SHA512 31ab532dfc99df92f97d0b818477f23ed06fa3967de418f756c26c02a4a270b501560fca359bf91c61ec643e1ac3c185cbd49bb74f6dc194a9856af4d6bad76e
-DIST thunderbird-68.3.0-si.xpi 637404 BLAKE2B 288fa89fd0384127adb4308fd4243420ceb3fa8bbbac2e5e2aab374f820b393a8d23dc9cf806450635364b0b5c670ea8fd082a14bcb8db95f69d700021a0e7e9 SHA512 a2cb64f388a3a1f43585d8ed213718d10f88456a7e98ece05999850afb38490a05f7c8ee6ebf67565b0054217260c23782928370e6830c02c5abb869226629bd
-DIST thunderbird-68.3.0-sk.xpi 609751 BLAKE2B b370af76d4feb8286281c1b224813ccf77ae1881e6d305fc4477a59f4d3bb49e27bd52af80c7b02ed0f79f48094463d68062d092dfb81e21e12803db851d204e SHA512 148d483cb276d145c290789371a7473fc6df168866adb9c19ed9ed77c01214ff164271ea799021d2f50562c51703e0dacf5f4ea2d24019ab77d539440cc71fca
-DIST thunderbird-68.3.0-sl.xpi 590627 BLAKE2B cdf9222020d50262a11650d43f4b41b2fc40057bbc9b8bd7d1c9c58350b945d2dc70c6f854ca156270f765ef15b560f50d3709875df0f162342b95ff42e90cfe SHA512 982989131ed30d2765a140861208db58a8b87dc04c89da687d8e1e534b3221980a470c8944875bc4dabeec42258b705730ad31d9b7ed7b3bb8403bf8344006ae
-DIST thunderbird-68.3.0-sq.xpi 598899 BLAKE2B 42b9540a34a2ab14d5cbfb5b69b303edbb11c5597426b5af7d0936f0971e77c1397a7c9fc19aadf59929730247215f1ad27eb984622039f0a29eadb2ae1d3a67 SHA512 9c154f646af00d5ffe880f9bb32e185746cfa7edc9163b9081a201c4a94bf6be77e6d9d8926ffa08ea42987b7fe3c81d4927b5a4b7cdeccb66120d81a3be75b8
-DIST thunderbird-68.3.0-sr.xpi 624895 BLAKE2B 6316b26f8f9f604cd0a374ad4a39a2cc637420dab452e583a4a419061033658ea7bf60bb8e2355a0b6c6a08f295c50f85fce835362f050f5804cc8aea6115e5f SHA512 70b2aa3be55fb87c54e3d1b5ac237b5130784261060a24f824f1bc5df2777238b1d60f9493cd381876c0faa102414f6aff7ecd873f767e9cbcd1080d771a0815
-DIST thunderbird-68.3.0-sv-SE.xpi 591594 BLAKE2B 80919193b0cbad15f45995692c3600c89ae354f46e3d914c0cdb380fcd09a6b79e4c05c39c1a873a2e5ee24c8c3d72e03813e32c328e20b707e86920901d0fe4 SHA512 54132d25d21f4703415f222e1cae92f70052b6a59b8322fd14fae39a3bb34e4cb88f76011052bba583c770e14bc98535e45f79a50820da2ca853b7682d71b3b5
-DIST thunderbird-68.3.0-tr.xpi 599706 BLAKE2B adfbb20401c27fea4615f4dbf51b0b58a928d111c8c720bfdd03581d68077ca6de405f51d4a6e46acb6089df318ce93080ffb890ce6605d38c589d138f11f31a SHA512 2fd9ad18c6756fafd2227f258c1511df9d7b34715640c4e6b2473b4e3b0cdf1952f995d5ae1caabcfc7c9d3714e03c1d91a2e7c5cecaa16e4adb485bbe22f0b4
-DIST thunderbird-68.3.0-uk.xpi 671452 BLAKE2B 8d9d86cf679e873d5d185609dda6f73932bfb704a912549c9377d8bc445fef76bc40e1d24f5e3e0dc2b1c9d42347e91dba14d15f2b42600deb0c07266599b42c SHA512 21f24d163a8c250b3d329f152f0fa0ff8a5c69835810a81640cfaadce01a1b8214f7644719f1f63d531eac7cabee8e04d3beb55b826c4829033b1b01c98a9be2
-DIST thunderbird-68.3.0-vi.xpi 623422 BLAKE2B 33c456c98384ba76c83013a2ead8f15783dff7a12a33104a5576d111b4417afdc4908ad17d74651acc6601f5dcf59ebe1dd2c62dd829126ef124d52786454b4a SHA512 d6f9fe7daaf2552acec59c924daaf55bd5690ef83e0c9e0b1090c73bdf85ea5675ae5ed58858ec90a04b347c224fb13c588cbf25d601b9ddbc6fdb18ca780dea
-DIST thunderbird-68.3.0-zh-CN.xpi 626818 BLAKE2B ee3f4579e747a1e3938adc81ccc11512d12e3c928bd91353c61d2f0cb89ad76d06a154ec6e33a75f1e39609dcb51e7045e0a314975607f7f28231a7436e45ac9 SHA512 c42ea1b005a40ce56d8f7e40ee66e978f5a9fed68087ffc1e14f489cd585ff0522d084cdf9c1be2d34b615c23b97aa1e392775963f85c2c1a5fa9b06260b5024
-DIST thunderbird-68.3.0-zh-TW.xpi 627474 BLAKE2B c23263e7fe4674d4dd74a6caf10f67d94f35421fd9dee8449c39ac6d1384fb0f8cebd848f18f59fc3d8352ef0e47439167c5e1cc65cc4730ac669ca2b4e247a4 SHA512 b244d06d4a30ee404caa18cea07882eea3b3ac87315b376a669b4fe33129df641f9eabb4e7a304dbc2c2f8698814ab19471ca729f02fd8c40269c09d1cf85a2e
-DIST thunderbird-68.3.0.source.tar.xz 331088404 BLAKE2B b5de4bd1e3d21eac506d16f8085f70f22636eeaeb242ffe71bc22a3a9a20f0e93afade1509d34924ed7bb477cac0209e395694fd658acfa977ac4332af338e3a SHA512 94474f91a4e7b927b94698340c31015fda6f25533ec2a4aad0712bd6d2f9a528184345ed7ddb0ff25e207375391a5c6252506538e4a4992614cd152db28d8cd5
+DIST thunderbird-68.4.1-ar.xpi 617168 BLAKE2B d2672daa723f3b899659d36e42c5a8ee0d49112f9fedad9ecca8d5365eeb0fd192bf24f0c99abb0364937b501fa25fa5c741a4d669d60caa460d7924467b5f3b SHA512 a805ab02f3e7b047e1ded7d1970d9f7f8fa4372a2850c63b2a225512667c0ee5b0cc6267eb23fbd343025667a9ccf1042f689ec02e7a0560b1a6f731a59436b0
+DIST thunderbird-68.4.1-ast.xpi 551299 BLAKE2B c867545fc334b57e7617dbf2b7b5d2d81e6c67a2f87926336b831bccc953672bf0a9333f45ba8406ee585f4240b34d85a90878606a323435c668be276243fa29 SHA512 8feafb855cb83011bc9496a20b6183e026d71f7c807d533814f103ab8d8c67b57af18b40a9279504a66930756c399c2a75d81349d95829ef317b4590884399e6
+DIST thunderbird-68.4.1-be.xpi 646281 BLAKE2B af008b19f3e2d36889bf95469225b33fe44153900e4ff7cac3f102ea1327543677dc6f2339f9dd653bca4d870a91201992d6b95e2d5d008d646ad51c696b8296 SHA512 b8fdde6cfb5a363983cd866fb62ca75e3f8b153235659a69be0004c8d655cf30f254bbcd722bb6f476633a8a1e4dc51e9e1faa16aab3331666610f155ed63536
+DIST thunderbird-68.4.1-bg.xpi 646227 BLAKE2B cfe1f5934183193542667f2c3838b4ef1bbacca10c25e2c8ea0cc3dc5089651388b4aaef3a6ed01734bc0d607a61d40147c00e656e345e87a578cc00aee74d39 SHA512 2693b6545abbef7717505a8b250581c258afbbba1baa014e322c49e1f9450fd8cf89f3061e65cc2ab311776c316833be729912220e62749e52db19939608aaea
+DIST thunderbird-68.4.1-br.xpi 574852 BLAKE2B 141a8b61d0b5fbc68fa174e3dc5d4b9978cc455e887f3d2a27b2842705ecf090f0eda000d713736362119cede9681ec9592c265ded04c3567fd53ad58cf41543 SHA512 e669b4ec3a4d06454f0a7487b50ed3594c0e207803ac3a0ad23b0ba96e5217baf4f629c7477f126ec5845ee81a75ead4c2531a7d30fc2c05d2de91f8eb09f4fb
+DIST thunderbird-68.4.1-ca.xpi 578440 BLAKE2B 222faf8f6871dfb54927348b56c43c280b88d4fed790ae35105ba991c5b462cf64f90dcc32f948b8a718fc8d1cf06e1247202aa153b9595e66a8a7b6fb0b48b3 SHA512 394582b25d04441087f6192e540718791771f03a729a43fc0cea0b0efdc01931eb8ad6ff3415d606111d2dbbb0b8fa6dc81b11a7648eb7c48b551d4d48d2f643
+DIST thunderbird-68.4.1-cs.xpi 603042 BLAKE2B fda7a35cd6496f8f7377904af45c6a97376260e4ec9e880c3bca76b3a7fcb98d281a85710e148410d16d94f818084ed111cf8604fb21dbc0ba3f45e554b6f055 SHA512 10bdabdc91c8802506998a2465b6715cc70a6740a715b6d1fbaadee7d5310a2d7fbef7407ac458da561b2156051e6e21eb16bd0a6578807240602308a9d2f55d
+DIST thunderbird-68.4.1-cy.xpi 589902 BLAKE2B f8e4c345721db52c26f9360d12a14ca05fd2dfc9a4aa40db9c32329711ead1f607938a90fd4e58173dc9665e2592bb126938cf8c7167f17d1cfdb58ed9e2dfd2 SHA512 ad08a053c5f166010dd9eeb39653492681fe3d3b10cee3feb0d8ce4f8fe0a7e4c6cba410e86364e1680b722190b7952fec29a651d38ec537e6f24b3cd12bd766
+DIST thunderbird-68.4.1-da.xpi 588350 BLAKE2B 54454f40620f559033827fc2f25af329b61574b4207048403059cbca4868437d02a25c32ed727d8d024f971f5b5c039efd0f35cf887ea7a86122f25d52e6e50f SHA512 a9e92e7195a67d7fd89ee4bcedf34593a74770c0667efa7a8cd51808e626baa671bed285fd4314b20040e92e71f2b1d495347b001330561df1dacbef1cd9cdac
+DIST thunderbird-68.4.1-de.xpi 597805 BLAKE2B b13109c02d84b218ae50441a87bbd09fdfa616f85bb8654d20acbdd6914787cb498e236c0a7a26e4ec1377a4619de993692647127ab88f6366a3053319e828ba SHA512 e8bd7f46cbba624d81626d3290b533c6105d9dbeacfb35b5ecb1fda57e95dfb01b12661c5d5201fa69bf3204033b2514e5cbee0b72bf3f06f87ea0b8de7cdfe2
+DIST thunderbird-68.4.1-el.xpi 699224 BLAKE2B 9631a6a2541b61ad98e83fab4798fc430219b924c813fdfb662ff44d6f60685879549668d79b7caac9f8d1494aa6e4e75266fc79ac8a3422d6010dabf6be9bba SHA512 6bf4dfd5e218eb1c321eab240b3b6b4a8e6574318ad29fd4a97faa28f42050d458eed94bdba07a3f5393226da3cdb4c2cbe0d4613bd678badc9c3ef361a74739
+DIST thunderbird-68.4.1-en-GB.xpi 556404 BLAKE2B 52ab2aecef8c9cb3ba0164c3e57b55cff6912f5defe0bc1f3d92efe9386082b85ca9640f5a1c6ce3bbfd569fa90b8211cdb6a6bb40bbc51d94c79ab844efa7e4 SHA512 0b89f6f575101a80edf9c564b53af7d884a7247d53955ba0aece5307c0b31a00a0f04f2e6f71fa261ed5865cecadce21a7fa17a16d0264a8d6e753a5cca60285
+DIST thunderbird-68.4.1-es-AR.xpi 596552 BLAKE2B d73c67b05aad5d07bb35d661cc46239c909a2d046a46b68c987744935ff9fe7a81bb1b4189b093fa9a072059078d21752888cfa67f84ef7a24fa5092a8796601 SHA512 78efbbf2bb5105d12ec33ebff31ba6258d154032452f62862f174c4ec3bdc74eb8fdc5bb92391276b64d38e9d61c41aa02b7479f7fbada3a9dca5572da9adfcd
+DIST thunderbird-68.4.1-es-ES.xpi 518351 BLAKE2B 5c933a68c44acab013e3e7124c9826a01cd8afce6593aba19ee66e1ecc004017cfc82fe432ecb484a0cd9c7861a704b2cab814562c5cc17ffe12812fb3cf6c6c SHA512 ba8517f180adab4ce35775e38ac65736d136a567f0d05c57cb4246c9eec87bbf3b97c6a221c3aff62dbda78831fbbb820940528e3b4be4d27f54b6edd4ad109b
+DIST thunderbird-68.4.1-et.xpi 573582 BLAKE2B 27d2bc030cf2957afd7fe825e6814b7980c0c9f8b8e4c6eb3369921b93406fca22f1ff8f08ea7ce1638e6aec9d9da7eaaaee1c5b52cb94a923d11116c474e59f SHA512 1e52260ae3c5660000fcbfa3fc716a83c3444025dcfad002ef5e10f6bdfdde28ebc606c5f416a3e10f59aea1822676b2bb430fbc5f29f693d5878549e3b98160
+DIST thunderbird-68.4.1-eu.xpi 579945 BLAKE2B c83a9c5efe5a55ae197e8177617f10870bc2a14fcf6216e0a28ce3956e7d7b089510d8400e4ee4d5d0c40fcd6db85466f84a95472026b57de50191be50501e8d SHA512 73103348a32f31a5930f68546b5fba2a6c47940c15c0f4a7ce43839723f130d5770b6f2d98f856f1693a7b5753f327778245b6284b902bfab3f9a79728622f70
+DIST thunderbird-68.4.1-fi.xpi 578419 BLAKE2B 6080cb043bcb863f70229bc8e323149d0f7538103ba188d41421190315454e363aaf80e9c29d148b0b638d1932e078da2aaa2ed1b7bc95870d74d0999f7ac3d8 SHA512 9380164c2173bb1495145986c5fcbcfe983974b890cc140c919bd97285c634b169c818110138184179dd45a0ed8a0ccac855733a69e91f2d9243197adca1b019
+DIST thunderbird-68.4.1-fr.xpi 607810 BLAKE2B b50999859712501ad65f0238dbef32bab2f9cfc4a4220bb88960e12c7813c4a35dcfcba0f1745275cc1bd1ba2ff1c41ab69e1eb03cf923753c25af9ca0a15a0d SHA512 9866a32481be4df00a0f2520457de1fde39ce3061a724d4db763ca5fa98250e46551d6ea1b8db34a2262a764f03ffe73250540588d04d559ca78032ef2753475
+DIST thunderbird-68.4.1-fy-NL.xpi 594467 BLAKE2B d8ebe42a35658e3028cb93d2794b46344accfab77cee88305517f22935103906265fa15b32e6e2fc7288471fa914aa56f97d9907326ee0c053dc6ae9cf182de6 SHA512 443fe9b0a1acb572f1f729f573175653411cf57d74ab7f77d3f9c16838f2e928f2e789f09b3577be8de51d74fc820d1a12d6daa23b1e668b91d5254ddd69bd6b
+DIST thunderbird-68.4.1-ga-IE.xpi 588710 BLAKE2B 78650b4a080ebd01c808643c1ed6c7e41f50f6cb96082bc620111493e32b2bf1a61d0ad81944bf9be36142f50143fb86aba1e1a780cc67c58ac4dc887a999c8a SHA512 a60f3638856697dc4bc4a12873e4eca158bd567f5a09a4b03f9346e66428ba4d794efeed7caa3d8ccd9d395d8805d666408e99a18e40f5664e190386026e0ea1
+DIST thunderbird-68.4.1-gd.xpi 587110 BLAKE2B 15032b5827e3d5ae7a16bd1085481c14612d06b2a69f5a7fb62b44513b3dad24b944195cfe6e12cc7af96d42715c16895100e9e11ca408c2f11b9b63d211ddde SHA512 1874bc6f53b5b2f0fb11eec617c5302bd99f392856376326946a2adeeffae90bfef93533e6fa3c6afb480bb1986aa6c2d60ee4390c46815f66bc2a36fbc37a30
+DIST thunderbird-68.4.1-gl.xpi 568396 BLAKE2B ec09a2f090cf0cc0c3b4638a4d8a8ba2d5cf0a294a6669e3e8b660ca2347df0523fa46d56ccaebcc295c07c209595d6833d1c9a298fe113fda5f54d1c7e1e33b SHA512 05a5bbe409425427f7cbe915d2bc232d65824e5e0988630926a137860878b83d38c175c39b57958e656aed82a2e937f51fc837fd775443adf68f4943fed49d07
+DIST thunderbird-68.4.1-he.xpi 604787 BLAKE2B 3a085c98399b16b3e98b46d38af6d32330ac5e5f5d558f035b71d2ab68cca913132d0816cb958033be7791e132a477b1081198c54dfae95d8efab57faf73668a SHA512 edfa2bd9cfd1029e6b6c9a43b96f0ac1f544b61c2f3b560e65d9007aa03df7b59bf5f08f1a2b9ea30134159abca4f26634ea07d59778d67b0cf0c7938f5e9523
+DIST thunderbird-68.4.1-hr.xpi 583784 BLAKE2B 42e4cade236225d191f9caa44d8ebedda6825108246bf0e524c3cd433376c3f21f13ee40f0b9fbf5c70fc127340f8482ed61e3db71857a950f6b7ff5ad3a7944 SHA512 5a2794728bb22e3dc599276e95e008f423cba622f8a6e9ae65ad93fd37325317b9f74d0563ad6a3eead9c04d530df46c780fa0bb876f43b2f6c6823a2ff4eb39
+DIST thunderbird-68.4.1-hsb.xpi 616035 BLAKE2B 614e9ba0e778e6f7b9d0053b2955bf53efd944e8ab33fcb632f992215bfd4870ace017c874691ed8a6118da0840676dd02798744e7c41539e7f04974e403c263 SHA512 a0e8fcafb650d47402d6ffc15368f038bf3ce8fc684975fda1d7cb0c0c38679c246202ca2a7b217edad179217d688a04f448873a8ee1fdff1214a9220ae4240d
+DIST thunderbird-68.4.1-hu.xpi 618154 BLAKE2B 0a6889d403d0d6ab5662cee85af71a729f8a301e249caebd56ffd2534e62d80716891bcdd8c8ff4c6ce398a07e2c14ad62dfaa6a25ed1ba358d3c3157a125c9a SHA512 48eb5c66ff7c224a43b7d7932c5d39fc676a35bc39aa002281c687dccf34f5fdcac55aabc4f1fc15590e1892805b39fb49b706506e4b65d0f261e55d9384f61d
+DIST thunderbird-68.4.1-hy-AM.xpi 631977 BLAKE2B 347b809e188111ff98a65c3136facac23442e44f4686715defebb6e8d009686d5cac1dc7834ec81c3abf5916a50544dbe52c7760dfcc279a7d7ffc1772fba90b SHA512 4b52bffdab94b2d20ab80a7e1e48acc9f78496adfaecd1f89da12ee96ee23cd3e8983b5ed2227fab29e85ea480b173a9aecf4d7fb3fa1577d266fefad10e862f
+DIST thunderbird-68.4.1-id.xpi 567748 BLAKE2B 295ef6e7b161f9b4d564cf0c484a62e3061a44ea6afa693fd8cc314fa713de81c21621452d319878296787238cec6cd478b02c8cb25bd5917e16bca41a8dd304 SHA512 c940fed7dcb95fb3093276bff3069149a469b85a65df26c58b0beb5fc4d875091bfc3216be9db0be9ce0102da12059fffa845d749748245f396461dbaf2ed7e6
+DIST thunderbird-68.4.1-is.xpi 575440 BLAKE2B b6d402367d540200ec9f8894c062c5eb445c7b118b76df5ac29e06d99223a715c7986f549059f4641ea6a938ad841f696bd90b3b629be82320d3da412a8c8107 SHA512 f89c03981f8d2e901047109fb74fe834ef3bc559aca565e6b1616c3ede06c442ef6a426e908adeb94ef26f03d125a4383d0b304babe66734f900390416001e53
+DIST thunderbird-68.4.1-it.xpi 489519 BLAKE2B db2bf0d9ede55eb9a5498aaa2b1b8ce793462fc23c1369d5cb3963890e345725b1f8934c5b69b9edaded84bb8b24ad3d27932f13f9bd514c8eb2818261d9b683 SHA512 cdd9d520fb9d188f8af7f22dcb37b7611fe4ced2387a345dbb777f4840934c30e564d609214df00d0b1205865f1ae4bc0938f883643d1a61036c7e870f2b4f1f
+DIST thunderbird-68.4.1-ja.xpi 643576 BLAKE2B 74422ce9ec425a2e33a7ee91626566db7a709c03108eb64426d42e58a7ad54970a046acb09eb8d2a8868cc45770483113187a963cd2f1cb1ba551d97292ddc2f SHA512 bdfc41e4401dd64a8213d937ecba45fcb376e6aebd6fdf34cb5257966d4fa93a3102f0409045eccc24467d249ca51519466969b8370b30ca8bb38721aa807597
+DIST thunderbird-68.4.1-ko.xpi 620531 BLAKE2B fbe2966f8952558b6b2022d8d9dff872c7e08a74876208a44de3bacfde59bd6aaf928d45031edd000ead0cc785df78e4117d4a82943c965d43098220a6d3a6b1 SHA512 258bc22cf918701d9491f4e105d33047a9b072fe02a039ecdb6df482de9c72b6cd628a5f7cd09b3ad5d6551d5e7aa0e879b1b75537c85da6a950aefb6e363ad0
+DIST thunderbird-68.4.1-lt.xpi 603846 BLAKE2B a3604648faa1687ac14d326716521d54a07cb72f034b87f1eaefa978944b28c073893b39a6949078c2c6717f844b68f64cc9bc85ef644cfda3e55d744c06f4bb SHA512 bf6e4921876212debf9707aa83f91907ce6d6537a1d240f789f797d18082ea229f16f75b484252bd99398243e7f1c4cd66d600ef747345ce7ea2301d455f790a
+DIST thunderbird-68.4.1-nb-NO.xpi 574022 BLAKE2B 8dbcfa37d7fd24199fe1451620069db71495b34107fb548f8206fb240ce0d2e9faa96e16bd64b577ddbccdaffaa76ff199f82d0f5033cca132b81195bed16f75 SHA512 ea197e592fce9e81c4ad752dccf480f2bc70aef9f2625a1178b24ce4b6f3db728864b6fe6823425bcce8d6e7cc82a805063b351697568252db1478d790ccdf45
+DIST thunderbird-68.4.1-nl.xpi 581356 BLAKE2B a3c6027a1d369d0ad10d46c1d287208ebf96fceae4a9de4449aee80a2d6e9491085db62709198cd071930055fa3fb7ab6e2c0a253cd94f40314344fa121f024a SHA512 0a73a591d33b45b95cb5eed23783899767fcf2b3a07f34695194de02c541bc1d707721e0c187c3e8cd8aba648090dc58aa4ef7487ab7ea9fe5562a51da67c1df
+DIST thunderbird-68.4.1-nn-NO.xpi 574950 BLAKE2B ce13d468fc2cd23281f1c4654ff1033f3021cd83594be2dc00457116cb27e0ba2ffe4febb4147ba1e84bd7aecfede3c2baed276c8c4520615e83cb1e294a79db SHA512 d36a779d6bcd7d6b0f3be63cb6da53f4509490bc78944af947020ac008bb978389d556ef27c6f01f714e5f31eaac9b0baff5246bc5b5794e7cd71eeb2246b6f7
+DIST thunderbird-68.4.1-pl.xpi 576086 BLAKE2B 128eb1fe7ba9e1fc9bbe20c012ca46bf591105c88afb7d2d624ebb036ee71314d98884eee42f6750f875af7b3833e6766d894b7cd82165f22d790a7bcd629bf8 SHA512 63c0a636baa339eced598c1d61135e05f6c4d1edc673ed50da8079b08c69e473ec3d165e28f6648ba764d0226baa7d491be2d8635ab5b4b03d478f3365cb7db3
+DIST thunderbird-68.4.1-pt-BR.xpi 589837 BLAKE2B 57e55ee8f941548fb3f15b419831c71db08f036eb9e1431341409715f6843d88d01f1d57a2f00a17367241f78dfd795fcf97f71391b45fd9ccd2921072b048d1 SHA512 5b40a0ad405e08cff5f070f2eb174e9392f667456693f6ac71838a70fd06be06847ea7c1dd03ee21338b51173fd5cef4c08974c1d0a2bc6392a8684ab6ab2b7c
+DIST thunderbird-68.4.1-pt-PT.xpi 588103 BLAKE2B 923dcdefb2ed67c05aeb3b3de5b82a2b53dcf8ce5f9f2820aa6c3eb7d49fdc82c2c170eabdb9803a8dec9bf9407bcd10d5a5307d1b9fefd8f153c9e76422a5df SHA512 0016a2757cac66b88ff631b98255ea5bbda4997c7026f0868d2d31a50d2be288998198f081fa6b26215ab957465b68c1db29616f2ceed706574b91a4364931e4
+DIST thunderbird-68.4.1-rm.xpi 578049 BLAKE2B e9cbc030562f22cc2e2aa02a5ce5dfa6bdfb6e7694e05708637ee3ef388397f2cdfce231d2715713e53c5df575278ff7cea0be58c1a6d0d80d1ab42f39fea2f3 SHA512 843f1125fa9f32f3d6e937346f01e0f304dbcbae714ab716d184a7a3c8c925b21f40f47201c70566a3d5501c98e43609f84f02ab4dd98bcc5da35b76e04cd8ff
+DIST thunderbird-68.4.1-ro.xpi 594840 BLAKE2B a7b587c4b4366b18e703f7ebeed880c9afbfdb08f61aebc286803c224769fa95e3c9fad5c4213956af288fe590f747b8d1f63a3840de0a0a13864158f6a87385 SHA512 a88f86c2d6750845eb659d5592b6361f2421cd28fc6bf718e82bf85e53507d7b78197c93bad000a60ddbe03395481694e929da13cf7e280e4e9702451777d785
+DIST thunderbird-68.4.1-ru.xpi 683326 BLAKE2B 2a3ae7d110d6406f47a1d9ca80f6138efea2c9d9b4b5d8794d8bb01ed1ffc7096fc9bfccf9035de75863b2b4d828e3397717910b2886b8513c6949aca70f4022 SHA512 7479337690453338458dbced49d6bf324bc0226c90f5713a4472aedaa4c66f4c3c70c3d43efb51bb32d19ca08792ca71f066f2c80c75a087030268ddec7463d6
+DIST thunderbird-68.4.1-si.xpi 637405 BLAKE2B f6bcc83eb887c5a8548fbc3882b93ce84fedfb6dab67284dec07ded1b22b272bc9892816b25c3c9e55ff1662009a7d3c0e8ddecdaacd03130279c499989dc113 SHA512 109d19433901168e500c739ba0abb2c5d44337361fcb63db4ed4345a7c9c715154c1636e6a2e366618e91784e32afa1b73e203cd18f4e652926cce4769bea02f
+DIST thunderbird-68.4.1-sk.xpi 609753 BLAKE2B 6c01e7d93e67dbcabdc7569c423b838011e78ba9bfdf4eeaafa3627bd954175bfcc25f7a06bc0b5a4ebe12e4e161cef2d530e5fe829f4ffcef7e58b52adf6121 SHA512 f906d12fc743129bfa22240f5eee34643b238f9970be3ca6e1c25e690bdc6f8ea173a371947b145ad44b75063ec649d05289b07fdd23da3133b0463affaa8415
+DIST thunderbird-68.4.1-sl.xpi 590628 BLAKE2B 2aab0e201f9801dc6b2f7fdf872216c47ecb343f501eea98d5cf8bf2cef72df0a866f1be49066fe80e022d43e1a6ee14011926c1e75c5bad6f69475cb16952cd SHA512 30729bdab58bad72d1a5ecaee6708ad62285a17ca72e9ba9b06429920226c20c84324b24395e6c4d406d90bea48e66e1ce041bb6d5e587ec0033d352152f4355
+DIST thunderbird-68.4.1-sq.xpi 598900 BLAKE2B e176f299a20fe9a5b7df21aa38ec1a733200788ef83ae014ef952ae406ad1b881a01cdbcad0de6ab58045df18a95f402fb96a36441ed817c2fc6442bc8681138 SHA512 73e3f10d0d597bd636f841df4795b6dc5cbfcd61b7a39c20a5cbfc3408ec6faf38fa34813869d9a45cf10f6ebce56aa9632c2005447a18de65935a01b9591df3
+DIST thunderbird-68.4.1-sr.xpi 624897 BLAKE2B 19fd888c98be9aba9a52234911d47ed76e6a104df540470870cc4425415f2dab942be83b868ffa34a14266a48d96c61b9f60a6c7af4df0691b77c7e8b1392b3a SHA512 2c025c3ff23dde25a74774c988d55b99202681b60179f648416f93a2893fa06f6acbbe964d02695f769e8888ef2abbcd6f2c984b8669a99689fc67eef0deb44f
+DIST thunderbird-68.4.1-sv-SE.xpi 591596 BLAKE2B 5eb7f988c447bc290642a530b74b15fa8b9daf9da8c68d97871a29c8900de928fda66f45ed673d5a18a9faba300d946558f07cd51392964e1001ed991ef063b4 SHA512 8a120498981ac4f2cdbeee9e8345773837b86f63d5e8004935d772ba5a4155f3fc96b27ff996dc33982af69152ac6a24c076b03023a453f4e39ab088c062d732
+DIST thunderbird-68.4.1-tr.xpi 599707 BLAKE2B 825a45e33b3dc1927396358283ca06aa73e785bfec526247db53c669f5cd89cfff9bcd5be133570f6e03c333ebc2ee10f9f361fd064b0b76058b19436e3879af SHA512 176de8ec4c3ebae6562d3820c1e0a75da6b7917b1767d4c7b4906f5a088311552c3114fff129cd5b9203cde4cd7faf8877a637c59781aaa6f1a6d8060fe29975
+DIST thunderbird-68.4.1-uk.xpi 671454 BLAKE2B dd67fb1efc856507f0e066fcf71b796b315a059e4a7c1d740621112fcb6ef438ad1101bc867d579c58ad61a724e5271f875a374c129d535fc62fa70908b7ebdf SHA512 e9f5be395cfa557d2ea387a7a8f9ae2cab0756fb07d229bbb878856e5819dc92697b1d2e7b23a100b3361b641e5b69f2b8ce5fea15a672929da2ed258a47978a
+DIST thunderbird-68.4.1-vi.xpi 623422 BLAKE2B 544b281c5711ea0020aa8aab0e9774fb0bc0bb1942b59ff51a43895801cc5c4a68956ae5e00c3466d391aec06bdffdfb3b7612a3d173cff4d0eb6212b2f0414d SHA512 49bcdb6b8cb987a3d30cc20107669eeefe27b9434255becca15cbe11e4ab34d80b76299b38b368fa9b3d485af128e980157f0bd0b864d2f5d85a1a47006f7e51
+DIST thunderbird-68.4.1-zh-CN.xpi 626820 BLAKE2B ba734f30a4ab8f6a870b7b12118db701f36d551e607723632419aec8ecd5e20a4adcab810c197922f390d944d09903c73ee16c9bea99afcbc2feb7adf67326ce SHA512 9404956545e739a2ebb4a08062f9f7f3a54ee73fb1a5bcdc604ad83bdda6838dc68acffd8e68ed9ec65f443114cf2d56bc467ba04222b4cf52e97e9b4b3baa0d
+DIST thunderbird-68.4.1-zh-TW.xpi 627476 BLAKE2B 964a8163102ee15f7815198d5e66ec16cc16e4b5bb8c63bac18b3a0fb95958d78d8158aeca0fcaaf3b45230a6a983de5209f8face36d21a4f199de87c83352dd SHA512 8085ca8cb1e976c541c1423d83289f372bf439d82c7b65d81d9b10408f45768293aefe4bb30e83fd5f2b20dfdeca8b522191d5e226bed9d40f94fe1746d5e31e
+DIST thunderbird-68.4.1.source.tar.xz 331482720 BLAKE2B 73429c48bc4f171feaa2964afe13335afaa696b3ec278e97e92f6c9c06ab8e4c4c9094751ee2c297341bfdc814f1bfdcb84afc1e9c1e82008e7d049fb01ca9dd SHA512 16cccbc2313472e6312e842a28079782238cb22e72b324bebaffefa4a2fe68fec9f2173f2c83f1caccc5522ab9145884b2e2a58e97e236f7aefa4c61764e08b7
EBUILD thunderbird-52.9.1.ebuild 10467 BLAKE2B e8864d5147e5f25b5621d6cff3bcbdc24ad651e0d895976bee609d0a8ba69fb65df8bf8b0778d4c7daf29ace635a147bcb5060ca38c1a33e319cb8fcd4f76192 SHA512 51e0f56a5bc314e65b9263553294c705a8e15a3689364cccbcb3ef059fcbf694020c3da32fe214619503e0ca5dbfe54ba9a9f889ab649252b58fcdce1148ca52
-EBUILD thunderbird-68.2.2.ebuild 25000 BLAKE2B fc526921bdea90b3bdfaace702b48e479a84a6a66a440fbf892225383a0be8d7f870b6cf1f984a0b714cf84b15e254c995553497456bf5a434d5dbf6a0b0d676 SHA512 621f11feaa7ae4ed6716892af56dee302399cd80d755a0aa9240df2cd33fc7f4c0538ea7bc88b76ff4effee5114261b1235b4c8685ea973c1ad6eb48b8251c12
-EBUILD thunderbird-68.3.0.ebuild 25028 BLAKE2B 1320d8fb866ec586166fff9b983a4b3dc410b53353f5e687020f15122df81083f1953e74e24203ab505cf099fbbcc5dd599a4a03eda6d45d0c467de49727a9df SHA512 aacbe32f16490d2e9f34dd29c4c18c82a99105f9107f6e11f33f19069edf567268192d10c15f9969aa4f6e7723340a1e1987a7c24394eee3d42e9958876f5869
+EBUILD thunderbird-68.4.1.ebuild 24973 BLAKE2B 7935128c93a72efff4b289af360df38a27406b14cc539620a361abacf3a169872f68644c8e9362dca1a4d824907c83d6710c7bb05d249050e5697309bc8949af SHA512 8cd3ba22bcefad9174f84f135fc7ab48074d49a501738d64e1500b668b5bb959d53d81af045a255571fc5f97c578f522874ff9cb90a393918123e61487f01f2d
MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.2.2.ebuild b/mail-client/thunderbird/thunderbird-68.2.2.ebuild
deleted file mode 100644
index 95b2bcfc9a80..000000000000
--- a/mail-client/thunderbird/thunderbird-68.2.2.ebuild
+++ /dev/null
@@ -1,778 +0,0 @@
-# Copyright 1999-2019 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_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated using scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
-es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
-ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
-sv-SE tr uk vi zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}"
-
-# Patches
-PATCHFF="firefox-68.0-patches-12"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-
-# ESR releases have slightly version numbers
-if [[ ${MOZ_ESR} == 1 ]]; then
- MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${PN}-${MOZ_PV}"
-
-LLVM_MAX_SLOT=9
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
- +gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
- selinux startup-notification +system-av1 +system-harfbuzz +system-icu
- +system-jpeg +system-libevent +system-sqlite +system-libvpx
- +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )
- !test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
-SRC_URI="${SRC_URI}
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
- https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
- lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
- ${PATCH_URIS[@]}"
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
- gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
- autotools mozlinguas-v2 virtualx multiprocessing
-
-CDEPEND="
- >=dev-libs/nss-3.44.1
- >=dev-libs/nspr-4.21
- dev-libs/atk
- dev-libs/expat
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3[X]
- x11-libs/gdk-pixbuf
- >=x11-libs/pango-1.22.0
- >=media-libs/libpng-1.6.35:0=[apng]
- >=media-libs/mesa-10.2:*
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10
- kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
- virtual/freedesktop-icon-theme
- dbus? ( >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72 )
- startup-notification? ( >=x11-libs/startup-notification-0.8 )
- >=x11-libs/pixman-0.19.2
- >=dev-libs/glib-2.26:2
- >=sys-libs/zlib-1.2.3
- >=virtual/libffi-3.0.10:=
- virtual/ffmpeg
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXt
- system-av1? (
- >=media-libs/dav1d-0.3.0:=
- >=media-libs/libaom-1.0.0:=
- )
- system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
- system-icu? ( >=dev-libs/icu-63.1:= )
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
- system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
- system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
- system-webp? ( >=media-libs/libwebp-1.0.2:0= )
- wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
- >=dev-libs/dbus-glib-0.72
- net-misc/networkmanager ) )
- jack? ( virtual/jack )
- selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
- jack? ( virtual/jack )
- pulseaudio? ( || ( media-sound/pulseaudio
- >=media-sound/apulse-0.1.9 ) )
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
- app-arch/zip
- app-arch/unzip
- >=dev-util/cbindgen-0.8.7
- >=net-libs/nodejs-8.11.0
- >=sys-devel/binutils-2.30
- sys-apps/findutils
- || (
- (
- sys-devel/clang:9
- !clang? ( sys-devel/llvm:9 )
- clang? (
- =sys-devel/lld-9*
- sys-devel/llvm:9[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
- )
- )
- (
- sys-devel/clang:8
- !clang? ( sys-devel/llvm:8 )
- clang? (
- =sys-devel/lld-8*
- sys-devel/llvm:8[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
- )
- )
- (
- sys-devel/clang:7
- !clang? ( sys-devel/llvm:7 )
- clang? (
- =sys-devel/lld-7*
- sys-devel/llvm:7[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
- )
- )
- (
- sys-devel/clang:6
- !clang? ( sys-devel/llvm:6 )
- clang? (
- =sys-devel/lld-6*
- sys-devel/llvm:6[gold]
- pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
- )
- )
- )
- pulseaudio? ( media-sound/pulseaudio )
- >=virtual/rust-1.34.0
- wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
- amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
- x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
- !system-av1? (
- amd64? ( >=dev-lang/nasm-2.13 )
- x86? ( >=dev-lang/nasm-2.13 )
- )"
-
-REQUIRED_USE="wifi? ( dbus )
- pgo? ( lto )"
-
-S="${WORKDIR}/${MOZ_P%b[0-9]*}"
-
-BUILD_OBJ_DIR="${S}/tbird"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
- GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang ; then
- if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use pgo ; then
- if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
- fi
-
- einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
- moz_pkgsetup
-
- if use pgo ; then
- if ! has usersandbox $FEATURES ; then
- die "You must enable usersandbox as X server can not run as root!"
- fi
- fi
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist ; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation."
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
- fi
-
- addpredict /proc/self/oom_score_adj
-
- llvm_pkg_setup
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
-
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply firefox patchset then apply thunderbird patches
- rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
- rm "${WORKDIR}"/firefox/2015_fix_cssparser.patch || die
- eapply "${WORKDIR}/firefox"
- pushd "${S}"/comm &>/dev/null || die
- eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
- popd &>/dev/null || die
-
- eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
-
- # 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 neon ; then
- mozconfig_annotate '' --with-fpu=neon
-
- if ! tc-is-clang ; then
- # thumb options aren't supported when using clang, bug 666966
- mozconfig_annotate '' --with-thumb=yes
- mozconfig_annotate '' --with-thumb-interwork=no
- fi
- fi
- if [[ ${CHOST} == armv*h* ]] ; then
- mozconfig_annotate '' --with-float-abi=hard
- if ! use system-libvpx ; then
- sed -i -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build
- fi
- fi
-
- mozconfig_use_enable !bindist official-branding
-
- mozconfig_use_enable debug
- mozconfig_use_enable debug tests
- if ! use debug ; then
- mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
- else
- mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
- fi
- # These are enabled by default in all mozilla applications
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
- --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --disable-crashreporter
- mozconfig_annotate 'Gentoo default' --with-system-png
- mozconfig_annotate '' --enable-system-ffi
- mozconfig_annotate '' --disable-gconf
- mozconfig_annotate '' --with-intl-api
- mozconfig_annotate '' --enable-system-pixman
- # Instead of the standard --build= and --host=, mozilla uses --host instead
- # of --build, and --target intstead of --host.
- # Note, mozilla also has --build but it does not do what you think it does.
- # Set both --target and --host as mozilla uses python to guess values otherwise
- mozconfig_annotate '' --target="${CHOST}"
- mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
- if use system-libevent ; then
- mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
- fi
-
- if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
- mozconfig_annotate '' --enable-rust-simd
- fi
-
- # use the gtk3 toolkit (the only one supported at this point)
- # TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
- if use wayland ; then
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
- else
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
- fi
-
- mozconfig_use_enable startup-notification
- mozconfig_use_enable system-sqlite
- mozconfig_use_with system-av1
- mozconfig_use_with system-harfbuzz
- mozconfig_use_with system-harfbuzz system-graphite2
- mozconfig_use_with system-icu
- mozconfig_use_with system-jpeg
- mozconfig_use_with system-libvpx
- mozconfig_use_with system-webp
- mozconfig_use_enable pulseaudio
- # force the deprecated alsa sound code if pulseaudio is disabled
- if use kernel_linux && ! use pulseaudio ; then
- mozconfig_annotate '-pulseaudio' --enable-alsa
- fi
-
- # Disable built-in ccache support to avoid sandbox violation, #665420
- # Use FEATURES=ccache instead!
- mozconfig_annotate '' --without-ccache
- sed -i -e 's/ccache_stats = None/return None/' \
- python/mozbuild/mozbuild/controller/building.py || \
- die "Failed to disable ccache stats call"
-
- mozconfig_use_enable dbus
-
- mozconfig_use_enable wifi necko-wifi
-
- # enable JACK, bug 600002
- mozconfig_use_enable jack
-
- # Other tb-specific settings
- mozconfig_annotate '' --with-user-appdir=.thunderbird
- mozconfig_annotate '' --enable-ldap
- mozconfig_annotate '' --enable-calendar
-
- # Enable/Disable eme support
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
- # Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
- mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
- # allow elfhack to work in combination with unstripped binaries
- # when they would normally be larger than 2GiB.
- append-ldflags "-Wl,--compress-debug-sections=zlib"
-
- if use clang ; then
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
- mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
- echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- mkdir -p "${S}"/third_party/rust/libloading/.deps
-
- # workaround for funky/broken upstream configure...
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- ./mach configure || die
-}
-
-src_compile() {
- local _virtx=
- if use pgo ; then
- _virtx=virtx
-
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- addpredict /root
- addpredict /etc/gconf
- fi
-
- GDK_BACKEND=x11 \
- MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
- SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
- MOZ_NOSPAM=1 \
- ${_virtx} \
- ./mach build --verbose \
- || die
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Copy our preference before omnijar is created.
- cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- # set dictionary path, to use system hunspell
- echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
-
- # force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
- if use system-harfbuzz ; then
- echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- # force cairo as the canvas renderer on platforms without skia support
- if [[ $(tc-endian) == "big" ]] ; then
- echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
- >>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
- fi
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
- || die
- done
-
- cd "${S}"
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
- DESTDIR="${D}" ./mach install || die
-
- # Install language packs
- MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
- local size sizes icon_path icon
- if ! use bindist; then
- icon_path="${S}/comm/mail/branding/thunderbird"
- icon="${PN}-icon"
-
- domenu "${FILESDIR}"/icon/${PN}.desktop
- else
- icon_path="${S}/comm/mail/branding/nightly"
- icon="${PN}-icon-unbranded"
-
- newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
- ${PN}.desktop
-
- sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
- "${ED}"/usr/share/applications/${PN}.desktop
- fi
-
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}"/default48.png "${icon}".png
- # Install icons for menu entry
- sizes="16 22 24 32 48 256"
- for size in ${sizes}; do
- newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
- done
-
- # Disable built-in auto-update because we update firefox through package manager
- insinto ${MOZILLA_FIVE_HOME}/distribution/
- newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Don't install llvm-symbolizer from sys-devel/llvm package
- [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
- rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
- local emid
- # stage extra locales for lightning and install over existing
- emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
- rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
- "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
-
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
- insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
- doins -r "${T}/${emid}"
-
- if use lightning; then
- # move lightning out of distribution/extensions and into extensions for app-global install
- mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
- mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
-
- # stage extra locales for gdata-provider and install app-global
- mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
- "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
- emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
- mkdir -p "${T}/${emid}" || die
- cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
-
- # manifest.json does not allow the addon to load, put install.rdf in place
- # note, version number needs to be set properly
- cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
- sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
-
- insinto ${MOZILLA_FIVE_HOME}/extensions
- doins -r "${T}/${emid}"
- fi
-
- # thunderbird and thunderbird-bin are identical
- rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
- dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
-
- # Required in order to use plugins and even run thunderbird on hardened.
- pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
-}
-
-pkg_preinst() {
- # if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # doesn't need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- einfo "APULSE found - Generating library symlinks for sound support"
- local lib
- pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # a quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if [[ ! -L ${lib##*/} ]] ; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-
- if ! use gmp-autoupdate && ! use eme-free ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/mail-client/thunderbird/thunderbird-68.3.0.ebuild b/mail-client/thunderbird/thunderbird-68.4.1.ebuild
index 9ca623c2f8ff..e288efad627c 100644
--- a/mail-client/thunderbird/thunderbird-68.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-68.4.1.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=6
@@ -8,7 +8,7 @@ MOZ_ESR=""
MOZ_LIGHTNING_VER="6.2.5"
MOZ_LIGHTNING_GDATA_VER="4.4.1"
-PYTHON_COMPAT=( python3_{5,6,7} )
+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
@@ -261,8 +261,6 @@ src_prepare() {
eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
popd &>/dev/null || die
- eapply "${FILESDIR}"/${PN}-68.2.2-rust-1.39+.patch
-
# Allow user to apply any additional patches without modifing ebuild
eapply_user
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 0c5ebca783ba..d2ac87270155 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -3,5 +3,5 @@ AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db
AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
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 1815 BLAKE2B d7038634ccc3e1db47caedb9a05fa3587dd4995ee80dda1546219296468f2c7747c7f02093bbd768b43d486365edbac3a17503b9957984c6150ecc7b5d1e1033 SHA512 9b903c63fbf1e8011b9370bcdb2788551f2fd96190b3247ee1c83cedbfacd33e84214401bfa22e39601d6340708bd7cad10a8edb924d21e3e6d7df685597b91b
+EBUILD trojita-9999.ebuild 1791 BLAKE2B 31082327b84b8dbf4266e4e53130295e6feb6a671670ad9b52689d197fab024b7d115e85279dfe91f2561bc7e4aafa3b5a0d8054e3eb7e228e1a6b21eefe6766 SHA512 2cbb459fd5a63e23877de16465af805f83c84c5c5543a0a6b4060aac3c5ddc65e2fcb51844471806f85f7381f2c11aaaf18c78564c826a80dfe4317b87a9b099
MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index f6b3d85cf534..a6f81504d4eb 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -10,7 +10,7 @@ else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
-inherit cmake-utils virtualx xdg
+inherit cmake virtualx xdg
DESCRIPTION="A Qt IMAP e-mail client"
HOMEPAGE="http://trojita.flaska.net/"
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
DOCS=( README LICENSE )
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
@@ -72,9 +72,9 @@ src_configure() {
-DWITH_ZLIB=$(usex zlib)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
- virtx cmake-utils_src_test
+ virtx cmake_src_test
}