Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 162647
Collapse All | Expand All

(-)orig/portage/main/trunk/man/emerge.1 (-5 / +5 lines)
Lines 23-32 Link Here
23
installed packages to newer releases as well.  It handles both source
23
installed packages to newer releases as well.  It handles both source
24
and binary packages, and it can be used to create binary packages for
24
and binary packages, and it can be used to create binary packages for
25
distribution.
25
distribution.
26
.SH "EBUILDS, TBZ2S, SETS AND DEPENDENCIES"
26
.SH "EBUILDS, TBZ2S, SETS AND ATOMS"
27
\fBemerge\fR primarily installs packages.  You can specify
27
\fBemerge\fR primarily installs packages.  You can specify
28
packages to install in one of four main ways: an \fIebuild\fR,
28
packages to install in one of four main ways: an \fIebuild\fR,
29
a \fItbz2file\fR, a \fIset\fR, or a \fIatom\fR.
29
a \fItbz2file\fR, a \fIset\fR, or an \fIatom\fR.
30
.LP
30
.LP
31
.TP
31
.TP
32
.BR ebuild
32
.BR ebuild
Lines 39-46 Link Here
39
ignores a trailing slash so that filename completion can be used.
39
ignores a trailing slash so that filename completion can be used.
40
The \fIebuild\fR may also be an actual filename, such as
40
The \fIebuild\fR may also be an actual filename, such as
41
\fB/usr/portage/app\-admin/python/python\-2.2.1\-r2.ebuild\fR.
41
\fB/usr/portage/app\-admin/python/python\-2.2.1\-r2.ebuild\fR.
42
WARNING: The implementation of \fBemerge /path/to/ebuild\fR is broken and so 
42
\fBWARNING: The implementation of\fR emerge /path/to/ebuild \fBis broken and so 
43
this syntax shouldn't be used.
43
this syntax shouldn't be used.\fR
44
.TP
44
.TP
45
.BR tbz2file
45
.BR tbz2file
46
A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
46
A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild
Lines 390-396 Link Here
390
.BR "\-\-with\-bdeps < y | n >"
390
.BR "\-\-with\-bdeps < y | n >"
391
In dependency calculations, pull in build time dependencies that are not
391
In dependency calculations, pull in build time dependencies that are not
392
strictly required.   This defaults to \'n\' for installation actions and
392
strictly required.   This defaults to \'n\' for installation actions and
393
\'y\' for the \-\-depclean action.  This setting can be added to
393
\'y\' for the \fB\-\-depclean\fR action.  This setting can be added to
394
EMERGE_DEFAULT_OPTS (see make.conf(5)) and later overridden via the command
394
EMERGE_DEFAULT_OPTS (see make.conf(5)) and later overridden via the command
395
line.
395
line.
396
.SH "ENVIRONMENT OPTIONS"
396
.SH "ENVIRONMENT OPTIONS"

Return to bug 162647