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

Conflicts:
	pym/_emerge/EbuildBuildDir.py

diff --cc bin/ebuild-helpers/ecompress
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/EbuildBuildDir.py
index 1ab157e5598ead9809c64a0364b948b183bd3296,1da3c93ae2c755aa3b6fff3b4a74a1c9b77c15ab..0451aec6f1e1b693c55d64d4e610eeb0ed864c88
--- 1/pym/_emerge/EbuildBuildDir.py
--- 2/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@@ -5,7 -5,7 +5,8 @@@ from _emerge.AsynchronousLock import As
  from _emerge.SlotObject import SlotObject
  import portage
  from portage import os
 +import sys
+ from portage.exception import PortageException
  import errno
  
  class EbuildBuildDir(SlotObject):

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

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

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

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

diff --cc pym/portage/dbapi/vartree.py
Simple merge

diff --cc pym/portage/dispatch_conf.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/prepare_build_dirs.py
Simple merge

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

diff --cc pym/portage/util/_dyn_libs/LinkageMapELF.py
Simple merge