make.conf touchups. Fixed the living-after-kill issue in regen/metadata.

Better control-C handling via stdin.close(). _rc8

10 files changed, 200 insertions, 210 deletions

diff --git a/cnf/make.conf b/cnf/make.conf
index 1eb3610..c7918be 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.83 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.84 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -249,24 +249,24 @@ CHOST="i686-pc-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -275,20 +275,19 @@ CHOST="i686-pc-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index d0c09eb..181f84f 100644
--- a/cnf/make.conf.alpha
+++ b/cnf/make.conf.alpha
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.39 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.40 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -235,24 +235,24 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -261,20 +261,19 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64
index 2025080..3230f1c 100644
--- a/cnf/make.conf.amd64
+++ b/cnf/make.conf.amd64
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.amd64,v 1.4 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.amd64,v 1.5 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -247,24 +247,24 @@ CHOST="x86_64-pc-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -273,20 +273,19 @@ CHOST="x86_64-pc-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index 7cd50fd..7e1b7f1 100644
--- a/cnf/make.conf.arm
+++ b/cnf/make.conf.arm
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.29 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.30 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -240,24 +240,24 @@ CHOST="armv4l-unknown-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -266,20 +266,19 @@ CHOST="armv4l-unknown-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index fa8a92c..ac289f7 100644
--- a/cnf/make.conf.hppa
+++ b/cnf/make.conf.hppa
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.36 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.37 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -252,24 +252,24 @@ CHOST="hppa-unknown-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -278,20 +278,19 @@ CHOST="hppa-unknown-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index 05366af..db8f676 100644
--- a/cnf/make.conf.mips
+++ b/cnf/make.conf.mips
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.37 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.38 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -233,24 +233,24 @@ CHOST="mips-unknown-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -259,20 +259,19 @@ CHOST="mips-unknown-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index 7f4070a..1a65d3e 100644
--- a/cnf/make.conf.ppc
+++ b/cnf/make.conf.ppc
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.56 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.57 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -266,24 +266,24 @@ CHOST="powerpc-unknown-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -292,20 +292,19 @@ CHOST="powerpc-unknown-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390
index 0424c8f..9e9f2ae 100644
--- a/cnf/make.conf.s390
+++ b/cnf/make.conf.s390
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.s390,v 1.2 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.s390,v 1.3 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -215,24 +215,24 @@ CHOST="s390-ibm-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -241,20 +241,19 @@ CHOST="s390-ibm-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index 47fa8a6..abbfa77 100644
--- a/cnf/make.conf.sparc
+++ b/cnf/make.conf.sparc
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.41 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.42 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -256,24 +256,24 @@ CHOST="sparc-unknown-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -282,20 +282,19 @@ CHOST="sparc-unknown-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #
diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86
index 6b14849..b39b577 100644
--- a/cnf/make.conf.x86
+++ b/cnf/make.conf.x86
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.x86,v 1.4 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.x86,v 1.5 2004/10/10 23:27:28 carpaski Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -249,24 +249,24 @@ CHOST="i686-pc-linux-gnu"
 #                that will have to be added later. Done at generation times
 #                and only has an effect when 'cvs' is also set.
 #  'buildpkg'    causes binary packages to be created of all packages that 
-#                are merged.
+#                are being merged.
 #  'ccache'      enables ccache support via CC.
 #  'collision-protect'
-#                this will prevent packages from overwriting files that
-#                are owned by another package or by no package at all.
-#  'cvs'         feature for developers that causes portage to enable all
-#                cvs features (commits, adds) and all USE flags in SRC_URI
-#                will be applied for digests.
-#  'digest'      autogenerate a digest for packages.
+#                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'      causes digests to be generated for all packages being merged.
 #  '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.
+#  '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.
+#  '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) 
@@ -275,20 +275,19 @@ CHOST="i686-pc-linux-gnu"
 #  'maketest'    causes ebuilds to perform testing phases if they are capable
 #                of it. Some packages support this automaticaly via makefiles.
 #  'noauto'      causes ebuild to perform only the action requested and 
-#                not any other required actions like clean.
+#                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 stripping of binaries.
+#  'nostrip'     prevents the stripping of binaries.
 #  'notitles'    disables xterm titlebar updates (which contain status info). 
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild.
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
+#  'sandbox'     enables sandboxing when running emerge and ebuild.
+#  'strict'      causes portage to react strongly to conditions that are
+#                potentially dangerous, like missing/incorrect Manifest files.
+#  'userpriv'    allows portage to drop root privileges while it is compiling,
+#                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.
-#                unpack -- for debugging purposes only.
 #FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs"
 #FEATURES="sandbox ccache distcc distlocks autoaddcvs"
 #