8 files changed, 34 insertions, 29 deletions
diff --git a/app-misc/calamares-config-redcore/calamares-config-redcore-1.314.1337-r6.ebuild b/app-misc/calamares-config-redcore/calamares-config-redcore-1.314.1337-r12.ebuild
index d1471cf6..d1471cf6 100644
--- a/app-misc/calamares-config-redcore/calamares-config-redcore-1.314.1337-r6.ebuild
+++ b/app-misc/calamares-config-redcore/calamares-config-redcore-1.314.1337-r12.ebuild
diff --git a/app-misc/calamares-config-redcore/files/modules/bootloader.conf b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
index 233c27a6..21d4d53c 100644
--- a/app-misc/calamares-config-redcore/files/modules/bootloader.conf
+++ b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
@@ -1,8 +1,8 @@
 ---
 efiBootLoader: "grub"
 
-kernel: "/boot/vmlinuz-6.6.13-redcore-lts"
-img: "/boot/initrd-6.6.13-redcore-lts"
+kernel: "/boot/vmlinuz-6.10.14-redcore"
+img: "/boot/initrd-6.10.14-redcore"
 timeout: "10"
 
 grubInstall: "grub2-install"
diff --git a/app-misc/calamares-config-redcore/files/modules/dracut.conf b/app-misc/calamares-config-redcore/files/modules/dracut.conf
new file mode 100644
index 00000000..402a88e9
--- /dev/null
+++ b/app-misc/calamares-config-redcore/files/modules/dracut.conf
@@ -0,0 +1,2 @@
+---
+initramfsName: /boot/initrd-6.10.14-redcore
diff --git a/app-misc/calamares-config-redcore/files/modules/partition.conf b/app-misc/calamares-config-redcore/files/modules/partition.conf
index ff39e356..eb274351 100644
--- a/app-misc/calamares-config-redcore/files/modules/partition.conf
+++ b/app-misc/calamares-config-redcore/files/modules/partition.conf
@@ -15,4 +15,4 @@ requiredPartitionTableType:
      - msdos
      - gpt
 defaultFileSystemType:  "ext4"
-enableLuksAutomatedPartitioning:    true
+enableLuksAutomatedPartitioning:    false
diff --git a/app-misc/calamares-config-redcore/files/modules/welcome.conf b/app-misc/calamares-config-redcore/files/modules/welcome.conf
index d04786c9..c5b483b0 100644
--- a/app-misc/calamares-config-redcore/files/modules/welcome.conf
+++ b/app-misc/calamares-config-redcore/files/modules/welcome.conf
@@ -4,8 +4,8 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
 requirements:
-    requiredStorage:    32.0
-    requiredRam:        2.0
+    requiredStorage:    48.0
+    requiredRam:        4.0
     internetCheckUrl:   http://google.com
     check:
         - storage
diff --git a/app-misc/geoclue/geoclue-2.7.1-r5.ebuild b/app-misc/geoclue/geoclue-2.7.1-r6.ebuild
index 4b27f13f..601ac3db 100644
--- a/app-misc/geoclue/geoclue-2.7.1-r5.ebuild
+++ b/app-misc/geoclue/geoclue-2.7.1-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson python-any-r1 systemd vala xdg
diff --git a/app-misc/redcore-live/redcore-live-1.314.1337.ebuild b/app-misc/redcore-live/redcore-live-1.314.1337-r4.ebuild
index fb74ccb6..59462bbf 100644
--- a/app-misc/redcore-live/redcore-live-1.314.1337.ebuild
+++ b/app-misc/redcore-live/redcore-live-1.314.1337-r4.ebuild
@@ -1,11 +1,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 EGIT_BRANCH="master"
 EGIT_REPO_URI="https://pagure.io/redcore/redcore-live.git"
 
-inherit eutils git-r3
+inherit git-r3
 
 DESCRIPTION="Redcore Linux live scripts"
 HOMEPAGE="http://redcorelinux.org"
diff --git a/app-misc/redcore-skel/redcore-skel-1.314.1337-r2.ebuild b/app-misc/redcore-skel/redcore-skel-1.314.1337-r10.ebuild
index 86ef9006..3657c4fe 100644
--- a/app-misc/redcore-skel/redcore-skel-1.314.1337-r2.ebuild
+++ b/app-misc/redcore-skel/redcore-skel-1.314.1337-r10.ebuild
@@ -1,10 +1,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=6
+EAPI=8
 EGIT_REPO_URI="https://pagure.io/redcore/redcore-skel.git"
 
-inherit eutils git-r3
+inherit desktop git-r3
 
 DESCRIPTION="Redcore Linux skel tree"
 HOMEPAGE="https://redcorelinux.org"
@@ -14,33 +14,36 @@ KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND=""
 RDEPEND="
-	media-fonts/jetbrains-mono
+	media-fonts/fontawesome
 	media-fonts/roboto
 	x11-themes/material-icon-theme
-	x11-themes/numix-icon-theme
-	x11-themes/numix-icon-theme-circle
-	x11-themes/redcore-theme
 	x11-themes/redcore-artwork-community
 	x11-themes/redcore-artwork-core
-	x11-themes/redcore-artwork-grub"
-
-S="${WORKDIR}/${P}"
+	x11-themes/redcore-artwork-grub
+	x11-themes/redcore-theme
+	x11-themes/redcore-theme-sddm"
+S="${WORKDIR}/${P}/skel"
 
 src_install () {
-	dodir etc/skel
-	insinto etc/skel
-	doins -r skel/*
-	doins -r skel/.*
-
-	doicon "${FILESDIR}"/redcore-weblink.svg
-
-	dodir etc/xdg/autostart
-	insinto etc/xdg/autostart
+	local SKEL_HOME="/etc/skel"
+	dodir "${SKEL_HOME}"
+	insinto "${SKEL_HOME}"
+	doins -r *
+	doins -r .*
+	fperms 755 "${SKEL_HOME}"/.config/autostart/scripts/disable-dpms.sh
+	fperms 755 "${SKEL_HOME}"/.config/qtile/scripts/autostart.sh
+
+	local XDG_HOME="/etc/xdg"
+	dodir "${XDG_HOME}"/autostart
+	insinto "${XDG_HOME}"/autostart
 	doins "${FILESDIR}"/loginsound.desktop
 
-	dodir usr/share/sounds
-	insinto usr/share/sounds
+	local SND_HOME="/usr/share/sounds"
+	dodir "${SND_HOME}"
+	insinto "${SND_HOME}"
 	doins "${FILESDIR}"/redcore.ogg
 
-	rm -rf ${D}etc/.git
+	doicon "${FILESDIR}"/redcore-weblink.svg
+
+	rm -rvf "${D}"/etc/.git
 }