diff options
| -rw-r--r-- | cnf/make.conf | 10 | ||||
| -rw-r--r-- | man/make.conf.5 | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/cnf/make.conf b/cnf/make.conf index a2b5c01eb..19f9fddf0 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -228,6 +228,11 @@ # these settings are for developer use, but some are available to non- # developers as well. # +# 'assume-digests' +# when commiting work to cvs with repoman(1), assume that all +# existing SRC_URI digests are correct. This feature also +# affects digest generation via ebuild(1) and emerge(1) (emerge +# generates digests only when the 'digest' feature is enabled). # 'autoaddcvs' causes portage to automatically try to add files to cvs # that will have to be added later. Done at generation times # and only has an effect when 'cvs' is also set. @@ -242,7 +247,10 @@ # 'cvs' causes portage to enable all cvs features (commits, adds), # and to apply all USE flags in SRC_URI for digests -- for # developers only. -# 'digest' causes digests to be generated for all packages being merged. +# 'digest' autogenerate digests for packages when running the emerge(1) +# command. If the 'assume-digests' feature is also enabled then +# existing SRC_URI digests will be reused whenever they are +# available. # 'distcc' enables distcc support via CC. # 'distlocks' enables distfiles locking using fcntl or hardlinks. This # is enabled by default. Tools exist to help clean the locks diff --git a/man/make.conf.5 b/man/make.conf.5 index ea0262fb2..5270c6dc8 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -116,7 +116,9 @@ an incremental variable. .TP .B assume-digests When commiting work to cvs with \fBrepoman\fR(1), assume that all existing -SRC_URI digests are correct. +SRC_URI digests are correct. This feature also affects digest generation via +\fBebuild\fR(1) and \fBemerge\fR(1) (emerge generates digests only when the +\fIdigest\fR feature is enabled). .TP .B autoaddcvs Causes portage to automatically try to add files to cvs that will have to be added @@ -143,7 +145,9 @@ A feature for developers that causes portage to enable all USE flags in SRC_URI when creating digests. .TP .B digest -Autogenerate a digest for packages. +Autogenerate digests for packages when running the \fBemerge\fR(1) command. If +the \fIassume-digests\fR feature is also enabled then existing SRC_URI digests +will be reused whenever they are available. .TP .B distcc Enable portage support for the distcc package. |