gentoo resync : 15.01.2020

10 files changed, 339 insertions, 428 deletions

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 @@ 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
+-=r1WA
++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
++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 @@ 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
+-=T5TK
++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
++=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
+