Merge branch 'master' of github.com:Rogentos/kogaion-desktop

5 files changed, 22 insertions, 101 deletions

diff --git a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r1.ebuild b/app-misc/anaconda-runtime/anaconda-runtime-1.1-r1.ebuild
deleted file mode 100644
index 206c58ff..00000000
--- a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2004-2010 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-EAPI="2"
-
-DESCRIPTION="Anaconda Installer runtime meta-package (containing all the runtime dependencies)"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="app-admin/system-config-date
-	app-admin/system-config-users
-	>=app-misc/rogentoslive-tools-1
-	>=app-misc/rogentos-version-1
-	app-text/xmlto
-	dev-libs/elfutils
-	dev-libs/libnl
-	dev-libs/libxml2[python]
-	dev-python/pyblock
-	>=dev-python/python-cryptsetup-0.1.4
-	dev-python/python-meh
-	dev-python/python-nss
-	dev-python/python-report
-	dev-python/urlgrabber
-	dev-util/pykickstart
-	net-misc/curl
-	net-misc/dhcp
-	net-misc/fcoe-utils
-	>=net-misc/networkmanager-0.7.2
-	sys-apps/dmidecode
-	sys-apps/language-configuration-helpers
-	>=sys-boot/grub-1.98
-	sys-boot/makebootfat
-	sys-fs/btrfs-progs
-	sys-fs/cryptsetup
-	sys-fs/dosfstools
-	sys-fs/e2fsprogs
-	sys-fs/jfsutils
-	sys-fs/mdadm
-	sys-fs/multipath-tools
-	|| ( sys-fs/ntfsprogs sys-fs/ntfs3g[ntfsprogs] )
-	sys-fs/reiserfsprogs
-	sys-fs/squashfs-tools
-	sys-fs/xfsprogs
-	sys-libs/cracklib
-	sys-libs/libuser
-	sys-libs/slang"
diff --git a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r3.ebuild b/app-misc/anaconda-runtime/anaconda-runtime-1.1-r3.ebuild
deleted file mode 100644
index f9a4aa40..00000000
--- a/app-misc/anaconda-runtime/anaconda-runtime-1.1-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2004-2010 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-EAPI="2"
-
-DESCRIPTION="Anaconda Installer runtime meta-package (containing all the runtime dependencies)"
-SRC_URI=""
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="app-admin/system-config-date
-	app-admin/system-config-users
-	>=app-misc/kogaion-live-1
-	>=app-misc/kogaion-version-1
-	app-text/xmlto
-	dev-libs/elfutils
-	dev-libs/libnl
-	dev-libs/libxml2[python]
-	dev-python/pyblock
-	>=dev-python/python-cryptsetup-0.1.4
-	dev-python/python-meh
-	dev-python/python-nss
-	dev-python/python-report
-	dev-python/urlgrabber
-	dev-util/pykickstart
-	net-misc/curl
-	net-misc/dhcp
-	net-misc/fcoe-utils
-	>=net-misc/networkmanager-0.7.2
-	sys-apps/dmidecode
-	>=sys-boot/grub-1.98
-	sys-boot/makebootfat
-	sys-fs/btrfs-progs
-	sys-fs/cryptsetup
-	sys-fs/dosfstools
-	sys-fs/e2fsprogs
-	sys-fs/jfsutils
-	sys-fs/mdadm
-	sys-fs/multipath-tools
-	|| ( sys-fs/ntfsprogs sys-fs/ntfs3g[ntfsprogs] )
-	sys-fs/reiserfsprogs
-	sys-fs/squashfs-tools
-	sys-fs/xfsprogs
-	sys-libs/cracklib
-	sys-libs/libuser
-	sys-libs/slang"
diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r3.ebuild
index e46b065f..e46b065f 100644
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r2.ebuild
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r3.ebuild
diff --git a/app-misc/calamares-config-kogaion/files/modules/users.conf b/app-misc/calamares-config-kogaion/files/modules/users.conf
new file mode 100644
index 00000000..37517aa2
--- /dev/null
+++ b/app-misc/calamares-config-kogaion/files/modules/users.conf
@@ -0,0 +1,21 @@
+---
+userGroup:       users
+defaultGroups:
+    - lp
+    - video
+    - network
+    - storage
+    - wheel
+    - audio
+    - cdrom
+    - cdrw
+    - usb
+    - plugdev
+    - vboxusers
+    - vboxsf
+    - entropy
+    - portage
+    - messagebus
+autologinGroup:  autologin
+sudoersGroup:    wheel
+setRootPassword: true
diff --git a/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
index f76741de..56ce336e 100644
--- a/app-misc/calamares-runtime/calamares-runtime-2.0.ebuild
+++ b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
 	>=sys-apps/dmidecode-2.12-r1
 	>=sys-fs/squashfs-tools-4.3:0[xattr]
 	>=sys-power/upower-0.99.0-r1
+	sys-boot/os-prober
 	sys-auth/polkit-qt5
 	sys-fs/udisks:2[systemd]
 	virtual/udev[systemd]"