summaryrefslogtreecommitdiffstats
path: root/man
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
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')
-rw-r--r--man/ebuild.55
-rw-r--r--man/make.conf.55
-rw-r--r--man/portage.52
3 files changed, 9 insertions, 3 deletions
diff --git a/man/ebuild.5 b/man/ebuild.5
index bc5680fc9..20117e08d 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -246,8 +246,9 @@ is possible to prefix flags with + or - in order to create default settings
that respectively enable or disable the corresponding \fBUSE\fR flags. For
details about \fBUSE\fR flag stacking order, refer to the \fBUSE_ORDER\fR
variable in \fBmake.conf\fR(5). Given the default \fBUSE_ORDER\fR setting,
-negative IUSE default settings are ineffective since profile and user
-configuration settings override them.
+negative IUSE default settings are effective only for negation of
+repo\-level USE settings, since profile and user configuration settings
+override them.
.TP
\fBDEPEND\fR
This should contain a list of all packages that are required for the
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
diff --git a/man/portage.5 b/man/portage.5
index 61f462309..b2b0eb12c 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -81,8 +81,10 @@ categories
info_pkgs
info_vars
license_groups
+make.defaults
package.mask
package.unmask
+package.use
package.use.force
package.use.mask
profiles.desc