--- emerge.old	2006-08-05 07:27:30.094163576 +0000
+++ emerge	2006-08-05 07:30:31.163636832 +0000
@@ -2645,9 +2645,11 @@
 			maxretries=3 #default number of retries
 
 		retries=0
-		hostname, port=re.split("rsync://([^:/]*)(:[0-9]+)?", syncuri)[1:3];
+		user_name, hostname, port=re.split("rsync://([^:/]+@)?([^:/]*)(:[0-9]+)?", syncuri)[1:4]
 		if port is None:
 			port=""
+		if user_name is None:
+			user_name=""
 		updatecache_flg=True
 		all_rsync_opts = set(rsync_opts)
 		all_rsync_opts.update(
@@ -2679,7 +2681,7 @@
 
 			if ips:
 				try:
-					dosyncuri=string.replace(syncuri, "//"+hostname+port+"/", "//"+ips[0]+port+"/", 1)
+					dosyncuri=string.replace(syncuri, "//"+user_name+hostname+port+"/", "//"+user_name+ips[0]+port+"/", 1)
 				except SystemExit, e:
 					raise # Needed else can't exit
 				except Exception, e: