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

Conflicts:
	pym/portage/_global_updates.py

WORLD_FILE already includes EPREFIX (derived from PRIVATE_PATH), so no
need to add EPREFIX to it again

diff --cc bin/emaint
Simple merge

diff --cc man/emerge.1
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/bintree.py
Simple merge

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