[gentoo-dev] [PATCH] python-utils-r1.eclass: replace 2to3 with "unsupported" wrapper for 3.13+

[gentoo-dev] [PATCH] python-utils-r1.eclass: replace 2to3 with "unsupported" wrapper for 3.13+

[Eli Schwartz]

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 <negril.nx+gentoo@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
---
 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 \
-- 
2.49.1

Re: [gentoo-dev] [PATCH] python-utils-r1.eclass: replace 2to3 with "unsupported" wrapper for 3.13+

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]

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 <negril.nx+gentoo@gmail.com>
> Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
> ---
>  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

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]