make.conf is not a manual so only list common FEATURES #161985

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

diff --git a/cnf/make.conf b/cnf/make.conf
index 6c1dc03c47bb5a59b777a8073ecfe091308e0c8d..0d5694cc3a5aa9fd594f35b9e066b60908f77f4b 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 # Contains local system settings for Portage system
@@ -237,44 +237,21 @@
 #
 # 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'
@@ -283,8 +260,6 @@
 #  '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'
@@ -301,7 +276,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 noclean noauto cvs keeptemp keepwork"
+#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noauto"
 #FEATURES="sandbox ccache distcc distlocks"
 
 # CCACHE_SIZE and CCACHE_DIR are used to control the behavior of ccache, and