USE flag updates for X to 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. NOTE: 2005.0 and newer should _not_ enable font-server.

30 files changed, 67 insertions, 58 deletions

diff --git a/profiles/default-linux/alpha/2004.3/make.defaults b/profiles/default-linux/alpha/2004.3/make.defaults
index c6b205e66d07..7c051e3db0b6 100644
--- a/profiles/default-linux/alpha/2004.3/make.defaults
+++ b/profiles/default-linux/alpha/2004.3/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/default-linux/alpha/2004.3/make.defaults,v 1.5 2004/11/08 00:22:07 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/make.defaults,v 1.6 2005/01/12 23:08:21 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -23,6 +23,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-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index 89f3ce75783e..f8c76f57af44 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.14 2005/01/07 06:11:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.15 2005/01/12 23:08:21 spyderous Exp $
 
 # GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
 # for compatibility
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses multilib readline zlib -java -nptl"
 
 # Sane, functional, almost-but-not-quite-minimal default for USE
-USE="${GRP_STAGE23_USE} bitmap-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
+USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts font-server oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox autoconfig"
diff --git a/profiles/default-linux/amd64/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index fe5505f252dc..47468435874b 100644
--- a/profiles/default-linux/amd64/2004.3/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/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/default-linux/amd64/2004.3/make.defaults,v 1.14 2005/01/01 00:30:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.15 2005/01/12 23:08:21 spyderous Exp $
 
 # GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
 # for compatibility. also, without this we might actually fail to build stages.
@@ -9,7 +9,7 @@ STAGE1_USE="multilib"
 GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java -nptl"
 
 # Sane, functional, almost-but-not-quite-minimal default for USE
-USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
+USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts font-server oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox autoconfig"
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
index 2f9c90d6e07e..82c887328a85 100644
--- a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
+++ b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/make.defaults,v 1.10 2005/01/01 00:30:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/make.defaults,v 1.11 2005/01/12 23:08:21 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
-USE="amd64 bitmap-fonts oss 3dnow apm arts avi berkdb 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 bitmap-fonts oss 3dnow apm arts avi berkdb crypt -cups encode fortran f77 font-server 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"
 
 # not having a 32bit sandbox breaks too much right now, and we cant even be
 # sure the user has a 32bit sandbox! it only gets installed if you add multilib
diff --git a/profiles/default-linux/amd64/multilib-dev/make.defaults b/profiles/default-linux/amd64/multilib-dev/make.defaults
index 8019abae5fe6..54f119f57aed 100644
--- a/profiles/default-linux/amd64/multilib-dev/make.defaults
+++ b/profiles/default-linux/amd64/multilib-dev/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/make.defaults,v 1.2 2005/01/05 08:04:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/multilib-dev/make.defaults,v 1.3 2005/01/12 23:08:21 spyderous Exp $
 
 STAGE1_USE="multilib"
 GRP_STAGE23_USE="${STAGE1_USE} multislot ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java -nptl"
-USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
+USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts font-server oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 # we can enable sandbox now that we use multilib by default
 # also enable multilib-strict to force people using the dev profile to find
diff --git a/profiles/default-linux/hppa/2004.2/make.defaults b/profiles/default-linux/hppa/2004.2/make.defaults
index d3a89cd78f27..2a25060d1c6a 100644
--- a/profiles/default-linux/hppa/2004.2/make.defaults
+++ b/profiles/default-linux/hppa/2004.2/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/default-linux/hppa/2004.2/make.defaults,v 1.8 2005/01/06 10:49:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2004.2/make.defaults,v 1.9 2005/01/12 23:08:21 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -13,6 +13,7 @@ bitmap-fonts
 crypt
 cups
 encode
+font-server
 foomaticdb
 fortran
 f77
@@ -48,6 +49,8 @@ ssl
 svga
 tcpd
 truetype
+truetype-fonts
+type1-fonts
 X
 xml2
 xmms
diff --git a/profiles/default-linux/ia64/2004.3/make.defaults b/profiles/default-linux/ia64/2004.3/make.defaults
index 6b07b8f92747..9c4fd8fce340 100644
--- a/profiles/default-linux/ia64/2004.3/make.defaults
+++ b/profiles/default-linux/ia64/2004.3/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/default-linux/ia64/2004.3/make.defaults,v 1.5 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2004.3/make.defaults,v 1.6 2005/01/12 23:08:21 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -14,6 +14,7 @@ cups
 encode
 fortran
 f77
+font-server
 foomaticdb
 gdbm
 gif
@@ -45,6 +46,8 @@ spell
 ssl
 tcpd
 truetype
+truetype-fonts
+type1-fonts
 X
 xml2
 xmms
diff --git a/profiles/default-linux/make.defaults b/profiles/default-linux/make.defaults
index 6f4fdc36b943..b1935fd31a53 100644
--- a/profiles/default-linux/make.defaults
+++ b/profiles/default-linux/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/default-linux/make.defaults,v 1.7 2004/12/25 03:51:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/make.defaults,v 1.8 2005/01/12 23:08:21 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,5 +12,5 @@
 
 
 
-# bitmap-fonts: build X the (upstream) default way
-USE="bitmap-fonts"
+# build X in an expected way
+USE="bitmap-fonts truetype-fonts type1-fonts"
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index 19205f0642d6..e9fb5e03bf8b 100644
--- a/profiles/default-linux/ppc/2004.0/make.defaults
+++ b/profiles/default-linux/ppc/2004.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.12 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.13 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls  png ppc truetype fortran f77"
+USE="bitmap-fonts dvd font-server gif jpeg nls  png ppc truetype truetype-fonts type1-fonts fortran f77"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.1/make.defaults b/profiles/default-linux/ppc/2004.1/make.defaults
index 741d79a8fc39..bd1401bdfe72 100644
--- a/profiles/default-linux/ppc/2004.1/make.defaults
+++ b/profiles/default-linux/ppc/2004.1/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.12 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.13 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls  png ppc truetype fortran f77"
+USE="bitmap-fonts dvd font-server gif jpeg nls  png ppc truetype truetype-fonts type1-fonts fortran f77"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.2/make.defaults b/profiles/default-linux/ppc/2004.2/make.defaults
index 52e6579e1526..c6c10989c11e 100644
--- a/profiles/default-linux/ppc/2004.2/make.defaults
+++ b/profiles/default-linux/ppc/2004.2/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.12 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.13 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls png ppc truetype fortran f77"
+USE="bitmap-fonts dvd font-server gif jpeg nls png ppc truetype truetype-fonts type1-fonts fortran f77"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.3/make.defaults b/profiles/default-linux/ppc/2004.3/make.defaults
index 67e2555c8fcf..5b9be2e13be4 100644
--- a/profiles/default-linux/ppc/2004.3/make.defaults
+++ b/profiles/default-linux/ppc/2004.3/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.7 2004/12/28 15:57:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.8 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="pam bitmap-fonts dvd gif jpeg nls png ppc truetype fortran f77"
+USE="pam bitmap-fonts dvd font-server gif jpeg nls png ppc truetype truetype-fonts type1-fonts fortran f77"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2005.0/make.defaults b/profiles/default-linux/ppc/2005.0/make.defaults
index 3061ed277c3a..4152aef4ba9e 100644
--- a/profiles/default-linux/ppc/2005.0/make.defaults
+++ b/profiles/default-linux/ppc/2005.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/make.defaults,v 1.3 2005/01/03 13:27:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/make.defaults,v 1.4 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="unicode pam bitmap-fonts dvd gif jpeg nls png ppc truetype fortran f77"
+USE="unicode pam bitmap-fonts dvd gif jpeg nls png ppc truetype truetype-fonts type1-fonts fortran f77"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/2004.3/make.defaults b/profiles/default-linux/ppc64/2004.3/make.defaults
index 517c0ea2836a..5d5173d74812 100644
--- a/profiles/default-linux/ppc64/2004.3/make.defaults
+++ b/profiles/default-linux/ppc64/2004.3/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/make.defaults,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/make.defaults,v 1.2 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
 
-USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype zlib"
+USE="unicode pam bitmap-fonts font-server gif jpeg nls png ppc64 truetype truetype-fonts type1-fonts zlib"
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/2005.0/make.defaults b/profiles/default-linux/ppc64/2005.0/make.defaults
index 8af407eadfe0..518fc83e2a42 100644
--- a/profiles/default-linux/ppc64/2005.0/make.defaults
+++ b/profiles/default-linux/ppc64/2005.0/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/make.defaults,v 1.1 2005/01/03 17:58:25 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/make.defaults,v 1.2 2005/01/12 23:08:21 spyderous Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
 
-USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype zlib"
+USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype truetype-fonts type1-fonts zlib"
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/s390/2004.3/make.defaults b/profiles/default-linux/s390/2004.3/make.defaults
index 0ca99d36730c..fb914f29a07c 100644
--- a/profiles/default-linux/s390/2004.3/make.defaults
+++ b/profiles/default-linux/s390/2004.3/make.defaults
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/2004.3/make.defaults,v 1.5 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/2004.3/make.defaults,v 1.6 2005/01/12 23:08:21 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
 ARCH="s390"
 
-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 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 spell ssl tcpd truetype truetype-fonts type1-fonts zlib"
 
 ACCEPT_KEYWORDS="s390"
diff --git a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
index ebf72b43daaf..740e6e7c5366 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.3 2004/12/31 10:36:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.4 2005/01/12 23:08:21 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-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"
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/make.defaults b/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
index 856d159946b4..08e63f19adac 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/make.defaults,v 1.1 2005/01/11 01:27:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/make.defaults,v 1.2 2005/01/12 23:08:22 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-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 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"
diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
index 62c5767765d2..a9934ac9cc6b 100644
--- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults
+++ b/profiles/default-linux/sparc/sparc64-multilib/dev/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/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.15 2005/01/07 08:12:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.16 2005/01/12 23:08:22 spyderous Exp $
 
 FEATURES="sandbox ccache autoconfig multilib-pkg multilib-strict"
 
@@ -8,7 +8,7 @@ FEATURES="sandbox ccache autoconfig multilib-pkg multilib-strict"
 GRP_STAGE23_USE="berkdb gpm ipv6 -java multislot multilib ncurses nls -nptl pam perl python readline ssl tcpd zlib"
 
 # Sane, minimal USE settings
-USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups fortran f77 fbcon gif jpeg nls png tiff truetype truetype-fonts type1-fontsusb xpm xrandr xv"
+USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups font-server fortran f77 fbcon gif jpeg nls opengl png tiff truetype truetype-fonts type1-fonts usb xpm xrandr xv"
 
 # Not all of this is implemented in portage/toolchain, yet. See 
 # http://bugs.gentoo.org/show_bug.cgi?id=75420
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
index 4af9fa170c2f..3c6e0f338973 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.9 2004/12/31 10:29:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.10 2005/01/12 23:08:22 spyderous Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -10,6 +10,6 @@ CXXFLAGS=${CFLAGS}
 FEATURES="sandbox ccache"
 
 # USE settings
-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 gtk2"
+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 gtk2"
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses gtk2"
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults
index 6f08dd934335..3f54ed6c7068 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults,v 1.4 2004/12/31 10:29:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults,v 1.5 2005/01/12 23:08:22 spyderous Exp $
 
 # USE settings
-USE="alsa arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype X xv xml2 xmms zlib"
+USE="alsa arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon font-server foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 # Catalyst stage/grp USE
 GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
index f12aa64a5bd5..24a8299ff1e6 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.3/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/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.8 2004/12/31 10:29:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.9 2005/01/12 23:08:22 spyderous Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -10,7 +10,7 @@ CXXFLAGS=${CFLAGS}
 FEATURES="sandbox ccache"
 
 # USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline 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 gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 # Catalyst stage/grp USE
 GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults b/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
index fcaff760a924..67457b524f78 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2005.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-linux/sparc/sparc64/2005.0/make.defaults,v 1.1 2005/01/11 01:19:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/make.defaults,v 1.2 2005/01/12 23:08:22 spyderous Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -10,7 +10,7 @@ CXXFLAGS=${CFLAGS}
 FEATURES="sandbox ccache"
 
 # USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype X xv xml2 xmms zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 # Catalyst stage/grp USE
 GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults
index b1f3f303c65a..092003511e97 100644
--- a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/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/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults,v 1.7 2004/12/31 10:29:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults,v 1.8 2005/01/12 23:08:22 spyderous Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -10,7 +10,7 @@ CXXFLAGS=${CFLAGS}
 FEATURES="sandbox ccache"
 
 # USE settings
-USE="alsa arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
+USE="alsa arts avi berkdb bitmap-fonts crypt cups encode esd font-server fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts X xv xml2 xmms zlib"
 
 # Catalyst stage/grp USE
 GRP_STAGE23_USE="berkdb gpm gcc64 gtk2 ipv6 ncurses nls pam perl python readline ssl tcpd"
diff --git a/profiles/default-linux/x86/2004.0/make.defaults b/profiles/default-linux/x86/2004.0/make.defaults
index fbadbfd6410c..07a84bb862ee 100644
--- a/profiles/default-linux/x86/2004.0/make.defaults
+++ b/profiles/default-linux/x86/2004.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/make.defaults,v 1.11 2005/01/12 16:31:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/make.defaults,v 1.12 2005/01/12 23:08:22 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode foomaticdb fortran f77 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 fortran f77 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-linux/x86/2004.2/make.defaults b/profiles/default-linux/x86/2004.2/make.defaults
index cb9489231db4..2dc802bd6e58 100644
--- a/profiles/default-linux/x86/2004.2/make.defaults
+++ b/profiles/default-linux/x86/2004.2/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.10 2005/01/12 16:42:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.11 2005/01/12 23:08:22 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-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-linux/x86/2004.3/make.defaults b/profiles/default-linux/x86/2004.3/make.defaults
index 83409502112f..4a83d97cc668 100644
--- a/profiles/default-linux/x86/2004.3/make.defaults
+++ b/profiles/default-linux/x86/2004.3/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/make.defaults,v 1.8 2005/01/12 16:41:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/make.defaults,v 1.9 2005/01/12 23:08:22 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-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 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 spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-linux/x86/2005.0/make.defaults b/profiles/default-linux/x86/2005.0/make.defaults
index 6ff0b6564f3c..0585f46aee1b 100644
--- a/profiles/default-linux/x86/2005.0/make.defaults
+++ b/profiles/default-linux/x86/2005.0/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/make.defaults,v 1.4 2005/01/12 16:39:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/make.defaults,v 1.5 2005/01/12 23:08:22 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-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 spell ssl svga tcpd truetype X xml2 xmms xv zlib"
+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 spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-linux/x86/gcc2/make.defaults b/profiles/default-linux/x86/gcc2/make.defaults
index b6d7298c2c9b..5a9d74c7b655 100644
--- a/profiles/default-linux/x86/gcc2/make.defaults
+++ b/profiles/default-linux/x86/gcc2/make.defaults
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.12 2005/01/12 16:36:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.13 2005/01/12 23:08:22 spyderous Exp $
 
-USE="x86 oss 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 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-linux/x86/xbox/make.defaults b/profiles/default-linux/x86/xbox/make.defaults
index 8e1adfdeb8fb..c2fd9d2892ce 100644
--- a/profiles/default-linux/x86/xbox/make.defaults
+++ b/profiles/default-linux/x86/xbox/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.5 2005/01/12 16:45:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.6 2005/01/12 23:08:22 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-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"
 PROFILE_ARCH="xbox"