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

Conflicts:
	bin/emerge-webrsync
	pym/_emerge/depgraph.py

diff --cc bin/emerge-webrsync
index f4cd0d80bd9d29330d3e9cf9cc97316133c8b145,401e93595ae23449f56da569f9b0ec9b5d29455c..aace7c9702f00a0b583b1faad48087b91eaef597
--- 1/bin/emerge-webrsync
--- 2/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@@ -1,5 -1,5 +1,5 @@@
 -#!/bin/bash
 +#!@PORTAGE_BASH@
- # Copyright 1999-2008 Gentoo Foundation
+ # Copyright 1999-2011 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
  # Rewritten from the old, Perl-based emerge-webrsync script

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

diff --cc pym/_emerge/depgraph.py
index cf39ce3c26335de9250cca65d360f098f598ac2e,dfb4fc98def3ff954b7c3c68b84cb5d55efead9f..0f10f57613ba2d17fdff72173e8d349df717568f
--- 1/pym/_emerge/depgraph.py
--- 2/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@@ -5835,27 -5894,6 +5894,12 @@@ def _get_masking_status(pkg, pkgsetting
                        mreasons.append(_MaskReason("CHOST", "CHOST: %s" % \
                                pkg.metadata["CHOST"]))
  
-               if pkg.metadata["REQUIRED_USE"] and \
-                       eapi_has_required_use(pkg.metadata["EAPI"]):
-                       required_use = pkg.metadata["REQUIRED_USE"]
-                       if use is None:
-                               use = pkg.use.enabled
-                       try:
-                               required_use_is_sat = check_required_use(
-                                       required_use, use, pkg.iuse.is_valid_flag)
-                       except portage.exception.InvalidDependString:
-                               mreasons.append(_MaskReason("invalid", "invalid: REQUIRED_USE"))
-                       else:
-                               if not required_use_is_sat:
-                                       msg = "violated use flag constraints: '%s'" % required_use
-                                       mreasons.append(_MaskReason("REQUIRED_USE", "REQUIRED_USE violated"))
- 
 +      if pkg.built and not pkg.installed:
 +              if not "EPREFIX" in pkg.metadata or not pkg.metadata["EPREFIX"]:
 +                      mreasons.append("missing EPREFIX")
 +              elif len(pkg.metadata["EPREFIX"].strip()) < len(pkgsettings["EPREFIX"]):
 +                      mreasons.append("EPREFIX: '%s' too small" % pkg.metadata["EPREFIX"])
 +
        if pkg.invalid:
                for msg_type, msgs in pkg.invalid.items():
                        for msg in msgs:

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