From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 04:58:21 +0000 (-0000)
Subject: Fix broke package.provided handling.
X-Git-Tag: v2.1.5~289
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e9457405c690bf26f4e884f3b47c06ea17cab8f;p=portage.git

Fix broke package.provided handling.

svn path=/main/branches/2.1.2/; revision=9618
---

diff --git a/bin/emerge b/bin/emerge
index 477bff713..15196cb72 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2063,6 +2063,11 @@ class depgraph:
 			if not oneshot:
 				myfavorites.append(myatom)
 		for myarg, myatom in arg_atoms:
+				pprovided = pkgsettings.pprovideddict.get(
+					portage.dep_getkey(myatom))
+				if pprovided and portage.match_from_list(myatom, pprovided):
+					self._pprovided_args.append((myarg, myatom))
+					continue
 				pkg, existing_node = self._select_package(
 					myroot, myatom, onlydeps=onlydeps)
 				if not pkg:
@@ -3075,11 +3080,18 @@ class depgraph:
 			self._set_atoms.add(myatom)
 
 		for mydep in mylist:
+			pprovided = pkgsettings.pprovideddict.get(
+				portage.dep_getkey(mydep))
+			if pprovided and portage.match_from_list(mydep, pprovided):
+				self._pprovided_args.append((mydep, mydep))
+				continue
+
 			pkg, existing_node = self._select_package(
 				self.target_root, mydep)
 			if not pkg:
 				self._missing_args.append(mydep)
 				continue
+
 			if not self.create(pkg, None):
 				print >> sys.stderr, "\n\n!!! Problem resolving dependencies for", mydep
 				return 0