Document ACCEPT_LICENSE and package.license.

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

diff --git a/man/emerge.1 b/man/emerge.1
index 0e1d29b0a19694243f60c6cf93573008926d1a4c..b36c40e70274a06649155b288f275f632bd687ae 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -652,6 +652,14 @@ variable to allow or disallow the emerging of a package masked by
 versions of packages, you should update your 
 \fI/etc/portage/package.keywords\fR file to list the packages you want the 
 \'testing\' version.  See \fBportage\fR(5) for more information.
+.TP
+.BR LICENSE
+The \fBLICENSE\fR variable in an \fBebuild\fR file can be used to mask
+packages based on licensing restrictions. \fBemerge\fR examines the
+\fBACCEPT_LICENSE\fR environment variable to allow or disallow the emerging
+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.
 .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 229e50b3fb49b470ccc76bd202dd721bb7043fa5..0283f4f0ff7c3d2882cedfd16c2eabfb5cb12f09 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -36,6 +36,11 @@ set this to '~ppc'.  This is an incremental variable.  Only define a
 .br
 Defaults to the value of $ARCH.
 .TP
+\fBACCEPT_LICENSE\fR = \fI[space delimited list of licenses or groups]\fR
+This variable is used to mask packages based on licensing restrictions.
+.br
+Defaults to the value of * -@EULA.
+.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 9ce5b5552a9eccca29d19adc5783a7ea615f8797..3d447a86979f54ecd64548e284d38e666840c18e 100644 (file)
--- a/man/portage.5
+++ b/man/portage.5
@@ -51,6 +51,7 @@ color.map
 mirrors
 modules
 package.keywords
+package.license
 package.mask
 package.unmask
 package.use
@@ -512,6 +513,15 @@ package.keywords like this:
 
 games-fps/quake3-demo x86
 
+.TP
+.BR package.license
+This will allow ACCEPT_LICENSE 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 licenses or groups
+.fi
 .TP
 .BR package.mask
 A list of package atoms to mask.  Useful if specific versions of packages do