From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 29 Jul 2007 22:09:49 +0000 (-0000)
Subject: Update USE_ORDER docs for bug #187016.
X-Git-Tag: v2.2_pre1~923
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6ac2c7f2ed8160028be31263766f4a3b1cec17c;p=portage.git

Update USE_ORDER docs for bug #187016.

svn path=/main/trunk/; revision=7428
---

diff --git a/man/make.conf.5 b/man/make.conf.5
index da6df14dc..79361e482 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -494,11 +494,16 @@ This variable contains options that control the build behavior of several
 packages.  More information in \fBebuild\fR(5).  Possible USE values
 can be found in \fI/usr/portage/profiles/use.desc\fR.
 .TP
+\fBUSE_EXPAND\fR = \fI[space delimited list of variable names]\fR
+Any variable listed here will be used to augment USE by inserting a new flag
+for every value in that variable, so USE_EXPAND="FOO" and FOO="bar bla" results
+in USE="foo_bar foo_bla".
+.TP
 \fBUSE_EXPAND_HIDDEN\fR = \fI[space delimited list of variable names]\fR
 Names of \fBUSE_EXPAND\fR variables that should not be shown in the verbose merge
 list output of the \fBemerge\fR(1) command.
 .TP
-\fBUSE_ORDER\fR = \fI"env:pkg:conf:defaults:pkginternal"\fR
+\fBUSE_ORDER\fR = \fI"env:pkg:conf:defaults:pkginternal:env.d"\fR
 Determines the precedence of layers in the incremental stacking of the USE
 variable. Precedence decreases from left to right such that env overrides
 pkg, pkg overrides conf, and so forth.
@@ -512,7 +517,7 @@ you fix it.
 .RS
 .TP
 .B env
-USE from the current USE environment variable if it exists
+USE from the current environment variables (USE and those listed in USE_EXPAND)
 .TP
 .B pkg
 Per\-package USE from \fB/etc/portage/package.use\fR (see \fBportage\fR(5))
@@ -525,6 +530,9 @@ USE from make.defaults and package.use in the profile (see \fBportage\fR(5))
 .TP
 .B pkginternal
 USE from ebuild IUSE defaults (flags enabled via a + prefix; see \fBebuild\fR(5))
+.TP
+.B env.d
+USE from the environment variables defined by files in \fI/etc/env.d/\fR
 .RE
 
 .SH "REPORTING BUGS"