From 080db5ec4b5f5aeeb7c2a22f856912169afc7cfa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 8 Oct 2017 22:00:06 +0100
Subject: reorganize repo's in a more sane way

---
 conf/intel/portage/bashrc                  | 6 +++---
 conf/intel/portage/global.conf/layout.conf | 2 +-
 conf/intel/portage/repos.conf/gentoo.conf  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/intel/portage/bashrc b/conf/intel/portage/bashrc
index adfae3e..a6f4f25 100644
--- a/conf/intel/portage/bashrc
+++ b/conf/intel/portage/bashrc
@@ -16,10 +16,10 @@ cleancache() {
 	# must be on the same filesystem, which is 99% the case. If they are on different
 	# filesystems, package cache is always saved, as mentioned above.
 
-	export local PORTDIRDEV=$(find /usr/portage -maxdepth 0 -printf "%D")
-	export local PKGDIRDEV=$(find /usr/portage/packages -maxdepth 0 -printf "%D")
+	export local PORTDIRDEV=$(find /usr/ports/gentoo -maxdepth 0 -printf "%D")
+	export local PKGDIRDEV=$(find /usr/ports/gentoo/packages -maxdepth 0 -printf "%D")
 	if [ $PORTDIRDEV = $PKGDIRDEV ]; then
-		rm -rf /usr/portage/packages/"${CATEGORY}"/"${P}"*.tbz2
+		rm -rf /usr/ports/gentoo/packages/"${CATEGORY}"/"${P}"*.tbz2
 	fi
 }
 
diff --git a/conf/intel/portage/global.conf/layout.conf b/conf/intel/portage/global.conf/layout.conf
index a33c3ae..f6666e0 100644
--- a/conf/intel/portage/global.conf/layout.conf
+++ b/conf/intel/portage/global.conf/layout.conf
@@ -1,4 +1,4 @@
-PORTDIR="/usr/portage"
+PORTDIR="/usr/ports/gentoo"
 DISTDIR="${PORTDIR}/distfiles"
 
 INSTALL_MASK="/etc/systemd
diff --git a/conf/intel/portage/repos.conf/gentoo.conf b/conf/intel/portage/repos.conf/gentoo.conf
index b0996df..b2368f8 100644
--- a/conf/intel/portage/repos.conf/gentoo.conf
+++ b/conf/intel/portage/repos.conf/gentoo.conf
@@ -2,7 +2,7 @@
 main-repo = redcore-desktop
 
 [redcore-desktop]
-location = /usr/local/portage
+location = /usr/ports/redcore
 sync-type = git
 sync-uri = https://gitlab.com/redcore/redcore-desktop.git
 auto-sync = yes
@@ -10,7 +10,7 @@ clone-depth = 1
 priority = 50
 
 [gentoo]
-location = /usr/portage
+location = /usr/ports/gentoo
 sync-type = git
 sync-uri = https://gitlab.com/redcore/portage.git
 auto-sync = yes
-- 
cgit v1.2.3