Merge updates from master

13 files changed, 51 insertions, 7 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index bf9a7d7c9591..8789d3aaa07c 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Requires sys-devel/{clang,llvm}:16.
+dev-lang/python jit
+
 # matoro <matoro_gentoo@matoro.tk> (2024-02-29)
 # sys-apps/xdg-desktop-portal is not keyworded here, #925731
 x11-base/xwayland libei
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 8049967550c6..05b4d15bec03 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Python 3.13 is due for rekeywording due to a new dep.
+-python_targets_python3_13
+-python_single_target_python3_13
+
 # Unmask the flag which corresponds to ARCH.
 -amd64
 
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index c7159b879206..c37a4c878745 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Need to copy this here while the flag is use.masked.
+python_targets_python3_13
+python_single_target_python3_13
+
 # Paul Zander <negril.nx+gentoo@gmail.com> (2023-11-17)
 # ROCm/HIP is not suitable for stabilization.
 hip
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index d1cd9910ec4a..529ebbacc4e4 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Python 3.13 is due for rekeywording due to a new dep.
+python_targets_python3_13
+python_single_target_python3_13
+
 # Paul Zander <negril.nx+gentoo@gmail.com> (2024-04-14)
 # media-libs/quirc only keyworded on amd64, x86
 quirc
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 9728d61161dd..2d77ba533f9f 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Requires sys-devel/{clang,llvm}:16.
+dev-lang/python jit
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-01-23)
 # Needs dev-qt/qtquick3d:6 which itself needs media-libs/assimp that
 # is not keyworded here and currently fails tests (bug #919896).
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 2d99d65bfd3e..9ba2bb84b47d 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Requires sys-devel/{clang,llvm}:16.
+dev-lang/python jit
+
 # Robin H. Johnson <robbat2@gentoo.org) (2024-03-13)
 # sys-cluster/corosync not yet keyworded, niche use case for mdadm
 sys-fs/mdadm corosync
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 9be2feccdf89..5dcd046b960f 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Requires sys-devel/{clang,llvm}:16.
+dev-lang/python jit
+
 # James Le Cuirot (2023-12-12)
 # USE=bpf depends on sys-devel/clang which is not keyworded on m68k
 media-libs/libv4l bpf
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index d12ad2b0168e..a9717ab8aad9 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Requires sys-devel/{clang,llvm}:16.
+dev-lang/python jit
+
 # matoro <matoro_gentoo@matoro.tk> (2024-05-01)
 # Sanitizers supported on both 32-bit and 64-bit mips, #779742
 sys-libs/compiler-rt-sanitizers -asan -profile -ubsan -safestack -scudo -xray
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 144e11dcf539..3f1e43fa394d 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Requires sys-devel/{clang,llvm}:16.
+dev-lang/python jit
+
 # NRK <nrk@disroot.org> (2024-04-08)
 # media-libs/libraw is not keyworded
 media-libs/imlib2 raw
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 65e6df80c21a..f4cd5a5e7e69 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -241,6 +241,7 @@ app-shells/bash:0 readline
 dev-lang/python-exec python_targets_python3_10
 dev-lang/python-exec python_targets_python3_11
 dev-lang/python-exec python_targets_python3_12
+dev-lang/python-exec python_targets_python3_13
 dev-lang/python-exec python_targets_pypy3
 
 # Zac Medico <zmedico@gentoo.org> (2010-10-20)
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 59d9eb195daf..0a161be42cc7 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Michał Górny <mgorny@gentoo.org> (2024-05-08)
+# Python implementations without stable keywords.
+python_targets_python3_13
+python_single_target_python3_13
+python_targets_pypy3
+python_single_target_pypy3
+
 # Michał Górny <mgorny@gentoo.org> (2024-04-04)
 # LLVM slots without stablekeywords.
 llvm_slot_18
@@ -16,8 +23,3 @@ ruby_targets_ruby33
 # Michael Orlitzky <mjo@gentoo.org> (2023-12-05)
 # New unstable PHP slot.
 php_targets_php8-3
-
-# Zac Medico <zmedico@gentoo.org> (2016-09-01)
-# Needs dev-python/pypy* stable
-python_targets_pypy3
-python_single_target_pypy3
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index 8a9f6479f1b9..427e206dd196 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors.
+# Copyright 1999-2024 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags.
@@ -6,4 +6,5 @@
 python3_10 - Build for Python 3.10 only
 python3_11 - Build for Python 3.11 only
 python3_12 - Build for Python 3.12 only
+python3_13 - Build for Python 3.13 only
 pypy3 - Build for PyPy3 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index 7bde52333b5d..b48cc57e99fb 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors.
+# Copyright 1999-2024 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags.
@@ -6,4 +6,5 @@
 python3_10 - Build with Python 3.10
 python3_11 - Build with Python 3.11
 python3_12 - Build with Python 3.12
+python3_13 - Build with Python 3.13
 pypy3 - Build with PyPy3