From: Zac Medico Date: Wed, 23 May 2007 20:33:27 +0000 (-0000) Subject: s:${PORTDIR}:/usr/portage: so that it's not implied that those variables are automati... X-Git-Tag: v2.1.2.8~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9a331bd572748a82b611230022e2f0e8474de16;p=portage.git s:${PORTDIR}:/usr/portage: so that it's not implied that those variables are automatically relative to ${PORTDIR} when the value of ${PORTDIR} has changed to something other than /usr/portage. Thanks to kerframil for reporting. (trunk r6522:6523) svn path=/main/branches/2.1.2/; revision=6602 --- diff --git a/cnf/make.conf b/cnf/make.conf index 0d5694cc3..e8ac854e7 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,4 +1,4 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # Contains local system settings for Portage system @@ -85,12 +85,12 @@ # 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. -#DISTDIR=${PORTDIR}/distfiles +#DISTDIR=/usr/portage/distfiles # # PKGDIR is the location of binary packages that you can have created # with '--buildpkg' or '-b' while emerging a package. This can get # up to several hundred megs, or even a few gigs. -#PKGDIR=${PORTDIR}/packages +#PKGDIR=/usr/portage/packages # # PORT_LOGDIR is the location where portage will store all the logs it # creates from each individual merge. They are stored as NNNN-$PF.log @@ -237,21 +237,44 @@ # # FEATURES are settings that affect the functionality of portage. Most of # these settings are for developer use, but some are available to non- -# developers as well. +# developers as well. # +# 'assume-digests' +# when committing 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). # 'buildpkg' causes binary packages to be created of all packages that # are being merged. -# 'buildsyspkg' only build binary packages for system packages. # 'ccache' enable support for the dev-util/ccache package, which can # noticably decrease the time needed to remerge previously built # packages. +# 'confcache' enable confcache support; speeds up autotool based configure +# calls # 'collision-protect' # prevents packages from overwriting files that are owned by # another package or by no package at all. +# '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' 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 # after crashes: /usr/lib/portage/bin/clean_locks. +# 'fixpackages' allows portage to fix binary packages that are stored in +# PKGDIR. This can consume a lot of time. 'fixpackages' is +# also a script that can be run at any given time to force +# the same actions. +# 'gpg' enables basic verification of Manifest files using gpg. +# This features is UNDER DEVELOPMENT and reacts to features +# of strict and severe. Heavy use of gpg sigs is coming. +# 'keeptemp' prevents the clean phase from deleting the temp files ($T) +# from a merge. +# 'keepwork' prevents the clean phase from deleting the WORKDIR. # 'test' causes ebuilds to perform testing phases if they are capable # of it. Some packages support this automatically via makefiles. # 'metadata-transfer' @@ -260,6 +283,8 @@ # 'noauto' causes ebuild to perform only the action requested and # not any other required actions like clean or unpack -- for # debugging purposes only. +# 'noclean' prevents portage from removing the source and temporary files +# after a merge -- for debugging purposes only. # 'nostrip' prevents the stripping of binaries. # 'notitles' disables xterm titlebar updates (which contain status info). # 'parallel-fetch' @@ -276,7 +301,7 @@ # as a security measure. As a side effect this can remove # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noauto" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork" #FEATURES="sandbox ccache distcc distlocks" # CCACHE_SIZE and CCACHE_DIR are used to control the behavior of ccache, and diff --git a/man/make.conf.5 b/man/make.conf.5 index db3cafbb6..dc01a2c55 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -98,7 +98,7 @@ as \fI\-\-target=${CTARGET}\fR only if it is defined. \fBDISTDIR\fR = \fI[path]\fR Defines the location of your local source file repository. .br -Defaults to ${PORTDIR}/distfiles. +Defaults to /usr/portage/distfiles. .TP .B DOC_SYMLINKS_DIR If this variable contains a directory then symlinks to html documentation will @@ -317,7 +317,7 @@ Defaults to false. \fBPKGDIR\fR = \fI[path]\fR Defines the location where created .tbz2 binary packages will be stored. .br -Defaults to ${PORTDIR}/packages. +Defaults to /usr/portage/packages. .TP .B PORT_LOGDIR This variable defines the directory in which per\-ebuild logs are kept.