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

Conflicts:
	pym/portage/data.py

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/isolated-functions.sh
Simple merge

diff --cc bin/phase-functions.sh
Simple merge

diff --cc man/emerge.1
Simple merge

diff --cc man/make.conf.5
Simple merge

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

diff --cc pym/_emerge/depgraph.py
index 12b84396fcb2fb95bbb703d74383d5e3d86c07f1,93819c611ba64a87af380d56456dd156f4fda926..2e3ca4b37bc368c51109c709099dce0f0957bbd1
--- 1/pym/_emerge/depgraph.py
--- 2/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@@ -7186,14 -7169,8 +7169,14 @@@ def _get_masking_status(pkg, pkgsetting
                        mreasons.append(_MaskReason("CHOST", "CHOST: %s" % \
                                pkg.metadata["CHOST"]))
  
 +      if pkg.built and not pkg.installed:
 +              if not "EPREFIX" in pkg.metadata:
 +                      mreasons.append(_MaskReason("EPREFIX", "missing EPREFIX"))
 +              elif len(pkg.metadata["EPREFIX"].strip()) < len(pkgsettings["EPREFIX"]):
 +                      mreasons.append(_MaskReason("EPREFIX", "EPREFIX: '%s' too small" % pkg.metadata["EPREFIX"]))
 +
        if pkg.invalid:
-               for msg_type, msgs in pkg.invalid.items():
+               for msgs in pkg.invalid.values():
                        for msg in msgs:
                                mreasons.append(
                                        _MaskReason("invalid", "invalid: %s" % (msg,)))

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

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

diff --cc pym/portage/data.py
index b2aac068e800779212ab277c13a5ba66eed88369,ec750a611d942961cc2474efd21d8190fd8c7906..1351c7f733a7e33e71b6aa44299f6fcbae35b72c
--- 1/pym/portage/data.py
--- 2/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -90,16 -86,13 +90,21 @@@ def _get_global(k)
                        secpass = 2
                #Discover the uid and gid of the portage user/group
                try:
-                       portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid
 -                      portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
+                       _portage_grpname = _get_global('_portage_grpname')
+                       if platform.python_implementation() == 'PyPy':
+                               # Somehow this prevents "TypeError: expected string" errors
+                               # from grp.getgrnam() with PyPy 1.7
+                               _portage_grpname = str(_portage_grpname)
+                       portage_gid = grp.getgrnam(_portage_grpname).gr_gid
 +              except KeyError:
 +                      # PREFIX LOCAL: some sysadmins are insane, bug #344307
-                       if _get_global('_portage_grpname').isdigit():
-                               portage_gid = int(_get_global('_portage_grpname'))
++                      if _portage_grpname.isdigit():
++                              portage_gid = int(_portage_grpname)
 +                      else:
 +                              portage_gid = None
 +                      # END PREFIX LOCAL
 +              try:
 +                      portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
                        if secpass < 1 and portage_gid in os.getgroups():
                                secpass = 1
                except KeyError:

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

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