From aeff37830843c7b02b5fbcaa6eec8f3e481ae405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Tue, 10 Mar 2020 19:44:37 +0100
Subject: acct-user/cynerd: return of the desktop

---
 acct-user/cynerd/cynerd-0.1.ebuild | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

(limited to 'acct-user/cynerd/cynerd-0.1.ebuild')

diff --git a/acct-user/cynerd/cynerd-0.1.ebuild b/acct-user/cynerd/cynerd-0.1.ebuild
index 68c8c97..9287959 100644
--- a/acct-user/cynerd/cynerd-0.1.ebuild
+++ b/acct-user/cynerd/cynerd-0.1.ebuild
@@ -3,7 +3,7 @@ EAPI=7
 inherit acct-user
 
 DESCRIPTION="Personal user for Cynerd"
-IUSE="alsa pulseaudio cups X wayland docker lxd wireshark roccat build"
+IUSE="cups docker desktop lxd wireshark roccat build"
 
 ACCT_USER_ID=1000
 ACCT_USER_SHELL=/bin/zsh
@@ -17,20 +17,15 @@ ACCT_USER_GROUPS=(
 RDEPEND="
 	sys-apps/shellrc[zsh]
 
-	alsa? ( acct-group/audio )
-	pulseaudio? ( media-sound/pulseaudio )
 	cups? ( net-print/cups )
-	X? (
-		acct-group/video
-		acct-group/input
-		acct-group/plugdev
-	)
-	wayland? (
+
+	desktop? (
+		acct-group/audio
+		media-sound/pulseaudio
 		acct-group/video
 		acct-group/input
 		acct-group/plugdev
 	)
-
 	docker? ( acct-group/docker )
 	lxd? ( app-emulation/lxd )
 	wireshark? ( net-analyzer/wireshark )
@@ -42,18 +37,14 @@ acct-user_add_deps
 
 pkg_setup() {
 	ACCT_USER_GROUPS+=( users portage uucp )
-	use alsa && \
-		ACCT_USER_GROUPS+=( audio )
-	use pulseaudio && \
-		ACCT_USER_GROUPS+=( pulse pulse-access )
-	{ use X || use wayland; } && \
-		ACCT_USER_GROUPS+=( video input plugdev )
+	use cups && \
+		ACCT_USER_GROUPS+=( lp lpadmin )
+	use desktop && \
+		ACCT_USER_GROUPS+=( audio pulse pulse-access video input plugdev )
 	use docker && \
 		ACCT_USER_GROUPS+=( docker )
 	use lxd && \
 		ACCT_USER_GROUPS+=( lxd )
-	use cups && \
-		ACCT_USER_GROUPS+=( lp lpadmin )
 	use wireshark && \
 		ACCT_USER_GROUPS+=( wireshark )
 	use roccat && \
-- 
cgit v1.2.3