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

diff --cc bin/archive-conf
Simple merge

diff --cc bin/emaint
Simple merge

diff --cc bin/portageq
Simple merge

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

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

diff --cc pym/portage/_sets/files.py
Simple merge

diff --cc pym/portage/dbapi/bintree.py
Simple merge