removing AUTOCLEAN=no support

24 files changed, 50 insertions, 90 deletions

diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index 181f84f..6236dd5 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.40 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.41 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -221,12 +221,6 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64
index 3230f1c..b7326f2 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.5 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.amd64,v 1.6 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -233,12 +233,6 @@ CHOST="x86_64-pc-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index e7f4ab5..e3247f1 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.31 2004/10/15 01:34:01 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.32 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -229,12 +229,6 @@ CHOST="armv4l-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index ac289f7..25df243 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.37 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.38 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -238,12 +238,6 @@ CHOST="hppa-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.ia64 b/cnf/make.conf.ia64
index ed3db3b..b2cb903 100644
--- a/cnf/make.conf.ia64
+++ b/cnf/make.conf.ia64
@@ -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.ia64,v 1.1 2004/10/12 02:00:34 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ia64,v 1.2 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -201,12 +201,6 @@ CHOST="ia64-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index db8f676..4dd0f38 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.38 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.mips,v 1.39 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -219,12 +219,6 @@ CHOST="mips-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index 1a65d3e..9f83d69 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.57 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.ppc,v 1.58 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -252,12 +252,6 @@ CHOST="powerpc-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390
index 9e9f2ae..94656e9 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.3 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.s390,v 1.4 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -201,12 +201,6 @@ CHOST="s390-ibm-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.sh b/cnf/make.conf.sh
index 560a7c3..cdf6304 100644
--- a/cnf/make.conf.sh
+++ b/cnf/make.conf.sh
@@ -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.sh,v 1.1 2004/10/21 13:39:52 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sh,v 1.2 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -209,12 +209,6 @@ CHOST="sh-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index abbfa77..fd85ce0 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.42 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.sparc,v 1.43 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -242,12 +242,6 @@ CHOST="sparc-unknown-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86
index b39b577..2a2a184 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.5 2004/10/10 23:27:28 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.x86,v 1.6 2004/11/14 05:45:57 genone Exp $
 # Contains local system settings for Portage system
 
 # Please review 'man make.conf' for more information.
@@ -235,12 +235,6 @@ CHOST="i686-pc-linux-gnu"
 #     reduce it further. Default is unset.
 #PORTAGE_NICENESS=3
 #
-# AUTOCLEAN enables portage to automatically clean out older or overlapping
-#     packages from the system after every successful merge. This is the
-#     same as running 'emerge -c' after every merge. Set with: "yes" or "no".
-#     This does not affect the unpacked source. See 'noclean' below.
-#AUTOCLEAN="yes"
-#
 # 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. 
diff --git a/cnf/make.globals b/cnf/make.globals
index 71967d2..a7662fc 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -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.globals,v 1.56 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals,v 1.57 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.alpha b/cnf/make.globals.alpha
index 2f656f0..9226cf1 100644
--- a/cnf/make.globals.alpha
+++ b/cnf/make.globals.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.globals.alpha,v 1.14 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.alpha,v 1.15 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.amd64 b/cnf/make.globals.amd64
index 9ae1040..3a34d36 100644
--- a/cnf/make.globals.amd64
+++ b/cnf/make.globals.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.globals.amd64,v 1.5 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.amd64,v 1.6 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.arm b/cnf/make.globals.arm
index deba91d..7fcf133 100644
--- a/cnf/make.globals.arm
+++ b/cnf/make.globals.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.globals.arm,v 1.12 2004/10/21 13:38:03 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.arm,v 1.13 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.hppa b/cnf/make.globals.hppa
index 38aaacf..c4ff116 100644
--- a/cnf/make.globals.hppa
+++ b/cnf/make.globals.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.globals.hppa,v 1.15 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.hppa,v 1.16 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.ia64 b/cnf/make.globals.ia64
index 31d000f..9c11cdf 100644
--- a/cnf/make.globals.ia64
+++ b/cnf/make.globals.ia64
@@ -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.globals.ia64,v 1.1 2004/10/12 02:00:34 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.ia64,v 1.2 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.mac b/cnf/make.globals.mac
index 6e0c84f..f5f5ad0 100644
--- a/cnf/make.globals.mac
+++ b/cnf/make.globals.mac
@@ -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.globals.mac,v 1.9 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.mac,v 1.10 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.mips b/cnf/make.globals.mips
index 89d2136..a3fc202 100644
--- a/cnf/make.globals.mips
+++ b/cnf/make.globals.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.globals.mips,v 1.14 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.mips,v 1.15 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.ppc b/cnf/make.globals.ppc
index 2c15388..209826e 100644
--- a/cnf/make.globals.ppc
+++ b/cnf/make.globals.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.globals.ppc,v 1.28 2004/10/03 17:56:18 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.ppc,v 1.29 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.s390 b/cnf/make.globals.s390
index c9eebe5..36d8aac 100644
--- a/cnf/make.globals.s390
+++ b/cnf/make.globals.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.globals.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.globals.s390,v 1.3 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.sh b/cnf/make.globals.sh
index 5fc9e2f..62b79ec 100644
--- a/cnf/make.globals.sh
+++ b/cnf/make.globals.sh
@@ -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.globals.sh,v 1.1 2004/10/21 13:39:52 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.sh,v 1.2 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.sparc b/cnf/make.globals.sparc
index 9f18dfc..eb546a1 100644
--- a/cnf/make.globals.sparc
+++ b/cnf/make.globals.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.globals.sparc,v 1.14 2004/10/03 17:56:19 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.sparc,v 1.15 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.
diff --git a/cnf/make.globals.x86 b/cnf/make.globals.x86
index a420dfb..e675879 100644
--- a/cnf/make.globals.x86
+++ b/cnf/make.globals.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.globals.x86,v 1.4 2004/10/03 17:56:19 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.globals.x86,v 1.5 2004/11/14 05:45:57 genone Exp $
 # System-wide defaults for the Portage system
 
 #            *****************************
@@ -52,9 +52,11 @@ USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
 # By default wait 5 secs before cleaning a package
 CLEAN_DELAY="5"
+
 # Set to yes automatically run "emerge --clean" after each merge
 # Important, as without this you may experience missing symlinks when
 # downgrading libraries during a batch (world/system) update.
+# DEPRECATED, THIS IS ALWAYS ENABLED IN >=PORTAGE-2.1
 AUTOCLEAN="yes"
 
 # Number of times 'emerge --sync' will run before giving up.