--- emerge.org	2003-08-03 03:25:13.000000000 +0100
+++ emerge	2003-08-04 01:13:40.000000000 +0100
@@ -547,6 +547,7 @@
 		#self.fakedbapi.cpv_inject("sys-libs/glibc-2.3")	
 		self.outdatedpackages=[]
 		self.mydbapi={}
+		self.removelist=[]
 		if "empty" in myparams:
 			#for --update, we want to rebuild an entire empty tree of dependencies, and then we won't merge was is already merged.
 			self.mydbapi["/"]=self.fakedbapi
@@ -900,7 +901,8 @@
 			mygraph.delnode(mycurkey)
 		for x in dolist:
 			for y in portage.db[x]["merge"]:
-				retlist.append(y)
+				if not y in self.removelist:
+					retlist.append(y)
 		return retlist
 
 	def xcreate(self,mode="system"):
@@ -960,7 +962,10 @@
 				print "!!! Problem with",myk[0],myk[2]
 				print "!!! Possibly a DEPEND/*DEPEND problem."
 				print
-				return 0
+				print red("!!! remove ")+green("\""+myk[0]+" "+myk[2]+"\"")+red(" from update list at this time")
+				self.removelist.append(myk)
+				print
+
 		return 1
 
 	def match(self,mydep,myroot=portage.root,mykey=None):