calamares config && runtime done

11 files changed, 8 insertions, 63 deletions

diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.1-r5.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1.ebuild
index 11600728..11600728 100644
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.1-r5.ebuild
+++ b/app-misc/calamares-config-redcore/calamares-config-redcore-1.ebuild
diff --git a/app-misc/calamares-config-kogaion/files/modules/bootloader.conf b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
index 57c162da..62493e2e 100644
--- a/app-misc/calamares-config-kogaion/files/modules/bootloader.conf
+++ b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
@@ -5,8 +5,8 @@ efiBootLoader: "grub"
 
 # systemd-boot configuration files settings, set kernel and initramfs file names
 # and amount of time before default selection boots
-kernel: "/boot/kernel-genkernel-x86_64-4.4.4-kogaion"
-img: "/boot/initramfs-genkernel-x86_64-4.4.4-kogaion"
+kernel: "/boot/kernel-genkernel-x86_64-4.8.5-redcore"
+img: "/boot/initramfs-genkernel-x86_64-4.8.5-redcore"
 timeout: "10"
 # Optionally set the menu entry name and kernel name to use in systemd-boot.
 # If not specified here, these settings will be taken from branding.desc.
diff --git a/app-misc/calamares-config-kogaion/files/modules/displaymanager.conf b/app-misc/calamares-config-redcore/files/modules/displaymanager.conf
index 2e764a9b..2e764a9b 100644
--- a/app-misc/calamares-config-kogaion/files/modules/displaymanager.conf
+++ b/app-misc/calamares-config-redcore/files/modules/displaymanager.conf
diff --git a/app-misc/calamares-config-kogaion/files/modules/keyboard.conf b/app-misc/calamares-config-redcore/files/modules/keyboard.conf
index ff60ed60..ff60ed60 100644
--- a/app-misc/calamares-config-kogaion/files/modules/keyboard.conf
+++ b/app-misc/calamares-config-redcore/files/modules/keyboard.conf
diff --git a/app-misc/calamares-config-kogaion/files/modules/packages.conf b/app-misc/calamares-config-redcore/files/modules/packages.conf
index eaec5a1f..8d45706b 100644
--- a/app-misc/calamares-config-kogaion/files/modules/packages.conf
+++ b/app-misc/calamares-config-redcore/files/modules/packages.conf
@@ -29,10 +29,10 @@ backend: portage
 operations:
   - remove:
       - app-admin/calamares
-      - app-misc/calamares-config-kogaion
+      - app-misc/calamares-config-redcore
       - app-misc/calamares-runtime
-      - app-misc/kogaion-live
-      - x11-themes/kogaion-artwork-calamares
+      - app-misc/redcore-live
+      - x11-themes/redcore-artwork-calamares
 #  - install:
 #      - pkg1
 #      - pkg2
diff --git a/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf b/app-misc/calamares-config-redcore/files/modules/unpackfs.conf
index 91eca93e..91eca93e 100644
--- a/app-misc/calamares-config-kogaion/files/modules/unpackfs.conf
+++ b/app-misc/calamares-config-redcore/files/modules/unpackfs.conf
diff --git a/app-misc/calamares-config-kogaion/files/modules/users.conf b/app-misc/calamares-config-redcore/files/modules/users.conf
index 183c3f9d..183c3f9d 100644
--- a/app-misc/calamares-config-kogaion/files/modules/users.conf
+++ b/app-misc/calamares-config-redcore/files/modules/users.conf
diff --git a/app-misc/calamares-config-kogaion/files/modules/welcome.conf b/app-misc/calamares-config-redcore/files/modules/welcome.conf
index 7e4f3404..7e4f3404 100644
--- a/app-misc/calamares-config-kogaion/files/modules/welcome.conf
+++ b/app-misc/calamares-config-redcore/files/modules/welcome.conf
diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-redcore/files/settings.conf
index f67f4daf..91f9fe80 100644
--- a/app-misc/calamares-config-kogaion/files/settings.conf
+++ b/app-misc/calamares-config-redcore/files/settings.conf
@@ -97,7 +97,7 @@ sequence:
 # Only the name of the branding component (directory) should be specified here, Calamares
 # then takes care of finding it and loading the contents.
 # YAML: string.
-branding: kogaion_branding
+branding: redcore_branding
 
 # If this is set to true, Calamares will show an "Are you sure?" prompt right before
 # each execution phase, i.e. at points of no return. If this is set to false, no prompt
diff --git a/app-misc/calamares-runtime/calamares-runtime-3.1-r1.ebuild b/app-misc/calamares-runtime/calamares-runtime-1.ebuild
index 12e18eb4..91500299 100644
--- a/app-misc/calamares-runtime/calamares-runtime-3.1-r1.ebuild
+++ b/app-misc/calamares-runtime/calamares-runtime-1.ebuild
@@ -19,8 +19,8 @@ RDEPEND="
 	python? (
 		>=dev-libs/boost-1.55.0-r2[python_targets_python3_4]
 	)
-	branding? ( >=x11-themes/kogaion-artwork-calamares-2.0 )
-	>=app-misc/calamares-config-kogaion-2.0
+	branding? ( >=x11-themes/redcore-artwork-calamares-1 )
+	>=app-misc/calamares-config-redcore-1
 	>=dev-qt/designer-5.6.0:5
 	>=dev-qt/linguist-tools-5.6.0:5
 	>=dev-qt/qtconcurrent-5.6.0:5
diff --git a/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
deleted file mode 100644
index df6e0bd2..00000000
--- a/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_4 )
-
-DESCRIPTION="Calamares distribution-independent installer framework runtime meta-package (containing all the runtime dependencies)"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+branding +python"
-
-DEPEND=""
-RDEPEND="
-	python? (
-		>=dev-libs/boost-1.55.0-r2[python_targets_python3_4]
-	)
-	branding? ( >=x11-themes/kogaion-artwork-calamares-2.0 )
-	>=app-misc/calamares-config-kogaion-2.0
-	>=dev-qt/designer-5.4.0:5
-	>=dev-qt/linguist-tools-5.4.0:5
-	>=dev-qt/qtconcurrent-5.4.0:5
-	>=dev-qt/qtcore-5.4.0:5
-	>=dev-qt/qtdbus-5.4.0:5
-	>=dev-qt/qtdeclarative-5.4.0:5
-	>=dev-qt/qtgui-5.4.0:5
-	>=dev-qt/qtnetwork-5.4.0:5
-	>=dev-qt/qtopengl-5.4.0:5
-	>=dev-qt/qtprintsupport-5.4.0:5
-	>=dev-qt/qtscript-5.4.0:5
-	>=dev-qt/qtsvg-5.4.0:5
-	>=dev-qt/qttest-5.4.0:5
-	>=dev-qt/qtwidgets-5.4.0:5
-	>=dev-qt/qtxml-5.4.0:5
-	>=dev-qt/qtxmlpatterns-5.4.0:5
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/libatasmart-0.19
-	>=kde-frameworks/kconfig-5.10.0
-	>=kde-frameworks/ki18n-5.10.0
-	>=kde-frameworks/kcoreaddons-5.10.0
-	>=kde-frameworks/solid-5.10.0
-	>=net-misc/rsync-3.1[xattr]
-	>=sys-block/parted-3.0
-	>=sys-apps/gptfdisk-0.8.10
-	>=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]"