From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RYN3r-0000al-6N for garchives@archives.gentoo.org; Wed, 07 Dec 2011 19:21:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9ABB21C073; Wed, 7 Dec 2011 19:21:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8AB1021C073 for ; Wed, 7 Dec 2011 19:21:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1026E1B4010 for ; Wed, 7 Dec 2011 19:21:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5915E80042 for ; Wed, 7 Dec 2011 19:21:38 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 man/fixpackages.1 X-VCS-Directories: man/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c93a46851c43f7e8539a67b2376dc8f55af41789 Date: Wed, 7 Dec 2011 19:21:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c7ca2fa6-fd40-4e26-9006-1abfa78712f3 X-Archives-Hash: def6888ec3bbcea768c6719d0964f799 commit: c93a46851c43f7e8539a67b2376dc8f55af41789 Author: Zac Medico gentoo org> AuthorDate: Wed Dec 7 19:20:39 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Dec 7 19:20:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc93a4685 man: document fixpackages for bug #393517 --- man/emerge.1 | 21 ++++++++++++++++----- man/fixpackages.1 | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 0329e20..b4da69c 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1,4 +1,4 @@ -.TH "EMERGE" "1" "Oct 2011" "Portage VERSION" "Portage" +.TH "EMERGE" "1" "Dec 2011" "Portage VERSION" "Portage" .SH "NAME" emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" @@ -427,8 +427,8 @@ are modified. This option is enabled by default. =20 \fBWARNING:\fR If you want to disable \-\-dynamic\-deps, then it may be necessary to -first run \fBfixpackages\fR in order to get the best results. The -\fBfixpackages\fR command performs two different operations that can +first run \fBfixpackages\fR(1) in order to get the best results. The +\fBfixpackages\fR(1) command performs two different operations that can also be performed separately by the `emaint \-\-fix moveinst` and `emaint \-\-fix movebin` commands (see \fBemaint\fR(1)). .TP @@ -561,11 +561,22 @@ Only merge (or pretend to merge) the dependencies o= f the packages specified, not the packages themselves. .TP .BR "\-\-package\-moves [ y | n ]" -Perform package moves when necessary. This option -is enabled by default. \fBWARNING:\fR This option +Perform package moves when necessary. This option is enabled +by default. Package moves are typically applied immediately +after a \fB\-\-sync\fR action. They are applied in an +incremental fashion, using only the subset of the history of +package moves which have been added or modified since the +previous application of package moves. + +\fBWARNING:\fR This option should remain enabled under normal circumstances. Do not disable it unless you know what you are doing. + +\fBNOTE:\fR The \fBfixpackages\fR(1) command can be used to +exhaustively apply the entire history of package moves, +regardless of whether or not any of the package moves have +been previously applied. .TP .BR "\-\-pretend " (\fB\-p\fR) Instead of actually performing the merge, simply display what *would* diff --git a/man/fixpackages.1 b/man/fixpackages.1 new file mode 100644 index 0000000..3168327 --- /dev/null +++ b/man/fixpackages.1 @@ -0,0 +1,15 @@ +.TH "FIXPACKAGES" "1" "Dec 2011" "Portage VERSION" "Portage" +.SH NAME +fixpackages \- Perform package move updates for all packages +.SH SYNOPSIS +\fBfixpackages\fR +.SH DESCRIPTION +The fixpackages program performs package move updates on configuration +files, installed packages, and binary packages. +.SH "REPORTING BUGS" +Please report bugs via http://bugs.gentoo.org/ +.SH AUTHORS +Zac Medico +.SH "SEE ALSO" +.BR emaint (1), +.BR emerge (1)