Index: bin/emerge
===================================================================
--- bin/emerge	(revision 7576)
+++ bin/emerge	(revision 7577)
@@ -4443,7 +4443,6 @@
 	if myaction == "metadata":
 		print "skipping sync"
 		updatecache_flg = True
-		tmpservertimestampfile = None
 	elif syncuri[:8]=="rsync://":
 		if not os.path.exists("/usr/bin/rsync"):
 			print "!!! /usr/bin/rsync does not exist, so rsync support is disabled."
@@ -4558,9 +4557,6 @@
 		# Real local timestamp file.
 		servertimestampfile = os.path.join(
 			myportdir, "metadata", "timestamp.chk")
-		# Temporary file for remote server timestamp comparison.
-		tmpservertimestampfile = os.path.join(
-			settings["PORTAGE_TMPDIR"], "timestamp.chk")
 
 		content = portage_util.grabfile(servertimestampfile)
 		mytimestamp = 0
@@ -4674,6 +4670,10 @@
 			# connection attempt to an unresponsive server which rsync's
 			# --timeout option does not prevent.
 			if True:
+				# Temporary file for remote server timestamp comparison.
+				from tempfile import mkstemp
+				fd, tmpservertimestampfile = mkstemp()
+				os.close(fd)
 				mycommand = rsynccommand[:]
 				mycommand.append(dosyncuri.rstrip("/") + \
 					"/metadata/timestamp.chk")