summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-10-17 04:31:10 +0000
committerZac Medico <zmedico@gentoo.org>2006-10-17 04:31:10 +0000
commitc2a9bb3d06d32472d4bbadc15a397c5746645372 (patch)
tree10b7a2c7a4d19a305b9089454a72f6b52dcc2066 /cnf/make.globals
parentUse setdefault to avoid an extra dict lookup. (diff)
downloadportage-multirepo-c2a9bb3d06d32472d4bbadc15a397c5746645372.tar.gz
portage-multirepo-c2a9bb3d06d32472d4bbadc15a397c5746645372.tar.bz2
portage-multirepo-c2a9bb3d06d32472d4bbadc15a397c5746645372.zip
Merge package.use and USE from make.defaults together at each level of the profile stack. This is analogous to how use.mask and package.use.mask are planned to be merged for bug #151586.
svn path=/main/trunk/; revision=4734
Diffstat (limited to 'cnf/make.globals')
-rw-r--r--cnf/make.globals2
1 files changed, 1 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index 96f3a5b3..d10aaf8e 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:pkgprofile:defaults:pkginternal"
+USE_ORDER="env:pkg:conf:defaults:pkginternal"
# Default ownership of installed files.
PORTAGE_INST_UID="0"