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

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

diff --cc man/emerge.1
Simple merge

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

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

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