Removing sandbox use flag again... Will be re-looked at with 2.1.

33 files changed, 54 insertions, 61 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7aed1011fcbe..20221e470ff8 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/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/base/make.defaults,v 1.7 2005/04/23 08:30:51 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.8 2005/04/23 16:25:07 jstubbs Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,5 +12,3 @@ FEATURES="autoconfig strict"
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
 # be updated appropriately.
 USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS"
-
-USE="sandbox"
diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults
index 82aab6204e7f..da0f640f58af 100644
--- a/profiles/cobalt-mips-1.4/make.defaults
+++ b/profiles/cobalt-mips-1.4/make.defaults
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
+USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/cobalt-mips-2004.1/make.defaults b/profiles/cobalt-mips-2004.1/make.defaults
index 82aab6204e7f..da0f640f58af 100644
--- a/profiles/cobalt-mips-2004.1/make.defaults
+++ b/profiles/cobalt-mips-2004.1/make.defaults
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
+USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index a78b3c380463..892446f4ba3a 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.18 2005/04/23 08:30:51 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.19 2005/04/23 16:25:07 jstubbs Exp $
 
 USE="
 alpha
@@ -37,7 +37,6 @@ python
 qt
 quicktime
 readline
-sandbox
 sdl
 slang
 spell
diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index 3de76af62788..2e1ecddcc999 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.12 2005/04/23 08:30:51 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.13 2005/04/23 16:25:07 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 
@@ -52,7 +52,6 @@ python
 qt
 quicktime
 readline
-sandbox
 sdl
 slang
 spell
diff --git a/profiles/default-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults
index 3f1f472affa5..12d9ecc30654 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.12 2005/04/23 08:30:51 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.13 2005/04/23 16:25:07 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
@@ -9,7 +9,7 @@
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 
-USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode font-server fortran foomaticdb gdbm gif gpm gtk  gtk2 imlib nogcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sandbox sdl slang spell sse ssl tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode font-server fortran foomaticdb gdbm gif gpm gtk  gtk2 imlib nogcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-bsd/fbsd/x86/use.mask b/profiles/default-bsd/fbsd/x86/use.mask
index 867962ceb5e7..208fd7b9385c 100644
--- a/profiles/default-bsd/fbsd/x86/use.mask
+++ b/profiles/default-bsd/fbsd/x86/use.mask
@@ -1,3 +1,2 @@
 # aqua USE flag is only valid on Mac OS X
 aqua
-sandbox
diff --git a/profiles/default-darwin/make.defaults b/profiles/default-darwin/make.defaults
index 2108744612c2..bc1b61d7cf2e 100644
--- a/profiles/default-darwin/make.defaults
+++ b/profiles/default-darwin/make.defaults
@@ -16,4 +16,4 @@ RESUMECOMMAND="/usr/bin/curl --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE
 
 FEATURES="-sandbox userpriv"
 
-USE="emboss -sandbox"
+USE="emboss"
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index dbcf5607c090..ae731534ab89 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -52,7 +52,6 @@ mono
 mzscheme
 nas
 qdbm
-sandbox
 socks5
 xmms
 
diff --git a/profiles/default-linux/make.defaults b/profiles/default-linux/make.defaults
index 1376a23bc107..da6973912886 100644
--- a/profiles/default-linux/make.defaults
+++ b/profiles/default-linux/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-linux/make.defaults,v 1.10 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.11 2005/04/23 16:25:07 jstubbs Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -11,7 +11,7 @@
 # pulled in during *emerge system*!
 
 # build X in an expected way
-USE="bitmap-fonts truetype-fonts type1-fonts sandbox"
+USE="bitmap-fonts truetype-fonts type1-fonts"
 
 # make sure toolchain has sane defaults
 USE="${USE} fortran"
diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults
index 1c9df5e47b44..7d3c7eea821d 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.13 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.14 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline gpm berkdb fortran font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
+USE="bitmap-fonts slang readline gpm berkdb fortran font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults
index 247ef4635c3a..13118138066b 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
+USE="bitmap-fonts slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults
index 0c6fecd38513..1fc4a6844247 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="mips"
@@ -23,7 +23,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
+USE="bitmap-fonts slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults
index 3407c7c2bbb3..bb83d53cebd0 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.17 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.18 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="ppc"
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype truetype-fonts type1-fonts ppc sandbox" 
+USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype truetype-fonts type1-fonts ppc"
 
 # The following USE should _not_ bet set on ppc as they can cause breakage
 # in some pacakges (are mostly x86 only options)
diff --git a/profiles/default-ppc-1.4/make.defaults b/profiles/default-ppc-1.4/make.defaults
index 7ffa75dea7a8..b0a1a30840ab 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.24 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.25 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype truetype-fonts type1-fonts ppc cups foomaticdb sandbox"
+USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype truetype-fonts type1-fonts ppc cups foomaticdb"
 
 # The following USE should _not_ bet set on ppc as they can cause breakage
 # in some pacakges (are mostly x86 only options)
diff --git a/profiles/default-ppc-2004.0/make.defaults b/profiles/default-ppc-2004.0/make.defaults
index c7bc5e6ab749..3e81d2e02d1e 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -11,7 +11,7 @@ CXXFLAGS=${CFLAGS}
 FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 MAKEOPTS="-j2"
 PLATFORM=$CHOST
-USE="dvd jpeg nls gif png truetype ppc fortran sandbox"
+USE="dvd jpeg nls gif png truetype ppc fortran"
 
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
diff --git a/profiles/default-ppc-2004.1/make.defaults b/profiles/default-ppc-2004.1/make.defaults
index f44814fac054..9cc6ce278d9f 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -11,7 +11,7 @@ CXXFLAGS=${CFLAGS}
 FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 MAKEOPTS="-j2"
 PLATFORM=$CHOST
-USE="dvd jpeg nls gif png truetype ppc fortran sandbox"
+USE="dvd jpeg nls gif png truetype ppc fortran"
 
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
diff --git a/profiles/default-ppc-2004.2/make.defaults b/profiles/default-ppc-2004.2/make.defaults
index de7f159a81ff..f1c91aad9b2f 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -11,7 +11,7 @@ CXXFLAGS=${CFLAGS}
 FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 MAKEOPTS="-j2"
 PLATFORM=$CHOST
-USE="dvd jpeg nls gif png truetype ppc fortran sandbox"
+USE="dvd jpeg nls gif png truetype ppc fortran"
 
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
diff --git a/profiles/default-ppc-2004.3/make.defaults b/profiles/default-ppc-2004.3/make.defaults
index 12853b50d1c7..44237c17a87b 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.9 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.10 2005/04/23 16:25:07 jstubbs Exp $
 # Gentoo Linux PowerPC system defaults
 
 ACCEPT_KEYWORDS="ppc"
@@ -11,7 +11,7 @@ CXXFLAGS=${CFLAGS}
 FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
 MAKEOPTS="-j2"
 PLATFORM=$CHOST
-USE="unicode pam dvd jpeg nls gif pam png truetype ppc fortran sandbox"
+USE="unicode pam dvd jpeg nls gif pam png truetype ppc fortran"
 
 # Env vars to expand into USE vars. Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org. Flat profiles also need to
diff --git a/profiles/default-ppc/make.defaults b/profiles/default-ppc/make.defaults
index 13a3587c2967..69bba6f8ac7c 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.12 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.13 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="ppc"
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X truetype-fonts type1-fonts qt kde motif opengl mozilla sandbox"
+USE="bitmap-fonts oss xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X truetype-fonts type1-fonts qt kde motif opengl mozilla"
 
 ACCEPT_KEYWORDS="ppc"
 
diff --git a/profiles/default-ppc64-2004.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults
index 40b41dd0b5c7..6b43f1b1cbdc 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype truetype-fonts type1-fonts ppc64 cups foomaticdb sandbox"
+USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype truetype-fonts type1-fonts ppc64 cups foomaticdb"
 
 # esd gnome gtk gtk2 X qt kde  motif opengl mozilla
 # The following USE should _not_ bet set on ppc as they can cause breakage
diff --git a/profiles/default-ppc64-2004.3/make.defaults b/profiles/default-ppc64-2004.3/make.defaults
index e4415dad2b67..5c430f1f7c08 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.8 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.9 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype truetype-fonts type1-fonts ppc64 cups foomaticdb sandbox"
+USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype truetype-fonts type1-fonts ppc64 cups foomaticdb"
 
 # esd gnome gtk gtk2 X qt kde  motif opengl mozilla
 # The following USE should _not_ bet set on ppc as they can cause breakage
diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index c6b932b05477..5a1bdefab5c8 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.22 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.23 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="sparc"
@@ -23,7 +23,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib sandbox"
+USE="arts berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-sparc-2004.0/make.defaults b/profiles/default-sparc-2004.0/make.defaults
index 25f7ce360ec9..22e6772c3c52 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -25,7 +25,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib sandbox"
+USE="arts berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome libwww mikmod motif mad mpeg ncurses nls opengl pam perl png python qt readline slang spell ssl tcpd truetype truetype-fonts type1-fonts X xv zlib"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults
index ccbcf3a9ed85..a3b86b66dbac 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.29 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.30 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -27,7 +27,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-server foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib sandbox"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-server foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/default-sparc64-2004.0/make.defaults b/profiles/default-sparc64-2004.0/make.defaults
index 200c9c7bd91c..42f49cafaf35 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.12 2005/04/23 16:25:07 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 #Experimental: trying to use these USE variables to build up from stage 2->3 
@@ -27,7 +27,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-server foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib sandbox"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-server foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults
index 302e4bb95083..486f4dbfc2ac 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.12 2005/04/23 16:25:07 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
@@ -13,7 +13,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib sandbox"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults
index 8479831a471e..00820557ca7b 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.12 2005/04/23 16:25:08 jstubbs Exp $
 # System-wide defaults for the Portage system
 
 ARCH="sparc"
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-server foomaticdb gdbm gif gtk gnome imlib java jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib sandbox"
+USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-server foomaticdb gdbm gif gtk gnome imlib java jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/gcc34-amd64-2004.1/make.defaults b/profiles/gcc34-amd64-2004.1/make.defaults
index a72d4837041a..69706a199196 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.13 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.14 2005/04/23 16:25:08 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
@@ -9,7 +9,7 @@
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 
-USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode font-server fortran foomaticdb gdbm gif gpm gtk  gtk2 imlib -gcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib sandbox"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode font-server fortran foomaticdb gdbm gif gpm gtk  gtk2 imlib -gcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/gcc34-x86-2004.2/make.defaults b/profiles/gcc34-x86-2004.2/make.defaults
index 3a776c2ea918..3eae480665ac 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.14 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.15 2005/04/23 16:25:08 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
@@ -13,7 +13,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib sandbox"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults
index 2e67a1dc3d7c..433303f301cd 100644
--- a/profiles/hardened-x86-2004.0/make.defaults
+++ b/profiles/hardened-x86-2004.0/make.defaults
@@ -1,12 +1,12 @@
 # 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.11 2005/04/23 08:30:52 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.12 2005/04/23 16:25:08 jstubbs Exp $
 
 GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic pie hardened"
 
 # <zhen@gentoo.org> defaults for a hardened system
 # <zhen@gentoo.org> pam added until bug 10135 is fixed
-USE="x86 berkdb bitmap-fonts font-server crypt readline nls ssl tcpd type1-fonts truetype-fonts zlib pam pic pie hardened sandbox"
+USE="x86 berkdb bitmap-fonts font-server crypt readline nls ssl tcpd type1-fonts truetype-fonts zlib pam pic pie hardened"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults
index a97a94e3586f..ec16825d58c0 100644
--- a/profiles/n32-mips-2004.1/make.defaults
+++ b/profiles/n32-mips-2004.1/make.defaults
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe -mabi=n32 -mips4"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts font-server type1-fonts truetype-fonts slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib sandbox"
+USE="bitmap-fonts font-server type1-fonts truetype-fonts slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib"
 
 ACCEPT_KEYWORDS="mips ~mips"
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0aeb3f957df9..b4dca9c8cb15 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -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/use.local.desc,v 1.1105 2005/04/23 15:56:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.1106 2005/04/23 16:25:07 jstubbs Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -732,7 +732,6 @@ sys-apps/memtest86:serial - Compile with serial console support
 sys-apps/module-init-tools:no-old-linux - Don't support modules for Linux 2.4 and older
 sys-apps/parted:noreiserfs - Do not include reiserfs support
 sys-apps/pcmcia-cs:wavelan - Use the wavelan and not the orinoco wireless drivers
-sys-apps/portage:sandbox - Adds support for sys-apps/sandbox
 sys-apps/tcng:tcsim - enable traffic simulator
 sys-apps/tinylogin:make-symlinks - Create all the appropriate symlinks in /bin and /sbin
 sys-apps/util-linux:old-crypt - build support for the older cryptoapi that earlier util-linux's included