From ebec697dc1cffeea4e8cd60209a750d1e1412e43 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Mon, 29 Nov 2021 12:14:43 +0100
Subject: group-desktop: Migrate to media-video/pipewire

We have been using PipeWire [1] on our main desktop system for a while
now and it runs without any problems. Since we don't see the need to
stay with PulseAudio, completely migrate the group-desktop profile to
PipeWire instead.

This needs a couple of changes. PulseAudio is still pulled in by a large
amount of packages, so we can't simply remove it. If we want to use
PipeWire's ALSA plugin whilst having PulseAudio installed, we need to
make sure we disable the 'alsa-plugin' USE flag for it so they don't
conflict.

Additionally, media-video/wireplumber requires a version of Lua that is
not LuaJIT. Commit 23d2912 (group-base: Use LuaJIT as the default Lua
provider, 2021-02-05) masks any normal Lua version, so we have to be
specific here and enable a single LUA_SINGLE_TARGET version.

For now also unmask all relevant software packages as development seems
pretty speedy. We want to get new features (and fixes) as soon as
possible.

[1] https://pipewire.org/
---
 group-desktop/package.accept_keywords/01-group-desktop | 4 ++++
 group-desktop/package.use/01-group-desktop             | 5 +++++
 host-nabokov/package.accept_keywords/90-host-nabokov   | 2 ++
 host-nabokov/package.use/90-host-nabokov               | 2 ++
 4 files changed, 13 insertions(+)

diff --git a/group-desktop/package.accept_keywords/01-group-desktop b/group-desktop/package.accept_keywords/01-group-desktop
index 4a92789..6be0e72 100644
--- a/group-desktop/package.accept_keywords/01-group-desktop
+++ b/group-desktop/package.accept_keywords/01-group-desktop
@@ -1,6 +1,7 @@
 app-misc/khal
 dev-python/vdirsyncer
 media-sound/whipper
+media-video/pipewire
 net-im/signal-desktop-bin
 sci-calculators/qalculate-gtk
 x11-drivers/nvidia-drivers
@@ -15,6 +16,9 @@ dev-python/pycdio
 dev-python/click-log
 dev-python/click-threading
 
+# needed for media-video/pipewire
+media-video/wireplumber
+
 # needed for xfce-base/thunar
 xfce-base/exo
 xfce-base/libxfce4ui
diff --git a/group-desktop/package.use/01-group-desktop b/group-desktop/package.use/01-group-desktop
index e3deb9e..2e723aa 100644
--- a/group-desktop/package.use/01-group-desktop
+++ b/group-desktop/package.use/01-group-desktop
@@ -26,6 +26,7 @@ app-crypt/pinentry gtk
 media-fonts/iosevka aile etoile
 media-sound/pulseaudio alsa orc dbus gtk
 media-video/mpv cli luajit -xv
+media-video/pipewire pipewire-alsa
 net-analyzer/wireshark adns http2 smi sshdump tfshark
 net-p2p/transmission gtk
 net-p2p/transmission-remote-gtk libnotify
@@ -58,6 +59,10 @@ sys-libs/zlib minizip
 # needed for media-gfx/nomacs
 media-libs/opencv qt5
 
+# needed for media-video/pipewire
+media-sound/pulseaudio -alsa-plugin
+media-video/wireplumber LUA_SINGLE_TARGET: lua5-4
+
 # needed for pinentry-gnome3
 app-crypt/gcr gtk
 
diff --git a/host-nabokov/package.accept_keywords/90-host-nabokov b/host-nabokov/package.accept_keywords/90-host-nabokov
index f5469f4..d5ff114 100644
--- a/host-nabokov/package.accept_keywords/90-host-nabokov
+++ b/host-nabokov/package.accept_keywords/90-host-nabokov
@@ -1,3 +1,5 @@
+app-editors/neovim
+media-sound/mpd
 sys-devel/gcc
 
 # needed for ffmpeg[cuda]
diff --git a/host-nabokov/package.use/90-host-nabokov b/host-nabokov/package.use/90-host-nabokov
index 574884a..2bd2249 100644
--- a/host-nabokov/package.use/90-host-nabokov
+++ b/host-nabokov/package.use/90-host-nabokov
@@ -1,3 +1,5 @@
 */* nvenc
 */* cuda
 */* uvm
+
+net-analyzer/goaccess geoip geoipv2
-- 
cgit v1.2.3-2-gb3c3