--- bin/emerge.orig	2004-02-04 18:27:28.250656462 +0100
+++ bin/emerge	2004-02-04 18:27:57.645032104 +0100
@@ -1793,22 +1797,42 @@
 		if global_unmerge and not pkgmap[x]["selected"]:
 			#avoid cluttering the preview printout with stuff that isn't getting unmerged
 			continue
-		print "\n "+white(x)
-		for mytype in ["selected","protected","omitted"]:
-			print string.rjust(mytype,12)+":",
-			if pkgmap[x][mytype]:
-				for mypkg in pkgmap[x][mytype]:
-					mysplit=portage.catpkgsplit(mypkg)
-					if mysplit[3]=="r0":
-						myversion=mysplit[2]
-					else:
-						myversion=mysplit[2]+"-"+mysplit[3]
-					if mytype=="selected":
-						print red(myversion),
-					else:
-						print green(myversion),
-			else:
-					print "none",
+		if "--quiet" not in myopts:
+			print "\n "+white(x)
+			for mytype in ["selected","protected","omitted"]:
+				print string.rjust(mytype,12)+":",
+				if pkgmap[x][mytype]:
+					for mypkg in pkgmap[x][mytype]:
+						mysplit=portage.catpkgsplit(mypkg)
+						if mysplit[3]=="r0":
+							myversion=mysplit[2]
+						else:
+							myversion=mysplit[2]+"-"+mysplit[3]
+						if mytype=="selected":
+							print red(myversion),
+						else:
+							print green(myversion),
+				else:
+						print "none",
+				print
+		else:
+			sys.stdout.write("--- "+white(x)+": ")
+			for mytype,myshorttype in [("selected","Sel."),("protected","Prot."),("omitted","Omit.")]:
+				if pkgmap[x][mytype]:
+					if not mytype=="selected":
+						sys.stdout.write("  ("+myshorttype+":")
+					for mypkg in pkgmap[x][mytype]:
+						mysplit=portage.catpkgsplit(mypkg)
+						if mysplit[3]=="r0":
+							myversion=mysplit[2]
+						else:
+							myversion=mysplit[2]+"-"+mysplit[3]
+						if mytype=="selected":
+							sys.stdout.write(" "+red(myversion))
+						else:
+							sys.stdout.write(" "+green(myversion))
+					if not mytype=="selected":
+						sys.stdout.write(")")
 			print
 	
 	print "\n>>>",red("'Selected'"),"packages are slated for removal."