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 2b23cc7633518db3de463c9a26427c939ab3c5d1..9cb54274c1defd62d1941522046d42fcc97168d7 100644 (file)
--- 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: