summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-12 07:52:00 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-12 07:52:00 +0000
commitb76d2cb80bce6611dbd93db1819b4a449556acba (patch)
tree49efe9d6228daae6a209f3210657a58b50321f2b /man
parentcatch possible ENOENT error from portage_checksum.perform_md5 for bug 24374 (diff)
downloadportage-multirepo-b76d2cb80bce6611dbd93db1819b4a449556acba.tar.gz
portage-multirepo-b76d2cb80bce6611dbd93db1819b4a449556acba.tar.bz2
portage-multirepo-b76d2cb80bce6611dbd93db1819b4a449556acba.zip
add a new emerge --ignore-default-opts option for bug 121695
svn path=/main/trunk/; revision=2696
Diffstat (limited to 'man')
-rw-r--r--man/emerge.13
-rw-r--r--man/make.conf.54
2 files changed, 6 insertions, 1 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index 4caaa4a9..fcb33ea5 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -275,6 +275,9 @@ information from the local machine. All binaries will be downloaded from the
remote server without consulting packages existing in the local packages
directory.
.TP
+.BR "\-\-ignore-default-opts"
+Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored.
+.TP
.BR "\-\-newuse " (\fB\-N\fR)
Tells emerge to include installed packages where USE flags have changed since
compilation. An asterisk marks when a USE flag has changed since the package
diff --git a/man/make.conf.5 b/man/make.conf.5
index ee1bcb22..f881534e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -99,7 +99,9 @@ Defines whether or not to ignore audible beeps when displaying important
informational messages. This variable is unset by default.
.TP
.B EMERGE_DEFAULT_OPTS
-Options to append to the end of the emerge command line on every invocation.
+Options to append to the end of the \fBemerge\fR(1) command line on every invocation.
+These options will not be appended to the command line if --ignore-default-opts
+is specified.
.TP
.B EPAUSE_IGNORE
Defines whether or not to ignore short pauses that occur when displaying