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

Conflicts:
	pym/portage/elog/mod_save.py

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/egencache
Simple merge

diff --cc bin/portageq
Simple merge

diff --cc bin/repoman
Simple merge

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

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/dbapi/vartree.py
Simple merge

diff --cc pym/portage/elog/mod_save.py
index d1c9bb86c210f20b5e67f5d54ca5ab56ff01ac2d,091bbf86d5a6d3177630313083290aa33f00052b..7f971826c2eddd634e90cf3c0fdf94068c342671
--- 1/pym/portage/elog/mod_save.py
--- 2/pym/portage/elog/mod_save.py
+++ b/pym/portage/elog/mod_save.py
@@@ -10,8 -11,7 +11,8 @@@ from portage import _unicode_decod
  from portage import _unicode_encode
  from portage.data import portage_gid, portage_uid
  from portage.package.ebuild.prepare_build_dirs import _ensure_log_subdirs
- from portage.util import ensure_dirs, normalize_path
+ from portage.util import apply_permissions, ensure_dirs, normalize_path
 +from portage.const import EPREFIX_LSTRIP
  
  def process(mysettings, key, logentries, fulltext):
  

diff --cc pym/portage/elog/mod_save_summary.py
Simple merge

diff --cc pym/portage/package/ebuild/_config/special_env_vars.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/package/ebuild/prepare_build_dirs.py
Simple merge