9 files changed, 22 insertions, 17 deletions
diff --git a/app-misc/redcore-skel/files/3.0/img/redcore-weblink.png b/app-misc/redcore-skel/files/menu/img/redcore-weblink.png
index 858d375f..858d375f 100644
--- a/app-misc/redcore-skel/files/3.0/img/redcore-weblink.png
+++ b/app-misc/redcore-skel/files/menu/img/redcore-weblink.png
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-gentoo.desktop b/app-misc/redcore-skel/files/menu/xdg/redcore-gentoo.desktop
index 5b62299c..5b62299c 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-gentoo.desktop
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-gentoo.desktop
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-getlivehelp.desktop b/app-misc/redcore-skel/files/menu/xdg/redcore-getlivehelp.desktop
index f67fe60b..f67fe60b 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-getlivehelp.desktop
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-getlivehelp.desktop
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-git.desktop b/app-misc/redcore-skel/files/menu/xdg/redcore-git.desktop
index 957c0fcb..957c0fcb 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-git.desktop
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-git.desktop
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-homepage.desktop b/app-misc/redcore-skel/files/menu/xdg/redcore-homepage.desktop
index 26022c7a..26022c7a 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-homepage.desktop
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-homepage.desktop
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-mirrors.desktop b/app-misc/redcore-skel/files/menu/xdg/redcore-mirrors.desktop
index 5dea6702..5dea6702 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-mirrors.desktop
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-mirrors.desktop
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-redcore.directory b/app-misc/redcore-skel/files/menu/xdg/redcore-redcore.directory
index c22de2f8..e61aac8e 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-redcore.directory
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-redcore.directory
@@ -4,5 +4,3 @@ Type=Directory
 
 Icon=redcore-weblink
 Name=Redcore Linux
-
-
diff --git a/app-misc/redcore-skel/files/3.0/xdg/redcore-wiki.desktop b/app-misc/redcore-skel/files/menu/xdg/redcore-wiki.desktop
index 5d9ed278..5d9ed278 100644
--- a/app-misc/redcore-skel/files/3.0/xdg/redcore-wiki.desktop
+++ b/app-misc/redcore-skel/files/menu/xdg/redcore-wiki.desktop
diff --git a/app-misc/redcore-skel/redcore-skel-1710.ebuild b/app-misc/redcore-skel/redcore-skel-1710.ebuild
index 8e43bbbf..107e4602 100644
--- a/app-misc/redcore-skel/redcore-skel-1710.ebuild
+++ b/app-misc/redcore-skel/redcore-skel-1710.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://gitlab.com/redcore/redcore-skel.git"
 inherit eutils git-r3 fdo-mime
 
 DESCRIPTION="Redcore Linux skel tree"
-HOMEPAGE="http://redcorelinux.org"
+HOMEPAGE="https://redcorelinux.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -20,23 +20,30 @@ RDEPEND="
 	x11-themes/redcore-artwork-community
 	x11-themes/redcore-artwork-core"
 
+S="${WORKDIR}/${P}"
+
 src_install () {
-	dodir /etc/xdg/menus
-	cp "${S}"/* "${D}"/etc/ -Ra
-	chown root:root "${D}"/etc/skel -R
-
-	dodir /usr/share/desktop-directories
-	cp "${FILESDIR}"/3.0/xdg/*.directory "${D}"/usr/share/desktop-directories/
-	dodir /usr/share/redcore
-	cp -a "${FILESDIR}"/3.0/* "${D}"/usr/share/redcore/
-	doicon "${FILESDIR}"/3.0/img/redcore-weblink.png
-
-	dodir /etc/xdg/autostart
-	insinto /etc/xdg/autostart
+	dodir etc/skel
+	insinto etc/skel
+	doins -r skel/*
+	doins -r skel/.*
+
+	dodir usr/share/desktop-directories
+	insinto usr/share/desktop-directories
+	doins "${FILESDIR}"/menu/xdg/*.directory
+
+	dodir usr/share/redcore
+	insinto usr/share/redcore
+	doins -r "${FILESDIR}"/menu/*
+
+	doicon "${FILESDIR}"/menu/img/redcore-weblink.png
+
+	dodir etc/xdg/autostart
+	insinto etc/xdg/autostart
 	doins "${FILESDIR}"/loginsound.desktop
 
-	dodir /usr/share/sounds
-	insinto /usr/share/sounds
+	dodir usr/share/sounds
+	insinto usr/share/sounds
 	doins "${FILESDIR}"/redcore.ogg
 }