On Thu, 2025-09-04 at 14:24 -0400, Eli Schwartz wrote: > It has been removed upstream. Due to the use of a symlink for wrapping > it (as opposed to a shell script like python / python-config) this meant > searching PATH didn't find the broken symlink, and instead found > /usr/bin/2to3-3.12 with a 3.13 impl. > > Check the version of EPYTHON and add it to nonsupp wrappers instead of > making a symlink. > > Reported-by: Paul Zander <[email protected]> > Signed-off-by: Eli Schwartz <[email protected]> > --- > eclass/python-utils-r1.eclass | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass > index 13ed87501200..f454a066a352 100644 > --- a/eclass/python-utils-r1.eclass > +++ b/eclass/python-utils-r1.eclass > @@ -929,8 +929,12 @@ _python_wrapper_setup() { > chmod +x "${workdir}/bin/python-config" \ > "${workdir}/bin/python3-config" || die > > - # Python 2.6+. > - ln -s "${PYTHON/python/2to3-}" "${workdir}"/bin/2to3 || > die > + # Python 2.6+. Deprecated in 3.11, removed in 3.13. > + if ver_test ${EPYTHON#python} -lt 3.13; then > + ln -s "${PYTHON/python/2to3-}" > "${workdir}"/bin/2to3 || die > + else > + nonsupp+=( 2to3 ) > + fi > > # Python 2.7+. > ln -s > "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/${EPYTHON/n/n-}.pc \
LGTM (only eyeballed). -- Best regards, Michał Górny
signature.asc
Description: This is a digitally signed message part
