From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C51911387B1 for ; Thu, 5 Dec 2013 15:39:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62020E0818; Thu, 5 Dec 2013 15:38:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6C20E07FA for ; Thu, 5 Dec 2013 15:38:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A1EB33F548 for ; Thu, 5 Dec 2013 15:38:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4E221D07C4 for ; Thu, 5 Dec 2013 15:38:55 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1386256607.c08e18723f34cb33a025b7cfa999f03cced9a67b.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/bintree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: c08e18723f34cb33a025b7cfa999f03cced9a67b X-VCS-Branch: master Date: Thu, 5 Dec 2013 15:38:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2cb28450-3f46-4c30-bda5-3f6769a2602a X-Archives-Hash: 7ce8fff4394c502a06d23f89e5bc9f25 commit: c08e18723f34cb33a025b7cfa999f03cced9a67b Author: Sebastian Luther gmx de> AuthorDate: Thu Dec 5 13:36:51 2013 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Dec 5 15:16:47 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c08e1872 Don't filter USE for binary packages with IUSE (bug 485920) USE may contain values that aren't present in IUSE for any supported EAPI. This for example breaks use dependencies on USE_EXPAND-values. The behavior for binary packages is now in line with what is done for installed packages. Note that this filtering was not active during merge. URL: https://bugs.gentoo.org/485920 --- pym/portage/dbapi/bintree.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 61ac6b5..b1f67ae 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -1283,11 +1283,6 @@ class binarytree(object): def _eval_use_flags(self, cpv, metadata): use = frozenset(metadata["USE"].split()) - raw_use = use - iuse = set(f.lstrip("-+") for f in metadata["IUSE"].split()) - use = [f for f in use if f in iuse] - use.sort() - metadata["USE"] = " ".join(use) for k in self._pkgindex_use_evaluated_keys: if k.endswith('DEPEND'): token_class = Atom @@ -1296,7 +1291,7 @@ class binarytree(object): try: deps = metadata[k] - deps = use_reduce(deps, uselist=raw_use, token_class=token_class) + deps = use_reduce(deps, uselist=use, token_class=token_class) deps = paren_enclose(deps) except portage.exception.InvalidDependString as e: writemsg("%s: %s\n" % (k, str(e)),