- updated qfile ROOT and manpage handling.. TGL bug #142217

20 files changed, 310 insertions, 53 deletions

diff --git a/man/include/qfile-01-owners.include b/man/include/qfile-01-owners.include
new file mode 100644
index 00000000..b82c479f
--- /dev/null
+++ b/man/include/qfile-01-owners.include
@@ -0,0 +1,41 @@
+[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 
+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 
+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 
+one of the query items.
+.PP
+Find names of package(s) owning "/bin/bash":
+.nf\fI
+	$ qfile -q /bin/bash
+	app-shells/bash
+.fi
+.PP
+Find package(s) owning any file named "bash", and show paths of this files:
+.nf\fI
+	$ qfile bash
+	app-shells/bash (/bin/bash)
+	app-shells/bash (/etc/bash)
+.fi
+.PP
+Find packages(s) owning the file named "bash" in the current directory. Also 
+display their exact version:
+.nf\fI
+	$ cd /bin
+	$ qfile -e ./bash
+	app-shells/bash-3.1_p17 (/bin/bash)
+.fi
+.PP
+Find the package(s) owning the libraries needed by the Bash binary:
+.nf\fI
+	$ qfile $(scanelf -nq -F%n#F /bin/bash | tr , '\\n')
+	sys-libs/ncurses (/lib/libncurses.so.5)
+	sys-libs/glibc (/lib/libdl.so.2)
+	sys-libs/glibc (/lib/libc.so.6)
+.fi
diff --git a/man/include/qfile-02-orphans.include b/man/include/qfile-02-orphans.include
new file mode 100644
index 00000000..3692524a
--- /dev/null
+++ b/man/include/qfile-02-orphans.include
@@ -0,0 +1,41 @@
+[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 
+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, 
+leaving just a silent test command, which returns \fI0\fP if and only if
+there was no orphan in your query items.
+.PP
+Find the orphan libtool files of your system:
+.nf\fI
+	$ qfile -o $(find /lib /usr/lib -name "*.la")
+	/usr/lib/libGL.la
+.fi
+.PP
+Find the libraries needed by the binary "foo" which have not been installed by
+any package:
+.nf\fI
+	$ qfile -o $(scanelf -nq -F%n#F /path/to/foo | tr , '\\n')
+	libinstalledmanually.so.2
+.fi
+.PP
+Script to find the orphan config files on your system 
+(\fBIMPORTANT:\fP this script is just a quick example.  Do not blindly delete
+the files it will list!):
+.nf\fI
+	#!/bin/bash
+	SEARCH_PATHS="$(portageq envvar CONFIG_PROTECT)"
+	SEARCH_MASK="$(portageq envvar CONFIG_PROTECT_MASK) \\
+		/etc/runlevels /etc/portage \\
+		/etc/ssl/certs /etc/ssh \\
+		/etc/bash_completion.d /etc/cups"
+	for path in ${SEARCH_MASK} ; do
+		EXCLUDE="${EXCLUDE} -not -path ${path}/*"
+	done
+	set -f
+	find ${SEARCH_PATHS} ${EXCLUDE} -print0 \\
+		| xargs -0 -n 500 qfile -o
+.fi
diff --git a/man/include/qfile-03-ROOT.include b/man/include/qfile-03-ROOT.include
new file mode 100644
index 00000000..835f9603
--- /dev/null
+++ b/man/include/qfile-03-ROOT.include
@@ -0,0 +1,40 @@
+[Handling of the ROOT variable]
+.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 
+"/bin/sh", first on your main system, and then on a system mounted on "/mnt":
+.nf\fI
+	$ qfile -q /bin/sh
+	app-shells/bash
+	$ ROOT=/mnt qfile -q /bin/sh
+	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 
+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 
+(\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 
+later does:
+.nf\fI
+	$ ROOT=/mnt qfile sh
+	sys-apps/busybox (/bin/sh)
+	$ ROOT=/mnt qfile -R sh
+	sys-apps/busybox (/mnt/bin/sh)
+.fi
+.PP
+Sure, the same differences hold when querying for orphan files:
+.nf\fI
+	$ ROOT=/mnt qfile -o $(ls /mnt/bin/ | sed 's:^/mnt::')
+	/bin/dostuff.sh
+	$ ROOT=/mnt qfile -Ro /mnt/bin/*
+	/mnt/bin/dostuff.sh
+.fi
diff --git a/man/mkman.sh b/man/mkman.sh
index 7c6e6600..8a76e58d 100755
--- a/man/mkman.sh
+++ b/man/mkman.sh
@@ -4,7 +4,9 @@ export NOCOLOR=1
 APPLETS=$(../q | grep -e ' : ' | awk '{print $1}' | grep ^q$1)
 
 for applet in $APPLETS; do
-	help2man -N -S "Gentoo Foundation" -m ${applet} -s 1 -o ${applet}.1 "../q $applet"
+	help2man -N -S "Gentoo Foundation" -m ${applet} -s 1 \
+		$(for incl in include/${applet}-*.include; do echo "-I ${incl}"; done) \
+		-o ${applet}.1 "../q $applet"
 	[[ $? == 0 ]] || continue;
 	sed  -i -e s/'PORTAGE-UTILS-CVS:'/${applet}/g \
 		-e s/'portage-utils-cvs:'/${applet}/g \
diff --git a/man/q.1 b/man/q.1
index 44437c59..27b6e47a 100644
--- a/man/q.1
+++ b/man/q.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH q "1" "May 2006" "Gentoo Foundation" "q"
+.TH q "1" "August 2006" "Gentoo Foundation" "q"
 .SH NAME
 q \- manual page for q 
 .SH SYNOPSIS
@@ -12,9 +12,9 @@ q <applet> <args> : virtual applet
 .TP
 qatom <pkg>
 : split atom strings
-.TP
-qcheck <pkgname>
-: verify mtimes/digests
+.IP
+qcache <action> <args> : search the metadata cache
+qcheck <pkgname>       : verify mtimes/digests
 .TP
 qdepends <pkgname>
 : show dependency info
@@ -24,12 +24,7 @@ qfile <filename>
 .IP
 qglsa <action> <list> : check GLSAs against system
 qgrep <misc args>     : grep in ebuilds
-.TP
-qimlate <arch>
-: check for packages that can be marked stable
-.TP
-qlist <pkgname>
-: list files owned by pkgname
+qlist <pkgname>       : list files owned by pkgname
 .TP
 qlop <pkgname>
 : emerge log analyzer
@@ -40,6 +35,9 @@ qmerge <pkgnames>
 qpkg <misc args>
 : manipulate Gentoo binpkgs
 .TP
+qpy <misc args>
+: python interface
+.TP
 qsearch <regex>
 : search pkgname/desc
 .TP
@@ -81,4 +79,4 @@ Options: \fB\-[irmvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: q.1,v 1.18 2006/05/19 19:34:56 tcort Exp $
+$Id: q.1,v 1.19 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qatom.1 b/man/qatom.1
index 81a68a21..fea1db64 100644
--- a/man/qatom.1
+++ b/man/qatom.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qatom "1" "May 2006" "Gentoo Foundation" "qatom"
+.TH qatom "1" "August 2006" "Gentoo Foundation" "qatom"
 .SH NAME
 qatom \- manual page for qatom 
 .SH SYNOPSIS
@@ -26,4 +26,4 @@ Options: \fB\-[cvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qatom.1,v 1.10 2006/05/19 19:34:56 tcort Exp $
+$Id: qatom.1,v 1.11 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qcache.1 b/man/qcache.1
index b9891f42..9886e4b4 100644
--- a/man/qcache.1
+++ b/man/qcache.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qcache "1" "July 2006" "Gentoo Foundation" "qcache"
+.TH qcache "1" "August 2006" "Gentoo Foundation" "qcache"
 .SH NAME
 qcache \- manual page for qcache 
 .SH SYNOPSIS
 .B qcache
 \fI<action> <args> : search the metadata cache\fR
 .SH DESCRIPTION
-Options: \fB\-[p\fR:c:idtasvqChV]
+Options: \fB\-[p\fR:c:idtansvqChV]
 .HP
 \fB\-p\fR, \fB\-\-matchpkg\fR <arg>
 .BR
@@ -17,19 +17,22 @@ Options: \fB\-[p\fR:c:idtasvqChV]
  * match catname
 .TP
 \fB\-i\fR, \fB\-\-imlate\fR
-* list packages that can be marked stable
+* 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
+* 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
+* 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
 .TP
 \fB\-a\fR, \fB\-\-all\fR
-* list all packages that have at least one version keyworded for an 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.
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 * Make a lot of noise
@@ -46,4 +49,4 @@ Options: \fB\-[p\fR:c:idtasvqChV]
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qcache.1,v 1.1 2006/07/09 19:54:45 solar Exp $
+$Id: qcache.1,v 1.2 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qcheck.1 b/man/qcheck.1
index 15c39c35..9a34eeea 100644
--- a/man/qcheck.1
+++ b/man/qcheck.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qcheck "1" "May 2006" "Gentoo Foundation" "qcheck"
+.TH qcheck "1" "August 2006" "Gentoo Foundation" "qcheck"
 .SH NAME
 qcheck \- manual page for qcheck 
 .SH SYNOPSIS
@@ -29,4 +29,4 @@ Options: \fB\-[auvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qcheck.1,v 1.16 2006/05/19 19:34:56 tcort Exp $
+$Id: qcheck.1,v 1.17 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qdepends.1 b/man/qdepends.1
index f6af1f6f..6c5c3a0d 100644
--- a/man/qdepends.1
+++ b/man/qdepends.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qdepends "1" "May 2006" "Gentoo Foundation" "qdepends"
+.TH qdepends "1" "August 2006" "Gentoo Foundation" "qdepends"
 .SH NAME
 qdepends \- manual page for qdepends 
 .SH SYNOPSIS
@@ -48,4 +48,4 @@ Options: \fB\-[drpaNk\fR:Q:vqChV]
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qdepends.1,v 1.17 2006/05/19 19:34:56 tcort Exp $
+$Id: qdepends.1,v 1.18 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qfile.1 b/man/qfile.1
index d8bf53ae..38a43265 100644
--- a/man/qfile.1
+++ b/man/qfile.1
@@ -1,18 +1,21 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qfile "1" "May 2006" "Gentoo Foundation" "qfile"
+.TH qfile "1" "August 2006" "Gentoo Foundation" "qfile"
 .SH NAME
 qfile \- manual page for qfile 
 .SH SYNOPSIS
 .B qfile
 \fI<filename> : list all pkgs owning files\fR
 .SH DESCRIPTION
-Options: \fB\-[evqChV]\fR
+Options: \fB\-[eoRvqChV]\fR
 .TP
 \fB\-e\fR, \fB\-\-exact\fR
 * Exact match
 .TP
 \fB\-o\fR, \fB\-\-orphans\fR
-* List orphans files (inverse matching)
+* List orphan files
+.TP
+\fB\-R\fR, \fB\-\-root\-prefix\fR
+* Assume arguments are already prefixed by $ROOT
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 * Make a lot of noise
@@ -29,4 +32,127 @@ Options: \fB\-[evqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qfile.1,v 1.17 2006/07/22 21:42:20 solar Exp $
+$Id: qfile.1,v 1.18 2006/08/21 00:11:54 solar 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 
+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 
+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 
+one of the query items.
+.PP
+Find names of package(s) owning "/bin/bash":
+.nf\fI
+	$ qfile -q /bin/bash
+	app-shells/bash
+.fi
+.PP
+Find package(s) owning any file named "bash", and show paths of this files:
+.nf\fI
+	$ qfile bash
+	app-shells/bash (/bin/bash)
+	app-shells/bash (/etc/bash)
+.fi
+.PP
+Find packages(s) owning the file named "bash" in the current directory. Also 
+display their exact version:
+.nf\fI
+	$ cd /bin
+	$ qfile -e ./bash
+	app-shells/bash-3.1_p17 (/bin/bash)
+.fi
+.PP
+Find the package(s) owning the libraries needed by the Bash binary:
+.nf\fI
+	$ qfile $(scanelf -nq -F%n#F /bin/bash | tr , '\\n')
+	sys-libs/ncurses (/lib/libncurses.so.5)
+	sys-libs/glibc (/lib/libdl.so.2)
+	sys-libs/glibc (/lib/libc.so.6)
+.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 
+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, 
+leaving just a silent test command, which returns \fI0\fP if and only if
+there was no orphan in your query items.
+.PP
+Find the orphan libtool files of your system:
+.nf\fI
+	$ qfile -o $(find /lib /usr/lib -name "*.la")
+	/usr/lib/libGL.la
+.fi
+.PP
+Find the libraries needed by the binary "foo" which have not been installed by
+any package:
+.nf\fI
+	$ qfile -o $(scanelf -nq -F%n#F /path/to/foo | tr , '\\n')
+	libinstalledmanually.so.2
+.fi
+.PP
+Script to find the orphan config files on your system 
+(\fBIMPORTANT:\fP this script is just a quick example.  Do not blindly delete
+the files it will list!):
+.nf\fI
+	#!/bin/bash
+	SEARCH_PATHS="$(portageq envvar CONFIG_PROTECT)"
+	SEARCH_MASK="$(portageq envvar CONFIG_PROTECT_MASK) \\
+		/etc/runlevels /etc/portage \\
+		/etc/ssl/certs /etc/ssh \\
+		/etc/bash_completion.d /etc/cups"
+	for path in ${SEARCH_MASK} ; do
+		EXCLUDE="${EXCLUDE} -not -path ${path}/*"
+	done
+	set -f
+	find ${SEARCH_PATHS} ${EXCLUDE} -print0 \\
+		| xargs -0 -n 500 qfile -o
+.fi
+.SH "HANDLING OF THE ROOT VARIABLE"
+.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 
+"/bin/sh", first on your main system, and then on a system mounted on "/mnt":
+.nf\fI
+	$ qfile -q /bin/sh
+	app-shells/bash
+	$ ROOT=/mnt qfile -q /bin/sh
+	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 
+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 
+(\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 
+later does:
+.nf\fI
+	$ ROOT=/mnt qfile sh
+	sys-apps/busybox (/bin/sh)
+	$ ROOT=/mnt qfile -R sh
+	sys-apps/busybox (/mnt/bin/sh)
+.fi
+.PP
+Sure, the same differences hold when querying for orphan files:
+.nf\fI
+	$ ROOT=/mnt qfile -o $(ls /mnt/bin/ | sed 's:^/mnt::')
+	/bin/dostuff.sh
+	$ ROOT=/mnt qfile -Ro /mnt/bin/*
+	/mnt/bin/dostuff.sh
diff --git a/man/qgrep.1 b/man/qgrep.1
index 5f1994af..d00120a5 100644
--- a/man/qgrep.1
+++ b/man/qgrep.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qgrep "1" "May 2006" "Gentoo Foundation" "qgrep"
+.TH qgrep "1" "August 2006" "Gentoo Foundation" "qgrep"
 .SH NAME
 qgrep \- manual page for qgrep 
 .SH SYNOPSIS
@@ -38,4 +38,4 @@ Options: \fB\-[IiHcevqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qgrep.1,v 1.12 2006/05/19 19:34:56 tcort Exp $
+$Id: qgrep.1,v 1.13 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qlist.1 b/man/qlist.1
index 2e72b112..9185c8ab 100644
--- a/man/qlist.1
+++ b/man/qlist.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qlist "1" "May 2006" "Gentoo Foundation" "qlist"
+.TH qlist "1" "August 2006" "Gentoo Foundation" "qlist"
 .SH NAME
 qlist \- manual page for qlist 
 .SH SYNOPSIS
 .B qlist
 \fI<pkgname> : list files owned by pkgname\fR
 .SH DESCRIPTION
-Options: \fB\-[ISUDeadosvqChV]\fR
+Options: \fB\-[ISUODeadosvqChV]\fR
 .TP
 \fB\-I\fR, \fB\-\-installed\fR
 * Just show installed packages
@@ -17,6 +17,9 @@ Options: \fB\-[ISUDeadosvqChV]\fR
 \fB\-U\fR, \fB\-\-umap\fR
 * Display installed packages with flags used
 .TP
+\fB\-O\fR, \fB\-\-invert\fR
+* Display atoms not installed (use with \fB\-I\fR/-S/-U
+.TP
 \fB\-D\fR, \fB\-\-dups\fR
 * Only show package dups
 .TP
@@ -50,4 +53,4 @@ Options: \fB\-[ISUDeadosvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qlist.1,v 1.17 2006/05/19 19:34:56 tcort Exp $
+$Id: qlist.1,v 1.18 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qlop.1 b/man/qlop.1
index 6374e779..dda4e78e 100644
--- a/man/qlop.1
+++ b/man/qlop.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qlop "1" "July 2006" "Gentoo Foundation" "qlop"
+.TH qlop "1" "August 2006" "Gentoo Foundation" "qlop"
 .SH NAME
 qlop \- manual page for qlop 
 .SH SYNOPSIS
@@ -49,4 +49,4 @@ Options: \fB\-[gtluscf\fR:F:HvqChV]
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qlop.1,v 1.15 2006/07/25 14:46:04 solar Exp $
+$Id: qlop.1,v 1.16 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qmerge.1 b/man/qmerge.1
index cac72e9a..7b9cb0c0 100644
--- a/man/qmerge.1
+++ b/man/qmerge.1
@@ -1,18 +1,18 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qmerge "1" "May 2006" "Gentoo Foundation" "qmerge"
+.TH qmerge "1" "August 2006" "Gentoo Foundation" "qmerge"
 .SH NAME
 qmerge \- manual page for qmerge 
 .SH SYNOPSIS
 .B qmerge
 \fI<pkgnames> : fetch and merge binary package\fR
 .SH DESCRIPTION
-Options: \fB\-[fFsKUpyO5vqChV]\fR
+Options: \fB\-[fFsKUpuyO5vqChV]\fR
 .TP
 \fB\-f\fR, \fB\-\-fetch\fR
-* Force download overwriting existing files
+* Fetch package and newest Packages metadata
 .TP
 \fB\-F\fR, \fB\-\-force\fR
-* Force download overwriting existing files (skipping Packages)
+* Fetch package (skipping Packages)
 .TP
 \fB\-s\fR, \fB\-\-search\fR
 * Search available packages
@@ -26,6 +26,9 @@ Options: \fB\-[fFsKUpyO5vqChV]\fR
 \fB\-p\fR, \fB\-\-pretend\fR
 * Pretend only
 .TP
+\fB\-u\fR, \fB\-\-update\fR
+* Update only
+.TP
 \fB\-y\fR, \fB\-\-yes\fR
 * Don't prompt before overwriting
 .TP
@@ -50,4 +53,4 @@ Options: \fB\-[fFsKUpyO5vqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qmerge.1,v 1.9 2006/05/19 19:34:56 tcort Exp $
+$Id: qmerge.1,v 1.10 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qpkg.1 b/man/qpkg.1
index b5f2423a..239247d6 100644
--- a/man/qpkg.1
+++ b/man/qpkg.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qpkg "1" "May 2006" "Gentoo Foundation" "qpkg"
+.TH qpkg "1" "August 2006" "Gentoo Foundation" "qpkg"
 .SH NAME
 qpkg \- manual page for qpkg 
 .SH SYNOPSIS
@@ -31,4 +31,4 @@ Options: \fB\-[pP\fR:vqChV]
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qpkg.1,v 1.13 2006/05/19 19:34:56 tcort Exp $
+$Id: qpkg.1,v 1.14 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qsearch.1 b/man/qsearch.1
index c5fe0fbd..84908ad2 100644
--- a/man/qsearch.1
+++ b/man/qsearch.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qsearch "1" "May 2006" "Gentoo Foundation" "qsearch"
+.TH qsearch "1" "August 2006" "Gentoo Foundation" "qsearch"
 .SH NAME
 qsearch \- manual page for qsearch 
 .SH SYNOPSIS
@@ -43,4 +43,4 @@ Options: \fB\-[acsSNHvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qsearch.1,v 1.16 2006/05/19 19:34:56 tcort Exp $
+$Id: qsearch.1,v 1.17 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qsize.1 b/man/qsize.1
index 3970b00b..b4e0174a 100644
--- a/man/qsize.1
+++ b/man/qsize.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qsize "1" "May 2006" "Gentoo Foundation" "qsize"
+.TH qsize "1" "August 2006" "Gentoo Foundation" "qsize"
 .SH NAME
 qsize \- manual page for qsize 
 .SH SYNOPSIS
@@ -44,4 +44,4 @@ Options: \fB\-[fasSmkbvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qsize.1,v 1.16 2006/05/19 19:34:56 tcort Exp $
+$Id: qsize.1,v 1.17 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qtbz2.1 b/man/qtbz2.1
index 51ea51db..fa769f64 100644
--- a/man/qtbz2.1
+++ b/man/qtbz2.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qtbz2 "1" "May 2006" "Gentoo Foundation" "qtbz2"
+.TH qtbz2 "1" "August 2006" "Gentoo Foundation" "qtbz2"
 .SH NAME
 qtbz2 \- manual page for qtbz2 
 .SH SYNOPSIS
@@ -38,4 +38,4 @@ Options: \fB\-[jstxOvqChV]\fR
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qtbz2.1,v 1.14 2006/05/19 19:34:56 tcort Exp $
+$Id: qtbz2.1,v 1.15 2006/08/21 00:11:54 solar Exp $
diff --git a/man/quse.1 b/man/quse.1
index fe222794..1a1c890c 100644
--- a/man/quse.1
+++ b/man/quse.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH quse "1" "May 2006" "Gentoo Foundation" "quse"
+.TH quse "1" "August 2006" "Gentoo Foundation" "quse"
 .SH NAME
 quse \- manual page for quse 
 .SH SYNOPSIS
@@ -46,4 +46,4 @@ Options: \fB\-[eavKLDF\fR:NvqChV]
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: quse.1,v 1.17 2006/05/19 19:34:56 tcort Exp $
+$Id: quse.1,v 1.18 2006/08/21 00:11:54 solar Exp $
diff --git a/man/qxpak.1 b/man/qxpak.1
index 0e3bd2b3..559bf7db 100644
--- a/man/qxpak.1
+++ b/man/qxpak.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH qxpak "1" "May 2006" "Gentoo Foundation" "qxpak"
+.TH qxpak "1" "August 2006" "Gentoo Foundation" "qxpak"
 .SH NAME
 qxpak \- manual page for qxpak 
 .SH SYNOPSIS
@@ -40,4 +40,4 @@ Options: \fB\-[lxcd\fR:OvqChV]
 \fB\-V\fR, \fB\-\-version\fR
 * Print version and exit
 .PP
-$Id: qxpak.1,v 1.14 2006/05/19 19:34:56 tcort Exp $
+$Id: qxpak.1,v 1.15 2006/08/21 00:11:54 solar Exp $