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

diff --cc bin/ebuild
Simple merge

diff --cc bin/emerge-webrsync
Simple merge

diff --cc bin/misc-functions.sh
index 750f5003ec58f3cb17aaf72cad2cbf663b5391ad,30244a74b27f29ac9b7e5a9410793a2d382ad599..e9d6e5ada7a8c6ad5414bda08e4d444bd9c66eea
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc bin/repoman
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/vartree.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/package/ebuild/fetch.py
Simple merge

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

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