Reorganize group-desktop and desktop-* profiles

We've been using a wayland-based desktop for quite a while now, so it
seems reasonable to merge most generic bits into the group-desktop
profile. Going forward, desktop-* profiles will be used for specific
desktop configurations (sway or plasma, for example).

3 files changed, 34 insertions, 31 deletions

diff --git a/desktop-sway/package.use/09-desktop-sway b/desktop-sway/package.use/09-desktop-sway
new file mode 100644
index 0000000..fe45b5d
--- /dev/null
+++ b/desktop-sway/package.use/09-desktop-sway
@@ -0,0 +1,8 @@
+app-crypt/pinentry gtk
+gui-wm/sway -swaybar
+
+# needed for app-crypt/pinentry
+app-crypt/gcr gtk
+
+# needed for media-sound/pavucontrol
+dev-cpp/gtkmm X
diff --git a/desktop-wayland/package.use/09-desktop-wayland b/desktop-wayland/package.use/09-desktop-wayland
deleted file mode 100644
index 0fd07fd..0000000
--- a/desktop-wayland/package.use/09-desktop-wayland
+++ /dev/null
@@ -1,27 +0,0 @@
-*/* egl
-*/* vulkan
-*/* wayland
-*/* -gtk4
-*/* -X
-
-dev-qt/qtgui eglfs
-gui-wm/sway -swaybar
-media-libs/libepoxy X
-x11-libs/gtk+ X
-
-app-accessibility/at-spi2-core dbus-broker
-
-# we're using the vulkan backend for mpv
-media-video/mpv -opengl
-
-# needed for media-libs/libsdl2[wayland]
-media-libs/libsdl2 gles2
-
-# needed for www-browser/firefox
-dev-cpp/cairomm X
-x11-libs/cairo X
-media-libs/mesa X
-media-libs/libglvnd X
-
-# needed for media-sound/pavucontrol
-dev-cpp/gtkmm X
diff --git a/group-desktop/package.use/01-group-desktop b/group-desktop/package.use/01-group-desktop
index 664bc40..587b61d 100644
--- a/group-desktop/package.use/01-group-desktop
+++ b/group-desktop/package.use/01-group-desktop
@@ -1,3 +1,5 @@
+*/* egl
+*/* eglfs
 */* exif
 */* gif
 */* jpeg
@@ -10,9 +12,12 @@
 */* truetype
 */* udev
 */* vaapi
+*/* vulkan
+*/* wayland
+*/* -X
 */* -gnome
 
-app-crypt/pinentry gtk
+app-accessibility/at-spi2-core dbus-broker
 media-fonts/iosevka iosevka-aile iosevka-etoile
 media-gfx/imv heif -freeimage
 media-sound/pulseaudio -daemon
@@ -40,9 +45,6 @@ media-libs/libcanberra alsa
 # needed for net-analyzer/wireshark
 sys-libs/zlib minizip
 
-# needed for app-crypt/pinentry
-app-crypt/gcr gtk
-
 # needed for x11-libs/pango
 media-libs/freetype harfbuzz
 
@@ -57,3 +59,23 @@ dev-qt/qtgui dbus
 
 # needed for media-video/obs-studio
 dev-qt/qtbase dbus
+
+x11-libs/gtk+ X
+
+# needed for x11-libs/gtk+[X]
+media-libs/libepoxy X
+
+# we're using the vulkan backend for mpv
+media-video/mpv -opengl
+
+# needed for media-libs/libsdl2[wayland]
+media-libs/libsdl2 gles2
+
+# needed for www-browser/firefox
+dev-cpp/cairomm X
+x11-libs/cairo X
+media-libs/mesa X
+media-libs/libglvnd X
+
+# needed for games-emulation/cemu
+x11-libs/wxGTK X