--- /usr/bin/emerge	2004-04-19 14:52:34.000000000 +0900
+++ emerge	2004-04-19 14:51:39.899135792 +0900
@@ -712,12 +712,16 @@
 			#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
 		else:
-			self.mydbapi["/"]=portage.db["/"]["vartree"].dbapi
+			self.mydbapi["/"]=portage.fakedbapi()
+			for pkg in portage.db["/"]["vartree"].getallcpv():
+				self.mydbapi["/"].cpv_inject(pkg)
 		if portage.root!="/":
 			if "empty" in myparams:
 				self.mydbapi[portage.root]=self.fakedbapi
 			else:
-				self.mydbapi[portage.root]=portage.db[portage.root]["vartree"].dbapi
+				self.mydbapi[portage.root]=portage.fakedbapi()
+				for pkg in portage.db[portage.root]["vartree"].getallcpv():
+					self.mydbapi[portage.root].cpv_inject(pkg)
 			
 		if "--usepkg" in myopts:
 			try:
@@ -777,6 +781,8 @@
 			merging=2
 		if merging==1:
 			mybigkey.append("merge")
+			self.mydbapi[myroot].cpv_inject(mykey)
+
 		else:
 			mybigkey.append("nomerge")