gentoo auto-resync : 22:03:2024 - 19:00:48

23 files changed, 18 insertions, 98 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index b1b28a51aaf3..3b6df5e08a9e 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -251,7 +251,7 @@ media-libs/mesa vulkan vulkan-overlay zink
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
 # net-libs/webkit-gtk has no alpha keywords
 app-editors/emacs xwidgets
-gnome-extra/evolution-data-server oauth oauth-gtk3 oauth-gtk4
+gnome-extra/evolution-data-server oauth-gtk3 oauth-gtk4
 # needs gnome-extra/sushi, depends on net-libs/webkit-gtk
 gnome-base/nautilus previewer
 # needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
@@ -542,7 +542,7 @@ x11-misc/xscreensaver new-login
 
 # Alexey Shvetsov <alexxy@gentoo.org> (2011-12-17)
 # mask use numa for openmpi
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Raúl Porcel <armin76@gentoo.org> (2011-10-08)
 # Needs media-sound/lilypond
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index ab647373fb87..62aff0c6a407 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -418,7 +418,7 @@ sys-boot/grub:2 -grub_platforms_xen-32
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sd-boot is not supported on all archs.
-sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd -boot -ukify
 sys-apps/systemd-utils -boot -ukify
 sys-kernel/installkernel -systemd-boot -ukify -uki
 
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index da0b707dd420..aff9fae98df9 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -85,10 +85,6 @@ media-video/ffmpeg vmaf
 # needs stabilizing
 media-video/ffmpeg amf
 
-# Sam James <sam@gentoo.org> (2022-02-01)
-# sys-cluster/ucx is not marked stable on amd64
-sys-cluster/slurm ucx
-
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is stabilized on amd64.
 app-crypt/pinentry -efl
@@ -105,9 +101,8 @@ dev-java/openjdk:8 javafx
 dev-java/openjdk:11 javafx
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-09-07)
-# sys-cluster/slurm has no stable keywords
 # dev-util/nvidia-cuda-toolkit has no stable keywords
-app-metrics/collectd collectd_plugins_slurm collectd_plugins_gpu_nvidia
+app-metrics/collectd collectd_plugins_gpu_nvidia
 
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
@@ -141,7 +136,7 @@ virtual/wine staging
 
 # Christoph Junghans <junghans@gentoo.org> (2017-02-26)
 # Stable mask some fabrics (bug #525534)
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Brian Evans <grknight@gentoo.org> (2017-01-17)
 # Stable mask groonga on mariadb as I don't know how stable
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 6f40e11a351b..18965e249fcb 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -3,7 +3,6 @@
 
 # Sam James <sam@gentoo.org> (2024-02-17)
 # Broken on arm, see bug #924649 (https://github.com/golang/go/issues/65601).
-=dev-lang/go-1.22.0
 >=net-vpn/tailscale-1.60.0
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-02-06)
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 357bcc9164bc..b1c7dae45c42 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -169,7 +169,7 @@ net-im/prosody selinux
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm
 # bug #729720
-sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd -boot -ukify
 sys-apps/systemd-utils -boot -ukify
 sys-kernel/installkernel -systemd-boot -ukify -uki
 
@@ -302,7 +302,7 @@ app-metrics/collectd -collectd_plugins_mqtt
 
 # Christoph Junghans <junghans@gentoo.org> (2017-02-05)
 # Mask some fabrics
-sys-cluster/openmpi java openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi java openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2017-01-04)
 # Assembly optimisations are supported on arm since 0.0.0_pre20161213
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index eb63148c4543..5f51dcb020ea 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -88,10 +88,6 @@ dev-lang/ruby -jit
 # avoid larger deptree, bug #882593
 dev-python/bracex doc
 
-# Alexey Shvetsov <alexxy@gentoo.org> (2022-09-15)
-# Mask nvml use flag for slurm
-sys-cluster/slurm nvml
-
 # Sam James <sam@gentoo.org> (2022-07-08)
 # Unmask galera for dev-db/mariadb
 >=dev-db/mariadb-10.1.0 -galera
@@ -129,10 +125,6 @@ media-video/ffmpeg vmaf
 # sys-cluster/knem is not keyworded on arm64
 sys-cluster/openmpi openmpi_fabrics_knem
 
-# Sam James <sam@gentoo.org> (2022-02-01)
-# sys-cluster/ucx is not keyworded on arm64
-sys-cluster/slurm ucx
-
 # Sam James <sam@gentoo.org> (2022-01-22)
 # Supports 64-bit NEON
 dev-libs/libgcrypt -cpu_flags_arm_neon
@@ -202,7 +194,7 @@ media-sound/bluez-alsa man
 # Sam James <sam@gentoo.org> (2020-01-17)
 # gnuefi + systemd-boot works on arm64
 # bug #729720
-sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd -boot -ukify
 sys-apps/systemd-utils -boot -ukify
 sys-kernel/installkernel -systemd-boot -ukify -uki
 
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 57f65f4d28be..459cf2219642 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -33,8 +33,7 @@ sci-mathematics/octave sundials
 
 # Sam James <sam@gentoo.org> (2022-03-07)
 # sys-cluster/torque not marked stable on arm64
-# nor is sys-cluster/slurm yet
-sys-cluster/openmpi openmpi_rm_pbs openmpi_rm_slurm
+sys-cluster/openmpi openmpi_rm_pbs
 
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
 # Don't apply stable masks to python-exec since we're forcing every
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index a51be55b952e..ec88de6222ce 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -81,10 +81,6 @@ media-video/pipewire roc
 # dev-cpp/cppdap is not keyworded in most places
 dev-build/cmake dap
 
-# Sam James <sam@gentoo.org> (2023-07-09)
-# sys-libs/libhugetlbfs is broken w/ newer glibc, bug #806079
-sys-apps/nvme-cli hugepages
-
 # Michał Górny <mgorny@gentoo.org> (2023-06-24)
 # dev-db/mongodb builds practically only on the authors' computer.
 dev-python/pymongo test-full
@@ -400,7 +396,7 @@ media-video/mpv mmal
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sd-boot and ukify are not supported on all archs.
-sys-apps/systemd boot gnuefi ukify
+sys-apps/systemd boot ukify
 sys-apps/systemd-utils boot ukify
 sys-kernel/installkernel systemd-boot ukify uki
 
diff --git a/profiles/arch/hppa/package.mask b/profiles/arch/hppa/package.mask
index 38231b9f09d7..39addcecad66 100644
--- a/profiles/arch/hppa/package.mask
+++ b/profiles/arch/hppa/package.mask
@@ -5,11 +5,6 @@
 # Needs explicit porting to each platform (bug 894078#c6)
 dev-python/py-cpuinfo
 
-# Sam James <sam@gentoo.org> (2023-03-10)
-# Fails to build on HPPA w/ sys-kernel/linux-headers-6.2:
-# https://github.com/strace/strace/issues/241
-=dev-debug/strace-6.2
-
 # Quote from <eike@s...l.de>:
 # "Compilation fails with: #error You need to define CycleTimer for
 #  your OS and CPU"
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index ea0c0add11c4..045ee43a972c 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -41,7 +41,6 @@ media-libs/libplacebo glslang shaderc vulkan
 # Vulkan is not available on hppa.
 dev-qt/qtdeclarative vulkan
 dev-qt/qtgui vulkan
-<dev-qt/qtwayland-5.15.11:5 vulkan
 >=dev-qt/qtwayland-5.15.11:5 compositor
 # Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
 # sys-apps/s6-linux-init has not been tested on this arch
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 17bf844ce195..3aa516a35fd8 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -259,7 +259,7 @@ app-text/texlive l10n_ja context
 # - net-libs/webkit-gtk: ruby build system
 app-editors/emacs xwidgets
 dev-util/geany-plugins markdown
-gnome-extra/evolution-data-server oauth oauth-gtk3 oauth-gtk4
+gnome-extra/evolution-data-server oauth-gtk3 oauth-gtk4
 # - gnome-extra/sushi: depends on webkit-gtk
 gnome-base/nautilus previewer
 # - net-libs/gnome-online-accounts: depends on webkit-gtk
@@ -447,11 +447,6 @@ net-misc/networkmanager wext
 media-sound/pulseaudio ofono-headset
 media-sound/pulseaudio-daemon ofono-headset
 
-# Mike Gilbert <floppym@gentoo.org> (2015-09-05)
-# sys-boot/gnu-efi is not supported on all archs.
-<sys-apps/systemd-254 -gnuefi
-<sys-apps/systemd-utils-254 -boot
-
 # Pacho Ramos <pacho@gentoo.org> (2015-06-13)
 # Missing keywords, bug #513108
 net-misc/spice-gtk smartcard webdav
@@ -526,7 +521,7 @@ x11-misc/xscreensaver new-login
 
 # Alexey Shvetsov <alexxy@gentoo.org> (2011-12-17)
 # Mask use numa for openmpi
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Raúl Porcel <armin76@gentoo.org> (2011-11-05)
 # jit not supported on ia64
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index e6426e1dcde2..0b0b6ab04b62 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -97,7 +97,6 @@ semantic-desktop
 fits
 libburn
 topal
-indi
 flite
 sctp
 bs2b
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 5a384dacc36e..b305d9c528ee 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -171,8 +171,6 @@ sci-libs/spqr tbb
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # sys-boot/gnu-efi upstream hasn't merged the loong port yet
 sys-apps/fwupd uefi
-<sys-apps/systemd-254 gnuefi
-<sys-apps/systemd-utils-254 boot
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # The loong port of sys-boot/grub:2 isn't upstreamed yet.
@@ -224,17 +222,12 @@ dev-python/PyQt5 location
 dev-python/QtPy test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-01)
-# sys-libs/libhugetlbfs isn't buildable here yet due to arch-specific code.
-sys-apps/nvme-cli hugepages
-
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-01)
 # Mask GRUB2 platforms not applicable to loong.
 sys-boot/grub:2 grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_ieee1275 grub_platforms_multiboot grub_platforms_pc grub_platforms_qemu grub_platforms_uboot grub_platforms_xen grub_platforms_xen-pvh
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-11-30)
 # No Haskell on loong yet (in-tree ghc too old and not bootstrapped here as of
 # Oct 2023), hence no virtual/pandoc and friends.
-sys-apps/eza man
 www-apps/hugo test
 
 # WANG Xuerui <xen0n@gentoo.org> (2022-11-29)
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index e4179d80d272..ed1d0c7d3d7e 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -387,7 +387,7 @@ net-misc/connman ofono
 
 # Alexey Shvetsov <alexxy@gentoo.org> (2012-01-20)
 # Mask some use flags for openmpi due to unkeyworded deps
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Patrick McLean <chutzpah@gentoo.org> (2011-09-07)
 # missing keywords on dependencies
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 39ca7fd3fb03..93269f61965d 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -154,7 +154,6 @@ dev-lang/php avif
 # bug #708344
 sys-devel/clang-runtime compiler-rt sanitize
 sys-devel/clang-common default-compiler-rt
-sys-devel/clang default-compiler-rt
 
 # Florian Schmaus <flo@geekplace.eu> (2020-12-03)
 # Rubber's testsuite depends on media-gfx/asymptote and
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index ad5f2a0d5f0a..029dc5b15a7d 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -84,10 +84,6 @@ media-sound/easyeffects zamaudio
 # Feature currently relies on amd64 prebuilt binaries.
 media-video/obs-studio browser
 
-# Joonas Niilola <juippis@gentoo.org> (2021-06-23)
-# Pandoc is a required dep, and not keyworded.
-sys-apps/eza man
-
 # Matt Turner <mattst88@gentoo.org> (2021-06-10)
 # dev-python/django is not keyworded here
 dev-python/diskcache test
@@ -125,8 +121,7 @@ sci-mathematics/gmp-ecm -custom-tune
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-05)
 # dropbox requires binaries unavaliable for ppc64
-# telepathy flag requires unkeyworded plasma-telepathy-meta
-kde-apps/kdenetwork-meta dropbox telepathy
+kde-apps/kdenetwork-meta dropbox
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-08-20)
 # zfs is keyworded on ppc64
@@ -201,7 +196,6 @@ dev-vcs/subversion kwallet
 # Patrice Clement <monsieurp@gentoo.org> (2016-02-08)
 # I would need to keyword an awful lot of packages on ppc64
 # that would need Java 7 otherwise.
-dev-java/bsf python
 dev-java/ant-apache-bsf python
 
 # Jeroen Roovers <jer@gentoo.org> (2015-12-26)
diff --git a/profiles/arch/riscv/package.use.force b/profiles/arch/riscv/package.use.force
index bbeece97d895..d69a9bf759c6 100644
--- a/profiles/arch/riscv/package.use.force
+++ b/profiles/arch/riscv/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Ionen Wolkens <ionen@gentoo.org> (2023-07-26)
@@ -13,10 +13,6 @@ media-video/mpv -lua_single_target_luajit lua_single_target_lua5-1
 # luajit is currently not supported on riscv, so use lua instead
 app-editors/neovim lua_single_target_lua5-1
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-11-13)
-# 1.64 segfaults, so we force 1.65 bootstrapping 1.65
-~dev-lang/rust-1.65.0 system-bootstrap
-
 # matoro <matoro_gentoo@matoro.tk> (2022-09-10)
 # GHC does not support native codegen for riscv at all.
 # It gains LLVM codegen in 9.2, but we maintain a backport of this,
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 524b442bf6fd..27f85e149055 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -234,10 +234,6 @@ www-servers/nginx nginx_modules_http_lua
 dev-db/postgresql llvm
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
-# sys-cluster/ucx fails to compile on this arch
-sys-cluster/slurm ucx
-
-# Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
 #  - sci-libs/vtk
 media-libs/opencv vtk
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index b824ae154cc6..5347e66d38e5 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -72,7 +72,6 @@ app-alternatives/ninja samurai
 # Vulkan is not available on sparc.
 dev-qt/qtdeclarative vulkan
 dev-qt/qtgui vulkan
-<dev-qt/qtwayland-5.15.11:5 vulkan
 >=dev-qt/qtwayland-5.15.11:5 compositor
 
 # Patrick McLean <chutzpah@gentoo.org> (2023-10-03)
@@ -660,7 +659,7 @@ net-vpn/tinc vde
 
 # Alexey Shvetsov <alexxy@gentoo.org> (2011-12-17)
 # Mask use numa for openmpi
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Raúl Porcel <armin76@gentoo.org> (2011-10-08)
 # Needs media-sound/lilypond
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index d725dced8dea..7cddc31b675f 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -5,14 +5,6 @@
 # app-arch/lrzip-next does not support 32-bit arches (#925548)
 app-arch/lrzip-next
 
-# matoro <matoro_gentoo@matoro.tk> (2024-01-06)
-# <dev-lang/go-1.{20.12,21.5} has multiple vulns (#919738):
-# CVE-2023-39326, CVE-2023-45283, CVE-2023-45285
-# However cgo is broken for <dev-lang/go-1.21 on i386 (#921366)
-# <net-p2p/kubo-0.23.0 depends on <dev-lang/go-1.21 (#912149)
-<dev-lang/go-1.21
-<net-p2p/kubo-0.23.0
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-02-06)
 # Successful build of dev-qt/qtwebengine depends on 64-bit host
 # Bug #893234
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 1a7e78b7d7e2..6198eaac2dc3 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -113,10 +113,6 @@ media-video/mpv -vulkan
 # sys-libs/libsmbios is available here.
 app-laptop/pbbuttonsd -macbook
 
-# Alexey Shvetsov <alexxy@gentoo.org> (2022-09-15)
-# Mask nvml use flag for slurm
-sys-cluster/slurm nvml
-
 # Alfredo Tupone <tupone@gentoo.org> (2022-08-30)
 # ada bootstrap currently only available on amd64/x86
 sys-devel/gcc -ada
@@ -412,7 +408,7 @@ app-emulation/libvirt xen
 
 # Mike Gilbert <floppym@gentoo.org> (2015-09-05)
 # sys-boot/gnu-efi is not supported on all archs.
-sys-apps/systemd -boot -gnuefi -ukify
+sys-apps/systemd -boot -ukify
 sys-apps/systemd-utils -boot -ukify
 sys-kernel/installkernel -systemd-boot -ukify -uki
 
diff --git a/profiles/arch/x86/package.use.stable.force b/profiles/arch/x86/package.use.stable.force
deleted file mode 100644
index a6c0d6da525f..000000000000
--- a/profiles/arch/x86/package.use.stable.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2023-06-03)
-# Destabilizing x86 keywords on sci-*/* packages
-app-office/libalkimia gmp
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index a9678b193c05..98a331d0e71e 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -62,10 +62,6 @@ sci-physics/geant vtk
 # sci-libs/sundials is not marked stable on x86
 sci-mathematics/octave sundials
 
-# Sam James <sam@gentoo.org> (2022-02-02)
-# sys-cluster/ucx is not marked stable on x86
-sys-cluster/slurm ucx
-
 # Marek Szuba <marecki@gentoo.org> (2022-01-03)
 # no stable media-libs/rnnoise on this arch yet
 media-sound/pulseeffects rnnoise
@@ -88,10 +84,6 @@ dev-util/diffoscope haskell
 # large amount of fabric. bug #763954
 sys-block/open-iscsi infiniband
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-08-05)
-# sys-cluster/slurm has no stable keywords
-app-metrics/collectd collectd_plugins_slurm
-
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
 # (except what's needed by digikam, dilfridge)
@@ -115,7 +107,7 @@ virtual/wine proton staging
 
 # Christoph Junghans <junghans@gentoo.org> (2017-02-26)
 # Stable mask some fabrics (bug #525534)
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Brian Evans <grknight@gentoo.org> (2017-01-17)
 # Stable mask groonga on mariadb as I don't know how stable