Attachment #71426 for bug #84884




	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")+"] ["+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


		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."




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 

Return to bug 84884

Lines 16-22 Link Here

(-)pym/emergehelp.py.0 (-1 / +16 lines)
16	print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" \| "+green("--ask")+" \| "+green("--skipfirst")+" ]"	16	print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" \| "+green("--ask")+" \| "+green("--skipfirst")+" ]"
17	print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" \| "+green("config")+" \| "+green("sync")+" ] "	17	print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" \| "+green("config")+" \| "+green("sync")+" ] "
18	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"	18	print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
19	print " ["+green("--columns")+"] ["+green("--nospinner")+"]"	19	print " ["+green("--columns")+"] ["+green("--nospinner")+"] ["+green("--use-desc-")+"("+green("all")+","+green("local")+","+green("special")+")]"
20	print bold("Actions:")+" [ "+green("--clean")+" \| "+green("--depclean")+" \| "+green("--prune")+" \| "+green("--regen")+" \| "+green("--search")+" \| "+green("--unmerge")+" ]"	20	print bold("Actions:")+" [ "+green("--clean")+" \| "+green("--depclean")+" \| "+green("--prune")+" \| "+green("--regen")+" \| "+green("--search")+" \| "+green("--unmerge")+" ]"
21	print	21	print
22		22
Lines 269-274 Link Here
269	print " may not what you want. In general use this option only in combi-"	269	print " may not what you want. In general use this option only in combi-"
270	print " nation with the world or system target."	270	print " nation with the world or system target."
271	print	271	print
		272	print " "+green("--use-desc-all")
		273	print " In addition to --verbose and either --ask or --pretend, display"
		274	print " descriptions of all USE flags affecting the packages that are to"
		275	print " be installed."
		276	print
		277	print " "+green("--use-desc-local")
		278	print " In addition to --verbose and either --ask or --pretend, display"
		279	print " descriptions of all local USE flags affecting the packages that"
		280	print " are to be installed."
		281	print
		282	print " "+green("--use-desc-special")
		283	print " In addition to --verbose and either --ask or --pretend, display"
		284	print " descriptions of USE flags affecting the packages that are to be"
		285	print " installed which have here a different meaning than their usual one."
		286	print
272	print " "+green("--usepkg")+" ("+green("-k")+" short option)"	287	print " "+green("--usepkg")+" ("+green("-k")+" short option)"
273	print " Tell emerge to use binary packages (from $PKGDIR) if they are"	288	print " Tell emerge to use binary packages (from $PKGDIR) if they are"
274	print " available, thus possibly avoiding some time-consuming compiles."	289	print " available, thus possibly avoiding some time-consuming compiles."

Lines 333-338 Link Here

(-)man.orig/emerge.1 (+15 lines)
333	This option is deprecated and should not be used anymore. Please use the	333	This option is deprecated and should not be used anymore. Please use the
334	/etc/portage/package.* files from now on.	334	/etc/portage/package.* files from now on.
335	.TP	335	.TP
		336	.BR "\-\-use\-desc\-all"
		337	In addition to \fB\-\-verbose\fR and either \fB\-\-ask\fR or \fB\-\-pretend\fR,
		338	display descriptions of all USE flags affecting the packages that are to be
		339	installed.
		340	.TP
		341	.BR "\-\-use\-desc\-local"
		342	In addition to \fB\-\-verbose\fR and either \fB\-\-ask\fR or \fB\-\-pretend\fR,
		343	display descriptions of all local USE flags affecting the packages that are to
		344	be installed.
		345	.TP
		346	.BR "\-\-use\-desc\-special"
		347	In addition to \fB\-\-verbose\fR and either \fB\-\-ask\fR or \fB\-\-pretend\fR,
		348	display descriptions of USE flags affecting the packages that are to be
		349	installed which have here a different meaning than their usual one.
		350	.TP
336	.BR "\-\-usepkg " (\fB\-k\fR)	351	.BR "\-\-usepkg " (\fB\-k\fR)
337	Tells emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some	352	Tells emerge to use binary packages (from $PKGDIR) if they are available, thus possibly avoiding some
338	time\-consuming compiles. This option is useful for CD installs; you can export PKGDIR=/mnt/cdrom/packages	353	time\-consuming compiles. This option is useful for CD installs; you can export PKGDIR=/mnt/cdrom/packages