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

diff --cc bin/ebuild
Simple merge

diff --cc bin/egencache
Simple merge

diff --cc bin/misc-functions.sh
index 97e190b75fb3bb8d6681c64be0f105580b40846d,b3e62c5fe3941b4da696a67a4d3a712dde4164c1..34fe18f8877c4ea29677728257134fbd250dde3a
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc bin/portageq
Simple merge

diff --cc bin/quickpkg
Simple merge

diff --cc bin/repoman
Simple merge

diff --cc man/emerge.1
Simple merge

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

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

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

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