[gentoo-dev] [PATCH 00/10] Add pypy3_11 Python target

[gentoo-dev] [PATCH 00/10] Add pypy3_11 Python target

[Michał Górny]

Hi,

Long story short, upgrades for PyPy are a mess in Gentoo right now.
To fix that mess, I'd like to propose slotting PYTHON_TARGETS for PyPy
much like we slot them for CPython.

This roughly means:

- "pypy3" target will only match PyPy3.10 going forward, and be removed
  once we fully migrate to PyPy3.11

- a new "pypy3_11" target will be added for PyPy3.11, and every new
  PyPy slot will receive its own target

- shebangs for Python scripts will now refer to "pypy3.x" rather than
  "pypy3", so "pypy3" executable will eventually become a convenience
  wrapper much like "python" is now

On the plus side, users will be able to take the safer upgrade path,
by rebuilding everything with PyPy3.11 support without losing PyPy3.10
support immediately (and ending up with messed up depgraph if something
fails in the middle).

On the minus side, we'll have to test things on PyPy3.11 explicitly,
so more work.  On the other hand, it's not so bad — at least we'll keep
a track of problems with PyPy3.11 rather than guessing if it's good
enough to switch already, and then having lots of sudden breakage
without the old version to compare to.

-- 
Best regards,
Michał Górny


Michał Górny (10):
  profiles: Add pypy3_11 target
  python-utils-r1.eclass: Add pypy3_11 target
  app-portage/gpyutils: Add pypy3_11 target
  dev-lang/pypy3-exe: Readd KEYWORDS
  dev-lang/pypy3-exe-bin: Readd KEYWORDS
  dev-lang/pypy: Readd KEYWORDS
  dev-python/pypy3: Remove pypy3.11 version, it's a separate target
  dev-lang/pypy: Do not default-enable USE=symlink in :3.11
  python-any-r1.eclass: Fix := stripping again (now we have :3.11=)
  python-r1.eclass: Fix PYTHON_PKG_DEP stripping (we have :3.11= now)

 .../gpyutils/files/implementations.txt        |  1 +
 dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild      |  3 ++-
 .../pypy3-exe-bin-3.11.7.3.18.ebuild          |  1 +
 .../pypy3-exe/pypy3-exe-3.11.7.3.18.ebuild    |  1 +
 dev-python/pypy3/pypy3-7.3.18-r100.ebuild     | 18 --------------
 eclass/python-any-r1.eclass                   |  4 ++--
 eclass/python-r1.eclass                       |  2 +-
 eclass/python-utils-r1.eclass                 | 24 +++++++++----------
 eclass/tests/python-utils-r1.sh               | 19 +++++++++++++--
 profiles/base/package.use.force               |  1 +
 profiles/base/use.stable.mask                 |  2 ++
 profiles/desc/python_single_target.desc       |  3 ++-
 profiles/desc/python_targets.desc             |  3 ++-
 13 files changed, 44 insertions(+), 38 deletions(-)
 delete mode 100644 dev-python/pypy3/pypy3-7.3.18-r100.ebuild

[gentoo-dev] [PATCH 01/10] profiles: Add pypy3_11 target

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 profiles/base/package.use.force         | 1 +
 profiles/base/use.stable.mask           | 2 ++
 profiles/desc/python_single_target.desc | 3 ++-
 profiles/desc/python_targets.desc       | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 03ebc138e7cf..e6eb75e716ea 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -307,6 +307,7 @@ dev-lang/python-exec python_targets_python3_12
 dev-lang/python-exec python_targets_python3_13
 dev-lang/python-exec python_targets_python3_13t
 dev-lang/python-exec python_targets_pypy3
+dev-lang/python-exec python_targets_pypy3_11
 
 # Zac Medico <zmedico@gentoo.org> (2010-10-20)
 # Force ipc USE flag since it should remain enabled unless
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index f2bbf0a0a135..f38e5e82c741 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -15,6 +15,8 @@ python_targets_python3_13t
 python_single_target_python3_13t
 python_targets_pypy3
 python_single_target_pypy3
+python_targets_pypy3_11
+python_single_target_pypy3_11
 
 # Michael Orlitzky <mjo@gentoo.org> (2023-12-05)
 # New unstable PHP slot.
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index d168b301a8d8..0464f2554d2e 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors.
+# Copyright 1999-2025 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
@@ -9,3 +9,4 @@ python3_12 - Build for Python 3.12 only
 python3_13 - Build for Python 3.13 only
 python3_13t - Build for Python 3.13 freethreading only
 pypy3 - Build for PyPy3 only
+pypy3_11 - Build for PyPy3.11 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index 298b54067be7..aae9d0ff1acd 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors.
+# Copyright 1999-2025 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
@@ -9,3 +9,4 @@ python3_12 - Build with Python 3.12
 python3_13 - Build with Python 3.13
 python3_13t - Build with Python 3.13 freethreading
 pypy3 - Build with PyPy3
+pypy3_11 - Build with PyPy3.11

[gentoo-dev] [PATCH 02/10] python-utils-r1.eclass: Add pypy3_11 target

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/python-utils-r1.eclass   | 24 ++++++++++++------------
 eclass/tests/python-utils-r1.sh | 19 +++++++++++++++++--
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 0cb132b72e3a..affb8e55a50d 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-utils-r1.eclass
@@ -39,7 +39,7 @@ inherit multiprocessing toolchain-funcs
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
 _PYTHON_ALL_IMPLS=(
-	pypy3
+	pypy3 pypy3_11
 	python3_13t
 	python3_{10..13}
 )
@@ -137,7 +137,7 @@ _python_set_impls() {
 			# please keep them in sync with _PYTHON_ALL_IMPLS
 			# and _PYTHON_HISTORICAL_IMPLS
 			case ${i} in
-				pypy3|python3_9|python3_1[0-3]|python3_13t)
+				pypy3|pypy3_11|python3_9|python3_1[0-3]|python3_13t)
 					;;
 				jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9])
 					obsolete+=( "${i}" )
@@ -233,7 +233,8 @@ _python_impl_matches() {
 					return 0
 				;;
 			3.8|3.9|3.1[1-3])
-				[[ ${impl%t} == python${pattern/./_} ]] && return 0
+				[[ ${impl%t} == python${pattern/./_} || ${impl} == pypy${pattern/./_} ]] &&
+					return 0
 				;;
 			*)
 				# unify value style to allow lax matching
@@ -304,14 +305,10 @@ _python_export() {
 	local impl var
 
 	case "${1}" in
-		python*|jython*)
+		python*|jython*|pypy|pypy3*)
 			impl=${1/_/.}
 			shift
 			;;
-		pypy|pypy3)
-			impl=${1}
-			shift
-			;;
 		*)
 			impl=${EPYTHON}
 			if [[ -z ${impl} ]]; then
@@ -453,7 +450,10 @@ _python_export() {
 						PYTHON_PKG_DEP="dev-lang/python:${impl#python}${PYTHON_REQ_USE:+[${PYTHON_REQ_USE}]}"
 						;;
 					pypy3)
-						PYTHON_PKG_DEP=">=dev-lang/pypy-3.10:=[symlink${PYTHON_REQ_USE:+,${PYTHON_REQ_USE}}]"
+						PYTHON_PKG_DEP="dev-lang/pypy:3.10=[symlink${PYTHON_REQ_USE:+,${PYTHON_REQ_USE}}]"
+						;;
+					pypy3.*)
+						PYTHON_PKG_DEP="dev-lang/pypy:${impl#pypy}=${PYTHON_REQ_USE:+[${PYTHON_REQ_USE}]}"
 						;;
 					*)
 						die "Invalid implementation: ${impl}"
@@ -641,7 +641,7 @@ python_optimize() {
 				"${PYTHON}" -O -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}"
 				"${PYTHON}" -OO -m compileall -j "${jobs}" -q -f -d "${instpath}" "${d}"
 				;;
-			python*|pypy3)
+			python*|pypy3*)
 				# Python 3.9+
 				"${PYTHON}" -m compileall -j "${jobs}" -o 0 -o 1 -o 2 --hardlink-dupes -q -f -d "${instpath}" "${d}"
 				;;
@@ -1080,7 +1080,7 @@ python_fix_shebang() {
 					python|python3)
 						match=1
 						;;
-					python2|python[23].[0-9]|python3.[1-9][0-9]|pypy|pypy3|jython[23].[0-9])
+					python2|python[23].[0-9]|python3.[1-9][0-9]|pypy|pypy3|pypy3.[1-9][0-9]|jython[23].[0-9])
 						# Explicit mismatch.
 						match=1
 						error=1
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 81c3c6f78158..b1af3636e519 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -127,11 +127,26 @@ if [[ -x /usr/bin/pypy3 ]]; then
 	test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3.*/site-packages"
 	test_var PYTHON_INCLUDEDIR pypy3 "/usr/include/pypy3.*"
 fi
-test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink\]'
-PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:=\[symlink,sqlite\]'
+test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:3.10=\[symlink\]'
+PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP pypy3 '*dev-lang/pypy*:3.10=\[symlink,sqlite\]'
 test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
 eoutdent
 
+for minor in 11; do
+	ebegin "Testing pypy3.${minor}"
+	eindent
+	test_var EPYTHON "pypy3.${minor}" "pypy3.${minor}"
+	test_var PYTHON "pypy3.${minor}" "/usr/bin/pypy3.${minor}"
+	if [[ -x /usr/bin/pypy3.${minor} ]]; then
+		test_var PYTHON_SITEDIR "pypy3.${minor}" "/usr/lib*/pypy3.${minor}/site-packages"
+		test_var PYTHON_INCLUDEDIR "pypy3.${minor}" "/usr/include/pypy3.${minor}"
+	fi
+	test_var PYTHON_PKG_DEP "pypy3.${minor}" '*dev-lang/pypy*:3.11='
+	PYTHON_REQ_USE=sqlite test_var PYTHON_PKG_DEP "pypy3.${minor}" '*dev-lang/pypy*:3.11=\[sqlite\]'
+	test_var PYTHON_SCRIPTDIR "pypy3.${minor}" "/usr/lib/python-exec/pypy3.${minor}"
+	eoutdent
+done
+
 for EPREFIX in '' /foo; do
 	einfo "Testing python_fix_shebang with EPREFIX=${EPREFIX@Q}"
 	eindent

[gentoo-dev] [PATCH 03/10] app-portage/gpyutils: Add pypy3_11 target

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 app-portage/gpyutils/files/implementations.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-portage/gpyutils/files/implementations.txt b/app-portage/gpyutils/files/implementations.txt
index 95b321ec9437..574c3fcc256b 100644
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@@ -31,6 +31,7 @@ pypy2_0	2.7-pypy-2.0	dead	p2.0
 
 pypy		dead	pypy
 pypy3		experimental	pypy3
+pypy3_11		experimental	pypy3_11
 
 jython2_5	2.5-jython	dead	j2.5
 jython2_7	2.7-jython	dead	j2.7

[gentoo-dev] [PATCH 04/10] dev-lang/pypy3-exe: Readd KEYWORDS

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.18.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.18.ebuild b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.18.ebuild
index 463370032f36..a217479b3123 100644
--- a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.18.ebuild
+++ b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.18.ebuild
@@ -26,6 +26,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND="

[gentoo-dev] [PATCH 05/10] dev-lang/pypy3-exe-bin: Readd KEYWORDS

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.18.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.18.ebuild b/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.18.ebuild
index 2a484ef6b602..15481f9c5c4e 100644
--- a/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.18.ebuild
+++ b/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.18.ebuild
@@ -57,6 +57,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 # sys-devel/gcc for libgcc_s.so
 RDEPEND="

[gentoo-dev] [PATCH 06/10] dev-lang/pypy: Readd KEYWORDS

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild b/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild
index 9ab184569112..214aeb10d09f 100644
--- a/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild
@@ -28,6 +28,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="${PYVER}/pypy311-pp73-400"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+ensurepip gdbm +jit ncurses sqlite +symlink +test-install tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}

[gentoo-dev] [PATCH 07/10] dev-python/pypy3: Remove pypy3.11 version, it's a separate target

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/pypy3/pypy3-7.3.18-r100.ebuild | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 dev-python/pypy3/pypy3-7.3.18-r100.ebuild

diff --git a/dev-python/pypy3/pypy3-7.3.18-r100.ebuild b/dev-python/pypy3/pypy3-7.3.18-r100.ebuild
deleted file mode 100644
index 8af5e436abf5..000000000000
--- a/dev-python/pypy3/pypy3-7.3.18-r100.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A backwards compatibility package for dev-lang/pypy:3.11"
-HOMEPAGE="
-	https://pypy.org/
-	https://foss.heptapod.net/pypy/pypy/
-"
-
-LICENSE="metapackage"
-SLOT="0/pypy311-pp73-400"
-IUSE="+gdbm ncurses sqlite +test-install tk"
-
-RDEPEND="
-	=dev-lang/pypy-3.11.${PV}*:3.11/${SLOT#*/}[gdbm?,ncurses?,sqlite?,symlink,test-install?,tk?]
-"

[gentoo-dev] [PATCH 08/10] dev-lang/pypy: Do not default-enable USE=symlink in :3.11

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild b/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild
index 214aeb10d09f..e2dafe4ccb16 100644
--- a/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.18_p1.ebuild
@@ -29,7 +29,7 @@ LICENSE="MIT"
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="${PYVER}/pypy311-pp73-400"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+ensurepip gdbm +jit ncurses sqlite +symlink +test-install tk"
+IUSE="+ensurepip gdbm +jit ncurses sqlite symlink +test-install tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}
 RESTRICT="test"

[gentoo-dev] [PATCH 09/10] python-any-r1.eclass: Fix := stripping again (now we have :3.11=)

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/python-any-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index adc7b1bfec47..835780aab802 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -175,7 +175,7 @@ _python_any_set_globals() {
 		_python_export "${i}" PYTHON_PKG_DEP
 
 		# note: need to strip '=' slot operator for || deps
-		deps="${PYTHON_PKG_DEP/:=} ${deps}"
+		deps="${PYTHON_PKG_DEP/=} ${deps}"
 	done
 	deps="|| ( ${deps})"
 
@@ -258,7 +258,7 @@ python_gen_any_dep() {
 		local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
 		i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}}
 		# note: need to strip '=' slot operator for || deps
-		out="( ${PYTHON_PKG_DEP/:=} ${i_depstr} ) ${out}"
+		out="( ${PYTHON_PKG_DEP/=} ${i_depstr} ) ${out}"
 	done
 	echo "|| ( ${out})"
 }

[gentoo-dev] [PATCH 10/10] python-r1.eclass: Fix PYTHON_PKG_DEP stripping (we have :3.11= now)

[Michał Górny]

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/python-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 9b03a269e88b..e51218e26ac5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -518,7 +518,7 @@ python_gen_any_dep() {
 			local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
 			i_depstr=${i_depstr//\$\{PYTHON_SINGLE_USEDEP\}/${PYTHON_SINGLE_USEDEP}}
 			# note: need to strip '=' slot operator for || deps
-			out="( ${PYTHON_PKG_DEP/:=} ${i_depstr} ) ${out}"
+			out="( ${PYTHON_PKG_DEP/=} ${i_depstr} ) ${out}"
 		fi
 	done
 	echo "|| ( ${out})"