From 13671dd5ab70de236e2ac4ce151517a83ed62b26 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 20 May 2019 02:26:13 +0200
Subject: [PATCH] savedconfig.eclass: Use configuration file schemes with
 ${CTARGET} / ${CHOST} only when ${CTARGET} / ${CHOST} are not empty.

Fixes: https://bugs.gentoo.org/686350
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
---
 eclass/savedconfig.eclass | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index a518125b29f..960b1538521 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -111,19 +111,19 @@ restore_config() {
 
 	use savedconfig || return
 
-	local found check configfile
+	local configfile found package_dependency_spec
 	local base=${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig
-	for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
-		configfile=${base}/${CTARGET}/${check}
-		[[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check}
-		[[ -r ${configfile} ]] || configfile=${base}/${check}
-		einfo "Checking existence of ${configfile} ..."
-		if [[ -r "${configfile}" ]]; then
-			einfo "Found ${configfile}"
-			found=${configfile}
-			_SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
-			break
-		fi
+	for package_dependency_spec in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
+		for configfile in ${CTARGET:+${CTARGET}/${package_dependency_spec}} ${CHOST:+${CHOST}/${package_dependency_spec}} ${package_dependency_spec}; do
+			configfile=${base}/${configfile}
+			einfo "Checking existence of ${configfile} ..."
+			if [[ -r "${configfile}" ]]; then
+				einfo "Found ${configfile}"
+				found=${configfile}
+				_SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
+				break 2
+			fi
+		done
 	done
 	if [[ -f ${found} ]]; then
 		elog "Building using saved configfile ${found}"
-- 
2.21.0