| 1 |
commit: 0950b698411ea7ffbafe868d231b18181da77e28 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Sat Jan 16 13:27:00 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 28 09:20:05 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0950b698 |
| 7 |
|
| 8 |
eclass/distutils-r1: fix distutils_enable_sphinx with DIS.._SINGLE_IMPL |
| 9 |
|
| 10 |
python-single-r1 does not have the python_gen_any_dep function |
| 11 |
use the python_gen_cond_dep instead |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/704520 |
| 14 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
eclass/distutils-r1.eclass | 17 ++++++++++------- |
| 18 |
1 file changed, 10 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 21 |
index 5ffc91be479..c5c954f4925 100644 |
| 22 |
--- a/eclass/distutils-r1.eclass |
| 23 |
+++ b/eclass/distutils-r1.eclass |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2020 Gentoo Authors |
| 26 |
+# Copyright 1999-2021 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
# @ECLASS: distutils-r1.eclass |
| 30 |
@@ -316,22 +316,25 @@ distutils_enable_sphinx() { |
| 31 |
_DISTUTILS_SPHINX_PLUGINS=( "${@}" ) |
| 32 |
|
| 33 |
local deps autodoc=1 d |
| 34 |
+ deps="dev-python/sphinx[\${PYTHON_USEDEP}]" |
| 35 |
for d; do |
| 36 |
if [[ ${d} == --no-autodoc ]]; then |
| 37 |
autodoc= |
| 38 |
else |
| 39 |
deps+=" |
| 40 |
${d}[\${PYTHON_USEDEP}]" |
| 41 |
+ if [[ ! ${autodoc} ]]; then |
| 42 |
+ die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" |
| 43 |
+ fi |
| 44 |
fi |
| 45 |
done |
| 46 |
|
| 47 |
- if [[ ! ${autodoc} && -n ${deps} ]]; then |
| 48 |
- die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" |
| 49 |
- fi |
| 50 |
if [[ ${autodoc} ]]; then |
| 51 |
- deps="$(python_gen_any_dep " |
| 52 |
- dev-python/sphinx[\${PYTHON_USEDEP}] |
| 53 |
- ${deps}")" |
| 54 |
+ if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then |
| 55 |
+ deps="$(python_gen_cond_dep "${deps}")" |
| 56 |
+ else |
| 57 |
+ deps="$(python_gen_any_dep "${deps}")" |
| 58 |
+ fi |
| 59 |
|
| 60 |
python_check_deps() { |
| 61 |
use doc || return 0 |
Archives