Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 20 Jan 2022 14:38:24
Message-Id: 1642689497.f6a17acb8b7ce70a24991a7ac75b43bbd0383fc8.mgorny@gentoo
1 commit: f6a17acb8b7ce70a24991a7ac75b43bbd0383fc8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 20 14:31:37 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 20 14:38:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a17acb
7
8 python-utils-r1.eclass: Run sphinx-build via EPYTHON
9
10 Run sphinx-build via EPYTHON to ensure that the correct Python
11 executable is being used. Otherwise, sphinx-build runs via
12 /usr/bin/python* and does not respect the virtualenv boundaries.
13
14 Closes: https://bugs.gentoo.org/831565
15 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
16
17 eclass/python-utils-r1.eclass | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20 diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
21 index aece257e8cba..85de8cb92182 100644
22 --- a/eclass/python-utils-r1.eclass
23 +++ b/eclass/python-utils-r1.eclass
24 @@ -1250,7 +1250,8 @@ build_sphinx() {
25 sed -i -e 's:^intersphinx_mapping:disabled_&:' \
26 "${dir}"/conf.py || die
27 # not all packages include the Makefile in pypi tarball
28 - sphinx-build -b html -d "${dir}"/_build/doctrees "${dir}" \
29 + "${EPYTHON}" -m sphinx.cmd.build \
30 + -b html -d "${dir}"/_build/doctrees "${dir}" \
31 "${dir}"/_build/html || die
32
33 HTML_DOCS+=( "${dir}/_build/html/." )