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

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/emerge-webrsync
Simple merge

diff --cc man/emerge.1
Simple merge

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

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

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