gentoo auto-resync : 24:09:2024 - 01:25:19

6 files changed, 18 insertions, 34 deletions

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