[gentoo-commits] proj/portage:prefix commit in: cnf/, /

[gentoo-commits] proj/portage:prefix commit in: cnf/, /

[Fabian Groffen]

commit:     5809022122baff61ac84f9be88899b49a09bb551
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 10:08:29 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 10:08:29 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=58090221

*: drop no longer used EXTRA_PATH

This is now handled via baselayout's 99host file.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 cnf/make.globals | 3 ---
 subst-install.in | 1 -
 2 files changed, 4 deletions(-)

diff --git a/cnf/make.globals b/cnf/make.globals
index 574135288c..116b76cd7c 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -148,9 +148,6 @@ PORTAGE_ROOT_USER='@rootuser@'
 PORTAGE_INST_UID="@rootuid@"
 PORTAGE_INST_GID="@rootgid@"
 
-# Any extra PATHs to add to the ebuild environment's PATH (if any)
-EXTRA_PATH="@EXTRA_PATH@"
-
 # Mode bits for ${WORKDIR} (see ebuild.5).
 PORTAGE_WORKDIR_MODE="0700"
 

diff --git a/subst-install.in b/subst-install.in
index d65db48042..acc7824c4b 100644
--- a/subst-install.in
+++ b/subst-install.in
@@ -22,7 +22,6 @@ at='@'
 dirs='/(usr|lib(|[onx]?32|n?64)|etc|bin|sbin|var|opt|run)'
 sedexp=(
 	-r
-	-e "s,${at}EXTRA_PATH${at},@EXTRA_PATH@,g"
 	-e "s,${at}PORTAGE_BASE${at},@PORTAGE_BASE@,g"
 	-e "s,${at}PORTAGE_BASE_PATH${at},@PORTAGE_BASE@,g"
 	-e "s,${at}PORTAGE_BASH${at},@PORTAGE_BASH@,g"