1 |
On Sat, 2021-01-16 at 14:49 +0100, Andrew Ammerlaan wrote: |
2 |
> See my previous email for the rational behind these changes. This closes |
3 |
> https://bugs.gentoo.org/704520 and the PR is here: |
4 |
> https://github.com/gentoo/gentoo/pull/19078 |
5 |
> |
6 |
> This eclass is maintained by @mgorny, so I would like to hear his |
7 |
> thoughts on these changes in particular. |
8 |
> |
9 |
> Best regards, |
10 |
> Andrew |
11 |
> |
12 |
> |
13 |
> From 9645afdcd4efa7702b538e70bcf2fc4fec93c245 Mon Sep 17 00:00:00 2001 |
14 |
> From: Andrew Ammerlaan <andrewammerlaan@××××××.net> |
15 |
> Date: Sat, 16 Jan 2021 14:27:00 +0100 |
16 |
> Subject: [PATCH] eclass/distutils-r1: fix distutils_enable_sphinx with |
17 |
> DISTUTILS_SINGLE_IMPL |
18 |
> |
19 |
> python-single-r1 does not have the python_gen_any_dep function |
20 |
> use the python_gen_cond_dep instead |
21 |
> |
22 |
> Closes: https://bugs.gentoo.org/704520 |
23 |
> |
24 |
> Signed-off-by: Andrew Ammerlaan <andrewammerlaan@××××××.net> |
25 |
> --- |
26 |
> eclass/distutils-r1.eclass | 12 +++++++++--- |
27 |
> 1 file changed, 9 insertions(+), 3 deletions(-) |
28 |
> |
29 |
> diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
30 |
> index 5ffc91be479cb..e2c1e1e403a76 100644 |
31 |
> --- a/eclass/distutils-r1.eclass |
32 |
> +++ b/eclass/distutils-r1.eclass |
33 |
> @@ -329,9 +329,15 @@ distutils_enable_sphinx() { |
34 |
> die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" |
35 |
> fi |
36 |
> if [[ ${autodoc} ]]; then |
37 |
> - deps="$(python_gen_any_dep " |
38 |
> - dev-python/sphinx[\${PYTHON_USEDEP}] |
39 |
> - ${deps}")" |
40 |
> + if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then |
41 |
> + deps="$(python_gen_cond_dep " |
42 |
> + dev-python/sphinx[\${PYTHON_USEDEP}] |
43 |
> + ${deps}")" |
44 |
> + else |
45 |
> + deps="$(python_gen_any_dep " |
46 |
> + dev-python/sphinx[\${PYTHON_USEDEP}] |
47 |
|
48 |
I see an opportunity to move prepending sphinx before in the common |
49 |
code. |
50 |
|
51 |
> + ${deps}")" |
52 |
> + fi |
53 |
> |
54 |
> |
55 |
> |
56 |
> |
57 |
> python_check_deps() { |
58 |
> use doc || return 0 |
59 |
> |
60 |
|
61 |
-- |
62 |
Best regards, |
63 |
Michał Górny |