From 50e019aab74a3eb18b1067b8cff3bfdf0ccc76c6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 2 Jan 2021 17:43:54 +0000
Subject: net-fs/sambacfg : migrate from enewgroup to acct-group

---
 acct-group/smbshare/smbshare-0.ebuild              |  8 +++++
 .../files/modules/users.conf                       |  2 +-
 net-fs/sambacfg/sambacfg-1337-r1.ebuild            | 31 +++++++++++++++++++
 net-fs/sambacfg/sambacfg-1337.ebuild               | 35 ----------------------
 4 files changed, 40 insertions(+), 36 deletions(-)
 create mode 100644 acct-group/smbshare/smbshare-0.ebuild
 create mode 100644 net-fs/sambacfg/sambacfg-1337-r1.ebuild
 delete mode 100644 net-fs/sambacfg/sambacfg-1337.ebuild

diff --git a/acct-group/smbshare/smbshare-0.ebuild b/acct-group/smbshare/smbshare-0.ebuild
new file mode 100644
index 00000000..b7aa5a2c
--- /dev/null
+++ b/acct-group/smbshare/smbshare-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=555
diff --git a/app-misc/calamares-config-redcore/files/modules/users.conf b/app-misc/calamares-config-redcore/files/modules/users.conf
index 8a016a3a..8a1addc0 100644
--- a/app-misc/calamares-config-redcore/files/modules/users.conf
+++ b/app-misc/calamares-config-redcore/files/modules/users.conf
@@ -22,9 +22,9 @@ defaultGroups:
     - disk
     - wheel
     - audio
+    - input
     - cdrom
     - cdrw
-    - cdemu
     - games
     - usb
     - plugdev
diff --git a/net-fs/sambacfg/sambacfg-1337-r1.ebuild b/net-fs/sambacfg/sambacfg-1337-r1.ebuild
new file mode 100644
index 00000000..2ac3cd32
--- /dev/null
+++ b/net-fs/sambacfg/sambacfg-1337-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user
+
+DESCRIPTION="Redcore Linux Samba configuration files"
+HOMEPAGE="https://redcorelinux.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="acct-group/smbshare"
+RDEPEND="${DEPEND}"
+
+S=${FILESDIR}
+
+src_install() {
+	dodir etc/samba
+	insinto etc/samba
+	newins redcore-smb.conf smb.conf
+	keepdir var/lib/samba/usershare
+}
+
+pkg_postinst() {
+	chown root:smbshare /var/lib/samba/usershare
+	chmod 1770 /var/lib/samba/usershare
+}
diff --git a/net-fs/sambacfg/sambacfg-1337.ebuild b/net-fs/sambacfg/sambacfg-1337.ebuild
deleted file mode 100644
index 3e0cf05e..00000000
--- a/net-fs/sambacfg/sambacfg-1337.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user
-
-DESCRIPTION="Redcore Linux Samba configuration files"
-HOMEPAGE="https://redcorelinux.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${FILESDIR}
-
-src_install() {
-	dodir etc/samba
-	insinto etc/samba
-	newins redcore-smb.conf smb.conf
-	keepdir var/lib/samba/usershare
-}
-
-pkg_preinst() {
-	enewgroup smbshare
-}
-
-pkg_postinst() {
-	chown root:smbshare /var/lib/samba/usershare
-	chmod 1770 /var/lib/samba/usershare
-}
-- 
cgit v1.2.3