Added CONFIG_PROTECT*

31 files changed, 123 insertions, 24 deletions

diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults
index da0f640f58af..be1a5e51a8bb 100644
--- a/profiles/cobalt-mips-1.4/make.defaults
+++ b/profiles/cobalt-mips-1.4/make.defaults
@@ -33,3 +33,6 @@ ACCEPT_KEYWORDS="mips"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/cobalt-mips-2004.1/make.defaults b/profiles/cobalt-mips-2004.1/make.defaults
index da0f640f58af..be1a5e51a8bb 100644
--- a/profiles/cobalt-mips-2004.1/make.defaults
+++ b/profiles/cobalt-mips-2004.1/make.defaults
@@ -33,3 +33,6 @@ ACCEPT_KEYWORDS="mips"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index 892446f4ba3a..0be17f0ff384 100644
--- a/profiles/default-alpha-1.4/make.defaults
+++ b/profiles/default-alpha-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.19 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.20 2005/04/24 02:42:10 jstubbs Exp $
 
 USE="
 alpha
@@ -60,3 +60,6 @@ ACCEPT_KEYWORDS="alpha"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index 2e1ecddcc999..bb823e7eabbd 100644
--- a/profiles/default-alpha-2004.0/make.defaults
+++ b/profiles/default-alpha-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.13 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.14 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system on alpha
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -75,3 +75,6 @@ ACCEPT_KEYWORDS="alpha"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults
index 12d9ecc30654..7d24be5d8a95 100644
--- a/profiles/default-amd64-2004.2/make.defaults
+++ b/profiles/default-amd64-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.13 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.14 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the gcc 3.3 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -27,3 +27,6 @@ FEATURES="-sandbox"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-bsd/fbsd/x86/make.defaults b/profiles/default-bsd/fbsd/x86/make.defaults
index e69de29bb2d1..8176912b1a53 100644
--- a/profiles/default-bsd/fbsd/x86/make.defaults
+++ b/profiles/default-bsd/fbsd/x86/make.defaults
@@ -0,0 +1,8 @@
+# Env vars to expand into USE vars. Modifying this requires prior
+# discussion on gentoo-dev@gentoo.org. Flat profiles also need to
+# be updated appropriately.
+USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
+
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-macos-10.3/make.defaults b/profiles/default-macos-10.3/make.defaults
index 742ff0bea47b..246b9aaaa11a 100644
--- a/profiles/default-macos-10.3/make.defaults
+++ b/profiles/default-macos-10.3/make.defaults
@@ -21,3 +21,6 @@ FETCHCOMMAND="/usr/bin/curl --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${U
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-macos-10.4/make.defaults b/profiles/default-macos-10.4/make.defaults
index eb70760da39a..3f7a7d072ef0 100644
--- a/profiles/default-macos-10.4/make.defaults
+++ b/profiles/default-macos-10.4/make.defaults
@@ -20,3 +20,7 @@ FETCHCOMMAND="/usr/bin/curl --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${U
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
+
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults
index 7d3c7eea821d..c1442b4ade30 100644
--- a/profiles/default-mips-1.4/make.defaults
+++ b/profiles/default-mips-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.14 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.15 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -31,3 +31,6 @@ ACCEPT_KEYWORDS="mips"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults
index 13118138066b..f4dac4232125 100644
--- a/profiles/default-mips-2004.1/make.defaults
+++ b/profiles/default-mips-2004.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -31,3 +31,6 @@ ACCEPT_KEYWORDS="mips"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults
index 1fc4a6844247..f2b114ea3d86 100644
--- a/profiles/default-mips64-1.4/make.defaults
+++ b/profiles/default-mips64-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -32,3 +32,6 @@ ACCEPT_KEYWORDS="mips"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults
index bb83d53cebd0..9931131f1298 100644
--- a/profiles/default-ppc-1.0/make.defaults
+++ b/profiles/default-ppc-1.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.18 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.19 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="ppc"
@@ -35,3 +35,6 @@ ACCEPT_KEYWORDS="ppc"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc-1.4/make.defaults b/profiles/default-ppc-1.4/make.defaults
index b0a1a30840ab..1ece96e745ff 100644
--- a/profiles/default-ppc-1.4/make.defaults
+++ b/profiles/default-ppc-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.25 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.26 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -37,3 +37,6 @@ ACCEPT_KEYWORDS="ppc"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc-2004.0/make.defaults b/profiles/default-ppc-2004.0/make.defaults
index 3e81d2e02d1e..0608bd81c8e0 100644
--- a/profiles/default-ppc-2004.0/make.defaults
+++ b/profiles/default-ppc-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -18,3 +18,6 @@ USE="dvd jpeg nls gif png truetype ppc fortran"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc-2004.1/make.defaults b/profiles/default-ppc-2004.1/make.defaults
index 9cc6ce278d9f..e821a446f4ed 100644
--- a/profiles/default-ppc-2004.1/make.defaults
+++ b/profiles/default-ppc-2004.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -18,3 +18,6 @@ USE="dvd jpeg nls gif png truetype ppc fortran"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc-2004.2/make.defaults b/profiles/default-ppc-2004.2/make.defaults
index f1c91aad9b2f..e353f320b730 100644
--- a/profiles/default-ppc-2004.2/make.defaults
+++ b/profiles/default-ppc-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -18,3 +18,6 @@ USE="dvd jpeg nls gif png truetype ppc fortran"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc-2004.3/make.defaults b/profiles/default-ppc-2004.3/make.defaults
index 44237c17a87b..f980d3e98050 100644
--- a/profiles/default-ppc-2004.3/make.defaults
+++ b/profiles/default-ppc-2004.3/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.10 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.11 2005/04/24 02:42:10 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -18,3 +18,6 @@ USE="unicode pam dvd jpeg nls gif pam png truetype ppc fortran"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc/make.defaults b/profiles/default-ppc/make.defaults
index 69bba6f8ac7c..59bca0047e27 100644
--- a/profiles/default-ppc/make.defaults
+++ b/profiles/default-ppc/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.13 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.14 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="ppc"
@@ -31,3 +31,6 @@ ACCEPT_KEYWORDS="ppc"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc64-2004.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults
index 6b43f1b1cbdc..57ca63b5a1f6 100644
--- a/profiles/default-ppc64-2004.2/make.defaults
+++ b/profiles/default-ppc64-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -38,3 +38,6 @@ ACCEPT_KEYWORDS="ppc64"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-ppc64-2004.3/make.defaults b/profiles/default-ppc64-2004.3/make.defaults
index 5c430f1f7c08..6e6d68a9a6f0 100644
--- a/profiles/default-ppc64-2004.3/make.defaults
+++ b/profiles/default-ppc64-2004.3/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.9 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.10 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -38,3 +38,6 @@ ACCEPT_KEYWORDS="ppc64"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index 5a1bdefab5c8..3329981b0a13 100644
--- a/profiles/default-sparc-1.4/make.defaults
+++ b/profiles/default-sparc-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.23 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.24 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="sparc"
@@ -35,3 +35,6 @@ ACCEPT_KEYWORDS="sparc"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-sparc-2004.0/make.defaults b/profiles/default-sparc-2004.0/make.defaults
index 22e6772c3c52..e45888aa73e1 100644
--- a/profiles/default-sparc-2004.0/make.defaults
+++ b/profiles/default-sparc-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -37,3 +37,6 @@ ACCEPT_KEYWORDS="sparc"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults
index a3b86b66dbac..08b40f8d9289 100644
--- a/profiles/default-sparc64-1.4/make.defaults
+++ b/profiles/default-sparc64-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.30 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.31 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -41,3 +41,6 @@ FEATURES="sandbox ccache"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-sparc64-2004.0/make.defaults b/profiles/default-sparc64-2004.0/make.defaults
index 42f49cafaf35..c03d45c59884 100644
--- a/profiles/default-sparc64-2004.0/make.defaults
+++ b/profiles/default-sparc64-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -41,3 +41,6 @@ FEATURES="sandbox ccache"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults
index 486f4dbfc2ac..39b53b158136 100644
--- a/profiles/default-x86-2004.2/make.defaults
+++ b/profiles/default-x86-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the >=gcc 3.2 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -23,3 +23,6 @@ ACCEPT_KEYWORDS="x86"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/default-x86-obsd-2004/make.defaults b/profiles/default-x86-obsd-2004/make.defaults
index bb9a5515be8c..ccfb4e785d58 100644
--- a/profiles/default-x86-obsd-2004/make.defaults
+++ b/profiles/default-x86-obsd-2004/make.defaults
@@ -30,3 +30,6 @@ USERLAND="BSD"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults
index 00820557ca7b..2311b3b7fbbe 100644
--- a/profiles/gcc33-sparc64-1.4/make.defaults
+++ b/profiles/gcc33-sparc64-1.4/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.12 2005/04/23 16:25:08 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="sparc"
@@ -36,3 +36,6 @@ FEATURES="sandbox ccache"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/gcc34-amd64-2004.1/make.defaults b/profiles/gcc34-amd64-2004.1/make.defaults
index 69706a199196..050ee16a3ce3 100644
--- a/profiles/gcc34-amd64-2004.1/make.defaults
+++ b/profiles/gcc34-amd64-2004.1/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.14 2005/04/23 16:25:08 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.15 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the gcc 3.3 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -27,3 +27,6 @@ FEATURES="-sandbox"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/gcc34-x86-2004.2/make.defaults b/profiles/gcc34-x86-2004.2/make.defaults
index 3eae480665ac..ebb0a485c78a 100644
--- a/profiles/gcc34-x86-2004.2/make.defaults
+++ b/profiles/gcc34-x86-2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.15 2005/04/23 16:25:08 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.16 2005/04/24 02:42:10 jstubbs Exp $
 # System-wide defaults for the >=gcc 3.2 Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3
@@ -25,3 +25,6 @@ CXXFLAGS="${CFLAGS}"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults
index 433303f301cd..df52782bdc6c 100644
--- a/profiles/hardened-x86-2004.0/make.defaults
+++ b/profiles/hardened-x86-2004.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.12 2005/04/23 16:25:08 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.13 2005/04/24 02:42:10 jstubbs Exp $
 
 GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic pie hardened"
 
@@ -38,3 +38,6 @@ FEATURES="sandbox sfperms strict"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+
diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults
index ec16825d58c0..dadceca69530 100644
--- a/profiles/n32-mips-2004.1/make.defaults
+++ b/profiles/n32-mips-2004.1/make.defaults
@@ -36,3 +36,6 @@ ACCEPT_KEYWORDS="mips ~mips"
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
 
+CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config /usr/kde/3/share/config"
+CONFIG_PROTECT_MASK="/etc/gconf"
+