USE flag updates for X to non-cascading profiles. Add font-server, truetype-fonts, and type1-fonts to everything. If X was in USE, add opengl and xv. This should retain the same functionality there was prior to these new USE flags in X.

35 files changed, 44 insertions, 32 deletions

diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults
index 7d709840fd27..49ddd6a1aaf4 100644
--- a/profiles/cobalt-mips-1.4/make.defaults
+++ b/profiles/cobalt-mips-1.4/make.defaults
@@ -24,6 +24,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+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 7d709840fd27..49ddd6a1aaf4 100644
--- a/profiles/cobalt-mips-2004.1/make.defaults
+++ b/profiles/cobalt-mips-2004.1/make.defaults
@@ -24,6 +24,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+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-1.0-gcc3/make.defaults b/profiles/default-1.0-gcc3/make.defaults
index 821894c5190b..ce530246410d 100644
--- a/profiles/default-1.0-gcc3/make.defaults
+++ b/profiles/default-1.0-gcc3/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2002 Daniel Robbins, Gentoo Foundation.
 # System-wide defaults for the gcc 3.1 Portage system
 
-USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode f77 gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
+USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode f77 font-server gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx 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/default-1.0/make.defaults b/profiles/default-1.0/make.defaults
index d42ac47e8dbe..09508b01e25f 100644
--- a/profiles/default-1.0/make.defaults
+++ b/profiles/default-1.0/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2000 Daniel Robbins, Gentoo Foundation.
 # System-wide defaults for the Portage system
 
-USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 gdbm gif gpm gtk imlib java jpeg kde libg++ libwww mikmod mmx motif  mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv" 
+USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 font-server gdbm gif gpm gtk imlib java jpeg kde libg++ libwww mikmod mmx 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" 
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index 9b9573b4603e..b8d85702e78e 100644
--- a/profiles/default-alpha-1.4/make.defaults
+++ b/profiles/default-alpha-1.4/make.defaults
@@ -10,6 +10,7 @@ cups
 encode
 fortran
 f77
+font-server
 foomaticdb
 gdbm
 gif
@@ -42,6 +43,8 @@ spell
 ssl
 tcpd
 truetype
+truetype-fonts
+type1-fonts
 X
 xml2
 xmms
diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index b407e903f1e6..b6982b6552fd 100644
--- a/profiles/default-alpha-2004.0/make.defaults
+++ b/profiles/default-alpha-2004.0/make.defaults
@@ -22,6 +22,7 @@ cups
 encode
 fortran
 f77
+font-server
 foomaticdb
 gdbm
 gif
@@ -56,6 +57,8 @@ spell
 ssl
 tcpd
 truetype
+truetype-fonts
+type1-fonts
 X
 xml2
 xmms
diff --git a/profiles/default-amd64-1.4/make.defaults b/profiles/default-amd64-1.4/make.defaults
index d1650711c8e7..50d38c8e178a 100644
--- a/profiles/default-amd64-1.4/make.defaults
+++ b/profiles/default-amd64-1.4/make.defaults
@@ -7,7 +7,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 fortran f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib -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 X xml2 xmms xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode fortran f77 font-server foomaticdb gdbm gif gpm gtk  gtk2 imlib -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-amd64-2004.0/make.defaults b/profiles/default-amd64-2004.0/make.defaults
index e0577c2dbc98..06132efdcaef 100644
--- a/profiles/default-amd64-2004.0/make.defaults
+++ b/profiles/default-amd64-2004.0/make.defaults
@@ -7,7 +7,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 fortran f77 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 X xml2 xmms xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode fortran f77 font-server 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-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults
index e0577c2dbc98..1272b29e203f 100644
--- a/profiles/default-amd64-2004.2/make.defaults
+++ b/profiles/default-amd64-2004.2/make.defaults
@@ -7,7 +7,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 fortran f77 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 X xml2 xmms xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode font-server fortran f77 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-arm-2004.0/make.defaults b/profiles/default-arm-2004.0/make.defaults
index 790927504266..b028ff65e96e 100644
--- a/profiles/default-arm-2004.0/make.defaults
+++ b/profiles/default-arm-2004.0/make.defaults
@@ -3,7 +3,7 @@
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-USE="arm berkdb bitmap-fonts crypt cups encode foomaticdb gdbm gif gpm jpeg libg++ libwww mpeg ncurses nls pam png perl python readline spell ssl tcpd truetype zlib"
+USE="arm berkdb bitmap-fonts crypt cups encode font-server foomaticdb gdbm gif gpm jpeg libg++ libwww mpeg ncurses nls pam png perl python readline spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
 
 ARCH="arm"
 ACCEPT_KEYWORDS="arm"
diff --git a/profiles/default-hppa-2004.0/make.defaults b/profiles/default-hppa-2004.0/make.defaults
index da5daf2395fb..cb39f9259e5b 100644
--- a/profiles/default-hppa-2004.0/make.defaults
+++ b/profiles/default-hppa-2004.0/make.defaults
@@ -5,6 +5,7 @@ berkdb
 bitmap-fonts
 crypt
 cups
+font-server
 fortran
 f77
 encode
@@ -41,6 +42,8 @@ ssl
 svga
 tcpd
 truetype
+truetype-fonts
+type1-fonts
 X
 xml2
 xmms
diff --git a/profiles/default-ia64-1.4/make.defaults b/profiles/default-ia64-1.4/make.defaults
index 8a437d1fd1b5..20ff2ee18667 100644
--- a/profiles/default-ia64-1.4/make.defaults
+++ b/profiles/default-ia64-1.4/make.defaults
@@ -10,6 +10,7 @@ cups
 encode
 fortran
 f77
+font-server
 foomaticdb
 gdbm
 gif
@@ -42,6 +43,8 @@ spell
 ssl
 tcpd
 truetype
+truetype-fonts
+type1-fonts
 X
 xml2
 xmms
diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults
index d4258331e295..66397ab15eed 100644
--- a/profiles/default-mips-1.4/make.defaults
+++ b/profiles/default-mips-1.4/make.defaults
@@ -20,6 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline gpm berkdb fortran f77 gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline gpm berkdb fortran f77 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 62ff383f3684..cef5393caf87 100644
--- a/profiles/default-mips-2004.1/make.defaults
+++ b/profiles/default-mips-2004.1/make.defaults
@@ -20,6 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline fortran f77 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 3d5b44c51687..029d29851b7f 100644
--- a/profiles/default-mips64-1.4/make.defaults
+++ b/profiles/default-mips64-1.4/make.defaults
@@ -21,6 +21,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts slang readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline fortran f77 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 d01a20032fa6..b44e7144a98c 100644
--- a/profiles/default-ppc-1.0/make.defaults
+++ b/profiles/default-ppc-1.0/make.defaults
@@ -20,7 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran f77 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 ppc" 
+USE="bitmap-fonts oss dvd xv slang readline fortran f77 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 5154d035bcd7..e919cbd72c03 100644
--- a/profiles/default-ppc-1.4/make.defaults
+++ b/profiles/default-ppc-1.4/make.defaults
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran f77 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 ppc cups foomaticdb"
+USE="bitmap-fonts oss dvd xv slang readline fortran f77 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/make.defaults b/profiles/default-ppc/make.defaults
index 2d96c50742ad..8a7734dd0286 100644
--- a/profiles/default-ppc/make.defaults
+++ b/profiles/default-ppc/make.defaults
@@ -20,6 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss xv slang readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla"
+USE="bitmap-fonts oss xv slang readline fortran f77 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 df0b4219af55..30fdbb98147e 100644
--- a/profiles/default-ppc64-2004.2/make.defaults
+++ b/profiles/default-ppc64-2004.2/make.defaults
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype ppc64 cups foomaticdb"
+USE="bitmap-fonts oss dvd xv slang readline fortran f77 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 df0b4219af55..30fdbb98147e 100644
--- a/profiles/default-ppc64-2004.3/make.defaults
+++ b/profiles/default-ppc64-2004.3/make.defaults
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts oss dvd xv slang readline fortran f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype ppc64 cups foomaticdb"
+USE="bitmap-fonts oss dvd xv slang readline fortran f77 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-s390-2004.0/make.defaults b/profiles/default-s390-2004.0/make.defaults
index a98de42b6d7c..4ea4aa488f94 100644
--- a/profiles/default-s390-2004.0/make.defaults
+++ b/profiles/default-s390-2004.0/make.defaults
@@ -23,7 +23,7 @@ CFLAGS=""
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="berkdb bitmap-fonts crypt cups fortran f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype zlib"
+USE="berkdb bitmap-fonts crypt cups fortran f77 fbcon font-server foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-s390-2004.1/make.defaults b/profiles/default-s390-2004.1/make.defaults
index a98de42b6d7c..4ea4aa488f94 100644
--- a/profiles/default-s390-2004.1/make.defaults
+++ b/profiles/default-s390-2004.1/make.defaults
@@ -23,7 +23,7 @@ CFLAGS=""
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="berkdb bitmap-fonts crypt cups fortran f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype zlib"
+USE="berkdb bitmap-fonts crypt cups fortran f77 fbcon font-server foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype truetype-fonts type1-fonts 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-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index 84a7efcf63fe..ae56df6e9fac 100644
--- a/profiles/default-sparc-1.4/make.defaults
+++ b/profiles/default-sparc-1.4/make.defaults
@@ -21,7 +21,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb bitmap-fonts crypt cups fortran f77 fbcon 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 X xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups fortran f77 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 844b122d1dc2..71a2a03de63f 100644
--- a/profiles/default-sparc-2004.0/make.defaults
+++ b/profiles/default-sparc-2004.0/make.defaults
@@ -23,7 +23,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb bitmap-fonts crypt cups fortran f77 fbcon 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 X xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups fortran f77 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 7c341ed212b7..7f181763ae53 100644
--- a/profiles/default-sparc64-1.4/make.defaults
+++ b/profiles/default-sparc64-1.4/make.defaults
@@ -25,7 +25,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon 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 X xv xml2 xmms zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 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 7c341ed212b7..7f181763ae53 100644
--- a/profiles/default-sparc64-2004.0/make.defaults
+++ b/profiles/default-sparc64-2004.0/make.defaults
@@ -25,7 +25,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon 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 X xv xml2 xmms zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 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-1.4/make.defaults b/profiles/default-x86-1.4/make.defaults
index c0f91ef96533..a894bca7d655 100644
--- a/profiles/default-x86-1.4/make.defaults
+++ b/profiles/default-x86-1.4/make.defaults
@@ -11,7 +11,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 encode fortran f77 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 X xml2 xmms xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 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/default-x86-2004.0/make.defaults b/profiles/default-x86-2004.0/make.defaults
index c0f91ef96533..a894bca7d655 100644
--- a/profiles/default-x86-2004.0/make.defaults
+++ b/profiles/default-x86-2004.0/make.defaults
@@ -11,7 +11,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 encode fortran f77 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 X xml2 xmms xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 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/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults
index b24ccbf255f1..e0d92e01f94d 100644
--- a/profiles/default-x86-2004.2/make.defaults
+++ b/profiles/default-x86-2004.2/make.defaults
@@ -11,7 +11,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 encode fortran f77 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 X xml2 xmms xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 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 e93029721cd5..c89ca17a1ef8 100644
--- a/profiles/gcc33-sparc64-1.4/make.defaults
+++ b/profiles/gcc33-sparc64-1.4/make.defaults
@@ -20,7 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon 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 X xv xml2 xmms zlib"
+USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd fortran f77 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 c0ec39dee184..59481b16e1ff 100644
--- a/profiles/gcc34-amd64-2004.1/make.defaults
+++ b/profiles/gcc34-amd64-2004.1/make.defaults
@@ -7,7 +7,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 fortran f77 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 X xml2 xmms xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode font-server fortran f77 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 04c5f1cef917..129f9badd139 100644
--- a/profiles/gcc34-x86-2004.2/make.defaults
+++ b/profiles/gcc34-x86-2004.2/make.defaults
@@ -11,7 +11,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 encode fortran f77 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 X xml2 xmms xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 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 1b4ba5d359b7..104e8526b209 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.7 2004/10/28 19:35:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.8 2005/01/12 22:47:06 spyderous 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 crypt readline nls ssl tcpd zlib pam pic pie hardened"
+USE="x86 berkdb bitmap-fonts font-server crypt readline nls opengl ssl tcpd type1-fonts truetype-fonts xv 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 48609a8bf9d1..ba8cb01fee46 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 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"
 
 ACCEPT_KEYWORDS="mips ~mips"
 
diff --git a/profiles/xbox-x86-2004.0/make.defaults b/profiles/xbox-x86-2004.0/make.defaults
index 10017ca84b18..696adf892263 100644
--- a/profiles/xbox-x86-2004.0/make.defaults
+++ b/profiles/xbox-x86-2004.0/make.defaults
@@ -11,7 +11,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 encode 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 X xml2 xmms xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 PROFILE_ARCH="xbox"