From 76d55b130e7f9cb89cdd292dc07d6f6d9d7fd8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Wed, 4 Mar 2020 13:12:21 +0100
Subject: acct-user/cynerd: change uses to global ones

This is better because we already are using those so no need to explicit
configure them.
---
 acct-user/cynerd/cynerd-0.ebuild | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'acct-user/cynerd')

diff --git a/acct-user/cynerd/cynerd-0.ebuild b/acct-user/cynerd/cynerd-0.ebuild
index 27d41b8..6724cd6 100644
--- a/acct-user/cynerd/cynerd-0.ebuild
+++ b/acct-user/cynerd/cynerd-0.ebuild
@@ -3,7 +3,7 @@ EAPI=7
 inherit acct-user
 
 DESCRIPTION="Personal user for Cynerd"
-IUSE="desktop hw-access docker lxd cups wireshark roccat"
+IUSE="alsa pulseaudio cups X wayland docker lxd wireshark roccat"
 
 ACCT_USER_ID=1000
 ACCT_USER_SHELL=/bin/zsh
@@ -11,21 +11,28 @@ ACCT_USER_HOME=/home/cynerd
 ACCT_USER_GROUPS=(
 	cynerd
 	wheel
+	usb
 )
 
-DEPEND="
+RDEPEND="
 	sys-apps/shellrc[zsh]
-	desktop? (
-		acct-group/audio
+
+	alsa? ( acct-group/audio )
+	pulseaudio? ( media-sound/pulseaudio )
+	cups? ( net-print/cups )
+	X? (
+		acct-group/video
+		acct-group/input
+		acct-group/plugdev
+	)
+	wayland? (
 		acct-group/video
 		acct-group/input
 		acct-group/plugdev
-		media-sound/pulseaudio[system-wide]
 	)
-	hw-access? ( acct-group/usb )
+
 	docker? ( acct-group/docker )
 	lxd? ( app-emulation/lxd )
-	cups? ( net-print/cups )
 	wireshark? ( net-analyzer/wireshark )
 	roccat? ( sys-apps/roccat-tools )
 "
@@ -33,11 +40,13 @@ DEPEND="
 acct-user_add_deps
 
 pkg_setup() {
-	ACCT_USER_GROUPS+=( users portage )
-	use desktop && \
-		ACCT_USER_GROUPS+=( audio video input plugdev pulse pulse-access )
-	use hw-access && \
-		ACCT_USER_GROUPS+=( uucp usb )
+	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 docker && \
 		ACCT_USER_GROUPS+=( docker )
 	use lxd && \
-- 
cgit v1.2.3