Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2 2/3] distutils-r1.eclass: Use python_has_version in ...enable_sphinx
Date: Thu, 10 Feb 2022 14:44:45
Message-Id: 20220210144406.1957037-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2 1/3] python-utils-r1.eclass: Add a verbose python_has_version() wrapper by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 eclass/distutils-r1.eclass | 4 +---
4 1 file changed, 1 insertion(+), 3 deletions(-)
5
6 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
7 index cdd57149720d..c14297d39757 100644
8 --- a/eclass/distutils-r1.eclass
9 +++ b/eclass/distutils-r1.eclass
10 @@ -424,11 +424,9 @@ distutils_enable_sphinx() {
11 python_check_deps() {
12 use doc || return 0
13
14 - local hasv_args=( -b )
15 - [[ ${EAPI} == 6 ]] && hasv_args=( --host-root )
16 local p
17 for p in dev-python/sphinx "${_DISTUTILS_SPHINX_PLUGINS[@]}"; do
18 - has_version "${hasv_args[@]}" "${p}[${PYTHON_USEDEP}]" ||
19 + python_has_version "${p}[${PYTHON_USEDEP}]" ||
20 return 1
21 done
22 }
23 --
24 2.35.1

Replies