Revert "python-utils-r1.eclass: Remove old EAPI hack for exporting PY…

…THON" This reverts commit 9e4dc06. It fixed cross-prefix but inadvertently broke regular prefix. Both were ultimately affected by the same PMS + Portage bug where BROOT was not set in pkg_preinst. This has now been fixed, but regular prefix users need to be able to update Portage without hitting the issue. Cross-prefix users are safe because the BROOT Portage can be updated without hitting the issue. Closes: https://bugs.gentoo.org/911797 Signed-off-by: James Le Cuirot <[email protected]>
johu · Aug 7, 2023 · 01e4a63 · 01e4a63
1 parent db4990a
commit 01e4a63
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
@@ -338,7 +338,9 @@ _python_export() {
 				debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}"
 				;;
 			PYTHON)
-				export PYTHON=${BROOT}/usr/bin/${impl}
+				# Under EAPI 7+, this should just use ${BROOT}, but Portage
+				# <3.0.50 was buggy, and prefix users need this to update.
+				export PYTHON=${BROOT-${EPREFIX}}/usr/bin/${impl}
 				debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
 				;;
 			PYTHON_SITEDIR)