Added "sandbox" use flag for portage, enabled it by default on all

supported and use.mask'ed it on unsupported systems.

33 files changed, 61 insertions, 54 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 5e53fcabd44c..7aed1011fcbe 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.6 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.7 2005/04/23 08:30:51 jstubbs Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,3 +12,5 @@ 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 da0f640f58af..82aab6204e7f 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"
+USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/cobalt-mips-2004.1/make.defaults b/profiles/cobalt-mips-2004.1/make.defaults
index da0f640f58af..82aab6204e7f 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"
+USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts sandbox"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index 33aec84ef68e..a78b3c380463 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.17 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.18 2005/04/23 08:30:51 jstubbs Exp $
 
 USE="
 alpha
@@ -37,6 +37,7 @@ 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 a502d8d13bd1..3de76af62788 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.11 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.12 2005/04/23 08:30:51 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,6 +52,7 @@ 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 d370e0d15beb..3f1f472affa5 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.11 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.12 2005/04/23 08:30:51 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 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 sandbox 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 208fd7b9385c..867962ceb5e7 100644
--- a/profiles/default-bsd/fbsd/x86/use.mask
+++ b/profiles/default-bsd/fbsd/x86/use.mask
@@ -1,2 +1,3 @@
 # 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 bc1b61d7cf2e..2108744612c2 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"
+USE="emboss -sandbox"
diff --git a/profiles/default-darwin/use.mask b/profiles/default-darwin/use.mask
index ae731534ab89..dbcf5607c090 100644
--- a/profiles/default-darwin/use.mask
+++ b/profiles/default-darwin/use.mask
@@ -52,6 +52,7 @@ mono
 mzscheme
 nas
 qdbm
+sandbox
 socks5
 xmms
 
diff --git a/profiles/default-linux/make.defaults b/profiles/default-linux/make.defaults
index ad0c5ce27bc0..1376a23bc107 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.9 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.10 2005/04/23 08:30:52 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"
+USE="bitmap-fonts truetype-fonts type1-fonts sandbox"
 
 # 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 09623cd17414..1c9df5e47b44 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.12 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.13 2005/04/23 08:30:52 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"
+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"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults
index 9502c29419f9..247ef4635c3a 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.10 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults
index ef28ccb1d85f..0c6fecd38513 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.10 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 ACCEPT_KEYWORDS="mips"
 
diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults
index 11a9c6f23cd6..3407c7c2bbb3 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.16 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.17 2005/04/23 08:30:52 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" 
+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" 
 
 # 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 127ace011548..7ffa75dea7a8 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.23 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.24 2005/04/23 08:30:52 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"
+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"
 
 # 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 c7582c9a5d29..c7bc5e6ab749 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+USE="dvd jpeg nls gif png truetype ppc fortran sandbox"
 
 # 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 744bf16ce9ca..f44814fac054 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+USE="dvd jpeg nls gif png truetype ppc fortran sandbox"
 
 # 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 ca0c35e8de69..de7f159a81ff 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+USE="dvd jpeg nls gif png truetype ppc fortran sandbox"
 
 # 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 cca805b12a53..12853b50d1c7 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.8 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.9 2005/04/23 08:30:52 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"
+USE="unicode pam dvd jpeg nls gif pam png truetype ppc fortran sandbox"
 
 # 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 12890e3af1ab..13a3587c2967 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.11 2005/04/23 03:40:13 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.12 2005/04/23 08:30:52 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"
+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"
 
 ACCEPT_KEYWORDS="ppc"
 
diff --git a/profiles/default-ppc64-2004.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults
index e2301389e256..40b41dd0b5c7 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 # 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 ac6685bc8bdc..e4415dad2b67 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.7 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.8 2005/04/23 08:30:52 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"
+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"
 
 # 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 d6fac821fec1..c6b932b05477 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.21 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.22 2005/04/23 08:30:52 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"
+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"
 
 # 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 ec21ba04ed03..25f7ce360ec9 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 # 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 8032ae89ca23..ccbcf3a9ed85 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.28 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.29 2005/04/23 08:30:52 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"
+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"
 
 
 # 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 a6cc51fe2a4d..200c9c7bd91c 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 
 # 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 0e3d363eb4ab..302e4bb95083 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults
index 8f61d1fcb203..8479831a471e 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+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"
 
 
 # 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 c808ed177385..a72d4837041a 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.12 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.13 2005/04/23 08:30:52 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"
+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"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/gcc34-x86-2004.2/make.defaults b/profiles/gcc34-x86-2004.2/make.defaults
index daaa0079abf9..3a776c2ea918 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.13 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.14 2005/04/23 08:30:52 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"
+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"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults
index 60675d32b620..2e67a1dc3d7c 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.10 2005/04/23 03:40:14 jstubbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.11 2005/04/23 08:30:52 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"
+USE="x86 berkdb bitmap-fonts font-server crypt readline nls ssl tcpd type1-fonts truetype-fonts zlib pam pic pie hardened sandbox"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults
index ec16825d58c0..a97a94e3586f 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"
+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"
 
 ACCEPT_KEYWORDS="mips ~mips"
 
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5089ee0fa83e..9e82f9a6ee8b 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.1101 2005/04/23 07:33:31 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.1102 2005/04/23 08:30:51 jstubbs Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -736,6 +736,7 @@ 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