--- pym/emergehelp.py.0	2005-10-25 17:28:07.000000000 +0200
+++ pym/emergehelp.py	2005-10-25 17:40:16.000000000 +0200
@@ -16,7 +16,7 @@
 	print "   "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]"
 	print "   "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] "
 	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
-	print      "                                    ["+green("--columns")+"] ["+green("--nospinner")+"]"
+	print      "         ["+green("--columns")+"] ["+green("--nospinner")+"] ["+green("--use-desc-")+"("+green("all")+","+green("local")+","+green("special")+")]"
 	print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
 	print
 
@@ -269,6 +269,21 @@
 		print "              may not what you want. In general use this option only in combi-"
 		print "              nation with the world or system target."
 		print
+		print "       "+green("--use-desc-all")
+		print "              In addition to --verbose and either --ask or --pretend, display"
+		print "              descriptions of all USE flags affecting the packages that are to"
+		print "              be installed."
+		print
+		print "       "+green("--use-desc-local")
+		print "              In addition to --verbose and either --ask or --pretend, display"
+		print "              descriptions of all local USE flags affecting the packages that"
+		print "              are to be installed."
+		print
+		print "       "+green("--use-desc-special")
+		print "              In addition to --verbose and either --ask or --pretend, display"
+		print "              descriptions of USE flags affecting the packages that are to be"
+		print "              installed which have here a different meaning than their usual one."
+		print
 		print "       "+green("--usepkg")+" ("+green("-k")+" short option)"
 		print "              Tell emerge to use binary packages (from $PKGDIR) if they are"
 		print "              available, thus possibly avoiding some time-consuming compiles."
--- man.orig/emerge.1	2005-10-25 17:42:25.100036992 +0200
+++ man/emerge.1	2005-10-25 17:47:49.906658880 +0200
@@ -333,6 +333,21 @@
 This option is deprecated and should not be used anymore.  Please use the 
 /etc/portage/package.* files from now on.
 .TP
+.BR "\-\-use\-desc\-all"
+In addition to \fB\-\-verbose\fR and either \fB\-\-ask\fR or \fB\-\-pretend\fR,
+display descriptions of all USE flags affecting the packages that are to be 
+installed.
+.TP
+.BR "\-\-use\-desc\-local"
+In addition to \fB\-\-verbose\fR and either \fB\-\-ask\fR or \fB\-\-pretend\fR,
+display descriptions of all local USE flags affecting the packages that are to
+be installed.
+.TP
+.BR "\-\-use\-desc\-special"
+In addition to \fB\-\-verbose\fR and either \fB\-\-ask\fR or \fB\-\-pretend\fR,
+display descriptions of USE flags affecting the packages that are to be
+installed which have here a different meaning than their usual one.
+.TP
 .BR "\-\-usepkg " (\fB\-k\fR) 
 Tells emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some 
 time\-consuming compiles.  This option is useful for CD installs; you can export PKGDIR=/mnt/cdrom/packages