14 files changed, 42 insertions, 42 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f05f3e49d236..e188ffa71550 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 40350932035c..0f4f5e05f2d8 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrick McLean <chutzpah@gentoo.org> (2024-09-23)
+# Only supported on x86/amd64 (bug #940014).
+net-misc/lldpd -seccomp
+
 # orbea <orbea@riseup.net> (2024-07-19)
 # Unmask the dynarec flag which has amd64 asm.
 games-emulation/rmg -dynarec
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 131a47d063b1..b31655dceb8e 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -185,6 +185,7 @@ dev-util/perf python
 #
 # See https://github.com/openssl/openssl/issues/21340
 >=dev-libs/openssl-3.1 asm
+>=dev-libs/openssl-3.2 -asm
 
 # WANG Xuerui <xen0n@gentoo.org> (2023-06-03)
 # sys-cluster/knem not keyworded yet
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index d866c16d68e0..c8fd4375ed58 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
 
+# Patrick McLean <chutzpah@gentoo.org> (2024-09-23)
+# Only supported on x86/amd64 (bug #940014).
+net-misc/lldpd -seccomp
+
 # orbea <orbea@riseup.net> (2024-07-19)
 # Unmask the dynarec flag which has x86 asm.
 games-emulation/rmg -dynarec
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index b74f912ef14f..01df0a79fdb6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Patrick McLean <chutzpah@gentoo.org> (2024-09-23)
+# Only supported on x86/amd64 (bug #940014).
+net-misc/lldpd seccomp
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-09-12)
 # No suitable version of dev-libs/protobuf available.
 =dev-java/protobuf-java-4.28.1 system-protoc
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 30e6852a7ea3..4a9c862847d3 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.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-09-23)
+# Requires dev-python/nh3.
+dev-python/textile
+
 # matoro <matoro_gentoo@matoro.tk> (2024-08-10), #936643
 # Unmask old pre-rust librsvg.  This has vulnerabilities,
 # so it is masked by default and only unmasked on wd40
diff --git a/profiles/package.mask b/profiles/package.mask
index 5afa61d8c96c..a36c889f57a9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Eli Schwartz <eschwartz@gentoo.org> (2024-09-22)
+# Unmaintained, abandoned upstream, does not compile with GCC 14.
+# Removal on 2024-10-22.  Bug #874732.
+dev-util/biew
+
 # Sam James <sam@gentoo.org> (2024-09-22)
 # GCC 11 and older no longer receive upstream support or fixes for
 # bugs. Please switch to a newer GCC version using gcc-config.
@@ -308,13 +313,6 @@ dev-scheme/guile:3.0
 >=media-sound/denemo-2.6.0-r100
 >=dev-scheme/skribilo-0.10.0-r100
 
-# Eli Schwartz <eschwartz@gentoo.org> (2024-08-15)
-# Abandoned upstream since 2011, unmaintained in gentoo since 2017. Tons of
-# patches, breaks again with GCC 14. Severe QA issues, automagic dependencies,
-# sole reverse dependency wants to remove it anyway.
-# Removal on 2024-09-14. Bug #829229, #854900, #863959, #880839, #882265, #931102, #914924.
-app-text/cuneiform
-
 # Ionen Wolkens <ionen@gentoo.org> (2024-08-11)
 # >=1.1.14 enables usage of explicit sync (with >=nvidia-drivers-560
 # and compositors that supports like kwin-6), which currently seems
diff --git a/profiles/targets/desktop/gnome/make.defaults b/profiles/targets/desktop/gnome/make.defaults
index 3f9e6955f3b8..2dc85fe967ca 100644
--- a/profiles/targets/desktop/gnome/make.defaults
+++ b/profiles/targets/desktop/gnome/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="colord eds evo gnome gnome-keyring gnome-online-accounts gnome-shell gstreamer introspection keyring nautilus networkmanager pulseaudio sysprof tracker wayland"
+USE="colord eds evo gnome gnome-keyring gnome-online-accounts gnome-shell gstreamer introspection keyring nautilus networkmanager pulseaudio sysprof tracker"
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index 3914d0992c9e..a60190ee8b3e 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,15 +1,6 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Alfred Wingate <parona@protonmail.com> (2023-12-25)
-# Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X )
->=media-tv/kodi-20.2 wayland -X
-
-# Mart Raudsepp <leio@gentoo.org> (2023-10-01)
-# x11-wm/mutter[wayland] requires xwayland[libei] for emulated input portal
-# for e.g. remote desktop remote input support
-x11-base/xwayland libei
-
 # Mart Raudsepp <leio@gentoo.org> (2022-01-05)
 # gnome-boxes requires spice-gtk[vala]
 net-misc/spice-gtk vala
@@ -32,15 +23,6 @@ dev-libs/efl sound
 # Needed by gnome-photos
 media-libs/gegl raw
 
-# Needed by a global USE=wayland right now; some REQUIRED_USE may be outdated and need review
->=media-libs/cogl-1.18.2-r1 gles2
->=media-libs/clutter-1.20 egl
-media-libs/cogl kms
-media-libs/libsdl2 gles2
-
-# Needed by mutter defaults and USE=wayland, bug #547300
->=media-libs/mesa-10.3 gles2
-
 # For eautoreconf in =app-crypt/seahorse-3.10.2-r1
 app-crypt/gcr vala
 
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 02e4f168b0a1..3e4f9fd3998b 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qml qt6 qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qml qt6 qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wayland wxwidgets X xcb xft x264 xml xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 82330969f098..febf52c3b940 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -11,8 +11,9 @@ net-p2p/transmission -qt5
 dev-qt/qtbase libproxy
 
 # Alfred Wingate <parona@protonmail.com> (2023-12-25)
-# Prefer X over gbm with REQUIRED_USE: ^^ ( gbm wayland X )
->=media-tv/kodi-20.2 X -gbm
+# Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X )
+# >=21.1 allows build with multiple display backends again
+<media-tv/kodi-21.1 wayland -X
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-11-12)
 # NSS: Required by kde-apps/okular[pdf]
@@ -24,6 +25,11 @@ app-text/poppler nss boost
 # accessibility required by kde-plasma/kwin:5
 dev-qt/qtgui:5 accessibility egl libinput
 
+# Mart Raudsepp <leio@gentoo.org> (2023-10-01)
+# kde-plasma/kwin and x11-wm/mutter[wayland] require xwayland[libei] for
+# emulated input portal for e.g. remote desktop remote input support
+x11-base/xwayland libei
+
 # Sam James <sam@gentoo.org> (2023-09-22)
 # Most people aren't going to use CMake's GUI. USE=gui is enabled by default
 # on desktop profiles and CMake is unavoidable, it feels a shame to drag in
@@ -35,6 +41,13 @@ dev-build/cmake -gui -qt6
 # Required by dev-python/PyQt5[multimedia]
 dev-qt/qtmultimedia:5 widgets
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2023-05-21)
+# Needed by a global USE=wayland right now (REQUIRED_USE conflicts)
+media-libs/clutter egl
+media-libs/cogl gles2
+media-libs/libsdl2 gles2
+<media-libs/mesa-24.1 gles2
+
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2022-12-27)
 # On desktops it's common to use browser to browse internet, which these
 # days is full of emojis, which wouldn't render properly without the fonts.
diff --git a/profiles/targets/desktop/plasma/make.defaults b/profiles/targets/desktop/plasma/make.defaults
index 7f42ef98fc5b..952f3e112e02 100644
--- a/profiles/targets/desktop/plasma/make.defaults
+++ b/profiles/targets/desktop/plasma/make.defaults
@@ -1,4 +1,4 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="activities declarative dri kde kwallet networkmanager pipewire plasma policykit pulseaudio screencast semantic-desktop wayland widgets"
+USE="activities declarative dri kde kwallet networkmanager pipewire plasma policykit pulseaudio screencast semantic-desktop widgets"
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 88e56d0ddcf1..f72f96ede24e 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,10 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Alfred Wingate <parona@protonmail.com> (2023-12-25)
-# Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X )
->=media-tv/kodi-20.2 wayland -X
-
 # Marek Szuba <marecki@gentoo.org> (2023-11-12)
 # FUSE cannot be built with multiple audio drivers, and desktop/gnome
 # profiles set both USE=pulseaudio (directly) and USE=alsa (inherited
@@ -41,13 +37,6 @@ kde-plasma/kde-cli-tools kdesu
 # Required by media-gfx/graphviz which is required by kde-apps/kcachegrind
 media-libs/gd fontconfig
 
-# Needed by a global USE=wayland right now
-media-libs/libsdl2 gles2
-
-# Required by kde-plasma/kwin
-media-libs/mesa wayland
-x11-base/xwayland libei
-
 # Required by kde-apps/kdenlive
 media-libs/mlt ffmpeg frei0r rubberband
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3288300accbe..c6e59eb243de 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3075,6 +3075,7 @@ games-arcade/jazz2-data:demo - Use the free demo data instead of the full retail
 games-arcade/lbreakout2:themes - Install additional themes
 games-arcade/moleinvasion:music - Download and install the music files
 games-arcade/oshu:osu-skin - Include more complete osu-skin (other is minimal)
+games-arcade/osu-lazer:pipewire - Use pipewire to enable sound output
 games-arcade/performous:midi - Enable MIDI I/O support
 games-arcade/performous:songs - Install a few demo songs
 games-arcade/performous:webcam - Enable Webcam support
@@ -6151,7 +6152,6 @@ net-libs/xrootd:server - Install xrootd server and related plug-ins
 net-libs/xrootd:xrdec - Enable erasure coding support (XrdEc plugin) with dev-libs/isa-l
 net-libs/zeromq:drafts - Build draft API, which may change at any time without any notice, and is therefore not recommended for normal use.
 net-libs/zeromq:libbsd - Use strlcpy() from dev-libs/libbsd instead of internal implementation.
-net-libs/zeromq:pgm - Build PGM (Pragmatic General Multicast)extention, a protocol for reliable multicast transport of data over IP networks.
 net-libs/zeromq:sodium - Use dev-libs/libsodium for cryptography
 net-mail/courier-imap:trashquota - include deleted messages, and the Trash folder, in the estimated quota usage for maildirs
 net-mail/cyrus-imapd:backup - Enable backup service support
@@ -7620,6 +7620,7 @@ sci-physics/pythia:lhapdf - Support the use of external PDF sets via sci-physics
 sci-physics/pythia:root - Use sci-physics/root trees and histograms (in examples only)
 sci-physics/rivet:hepmc2 - Build with HepMC2
 sci-physics/rivet:hepmc3 - Build with HepMC3
+sci-physics/rivet:highfive - Build with hdf5 and highfive
 sci-physics/rivet:zlib - Build with zlib
 sci-physics/root:R - Enable support for dev-lang/R
 sci-physics/root:asimage - Enable support for media-libs/libafterimage