gentoo resync : 25.08.2020

5 files changed, 66 insertions, 384 deletions

diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 03beee26533a..557fdc7f08f3 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1,11 +1,9 @@
-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.1.tar.gz 228645 BLAKE2B 7a44542513bc6d90df43cb21daf2ba103cbbae4dd81b44eaf935d764ba11d6c5640774e72728725eca83a777dcf3583bebaa57c9061191499f74ed89d4c11b4f SHA512 ac65c742d5bfb4827482c881ec2eb95b9215e9a5c49d7001421d62ffb1f38c7792dbbf94c0f16578da70b5ce15ba7a28cea0c1bbd34080f8132c80f4a0a2199b
 DIST alot-0.9.tar.gz 224932 BLAKE2B 6063b9974ec54b51521ec52db41519bd9f16cc8da611b1a2da7de3f7581a924962a79ca8193ad0bb36633141182c047f32c5ab58132c78e1ec036e4da684181c SHA512 e630ea18702c570630deb10347c52e03aecb297bc1f76ce60318eeb8725274b12eb408cbceb69c8035b1ec9ea778f19a035f48070606bc6540b68a4bc5591860
-EBUILD alot-0.8.1.ebuild 1998 BLAKE2B 46501085e4f147292300691f35ebf3b820ab96ce746db455808e5b588887a5a792b3d49b9e6f8c3f7bc793ede8eba09a4f3d92a001005e85adfe05d2ef6c8bfa SHA512 1f89490c9213c1ad24b1b221029ac1f1c68b1cd2382fb8ceba852b86248f77e5cc07928e07e5bf1df5034e53f2e6a5f07fc8a1ac2859cd56f9147933ef415efa
+EBUILD alot-0.9.1.ebuild 1462 BLAKE2B 2154dcd727090a2aec8b669e31dae510db38516bda49dfd48136e00ee6b9170db3409ee9e0a720d16c4edd62b178494ca7f900047777318e7e52ef87246377ec SHA512 5f8898d7ef09e5eecd5edd7f5fea742e1076b81b5096738a38f15ddb7784ce0278434180a4f45106e07444891e8e777a978ecd93c36d89f857d12f401e32327d
 EBUILD alot-0.9.ebuild 1563 BLAKE2B ccf8ac185fecd7e6b19eb96cb28180adfcc76181ec9b5a2805bd614b1de2b151e060e37b055861476f7b1e7b91466564015d39b72ce91e637fa7944b41988b0b SHA512 4d7d1ba39bb93c351228b9d301748a1afa27d7fb7e40618480d101b2de069739bd7833b642ff8bea20ce5f7ebfe0efcb4a8d3cbe865c565c925b236acc48333a
 EBUILD alot-9999.ebuild 1668 BLAKE2B e2895d5701e4f1edfb4d794f4c8167784f0d20932e2e351225b959735b98985694b58e401777333a20fa36c05bcfd081b09ce542c03bc5fe7c0586eebe03858f SHA512 ed94b22b31906e817c6876e56a008fa303856158586c95493165ad2e1455c560b7d2683958dc0d0faeacfadd5130868f15c8f77f9f1aa65526efdd6f3b8df935
 MISC metadata.xml 713 BLAKE2B b17cf5b9a7b0b53c104e28962f5ea1e907b5d2f6cc7bf2b9d3ae3a86f9be165fedf1d89cfe618ae829e42769fd8e83b0774d512701d1b405586a293ed09a69aa SHA512 c0ac54ad568ab6cb8e349468e9b20cb130fe59ac98016aa6dccefc9ebfdf16632c75d4325ae28bbaa5b7b1665486254bee0ac6deb613c9e573ca1070ee6ee853
diff --git a/mail-client/alot/alot-0.8.1.ebuild b/mail-client/alot/alot-0.8.1.ebuild
deleted file mode 100644
index 7594d4ca93e0..000000000000
--- a/mail-client/alot/alot-0.8.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-1.9.0[python,${PYTHON_USEDEP}]
-	>=dev-python/configobj-4.7.0[${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/twisted-18.4[${PYTHON_USEDEP}]
-	net-mail/mailbase
-	>=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}]
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
-	"${FILESDIR}/${PV}-0002-changed-expired-test-keys.patch"
-	)
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	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 ""
-	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/alot-0.9.1.ebuild b/mail-client/alot/alot-0.9.1.ebuild
new file mode 100644
index 000000000000..56188e6ceffa
--- /dev/null
+++ b/mail-client/alot/alot-0.9.1.ebuild
@@ -0,0 +1,64 @@
+# 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,8} )
+
+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"
+
+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[${PYTHON_USEDEP}]
+	net-mail/mailbase
+	net-mail/notmuch[crypt,python,${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+)
+
+distutils_enable_tests unittest
+
+BDEPEND+=" test? ( dev-python/mock[${PYTHON_USEDEP}] ) "
+
+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/files/0.8.1-0001-remove-non-working-test.patch b/mail-client/alot/files/0.8.1-0001-remove-non-working-test.patch
deleted file mode 100644
index 489c54d9bd44..000000000000
--- a/mail-client/alot/files/0.8.1-0001-remove-non-working-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f83bc02ff427508d69ffccb908fd2eaa5a7144c1 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
----
- 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 9b026e6a..727a4d41 100644
---- a/tests/commands/test_global.py
-+++ b/tests/commands/test_global.py
-@@ -166,13 +166,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(u'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.21.0
-
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
deleted file mode 100644
index 97b719abfbac..000000000000
--- a/mail-client/alot/files/0.8.1-0002-changed-expired-test-keys.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-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-----