On Sat, 2021-01-16 at 14:49 +0100, Andrew Ammerlaan wrote: > See my previous email for the rational behind these changes. This > closes https://bugs.gentoo.org/704520 and the PR is here: > https://github.com/gentoo/gentoo/pull/19078 > This eclass is maintained by @mgorny, so I would like to hear his > thoughts on these changes in particular. > Best regards, > Andrew > > From 9645afdcd4efa7702b538e70bcf2fc4fec93c245 Mon Sep 17 00:00:00 2001 > From: Andrew Ammerlaan <[email protected]> > Date: Sat, 16 Jan 2021 14:27:00 +0100 > Subject: [PATCH] eclass/distutils-r1: fix distutils_enable_sphinx with > DISTUTILS_SINGLE_IMPL > > python-single-r1 does not have the python_gen_any_dep function > use the python_gen_cond_dep instead > > Closes: https://bugs.gentoo.org/704520 > > Signed-off-by: Andrew Ammerlaan <[email protected]> > --- > eclass/distutils-r1.eclass | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass > index 5ffc91be479cb..e2c1e1e403a76 100644 > --- a/eclass/distutils-r1.eclass > +++ b/eclass/distutils-r1.eclass > @@ -329,9 +329,15 @@ distutils_enable_sphinx() { > die "${FUNCNAME}: do not pass --no-autodoc if > external plugins are used" > fi > if [[ ${autodoc} ]]; then > - deps="$(python_gen_any_dep " > - dev-python/sphinx[\${PYTHON_USEDEP}] > - ${deps}")" > + if [[ ${DISTUTILS_SINGLE_IMPL} ]]; then > + deps="$(python_gen_cond_dep " > + dev-python/sphinx[\${PYTHON_USEDEP}] > + ${deps}")" > + else > + deps="$(python_gen_any_dep " > + dev-python/sphinx[\${PYTHON_USEDEP}] > + ${deps}")" > + fi > > python_check_deps() { > use doc || return 0 >
Please always send s plaintext email.
