diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-08-16 20:01:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-16 20:01:33 +0000 |
| commit | c5adad0a08c6a2de7dbdd2667f716a0db8f8f42d (patch) | |
| tree | ccc53598c11dbc31577b44573da85c662ad383a7 | |
| parent | The "myuse" parameter to depgraph.create() is still needed in this branch. (diff) | |
| download | portage-multirepo-c5adad0a08c6a2de7dbdd2667f716a0db8f8f42d.tar.gz portage-multirepo-c5adad0a08c6a2de7dbdd2667f716a0db8f8f42d.tar.bz2 portage-multirepo-c5adad0a08c6a2de7dbdd2667f716a0db8f8f42d.zip | |
For bug #187016, add env.d to the default USE_ORDER. (branches/2.1.2 r7429)
svn path=/main/branches/2.1.2.9/; revision=7633
| -rw-r--r-- | cnf/make.globals | 2 | ||||
| -rw-r--r-- | man/make.conf.5 | 12 | ||||
| -rw-r--r-- | pym/portage.py | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index b589d9d1..af43acc9 100644 --- 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 cc67cabb..164039e2 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -476,11 +476,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. @@ -494,7 +499,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)) @@ -507,6 +512,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 8d509aa3..3714c37a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1448,7 +1448,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") |