sphinx-5.2.patch fails (9.8.beta2)

[strogdon]

 * Applying sphinx-5.2.patch ...
patching file sage_docbuild/ext/multidocs.py
Hunk #1 FAILED at 146.
1 out of 1 hunk FAILED -- saving rejects to file sage_docbuild/ext/multidocs.py.rej

I haven't investigated further.

[kiwifb]

That patch should not be there. Sphinx 5.2 has been merged upstream.

[kiwifb]

And it looks like I left it. Which is strange considering that I had no issue on the vbraun branch.

[kiwifb]

Was looking at DEPEND rather than PATCHES :P it is not there. You should not see that.

[strogdon]

I don't understand. Which sphinx should be used - sphinx-5.2.3 was pulled in? And from sage_docbuild it appears the patch is to be applied.

    if has_version -r ">=dev-python/sphinx-5.2.0" ; then
        PATCHES+=( "${FILESDIR}/sphinx-5.2.patch" )
    fi

[strogdon]

I see, it appears (vbraun branch) that the above has_version if block should be removed.

[kiwifb]

OK, I don't know why that part was not merged. Looking for other differences before doing anything.

[kiwifb]

This is so weird. Only half the commit is merged. Fixing.

[kiwifb]

Fixed. sync and check please.

[strogdon]

This works.