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

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/repoman
Simple merge

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

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

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