updated portage to 2.2.8-r1HEADmaster

1 files changed, 14 insertions, 10 deletions

diff --git a/portage_with_autodep/pym/_emerge/resolver/circular_dependency.py b/portage_with_autodep/pym/_emerge/resolver/circular_dependency.py
index aca81fa..b710671 100644
--- a/portage_with_autodep/pym/_emerge/resolver/circular_dependency.py
+++ b/portage_with_autodep/pym/_emerge/resolver/circular_dependency.py
@@ -1,7 +1,7 @@
-# Copyright 2010-2011 Gentoo Foundation
+# Copyright 2010-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from itertools import chain, product
 import logging
@@ -11,6 +11,7 @@ from portage.exception import InvalidDependString
 from portage.output import colorize
 from portage.util import writemsg_level
 from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange
+from _emerge.Package import Package
 
 class circular_dependency_handler(object):
 	
@@ -61,8 +62,7 @@ class circular_dependency_handler(object):
 				node = nodes[0]
 			display_order.append(node)
 			tempgraph.remove(node)
-		display_order.reverse()
-		return display_order
+		return tuple(display_order)
 
 	def _prepare_circular_dep_message(self):
 		"""
@@ -113,9 +113,10 @@ class circular_dependency_handler(object):
 			parent_atoms = self.all_parent_atoms.get(pkg)
 
 			if priorities[-1].buildtime:
-				dep = parent.metadata["DEPEND"]
+				dep = " ".join(parent._metadata[k]
+					for k in Package._buildtime_keys)
 			elif priorities[-1].runtime:
-				dep = parent.metadata["RDEPEND"]
+				dep = parent._metadata["RDEPEND"]
 
 			for ppkg, atom in parent_atoms:
 				if ppkg == parent:
@@ -125,7 +126,7 @@ class circular_dependency_handler(object):
 
 			try:
 				affecting_use = extract_affecting_use(dep, parent_atom,
-					eapi=parent.metadata["EAPI"])
+					eapi=parent.eapi)
 			except InvalidDependString:
 				if not parent.installed:
 					raise
@@ -144,7 +145,8 @@ class circular_dependency_handler(object):
 			#If any of the flags we're going to touch is in REQUIRED_USE, add all
 			#other flags in REQUIRED_USE to affecting_use, to not lose any solution.
 			required_use_flags = get_required_use_flags(
-				parent.metadata.get("REQUIRED_USE", ""))
+				parent._metadata.get("REQUIRED_USE", ""),
+				eapi=parent.eapi)
 
 			if affecting_use.intersection(required_use_flags):
 				# TODO: Find out exactly which REQUIRED_USE flags are
@@ -186,9 +188,11 @@ class circular_dependency_handler(object):
 					parent_atom not in reduced_dep:
 					#We found an assignment that removes the atom from 'dep'.
 					#Make sure it doesn't conflict with REQUIRED_USE.
-					required_use = parent.metadata.get("REQUIRED_USE", "")
+					required_use = parent._metadata.get("REQUIRED_USE", "")
 
-					if check_required_use(required_use, current_use, parent.iuse.is_valid_flag):
+					if check_required_use(required_use, current_use,
+						parent.iuse.is_valid_flag,
+						eapi=parent.eapi):
 						use = self.depgraph._pkg_use_enabled(parent)
 						solution = set()
 						for flag, state in zip(affecting_use, use_state):