man: regenerate with new python helper

16 files changed, 563 insertions, 167 deletions

diff --git a/man/q.1 b/man/q.1
index 098a6193..59aa68d2 100644
--- a/man/q.1
+++ b/man/q.1
@@ -1,45 +1,12 @@
-.TH q "1" "April 2012" "Gentoo Foundation" "q"
+.TH q "1" "Sep 2013" "Gentoo Foundation" "q"
 .SH NAME
 q \- invoke a portage utility applet
 .SH SYNOPSIS
 .B q
 \fI<applet> <args> \fR
 .SH DESCRIPTION
-.SS "Currently defined applets:"
-.TP
-q <applet> <args> : virtual applet
-.TP
-qatom <pkg> : split atom strings
-.TP
-qcache <action> <args> : search the metadata cache
-.TP
-qcheck <pkgname> : verify integrity of installed packages
-.TP
-qdepends <pkgname> : show dependency info
-.TP
-qfile <filename> : list all pkgs owning files
-.TP
-qgrep <misc args> : grep in ebuilds
-.TP
-qlist <pkgname> : list files owned by pkgname
-.TP
-qlop <pkgname> : emerge log analyzer
-.TP
-qmerge <pkgnames> : fetch and merge binary package
-.TP
-qpkg <misc args> : manipulate Gentoo binpkgs
-.TP
-qsearch <regex> : search pkgname/desc
-.TP
-qsize <pkgname> : calculate size usage
-.TP
-qtbz2 <misc args> : manipulate tbz2 packages
-.TP
-quse <useflag> : find pkgs using useflags
-.TP
-qxpak <misc args> : manipulate xpak archives
-.PP
-Options: \fB\-[irmM:vqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-i\fR, \fB\-\-install\fR
 Install symlinks for applets
@@ -50,7 +17,7 @@ Reinitialize ebuild cache
 \fB\-m\fR, \fB\-\-metacache\fR
 Reinitialize metadata cache
 .TP
-\fB\-M\fR, \fB\-\-modpath\fR <arg>
+\fB\-M\fR \fI<arg>\fR, \fB\-\-modpath\fR \fI<arg>\fR
 Module path
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
@@ -67,5 +34,49 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: q.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
+.SH APPLETS
+.nf
+.B This applet also has sub applets:
+        q <applet> <args> : virtual applet
+    qatom <pkg>           : split atom strings
+   qcache <action> <args> : search the metadata cache
+   qcheck <pkgname>       : verify integrity of installed packages
+ qdepends <pkgname>       : show dependency info
+    qfile <filename>      : list all pkgs owning files
+    qglsa <action> <list> : check GLSAs against system
+    qgrep <misc args>     : grep in ebuilds
+    qlist <pkgname>       : list files owned by pkgname
+     qlop <pkgname>       : emerge log analyzer
+   qmerge <pkgnames>      : fetch and merge binary package
+     qpkg <misc args>     : manipulate Gentoo binpkgs
+  qsearch <regex>         : search pkgname/desc
+    qsize <pkgname>       : calculate size usage
+    qtbz2 <misc args>     : manipulate tbz2 packages
+     quse <useflag>       : find pkgs using useflags
+    qxpak <misc args>     : manipulate xpak archives
+.fi
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qatom.1 b/man/qatom.1
index 6573a368..934546db 100644
--- a/man/qatom.1
+++ b/man/qatom.1
@@ -1,11 +1,12 @@
-.TH qatom "1" "April 2012" "Gentoo Foundation" "qatom"
+.TH qatom "1" "Sep 2013" "Gentoo Foundation" "qatom"
 .SH NAME
 qatom \- split atom strings
 .SH SYNOPSIS
 .B qatom
 \fI<opts> <pkg>\fR
 .SH DESCRIPTION
-Options: \fB\-[cvqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-c\fR, \fB\-\-compare\fR
 Compare two atoms
@@ -24,5 +25,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qatom.1,v 1.16 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qcache.1 b/man/qcache.1
index 93b94bff..549777db 100644
--- a/man/qcache.1
+++ b/man/qcache.1
@@ -1,15 +1,18 @@
-.TH qcache "1" "April 2012" "Gentoo Foundation" "qcache"
+.TH qcache "1" "Sep 2013" "Gentoo Foundation" "qcache"
 .SH NAME
 qcache \- search the metadata cache
 .SH SYNOPSIS
 .B qcache
 \fI<opts> <action> <args>\fR
 .SH DESCRIPTION
-Options: \fB\-[p:c:idtansvqChV]\fR
-.HP
-\fB\-p\fR, \fB\-\-matchpkg\fR <arg> * match pkgname
-.HP
-\fB\-c\fR, \fB\-\-matchcat\fR <arg> * match catname
+
+.SH OPTIONS
+.TP
+\fB\-p\fR \fI<arg>\fR, \fB\-\-matchpkg\fR \fI<arg>\fR
+match pkgname
+.TP
+\fB\-c\fR \fI<arg>\fR, \fB\-\-matchcat\fR \fI<arg>\fR
+match catname
 .TP
 \fB\-i\fR, \fB\-\-imlate\fR
 list packages that can be marked stable on a given arch
@@ -43,5 +46,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qcache.1,v 1.7 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qcheck.1 b/man/qcheck.1
index 7273432a..a8300236 100644
--- a/man/qcheck.1
+++ b/man/qcheck.1
@@ -1,11 +1,12 @@
-.TH qcheck "1" "April 2012" "Gentoo Foundation" "qcheck"
+.TH qcheck "1" "Sep 2013" "Gentoo Foundation" "qcheck"
 .SH NAME
 qcheck \- verify integrity of installed packages
 .SH SYNOPSIS
 .B qcheck
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[aes:uABHTpvqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-a\fR, \fB\-\-all\fR
 List all packages
@@ -13,7 +14,7 @@ List all packages
 \fB\-e\fR, \fB\-\-exact\fR
 Exact match (only CAT/PN or PN without PV)
 .TP
-\fB\-s\fR, \fB\-\-skip\fR <arg>
+\fB\-s\fR \fI<arg>\fR, \fB\-\-skip\fR \fI<arg>\fR
 Ignore files matching the regular expression <arg>
 .TP
 \fB\-u\fR, \fB\-\-update\fR
@@ -31,6 +32,9 @@ Ignore differing/unknown file chksums
 \fB\-T\fR, \fB\-\-nomtime\fR
 Ignore differing file mtimes
 .TP
+\fB\-\-skip\-protected\fR
+Ignore files in CONFIG_PROTECT-ed paths
+.TP
 \fB\-p\fR, \fB\-\-prelink\fR
 Undo prelink when calculating checksums
 .TP
@@ -48,5 +52,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qcheck.1,v 1.25 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qdepends.1 b/man/qdepends.1
index f148abd1..2014c3fc 100644
--- a/man/qdepends.1
+++ b/man/qdepends.1
@@ -1,11 +1,19 @@
-.TH qdepends "1" "April 2012" "Gentoo Foundation" "qdepends"
+.TH qdepends "1" "Sep 2013" "Gentoo Foundation" "qdepends"
 .SH NAME
 qdepends \- show dependency info
 .SH SYNOPSIS
 .B qdepends
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[drpaNk:Q:vqChV]\fR
+The qdepends applet has a couple different modes.  Normally it is geared towards
+answering the queries "what does package X depend on" and "what packages depend
+on X".  Both can further be classified into build, run, and post dependencies.
+
+By default, it will tell you the build time dependencies only (DEPEND).
+
+Currently, qdepends will only query installed packages.  There is no support for
+querying packages not yet installed (the \fBequery\fR(1) tool can do that).
+.SH OPTIONS
 .TP
 \fB\-d\fR, \fB\-\-depend\fR
 Show DEPEND info (default)
@@ -16,10 +24,10 @@ Show RDEPEND info
 \fB\-p\fR, \fB\-\-pdepend\fR
 Show PDEPEND info
 .TP
-\fB\-k\fR, \fB\-\-key\fR <arg>
+\fB\-k\fR \fI<arg>\fR, \fB\-\-key\fR \fI<arg>\fR
 User defined vdb key
 .TP
-\fB\-Q\fR, \fB\-\-query\fR <arg>
+\fB\-Q\fR \fI<arg>\fR, \fB\-\-query\fR \fI<arg>\fR
 Query reverse deps
 .TP
 \fB\-N\fR, \fB\-\-name\-only\fR
@@ -28,6 +36,9 @@ Only show package name
 \fB\-a\fR, \fB\-\-all\fR
 Show all DEPEND info
 .TP
+\fB\-f\fR, \fB\-\-format\fR
+Pretty format specified depend strings
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 Make a lot of noise
 .TP
@@ -42,5 +53,22 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qdepends.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
+.SH "EXAMPLES"
+For finding out what a particular package depends on for building, you could do:
+.nf
+	$ \fIqdepends nano\fR
+	app-editors/nano-2.3.2: >=sys-libs/ncurses-5.9-r1[unicode] sys-apps/file ...
+.fi
+This tells us that we have \fIapp-editors/nano-2.3.2\fR installed and it depends
+on ncurses (among other things).
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+
diff --git a/man/qfile.1 b/man/qfile.1
index 6c5547a5..a651a95b 100644
--- a/man/qfile.1
+++ b/man/qfile.1
@@ -1,31 +1,36 @@
-.TH qfile "1" "April 2012" "Gentoo Foundation" "qfile"
+.TH qfile "1" "Sep 2013" "Gentoo Foundation" "qfile"
 .SH NAME
 qfile \- list all pkgs owning files
 .SH SYNOPSIS
 .B qfile
 \fI<opts> <filename>\fR
 .SH DESCRIPTION
-Options: \fB\-[ef:m:oRx:SvqChV]\fR
+
+.SH OPTIONS
 .TP
-\fB\-e\fR, \fB\-\-exact\fR
-Exact match
+\fB\-S\fR, \fB\-\-slots\fR
+Display installed packages with slots
 .TP
-\fB\-f\fR, \fB\-\-from\fR <arg>
-Read arguments from file <arg> ("\-" for stdin)
-.HP
-\fB\-m\fR, \fB\-\-max\-args\fR <arg> * Treat from file arguments by groups of <arg> (defaults to 5000)
+\fB\-R\fR, \fB\-\-root\-prefix\fR
+Assume arguments are already prefixed by $ROOT
+.TP
+\fB\-f\fR \fI<arg>\fR, \fB\-\-from\fR \fI<arg>\fR
+Read arguments from file <arg> ("-" for stdin)
+.TP
+\fB\-m\fR \fI<arg>\fR, \fB\-\-max\-args\fR \fI<arg>\fR
+Treat from file arguments by groups of <arg> (defaults to 5000)
+.TP
+\fB\-b\fR, \fB\-\-basename\fR
+Match any component of the path
 .TP
 \fB\-o\fR, \fB\-\-orphans\fR
 List orphan files
 .TP
-\fB\-R\fR, \fB\-\-root\-prefix\fR
-Assume arguments are already prefixed by $ROOT
-.TP
-\fB\-x\fR, \fB\-\-exclude\fR <arg>
-Don't look in package <arg>
+\fB\-x\fR \fI<arg>\fR, \fB\-\-exclude\fR \fI<arg>\fR
+Don't look in package <arg> (used with --orphans)
 .TP
-\fB\-S\fR, \fB\-\-slots\fR
-Display installed packages with slots
+\fB\-e\fR, \fB\-\-exact\fR
+Exact match (used with --exclude)
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 Make a lot of noise
@@ -41,21 +46,17 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qfile.1,v 1.25 2012/04/15 05:31:07 vapier Exp $
-file written for Gentoo by <solar and vapier 
- gentoo.org>
 .SH "FINDING FILES OWNERS"
 .PP
 This is the default behavior of \fBqfile\fP.  It will list the packages which
-own the files (or directories, or symlinks, or anything else Portage can 
+own the files (or directories, or symlinks, or anything else Portage can
 install) you are querying.  Query items may be file paths or simple file names.
 By default, output includes packages names and the complete paths to
-the matching files.  If using \fB\-\-exact\fP, versions of the packages will 
-also be shown.  At the contrary, when using \fB\-\-quiet\fP, only package 
+the matching files.  If using \fB\-\-exact\fP, versions of the packages will
+also be shown.  At the contrary, when using \fB\-\-quiet\fP, only package
 names are listed, without files paths.  Finally, \fB\-\-verbose\fP is similar
-to \fB\-\-exact\fP, but may adds a few warnings.  The return status of 
-\fBqfile\fP will be \fI0\fP as soon as an owning package has been found for 
+to \fB\-\-exact\fP, but may adds a few warnings.  The return status of
+\fBqfile\fP will be \fI0\fP as soon as an owning package has been found for
 one of the query items.
 .PP
 Find names of package(s) owning "/bin/bash":
@@ -71,7 +72,7 @@ Find package(s) owning any file named "bash", and show paths of this files:
 	app-shells/bash (/etc/bash)
 .fi
 .PP
-Find packages(s) owning the file named "bash" in the current directory. Also 
+Find packages(s) owning the file named "bash" in the current directory. Also
 display their exact version:
 .nf\fI
 	$ cd /bin
@@ -88,12 +89,12 @@ Find the package(s) owning the libraries needed by the Bash binary:
 .fi
 .SH "FINDING ORPHAN FILES"
 .PP
-\fBqfile\fP can also, with the \fB\-\-orphans\fP option, find files which are 
-not owned by any package.  This behavior is the opposite of the usual file 
+\fBqfile\fP can also, with the \fB\-\-orphans\fP option, find files which are
+not owned by any package.  This behavior is the opposite of the usual file
 owner search: the output is the list of query items for which no reference has
 been found in your installed packages database.  The \fB\-\-exact\fP option has
-no effect in this mode, whereas \fB\-\-verbose\fP may add a few warning 
-messages.  As for \fB\-\-quiet\fP, it will completly turn off the output, 
+no effect in this mode, whereas \fB\-\-verbose\fP may add a few warning
+messages.  As for \fB\-\-quiet\fP, it will completly turn off the output,
 leaving just a silent test command, which returns \fI0\fP if and only if
 there was no orphan in your query items.
 .PP
@@ -110,10 +111,10 @@ any package:
 	libinstalledmanually.so.2
 .fi
 .PP
-.SH "HANDLING OF THE ROOT VARIABLE"
+.SH "$ROOT HANDLING"
 .PP
 By setting the \fIROOT\fP environment variable, you can force \fBqfile\fP to
-work in the sytem of your choice. This example shows queries for owner of 
+work in the sytem of your choice. This example shows queries for owner of
 "/bin/sh", first on your main system, and then on a system mounted on "/mnt":
 .nf\fI
 	$ qfile -q /bin/sh
@@ -122,19 +123,19 @@ work in the sytem of your choice. This example shows queries for owner of
 	sys-apps/busybox
 .fi
 .PP
-Note that the query item is "/bin/sh" in both commands: by default, what 
-\fBqfile\fP looks for is file paths as they are recorded in the packages 
+Note that the query item is "/bin/sh" in both commands: by default, what
+\fBqfile\fP looks for is file paths as they are recorded in the packages
 database of the target system, and this paths don't include \fI$ROOT\fP.
-If, at the contrary, you want to query files with their current actual 
-paths (including the mount point), you should add the \fB\-\-root\-prefix\fP 
+If, at the contrary, you want to query files with their current actual
+paths (including the mount point), you should add the \fB\-\-root\-prefix\fP
 (\fB\-R\fP) option:
 .nf\fI
 	$ ROOT=/mnt qfile -Rq /mnt/bin/sh
 	sys-apps/busybox
 .fi
 .PP
-The other difference beetween defaults and \fB\-R\fP queries is the output 
-of files paths.  The former doesn't include the \fI$ROOT\fP prefix, and the 
+The other difference beetween defaults and \fB\-R\fP queries is the output
+of files paths.  The former doesn't include the \fI$ROOT\fP prefix, and the
 later does:
 .nf\fI
 	$ ROOT=/mnt qfile sh
@@ -150,7 +151,7 @@ Sure, the same differences hold when querying for orphan files:
 	$ ROOT=/mnt qfile -Ro /mnt/bin/*
 	/mnt/bin/dostuff.sh
 .fi
-.SH "READING ARGUMENTS FROM A FILE (OR STDIN)"
+.SH "READING ARGUMENTS FROM A FILE/STDIN"
 .PP
 When you try to launch \fBqfile\fP with a large number of arguments, you may
 hit the following shell error:
@@ -170,10 +171,10 @@ allows reading your arguments list in a file:
 .fi
 .PP
 Your arguments list must be formatted with one file per line, and without any
-kind of garbage (no leading or trailing space, no empty line, etc.).  The 
+kind of garbage (no leading or trailing space, no empty line, etc.).  The
 default \fBfind\fP output format is just fine in general.
 .PP
-You can also read the arguments list from standard input with the "\fB\-\fP" 
+You can also read the arguments list from standard input with the "\fB\-\fP"
 pseudo filename, which is useful with shell pipes:
 .nf\fI
 	$ find /usr/lib | qfile -o -f -
@@ -183,7 +184,7 @@ pseudo filename, which is useful with shell pipes:
 .fi
 .PP
 Here is an other example of use.  This script lists some files which may be
-orphan config files left behind by Portage after uninstallation or upgrade of 
+orphan config files left behind by Portage after uninstallation or upgrade of
 some packages:
 .nf\fI
 	#!/bin/bash
@@ -211,18 +212,18 @@ bit more memory, but may be a bit faster for really big queries.  Be careful
 though, using some stupidly high or low value can completly kill the
 performances.  In short, you probably don't want to touch this option.
 .PP
-.SH "SEARCHING FOR FILES COLLISIONS"
+.SH "SEARCHING FOR FILE COLLISIONS"
 .PP
 A last option of \fBqfile\fP is \fB\-\-exclude\fP (\fB\-x\fP), which will makes
 it skip one particular package when doing its files owners search.  This option
 takes one argument, which can be a package name (\fBbash\fP or
 \fBapp\-shells/bash\fP), or a versioned package (\fBbash\-3.2_p9\-r1\fP or
-\fBapp\-shells/bash\-3.2_p9\-r1\fP), or a slotted package (\fBbash:0\fP or 
-\fBapp\-shells/bash:0\fP). It is useful for finding file collisions beetween 
-packages (ie., comparing the contents of one package with the contents of all 
+\fBapp\-shells/bash\-3.2_p9\-r1\fP), or a slotted package (\fBbash:0\fP or
+\fBapp\-shells/bash:0\fP). It is useful for finding file collisions beetween
+packages (ie., comparing the contents of one package with the contents of all
 the others).
 .PP
-For example, the following script will search collisions beetween all your 
+For example, the following script will search collisions beetween all your
 installed packages. Be careful, this will takes time:
 .nf\fI
 	#!/bin/bash
@@ -239,7 +240,7 @@ installed packages. Be careful, this will takes time:
 	done
 .fi
 .PP
-An other example is the following script, which can be used to check that a 
+An other example is the following script, which can be used to check that a
 binary package (.tbz2) has no conflict with any of your installed packages,
 but the one it may replace (same name and slot), if any:
 .nf\fI
@@ -259,5 +260,31 @@ tar tjf "${tarbz2}" \\
 rm -rf "${tmpdir}"
 .PP
 .SH "ADDITIONAL CONTRIBUTORS"
-.TP
+.nf
 TGL degrenier[at]easyconnect.fr
+.fi
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qgrep.1 b/man/qgrep.1
index fa12b680..6858b700 100644
--- a/man/qgrep.1
+++ b/man/qgrep.1
@@ -1,14 +1,15 @@
-.TH qgrep "1" "April 2012" "Gentoo Foundation" "qgrep"
+.TH qgrep "1" "Sep 2013" "Gentoo Foundation" "qgrep"
 .SH NAME
 qgrep \- grep in ebuilds
 .SH SYNOPSIS
 .B qgrep
 \fI<opts> <misc args>\fR
 .SH DESCRIPTION
-Options: \fB\-[IiHNclLexJEsS:B:A:vqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-I\fR, \fB\-\-invert\-match\fR
-Select non\-matching lines
+Select non-matching lines
 .TP
 \fB\-i\fR, \fB\-\-ignore\-case\fR
 Ignore case distinctions
@@ -43,13 +44,13 @@ Search in eclasses instead of ebuilds
 \fB\-s\fR, \fB\-\-skip\-comments\fR
 Skip comments lines
 .TP
-\fB\-S\fR, \fB\-\-skip\fR <arg>
+\fB\-S\fR \fI<arg>\fR, \fB\-\-skip\fR \fI<arg>\fR
 Skip lines matching <arg>
 .TP
-\fB\-B\fR, \fB\-\-before\fR <arg>
+\fB\-B\fR \fI<arg>\fR, \fB\-\-before\fR \fI<arg>\fR
 Print <arg> lines of leading context
 .TP
-\fB\-A\fR, \fB\-\-after\fR <arg>
+\fB\-A\fR \fI<arg>\fR, \fB\-\-after\fR \fI<arg>\fR
 Print <arg> lines of trailing context
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
@@ -66,5 +67,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qgrep.1,v 1.18 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qlist.1 b/man/qlist.1
index 3db4c924..5a35b58e 100644
--- a/man/qlist.1
+++ b/man/qlist.1
@@ -1,11 +1,12 @@
-.TH qlist "1" "April 2012" "Gentoo Foundation" "qlist"
+.TH qlist "1" "Sep 2013" "Gentoo Foundation" "qlist"
 .SH NAME
 qlist \- list files owned by pkgname
 .SH SYNOPSIS
 .B qlist
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[ISULcDeadosvqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-I\fR, \fB\-\-installed\fR
 Just show installed packages
@@ -13,9 +14,6 @@ Just show installed packages
 \fB\-S\fR, \fB\-\-slots\fR
 Display installed packages with slots
 .TP
-\fB\-L\fR, \fB\-\-separator\fR
-Display : as the slot separator
-.TP
 \fB\-c\fR, \fB\-\-columns\fR
 Display column view
 .TP
@@ -25,6 +23,9 @@ Display installed packages with flags used
 \fB\-D\fR, \fB\-\-dups\fR
 Only show package dups
 .TP
+\fB\-\-showdebug\fR
+Show /usr/lib/debug files
+.TP
 \fB\-e\fR, \fB\-\-exact\fR
 Exact match (only CAT/PN or PN without PV)
 .TP
@@ -54,5 +55,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qlist.1,v 1.25 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qlop.1 b/man/qlop.1
index cbac617f..a40bf23a 100644
--- a/man/qlop.1
+++ b/man/qlop.1
@@ -1,11 +1,12 @@
-.TH qlop "1" "April 2012" "Gentoo Foundation" "qlop"
+.TH qlop "1" "Sep 2013" "Gentoo Foundation" "qlop"
 .SH NAME
 qlop \- emerge log analyzer
 .SH SYNOPSIS
 .B qlop
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[gtHluscf:vqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-g\fR, \fB\-\-gauge\fR
 Gauge number of times a package has been merged
@@ -14,7 +15,7 @@ Gauge number of times a package has been merged
 Calculate merge time for a specific package
 .TP
 \fB\-H\fR, \fB\-\-human\fR
-Print seconds in human readable format (needs \fB\-t\fR)
+Print seconds in human readable format (needs -t)
 .TP
 \fB\-l\fR, \fB\-\-list\fR
 Show merge history
@@ -28,7 +29,7 @@ Show sync history
 \fB\-c\fR, \fB\-\-current\fR
 Show current emerging packages
 .TP
-\fB\-f\fR, \fB\-\-logfile\fR <arg>
+\fB\-f\fR \fI<arg>\fR, \fB\-\-logfile\fR \fI<arg>\fR
 Read emerge logfile instead of /var/log/emerge.log
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
@@ -45,5 +46,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qlop.1,v 1.21 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qmerge.1 b/man/qmerge.1
index d21ff03f..b3f70b02 100644
--- a/man/qmerge.1
+++ b/man/qmerge.1
@@ -1,11 +1,12 @@
-.TH qmerge "1" "April 2012" "Gentoo Foundation" "qmerge"
+.TH qmerge "1" "Sep 2013" "Gentoo Foundation" "qmerge"
 .SH NAME
 qmerge \- fetch and merge binary package
 .SH SYNOPSIS
 .B qmerge
 \fI<opts> <pkgnames>\fR
 .SH DESCRIPTION
-Options: \fB\-[fFsKUpuyO5vqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-f\fR, \fB\-\-fetch\fR
 Fetch package and newest Packages metadata
@@ -51,5 +52,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qmerge.1,v 1.15 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qpkg.1 b/man/qpkg.1
index b7dc5ffe..35294518 100644
--- a/man/qpkg.1
+++ b/man/qpkg.1
@@ -1,11 +1,12 @@
-.TH qpkg "1" "April 2012" "Gentoo Foundation" "qpkg"
+.TH qpkg "1" "Sep 2013" "Gentoo Foundation" "qpkg"
 .SH NAME
 qpkg \- manipulate Gentoo binpkgs
 .SH SYNOPSIS
 .B qpkg
 \fI<opts> <misc args>\fR
 .SH DESCRIPTION
-Options: \fB\-[cEpP:vqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-c\fR, \fB\-\-clean\fR
 clean pkgdir of unused binary files
@@ -16,7 +17,7 @@ clean pkgdir of files not in the tree anymore (slow)
 \fB\-p\fR, \fB\-\-pretend\fR
 pretend only
 .TP
-\fB\-P\fR, \fB\-\-pkgdir\fR <arg>
+\fB\-P\fR \fI<arg>\fR, \fB\-\-pkgdir\fR \fI<arg>\fR
 alternate package directory
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
@@ -33,5 +34,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qpkg.1,v 1.20 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qsearch.1 b/man/qsearch.1
index 9cc6131b..2860f340 100644
--- a/man/qsearch.1
+++ b/man/qsearch.1
@@ -1,11 +1,12 @@
-.TH qsearch "1" "April 2012" "Gentoo Foundation" "qsearch"
+.TH qsearch "1" "Sep 2013" "Gentoo Foundation" "qsearch"
 .SH NAME
 qsearch \- search pkgname/desc
 .SH SYNOPSIS
 .B qsearch
 \fI<opts> <regex>\fR
 .SH DESCRIPTION
-Options: \fB\-[acesSNHvqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-a\fR, \fB\-\-all\fR
 List the descriptions of every package in the cache
@@ -19,7 +20,7 @@ Use the portage ebuild tree
 \fB\-s\fR, \fB\-\-search\fR
 Regex search package basenames
 .TP
-\fB\-S\fR, \fB\-\-desc\fR <arg>
+\fB\-S\fR \fI<arg>\fR, \fB\-\-desc\fR \fI<arg>\fR
 Regex search package descriptions
 .TP
 \fB\-N\fR, \fB\-\-name\-only\fR
@@ -42,5 +43,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qsearch.1,v 1.22 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qsize.1 b/man/qsize.1
index 1d0ebdf6..f14bf641 100644
--- a/man/qsize.1
+++ b/man/qsize.1
@@ -1,11 +1,12 @@
-.TH qsize "1" "April 2012" "Gentoo Foundation" "qsize"
+.TH qsize "1" "Sep 2013" "Gentoo Foundation" "qsize"
 .SH NAME
 qsize \- calculate size usage
 .SH SYNOPSIS
 .B qsize
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[fasSmkbi:vqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-f\fR, \fB\-\-filesystem\fR
 Show size used on disk
@@ -28,7 +29,7 @@ Display size in kilobytes
 \fB\-b\fR, \fB\-\-bytes\fR
 Display size in bytes
 .TP
-\fB\-i\fR, \fB\-\-ignore\fR <arg>
+\fB\-i\fR \fI<arg>\fR, \fB\-\-ignore\fR \fI<arg>\fR
 Ignore regexp string
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
@@ -45,5 +46,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qsize.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qtbz2 (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/qtbz2.1 b/man/qtbz2.1
index 8d12b406..cc8e3a4e 100644
--- a/man/qtbz2.1
+++ b/man/qtbz2.1
@@ -1,17 +1,18 @@
-.TH qtbz2 "1" "April 2012" "Gentoo Foundation" "qtbz2"
+.TH qtbz2 "1" "Sep 2013" "Gentoo Foundation" "qtbz2"
 .SH NAME
 qtbz2 \- manipulate tbz2 packages
 .SH SYNOPSIS
 .B qtbz2
 \fI<opts> <misc args>\fR
 .SH DESCRIPTION
-Options: \fB\-[d:jstxOvqChV]\fR
+
+.SH OPTIONS
 .TP
-\fB\-d\fR, \fB\-\-dir\fR <arg>
+\fB\-d\fR \fI<arg>\fR, \fB\-\-dir\fR \fI<arg>\fR
 Change to specified directory
 .TP
 \fB\-j\fR, \fB\-\-join\fR
-Join tar.bz2 + xpak into a tbz2
+Join: <tar.bz2> <xpak> <tbz2>
 .TP
 \fB\-s\fR, \fB\-\-split\fR
 Split a tbz2 into a tar.bz2 + xpak
@@ -39,5 +40,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qtbz2.1,v 1.20 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR quse (1),
+.BR qxpak (1)
diff --git a/man/quse.1 b/man/quse.1
index 1196de62..9bae65af 100644
--- a/man/quse.1
+++ b/man/quse.1
@@ -1,11 +1,12 @@
-.TH quse "1" "April 2012" "Gentoo Foundation" "quse"
+.TH quse "1" "Sep 2013" "Gentoo Foundation" "quse"
 .SH NAME
 quse \- find pkgs using useflags
 .SH SYNOPSIS
 .B quse
 \fI<opts> <useflag>\fR
 .SH DESCRIPTION
-Options: \fB\-[eavKLDF:NvqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-e\fR, \fB\-\-exact\fR
 Show exact non regexp matching using strcmp
@@ -22,8 +23,8 @@ Use the LICENSE vs IUSE
 \fB\-D\fR, \fB\-\-describe\fR
 Describe the USE flag
 .TP
-\fB\-F\fR, \fB\-\-format\fR <arg>
-Use your own variable formats. \fB\-F\fR NAME=
+\fB\-F\fR \fI<arg>\fR, \fB\-\-format\fR \fI<arg>\fR
+Use your own variable formats. -F NAME=
 .TP
 \fB\-N\fR, \fB\-\-name\-only\fR
 Only show package name
@@ -42,5 +43,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: quse.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR qxpak (1)
diff --git a/man/qxpak.1 b/man/qxpak.1
index 8fb2b2f4..d6bf28d2 100644
--- a/man/qxpak.1
+++ b/man/qxpak.1
@@ -1,11 +1,12 @@
-.TH qxpak "1" "April 2012" "Gentoo Foundation" "qxpak"
+.TH qxpak "1" "Sep 2013" "Gentoo Foundation" "qxpak"
 .SH NAME
 qxpak \- manipulate xpak archives
 .SH SYNOPSIS
 .B qxpak
 \fI<opts> <misc args>\fR
 .SH DESCRIPTION
-Options: \fB\-[lxcd:OvqChV]\fR
+
+.SH OPTIONS
 .TP
 \fB\-l\fR, \fB\-\-list\fR
 List the contents of an archive
@@ -16,7 +17,7 @@ Extract the contents of an archive
 \fB\-c\fR, \fB\-\-create\fR
 Create an archive of a directory/files
 .TP
-\fB\-d\fR, \fB\-\-dir\fR <arg>
+\fB\-d\fR \fI<arg>\fR, \fB\-\-dir\fR \fI<arg>\fR
 Change to specified directory
 .TP
 \fB\-O\fR, \fB\-\-stdout\fR
@@ -36,5 +37,29 @@ Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 Print version and exit
-.PP
-$Id: qxpak.1,v 1.20 2012/04/15 05:31:07 vapier Exp $
+
+.SH "REPORTING BUGS"
+Please report bugs via http://bugs.gentoo.org/
+.br
+Product: Portage Development; Component: Tools
+.SH AUTHORS
+.nf
+Ned Ludd <solar@gentoo.org>
+Mike Frysinger <vapier@gentoo.org>
+.fi
+.SH "SEE ALSO"
+.BR q (1),
+.BR qatom (1),
+.BR qcache (1),
+.BR qcheck (1),
+.BR qdepends (1),
+.BR qfile (1),
+.BR qgrep (1),
+.BR qlist (1),
+.BR qlop (1),
+.BR qmerge (1),
+.BR qpkg (1),
+.BR qsearch (1),
+.BR qsize (1),
+.BR qtbz2 (1),
+.BR quse (1)