From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 4 Nov 2007 08:10:29 +0000 (-0000)
Subject: When evaluating *DEPEND conditionals for the Packages metadata
X-Git-Tag: v2.2_pre1~445
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a33e056cffbab0d1c03299c4f568a259dcee55a;p=portage.git

When evaluating *DEPEND conditionals for the Packages metadata
index, do not use IUSE to filter USE since there is currently
no guarantee that IUSE properly defines all of the necessary
flags.

svn path=/main/trunk/; revision=8420
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 2b23cc763..9cb54274c 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -803,6 +803,7 @@ class binarytree(object):
 		metadata["DESC"] = metadata["DESCRIPTION"]
 		del metadata["DESCRIPTION"]
 		use = metadata["USE"].split()
+		raw_use = use
 		iuse = set(metadata["IUSE"].split())
 		use = [f for f in use if f in iuse]
 		use.sort()
@@ -812,7 +813,7 @@ class binarytree(object):
 		for k in "LICENSE", "RDEPEND", "DEPEND", "PDEPEND", "PROVIDE":
 			try:
 				deps = paren_reduce(metadata[k])
-				deps = use_reduce(deps, uselist=use)
+				deps = use_reduce(deps, uselist=raw_use)
 				deps = paren_normalize(deps)
 				deps = paren_enclose(deps)
 			except portage.exception.InvalidDependString, e: