7 files changed, 63 insertions, 64 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7d731fd07cf1..957af187bda2 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -12,7 +12,7 @@ USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PERL_FEATURES PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL CURL_QUIC ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_SLOT LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PERL_FEATURES PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -123,12 +123,13 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (2018-05-23)
 # sys-apps/baselayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr xml python_targets_python3_11 python_single_target_python3_11"
+# dev-lang/python:3.13 and later needs gil enabled
+BOOTSTRAP_USE="unicode pkg-config split-usr xml python_targets_python3_12 python_single_target_python3_12 gil"
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
-PYTHON_TARGETS="python3_11"
-PYTHON_SINGLE_TARGET="python3_11"
+PYTHON_TARGETS="python3_12"
+PYTHON_SINGLE_TARGET="python3_12"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
@@ -164,7 +165,7 @@ POSTGRES_TARGETS="postgres15"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php8-1"
+PHP_TARGETS="php8-2"
 
 # Alfredo Tupone <tupone@gentoo.org> (2024-03-15)
 #
diff --git a/profiles/base/package.use b/profiles/base/package.use
index cf646b56fb24..b4cc281eb2aa 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,13 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-05-30)
+# Only up to python 3.11 supported, bug #929546
+<dev-util/kdevelop-python-24.05.1:5 python_single_target_python3_11
+~www-client/falkon-23.08.5 python_single_target_python3_11
+dev-python/pyside2 python_targets_python3_11
+dev-python/shiboken2 python_targets_python3_11
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2024-03-23)
 # Used by pkgcheck, so let's make it easier for all developers to install it
 >=dev-libs/tree-sitter-bash-0.21.0 python
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index f4cd5a5e7e69..f33c69713d02 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,22 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2024-06-29)
+# Disabling GIL (enabling freethreading) is experimental and prone
+# to break packages.  Should you choose to test it, please do not file
+# Gentoo bugs and report any issues you hit upstream.
+dev-lang/python gil
+
+# Sam James <sam@gentoo.org> (2024-06-03)
+# Poor rendering performance otherwise (bug #931215).
+kde-plasma/kwin caps
+
+# James Le Cuirot <chewi@gentoo.org> (2024-06-02)
+# Requires FFmpeg 7.0, which we don't have yet, so force Chromium fork.
+>=dev-libs/nwjs-0.88.0 ffmpeg-chromium
+>=www-client/vivaldi-6.8.3371.4 ffmpeg-chromium
+>=www-client/vivaldi-snapshot-6.8.3371.4 ffmpeg-chromium
+
 # Ionen Wolkens <ionen@gentoo.org> (2024-04-10)
 # Flipping the zstd USE state is unsafe and can break *tons* of Qt revdeps
 # including many KDE packages and Qt itself without rebuilds due to losing
@@ -174,10 +190,6 @@ net-misc/wget ssl
 # is maintained for experts only.
 sys-libs/libcxx libcxxabi
 
-# Matt Turner <mattst88@gentoo.org> (2019-09-01)
-# <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
-media-sound/lilypond guile2
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-08-17)
 # USE=-cxx us a sure way to break native install as modern gcc
 # requires C++ to bootstrap. But in rare cases it's useful
@@ -218,7 +230,6 @@ sys-firmware/seabios binary
 net-analyzer/snort libtirpc
 net-fs/autofs libtirpc
 net-misc/netkit-bootparamd libtirpc
-sci-astronomy/esomidas libtirpc
 sys-cluster/glusterfs libtirpc
 
 # Maciej Mrozowski <reavertm@gentoo.org> (2016-09-01)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index aaf0abe073b1..b3d6e7f547fd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,9 +6,31 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Michał Górny <mgorny@gentoo.org> (2024-05-18)
-# dev-python/aesara is being removed.
-dev-python/sympy aesara
+# Viorel Munteanu <ceamac@gentoo.org> (2024-07-26)
+# Branch 7.1 needs a new BDEPEND for doc
+>=app-emulation/virtualbox-7.1 doc
+
+# orbea <orbea@riseup.net> (2024-07-19)
+# The dynarec is only supported upstream for amd64, arm, arm64 and x86.
+games-emulation/rmg dynarec
+
+# Maciej Mrozowski <reavertm@gentoo.org> (2024-07-14)
+# Fails with newer ffmpeg, bug #831486
+# Not needed by reverse deps as of 2024-07-14. Re-enable when
+# https://github.com/openscenegraph/OpenSceneGraph/pull/1281 or
+# similar effort is upstreamed
+dev-games/openscenegraph ffmpeg
+
+# Michał Górny <mgorny@gentoo.org> (2024-06-29)
+# JIT is experimental and prone to break packages.  Should you choose
+# to use it, please do not file Gentoo bugs and report any issues you
+# hit upstream.
+dev-lang/python jit
+
+# Sam James <sam@gentoo.org> (2024-06-24)
+# Breaks installed gems in hard-to-debug ways.
+# bug #887223, bug #891367, bug #903891, bug #917139
+dev-lang/ruby static-libs
 
 # Sam James <sam@gentoo.org> (2024-05-09)
 # Experimental option upstream which seems undertested and underdocumented.
@@ -41,23 +63,10 @@ dev-util/kdevelop reviewboard
 # sys-auth/pam_ssh is being last rited, bug #892031.
 sys-auth/pambase pam_ssh
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-03-22)
-# Building with qt6 requires (masked) kde-frameworks:6
-app-admin/calamares qt6
-
 # Viorel Munteanu <ceamac@gentoo.org> (2024-03-19)
 # The live version needs a new BDEPEND for doc
 =app-emulation/virtualbox-9999 doc
 
-# Sam James <sam@gentoo.org> (2024-03-18)
-# Needs masked KF6 for Wayland at least.
-app-crypt/pinentry qt6
-
-# Michał Górny <mgorny@gentoo.org> (2024-03-17)
-# Suffers from unaligned accesses, upstream's working on it.
-# https://github.com/psycopg/psycopg/issues/734
-<=dev-python/psycopg-3.1.18 native-extensions
-
 # Guilherme Amadio <amadio@gentoo.org> (2024-03-09)
 # Requires manually installing dependencies, see bug #791802
 # Please use MYCMAKEARGS instead.
@@ -200,7 +209,7 @@ app-admin/ansible-molecule doc
 # William Hubbs <williamh@gentoo.org> (2023-06-30)
 # multiple repeated issues: Bug: #909394
 # Joonas Niilola <juippis@gentoo.org> (2024-04-22)
-# Can break reverse dependencies (Chromium, Firefox), debugging not always 
+# Can break reverse dependencies (Chromium, Firefox), debugging not always
 # obvious.
 net-libs/nodejs lto
 
@@ -215,7 +224,6 @@ net-misc/curl sslv3
 
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-05-04)
 # No suitable version of dev-libs/protobuf available.
->=dev-java/protobuf-java-3.24.2 system-protoc
 =dev-java/protobuf-java-3.23.0 system-protoc
 
 # Joonas Niilola <juippis@gentoo.org> (2023-06-06)
@@ -273,10 +281,6 @@ sci-libs/vtk debug
 # See also: https://bugs.gentoo.org/891499
 sys-libs/libomp llvm_targets_AMDGPU
 
-# Sam James <sam@gentoo.org> (2023-01-21)
-# Fails to compile: https://github.com/libffi/libffi/issues/760
-<dev-libs/libffi-3.4.4-r4 exec-static-trampoline
-
 # Joonas Niilola <juippis@gentoo.org> (2023-01-08)
 # Doesn't compile currently, bug #853094.
 >=net-dialup/freeradius-3.2.0 oracle
@@ -294,10 +298,6 @@ app-misc/pax-utils seccomp
 # Broken when trying to use sys-libs/binutils-libs header, bug #879067
 >=x11-libs/cairo-1.17.6 debug
 
-# Joonas Niilola <juippis@gentoo.org> (2022-11-25)
-# x11-wm/stumpwm-22.05_p20220818[doc] is totally broken. Bug #882935
-x11-wm/stumpwm doc
-
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2022-11-25)
 # USE=tbb is broken in 7.7.0
 # https://tracker.dev.opencascade.org/view.php?id=33152
@@ -575,13 +575,9 @@ dev-php/fedora-autoloader test
 dev-php/json-schema test
 dev-php/jsonlint test
 dev-php/recaptcha test
-dev-php/symfony-config test
-dev-php/symfony-dependency-injection test
-dev-php/symfony-event-dispatcher test
 dev-php/symfony-filesystem test
 dev-php/symfony-finder test
 dev-php/symfony-process test
-dev-php/symfony-yaml test
 dev-php/theseer-Autoload test
 dev-php/twig test
 
@@ -649,10 +645,6 @@ dev-python/autobahn xbr
 # Dependency pam_wrapper missing for tests, and RESTRICT=test is already set
 net-fs/samba test
 
-# Mike Gilbert <floppym@gentoo.org> (2020-04-23)
-# Tests are very sensitive to the host environment.
-dev-build/meson test
-
 # Alfredo Tupone <tupone@gentoo.org> (2020-04-04)
 # Ada support is not yet ready for sys-devel/gcc
 sys-devel/gcc ada
@@ -807,7 +799,6 @@ app-emulation/libvirt openvz
 # need or even advantage to set custom compiler flags at all.
 # Example: bug #619628
 sys-boot/gnu-efi custom-cflags
-sys-boot/refind custom-cflags
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-29)
 # Does not build
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index fd8790053fa9..02af998f914f 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,9 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Ionen Wolkens <ionen@gentoo.org> (2024-05-07)
-# ffmpeg[soc] is not stable yet
-media-video/mpv soc
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
+# Building with qt6 requires (masked) kde-frameworks:6
+app-admin/calamares qt6
+app-crypt/pinentry qt6
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-14)
 # Qt6 dependencies are not yet available in stable. Moreover,
@@ -18,10 +19,6 @@ media-gfx/freecad qt6
 # Bug #910229, #920713
 >=mail-client/thunderbird-115.0 system-icu
 
-# Sam James <sam@gentoo.org> (2023-10-23)
-# Requires llvm-17.
->=www-client/chromium-118 libcxx lto pgo
-
 # Michał Górny <mgorny@gentoo.org> (2023-06-11)
 # xfce-base/libxfce4windowing is not ready to go stable (4.19 branch).
 xfce-extra/xfce4-pulseaudio-plugin libxfce4windowing
@@ -177,10 +174,6 @@ sys-auth/pambase sssd
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
 
-# Matthias Maier <tamiko@gentoo.org> (2018-03-18)
-# dev-libs/capstone hasn't been stabilized yet
-app-emulation/qemu capstone
-
 # Kent Fredric <kentnl@gentoo.org> (2018-03-03)
 # Not an officially supported configuration, as it causes unpredictable
 # fragility and/or dependency headaches due to the very narrow interop window
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 392c76f40109..3db1ca5d5430 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -13,10 +13,6 @@ perl_features_debug
 # Telepathy is dead and packages masked for removal.
 telepathy
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2023-12-15)
-# KF6 is not in ::gentoo yet. Move to stable.use.mask on KF6 intro.
-kf6compat
-
 # Hans de Graaff <graaff@gentoo.org> (2023-08-19)
 # Ruby 3.0 is not compatible with OpenSSL 3. Please upgrade to a newer
 # Ruby version.
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index ee3bba441b93..de017f0c28aa 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-06-13)
+# KF6 is not in stable yet.
+kf6compat
+
 # Michał Górny <mgorny@gentoo.org> (2024-05-08)
 # Python implementations without stable keywords.
 python_targets_python3_13
@@ -11,10 +15,6 @@ 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
-
 # Hans de Graaff <graaff@gentoo.org> (2023-12-25)
 # Currently in testing and not ready to go stable yet.
 ruby_targets_ruby33