summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/emerge.16
-rw-r--r--man/make.conf.57
2 files changed, 9 insertions, 4 deletions
diff --git a/man/emerge.1 b/man/emerge.1
index b01e8374e..43253bc93 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -567,10 +567,8 @@ problems or are known to have issues on different systems. It resides in
\fI/usr/portage/profiles\fR.
.TP
.BR CHOST
-The \CHOST\fR variable in \fBmake.conf\fR(5) is used to mask binary packages
-that have been built with a different \CHOST\fR setting. The only
-way to unmask such a binary package is to change the \CHOST\fR environment
-variable so that it exactly matches that of the binary package.
+Use the \fBACCEPT_CHOSTS\fR variable in \fBmake.conf\fR(5) to control
+\fBCHOST\fR acceptance for binary packages.
.TP
.BR EAPI
The \fBEAPI\fR variable in an \fBebuild\fR(5) file is used to mask packages
diff --git a/man/make.conf.5 b/man/make.conf.5
index c42500026..2fa95f724 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -21,6 +21,13 @@ settings. Clearing these variables requires a clear\-all as in:
export USE="\-*"
.SH "VARIABLES"
.TP
+\fBACCEPT_CHOSTS\fR = \fI[space delimited list of CHOST values]\fR
+Specifies acceptable \fBCHOST\fR values for binary packages. Regular
+expression syntax is supported, so it is necessary to escape
+\fBCHOST\fR characters if they have special meaning in regular expressions.
+.br
+Defaults to the value of $CHOST.
+.TP
\fBACCEPT_KEYWORDS\fR = \fI[space delimited list of KEYWORDS]\fR
Enable testing of ebuilds that have not yet been deemed 'stable'. Users
of the 'x86' architecture would set this to '~x86' while ppc users would