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

diff --cc cnf/make.conf
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/main.py
Simple merge

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

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