Define BROOT in pkg_* phases following PMS change

Closes: https://bugs.gentoo.org/911797 Bug: https://bugs.gentoo.org/911574 Signed-off-by: James Le Cuirot <[email protected]> Closes: gentoo#1077 Signed-off-by: Sam James <[email protected]>
thesamesam · Aug 6, 2023 · cfa3149 · cfa3149
1 parent 697e297
commit cfa3149
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -3,6 +3,7 @@ portage-3.0.50 (UNRELEASED)
 
 Breaking changes:
 * The minimum supported Python version is now >= Python 3.9.
+
 * Portage now installed with Meson and Python sdist + wheel now prepared with
   meson-python for PEP 517 compliance.
 
@@ -23,6 +24,8 @@ Bug fixes:
 * Use the correct Python library path when launching scripts directly from a
   virtual environment.
 
+* Define BROOT in pkg_* phases following PMS change.
+
 portage-3.0.49 (2023-06-21)
 --------------
 

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
@@ -945,8 +945,8 @@ ___best_version_and_has_version_common() {
 					-r) root=${ROOT%/}/${EPREFIX#/} ;;
 					-d) root=${ESYSROOT:-/} ;;
 					-b)
-						# Use /${PORTAGE_OVERRIDE_EPREFIX#/} which is equivalent
-						# to BROOT, except BROOT is only defined in src_* phases.
+						# Use /${PORTAGE_OVERRIDE_EPREFIX#/} to support older
+						# EAPIs, as it is equivalent to BROOT.
 						root=/${PORTAGE_OVERRIDE_EPREFIX#/}
 						cmd+=(env EPREFIX="${PORTAGE_OVERRIDE_EPREFIX}")
 						;;

diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
@@ -3338,7 +3338,7 @@ def environ(self):
         if not (src_like_phase and eapi_attrs.sysroot):
             mydict.pop("ESYSROOT", None)
 
-        if not (src_like_phase and eapi_attrs.broot):
+        if not eapi_attrs.broot:
             mydict.pop("BROOT", None)
 
         if phase == "depend" or (