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

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/etc-update
Simple merge

diff --cc bin/quickpkg
Simple merge

diff --cc cnf/dispatch-conf.conf
Simple merge

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

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

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

diff --cc pym/_emerge/depgraph.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/output.py
Simple merge

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

diff --cc pym/portage/package/ebuild/config.py
index c595017a3652e406f60db359de7dc32ce685330e,664075197bc94e2f3f0e64da89022bc019948280..40a175855c90d5bc26c446c402d1a47b81af8e38
--- 1/pym/portage/package/ebuild/config.py
--- 2/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@@ -2073,12 -2063,14 +2075,15 @@@ class config(object)
                if not eapi_exports_AA(eapi):
                        mydict.pop("AA", None)
  
+               if not eapi_exports_merge_type(eapi):
+                       mydict.pop("MERGE_TYPE", None)
+ 
                # Prefix variables are supported starting with EAPI 3.
 -              if phase == 'depend' or eapi is None or not eapi_supports_prefix(eapi):
 -                      mydict.pop("ED", None)
 -                      mydict.pop("EPREFIX", None)
 -                      mydict.pop("EROOT", None)
 +              # but during transition, we just support them anywhere
 +#             if phase == 'depend' or eapi is None or not eapi_supports_prefix(eapi):
 +#                     mydict.pop("ED", None)
 +#                     mydict.pop("EPREFIX", None)
 +#                     mydict.pop("EROOT", None)
  
                if phase == 'depend':
                        mydict.pop('FILESDIR', None)

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

diff --cc pym/portage/versions.py
Simple merge