diff -Nur portage-2.1.3_rc9/bin/emerge portage-2.1.3_rc9.new/bin/emerge
--- portage-2.1.3_rc9/bin/emerge	2007-07-22 00:49:38.000000000 -0700
+++ portage-2.1.3_rc9.new/bin/emerge	2007-07-30 15:54:11.000000000 -0700
@@ -2791,7 +2791,7 @@
 						raise portage_exception.PackageNotFound(pkg_key)
 					repo_path_real = os.path.dirname(os.path.dirname(
 						os.path.dirname(ebuild_path)))
-					pkgsettings.setcpv(pkg_key)
+					pkgsettings.setcpv(pkg_key, mydb=mydbapi)
 					metadata["USE"] = pkgsettings["USE"]
 				else:
 					repo_path_real = portdb.getRepositoryPath(repo_name)
@@ -2872,7 +2872,7 @@
 						mydbapi.aux_get(pkg_key, ["IUSE"])[0].split()))
 
 					forced_flags = set()
-					pkgsettings.setcpv(pkg_key) # for package.use.{mask,force}
+					pkgsettings.setcpv(pkg_key, mydb=mydbapi) # for package.use.{mask,force}
 					forced_flags.update(pkgsettings.useforce)
 					forced_flags.update(pkgsettings.usemask)