From: Fabian Groffen <grobian@gentoo.org>
Date: Fri, 7 Jan 2011 07:58:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f55cca94aac89374bb7de8fe906761152bf7f68;p=portage.git

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

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

6f55cca94aac89374bb7de8fe906761152bf7f68
diff --cc bin/emerge-webrsync
index f4cd0d80b,401e93595..aace7c970
--- a/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/depgraph.py
index cf39ce3c2,dfb4fc98d..0f10f5761
--- a/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: