--- portage-2.0.51_pre12-orig/pym/portage.py	2004-06-22 08:08:22.000000000 -0500
+++ portage-2.0.51_pre12/pym/portage.py	2004-07-08 12:09:33.192259680 -0500
@@ -1616,6 +1616,8 @@
 		if os.path.exists(infodir):
 			if os.path.exists(infodir+"/environment"):
 				self.configdict["pkg"]["PORT_ENV_FILE"] = infodir+"/environment"
+			if os.path.exists(infodir+"/environment.bz2"):
+				self.configdict["pkg"]["PORT_ENV_FILE"] = infodir+"/environment.bz2"
 
 			myre = re.compile('^[A-Z]+$')
 			for filename in listdir(infodir,filesonly=1,EmptyOnError=1):
@@ -2528,7 +2530,7 @@
 	if mydo not in ["fetch","digest","manifest"]:
 		# Should be ok again to set $T, as sandbox does not depend on it
 		mysettings["T"]=mysettings["BUILDDIR"]+"/temp"
-		if cleanup or mydo=="setup":
+		if cleanup or mydo=="clean":
 			if os.path.exists(mysettings["T"]):
 				shutil.rmtree(mysettings["T"])
 		if not os.path.exists(mysettings["T"]):