15 files changed, 30 insertions, 21 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
new file mode 100644
index 000000000000..efbba293c5f1
--- /dev/null
+++ b/profiles/base/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 2004 Gentoo Foundation.
+# System-wide defaults for a basic linux system
+
+# Please avoid enabling things by default in here if possible. Understand any 
+# implications with core packages. For example, if "java" is in USE and db 
+# has a conditional dependency on java (which it does,) then a JDK will be 
+# pulled in during *emerge system*!
+
+# bitmap-fonts and xprint: build X the (upstream) default way
+USE="bitmap-fonts xprint"
diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults
index f3aa24d21e49..cb8033a7338e 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="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts xprint slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/cobalt-mips-2004.1/make.defaults b/profiles/cobalt-mips-2004.1/make.defaults
index f3aa24d21e49..cb8033a7338e 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="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts xprint slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults
index e1f9ebc2e321..f6077d9e9642 100644
--- a/profiles/gcc33-sparc64-1.4/make.defaults
+++ b/profiles/gcc33-sparc64-1.4/make.defaults
@@ -20,9 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts apm avi berkdb crypt cups encode esd 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 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 xprint 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 f2347433d728..e814fe497c4d 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 crypt -cups encode 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 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 xprint 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 603a4433c1f6..bc8ef90ba4bb 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 crypt cups encode 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 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 xprint xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/hardened-amd64-2004.0/make.defaults b/profiles/hardened-amd64-2004.0/make.defaults
index cc29cfa84470..7de0f470cae0 100644
--- a/profiles/hardened-amd64-2004.0/make.defaults
+++ b/profiles/hardened-amd64-2004.0/make.defaults
@@ -1,7 +1,9 @@
 # Copyright 2002 Gentoo Foundation.
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-amd64-2004.0/make.defaults,v 1.4 2004/09/09 08:17:08 seemant Exp $
 
 GRP_STAGE23_USE="amd64 berkdb crypt readline nls ssl tcpd zlib pam pic python acl ncurses -java -gcj f77 objc -X -multilib hardened"
-USE="amd64 berkdb crypt readline nls ssl tcpd zlib pam pic python acl ncurses -java -gcj f77 objc -multilib hardened -cups gdbm zlib"
+
+USE="amd64 berkdb bitmap-fonts crypt readline nls ssl tcpd zlib pam pic python acl ncurses -java -gcj f77 objc -multilib hardened -cups gdbm xprint zlib"
 
 FEATURES="sandbox sfperms strict"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/hardened-x86-1.4/make.defaults b/profiles/hardened-x86-1.4/make.defaults
index cce0b6dbdc5d..31e3bf3524da 100644
--- a/profiles/hardened-x86-1.4/make.defaults
+++ b/profiles/hardened-x86-1.4/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-1.4/make.defaults,v 1.13 2004/08/25 14:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-1.4/make.defaults,v 1.14 2004/09/09 08:17:08 seemant Exp $
 
 GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic"
 
 # <zhen@gentoo.org> defaults for a hardened system
 # <zhen@gentoo.org> pam added until bug 10135 is fixed
-USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic"
+USE="x86 berkdb bitmap-fonts crypt readline nls ssl tcpd zlib pam pic xprint"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults
index afb3ebc28c4a..d008ed4efff6 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.5 2004/08/25 14:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.6 2004/09/09 08:17:08 seemant 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 crypt readline nls ssl tcpd zlib pam pic pie hardened"
+USE="x86 berkdb bitmap-fonts crypt readline nls ssl tcpd xprint zlib pam pic pie hardened"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/hardened/make.defaults b/profiles/hardened/make.defaults
index ff68dc3222ea..d3c970cc649e 100644
--- a/profiles/hardened/make.defaults
+++ b/profiles/hardened/make.defaults
@@ -1,5 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.2 2004/06/26 23:29:26 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/make.defaults,v 1.3 2004/09/09 08:17:08 seemant Exp $
 
 FEATURES="sandbox sfperms strict"
+
+USE="bitmap-fonts xprint"
diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults
index f164ba3cdd50..b0e06304fa44 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="slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib"
+USE="bitmap-fonts xprint 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/selinux-ppc-1.4/make.defaults b/profiles/selinux-ppc-1.4/make.defaults
index a900a73dcd67..ed8b6258cd1f 100644
--- a/profiles/selinux-ppc-1.4/make.defaults
+++ b/profiles/selinux-ppc-1.4/make.defaults
@@ -20,7 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="ppc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
+USE="ppc berkdb bitmap-fonts crypt ncurses pam python readline selinux ssl tcpd xprint zlib"
 GRP_STAGE23_USE="ppc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
 
 # The following USE should _not_ bet set on ppc as they can cause breakage
diff --git a/profiles/selinux-sparc64-1.4/make.defaults b/profiles/selinux-sparc64-1.4/make.defaults
index 80d398692def..5a589efe598c 100644
--- a/profiles/selinux-sparc64-1.4/make.defaults
+++ b/profiles/selinux-sparc64-1.4/make.defaults
@@ -13,7 +13,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="sparc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
+USE="sparc berkdb bitmap-fonts crypt ncurses pam python readline selinux ssl tcpd xprint zlib"
 GRP_STAGE23_USE="x86 berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
 
 ACCEPT_KEYWORDS="sparc"
diff --git a/profiles/selinux-x86-1.4/make.defaults b/profiles/selinux-x86-1.4/make.defaults
index ae3974a0e213..35c083167fcb 100644
--- a/profiles/selinux-x86-1.4/make.defaults
+++ b/profiles/selinux-x86-1.4/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2002 Gentoo Foundation.
 # System-wide defaults for the gcc 3.2 Portage system
 
-USE="x86 berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
+USE="x86 berkdb bitmap-fonts crypt ncurses pam python readline selinux ssl tcpd xprint zlib"
 GRP_STAGE23_USE="x86 berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
 
 ARCH="x86"
diff --git a/profiles/xbox-x86-2004.0/make.defaults b/profiles/xbox-x86-2004.0/make.defaults
index 820181b95475..97f4aed04e14 100644
--- a/profiles/xbox-x86-2004.0/make.defaults
+++ b/profiles/xbox-x86-2004.0/make.defaults
@@ -11,10 +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 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 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 xprint xv zlib"
 
 ARCH="x86"
 PROFILE_ARCH="xbox"