From 02b24b21ffbbb922fd094d76691846b3aed77414 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 30 Aug 2017 18:45:35 +0100
Subject: app-misc/redcore-live && app-misc/calamares-config-redcore : enable
 lpadmin group by default

---
 .../calamares-config-redcore-1708-r3.ebuild        | 24 ------------------
 .../calamares-config-redcore-1708-r4.ebuild        | 24 ++++++++++++++++++
 .../files/modules/users.conf                       |  1 +
 app-misc/redcore-live/redcore-live-1708-r1.ebuild  | 29 ++++++++++++++++++++++
 app-misc/redcore-live/redcore-live-1708.ebuild     | 29 ----------------------
 5 files changed, 54 insertions(+), 53 deletions(-)
 delete mode 100644 app-misc/calamares-config-redcore/calamares-config-redcore-1708-r3.ebuild
 create mode 100644 app-misc/calamares-config-redcore/calamares-config-redcore-1708-r4.ebuild
 create mode 100644 app-misc/redcore-live/redcore-live-1708-r1.ebuild
 delete mode 100644 app-misc/redcore-live/redcore-live-1708.ebuild

diff --git a/app-misc/calamares-config-redcore/calamares-config-redcore-1708-r3.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1708-r3.ebuild
deleted file mode 100644
index 9f6639d2..00000000
--- a/app-misc/calamares-config-redcore/calamares-config-redcore-1708-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Redcore Linux Calamares modules config"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="app-admin/calamares"
-
-S="${FILESDIR}"
-
-src_install() {
-	dodir "/etc/calamares" || die
-	insinto "/etc/calamares" || die
-	doins -r "${S}/"* || die
-}
diff --git a/app-misc/calamares-config-redcore/calamares-config-redcore-1708-r4.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1708-r4.ebuild
new file mode 100644
index 00000000..9f6639d2
--- /dev/null
+++ b/app-misc/calamares-config-redcore/calamares-config-redcore-1708-r4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Redcore Linux Calamares modules config"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/calamares"
+
+S="${FILESDIR}"
+
+src_install() {
+	dodir "/etc/calamares" || die
+	insinto "/etc/calamares" || die
+	doins -r "${S}/"* || die
+}
diff --git a/app-misc/calamares-config-redcore/files/modules/users.conf b/app-misc/calamares-config-redcore/files/modules/users.conf
index 33d39999..0ada3e54 100644
--- a/app-misc/calamares-config-redcore/files/modules/users.conf
+++ b/app-misc/calamares-config-redcore/files/modules/users.conf
@@ -1,6 +1,7 @@
 ---
 defaultGroups:
     - lp
+    - lpadmin
     - video
     - tape
     - uucp
diff --git a/app-misc/redcore-live/redcore-live-1708-r1.ebuild b/app-misc/redcore-live/redcore-live-1708-r1.ebuild
new file mode 100644
index 00000000..0ed5f33f
--- /dev/null
+++ b/app-misc/redcore-live/redcore-live-1708-r1.ebuild
@@ -0,0 +1,29 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="master"
+EGIT_REPO_URI="https://gitlab.com/redcore/redcore-live.git"
+
+inherit eutils git-r3
+
+DESCRIPTION="Redcore Linux live scripts"
+HOMEPAGE="http://redcorelinux.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	default
+}
+
+pkg_postrm() {
+	for service in "redcorelive.service" ; do
+		find "${ROOT}etc/systemd/system" -name "$service" -delete
+	done
+}
diff --git a/app-misc/redcore-live/redcore-live-1708.ebuild b/app-misc/redcore-live/redcore-live-1708.ebuild
deleted file mode 100644
index 0ed5f33f..00000000
--- a/app-misc/redcore-live/redcore-live-1708.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="master"
-EGIT_REPO_URI="https://gitlab.com/redcore/redcore-live.git"
-
-inherit eutils git-r3
-
-DESCRIPTION="Redcore Linux live scripts"
-HOMEPAGE="http://redcorelinux.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	default
-}
-
-pkg_postrm() {
-	for service in "redcorelive.service" ; do
-		find "${ROOT}etc/systemd/system" -name "$service" -delete
-	done
-}
-- 
cgit v1.2.3