20 files changed, 57 insertions, 155 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 436d0457329c..ea7478a98283 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 62aff0c6a407..72e1245bb5ac 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -29,6 +29,7 @@ media-libs/libplacebo -libdovi
 # Only works on amd64 (and x32).
 dev-debug/gdb -cet
 sys-devel/binutils -cet
+sys-devel/clang-common -cet
 sys-devel/gcc -cet
 sys-libs/binutils-libs -cet
 sys-libs/glibc -cet
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 9448d50c9303..ee3f8e2db1a2 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -69,8 +69,8 @@ app-editors/ghostwriter
 app-editors/retext
 app-misc/anki
 app-office/merkuro
-app-office/kmymoney:5
-app-office/skrooge:5
+app-office/kmymoney
+app-office/skrooge
 app-office/texmaker
 app-text/bibletime
 app-text/calibre
@@ -78,17 +78,15 @@ app-text/cb2bib
 app-text/kchmviewer
 app-text/kjots
 app-text/sigil
-dev-lang/typescript
 dev-python/spyder
 dev-python/spyder-terminal
 dev-python/spyder-unittest
 dev-python/spyder-line-profiler
 dev-python/spyder-vim
 dev-python/spyder-notebook
-dev-util/kdevelop:5
-dev-util/kdevelop-php:5
-dev-util/kdevelop-python:5
-gnome-extra/gnome-shell-extension-pop-shell
+dev-util/kdevelop
+dev-util/kdevelop-php
+dev-util/kdevelop-python
 kde-apps/akonadi-calendar
 kde-apps/akonadi-import-wizard
 kde-apps/akonadiconsole
@@ -129,7 +127,7 @@ kde-apps/plasma-telepathy-meta:5
 kde-misc/kio-gdrive
 kde-misc/tellico
 kde-misc/zanshin
-media-gfx/digikam:5
+media-gfx/digikam
 media-gfx/luminance-hdr
 media-sound/frescobaldi
 media-sound/teamspeak-client:3
@@ -141,17 +139,20 @@ net-analyzer/nmapsi
 >=net-im/tokodon-24.02.0
 net-im/whatsie
 net-libs/signon-ui
-net-misc/nextcloud-client
-net-p2p/ktorrent:5
 sci-geosciences/qmapshack
-sci-mathematics/rkward:5
-sci-visualization/labplot:5
+sci-mathematics/rkward
+sci-visualization/labplot
 sys-apps/polychromatic
 www-client/falkon
 www-client/otter
 www-client/qutebrowser
 media-video/jellyfin-media-player
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-02-09)
+# Requires net-libs/nodejs
+dev-lang/typescript
+gnome-extra/gnome-shell-extension-pop-shell
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2020-09-20)
 # Binary-only with no x32 support
 app-office/libreoffice-bin
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index efe73012e936..b6cc1e0d856f 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-03-24)
+# Requires unkeyworded dev-qt/qtwebengine
+net-p2p/ktorrent rss
+
 # Maciej Barć <xgqt@gentoo.org> (2023-09-17)
 # Tests require net-libs/nodejs which is unavailable on amd64/x32.
 dev-lang/dafny test
@@ -42,8 +46,8 @@ dev-python/cloudscraper test
 games-util/lgogdownloader gui
 kde-apps/kde-apps-meta pim
 kde-apps/kdenetwork-meta bittorrent
-kde-apps/kleopatra:5 pim
-kde-apps/umbrello:5 php
+kde-apps/kleopatra pim
+kde-apps/umbrello php
 kde-misc/kio-gdrive share
 kde-plasma/plasma-nm openconnect
 net-irc/quassel urlpreview
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 18965e249fcb..17e581e17f2c 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -5,98 +5,6 @@
 # Broken on arm, see bug #924649 (https://github.com/golang/go/issues/65601).
 >=net-vpn/tailscale-1.60.0
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2023-02-06)
-# Successful build of dev-qt/qtwebengine depends on 64-bit host
-# Bug #893234
-dev-qt/qtwebengine
-dev-qt/qtwebview
-dev-python/PyQt6-WebEngine
-dev-python/PyQtWebEngine
-app-admin/calamares
-app-text/zeal
-app-editors/ghostwriter
-app-editors/retext
-app-misc/anki
-app-office/merkuro
-app-office/kmymoney:5
-app-office/skrooge:5
-app-office/texmaker
-app-text/bibletime
-app-text/calibre
-app-text/cb2bib
-app-text/kchmviewer
-app-text/sigil
-dev-lang/typescript
-dev-python/spyder
-dev-python/spyder-terminal
-dev-python/spyder-unittest
-dev-python/spyder-line-profiler
-dev-python/spyder-vim
-dev-python/spyder-notebook
-dev-util/kdevelop:5
-dev-util/kdevelop-php:5
-dev-util/kdevelop-python:5
-gnome-extra/gnome-shell-extension-pop-shell
-kde-apps/akonadi-calendar:5
-kde-apps/akonadi-import-wizard:5
-kde-apps/akonadiconsole:5
-kde-apps/akregator:5
-kde-apps/calendarjanitor:5
-kde-apps/calendarsupport:5
-kde-apps/cantor:5
-kde-apps/eventviews:5
-kde-apps/grantlee-editor:5
-kde-apps/incidenceeditor:5
-kde-apps/kaccounts-providers:5
-kde-apps/kaddressbook:5
-kde-apps/kalarm:5
-kde-apps/kalgebra:5
-kde-apps/kdepim-addons:5
-kde-apps/kdepim-meta
-kde-apps/kdepim-runtime:5
-kde-apps/kimagemapeditor:5
-kde-apps/kmail:5
-kde-apps/kmail-account-wizard:5
-kde-apps/kmailtransport:5
-kde-apps/knotes:5
-kde-apps/konqueror:5
-kde-apps/konsolekalendar:5
-kde-apps/kontact:5
-kde-apps/korganizer:5
-kde-apps/ktp-accounts-kcm:5
-kde-apps/ktp-text-ui:5
-kde-apps/libksieve:5
-kde-apps/mailcommon:5
-kde-apps/messagelib:5
-kde-apps/mbox-importer:5
-kde-apps/parley:5
-kde-apps/pim-data-exporter:5
-kde-apps/pim-sieve-editor:5
-kde-apps/plasma-telepathy-meta:5
-kde-misc/kio-gdrive
-kde-misc/tellico:5
-kde-misc/zanshin:5
-media-gfx/digikam:5
-media-gfx/luminance-hdr
-media-sound/frescobaldi
-media-sound/teamspeak-client:3
-media-video/openshot
-media-video/vidify
-media-video/vidify-audiosync
-net-analyzer/nmapsi
-net-libs/signon-ui
-net-misc/nextcloud-client
-net-p2p/ktorrent:5
-sci-geosciences/qmapshack
->=sci-geosciences/gpsbabel-1.8.0
-sci-mathematics/rkward:5
-sci-visualization/labplot:5
-sys-apps/polychromatic
-www-client/falkon
-www-client/otter
-www-client/qutebrowser
-media-video/jellyfin-media-player
-
 # Sam James <sam@gentoo.org> (2020-06-24)
 # Valgrind lacks support for < ARMv7
 # https://valgrind.org/info/platforms.html
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index b1c7dae45c42..1f4b5d9ba909 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -76,8 +76,8 @@ dev-python/QtPy test
 games-util/lgogdownloader gui
 kde-apps/kde-apps-meta pim
 kde-apps/kdenetwork-meta bittorrent
-kde-apps/kleopatra:5 pim
-kde-apps/umbrello:5 php
+kde-apps/kleopatra pim
+kde-apps/umbrello php
 kde-misc/kio-gdrive share
 net-irc/quassel urlpreview
 net-misc/fatrat bittorrent
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index b305d9c528ee..8b3a6e04f5ce 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -160,10 +160,6 @@ net-vpn/openconnect test
 dev-python/QtPy pyside2
 dev-python/qtconsole test
 
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-06)
-# dev-qt/qtwebengine:5 isn't available on loong.
-dev-python/QtPy webengine
-
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # <dev-cpp/tbb-2021 fails to build on loong w/ gcc-13
 sci-libs/spqr tbb
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index ed1d0c7d3d7e..ad6a4aec5229 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-03-24)
+# Requires unkeyworded dev-qt/qtwebengine (and revdeps)
+kde-apps/kleopatra pim
+net-p2p/ktorrent rss
+
 # Eray Aslan <eras@gentoo.org> (2024-03-08)
 # mongodb dependencies are not keyworded
 mail-mta/postfix mongodb
diff --git a/profiles/arch/powerpc/ppc32/package.mask b/profiles/arch/powerpc/ppc32/package.mask
index 3b04d2d58ca3..1b3413e70272 100644
--- a/profiles/arch/powerpc/ppc32/package.mask
+++ b/profiles/arch/powerpc/ppc32/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-03-23)
+# sys-libs/libomp does not support ppc32 (bug #907213).
+sys-libs/libomp
+
 # Sam James <sam@gentoo.org> (2023-05-06)
 # Broken bundled Eigen, fails to compile. See bug #865191.
 sci-libs/pdal
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 93269f61965d..ba4f64dea0a1 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-03-23)
+# sys-libs/libomp does not support ppc32 (bug #907213).
+sys-devel/clang-runtime openmp
+
 # Matt Jolly <kangie@gentoo.org> (2024-03-02)
 # Fails tests, potential false negatives #911402
 app-antivirus/clamav system-mspack
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 2080a5e08c61..e52371ee7cfa 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,12 +1,6 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Ionen Wolkens <ionen@gentoo.org> (2024-01-27)
-# dev-qt/qtwebengine:6 is not available here, technically does
-# not need to be masked for Qt5 (is keyworded) but would require
-# USE=qt5-webengine or so to make the distinction with Qt6.
-sci-astronomy/stellarium webengine
-
 # Marek Szuba <marecki@gentoo.org> (2023-12-05)
 # Needs USE=video_cards_amdgpu, which IS available on ppc64le.
 >=sys-apps/fwupd-1.9.10 -amdgpu
@@ -41,10 +35,6 @@ dev-util/perf clang
 sys-libs/compiler-rt-sanitizers -xray
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-05)
-# dropbox requires binaries unavaliable for ppc64
-kde-apps/kdenetwork-meta webengine
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-05)
 # criu is unmasked on little-endian ppc64
 app-containers/crun -criu
 
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
index eef79d46cd40..29e00a4e703a 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -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
 
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
@@ -16,10 +16,6 @@
 # Prebuilt kernels are supported here.
 -dist-kernel
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-16)
-# dev-qt/qtwebengine works on ppc64le
--webengine
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-03)
 # clang is keyworded and works on ppc64
 -clang
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 029dc5b15a7d..857d7a0bd4ef 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2024-03-23)
+# dev-qt/qtwebengine not available here
+dev-python/QtPy webengine test
+
 # Michal Privoznik <michal.privoznik@gmail.com> (2024-01-21)
 # virtiofsd is available here
 app-emulation/libvirt -virtiofsd
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 27f85e149055..3f43a0d59202 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -32,7 +32,7 @@ sys-apps/openrc s6
 
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-08-30)
 # Avoid keywording more Qt stuff
-dev-python/pyside2 datavis webengine
+dev-python/pyside2 datavis
 
 # Marek Szuba <marecki@gentoo.org> (2023-08-19)
 # dev-libs/pocl needs some work before it can be keyworded here (Bug #907333).
@@ -107,7 +107,6 @@ dev-libs/cyrus-sasl berkdb
 # Avoid dragging in "heavy"  parts of dev-qt/* unless/until
 # somebody needs them. bug #816981, bug #854261.
 # Unfortunately, tests demand qtwebengine too.
-dev-python/QtPy webengine
 dev-python/QtPy test
 
 # Marek Szuba <marecki@gentoo.org> (2022-04-30)
@@ -136,10 +135,6 @@ app-emulation/qemu xen
 # unkeyworded depdendency - sys-cluster/ceph
 app-emulation/qemu rbd
 
-# Alexey Sokolov <alexey+gentoo@asokolov.org> (2012-12-25)
-# Requires dev-qt/qtwebengine
-sci-astronomy/stellarium webengine
-
 # Alex Fan <alex.fan.q@gmail.com> (2021-12-12)
 # dev-python/uvloop fails test #806412
 # but with it installed, anyio passes all tests
@@ -164,11 +159,6 @@ sys-cluster/ceph pmdk
 dev-ruby/capybara test
 #  - dev-qt/qtwebengine (bdepend)
 dev-python/ipython qt5
-kde-apps/k3b webengine
-kde-apps/marble webengine
-kde-plasma/discover webengine
-kde-plasma/kdeplasma-addons webengine
-kde-plasma/libksysguard webengine
 net-irc/quassel urlpreview
 
 # Jonathan Davies <jpds@protonmail.com> (2021-09-03)
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index 7cddc31b675f..580b0657bf6b 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -10,9 +10,7 @@ app-arch/lrzip-next
 # Bug #893234
 dev-qt/qtwebengine
 dev-qt/qtwebview
-dev-python/PyQt6-WebEngine
 dev-python/PyQtWebEngine
-app-admin/calamares
 app-text/zeal
 app-editors/ghostwriter
 app-editors/retext
@@ -22,11 +20,8 @@ app-office/kmymoney:5
 app-office/skrooge:5
 app-office/texmaker
 app-text/bibletime
-app-text/calibre
 app-text/cb2bib
 app-text/kchmviewer
-app-text/sigil
-dev-lang/typescript
 dev-python/spyder
 dev-python/spyder-terminal
 dev-python/spyder-unittest
@@ -36,7 +31,6 @@ dev-python/spyder-notebook
 dev-util/kdevelop:5
 dev-util/kdevelop-php:5
 dev-util/kdevelop-python:5
-gnome-extra/gnome-shell-extension-pop-shell
 kde-apps/akonadi-calendar:5
 kde-apps/akonadi-import-wizard:5
 kde-apps/akonadiconsole:5
@@ -81,21 +75,14 @@ media-gfx/luminance-hdr
 media-sound/frescobaldi
 media-sound/teamspeak-client:3
 media-video/openshot
-media-video/vidify
-media-video/vidify-audiosync
 net-analyzer/nmapsi
 net-libs/signon-ui
-net-misc/nextcloud-client
-net-p2p/ktorrent:5
 sci-geosciences/qmapshack
 >=sci-geosciences/gpsbabel-1.8.0
 sci-mathematics/rkward:5
 sci-visualization/labplot:5
-sys-apps/polychromatic
 www-client/falkon
 www-client/otter
-www-client/qutebrowser
-media-video/jellyfin-media-player
 
 # Viorel Munteanu <ceamac@gentoo.org> (2022-12-22)
 # The x86 build is broken and no longer available.  Bug #887831
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 6198eaac2dc3..6dafc718a187 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-03-24)
+# Requires unkeyworded dev-qt/qtwebengine
+net-p2p/ktorrent rss
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-03-21)
 # virt-firmware is keyworded here
 sys-kernel/installkernel -efistub
@@ -92,8 +96,8 @@ dev-python/QtPy test
 games-util/lgogdownloader gui
 kde-apps/kde-apps-meta pim
 kde-apps/kdenetwork-meta bittorrent
-kde-apps/kleopatra:5 pim
-kde-apps/umbrello:5 php
+kde-apps/kleopatra pim
+kde-apps/umbrello php
 kde-misc/kio-gdrive share
 net-irc/quassel urlpreview
 net-misc/fatrat bittorrent
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8442575839e0..76b39e86f880 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -46,6 +46,7 @@ sci-physics/root R
 dev-debug/gdb cet
 sys-devel/binutils cet
 sys-devel/binutils-hppa64 cet
+sys-devel/clang-common cet
 sys-devel/gcc cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 115beec584e2..83facb689f20 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -6,6 +6,7 @@
 dev-debug/gdb cet
 sys-devel/binutils cet
 sys-devel/binutils-hppa64 cet
+sys-devel/clang-common cet
 sys-devel/gcc cet
 sys-libs/binutils-libs cet
 sys-libs/glibc cet
diff --git a/profiles/package.mask b/profiles/package.mask
index 23ce2c574d70..01d948a3b058 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexey Sokolov <alexey+gentoo@asokolov.org> (2023-03-23)
+# Source incompatible with mygui-3.4.1
+# https://bugs.gentoo.org/927634
+>=dev-games/mygui-3.4.3
+
 # Conrad Kostecki <conikost@gentoo.org> (2024-03-22)
 # Stuck on old EAPI6. Last stable release over 10 years ago.
 # Not compatible with PHP8. Removal on 2024-04-22.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2a925d13604f..e760fe412d0f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8217,6 +8217,7 @@ sys-devel/clang:extra - Build extra tools (clangd, clang-tidy and a few more)
 sys-devel/clang:ieee-long-double - Use accelerated 128-bit IEEE long double ABI (ppc64le only)
 sys-devel/clang:static-analyzer - Install the Clang static analyzer
 sys-devel/clang-common:bootstrap-prefix - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for bootstrapping Gentoo Prefix
+sys-devel/clang-common:cet - Enable support for control flow hijacking protection. On amd64, this provides Intel Control Flow Enforcement Technology (CET). Only provides benefits on newer CPUs. For Intel, the CPU must be at least as new as Tiger Lake. For AMD, it must be at least as new as Zen 3. This is harmless on older CPUs, but provides no benefit either.
 sys-devel/clang-common:default-compiler-rt - Use compiler-rt + libunwind instead of libgcc as the default rtlib for clang
 sys-devel/clang-common:default-libcxx - Use libc++ instead of libstdc++ as the default stdlib for clang
 sys-devel/clang-common:default-lld - Use lld as the default linker for clang