Document ACCEPT_PROPERTIES and package.properties.

svn path=/main/trunk/; revision=14206

diff --git a/man/emerge.1 b/man/emerge.1
index b36c40e70274a06649155b288f275f632bd687ae..1822048d1174676c50831f488630d03b68347a71 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -660,6 +660,14 @@ packages based on licensing restrictions. \fBemerge\fR examines the
 of a package masked by \fBLICENSE\fR. See \fBmake.conf\fR(5) for information
 about \fBACCEPT_LICENSE\fR, and see \fBportage\fR(5) for information about
 \fI/etc/portage/package.license\fR.
+.TP
+.BR PROPERTIES
+The \fBPROPERTIES\fR variable in an \fBebuild\fR file can be used to mask
+packages based on properties restrictions. \fBemerge\fR examines the
+\fBACCEPT_PROPERTIES\fR environment variable to allow or disallow the emerging
+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.
 .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 0283f4f0ff7c3d2882cedfd16c2eabfb5cb12f09..be4b1ab9d9b402adde74b9a7fd24c1666a4bbcf7 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -41,6 +41,12 @@ This variable is used to mask packages based on licensing restrictions.
 .br
 Defaults to the value of * -@EULA.
 .TP
+\fBACCEPT_PROPERTIES\fR = \fI[space delimited list of properties]\fR
+This variable is used to mask packages based on PROPERTIES restrictions.
+See \fBebuild\fR(5) for more information about PROPERTIES.
+.br
+Defaults to the value of *.
+.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 3d447a86979f54ecd64548e284d38e666840c18e..36805f815e3c41a8e785c1cb1398ea4caf9d92b1 100644 (file)
--- a/man/portage.5
+++ b/man/portage.5
@@ -53,6 +53,7 @@ modules
 package.keywords
 package.license
 package.mask
+package.properties
 package.unmask
 package.use
 repos.conf
@@ -542,6 +543,15 @@ versions earlier than 1.0.4496.  No problem!
 >=media\-video/nvidia\-glx\-1.0.4496
 .fi
 .TP
+.BR package.properties
+This will allow ACCEPT_PROPERTIES 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 properties
+.fi
+.TP
 .BR package.unmask
 Just like package.mask above, except here you list packages you want to 
 unmask.  Useful for overriding the global package.mask file (see