4 files changed, 111 insertions, 17 deletions
diff --git a/mail-client/alot/Manifest b/mail-client/alot/Manifest
index 61958eaecf81..6c464a02608d 100644
--- a/mail-client/alot/Manifest
+++ b/mail-client/alot/Manifest
@@ -1,6 +1,9 @@
 AUX 0.9-0001-remove-non-working-test.patch 1017 BLAKE2B bfcecf9261084694a30191ea6793405328d538d49eed3b9721102b5314846acc4329f4c9d46b375c9acbc53bc0d09b9222f85a2f5292ec30983c7efb9f56b5fb SHA512 b30d20495728c7205ad1fb663d1aa61832488f83ef43a6af530500aadf6198335fbc45154952858d4c11364f1349afac40539a721342bbdcb8cf5c40e9c88d0b
 AUX 9999-0001-remove-non-working-test.patch 1017 BLAKE2B 4a12441ff229af7fa0cb58e0e68775bb418afcd621487b46eaa1ce2411eaaa388df26ac04db8dc7c5b5c7342a75f1df70ee8241e60e1da5c28a89a741455250a SHA512 1aa122c884ce7899ad0fe5a99c5acb298fbb20b1ad5df8d264bb133c8f8c439c26cdb0694aa4d61b1b37de72bbe7ef2951d09a11283dbdeeaad103015e48e354
+AUX alot-0.10-no-intersphinx-docs.patch 930 BLAKE2B 6515bfc063cbae84bcfdaf72ec6e3af1ae5946ea309965770328ddbe3e7c8b238f327f4b976056ce7c63d5c03090e9f0fb64b3647a7aa5ffd2b09a53ef64d4b8 SHA512 232c15c36efbde92e572028b6cfb7679dfb6bf5c30065db6ffbb32d36b54e889cffa0ba368ee9f560d8a2ba8b42c47ef868c924516115625e1678d5da8aa359f
+DIST alot-0.10.tar.gz 228451 BLAKE2B a90672817d30a9dc5a50814b123f107f94cc63cb9669578c3ffa9f6282dc0388c91e1a7f14e62c73159573ff97660a57b71b5ecac6549e050758bcef60c54e87 SHA512 b07c77f3a21c9670fb14a760d036ce0e14678dd6ae75585cc929f97db5126a7dbb7f411244d317fea2913692afca6ff9f439f9dbbf047acffb8fcea2ebef7056
 DIST alot-0.9.1.tar.gz 228645 BLAKE2B 7a44542513bc6d90df43cb21daf2ba103cbbae4dd81b44eaf935d764ba11d6c5640774e72728725eca83a777dcf3583bebaa57c9061191499f74ed89d4c11b4f SHA512 ac65c742d5bfb4827482c881ec2eb95b9215e9a5c49d7001421d62ffb1f38c7792dbbf94c0f16578da70b5ce15ba7a28cea0c1bbd34080f8132c80f4a0a2199b
+EBUILD alot-0.10.ebuild 1607 BLAKE2B 7842266bf26d4454edac10350cfc7fc93e19a1dd701f5532f7c0d0a16622270a580464c09805c2e40e5843f33dbf1ff83461dd8484e7364e1b35df39a191fba9 SHA512 4e0a3a7fffde2f24a0242d773ecf63f3b20845a6e21df2cc19d199f67ac5cbdbd44b4732b289b56a31382bc5c77494c07ab67129b8fa5cc2f9927b51e8ef4e34
 EBUILD alot-0.9.1.ebuild 1451 BLAKE2B fef418ed84105d42e9c584d519bf5e51df206e45d8395a55c5abea4ed33fa51f45076b3ce36c177cde8621671039dd6e53c6e50de7df132dbde60b2473c407a1 SHA512 e784edc5d94d2befa333de761f420baf8e41d8dbd4af8cab575af227dc4672134330c2112346e2c82c7fe80deb0c3afe2eb59a8cd2d22abcece2ae0cab32b4a3
-EBUILD alot-9999.ebuild 1591 BLAKE2B 99ef739a0b734cdd1c8223a194e76cfc16eeedf3abf0b2e0344bf8f1ab240eeb362f1f90632412209a3c3d0718035f1cfe082b15a38338be1f51b2a347fee003 SHA512 ce068712d5430d99b7b68188b62b3e6cb7b7516da60573a124e0b13902e530c87d575ed5ce6375c94a39226f1731d5421b46d265891301c4160a4e6a0615aed7
+EBUILD alot-9999.ebuild 1607 BLAKE2B 7842266bf26d4454edac10350cfc7fc93e19a1dd701f5532f7c0d0a16622270a580464c09805c2e40e5843f33dbf1ff83461dd8484e7364e1b35df39a191fba9 SHA512 4e0a3a7fffde2f24a0242d773ecf63f3b20845a6e21df2cc19d199f67ac5cbdbd44b4732b289b56a31382bc5c77494c07ab67129b8fa5cc2f9927b51e8ef4e34
 MISC metadata.xml 744 BLAKE2B 407cd2d09e4e86898b6a946cd9d8c74b85cbb68b337100826c427f04d759a7d80081f64161a5154310cf0649b36d17ccc339d3ef5f4b3f892d218aa382e359cd SHA512 adc232dbb7a363ca1d53958dfa9dbf106c251aee4755dde3f9d86be69201bcf98c8dfc88808d2e1bbffd873467db2fc2c81fa074b7aaa4df56ff27af684e1a79
diff --git a/mail-client/alot/alot-0.10.ebuild b/mail-client/alot/alot-0.10.ebuild
new file mode 100644
index 000000000000..dd3c5c8130c7
--- /dev/null
+++ b/mail-client/alot/alot-0.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
+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
+
+LICENSE="GPL-3"
+SLOT="0"
+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}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+	"${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
+)
+
+distutils_enable_tests unittest
+
+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 87b22470c579..dd3c5c8130c7 100644
--- a/mail-client/alot/alot-9999.ebuild
+++ b/mail-client/alot/alot-9999.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1
 
+DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
+HOMEPAGE="https://github.com/pazz/alot"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/pazz/alot/"
 	inherit git-r3
@@ -16,13 +18,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="Experimental terminal UI for net-mail/notmuch written in Python"
-HOMEPAGE="https://github.com/pazz/alot"
-
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 RDEPEND="
 	app-crypt/gpgme[python,${PYTHON_USEDEP}]
@@ -30,24 +28,23 @@ RDEPEND="
 	dev-python/python-magic[${PYTHON_USEDEP}]
 	dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/urwidtrees[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.4[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
 	net-mail/mailbase
-	net-mail/notmuch[crypt,python]
+	net-mail/notmuch[crypt,python,${PYTHON_USEDEP}]
 "
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+BDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 
 PATCHES=(
-	"${FILESDIR}/${PV}-0001-remove-non-working-test.patch"
+	"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+	"${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
 )
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
 
 python_compile_all() {
 	emake -C docs man
diff --git a/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch b/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch
new file mode 100644
index 000000000000..6cda5071e226
--- /dev/null
+++ b/mail-client/alot/files/alot-0.10-no-intersphinx-docs.patch
@@ -0,0 +1,23 @@
+Needs network access.
+--- a/docs/source/api/conf.py
++++ b/docs/source/api/conf.py
+@@ -56,7 +56,7 @@ from alot import __version__, __author__
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -16,7 +16,7 @@ needs_sphinx = '1.3'  # for autodoc_mock_imports setting below
+ 
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.autodoc']
+ 
+ # autodoc tweaks
+ autodoc_mock_imports = [