gentoo Easter resync : 12.04.2020

5 files changed, 145 insertions, 28 deletions

diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 78ede37ce03d..5274f07e8101 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1,7 +1,11 @@
 AUX 0.8.1-0001-remove-non-working-test.patch 1001 BLAKE2B e4ac8575683c32d15250ef0bd0ead027314aa5dae7e0b0f42a0c7ca1d5dbe0c562bccbddb2787b41634432c9ed5aff273642584e26509d11f56702624339a52f SHA512 5f2cc4c51eee1a9bb2c48e9101a1f031b2e0704373c175cbb4a6cdf6649864aa8279fc483f593a3e5fb757d4cc99d3e9b942d439f6f3b5c2c9962433a08b0831
 AUX 0.8.1-0002-changed-expired-test-keys.patch 16640 BLAKE2B 5bf18589c4a3b1f16a6d49c243cb5bd314947c31e26fd7517b76436656cb56bf2213daa60ba6f2e1fdc200cba2946a690492bfceef0abe9bbdbb214ebc3f81cf SHA512 ec8e4925965573b33694e9ee466b363e8b0a2c984f8c6027944bbb951d58f501125af76c6a813c43175694b937f7191451eea660e15bdbd69bba1387d999dfb2
+AUX 0.9-0001-remove-non-working-test.patch 1017 BLAKE2B bfcecf9261084694a30191ea6793405328d538d49eed3b9721102b5314846acc4329f4c9d46b375c9acbc53bc0d09b9222f85a2f5292ec30983c7efb9f56b5fb SHA512 b30d20495728c7205ad1fb663d1aa61832488f83ef43a6af530500aadf6198335fbc45154952858d4c11364f1349afac40539a721342bbdcb8cf5c40e9c88d0b
+AUX 0.9-0002-update-reference-to-envelope-body.patch 1056 BLAKE2B cbd4f33b356bccc0744fd6481e3b442685c5e7eb26fcde235a9e06f741223ef1219a8e164b887907750783d0af6db95c71ac1888a632472c35dccf712645fd86 SHA512 d239ba092e73f4841c5659c2c0efb1b0d6fd4d99974d10fa720237666ccdf43a953a82e97d3177bfc4db7db644725895b21bf3eec2783487d14d6a5251d4f20c
 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
+DIST alot-0.9.tar.gz 224932 BLAKE2B 6063b9974ec54b51521ec52db41519bd9f16cc8da611b1a2da7de3f7581a924962a79ca8193ad0bb36633141182c047f32c5ab58132c78e1ec036e4da684181c SHA512 e630ea18702c570630deb10347c52e03aecb297bc1f76ce60318eeb8725274b12eb408cbceb69c8035b1ec9ea778f19a035f48070606bc6540b68a4bc5591860
 EBUILD alot-0.8.1.ebuild 1998 BLAKE2B 46501085e4f147292300691f35ebf3b820ab96ce746db455808e5b588887a5a792b3d49b9e6f8c3f7bc793ede8eba09a4f3d92a001005e85adfe05d2ef6c8bfa SHA512 1f89490c9213c1ad24b1b221029ac1f1c68b1cd2382fb8ceba852b86248f77e5cc07928e07e5bf1df5034e53f2e6a5f07fc8a1ac2859cd56f9147933ef415efa
-EBUILD alot-9999.ebuild 2045 BLAKE2B 00bf2f96d8ec0b355258fbd672803c55a31e1a42aba63a98d9007d9562746745887c9a48000e2b759fb5379f924d5431151c2fa4d7a53507be80285205a5d2d1 SHA512 b84c4c85bbb8fccbab0eebe17b132b1f2c1ce5dbb64d9a41a5050688b1aeda709a35629c89fd0744fef01abc9e66d5ae8795594e5c800c4b894ca17dd04221fb
+EBUILD alot-0.9.ebuild 1563 BLAKE2B ccf8ac185fecd7e6b19eb96cb28180adfcc76181ec9b5a2805bd614b1de2b151e060e37b055861476f7b1e7b91466564015d39b72ce91e637fa7944b41988b0b SHA512 4d7d1ba39bb93c351228b9d301748a1afa27d7fb7e40618480d101b2de069739bd7833b642ff8bea20ce5f7ebfe0efcb4a8d3cbe865c565c925b236acc48333a
+EBUILD alot-9999.ebuild 1668 BLAKE2B e2895d5701e4f1edfb4d794f4c8167784f0d20932e2e351225b959735b98985694b58e401777333a20fa36c05bcfd081b09ce542c03bc5fe7c0586eebe03858f SHA512 ed94b22b31906e817c6876e56a008fa303856158586c95493165ad2e1455c560b7d2683958dc0d0faeacfadd5130868f15c8f77f9f1aa65526efdd6f3b8df935
 MISC metadata.xml 828 BLAKE2B f6a639fc8922f7c50e2ac449edb16e17abb622c3f39ab055d13db4cc81db074dfee37fff81ba043574fce37a8d9db426184c0e6d50c9dbc0f8124f72de8741fb SHA512 3300e7f9f49bd40cfb9cbbb4917b88edad34a03bc0b69699d79ad8b120800433b27b74b65207292602f54157496056c59caf4bbcc50b9fc94ca50e59ddaccbd4
diff --git a/mail-client/alot/alot-0.9.ebuild b/mail-client/alot/alot-0.9.ebuild
new file mode 100644
index 000000000000..248997e51961
--- /dev/null
+++ b/mail-client/alot/alot-0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
+SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/gpgme[python,${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwidtrees[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.4[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	net-mail/notmuch[crypt,python]
+	"
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+	"${FILESDIR}/${PV}-0002-update-reference-to-envelope-body.patch"
+	)
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	emake -C docs man
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	doman docs/build/man/*
+	distutils-r1_python_install_all
+
+	insinto /usr/share/alot
+	doins -r extra
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		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/"
+		elog ""
+	fi
+}
diff --git a/mail-client/alot/alot-9999.ebuild b/mail-client/alot/alot-9999.ebuild
index 616f650d4ec8..9d12b1946481 100644
--- a/mail-client/alot/alot-9999.ebuild
+++ b/mail-client/alot/alot-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
@@ -24,17 +25,16 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-crypt/gpgme-1.9.0[python,${PYTHON_USEDEP}]
-	>=dev-python/configobj-4.7.0[${PYTHON_USEDEP}]
+	app-crypt/gpgme[python,${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/python-magic[${PYTHON_USEDEP}]
-	>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/urwidtrees-1.0[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/urwidtrees[${PYTHON_USEDEP}]
 	>=dev-python/twisted-18.4[${PYTHON_USEDEP}]
 	net-mail/mailbase
-	>=net-mail/notmuch-0.27[crypt,python]
+	net-mail/notmuch[crypt,python]
 	"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
@@ -44,20 +44,19 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+	"${FILESDIR}/${PV}-0002-update-reference-to-envelope-body.patch"
 	)
 
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
+distutils_enable_tests setup.py
 
-src_test() {
-	esetup.py test
+python_compile_all() {
+	emake -C docs man
+	use doc && emake -C docs html
 }
 
 python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	doman docs/build/man/*
 	distutils-r1_python_install_all
 
 	insinto /usr/share/alot
@@ -71,18 +70,5 @@ pkg_postinst() {
 		elog "the user manual:"
 		elog "   https://alot.readthedocs.io/en/latest/"
 		elog ""
-	else
-		local rv
-		for rv in ${REPLACING_VERSIONS} ; do
-			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
-			fi
-		done
 	fi
 }
diff --git a/mail-client/alot/files/0.9-0001-remove-non-working-test.patch b/mail-client/alot/files/0.9-0001-remove-non-working-test.patch
new file mode 100644
index 000000000000..505f112e5042
--- /dev/null
+++ b/mail-client/alot/files/0.9-0001-remove-non-working-test.patch
@@ -0,0 +1,31 @@
+From d534d65e1d4855565124906319c54b179dae20bd 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 775a822c..ca79443f 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/alot/files/0.9-0002-update-reference-to-envelope-body.patch b/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch
new file mode 100644
index 000000000000..8010b50db8ad
--- /dev/null
+++ b/mail-client/alot/files/0.9-0002-update-reference-to-envelope-body.patch
@@ -0,0 +1,28 @@
+From 67a06f5b9afa132a187956d5f28b0470b84a0235 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc5812..aa1fd436 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ class ComposeCommand(Command):
+                     mimetype = helper.guess_mimetype(sigcontent)
+                     if mimetype.startswith('text'):
+                         sigcontent = helper.try_decode(sigcontent)
+-                        self.envelope.body += '\n' + sigcontent
++                        self.envelope.body_txt += '\n' + sigcontent
+             else:
+                 ui.notify('could not locate signature: %s' % sig,
+                           priority='error')
+-- 
+2.24.1
+