From d120da04d7ddbdc76d6bdd8f4c3720d71c87f870 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 8 Oct 2006 20:50:53 +0000
Subject: Make system/world less greedy for bug #150251.

svn path=/main/trunk/; revision=4619
---
 bin/emerge | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'bin/emerge')

diff --git a/bin/emerge b/bin/emerge
index 662c2dc0c..f927ae3bf 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1392,7 +1392,18 @@ class depgraph:
 					myslots.add(vardb.aux_get(cpv, ["SLOT"])[0])
 				if len(myslots) > 1:
 					for myslot in myslots:
-						newlist.append("%s:%s" % (mykey, myslot))
+						myslot_atom = "%s:%s" % (mykey, myslot)
+						available = False
+						if "--usepkgonly" not in self.myopts and \
+							self.trees[self.target_root][
+							"porttree"].dbapi.match(myslot_atom):
+							available = True
+						elif "--usepkg" in self.myopts and \
+							self.trees[self.target_root][
+							"bintree"].dbapi.match(myslot_atom):
+							available = True
+						if available:
+							newlist.append(myslot_atom)
 		mylist = newlist
 		
 		missing_atoms = []
-- 
cgit v1.2.3-1-g7c22