summaryrefslogtreecommitdiffstats
path: root/man/make.conf.5
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-20 18:08:59 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-20 18:08:59 -0700
commit1fdeb78d08bac14f3f999f112499d179a87cf342 (patch)
tree07d939f93be6c796a4b6b997ee71437e561539cc /man/make.conf.5
parentaa838c657803ac29628a1aa706bda3fc89c94dab (diff)
downloadportage-1fdeb78d08bac14f3f999f112499d179a87cf342.tar.gz
portage-1fdeb78d08bac14f3f999f112499d179a87cf342.tar.bz2
portage-1fdeb78d08bac14f3f999f112499d179a87cf342.zip
config: repo-level make.defaults/package.use
This completes the implementation of bug #370693.
Diffstat (limited to 'man/make.conf.5')
-rw-r--r--man/make.conf.55
1 files changed, 4 insertions, 1 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5
index 86ac46231..fcb0954ea 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -838,7 +838,7 @@ in USE="foo_bar foo_bla".
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:env.d"\fR
+\fBUSE_ORDER\fR = \fI"env:pkg:conf:defaults:pkginternal:repo: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.
@@ -866,6 +866,9 @@ USE from make.defaults and package.use in the profile (see \fBportage\fR(5))
.B pkginternal
USE from \fBebuild\fR(5) IUSE defaults
.TP
+.B repo
+USE from make.defaults and package.use in the repo (see \fBportage\fR(5))
+.TP
.B env.d
USE from the environment variables defined by files in \fI/etc/env.d/\fR
.RE