Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	bin/ebuild.sh

diff --cc bin/ebuild.sh
index 5d44e61656664dda2702b22967a1cfe6bdd8fc6b,3be4d4565dd76af655d0f86eb11b42c0b156caea..d88e46710f19dc4e8260d00c628c2b1a772ca398
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -1694,11 -1684,22 +1694,23 @@@ PORTAGE_READONLY_METADATA="DEFINED_PHAS
        EAPI HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE
        PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
  
- READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \
-       EBUILD_SH_ARGS ED EMERGE_FROM EROOT FILESDIR \
-       PORTAGE_BINPKG_FILE PORTAGE_BIN_PATH PORTAGE_IUSE \
-       PORTAGE_PYM_PATH PORTAGE_MUTABLE_FILTERED_VARS \
-       PORTAGE_SAVED_READONLY_VARS PORTAGE_TMPDIR T WORKDIR"
+ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \
+       EBUILD_SH_ARGS ECLASSDIR EMERGE_FROM FILESDIR PM_EBUILD_HOOK_DIR \
+       PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC  \
+       PORTAGE_BINPKG_FILE PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE \
+       PORTAGE_BIN_PATH PORTAGE_BUILDDIR PORTAGE_BUNZIP2_COMMAND \
+       PORTAGE_BZIP2_COMMAND PORTAGE_COLORMAP PORTAGE_CONFIGROOT \
+       PORTAGE_DEBUG PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE \
+       PORTAGE_GID PORTAGE_GRPNAME PORTAGE_INST_GID PORTAGE_INST_UID \
+       PORTAGE_IPC_DAEMON PORTAGE_IUSE PORTAGE_LOG_FILE \
+       PORTAGE_MUTABLE_FILTERED_VARS PORTAGE_PYM_PATH PORTAGE_PYTHON \
+       PORTAGE_READONLY_METADATA PORTAGE_READONLY_VARS \
+       PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_SANDBOX_COMPAT_LEVEL \
+       PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \
+       PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \
+       PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \
 -      PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR"
++      PROFILE_PATHS REPLACING_VERSIONS REPLACED_BY_VERSION T WORKDIR \
++      ED EROOT"
  
  PORTAGE_SAVED_READONLY_VARS="A CATEGORY P PF PN PR PV PVR"
  

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc bin/repoman
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/portage/package/ebuild/_config/special_env_vars.py
Simple merge

diff --cc pym/portage/package/ebuild/doebuild.py
Simple merge

diff --cc pym/portage/util/__init__.py
Simple merge