[gentoo-commits] portage r14206 - main/trunk/man

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-09-06 00:31:10 +0000 (Sun, 06 Sep 2009)
New Revision: 14206

Modified:
   main/trunk/man/emerge.1
   main/trunk/man/make.conf.5
   main/trunk/man/portage.5
Log:
Document ACCEPT_PROPERTIES and package.properties.


Modified: main/trunk/man/emerge.1
===================================================================
--- main/trunk/man/emerge.1	2009-09-06 00:15:27 UTC (rev 14205)
+++ main/trunk/man/emerge.1	2009-09-06 00:31:10 UTC (rev 14206)
@@ -660,6 +660,14 @@
 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

Modified: main/trunk/man/make.conf.5
===================================================================
--- main/trunk/man/make.conf.5	2009-09-06 00:15:27 UTC (rev 14205)
+++ main/trunk/man/make.conf.5	2009-09-06 00:31:10 UTC (rev 14206)
@@ -41,6 +41,12 @@
 .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

Modified: main/trunk/man/portage.5
===================================================================
--- main/trunk/man/portage.5	2009-09-06 00:15:27 UTC (rev 14205)
+++ main/trunk/man/portage.5	2009-09-06 00:31:10 UTC (rev 14206)
@@ -53,6 +53,7 @@
 package.keywords
 package.license
 package.mask
+package.properties
 package.unmask
 package.use
 repos.conf
@@ -542,6 +543,15 @@
 >=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