For bug #187016, and env.d to the default USE_ORDER. (trunk r7426:7428)

svn path=/main/branches/2.1.2/; revision=7429

diff --git a/cnf/make.globals b/cnf/make.globals
index 880df05c15427d7f4f369c78a18960bfddecd7b2..f857ff4392464a00cea9ae36465ab08732f9b354 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -61,7 +61,7 @@ CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d"
 
 # Disable auto-use
-USE_ORDER="env:pkg:conf:defaults:pkginternal"
+USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d"
 
 # Default ownership of installed files.
 PORTAGE_INST_UID="0"

diff --git a/man/make.conf.5 b/man/make.conf.5
index db8cad760edf11bdb9bb576aac731ec65fffe64f..a78b377fb069ba3c7a04d1a4ca8d967fa2e3bd38 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -481,11 +481,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.
@@ -499,7 +504,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))
@@ -512,6 +517,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"

diff --git a/pym/portage.py b/pym/portage.py
index 2cd342e5a97fe63c6b23580d6e745d7e4f5f1c9d..31136b676c5168afae7593bfb0239462b8cc3343 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1477,7 +1477,7 @@ class config:
                        # reasonable defaults; this is important as without USE_ORDER,
                        # USE will always be "" (nothing set)!
                        if "USE_ORDER" not in self:
-                               self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal"
+                               self.backupenv["USE_ORDER"] = "env:pkg:conf:defaults:pkginternal:env.d"
 
                        self["PORTAGE_GID"] = str(portage_gid)
                        self.backup_changes("PORTAGE_GID")