summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-20 17:11:38 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-20 17:11:38 -0700
commit5959cb1b25d1d0d7c87fd982df72dfd2212f80a3 (patch)
tree77909356c677db8953557846b7542a5eb4d2a261 /man
parent5bb4ab9957ada3eb044c1d3a740930aa8fd67833 (diff)
downloadportage-5959cb1b25d1d0d7c87fd982df72dfd2212f80a3.tar.gz
portage-5959cb1b25d1d0d7c87fd982df72dfd2212f80a3.tar.bz2
portage-5959cb1b25d1d0d7c87fd982df72dfd2212f80a3.zip
Bug #44796 - Add support for /etc/portage/package.env. As documented in
man/portage.5: Per-package environment variable settings. Entries refer to environment files that are placed in the /etc/portage/env/ directory and have the same format as make.conf(5). Format: - comment lines begin with # (no inline comments) - one DEPEND atom per line followed by name(s) of environment file(s) Example: sys-libs/glibc glibc.conf
Diffstat (limited to 'man')
-rw-r--r--man/make.conf.53
-rw-r--r--man/portage.522
2 files changed, 24 insertions, 1 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5
index cbedc3d19..0827db11a 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -19,6 +19,9 @@ and ACCEPT_KEYWORDS. Incremental variables are propagated down from
make.defaults to make.globals to make.conf to the environment
settings. Clearing these variables requires a clear\-all as in:
export USE="\-*"
+.br
+In order to create per\-package environment settings, refer to
+\fBpackage.env\fR in \fBportage\fR(5).
.SH "VARIABLES"
.TP
\fBACCEPT_CHOSTS\fR = \fI[space delimited list of CHOST values]\fR
diff --git a/man/portage.5 b/man/portage.5
index 3a472a8ac..7edeb171e 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -51,6 +51,7 @@ make.conf
mirrors
modules
package.accept_keywords
+package.env
package.keywords
package.license
package.mask
@@ -539,6 +540,24 @@ package.accept_keywords like this:
games-fps/quake3-demo x86
.TP
+.BR package.env
+Per\-package environment variable settings. Entries refer to
+environment files that are placed in the \fB/etc/portage/env/\fR
+directory and have the same format as \fBmake.conf\fR(5).
+
+.I Format:
+.nf
+\- comment lines begin with # (no inline comments)
+\- one DEPEND atom per line followed by name(s) of environment file(s)
+.fi
+
+.I Example:
+.nf
+# use environment variables from /etc/portage/env/glibc.conf for the glibc package
+sys\-libs/glibc glibc.conf
+.fi
+
+.TP
.BR package.license
This will allow ACCEPT_LICENSE to be augmented for a single package.
@@ -873,7 +892,8 @@ games\-emulation/xmess:net \- Adds network support
.TP
.BR make.globals
The global default settings for Portage. This comes from the portage package
-itself. Settings in \fBmake.conf\fR override values here. The format
+itself. Settings in \fBmake.conf\fR or \fBpackage.env\fR
+override values here. The format
is described extensivly in \fBmake.conf\fR(5).
.RE
.TP