diff options
author | 2013-05-02 20:45:39 -0700 | |
---|---|---|
committer | 2013-05-02 20:46:38 -0700 | |
commit | fcf9bec1bd756985a93bfb6843c942911eec075d (patch) | |
tree | 688b9fe2276931e7db60a39e31f4b29dc3606b9c /man | |
parent | _getMissingProperties: remove || support (diff) | |
download | portage-fcf9bec1bd756985a93bfb6843c942911eec075d.tar.gz portage-fcf9bec1bd756985a93bfb6843c942911eec075d.tar.bz2 portage-fcf9bec1bd756985a93bfb6843c942911eec075d.zip |
Support ACCEPT_RESTRICT for bug #467622.v2.2.0_alpha174
Diffstat (limited to 'man')
-rw-r--r-- | man/emerge.1 | 24 | ||||
-rw-r--r-- | man/make.conf.5 | 17 | ||||
-rw-r--r-- | man/portage.5 | 11 |
3 files changed, 52 insertions, 0 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 15e8185fa..23b023cf0 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -277,6 +277,21 @@ temporarily mask interactive packages. With default configuration, this would result in an effective \fBACCEPT_PROPERTIES\fR value of "* -interactive". .TP +.BR \-\-accept\-restrict=ACCEPT_RESTRICT +This option temporarily overrides the \fBACCEPT_RESTRICT\fR +variable. The \fBACCEPT_RESTRICT\fR variable is incremental, +which means that the specified setting is appended to the +existing value from your configuration. The special \fB-*\fR +token can be used to discard the existing configuration +value and start fresh. See the \fBMASKED PACKAGES\fR section +and \fBmake.conf\fR(5) for more information about +ACCEPT_RESTRICT. A typical usage example for this option +would be to use \fI\-\-accept\-restrict=\-bindist\fR to +temporarily mask packages that are not binary +re\-distributable. With default +configuration, this would result in an effective +\fBACCEPT_RESTRICT\fR value of "* -bindist". +.TP .BR "\-\-alphabetical " When displaying USE and other flag output, combines the enabled and disabled lists into one list and sorts the whole list alphabetically. @@ -1041,6 +1056,15 @@ of a package masked by \fBPROPERTIES\fR. See \fBmake.conf\fR(5) for information about \fBACCEPT_PROPERTIES\fR, and see \fBportage\fR(5) for information about \fI/etc/portage/package.properties\fR. Use the \fB\-\-accept\-properties\fR option to temporarily override \fBACCEPT_PROPERTIES\fR. +.TP +.BR RESTRICT +The \fBRESTRICT\fR variable in an \fBebuild\fR file can be used to mask +packages based on RESTRICT tokens. \fBemerge\fR examines the +\fBACCEPT_RESTRICT\fR environment variable to allow or disallow the emerging +of a package masked by \fBRESTRICT\fR. See \fBmake.conf\fR(5) for information +about \fBACCEPT_RESTRICT\fR, and see \fBportage\fR(5) for information about +\fI/etc/portage/package.accept_restrict\fR. Use the \fB\-\-accept\-restrict\fR +option to temporarily override \fBACCEPT_RESTRICT\fR. .SH "CONFIGURATION FILES" Portage has a special feature called "config file protection". The purpose of this feature is to prevent new package installs from clobbering existing diff --git a/man/make.conf.5 b/man/make.conf.5 index 8c6d477ce..19118ff7e 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -80,6 +80,23 @@ ACCEPT_PROPERTIES="*" ACCEPT_PROPERTIES="* -interactive" .fi .TP +\fBACCEPT_RESTRICT\fR = \fI[space delimited list of RESTRICT tokens]\fR +This variable is used to mask packages based on RESTRICT tokens. +In addition to RESTRICT tokens, the \fI*\fR and \fI-*\fR wildcard tokens are +also supported. This variable can be temporarily overridden using the +\fB\-\-accept\-restrict\fR option of \fBemerge\fR(1). +See \fBebuild\fR(5) for more information about RESTRICT. +.br +Defaults to the value of *. +.br +.I Examples: +.nf +# Accept any restrict tokens +ACCEPT_RESTRICT="*" +# Accept any tokens except "bindist" +ACCEPT_RESTRICT="* -bindist" +.fi +.TP .B CBUILD This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR as \fI\-\-build=${CBUILD}\fR only if it is defined. Do not set this yourself diff --git a/man/portage.5 b/man/portage.5 index 686e318e2..46a64f106 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -57,6 +57,7 @@ make.conf mirrors modules package.accept_keywords +package.accept_restrict package.env package.keywords package.license @@ -673,6 +674,16 @@ package.accept_keywords like this: games-fps/quake3-demo x86 .TP +.BR package.accept_restrict +This will allow ACCEPT_RESTRICT (see \fBmake.conf\fR(5)) to be augmented for a +single package. + +.I Format: +.nf +\- comment lines begin with # (no inline comments) +\- one DEPEND atom per line followed by additional RESTRICT tokens +.fi +.TP .BR package.env Per\-package environment variable settings. Entries refer to environment files that are placed in the \fB/etc/portage/env/\fR |