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

diff --cc bin/ebuild.sh
index df9fc69becd5dab53ed389ceb8516b7a0fe9c75b,cc3b4a1424b74e4c07a4ad4f7fa7bc70db35f420..291b3a1ab4c65a27eb1329ade6c4c910ca194ed7
--- 1/bin/ebuild.sh
--- 2/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@@ -2318,9 -2314,10 +2330,10 @@@ elif [[ -n $EBUILD_SH_ARGS ]] ; the
                # Save the env only for relevant phases.
                if ! hasq "$EBUILD_SH_ARGS" clean help info nofetch ; then
                        umask 002
-                       save_ebuild_env | filter_readonly_variables > "$T/environment"
+                       save_ebuild_env | filter_readonly_variables \
+                               --filter-features > "$T/environment"
                        assert "save_ebuild_env failed"
 -                      chown portage:portage "$T/environment" &>/dev/null
 +                      chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} "$T/environment" &>/dev/null
                        chmod g+w "$T/environment" &>/dev/null
                fi
                [[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE"

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

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

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

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

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

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

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