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

Conflicts:
	pym/_emerge/EbuildBuild.py

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

diff --cc pym/_emerge/EbuildBuild.py
index cbb3ea5abaf5ab558dcbaf0e3803a6f047b33d1c,afd6399cb081000ebcdffddcd8ad7fd93d51a1fe..a6fed37ff05c8a90050ec127a41105000b72bb14
--- 1/pym/_emerge/EbuildBuild.py
--- 2/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@@ -16,7 -16,7 +16,8 @@@ from portage import o
  from portage.output import colorize
  from portage.package.ebuild.digestcheck import digestcheck
  from portage.package.ebuild.doebuild import _check_temp_dir
 +from portage.const import EPREFIX
+ from portage.package.ebuild._spawn_nofetch import spawn_nofetch
  
  class EbuildBuild(CompositeTask):
  

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

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

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

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

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

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

diff --cc pym/portage/process.py
Simple merge