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

Conflicts:
	bin/ebuild.sh

diff --cc bin/ebuild.sh
index 3c32cfcaeed5dd044fc85a99e87aaa2eeb8e6a74,b46d14a6341542758d6d525cbf20a0c9dcdfd8c0..3b925e70454482e3803d5e2f062b5ca1af846e30
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -2173,7 -2185,8 +2178,8 @@@ elif [[ -n $EBUILD_SH_ARGS ]] ; the
                if ! hasq "$EBUILD_SH_ARGS" clean help info nofetch ; then
                        umask 002
                        save_ebuild_env | filter_readonly_variables > "$T/environment"
 -                      chown portage:portage "$T/environment" &>/dev/null
+                       assert "save_ebuild_env failed"
 +                      chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} "$T/environment" &>/dev/null
                        chmod g+w "$T/environment" &>/dev/null
                fi
                exit 0

diff --cc bin/misc-functions.sh
index 8a3cb4e24b1aa6d6c9d4a4978a304b954310681f,16d3016d5a05d40572837b89e62b0d51a593ff75..e11991f004851a2a8322dae5905f88d6065dd047
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh

diff --cc man/emerge.1
Simple merge

diff --cc pym/_emerge/Package.py
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