From d4ded4bd5f8470452abd7b30e030a8ba248defae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20H=C3=BCttenmeyer?= <walter.huettenmeyer@gmail.com>
Date: Mon, 5 Aug 2019 14:18:24 +0200
Subject: [PATCH] add new portage paths with optional portageq logic (#18)

* add new portage paths

added /var/db/repos/gentoo and /var/cache/distfiles to hard-coded list of excludes.
Portage has moved (when?) according to https://wiki.gentoo.org/wiki//usr/portage

* Added portageq logic

Added portageq logic to detect where portage stores its tree and distfiles.
If this fails, fall back to a default list declared in EXCLUDES_DEFAULT_PORTAGE
---
 mkstage4.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/mkstage4.sh b/mkstage4.sh
index d695c76..8c34f9e 100755
--- a/mkstage4.sh
+++ b/mkstage4.sh
@@ -16,6 +16,13 @@ USER_EXCL=""
 S_KERNEL=0
 x86_64=0
 PARALLEL=0
+HAS_PORTAGEQ=0
+
+if [ `which portageq` ]
+then
+  HAS_PORTAGEQ=1
+fi
+
 if [ `getconf LONG_BIT` = "64" ]
 then
     x86_64=1
@@ -143,18 +150,30 @@ EXCLUDES="\
 --exclude=${TARGET}run/* \
 --exclude=${TARGET}sys/* \
 --exclude=${TARGET}tmp/* \
---exclude=${TARGET}usr/portage/* \
 --exclude=${TARGET}var/lock/* \
 --exclude=${TARGET}var/log/* \
 --exclude=${TARGET}var/run/* \
---exclude=${TARGET}var/lib/docker/*"
+--exclude=${TARGET}var/lib/docker/* "
 
+EXCLUDES_DEFAULT_PORTAGE="\
+ --exclude=${TARGET}var/db/repos/gentoo/* \
+ --exclude=${TARGET}var/cache/distfiles/* \
+ --exclude=${TARGET}usr/portage/*"
 
 EXCLUDES+=$USER_EXCL
 
 if [ "$TARGET" == "/" ]
 then
   EXCLUDES+=" --exclude=${STAGE4_FILENAME#/}"
+  if [ ${HAS_PORTAGEQ} == 1 ]
+  then
+	  EXCLUDES+=" --exclude=$(portageq get_repo_path / gentoo)/*"
+	  EXCLUDES+=" --exclude=$(portageq distdir)/*"
+  else
+	  EXCLUDES+="${EXCLUDES_DEFAULT_PORTAGE}"
+  fi
+else
+	  EXCLUDES+="${EXCLUDES_DEFAULT_PORTAGE}"
 fi
 
 if [ ${EXCLUDE_CONNMAN} -eq 1 ]