From a613a634821cdd2bf9f4846c3ebf42b5158f27d0 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Jan 2010 18:52:04 +0000
Subject: Add an Atom.evaluate_conditionals() method and use where appropriate.
 (trunk r15212)

svn path=/main/branches/2.1.7/; revision=15263
---
 bin/portageq | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/portageq b/bin/portageq
index 9fbf3c9bc..909876cc8 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -49,11 +49,7 @@ from portage.util import writemsg, writemsg_stdout
 def eval_atom_use(atom):
 	if atom.use.conditional and 'USE' in os.environ:
 		use = os.environ['USE'].split()
-		evaluated_atom = portage.dep.remove_slot(atom)
-		if atom.slot:
-			evaluated_atom += ":%s" % atom.slot
-		evaluated_atom += str(atom.use.evaluate_conditionals(use))
-		atom = portage.dep.Atom(evaluated_atom)
+		atom = atom.evaluate_conditionals(use)
 	return atom
 
 #-----------------------------------------------------------------------------
-- 
cgit v1.2.3-1-g7c22