From f104c9f8ac201ce5276b6193a702a26e00437698 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 11 May 2008 19:47:10 +0000 Subject: [PATCH] Merge from trunk: ------------------------------------------------------------------------ r10291 | zmedico | 2008-05-11 12:37:31 -0700 (Sun, 11 May 2008) | 2 lines Add back the warning for DISTDIR about storing stuff inside PORTDIR. ------------------------------------------------------------------------ r10290 | zmedico | 2008-05-11 12:35:26 -0700 (Sun, 11 May 2008) | 2 lines Sync make.conf.example with make.conf.5 for bug #220111. ------------------------------------------------------------------------ r10289 | zmedico | 2008-05-11 12:21:28 -0700 (Sun, 11 May 2008) | 3 lines Bug #220111 - Update the DISTDIR docs to clarify that it's safe to remove any and all files from this location after packages are built. ------------------------------------------------------------------------ r10288 | zmedico | 2008-05-11 11:25:35 -0700 (Sun, 11 May 2008) | 2 lines Make the summary more accurate. ------------------------------------------------------------------------ svn path=/main/branches/2.1.2/; revision=10292 --- cnf/make.conf | 13 +++++++------ man/emaint.1 | 2 +- man/make.conf.5 | 6 +++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cnf/make.conf b/cnf/make.conf index d31036727..df7bddc27 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -87,12 +87,13 @@ #PORTDIR=/usr/portage # # DISTDIR is where all of the source code tarballs will be placed for -# emerges. The source code is maintained here unless you delete -# it. The entire repository of tarballs for Gentoo is 9G. This is -# considerably more than any user will ever download. 2-3G is -# a large DISTDIR. Note that locations under /usr/portage are not -# necessarily safe for data storage. See the PORTDIR documentation -# for more information. +# emerges. After packages are built, it is safe to remove any and +# all files from this directory since they will be automatically +# fetched on demand for a given build. If you would like to +# selectively prune obsolete files from this directory, see +# eclean from the gentoolkit package. Note that locations under +# /usr/portage are not necessarily safe for data storage. See the +# PORTDIR documentation for more information. #DISTDIR=/usr/portage/distfiles # # PKGDIR is the location of binary packages that you can have created diff --git a/man/emaint.1 b/man/emaint.1 index 98c33429f..2cf31420f 100644 --- a/man/emaint.1 +++ b/man/emaint.1 @@ -1,6 +1,6 @@ .TH "EMAINT" "1" "Dec 2005" "Portage 2.1" "Portage" .SH NAME -emaint \- updates environment settings automatically +emaint \- performs system health checks and maintenance .SH SYNOPSIS .BR emaint [\fIoptions\fR] diff --git a/man/make.conf.5 b/man/make.conf.5 index ac4555ed0..df4e08c92 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -98,7 +98,11 @@ This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR as \fI\-\-target=${CTARGET}\fR only if it is defined. .TP \fBDISTDIR\fR = \fI[path]\fR -Defines the location of your local source file repository. Note +Defines the location of your local source file repository. After packages +are built, it is safe to remove any and all files from this directory since +they will be automatically fetched on demand for a given build. If you would +like to selectively prune obsolete files from this directory, see +\fBeclean\fR(1) from the gentoolkit package. Note that locations under /usr/portage are not necessarily safe for data storage. See the \fBPORTDIR\fR documentation for more information. .br -- 2.26.2