commit: 8023d110541af97e459c16fef950be57aada3292
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 00:11:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 00:27:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8023d110
mail-client/alot: use PEP 517; avoid network access during build; sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
mail-client/alot/alot-0.10.ebuild | 14 ++++++++---
mail-client/alot/alot-9999.ebuild | 29 ++++++++++------------
.../alot/files/alot-0.10-no-intersphinx-docs.patch | 23 +++++++++++++++++
3 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/mail-client/alot/alot-0.10.ebuild
b/mail-client/alot/alot-0.10.ebuild
index 9f911d049abb..dd3c5c8130c7 100644
--- a/mail-client/alot/alot-0.10.ebuild
+++ b/mail-client/alot/alot-0.10.ebuild
@@ -3,18 +3,23 @@
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";
-SRC_URI="https://github.com/pazz/alot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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"
-KEYWORDS="~amd64 ~x86"
IUSE="doc"
RDEPEND="
@@ -36,6 +41,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/0.9-0001-remove-non-working-test.patch"
+ "${FILESDIR}/${PN}-0.10-no-intersphinx-docs.patch"
)
distutils_enable_tests unittest
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 = [
