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

Conflicts:
	bin/dohtml.py
	bin/misc-functions.sh

diff --cc bin/dohtml.py
Simple merge

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc bin/misc-functions.sh
index 0d60a51e7b86b73b612038e8b8886b8030d30aa0,4e81ddf5743e05253e6c62e4051dd364999f9c48..a7a18e23f0be0d8ef7174677dfa708194ee9d1a5
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/repoman
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/prepare_build_dirs.py
Simple merge