diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2004-10-20 01:24:49 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2004-10-20 01:24:49 +0000 |
| commit | 39f9cec06af3056ce79a1872898d3cc689d358e2 (patch) | |
| tree | f762b28d980eea8caab4207c0c50997192d93279 /man | |
| parent | Lots of stuff. Digest handling enhancements. Pickle speedups. Sandbox fixes f... (diff) | |
| download | portage-cvs-39f9cec06af3056ce79a1872898d3cc689d358e2.tar.gz portage-cvs-39f9cec06af3056ce79a1872898d3cc689d358e2.tar.bz2 portage-cvs-39f9cec06af3056ce79a1872898d3cc689d358e2.zip | |
PORTAGE-2.0.51_rc10 ---- FINAL ATTEMPT #1
portage.py: prelink tempfile per pid.
getbinpkg.py: Potential fix for a missing dict key.
emerge.1: Updated for 'f' and 'S'
emerge: Visual acuity enhancements. Fixed all the spaces in the option handling.
Diffstat (limited to 'man')
| -rw-r--r-- | man/emerge.1 | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 0d5505b..068e4d1 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -283,11 +283,24 @@ Instead of actually performing the merge, simply display what *would* have been installed if \fB\-\-pretend\fR weren't used. Using \fB\-\-pretend\fR is strongly recommended before installing an unfamiliar package. In the printout, -\fIN\fR = new, -\fIU\fR = upgrading, -\fIR\fR = replacing, -\fIF\fR = fetch restricted, -\fIB\fR = blocked by an already installed package. +.br + +.br +\fIN\fR = new, (not yet installed) +.br +\fIS\fR = new, Slot installation (side-by-side versions) +.br +\fIU\fR = updating, (changing versions) +.br +\fID\fR = downgrade, (Best version seems lower) +.br +\fIR\fR = replacing, (Remerging same version)) +.br +\fIF\fR = fetch restricted, (Manual download) +.br +\fIf\fR = fetch restricted, (Already downloaded) +.br +\fIB\fR = blocked by an already installed package .TP .BR "\-\-quiet " (\fB\-q\fR) Results may vary, but the general outcome is a reduced or condensed @@ -365,7 +378,7 @@ simultaneously emerged because they usually provide the same functionality. .B [ebuild N ] app\-games/qstat\-25c Qstat is New to your system, and will be emerged for the first time. .TP -.B [ebuild S ] dev-libs/glib-2.4.7 +.B [ebuild NS ] dev-libs/glib-2.4.7 You already have a version of glib installed, but a 'new' version in a different SLOT is available. .TP @@ -379,6 +392,9 @@ When you attempt to emerge the package, if the sources are not found, then portage will halt and you will be provided with instructions on how to download the required files. .TP +.B [ebuild f ] media\-video/realplayer\-8\-r6 +The realplayer package's files are already downloaded. +.TP .B [ebuild U ] net\-fs/samba\-2.2.8_pre1 [2.2.7a] Samba 2.2.7a has already been emerged and can be Updated to version 2.2.8_pre1. @@ -554,4 +570,4 @@ Mike Frysinger <vapier@gentoo.org> Marius Mauch <genone@gentoo.org> .br .SH "CVS HEADER" -$Id: emerge.1,v 1.69 2004/10/10 04:17:54 vapier Exp $ +$Id: emerge.1,v 1.70 2004/10/20 01:24:49 carpaski Exp $ |