Merge branch 'gentoolkit' into euse

Conflicts:
	bin/euse

7 files changed, 933 insertions, 300 deletions

diff --git a/man/analyse.1 b/man/analyse.1
new file mode 100644
index 0000000..76044b8
--- /dev/null
+++ b/man/analyse.1
@@ -0,0 +1,210 @@
+.TH "ANALYSE" "22" "Febuary 2010" "GENTOOLKIT"
+.SH "NAME"
+analyse \- Gentoo Installed Package Analysis Tool
+
+.SH "SYNOPSIS"
+.BI "analyse " "[global-options] " "module " "[local-options]" "TARGET"
+
+.SH "DESCRIPTION"
+.B Analyse
+Is a collection of modules for analysing the state of installed Gentoo packages for
+USE flags or keywords used for installation, and their current masking status.
+.br
+It can also optionally (re)generate new /etc/portage/package.* files.
+.br 
+
+.br
+.B CAUTION:
+This is beta software and is not yet feature complete. Some features, options or its name
+may change in the future.   Any files that it generates are saved to your home directory
+and will not harm your system without effort on your part.
+.br
+
+.SH "GLOBAL OPTIONS"
+.HP
+.B \-h, \-\-help
+.br
+Output a help message.
+.HP
+.B \-q, \-\-quiet
+.br
+Be less verbose where possible. In some modules, this option can increase the output speed.
+.HP
+.B \-C, \-\-no-color
+.br
+Do not colorize output.
+.HP
+.B \-N, \-\-no\-pipe
+.br
+Turn off automatic pipe detection. Use this option if you do not want
+.B analyse
+To detect if the output is being directed to the screen or to another program
+and adjust color and verbosity accordingly.
+.HP
+.B \-V, \-\-version
+.br
+Display \fBGentoolkit\fP's version. Please include this in all bug reports. (see
+.B BUGS
+below)
+
+.SH "MODULES"
+.B Analyse
+Uses a system of modules. Each module has both a long and short name. 
+The list below uses the notation "\fBmodule (m)\fP", where \fIm\fP is the short name
+and \fImodule\fP is the long name.
+.P
+You can view the
+.B help
+message for a specific module by using
+.BR "-h" ", " "--help "
+as either a global option (after
+.B analyse
+and before the module name) or as a local option (after the module name).
+
+.SS
+.BI "analyse (a) [OPTIONS] TARGET"
+Report on all installed packages for \fITARGET\fP.
+.P
+
+.IR "TARGET" ":"
+.HP
+.B use
+.br
+Will analyse the installed with USE flags for output results.
+.HP
+.B pkguse
+.br
+Will analyse the USE flags information from the installed pkg's 'PKGUSE' file which contains 
+only flags settings from /etc/portage/package.use at the time of installation.
+.HP
+.B keywords
+.br
+Will analyse the recorded keywords for output results.
+.HP
+.B unmask
+.br
+Will analyse the installed packages and portage trees for pkgs that require unmasking and report them.
+.br
+.P
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-u, \-\-unset
+.br
+Will also include any USE flags used that were not enabled for some packages.
+.HP
+.B \-v, \-\-verebose
+.br
+Gives more detail about the results found and the current task being performed.
+
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+analyse a --verbose --unset use
+.EE
+.br
+Report on all use flags used to install the packages.  (--unset) Include in the report all flags
+that have been used but also were not set enabled for some packages.  
+(--verbose) Also list the packages that used the USE flag setting.
+The report will break down the useage and report the USE flag up to 3 times indicating its
+setting {"+","-"," "= unset} prepended to the flag name. 
+It will also color the output, red = Disabled, blue = Enabled, plain text = unset
+.br
+
+.SS
+.BI "rebuild (r) [OPTIONS] TARGET"
+Create a list all packages for \fITARGET\fP settings that are needed for
+other than the default settings.
+
+.IR "TARGET" ":"
+.HP
+.B use
+.br
+Will analyse the USE flags for output results.
+.HP
+.B keywords
+.br
+Will analyse the keywords for output results.
+.HP
+.B unmask
+.br
+Will analyse the installed packages and portage trees for pkgs that require
+unmasking and produce output/a new /etc/portage/package.unmask file.
+.P
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-a, \-\-all
+.br
+Create files/output for all TARGET(s) found to need it. (not Implemented yet)
+.HP
+.B \-e, \-\-excact
+.br
+Will prepend the pkg with = as well as use the version information for the entries.
+.br
+eg.:  =CAT/PKG-VER flag1 flag2
+.HP
+.B \-p, \-\-pretend
+.br
+Sends the output to the screen instead of a file.
+.HP
+.B \-v, \-\-verebose
+.br
+Gives more detail about the results found and the current task being performed.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+analyse rebuild -p use
+.EE
+.br
+Analyse the installed packages database and current system USE flag settings
+ and output the results in the form of:
+.br
+   
+.br
+.EX
+CAT/PKG -flag1 -flag2 flag3 flag4...
+
+.SS
+.BI "clean (c) [OPTIONS] TARGET"
+Clean all packages for \fITARGET\fP settings that are found with obsolete settings
+for the current settings and pkg ebuild. (not Implemented yet)
+
+.IR "TARGET" ":"
+.HP
+.B use
+.br
+Will analyse the USE flags and /etc/portage/package.use file(s) for entries that
+are redundant or no longer used by the pkg.
+.HP
+.B keywords
+.br
+Will analyse the keywords and /etc/portage/package.keywords file(s) for entries
+that are no longer needed.
+.HP
+.B unmask
+.br
+Will analyse the installed packages, /etc/portage/package.unmask file(s) and
+portage trees for pkgs that no longer require unmasking.
+.P
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-a, \-\-all
+.br
+Clean files/output for all TARGET(s) found to need it. (not Implemented yet)
+.HP
+.B \-p, \-\-pretend
+.br
+Sends the output to the screen instead of a file.
+.HP
+.B \-v, \-\-verebose
+.br
+Gives more detail about the results found and the current task being performed.
+
+
+.SH "BUGS"
+Submit bug reports to http://bugs.gentoo.org.
+
+.SH "AUTHORS"
+.br
+Brian Dolbec <brian.dolbec@gmail.com>, 2010
diff --git a/man/eclean.1 b/man/eclean.1
index 7d785af..651cc71 100644
--- a/man/eclean.1
+++ b/man/eclean.1
@@ -21,7 +21,7 @@ whatever may still be useful, for instance to downgrade a package without downlo
 its sources for the second time, or to reinstall a package you unmerge by mistake
 without recompiling it.  Sure, it's also a mode in which your DISTDIR and PKGDIR will
 stay rather big (although still not growing infinitely).  For the 'distfiles', this
-mode is also quit slow mode because it requiries some access to the whole Portage tree.
+mode is also quite slow because it requiries some access to the whole Portage tree.
 .PP
 If you use the \-\-destructive option, eclean will only protect files corresponding to
 some currently installed package (taking their exact version into account).  It will
@@ -76,6 +76,8 @@ Units are: y (years), m (months), w (weeks), d (days) and h (hours).
 .TP
 \fB\-h, \-\-help\fP                 display the help screen
 .TP
+\fB\-v, \-\-verbose\fP              display more verbose messages during processing
+.TP
 \fB\-V, \-\-version\fP              display version informations
 .SS "Actions"
 .TP
@@ -126,9 +128,16 @@ if a line contains a package name with an exclamation mark in front ("!sys\-apps
 then this package will be excluded from protection.  This is only useful if the category 
 itself was protected.
 .IP o
-for distfiles protection, a line can also a filename to protect. This is useful if you have
-there some files which are not registered by the ebuilds, like OpenOffice.org i18n files
-("helpcontent_33_unix.tgz" for instance).
+for distfiles protection, a line can also be a filename to protect. This is useful if you have
+some files which are not registered by the ebuilds, like OpenOffice.org i18n files
+("helpcontent_33_unix.tgz" for instance).  Another example are sources you want to protect
+that do not have an ebuild in the tree or any currently installed overlays.
+.IP o
+eclean will also inform you of any deprecated installed packages that are on your system as well
+as if it was able to locate the source filename(s) in order to protect them.  If you want to protect
+all installed distfile sources, run elcelan in pretend mode first.  Then check which sources it was
+not able to find the filename(s) for and add entries for them in the distfiles.exclude file before
+running eclean again.
 .LP
 By default, if it exists, /etc/eclean/packages.exclude (resp. distfiles.exclude) will be use
 when action is "packages" (resp. "distfiles").  This can be overide with the \-\-exclude\-file
@@ -156,9 +165,14 @@ From a crontab, silently clean packages in the safest mode, and then distfiles i
 mode but protecting files less than a week old, every sunday at 1am:
 .br
 .B 0 1 * * sun \ \ eclean \-C \-q packages ; eclean \-C \-q \-d \-t1w distfiles
+.SH "NOTE"
+.TP
+While running and searching distfiles for cleaning, elcean will report any deprecated packages
+it finds installed on your system.  Those sources may not be protected if the SRC_URI is not recorded
+in the installed package database.  The SRC_URI is no longer recorded by recent portage/pkgcore versions.
 .".SH "BUGS"
 .".TP
-."The policy used to decide wether a distfile can be removed or not relies on the SRC_URI variables ."of ebuilds.  It means that if an ebuild uses files that are not part of its SRC_URI, eclean will ."probably remove them.  This are ebuilds bugs, please report them as such on ."http://bugs.gentoo.org. 
+."The policy used to decide if a distfile can be removed or not relies on the SRC_URI variables ."of ebuilds.  It means that if an ebuild uses files that are not part of its SRC_URI, eclean will ."probably remove them.  This are ebuilds bugs, please report them as such on ."http://bugs.gentoo.org. 
 .".TP
 ."In safest mode (default, without the \-\-destructive option), this script can be very slow.  There
 ."is not much to do about it without hacking outside of the portage API.
@@ -169,8 +183,9 @@ The Gentoo forum thread that gave birth to eclean:
 .TP
 The bug report requesting eclean inclusion in gentoolkit:
 .B http://bugs.gentoo.org/show_bug.cgi?id=33877
-.TP
-Yacleaner, one of the other similar tools:
-.B http://blog.tacvbo.net/data/files/yacleaner/
 .SH "AUTHORS"
 Thomas de Grenier de Latour (tgl) <degrenier@easyconnect.fr>
+.br
+modular re-write by:
+.br
+Brian Dolbec (dol-sen) <brian.dolbec@gmail.com>
diff --git a/man/epkginfo.1 b/man/epkginfo.1
index cefe602..bfab2d7 100644
--- a/man/epkginfo.1
+++ b/man/epkginfo.1
@@ -1,34 +1,38 @@
-.TH "epkginfo" "1" "0.4.1" "Ned Ludd" "gentoolkit"
+.TH "EPKGINFO" "1" "August 2009" "GENTOOLKIT"
+
 .SH "NAME"
-.LP 
 epkginfo \- Displays metadata information from packages in portage
-.SH "SYNTAX"
-.LP 
-epkginfo [\fIpackage\-cat/\fP]package
+
+.SH "SYNOPSIS"
+.BI "epkginfo " "[options] " "package name or atom"
+
+.SH "DESCRIPTION"
+.B Epkginfo
+is a shortcut to \fBequery meta\fP. For all available options and more
+examples, see \fBman equery\fP.
+
 .SH "EXAMPLES"
-$ epkginfo app\-portage/gentoolkit
-.br 
-\fBPackage:\fR app\-portage/gentoolkit
-.br 
-\fBHerd:\fR tools\-portage
-.br 
-\fBMaintainer:\fR tools\-portage
-.br 
-\fBLocation:\fR /usr/portage/app\-portage/gentoolkit
-.br 
-\fBKeywords:\fR gentoolkit\-0.2.2:
-.br 
-\fBKeywords:\fR gentoolkit\-0.2.3:  mips
-.br 
-\fBKeywords:\fR gentoolkit\-0.2.3\-r1:  ppc ppc64 alpha arm s390 amd64 hppa x86 sparc ia64 m68k sh
-.br 
-\fBKeywords:\fR gentoolkit\-0.2.4_pre3:
-.br 
-\fBKeywords:\fR gentoolkit\-0.2.4_pre4:
-.br 
-\fBKeywords:\fR gentoolkit\-0.2.4_pre5:  ~arm ~hppa ~x86 ~m68k ~amd64 ~ppc ~sh ~x86\-fbsd ~ia64 ~alpha ~sparc ~ppc64 ~sparc\-fbsd ~mips ~s390
+.nf
+  * app-portage/gentoolkit [portage]
+Location:    /usr/portage/app-portage/gentoolkit
+Herd:        tools-portage (tools-portage@gentoo.org)
+Maintainer:  None specified
+Upstream:    None specified
+Keywords:    0.2.4.5: alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64
+                      s390 sh sparc x86 -x86-fbsd
+Keywords:    0.3.0_rc5: ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips
+                        ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd
+                        ~x86-fbsd
+Keywords:    0.3.0_rc6: ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips
+                        ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd
+                        ~x86-fbsd
+Keywords:    0.3.0_rc7: ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips
+                        ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd
+                        ~x86-fbsd
+.fi
+
 .SH "AUTHORS"
-.LP 
-Ned Ludd <solar@gentoo.org>
+.LP
+Douglas Anderson <douglasjanderson@gmail.com>
 .SH "BUGS"
 Please report any bugs to http://bugs.gentoo.org
diff --git a/man/equery.1 b/man/equery.1
index 27b8078..1a9c5e6 100644
--- a/man/equery.1
+++ b/man/equery.1
@@ -1,278 +1,636 @@
-.TH "equery" "1" "Oct 2005" "gentoolkit" ""
+.TH "EQUERY" "1" "August 2009" "GENTOOLKIT"
 .SH "NAME"
-equery \- Gentoo: Package Query Tool
+equery \- Gentoo Package Query Tool
+
 .SH "SYNOPSIS"
-.B equery  
-.I [global\-opts] command [local\-opts]
-.PP 
+.BI "equery " "[global-options] " "module " "[local-options]"
 
 .SH "DESCRIPTION"
-equery is a flexible utility which may display various information about 
-packages, such as the files they own, their USE flags, the md5sum 
-of each file owned by a given package, and many other things.
-
-.SH "OPTIONS"
-The 'command' is the only mandatory option to equery.  Most commands require
-a 'pkgspec' option, which is described by <cat/>packagename<\-version>;
-namely, the package name is mandatory, while the category and version are 
-optional.
-
-[global\-opts] may be one of:
-
-.B \-q, \-\-quiet   
-causes minimal output to be emitted
-.PP 
-.B \-C, \-\-nocolor 
-turns off colours
-.PP 
+.B Equery
+is a collection of modules for querying the state of Gentoo packages, files and USE flags.
+
+.SH "GLOBAL OPTIONS"
+.HP
 .B \-h, \-\-help
-displays a help summary
-.PP 
-.B \-V, \-\-version
-displays the equery version
-.PP 
+.br
+Output a help message.
+.HP
+.B \-q, \-\-quiet
+.br
+Be less verbose where possible. In some modules, this option can increase the output speed.
+.HP
+.B \-C, \-\-no-color
+.br
+Do not colorize output.
+.HP
 .B \-N, \-\-no\-pipe
-turns off pipe detection
-.PP 
+.br
+Turn off automatic pipe detection. Use this option if you do not want
+.B equery
+to detect if the output is being directed to the screen or to another program and adjust color and verbosity accordingly.
+.HP
+.B \-V, \-\-version
+.br
+Display \fBGentoolkit\fP's version. Please include this in all bug reports. (see
+.B BUGS
+below)
 
-Only one command will actually be run, at most.  The possible commands are: 
-.TP 
-.B belongs <local\-opts> file
-This command lists all packages owning the specified file.
-.br 
-Note: Normally, only one package will own a file. If multiple packages own the
-same file, it usually consitutes a problem, and should be reported (http://bugs.gentoo.org).
-.br 
-.IP 
-<local\-opts> is either or both of:
-.br 
-.B \-c, \-\-category cat 
-only search in category cat
-.br 
-.B \-f, \-\-full\-regex
-supplied query is a regex
-.br 
-.B \-e, \-\-earlyout 
-stop when first match found
-
-.PP 
-.B check pkgspec
-This command checks the files of the specified package against recorded MD5 
-sums and timestamps.
-.PP 
-.TP 
-.B depends <local\-opts> pkgspec
-This command displays all dependencies matching pkgspec.
-.br 
-<local\-opts> is either or both of:
-.br 
-.B \-a, \-\-all\-packages
-search in all available packages (slow)
-.br 
-.B \-d, \-\-direct
-search direct dependencies only (default)
-.br 
+.SH "MODULES"
+.B Equery
+uses a system of modules. Each module has both a long and short name. The list below uses the notation "\fBmodule (m)\fP", where \fIm\fP is the short name and \fImodule\fP is the long name.
+.P
+You can view the
+.B help
+message for a specific module by using
+.BR "-h" ", " "--help "
+as either a global option (after
+.B equery
+and before the module name) or as a local option (after the module name).
+
+.SS
+.BI "belongs (b) [OPTIONS] " "FILE"
+List the package that owns \fIFILE\fP.
+.P
+.BI Note:
+Normally, only one package will own \fIFILE\fP. If multiple packages own the
+same file it should be reported. (see
+.B BUGS
+below)
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-f, \-\-full-regex
+.br
+The supplied query is a regular expression.
+.HP
+.B \-e, \-\-early-out
+.br
+Stop when the first match is found. This is generally a safe optimization when searching for the owner of a single file.
+.HP
+.B \-n, \-\-name-only
+.br
+Do not print the version.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery belongs --early-out /usr/bin/euse
+.EE
+.br
+Find out what package installed a certain command.
+.EX
+.HP
+emerge -p $(equery -q belongs -nf '^/usr/bin/g?vim.*')
+.EE
+.br
+Tell
+.B emerge
+to reinstall or update any package that installed a file matching a regular expression.
+
+.SS
+.BI "changes (c) [OPTIONS] " "PKG"
+Display the Gentoo ChangeLog entry for the latest installable version of \fIPKG\fP.
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-l, \-\-latest
+.br
+Display only the latest ChangeLog entry. It's not uncommon for changes to be prepended to the ChangeLog without a version header if the changes did not require a version bump. Use this option to display such entries.
+.HP
+.B \-f, \-\-full
+.br
+Display the full ChangeLog.
+.br
+\fBHint\fP: Try piping (|) the output to a pager, like 'less'.
+.HP
+.BI "\-\-limit=" "NUM"
+.br
+Limit the \fINUM\fP of entries displayed. Use  this option in conjunction with \fB--full\fP. \fB--limit=3\fP would display the three latest entries.
+.HP
+.BI "\-\-from=" "VER"
+.br
+Set which \fIVER\fP to display from. Using this option by itself is equivalent to passing \fBchanges\fP a ranged package atom, e.g., '>=foo/bar-1.5'. It can be used in conjunction with \fB--to\fP to request a more complex range of entries.
+.HP
+.BI "\-\-to=" "VER"
+.br
+Set which \fIVER\fP to display to. (See \fB--from\fP)
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery changes portage
+.EE
+.br
+Display the Gentoo ChangeLog entry for the latest installable version of Portage.
+.EX
+.HP
+equery changes '=sys-apps/portage-2.1.6*'
+.EE
+.br
+Use Portage's atom syntax. (See \fBman 5 ebuild\fP)
+.EX
+.HP
+equery changes portage --from=2.2_rc1 --to=2.2
+.EE
+.br
+Display any ChangeLog entry within a range of versions.
+
+.SS
+.BI "check (k) [OPTIONS] " "PKG"
+Check timestamps and MD5 sums for files owned by \fIPKG\fP, where \fIPKG\fP is an installed package.
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-f, \-\-full-regex
+.br
+The supplied query is a regular expression.
+.HP
+.B \-o, \-\-only-failures
+.br
+Only display packages which don't pass all checks.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery check --only-failures '*'
+.EE
+.br
+Verify timestamps and MD5 sums for all installed packages and show only packages which fail checks.
+.EX
+.HP
+equery check 'dev-python/*' dev-lang/python
+.EE
+.br
+Verify every installed package in the \fBdev-python\fP category, and Python itself.
+
+.SS
+.BI "depends (d) [OPTIONS] " "PKG"
+List all packages that depend on \fIPKG\fP.
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-a, \-\-all-packages
+.br
+Include dependencies that are not installed. This can take a while.
+.HP
 .B \-D, \-\-indirect
-search indirect dependencies (very slow)
-.br 
-.B \-\-depth=n
-Limit depth of indirect dependency tree to n levels. Setting \-\-depth=0 is the same as not specifing \-\-indirect.
-.PP 
-.TP 
-.B depgraph <local\-opts> pkgspec
-This command display a dependency tree for pkgspec, by default indented to reflect
-how dependancies relate to each other.
-.br 
-.IP 
-<local\-opts> is either or both of:
-.br 
-.B \-U, \-\-no\-useflags 
-do not show USE flags.
-.br 
-.B \-l, \-\-linear    
-do not use fancy formatting 
-.br 
-.B \-\-depth=n
-Limit depth of dependency graph to n levels.
-.PP 
-.TP 
-.B files <local\-opts> pkgspec
-This lists files owned by a particular package, optionally with extra
-information specified by <local\-opts>
-.br 
+.br
+Search for both direct and indirect dependencies.
+.HP
+.BI "\-\-depth=" "NUM"
+.br
+Limit the indirect dependency tree to a depth of \fINUM\fP. \fB--depth=0\fP is equivalent to not using \fB--indirect\fP.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery depends --indirect xulrunner
+.EE
+.br
+Figure out why a package got installed on your system.
 
-<local\-opts> is any combination of:
-.br 
-.B \-\-timestamp
-output the timestamp of each file
-.br 
-.B \-\-md5sum
-output the md5sum of each file
-.br 
-.B \-\-type
-output the type of each file
-.br 
+.SS
+.BI "depgraph (g) [OPTIONS] " "PKG"
+Display a direct dependency graph for every matching version of \fIPKG\fP. A dependency graph is an
+indented tree showing the relationship between packages and their dependencies.
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-A, \-\-no-atom
+.br
+Do not show the dependency atom that match the package.
+.HP
+.B \-U, \-\-no-useflags
+.br
+Do not show USE flags.
+.HP
+.B \-l, \-\-linear
+.br
+Do not format the graph by indenting dependencies. This option will print the
+recursion depth in square brackets before the package name for easier viewing
+in narrow terminals.
+.HP
+.BI "\-\-depth=" "NUM"
+.br
+Limit the dependency graph to a depth of \fINUM\fP. \fB--depth=0\fP means no
+maximum depth. Default depth is set to 1.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery depgraph --depth=0 portage
+.EE
+.br
+View a full tree of all direct and indirect compile-time, run-time, and post-merge dependencies for a package.
+
+.SS
+.BI "files (f) [OPTIONS] " "PKG"
+List files and directories installed by \fIPKG\fP.
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-m, \-\-md5sum
+.br
+Include the file's MD5 sum in the output.
+.HP
+.B \-s, \-\-timestamp
+.br
+Include the file's timestamp in the output.
+.HP
+.B \-t, \-\-type
+.br
+Include the file type in the output.
+.HP
 .B \-\-tree
-display results in a tree (turns off all other options)
-.br 
-.B \-\-filter=<rules>
-filter output based on files type or path
-.br 
-.B \t<rules>
-is a comma separated list of filtering rules. Available rules are:
-.br 
-.B \t\tdir\ 
-regular directories
-.br 
-.B \t\tobj\ 
-regular files
-.br 
-.B \t\tsym\ 
-symbolic links
-.br 
-.B \t\tdev\ 
-device nodes
-.br 
-.B \t\tfifo
-named pipes
-.br 
-.B \t\tpath
-shortest paths where some files where installed
-.br 
-.B \t\tconf
-configuration files (based on $CONFIG_PROTECT)
-.br 
-.B \t\tcmd\ 
-user commands (based on $PATH)
-.br 
-.B \t\tdoc\ 
-documentation files (from /usr/share/doc)
-.br 
-.B \t\tman\ 
-manpages (from /usr/share/man)
-.br 
-.B \t\tinfo
-info pages (from /usr/share/info)
-.PP 
-.TP 
-.B hasuse <local\-opts> useflag
-This command lists packages matching a particular USE flag in a user\-specified combination
-of installed packages, packages which are not installed, the portage tree, and
-the portage overlay tree.
-
-<local\-opts> must not include only \-I;
-if \-I is used, \-p and/or \-o must be also be present.  By default, only installed
-packages are searched.  \-o searches only the overlay tree [and possibly
-installed packages],
-.I not
-the main portage tree.
-
-.B \-i, \-\-installed
-search installed packages (default)
-.br 
-.B \-I, \-\-exclude\-installed
-do not search installed packages
-.br 
-.B \-p, \-\-portage\-tree
-also search in portage tree (/usr/portage)
-.br 
-.B \-o, \-\-overlay\-tree
-also search in overlay tree (/usr/local/portage)
-.PP 
-.TP 
-.B list <local\-opts> pkgspec
-This command lists packages matching pkgspec in a user\-specified combination
-of installed packages, packages which are not installed, the portage tree, and
-the portage overlay tree. By default the list command searches for partial name matches.
-
-<local\-opts> \-I cannot be used by itself;
-if \-I is used, \-p and/or \-o must be also be present.  By default, only installed
-packages are searched.  \-o searches only the overlay tree [and possibly
-installed packages],
-\fInot\fR the main portage tree.
-
-.B \-i, \-\-installed
-search installed packages (default)
-.br 
-.B \-I, \-\-exclude\-installed
-do not search installed packages
-.br 
-.B \-p, \-\-portage\-tree
-also search in portage tree (/usr/portage)
-.br 
-.B \-o, \-\-overlay\-tree
-also search in overlay tree (/usr/local/portage)
-.br 
-.B \-f, \-\-full\-regex
-query is a regular expression
-.br 
-.B \-e, \-\-exact\-name
-list only those packages that exactly match
-.br 
+.br
+Display files in a tree format. This option turns off all other local options.
+.HP
+.BI "\-f, \-\-filter=" "RULES"
+.br
+Filter output by file type.
+.HP
+RULES
+.br
+A comma-separated list (no spaces); choose from:
+.br
+.B dir, obj, sym, dev, path, conf, cmd, doc, man, info
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery files --tree vlc
+.EE
+.br
+View a file tree of all files installed by a package.
+.EX
+.HP
+equery files --filter=cmd vlc
+.EE
+.br
+Find out where a package installed its executables.
+
+.SS
+.BI "has (a) [OPTIONS] " "KEY  VALUE"
+List all installed packages that have a given \fIPKG\fP match.
+
+\fBNote\fP: \fBKEY\fP is case sensitive. Also \fBhas\fP does not currently have the ability to inteligently compare values dependending on the type of information being looked up.  It performs a simple string match. It can only list which packages have the matching \fBVALUE\fP as given on the command line. It is a general purpose lookup for most information available via portage's dbapi.aux_get() function.  Warning the quality of the results printed is dependant on the quality of the search (given the limited comparison method) and the recorded data available in the vardb. (See \fIEXAMPLES\fP)
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-I, \-\-exclude-installed
+.br
+Exclude installed packages from being output.
+.HP
+.B \-o, \-\-overlay-tree
+.br
+Include package from overlays in the search path.
+.HP
+.B \-p, \-\-portage-tree
+.br
+Include all packages from the Portage tree in the search path. Use this option to search through all standard Gentoo packages, including those that are not installed.
+.HP
+.B \-F, \-\-format=\fITMPL\fP
+.br 
+Customize the output format of the matched packages using the template string \fITMPL\fP. See the \fB\-\-format\fP option for \fBlist\fP below for a description of the \fITMPL\fP argument.
+.P
+.IR "OUTPUT" ":"
+.HP
+(See \fIOUTPUT\fP for \fBlist\fP below)
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery has SLOT 2.4
+.EE
+.br
+View all installed Gentoo packages that have a recorded SLOT = "2.4".
+.EX
+.HP
+equery has repository sunrise
+.EE
+.br
+View all installed Gentoo packages that were recorded to be installed from ebuilds from the "sunrise" overlay.
+.EX
+.HP
+equery has EAPI 2
+.EE
+.br
+View all installed Gentoo packages that were installed with ebuilds with a recorded EAPI of "2".
+
+.SS
+.BI "hasuse (h) [OPTIONS] " "USE"
+List all installed packages that have a given \fIPKG\fP flag.
+
+\fBNote\fP: \fBhasuse\fP does not currently have the ability to display if packages are built with the given USE flag or not. It can only list which packages have the flag as an option. (See \fIEXAMPLES\fP)
+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-I, \-\-exclude-installed
+.br
+Exclude installed packages from being output.
+.HP
+.B \-o, \-\-overlay-tree
+.br
+Include package from overlays in the search path.
+.HP
+.B \-p, \-\-portage-tree
+.br
+Include all packages from the Portage tree in the search path. Use this option to search through all standard Gentoo packages, including those that are not installed.
+.HP
+.B \-F, \-\-format=\fITMPL\fP
+.br 
+Customize the output format of the matched packages using the template string \fITMPL\fP. See the \fB\-\-format\fP option for \fBlist\fP below for a description of the \fITMPL\fP argument.
+.P
+.IR "OUTPUT" ":"
+.HP
+(See \fIOUTPUT\fP for \fBlist\fP below)
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery hasuse -pI perl
+.EE
+.br
+View all Gentoo packages that have the "perl" USE flag, exluding installed packages.
+.EX
+.HP
+USE="perl"; for PKG in $(equery -q hasuse $USE); do echo $PKG: $(equery -q uses $PKG |grep $USE); done
+.EE
+.br
+This Bash one-liner uses \fBhasuse\fP to find a list of packages that have a certain USE flag, and \fBuses\fP to check whether the flag is enabled or disabled. Modify \fBUSE="perl"\fP to change the query.
+
+.SS
+.BI "list (l) [OPTIONS] " "PKG"
+List installed versions of \fIPKG\fP or all packages matching the query pattern.
+
+.IR "LOCAL OPTIONS" ":"
+.HP
 .B \-d, \-\-duplicates
-only list installed duplicate packages
-.br 
+.br
+List only packages with more than one version installed.
+.HP
+.B \-f, \-\-full-regex
+.br
+The supplied query is a regular expression.
+.HP
+.B \-m, \-\-mask-reason
+.br
+Print the reason why a package was masked.
+.HP
+.B \-I, \-\-exclude-installed
+.br
+Exclude installed packages from being output.
+.HP
+.B \-o, \-\-overlay-tree
+.br
+Include package from overlays in the search path.
+.HP
+.B \-p, \-\-portage-tree
+.br
+Include all packages from the Portage tree in the search path. Use this option to search through all standard Gentoo packages, including those that are not installed.
+.HP
+.B \-F, \-\-format=\fITMPL\fP
+.br 
+Customize the output format of the matched packages using the template string \fITMPL\fP. \fITMPL\fP can contain the following placeholders:
+.RS
+.TP
+\fB$cp\fP \- Contains the category and the package name only (e.g 'app\-portage/gentoolkit').
+.TP
+\fB$cpv\fP \- Contains the category, the package name and the full version (e.g. 'app\-portage/gentoolkit\-0.3.0_rc10\-r1').
+.TP
+\fB$category\fP \- Contains just the category (e.g. 'app\-portage').
+.TP
+\fB$name\fP \- Contains just the package name (e.g. 'gentoolkit').
+.TP
+\fB$version\fP \- Contains the package version (without the revision) (e.g. '0.3.0_rc10').
+.TP
+\fB$revision\fP \- Contains the package revision (e.g. 'r1').
+.TP
+\fB$fullversion\fP \- Contains the package version including its revision (e.g. '0.3.0_rc10\-r1').
+.TP
+\fB$slot\fP \- Contains the package's slot.
+.TP
+\fB$repo\fP \- Contains the name of the package's repository (e.g. 'gentoo').
+.TP
+\fB$mask\fP \- The Mask\-status field (\fB~M\-??\fP), see \fIOUTPUT\fP below for an explanation.
+.TP
+\fB$mask2\fP \- Contains a verbose description of the packages masking status.
+.TP
+\fB$location\fP \- The Location field (\fBIPO\-\fP), see \fIOUTPUT\fP below for an explanation.
+.P
+Apart from the above placeholders the template string can contain arbitrary
+text as desired. Similar to bash variables, curly braces can be used to
+disambiguate the variable names from the enclosing text.
+.RE
+.P
+.IR "OUTPUT" ":"
 
-\fBOutput:\fR
+.EX
+$ equery list binutils
+ * Searching for binutils ...
+ [I--] [??] sys-devel/binutils-2.18-r1:i686-pc-linux-gnu-2.18
+ [IP-] [ ~] sys-devel/binutils-2.19.1-r1:i686-pc-linux-gnu-2.19.1
+.EE
+.HP
+Location field (\fB[IPO-]\fP):
+.br
+The first field shows the location and install status of the package. It consists of three letters in square brackets. \fBI\fP indicates the package is currently installed. \fBP\fP indicates the package is available in the Portage tree. \fBO\fP indicates the package is available in at least one overlay. \fB-\fP is a place holder and has no meaning. \fB[I-O]\fP would mean that the package is installed and available from an overlay, but not available from the Portage tree.
+.HP
+Mask-status field (\fB[ ~M-??]\fP):
+.br
+The second field shows the mask status of the package. Empty brackets indicate that the package is unmasked. A \fB~\fP means the package is masked by keyword, e.g., you are running a stable system and the package is marked testing). \fBM\fP means hard masked, e.g., the package maintainer has determined the package is unfit for widespread usage. \fB-\fP means arch masked, e.g., you are running an amd64 system, but this package only works on x86. Lastly, \fB??\fP only occurs when the location field is \fB[I--]\fP. Together, they indicate that the package was installed from the Portage tree or an overlay, but has since been removed from that tree; therefore \fBequery\fP can not determine a mask status for it.
+.HP
+Package name:
+.br
+The third field is the full package name and version.
+.HP
+Slot:
+.br
+The fourth field, after the colon, is the package's slot. \fB0\fP is the default slot. To find all packages with multiple slots installed, use \fB--duplicates\fP.
+.P
+\fBNote:\fP Because it takes extra processing time to determine the location, mask status and slot, you can speed up output by passing the \fB--quiet\fP global option to \fBequery\fP when you don't care about the extra information.
 
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery list '*'
+.EE
+.br
+List all installed packages. This is equivalent to '\fBequery list\fP' in \fBGentoolkit\fP versions prior to 0.3.0.
+.EX
+.HP
+equery list -op mozilla-firefox
+.EE
+.br
+List all available versions of the package exactly matching 'mozilla-firefox'. This is equivalent to '\fBequery list --exact-name -o -p mozilla-firefox\fP' in \fBGentoolkit\fP versions prior to 0.3.0.
+.EX
+.HP
+equery list '*zilla*'
+.EE
+.br
+List all packages that contain (fuzzy match) 'zilla'. This is equivalent to '\fBequery list zilla\fP' in \fBGentoolkit\fP versions prior to 0.3.0.
+.EX
+.HP
+equery list 'www-client/*'
+.EE
+.br
+List all packages in the category \fBwww-client\fP. This is equivalent to '\fBequery list --category=www-client\fP' in \fBGentoolkit\fP versions prior to 0.3.0.
+.EX
+.HP
+equery list --duplicates '*'
+.EE
+.br
+List all packages with more than one version installed. This is equivalent to '\fBequery list --duplicates\fP' in \fBGentoolkit\fP versions prior to 0.3.0.
+.EX
+.HP
+equery list -F '$cp:$slot' '*'
+.EE
 .br
-The list command searches packages for the name given. If found, the following info will be displayed: the package location between the first square brackets (I for Installed packages, P for Portage, O for Overlay), the possible masks between the second (~ by keyword, - by arch or M hard masked), then the category and complete name and last of all, the slot in which the package is stored.
+Get a list of slotted atoms for all installed packages.
+.EX
+.HP
+equery list -po -F '[$location] [$mask] $cpv:$slot [$repo]' '*'
+.EE
+.br
+Show all packages in the default (verbose) output format but also include their repository name.
 
-\fBExamples:\fR
+.SS
+.BI "meta (m) [OPTIONS] " "PKG"
+Display metadata about \fIPKG\fP.
 
-equery list zilla \- list all installed versions of packages containing the string 'zilla'
+\fBmeta\fP reads a file called metadata.xml which must be included with all Portage tree packages. \fBmeta\fP does not read ebuilds, so it can only return version independent metadata. Since until now there had not been an easy way for users to view metadata.xml, and because package maintainers are only required to fill out a very small portion of the file, there are still many packages without detailed metadata available. For more information about metadata.xml, see:
+.br
+.EX
+http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
+.EE
 
-equery list \-\-exact\-name x11\-libs/gtk+  \- list all installed versions of x11\-libs/gtk+
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-d, \-\-description
+.br
+Show an extended package description.
+.HP
+.B \-H, \-\-herd
+.br
+Show the herd(s) for the package. When not piping and not passing \fB--quiet\fP as a global option, also show the herd's email address. (shown by default)
+.HP
+.B \-k, \-\-keywords
+.br
+Show keywords for all matching versions. \fBkeywords\fP does not list all keywords for all versions. Instead, it filters the list to make it easier to spot versions that need bumping or are okay to remove from the tree. It filters by slot. For example:
+.br
+Keywords:    1.35.0-r3:\fB0\fP:
+.br
+Keywords:    1.35.0-r5:\fB0\fP: amd64 hppa ppc x86 ~alpha ~arm ~ia64 ~mips ~ppc64 ~s390 ~sh ~sparc
+.br
+In this output from \fBequery meta boost\fP, -r5 is the highest available version in slot 0, so all keywords are listed. The actual keywords for -r3 are "~amd64 ~hppa ~ppc ~x86", but since a higher version in the same slot has the same or more stable keywording, they are filtered out. Arch mask keywords (-*) are always shown.
+.HP
+.B \-m, \-\-maintainer
+.br
+Show the package maintainer(s) email address. If the metadata is available, also show the maitainer's name and/or job description. (shown by default)
+.HP
+.B \-u, \-\-useflags
+.br
+Show per-package USE flag descriptions. Per-package USE flag descriptions are sometimes added to metadata.xml if the affect of the USE flag is unusual, or if the USE flag is rare enough to be undefined in the global definition file. \fBequery uses\fP now displays these same local descriptions as well, so this option is left in \fBmeta\fP for completeness only.
+.HP
+.B \-U, \-\-upstream
+.br
+Show information about the package's upstream project, including the author's email, upstream bug tracker or upstream documentation. At the time of writing, most maintainers do not provide this information. (shown by default)
+.HP
+.B \-x, \-\-xml
+.br
+Dump the plain XML file to the screen.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery meta gnucash
+.EE
+.br
+Show general information about maintainership, including herd, maintainer and upstream.
+.EX
+.HP
+equery meta --description screen
+.EE
+.br
+See if the package maintainer has provided an extended description.
+.EX
+.HP
+equery -N meta -H gnome |grep -o --color=never '[^( ]*@gentoo.org'
+.EE
+.br
+Extract the herd's email address to let them know they're doing a great job. Remember, bug reports should go to bugs.gentoo.org. The above example will extract one or more emails if available, or return nothing if the herd is \fBno-herd\fP.
 
-equery list \-\-full\-regex '(mozilla\-firefox|mozilla\-thunderbird)' \- list all installed versions of mozilla\-firefox and mozilla\-thunderbird 
+.SS
+.BI "size (s) [OPTIONS] " "PKG"
+Print total size of files contained in a given \fIPKG\fP.
 
-equery list \-\-duplicates \- list all installed slotted packages
-.PP 
-.TP 
-.B size <local\-opts> pkgspec
-This command outputs the number of files in the specified package, as well as
-their total size in an appropriate unit.
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-b, \-\-bytes
+.br
+Report package size in bytes.
+.HP
+.B \-f, \-\-full-regex
+.br
+The query is a regular expression.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery -q size 'www-client/*'
+.EE
+.br
+Get a one-line summary of the number of files and total size (in bytes) of those files for each installed package in a category.
 
-The possible values for <local\-opts>, if specified, are:
-.br 
-.B \-b, \-\-bytes 
-report size in bytes
-.br 
-.B \-f, \-\-full\-regex
-query is a regular expression
-.br 
-.B \-e, \-\-exact\-name
-list only those packages that exactly match
-.PP 
-.TP 
-.B uses <local\-opts> pkgspec 
-display USE flags for pkgspec.
-
-The only possible value for <local\-opts>, if specified, is:
-.br 
-.B \-a, \-\-all
-include all package versions
-.PP 
-.B which pkgspec 
-print full path to ebuild for package pkgspec
-.PP 
+.SS
+.BI "uses (u) [OPTIONS] " "PKG"
+Display USE flag statuses and desriptions for a given \fRPKG\fP.
 
-.SH "Unimplemented Options"
-.PP 
-.B changes
-.PP 
-.B glsa \fR \- use glsa\-check for the time being.
-.PP 
-.B stats
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-a, \-\-all
+.br
+Display all package versions. Without this option, \fBequery\fP will choose the best available version.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+equery uses app-misc/beagle
+.EE
+.br
+See which USE flags are enabled for a specific package.
+.EX
+.HP
+USE="perl"; for PKG in $(equery -q hasuse $USE); do echo $PKG: $(equery -q uses $PKG |grep $USE); done
+.EE
+.br
+This Bash one-liner uses \fBhasuse\fP to find a list of packages that have a certain USE flag, and \fBuses\fP to check whether the flag is enabled or disabled. Modify \fBUSE="perl"\fP to change the query.
 
+.SS
+.BI "which (w) [OPTIONS] " "PKG"
+Display the path to the ebuild that would be used by Portage with the current configuation.
 
+.IR "LOCAL OPTIONS" ":"
+.HP
+.B \-m, \-\-include-masked
+.br
+Return the path to the hightest version ebuild available.
+.P
+.IR "EXAMPLES" ":"
+.EX
+.HP
+less $(equery which xorg-server)
+.EE
+.br
+View the most recent installable ebuild.
 
 .SH "BUGS"
-Many options aren't implemented.  Command\-line parsing could use some work. 
-.br 
-Submit bug reports to http://bugs.gentoo.org
-.SH "AUTHORS"
-equery, original man page: Karl Trygve Kalleberg <karltk@gentoo.org>, 2003.
-.br 
-Massive man page updates: Katerina Barone\-Adesi <katerinab@gmail.com>, 2004.
+Submit bug reports to http://bugs.gentoo.org.
 
+.SH "AUTHORS"
+Karl Trygve Kalleberg <karltk@gentoo.org>, 2003
+.br
+Katerina Barone\-Adesi <katerinab@gmail.com>, 2004
+.br
+Douglas Anderson <douglasjanderson@gmail.com>, 2009
diff --git a/man/eshowkw.1 b/man/eshowkw.1
new file mode 100644
index 0000000..29b49b8
--- /dev/null
+++ b/man/eshowkw.1
@@ -0,0 +1,47 @@
+.TH "eshowkw" "1" "" "Tomáš Chvátal" ""
+.SH "NAME"
+.LP 
+eshowkw \- Gentoo: Tool to package keywords
+.SH "SYNOPSIS"
+.B eshowkw
+[OPTIONS] [\-\-] [package [package ...]]
+.SH "DESCRIPTION"
+Display keywords for specified package(s) or for package that is in the current working directory.
+
+.SH "OPTIONS"
+.TP 
+.B package
+The packages to check. (The default is to read ebuilds in the current directory)
+.TP 
+.B \-h | \-\-help
+Print usage.
+.TP 
+.B   \-v | \-\-version
+Show version and exit.
+.TP 
+.B \-a=ARCH[,ARCH ...] | \-\-arch=ARCH[,ARCH ...]
+Display only specified architectures.
+.TP 
+.B \-A {top,bottom} | \-\-align {top,bottom}
+Specify alignment for descriptions. (default: bottom)
+.TP 
+.B \-T {archlist,versionlist} | \-\-top\-position {archlist,versionlist}
+Specify which fields we want to have in top listing. (default: archlist)
+.TP 
+.B \-B | \-\-bold
+Print out each other column in bold for easier visual separation. (default: False)
+.TP 
+.B \-C | \-\-color
+Force colored output (default: False)
+.TP 
+.B \-O | \-\-overlays
+Search overlays (default: False)
+.TP 
+.B \-P | \-\-prefix
+Display prefix keywords in output. (default: False)
+.TP 
+.B \-S | \-\-ignore\-slot
+Treat slots as irelevant during detection of redundant packages. (default: False)
+.SH "BUGS"
+.LP 
+Report bugs to <http://bugs.gentoo.org>.
diff --git a/man/glsa-check.1 b/man/glsa-check.1
index eee5151..be15992 100644
--- a/man/glsa-check.1
+++ b/man/glsa-check.1
@@ -1,4 +1,4 @@
-.TH "glsa-check" "1" "0.6" "Marius Mauch" "gentoolkit"
+.TH "glsa-check" "1" "0.3" "Marius Mauch" "gentoolkit"
 .SH "NAME"
 .LP 
 glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
@@ -6,7 +6,7 @@ glsa\-check \- Gentoo: Tool to locally monitor and manage GLSAs
 .LP 
 glsa\-check <\fIoption\fP> [\fIglsa\-list\fP]
 
-[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames containing GLSAs or the special identifiers 'all', 'new' and 'affected'
+[\fIglsa\-list\fR] can contain an arbitrary number of GLSA ids, filenames containing GLSAs or the special identifiers 'all' and 'affected'
 .SH "DESCRIPTION"
 .LP 
 This tool is used to locally monitor and manage Gentoo Linux Security Advisories.
@@ -21,19 +21,19 @@ Note: In order for this tool to be effective, you must regularly sync your local
 .LP 
 .TP 
 .B \-l, \-\-list
-list all unapplied GLSA
+list the a summary for all GLSAs in glsa-list and whether they affect the system
 .TP 
 .B \-d, \-\-dump, \-\-print
-show all information about the given GLSA
+show all information about the GLSAs in glsa-list
 .TP 
 .B \-t, \-\-test
-test if this system is affected by the given GLSA
+test if this system is affected by the GLSAs in glsa-list and output the GLSA IDs
 .TP 
 .B \-p, \-\-pretend
-show the necessary commands to apply this GLSA
+show the necessary steps to apply the GLSAs in glsa-list
 .TP 
 .B \-f, \-\-fix
-try to auto\-apply this GLSA (experimental)
+try to auto\-apply the GLSAs in in glsa-list using emerge. This will only upgrade packages to later version, but not remove packages when no upgrade path exists (experimental)
 .TP 
 .B \-i, \-\-inject
 inject the given GLSA into the glsa_injected file
diff --git a/man/revdep-rebuild.1 b/man/revdep-rebuild.1
index a482f66..a03ed58 100644
--- a/man/revdep-rebuild.1
+++ b/man/revdep-rebuild.1
@@ -10,6 +10,9 @@ revdep\-rebuild scans libraries and binaries for missing shared library dependen
 .TP 
 .B \-C | \-\-nocolor
 Turn off colored output. (This option is also passed to portage.)
+.TP
+.B \-d | \-\-debug
+Print way too much information (uses bash's set -xv)
 .TP      
 .B \-e | \-\-exact
 Emerge the most recent version of found packages, without regard to SLOT.
@@ -40,15 +43,11 @@ Turn off the progress meter
 .TP 
 .B \-q | \-\-quiet
 Print less output and disable the progress meter.  (This option is also passed to portage.)
-.TP 
-.B \-u UTIL | \-\-no-util UTIL
-Do not use features provided by UTIL.
-UTIL can be one of portage-utils or pkgcore, or it can be a \fBquoted\fR space-delimited list.
 .TP
 .B \-v | \-\-verbose
 More output.  (Prints the revdep\-rebuild search environment.)
 .TP
-.B All other options (including unrecognized ones) are passed to the emerge command.  Single\-letter options may not be combined, so for example, \-pv is not valid.  Please use \-p \-v.
+.B Options after -- are ignored by revdep-rebuild and passed directly to emerge.
 .SH "CONFIGURATION"
 revdep\-rebuild no longer uses hardcoded paths. To change the default behavior the following variables can be changed by the user.