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

diff --cc bin/ebuild
Simple merge

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/egencache
Simple merge

diff --cc bin/repoman
Simple merge

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

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

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