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

diff --cc bin/misc-functions.sh
index 13e11f39e5739bdebdd9b7db1f7bb5bd9a883e5b,7726b9f2344a18d17752f099578c9867236b6d70..435bdb0f5a978b37a23f3ca115ee8b90f62398a6
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 cnf/make.conf
Simple merge

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

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

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

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

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

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