From bbf769202ce0b9d3abf62f4303b6802f4663bbc8 Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Sun, 25 Apr 2021 17:34:53 +0100
Subject: profiles/common: use portageq instead of sourcing make.conf

---
 profiles/common/profile.bashrc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'profiles')

diff --git a/profiles/common/profile.bashrc b/profiles/common/profile.bashrc
index b5fddacf..8f5e5765 100644
--- a/profiles/common/profile.bashrc
+++ b/profiles/common/profile.bashrc
@@ -45,15 +45,11 @@ function __restore_bash_options () {
 }
 
 function __load_make_conf () {
-  if (( ${#} == 0 )) ; then
+  if (( ${#} != 1 )) ; then
     return 1
   fi
 
-  source <(
-    source "${PORTAGE_CONFIGROOT}/etc/portage/make.conf"
-    declare -p "${@}" 2> /dev/null \
-      | sed -e 's/^declare -. /declare -g /'
-  )
+  declare -g "${1}=$(env -i "PATH=${PATH}" portageq envvar ${1})"
 
   return $?
 }
-- 
cgit v1.2.3