Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
Conflicts:
bin/dispatch-conf
bin/ebuild-helpers/doins
bin/ebuild-helpers/newbin
bin/ebuild-helpers/newconfd
bin/ebuild-helpers/newdoc
bin/ebuild-helpers/newenvd
bin/ebuild-helpers/newexe
bin/ebuild-helpers/newinitd
bin/ebuild-helpers/newins
bin/ebuild-helpers/newlib.a
bin/ebuild-helpers/newlib.so
bin/ebuild-helpers/newman
bin/ebuild-helpers/newsbin
bin/emerge-webrsync
bin/isolated-functions.sh
bin/phase-helpers.sh
21 files changed: