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

diff --cc bin/emerge-webrsync
Simple merge

diff --cc bin/repoman
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc man/make.conf.5
Simple merge

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

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

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

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