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

diff --cc bin/ebuild-ipc.py
Simple merge

diff --cc bin/portageq
Simple merge

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

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