regen man pages

17 files changed, 317 insertions, 317 deletions

diff --git a/man/mkman.sh b/man/mkman.sh
index 4600bf09..791d4fd5 100755
--- a/man/mkman.sh
+++ b/man/mkman.sh
@@ -1,23 +1,45 @@
-#!/bin/sh
+#!/bin/bash
+
 export NOCOLOR=1
 
-APPLETS=$(../q | grep -e ' : ' | awk '{print $1}' | grep ^q$1)
+[[ $# -eq 0 ]] && set -- $(../q | awk '$0 ~ / : / && $1 != "Usage:" { print $1 }')
+
+for applet in "$@" ; do
+	man="${applet}.1"
+	echo "creating ${man}"
 
-for applet in $APPLETS; do
 	help2man -N -S "Gentoo Foundation" -m ${applet} -s 1 \
-		$(for incl in include/${applet}-*.include; do echo "-I ${incl}"; done) \
+		$(printf ' -I %s' include/${applet}-*.include) \
 		-n "$(../q $applet | sed -n '/^Usage/{s|^.* : ||p;q;}')" \
-		-o ${applet}.1 "../q $applet"
-	[[ $? == 0 ]] || continue;
-	sed  -i -e s/'PORTAGE-UTILS-CVS:'/${applet}/g \
-		-e s/'portage-utils-cvs:'/${applet}/g \
-		-e '/\.SH SYNOPSIS/,/\.SH/'s/' : .*\\fR$'/'\\fR'/ \
+		-o ${man} "../q ${applet}"
+	[[ $? == 0 ]] || continue
+
+	sed \
+		-e "s/PORTAGE-UTILS-CVS:/${applet}/g" \
+		-e "s/portage-utils-cvs:/${applet}/g" \
+		-e '/\.SH SYNOPSIS/,/\.SH/s/ : .*\\fR$/\\fR/' \
 		-e '/\.SH DESCRIPTION/,/\.SH/s|^\(Options:.*\)\\fR\(.*\)|\1\2\\fR|' \
-		-e s/'> \*'/'>@\.BR@ \*'/g ${applet}.1
-	head -n $(($(cat ${applet}.1 | wc -l)-1)) ${applet}.1 \
-		| tr '@' '\n' > ${applet}.1~ && mv ${applet}.1~ ${applet}.1
+		${man} | \
+		awk '{
+			if ($1 == "<arg>") {
+				line = line " " $1
+				$1 = ""
+			}
+			if (line)
+				print line
+			line = $0
+		}
+		END { print line }
+		' | \
+		sed -e 's:^ *[*] ::' > ${man}~
+	mv ${man}~ ${man}
+
+	head -n $(($(wc -l < ${man})-1)) ${man} \
+		| tr '@' '\n' > ${man}~ && mv ${man}~ ${man}
 
-	sed -i -e s/'compiled on'/'@@@@@@@@@@@@@@'/ ${applet}.1
-	cat ${applet}.1 | cut -d @ -f 1 > ${applet}.1~ && mv ${applet}.1~ ${applet}.1
-	grep -v 'DO NOT MODIFY THIS FILE' <  ${applet}.1 > ${applet}.1~ && mv ${applet}.1~ ${applet}.1
+	sed -e s/'compiled on'/'@@@@@@@@@@@@@@'/ ${man} |
+		cut -d @ -f 1 | \
+		grep -v 'DO NOT MODIFY THIS FILE' \
+		> ${man}~
+	mv ${man}~ ${man}
 done
diff --git a/man/q.1 b/man/q.1
index f4d2e22d..098a6193 100644
--- a/man/q.1
+++ b/man/q.1
@@ -1,4 +1,4 @@
-.TH q "1" "January 2007" "Gentoo Foundation" "q"
+.TH q "1" "April 2012" "Gentoo Foundation" "q"
 .SH NAME
 q \- invoke a portage utility applet
 .SH SYNOPSIS
@@ -7,84 +7,65 @@ q \- invoke a portage utility applet
 .SH DESCRIPTION
 .SS "Currently defined applets:"
 .TP
-q <applet> <args>
-: virtual applet
+q <applet> <args> : virtual applet
 .TP
-qatom <pkg>
-: split atom strings
+qatom <pkg> : split atom strings
 .TP
-qcache <action> <args>
-: search the metadata cache
+qcache <action> <args> : search the metadata cache
 .TP
-qcheck <pkgname>
-: verify mtimes/digests
+qcheck <pkgname> : verify integrity of installed packages
 .TP
-qdepends <pkgname>
-: show dependency info
+qdepends <pkgname> : show dependency info
 .TP
-qfile <filename>
-: list all pkgs owning files
+qfile <filename> : list all pkgs owning files
 .TP
-qglsa <action> <list>
-: check GLSAs against system
+qgrep <misc args> : grep in ebuilds
 .TP
-qgrep <misc args>
-: grep in ebuilds
+qlist <pkgname> : list files owned by pkgname
 .TP
-qlist <pkgname>
-: list files owned by pkgname
+qlop <pkgname> : emerge log analyzer
 .TP
-qlop <pkgname>
-: emerge log analyzer
+qmerge <pkgnames> : fetch and merge binary package
 .TP
-qmerge <pkgnames>
-: fetch and merge binary package
+qpkg <misc args> : manipulate Gentoo binpkgs
 .TP
-qpkg <misc args>
-: manipulate Gentoo binpkgs
+qsearch <regex> : search pkgname/desc
 .TP
-qpy <misc args>
-: python interface
+qsize <pkgname> : calculate size usage
 .TP
-qsearch <regex>
-: search pkgname/desc
+qtbz2 <misc args> : manipulate tbz2 packages
 .TP
-qsize <pkgname>
-: calculate size usage
+quse <useflag> : find pkgs using useflags
 .TP
-qtbz2 <misc args>
-: manipulate tbz2 packages
-.TP
-quse <useflag>
-: find pkgs using useflags
-.TP
-qxpak <misc args>
-: manipulate xpak archives
+qxpak <misc args> : manipulate xpak archives
 .PP
-Options: \fB\-[irmvqChV]\fR
+Options: \fB\-[irmM:vqChV]\fR
 .TP
 \fB\-i\fR, \fB\-\-install\fR
-* Install symlinks for applets
+Install symlinks for applets
 .TP
 \fB\-r\fR, \fB\-\-reinitialize\fR
-* Reinitialize ebuild cache
+Reinitialize ebuild cache
 .TP
 \fB\-m\fR, \fB\-\-metacache\fR
-* Reinitialize metadata cache
+Reinitialize metadata cache
+.TP
+\fB\-M\fR, \fB\-\-modpath\fR <arg>
+Module path
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: q.1,v 1.22 2007/01/07 20:32:41 solar Exp $
+$Id: q.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qatom.1 b/man/qatom.1
index 3e323914..6573a368 100644
--- a/man/qatom.1
+++ b/man/qatom.1
@@ -1,4 +1,4 @@
-.TH qatom "1" "May 2007" "Gentoo Foundation" "qatom"
+.TH qatom "1" "April 2012" "Gentoo Foundation" "qatom"
 .SH NAME
 qatom \- split atom strings
 .SH SYNOPSIS
@@ -8,21 +8,21 @@ qatom \- split atom strings
 Options: \fB\-[cvqChV]\fR
 .TP
 \fB\-c\fR, \fB\-\-compare\fR
-* Compare two atoms
+Compare two atoms
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qatom.1,v 1.15 2007/05/11 08:25:06 solar Exp $
+$Id: qatom.1,v 1.16 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qcache.1 b/man/qcache.1
index 4defdf54..93b94bff 100644
--- a/man/qcache.1
+++ b/man/qcache.1
@@ -1,4 +1,4 @@
-.TH qcache "1" "May 2007" "Gentoo Foundation" "qcache"
+.TH qcache "1" "April 2012" "Gentoo Foundation" "qcache"
 .SH NAME
 qcache \- search the metadata cache
 .SH SYNOPSIS
@@ -7,45 +7,41 @@ qcache \- search the metadata cache
 .SH DESCRIPTION
 Options: \fB\-[p:c:idtansvqChV]\fR
 .HP
-\fB\-p\fR, \fB\-\-matchpkg\fR <arg>
-.BR
- * match pkgname
+\fB\-p\fR, \fB\-\-matchpkg\fR <arg> * match pkgname
 .HP
-\fB\-c\fR, \fB\-\-matchcat\fR <arg>
-.BR
- * match catname
+\fB\-c\fR, \fB\-\-matchcat\fR <arg> * match catname
 .TP
 \fB\-i\fR, \fB\-\-imlate\fR
-* list packages that can be marked stable on a given arch
+list packages that can be marked stable on a given arch
 .TP
 \fB\-d\fR, \fB\-\-dropped\fR
-* list packages that have dropped keywords on a version bump on a given arch
+list packages that have dropped keywords on a version bump on a given arch
 .TP
 \fB\-t\fR, \fB\-\-testing\fR
-* list packages that have ~arch versions, but no stable versions on a given arch
+list packages that have ~arch versions, but no stable versions on a given arch
 .TP
 \fB\-s\fR, \fB\-\-stats\fR
-* display statistics about the portage tree
+display statistics about the portage tree
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* list packages that have at least one version keyworded for on a given arch
+list packages that have at least one version keyworded for on a given arch
 .TP
 \fB\-n\fR, \fB\-\-not\fR
-* list packages that aren't keyworded on a given arch.
+list packages that aren't keyworded on a given arch.
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qcache.1,v 1.6 2007/05/11 08:25:06 solar Exp $
+$Id: qcache.1,v 1.7 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qcheck.1 b/man/qcheck.1
index a4998425..7273432a 100644
--- a/man/qcheck.1
+++ b/man/qcheck.1
@@ -1,46 +1,52 @@
-.TH qcheck "1" "April 2008" "Gentoo Foundation" "qcheck"
+.TH qcheck "1" "April 2012" "Gentoo Foundation" "qcheck"
 .SH NAME
 qcheck \- verify integrity of installed packages
 .SH SYNOPSIS
 .B qcheck
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[eauAHTBvqChV]\fR
+Options: \fB\-[aes:uABHTpvqChV]\fR
+.TP
+\fB\-a\fR, \fB\-\-all\fR
+List all packages
 .TP
 \fB\-e\fR, \fB\-\-exact\fR
-* Exact match (only CAT/PN or PN without PV)
+Exact match (only CAT/PN or PN without PV)
 .TP
-\fB\-a\fR, \fB\-\-all\fR
-* List all packages
+\fB\-s\fR, \fB\-\-skip\fR <arg>
+Ignore files matching the regular expression <arg>
 .TP
 \fB\-u\fR, \fB\-\-update\fR
-* Update missing files, chksum and mtimes for packages
+Update missing files, chksum and mtimes for packages
 .TP
 \fB\-A\fR, \fB\-\-noafk\fR
-* Ignore missing files
+Ignore missing files
+.TP
+\fB\-B\fR, \fB\-\-badonly\fR
+Only print pkgs containing bad files
 .TP
 \fB\-H\fR, \fB\-\-nohash\fR
-* Ignore differing/unknown file chksums
+Ignore differing/unknown file chksums
 .TP
 \fB\-T\fR, \fB\-\-nomtime\fR
-* Ignore differing file mtimes
+Ignore differing file mtimes
 .TP
-\fB\-B\fR, \fB\-\-badonly\fR
-* Only print pkgs containing bad files excluding /etc.
+\fB\-p\fR, \fB\-\-prelink\fR
+Undo prelink when calculating checksums
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qcheck.1,v 1.24 2008/04/12 17:26:00 solar Exp $
+$Id: qcheck.1,v 1.25 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qdepends.1 b/man/qdepends.1
index 404fd7e1..f148abd1 100644
--- a/man/qdepends.1
+++ b/man/qdepends.1
@@ -1,4 +1,4 @@
-.TH qdepends "1" "May 2007" "Gentoo Foundation" "qdepends"
+.TH qdepends "1" "April 2012" "Gentoo Foundation" "qdepends"
 .SH NAME
 qdepends \- show dependency info
 .SH SYNOPSIS
@@ -8,43 +8,39 @@ qdepends \- show dependency info
 Options: \fB\-[drpaNk:Q:vqChV]\fR
 .TP
 \fB\-d\fR, \fB\-\-depend\fR
-* Show DEPEND info (default)
+Show DEPEND info (default)
 .TP
 \fB\-r\fR, \fB\-\-rdepend\fR
-* Show RDEPEND info
+Show RDEPEND info
 .TP
 \fB\-p\fR, \fB\-\-pdepend\fR
-* Show PDEPEND info
+Show PDEPEND info
 .TP
-\fB\-k\fR, \fB\-\-key\fR
-<arg>
-.BR
- * User defined vdb key
+\fB\-k\fR, \fB\-\-key\fR <arg>
+User defined vdb key
 .TP
-\fB\-Q\fR, \fB\-\-query\fR
-<arg>
-.BR
- * Query reverse deps
+\fB\-Q\fR, \fB\-\-query\fR <arg>
+Query reverse deps
 .TP
 \fB\-N\fR, \fB\-\-name\-only\fR
-* Only show package name
+Only show package name
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* Show all DEPEND info
+Show all DEPEND info
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qdepends.1,v 1.22 2007/05/11 08:25:06 solar Exp $
+$Id: qdepends.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qfile.1 b/man/qfile.1
index a8d4b4e4..6c5547a5 100644
--- a/man/qfile.1
+++ b/man/qfile.1
@@ -1,46 +1,48 @@
-.TH qfile "1" "January 2007" "Gentoo Foundation" "qfile"
+.TH qfile "1" "April 2012" "Gentoo Foundation" "qfile"
 .SH NAME
 qfile \- list all pkgs owning files
 .SH SYNOPSIS
 .B qfile
-\fI<filename>\fR
+\fI<opts> <filename>\fR
 .SH DESCRIPTION
-Options: \fB\-[ef:m:oRx:vqChV]\fR
+Options: \fB\-[ef:m:oRx:SvqChV]\fR
 .TP
 \fB\-e\fR, \fB\-\-exact\fR
-* Exact match
+Exact match
 .TP
 \fB\-f\fR, \fB\-\-from\fR <arg>
- * Read arguments from file <arg> ("-" for stdin)
+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\-m\fR, \fB\-\-max\-args\fR <arg> * Treat from file arguments by groups of <arg> (defaults to 5000)
 .TP
 \fB\-o\fR, \fB\-\-orphans\fR
-* List orphan files
+List orphan files
 .TP
 \fB\-R\fR, \fB\-\-root\-prefix\fR
-* Assume arguments are already prefixed by $ROOT
+Assume arguments are already prefixed by $ROOT
 .TP
 \fB\-x\fR, \fB\-\-exclude\fR <arg>
- * Don't look in package <arg>
+Don't look in package <arg>
+.TP
+\fB\-S\fR, \fB\-\-slots\fR
+Display installed packages with slots
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qfile.1,v 1.24 2007/01/13 19:17:40 solar Exp $
+$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"
diff --git a/man/qgrep.1 b/man/qgrep.1
index dc604d66..fa12b680 100644
--- a/man/qgrep.1
+++ b/man/qgrep.1
@@ -1,73 +1,70 @@
-.TH qgrep "1" "April 2007" "Gentoo Foundation" "qgrep"
+.TH qgrep "1" "April 2012" "Gentoo Foundation" "qgrep"
 .SH NAME
 qgrep \- grep in ebuilds
 .SH SYNOPSIS
 .B qgrep
-\fI<misc args>\fR
+\fI<opts> <misc args>\fR
 .SH DESCRIPTION
 Options: \fB\-[IiHNclLexJEsS:B:A:vqChV]\fR
 .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
+Ignore case distinctions
 .TP
 \fB\-H\fR, \fB\-\-with\-filename\fR
-* Print the filename for each match
+Print the filename for each match
 .TP
 \fB\-N\fR, \fB\-\-with\-name\fR
-* Print the package or eclass name for each match
+Print the package or eclass name for each match
 .TP
 \fB\-c\fR, \fB\-\-count\fR
-* Only print a count of matching lines per FILE
+Only print a count of matching lines per FILE
 .TP
 \fB\-l\fR, \fB\-\-list\fR
-* Only print FILE names containing matches
+Only print FILE names containing matches
 .TP
 \fB\-L\fR, \fB\-\-invert\-list\fR
-* Only print FILE names containing no match
+Only print FILE names containing no match
 .TP
 \fB\-e\fR, \fB\-\-regexp\fR
-* Use PATTERN as a regular expression
+Use PATTERN as a regular expression
 .TP
 \fB\-x\fR, \fB\-\-extended\fR
-* Use PATTERN as an extended regular expression
+Use PATTERN as an extended regular expression
 .TP
 \fB\-J\fR, \fB\-\-installed\fR
-* Search in installed ebuilds instead of the tree
+Search in installed ebuilds instead of the tree
 .TP
 \fB\-E\fR, \fB\-\-eclass\fR
-* Search in eclasses instead of ebuilds
+Search in eclasses instead of ebuilds
 .TP
 \fB\-s\fR, \fB\-\-skip\-comments\fR
-* Skip comments lines
+Skip comments lines
 .TP
 \fB\-S\fR, \fB\-\-skip\fR <arg>
-.BR
- * Skip lines matching <arg>
+Skip lines matching <arg>
 .TP
 \fB\-B\fR, \fB\-\-before\fR <arg>
-.BR
- * Print <arg> lines of leading context
+Print <arg> lines of leading context
 .TP
 \fB\-A\fR, \fB\-\-after\fR <arg>
-.BR
- * Print <arg> lines of trailing context
+Print <arg> lines of trailing context
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qgrep.1,v 1.17 2007/04/05 18:25:27 solar Exp $
+$Id: qgrep.1,v 1.18 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qlist.1 b/man/qlist.1
index 9ce53ade..3db4c924 100644
--- a/man/qlist.1
+++ b/man/qlist.1
@@ -1,55 +1,58 @@
-.TH qlist "1" "September 2007" "Gentoo Foundation" "qlist"
+.TH qlist "1" "April 2012" "Gentoo Foundation" "qlist"
 .SH NAME
 qlist \- list files owned by pkgname
 .SH SYNOPSIS
 .B qlist
 \fI<opts> <pkgname>\fR
 .SH DESCRIPTION
-Options: \fB\-[ISULDeadosvqChV]\fR
+Options: \fB\-[ISULcDeadosvqChV]\fR
 .TP
 \fB\-I\fR, \fB\-\-installed\fR
-* Just show installed packages
+Just show installed packages
 .TP
 \fB\-S\fR, \fB\-\-slots\fR
-* Display installed packages with slots
+Display installed packages with slots
 .TP
 \fB\-L\fR, \fB\-\-separator\fR
-* Display : as the slot separator
+Display : as the slot separator
+.TP
+\fB\-c\fR, \fB\-\-columns\fR
+Display column view
 .TP
 \fB\-U\fR, \fB\-\-umap\fR
-* Display installed packages with flags used
+Display installed packages with flags used
 .TP
 \fB\-D\fR, \fB\-\-dups\fR
-* Only show package dups
+Only show package dups
 .TP
 \fB\-e\fR, \fB\-\-exact\fR
-* Exact match (only CAT/PN or PN without PV)
+Exact match (only CAT/PN or PN without PV)
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* Show every installed package
+Show every installed package
 .TP
 \fB\-d\fR, \fB\-\-dir\fR
-* Only show directories
+Only show directories
 .TP
 \fB\-o\fR, \fB\-\-obj\fR
-* Only show objects
+Only show objects
 .TP
 \fB\-s\fR, \fB\-\-sym\fR
-* Only show symlinks
+Only show symlinks
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qlist.1,v 1.24 2007/09/08 06:31:48 solar Exp $
+$Id: qlist.1,v 1.25 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qlop.1 b/man/qlop.1
index 9247c6c4..cbac617f 100644
--- a/man/qlop.1
+++ b/man/qlop.1
@@ -1,4 +1,4 @@
-.TH qlop "1" "May 2007" "Gentoo Foundation" "qlop"
+.TH qlop "1" "April 2012" "Gentoo Foundation" "qlop"
 .SH NAME
 qlop \- emerge log analyzer
 .SH SYNOPSIS
@@ -8,44 +8,42 @@ qlop \- emerge log analyzer
 Options: \fB\-[gtHluscf:vqChV]\fR
 .TP
 \fB\-g\fR, \fB\-\-gauge\fR
-* Gauge number of times a package has been merged
+Gauge number of times a package has been merged
 .TP
 \fB\-t\fR, \fB\-\-time\fR
-* Calculate merge time for a specific package
+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 \fB\-t\fR)
 .TP
 \fB\-l\fR, \fB\-\-list\fR
-* Show merge history
+Show merge history
 .TP
 \fB\-u\fR, \fB\-\-unlist\fR
-* Show unmerge history
+Show unmerge history
 .TP
 \fB\-s\fR, \fB\-\-sync\fR
-* Show sync history
+Show sync history
 .TP
 \fB\-c\fR, \fB\-\-current\fR
-* Show current emerging packages
+Show current emerging packages
 .TP
-\fB\-f\fR, \fB\-\-logfile\fR
-<arg>
-.BR
- * Read emerge logfile instead of /var/log/emerge.log
+\fB\-f\fR, \fB\-\-logfile\fR <arg>
+Read emerge logfile instead of /var/log/emerge.log
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qlop.1,v 1.20 2007/05/11 08:25:06 solar Exp $
+$Id: qlop.1,v 1.21 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qmerge.1 b/man/qmerge.1
index 38e1094a..d21ff03f 100644
--- a/man/qmerge.1
+++ b/man/qmerge.1
@@ -1,4 +1,4 @@
-.TH qmerge "1" "May 2007" "Gentoo Foundation" "qmerge"
+.TH qmerge "1" "April 2012" "Gentoo Foundation" "qmerge"
 .SH NAME
 qmerge \- fetch and merge binary package
 .SH SYNOPSIS
@@ -8,48 +8,48 @@ qmerge \- fetch and merge binary package
 Options: \fB\-[fFsKUpuyO5vqChV]\fR
 .TP
 \fB\-f\fR, \fB\-\-fetch\fR
-* Fetch package and newest Packages metadata
+Fetch package and newest Packages metadata
 .TP
 \fB\-F\fR, \fB\-\-force\fR
-* Fetch package (skipping Packages)
+Fetch package (skipping Packages)
 .TP
 \fB\-s\fR, \fB\-\-search\fR
-* Search available packages
+Search available packages
 .TP
 \fB\-K\fR, \fB\-\-install\fR
-* Install package
+Install package
 .TP
 \fB\-U\fR, \fB\-\-unmerge\fR
-* Uninstall package
+Uninstall package
 .TP
 \fB\-p\fR, \fB\-\-pretend\fR
-* Pretend only
+Pretend only
 .TP
 \fB\-u\fR, \fB\-\-update\fR
-* Update only
+Update only
 .TP
 \fB\-y\fR, \fB\-\-yes\fR
-* Don't prompt before overwriting
+Don't prompt before overwriting
 .TP
 \fB\-O\fR, \fB\-\-nodeps\fR
-* Don't merge dependencies
+Don't merge dependencies
 .TP
 \fB\-5\fR, \fB\-\-nomd5\fR
-* Don't verify MD5 digest of files
+Don't verify MD5 digest of files
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qmerge.1,v 1.14 2007/05/11 08:25:06 solar Exp $
+$Id: qmerge.1,v 1.15 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qpkg.1 b/man/qpkg.1
index 8dff7ee1..b7dc5ffe 100644
--- a/man/qpkg.1
+++ b/man/qpkg.1
@@ -1,36 +1,37 @@
-.TH qpkg "1" "May 2007" "Gentoo Foundation" "qpkg"
+.TH qpkg "1" "April 2012" "Gentoo Foundation" "qpkg"
 .SH NAME
 qpkg \- manipulate Gentoo binpkgs
 .SH SYNOPSIS
 .B qpkg
 \fI<opts> <misc args>\fR
 .SH DESCRIPTION
-Options: \fB\-[cpP:vqChV]\fR
+Options: \fB\-[cEpP:vqChV]\fR
 .TP
 \fB\-c\fR, \fB\-\-clean\fR
-* clean pkgdir of unused binary files
+clean pkgdir of unused binary files
+.TP
+\fB\-E\fR, \fB\-\-eclean\fR
+clean pkgdir of files not in the tree anymore (slow)
 .TP
 \fB\-p\fR, \fB\-\-pretend\fR
-* pretend only
+pretend only
 .TP
-\fB\-P\fR, \fB\-\-pkgdir\fR
-<arg>
-.BR
- * alternate package directory
+\fB\-P\fR, \fB\-\-pkgdir\fR <arg>
+alternate package directory
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qpkg.1,v 1.19 2007/06/01 00:10:07 solar Exp $
+$Id: qpkg.1,v 1.20 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qsearch.1 b/man/qsearch.1
index b9df2ab3..9cc6131b 100644
--- a/man/qsearch.1
+++ b/man/qsearch.1
@@ -1,45 +1,46 @@
-.TH qsearch "1" "May 2007" "Gentoo Foundation" "qsearch"
+.TH qsearch "1" "April 2012" "Gentoo Foundation" "qsearch"
 .SH NAME
 qsearch \- search pkgname/desc
 .SH SYNOPSIS
 .B qsearch
 \fI<opts> <regex>\fR
 .SH DESCRIPTION
-Options: \fB\-[acsSNHvqChV]\fR
+Options: \fB\-[acesSNHvqChV]\fR
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* List the descriptions of every package in the cache
+List the descriptions of every package in the cache
 .TP
 \fB\-c\fR, \fB\-\-cache\fR
-* Use the portage cache
+Use the portage cache (default)
+.TP
+\fB\-e\fR, \fB\-\-ebuilds\fR
+Use the portage ebuild tree
 .TP
 \fB\-s\fR, \fB\-\-search\fR
-* Regex search package basenames
+Regex search package basenames
 .TP
-\fB\-S\fR, \fB\-\-desc\fR
-<arg>
-.BR
- * Regex search package descriptions
+\fB\-S\fR, \fB\-\-desc\fR <arg>
+Regex search package descriptions
 .TP
 \fB\-N\fR, \fB\-\-name\-only\fR
-* Only show package name
+Only show package name
 .TP
 \fB\-H\fR, \fB\-\-homepage\fR
-* Show homepage info
+Show homepage info
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qsearch.1,v 1.21 2007/05/11 08:25:06 solar Exp $
+$Id: qsearch.1,v 1.22 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qsize.1 b/man/qsize.1
index 04d0d917..1d0ebdf6 100644
--- a/man/qsize.1
+++ b/man/qsize.1
@@ -1,4 +1,4 @@
-.TH qsize "1" "June 2007" "Gentoo Foundation" "qsize"
+.TH qsize "1" "April 2012" "Gentoo Foundation" "qsize"
 .SH NAME
 qsize \- calculate size usage
 .SH SYNOPSIS
@@ -8,44 +8,42 @@ qsize \- calculate size usage
 Options: \fB\-[fasSmkbi:vqChV]\fR
 .TP
 \fB\-f\fR, \fB\-\-filesystem\fR
-* Show size used on disk
+Show size used on disk
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* Size all installed packages
+Size all installed packages
 .TP
 \fB\-s\fR, \fB\-\-sum\fR
-* Include a summary
+Include a summary
 .TP
 \fB\-S\fR, \fB\-\-sum\-only\fR
-* Show just the summary
+Show just the summary
 .TP
 \fB\-m\fR, \fB\-\-megabytes\fR
-* Display size in megabytes
+Display size in megabytes
 .TP
 \fB\-k\fR, \fB\-\-kilobytes\fR
-* Display size in kilobytes
+Display size in kilobytes
 .TP
 \fB\-b\fR, \fB\-\-bytes\fR
-* Display size in bytes
+Display size in bytes
 .TP
-\fB\-i\fR, \fB\-\-ignore\fR
-<arg>
-.BR
- * Ignore regexp string
+\fB\-i\fR, \fB\-\-ignore\fR <arg>
+Ignore regexp string
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qsize.1,v 1.22 2007/06/07 18:27:00 solar Exp $
+$Id: qsize.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qtbz2.1 b/man/qtbz2.1
index ae4577c8..8d12b406 100644
--- a/man/qtbz2.1
+++ b/man/qtbz2.1
@@ -1,40 +1,43 @@
-.TH qtbz2 "1" "May 2007" "Gentoo Foundation" "qtbz2"
+.TH qtbz2 "1" "April 2012" "Gentoo Foundation" "qtbz2"
 .SH NAME
 qtbz2 \- manipulate tbz2 packages
 .SH SYNOPSIS
 .B qtbz2
 \fI<opts> <misc args>\fR
 .SH DESCRIPTION
-Options: \fB\-[jstxOvqChV]\fR
+Options: \fB\-[d:jstxOvqChV]\fR
+.TP
+\fB\-d\fR, \fB\-\-dir\fR <arg>
+Change to specified directory
 .TP
 \fB\-j\fR, \fB\-\-join\fR
-* Join tar.bz2 + xpak into a tbz2
+Join tar.bz2 + xpak into a tbz2
 .TP
 \fB\-s\fR, \fB\-\-split\fR
-* Split a tbz2 into a tar.bz2 + xpak
+Split a tbz2 into a tar.bz2 + xpak
 .TP
 \fB\-t\fR, \fB\-\-tarbz2\fR
-* Just split the tar.bz2
+Just split the tar.bz2
 .TP
 \fB\-x\fR, \fB\-\-xpak\fR
-* Just split the xpak
+Just split the xpak
 .TP
 \fB\-O\fR, \fB\-\-stdout\fR
-* Write files to stdout
+Write files to stdout
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qtbz2.1,v 1.19 2007/05/11 08:25:06 solar Exp $
+$Id: qtbz2.1,v 1.20 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/quse.1 b/man/quse.1
index 8e747720..1196de62 100644
--- a/man/quse.1
+++ b/man/quse.1
@@ -1,4 +1,4 @@
-.TH quse "1" "May 2007" "Gentoo Foundation" "quse"
+.TH quse "1" "April 2012" "Gentoo Foundation" "quse"
 .SH NAME
 quse \- find pkgs using useflags
 .SH SYNOPSIS
@@ -8,41 +8,39 @@ quse \- find pkgs using useflags
 Options: \fB\-[eavKLDF:NvqChV]\fR
 .TP
 \fB\-e\fR, \fB\-\-exact\fR
-* Show exact non regexp matching using strcmp
+Show exact non regexp matching using strcmp
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* Show annoying things in IUSE
+Show annoying things in IUSE
 .TP
 \fB\-K\fR, \fB\-\-keywords\fR
-* Use the KEYWORDS vs IUSE
+Use the KEYWORDS vs IUSE
 .TP
 \fB\-L\fR, \fB\-\-license\fR
-* Use the LICENSE vs IUSE
+Use the LICENSE vs IUSE
 .TP
 \fB\-D\fR, \fB\-\-describe\fR
-* Describe the USE flag
+Describe the USE flag
 .TP
-\fB\-F\fR, \fB\-\-format\fR
-<arg>
-.BR
- * Use your own variable formats. \fB\-F\fR NAME=
+\fB\-F\fR, \fB\-\-format\fR <arg>
+Use your own variable formats. \fB\-F\fR NAME=
 .TP
 \fB\-N\fR, \fB\-\-name\-only\fR
-* Only show package name
+Only show package name
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: quse.1,v 1.22 2007/05/11 08:25:06 solar Exp $
+$Id: quse.1,v 1.23 2012/04/15 05:31:07 vapier Exp $
diff --git a/man/qxpak.1 b/man/qxpak.1
index bb6f50b0..8fb2b2f4 100644
--- a/man/qxpak.1
+++ b/man/qxpak.1
@@ -1,4 +1,4 @@
-.TH qxpak "1" "May 2007" "Gentoo Foundation" "qxpak"
+.TH qxpak "1" "April 2012" "Gentoo Foundation" "qxpak"
 .SH NAME
 qxpak \- manipulate xpak archives
 .SH SYNOPSIS
@@ -8,35 +8,33 @@ qxpak \- manipulate xpak archives
 Options: \fB\-[lxcd:OvqChV]\fR
 .TP
 \fB\-l\fR, \fB\-\-list\fR
-* List the contents of an archive
+List the contents of an archive
 .TP
 \fB\-x\fR, \fB\-\-extract\fR
-* Extract the contents of an archive
+Extract the contents of an archive
 .TP
 \fB\-c\fR, \fB\-\-create\fR
-* Create an archive of a directory/files
+Create an archive of a directory/files
 .TP
-\fB\-d\fR, \fB\-\-dir\fR
-<arg>
-.BR
- * Change to specified directory
+\fB\-d\fR, \fB\-\-dir\fR <arg>
+Change to specified directory
 .TP
 \fB\-O\fR, \fB\-\-stdout\fR
-* Write files to stdout
+Write files to stdout
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
-* Make a lot of noise
+Make a lot of noise
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
-* Tighter output; suppress warnings
+Tighter output; suppress warnings
 .TP
 \fB\-C\fR, \fB\-\-nocolor\fR
-* Don't output color
+Don't output color
 .TP
 \fB\-h\fR, \fB\-\-help\fR
-* Print this help and exit
+Print this help and exit
 .TP
 \fB\-V\fR, \fB\-\-version\fR
-* Print version and exit
+Print version and exit
 .PP
-$Id: qxpak.1,v 1.19 2007/05/11 08:25:06 solar Exp $
+$Id: qxpak.1,v 1.20 2012/04/15 05:31:07 vapier Exp $