remove xprint and bitmap-fonts from use.defaults and put into make.defaults

83 files changed, 142 insertions, 176 deletions

diff --git a/profiles/base/use.defaults b/profiles/base/use.defaults
index a867bc928203..eb80069cb177 100644
--- a/profiles/base/use.defaults
+++ b/profiles/base/use.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/base/use.defaults,v 1.8 2004/09/08 18:29:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.defaults,v 1.9 2004/09/09 08:07:09 seemant Exp $
 
 aalib						media-libs/aalib	
 alsa						media-libs/alsa-lib
@@ -51,5 +51,5 @@ tetex						app-text/tetex
 tiff						media-libs/tiff
 ungif						media-libs/ungif
 X						x11-base/xfree
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/cobalt-mips-1.4/use.defaults b/profiles/cobalt-mips-1.4/use.defaults
index e9774b81988a..eaa2388e2cf8 100644
--- a/profiles/cobalt-mips-1.4/use.defaults
+++ b/profiles/cobalt-mips-1.4/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/cobalt-mips-2004.1/use.defaults b/profiles/cobalt-mips-2004.1/use.defaults
index e9774b81988a..eaa2388e2cf8 100644
--- a/profiles/cobalt-mips-2004.1/use.defaults
+++ b/profiles/cobalt-mips-2004.1/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-1.0-gcc3/make.defaults b/profiles/default-1.0-gcc3/make.defaults
index 2d55258d6c94..10ff7c695ef3 100644
--- a/profiles/default-1.0-gcc3/make.defaults
+++ b/profiles/default-1.0-gcc3/make.defaults
@@ -1,10 +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 crypt cups encode 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 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 xprint xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-1.0-gcc3/use.defaults b/profiles/default-1.0-gcc3/use.defaults
index ea8afc1cb66b..59f420611733 100644
--- a/profiles/default-1.0-gcc3/use.defaults
+++ b/profiles/default-1.0-gcc3/use.defaults
@@ -56,5 +56,5 @@ snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
 
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-1.0/make.defaults b/profiles/default-1.0/make.defaults
index 851eab87e7b5..192920c0b213 100644
--- a/profiles/default-1.0/make.defaults
+++ b/profiles/default-1.0/make.defaults
@@ -1,10 +1,7 @@
 # Copyright 2000 Daniel Robbins, Gentoo Foundation.
 # System-wide defaults for the Portage system
 
-USE="x86 oss 3dnow apm arts avi berkdb crypt cups encode 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 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 xprint xv" 
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-1.0/use.defaults b/profiles/default-1.0/use.defaults
index 4efdab2f61f4..75fa300cedc4 100644
--- a/profiles/default-1.0/use.defaults
+++ b/profiles/default-1.0/use.defaults
@@ -57,5 +57,5 @@ tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
 tiff		media-libs/tiff
 X		x11-base/xfree
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index 0d614ad27a69..7f26559f4100 100644
--- a/profiles/default-alpha-1.4/make.defaults
+++ b/profiles/default-alpha-1.4/make.defaults
@@ -4,6 +4,7 @@
 USE="
 alpha
 berkdb
+bitmap-fonts
 crypt
 cups
 encode
@@ -42,6 +43,7 @@ truetype
 X
 xml2
 xmms
+xprint
 xv
 zlib
 "
diff --git a/profiles/default-alpha-1.4/use.defaults b/profiles/default-alpha-1.4/use.defaults
index ff58691d2bc1..3d98f58ed5ba 100644
--- a/profiles/default-alpha-1.4/use.defaults
+++ b/profiles/default-alpha-1.4/use.defaults
@@ -43,5 +43,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index fe0267251e3c..a7f07c85c2a9 100644
--- a/profiles/default-alpha-2004.0/make.defaults
+++ b/profiles/default-alpha-2004.0/make.defaults
@@ -16,6 +16,7 @@ alpha
 arts
 avi
 berkdb
+bitmap-fonts
 crypt
 cups
 encode
@@ -56,6 +57,7 @@ truetype
 X
 xml2
 xmms
+xprint
 xv
 zlib
 "
diff --git a/profiles/default-alpha-2004.0/use.defaults b/profiles/default-alpha-2004.0/use.defaults
index ff58691d2bc1..3d98f58ed5ba 100644
--- a/profiles/default-alpha-2004.0/use.defaults
+++ b/profiles/default-alpha-2004.0/use.defaults
@@ -43,5 +43,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-amd64-1.4/make.defaults b/profiles/default-amd64-1.4/make.defaults
index f8fd479397fe..4922f5224f86 100644
--- a/profiles/default-amd64-1.4/make.defaults
+++ b/profiles/default-amd64-1.4/make.defaults
@@ -7,10 +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
--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 -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/default-amd64-1.4/use.defaults b/profiles/default-amd64-1.4/use.defaults
index 059d5ea4bcf1..d8297770387e 100644
--- a/profiles/default-amd64-1.4/use.defaults
+++ b/profiles/default-amd64-1.4/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-amd64-2004.0/make.defaults b/profiles/default-amd64-2004.0/make.defaults
index 9ac3dc6510c8..f17fcd91dd42 100644
--- a/profiles/default-amd64-2004.0/make.defaults
+++ b/profiles/default-amd64-2004.0/make.defaults
@@ -7,10 +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 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 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 xprint xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-amd64-2004.0/use.defaults b/profiles/default-amd64-2004.0/use.defaults
index 059d5ea4bcf1..d8297770387e 100644
--- a/profiles/default-amd64-2004.0/use.defaults
+++ b/profiles/default-amd64-2004.0/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults
index 9ac3dc6510c8..f17fcd91dd42 100644
--- a/profiles/default-amd64-2004.2/make.defaults
+++ b/profiles/default-amd64-2004.2/make.defaults
@@ -7,10 +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 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 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 xprint xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-amd64-2004.2/use.defaults b/profiles/default-amd64-2004.2/use.defaults
index a7ca7a3376df..9100c21dbeca 100644
--- a/profiles/default-amd64-2004.2/use.defaults
+++ b/profiles/default-amd64-2004.2/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-arm-2004.0/make.defaults b/profiles/default-arm-2004.0/make.defaults
index e1b3aa0135c3..55e9803f8f39 100644
--- a/profiles/default-arm-2004.0/make.defaults
+++ b/profiles/default-arm-2004.0/make.defaults
@@ -3,10 +3,7 @@
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-USE="arm berkdb 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 foomaticdb gdbm gif gpm jpeg libg++ libwww mpeg ncurses nls pam png perl python readline spell ssl tcpd truetype xprint zlib"
 
 ARCH="arm"
 ACCEPT_KEYWORDS="arm"
diff --git a/profiles/default-arm-2004.0/use.defaults b/profiles/default-arm-2004.0/use.defaults
index 0ae0af3fd3de..4f31b72a1ccb 100644
--- a/profiles/default-arm-2004.0/use.defaults
+++ b/profiles/default-arm-2004.0/use.defaults
@@ -53,5 +53,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-hppa-1.4/make.defaults b/profiles/default-hppa-1.4/make.defaults
index e36ec43e309f..a9079fce9171 100644
--- a/profiles/default-hppa-1.4/make.defaults
+++ b/profiles/default-hppa-1.4/make.defaults
@@ -2,6 +2,7 @@
 
 USE="
 berkdb
+bitmap-fonts
 crypt
 cups
 encode
@@ -41,6 +42,7 @@ truetype
 X
 xml2
 xmms
+xprint
 xv
 zlib
 "
diff --git a/profiles/default-hppa-1.4/use.defaults b/profiles/default-hppa-1.4/use.defaults
index e9774b81988a..eaa2388e2cf8 100644
--- a/profiles/default-hppa-1.4/use.defaults
+++ b/profiles/default-hppa-1.4/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-hppa-2004.0/make.defaults b/profiles/default-hppa-2004.0/make.defaults
index e36ec43e309f..a9079fce9171 100644
--- a/profiles/default-hppa-2004.0/make.defaults
+++ b/profiles/default-hppa-2004.0/make.defaults
@@ -2,6 +2,7 @@
 
 USE="
 berkdb
+bitmap-fonts
 crypt
 cups
 encode
@@ -41,6 +42,7 @@ truetype
 X
 xml2
 xmms
+xprint
 xv
 zlib
 "
diff --git a/profiles/default-hppa-2004.0/use.defaults b/profiles/default-hppa-2004.0/use.defaults
index 73a5200da27e..dc43358f674f 100644
--- a/profiles/default-hppa-2004.0/use.defaults
+++ b/profiles/default-hppa-2004.0/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ia64-1.4/make.defaults b/profiles/default-ia64-1.4/make.defaults
index 9550fb6e4688..59a7f6477089 100644
--- a/profiles/default-ia64-1.4/make.defaults
+++ b/profiles/default-ia64-1.4/make.defaults
@@ -4,6 +4,7 @@
 USE="
 ia64
 berkdb
+bitmap-fonts
 crypt
 cups
 encode
@@ -42,6 +43,7 @@ truetype
 X
 xml2
 xmms
+xprint
 xv
 zlib
 "
diff --git a/profiles/default-ia64-1.4/use.defaults b/profiles/default-ia64-1.4/use.defaults
index ff58691d2bc1..3d98f58ed5ba 100644
--- a/profiles/default-ia64-1.4/use.defaults
+++ b/profiles/default-ia64-1.4/use.defaults
@@ -43,5 +43,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-macos-10.3/use.defaults b/profiles/default-macos-10.3/use.defaults
index dce04307ac23..06021fd0d0fb 100644
--- a/profiles/default-macos-10.3/use.defaults
+++ b/profiles/default-macos-10.3/use.defaults
@@ -18,5 +18,5 @@ ssl		dev-libs/openssl
 tcltk		dev-lang/tcl dev-lang/tk
 tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-macos-10.4/use.defaults b/profiles/default-macos-10.4/use.defaults
index dce04307ac23..06021fd0d0fb 100644
--- a/profiles/default-macos-10.4/use.defaults
+++ b/profiles/default-macos-10.4/use.defaults
@@ -18,5 +18,5 @@ ssl		dev-libs/openssl
 tcltk		dev-lang/tcl dev-lang/tk
 tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults
index 7d8f8d15b5ef..3b7b4763ffa9 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="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/default-mips-1.4/use.defaults b/profiles/default-mips-1.4/use.defaults
index 73a5200da27e..dc43358f674f 100644
--- a/profiles/default-mips-1.4/use.defaults
+++ b/profiles/default-mips-1.4/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults
index 7d8f8d15b5ef..3b7b4763ffa9 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="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/default-mips-2004.1/use.defaults b/profiles/default-mips-2004.1/use.defaults
index 73a5200da27e..dc43358f674f 100644
--- a/profiles/default-mips-2004.1/use.defaults
+++ b/profiles/default-mips-2004.1/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults
index 5294f09ff79f..464e34b0aefc 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="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/default-mips64-1.4/use.defaults b/profiles/default-mips64-1.4/use.defaults
index e9774b81988a..eaa2388e2cf8 100644
--- a/profiles/default-mips64-1.4/use.defaults
+++ b/profiles/default-mips64-1.4/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults
index 28b7ea6f131d..e4abbd1b0f2a 100644
--- a/profiles/default-ppc-1.0/make.defaults
+++ b/profiles/default-ppc-1.0/make.defaults
@@ -20,9 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline 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 xprint oss dvd xv slang readline 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" 
 
 # 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.0/use.defaults b/profiles/default-ppc-1.0/use.defaults
index f7d5534063ed..424731eff4b2 100644
--- a/profiles/default-ppc-1.0/use.defaults
+++ b/profiles/default-ppc-1.0/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc-1.4/make.defaults b/profiles/default-ppc-1.4/make.defaults
index e3b531208efb..2f31edef724a 100644
--- a/profiles/default-ppc-1.4/make.defaults
+++ b/profiles/default-ppc-1.4/make.defaults
@@ -22,9 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline 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 xprint oss dvd xv slang readline 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"
 
 # 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/use.defaults b/profiles/default-ppc-1.4/use.defaults
index c69dd1feea32..1add5167de93 100644
--- a/profiles/default-ppc-1.4/use.defaults
+++ b/profiles/default-ppc-1.4/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc-2004.0/make.defaults b/profiles/default-ppc-2004.0/make.defaults
index f58fd97f6587..eef49c456ab3 100644
--- a/profiles/default-ppc-2004.0/make.defaults
+++ b/profiles/default-ppc-2004.0/make.defaults
@@ -22,9 +22,7 @@ CFLAGS="-O2 -pipe -fno-strict-aliasing"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline 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 xprint oss dvd xv slang readline 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"
 
 # 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/use.defaults b/profiles/default-ppc-2004.0/use.defaults
index 57a23773e46c..e35dde7323ca 100644
--- a/profiles/default-ppc-2004.0/use.defaults
+++ b/profiles/default-ppc-2004.0/use.defaults
@@ -42,5 +42,5 @@ tcltk		dev-lang/tcl dev-lang/tk
 tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
 ungif		media-libs/ungif
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc-2004.1/make.defaults b/profiles/default-ppc-2004.1/make.defaults
index f58fd97f6587..eef49c456ab3 100644
--- a/profiles/default-ppc-2004.1/make.defaults
+++ b/profiles/default-ppc-2004.1/make.defaults
@@ -22,9 +22,7 @@ CFLAGS="-O2 -pipe -fno-strict-aliasing"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline 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 xprint oss dvd xv slang readline 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"
 
 # 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.1/use.defaults b/profiles/default-ppc-2004.1/use.defaults
index 57a23773e46c..e35dde7323ca 100644
--- a/profiles/default-ppc-2004.1/use.defaults
+++ b/profiles/default-ppc-2004.1/use.defaults
@@ -42,5 +42,5 @@ tcltk		dev-lang/tcl dev-lang/tk
 tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
 ungif		media-libs/ungif
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc-2004.2/make.defaults b/profiles/default-ppc-2004.2/make.defaults
index f58fd97f6587..eef49c456ab3 100644
--- a/profiles/default-ppc-2004.2/make.defaults
+++ b/profiles/default-ppc-2004.2/make.defaults
@@ -22,9 +22,7 @@ CFLAGS="-O2 -pipe -fno-strict-aliasing"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline 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 xprint oss dvd xv slang readline 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"
 
 # 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.2/use.defaults b/profiles/default-ppc-2004.2/use.defaults
index 57a23773e46c..e35dde7323ca 100644
--- a/profiles/default-ppc-2004.2/use.defaults
+++ b/profiles/default-ppc-2004.2/use.defaults
@@ -42,5 +42,5 @@ tcltk		dev-lang/tcl dev-lang/tk
 tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
 ungif		media-libs/ungif
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc/make.defaults b/profiles/default-ppc/make.defaults
index d7a79d666891..31eeca7de635 100644
--- a/profiles/default-ppc/make.defaults
+++ b/profiles/default-ppc/make.defaults
@@ -20,8 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss xv slang readline 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 xprint oss xv slang readline gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla"
 
 ACCEPT_KEYWORDS="ppc"
diff --git a/profiles/default-ppc/use.defaults b/profiles/default-ppc/use.defaults
index 0c1bfd513ee4..564ded9f5c05 100644
--- a/profiles/default-ppc/use.defaults
+++ b/profiles/default-ppc/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc64-2004.1/make.defaults b/profiles/default-ppc64-2004.1/make.defaults
index 794a58f801e3..d3413ebcfad4 100644
--- a/profiles/default-ppc64-2004.1/make.defaults
+++ b/profiles/default-ppc64-2004.1/make.defaults
@@ -22,9 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline 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 ppc64 cups foomaticdb"
+USE="bitmap-fonts xprint oss dvd xv slang readline 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 ppc64 cups foomaticdb"
 
 # The following USE should _not_ bet set on ppc64 as they can cause breakage
 # in some pacakges (are mostly x86 only options)
diff --git a/profiles/default-ppc64-2004.1/use.defaults b/profiles/default-ppc64-2004.1/use.defaults
index 7c285b1d50f3..59f7f4f8bd60 100644
--- a/profiles/default-ppc64-2004.1/use.defaults
+++ b/profiles/default-ppc64-2004.1/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-ppc64-2004.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults
index 53ccfcaab633..1992fe70e32b 100644
--- a/profiles/default-ppc64-2004.2/make.defaults
+++ b/profiles/default-ppc64-2004.2/make.defaults
@@ -24,9 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg
-nls mitshm perl python gif imlib sdl oggvorbis 
-png truetype ppc64 cups foomaticdb"
+USE="bitmap-fonts xprint oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype 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.2/use.defaults b/profiles/default-ppc64-2004.2/use.defaults
index b4386c38740a..8634030e4997 100644
--- a/profiles/default-ppc64-2004.2/use.defaults
+++ b/profiles/default-ppc64-2004.2/use.defaults
@@ -55,5 +55,5 @@ ldap           net-nds/openldap
 snmp           net-analyzer/ucd-snmp
 cdr            app-cdr/cdrtools
 scanner                media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-s390-2004.0/make.defaults b/profiles/default-s390-2004.0/make.defaults
index b868ae0371e3..6fa9f5492b02 100644
--- a/profiles/default-s390-2004.0/make.defaults
+++ b/profiles/default-s390-2004.0/make.defaults
@@ -23,8 +23,7 @@ CFLAGS=""
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="berkdb crypt cups 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 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype xprint 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.0/use.defaults b/profiles/default-s390-2004.0/use.defaults
index 339346ef1197..b11ffd22aa00 100644
--- a/profiles/default-s390-2004.0/use.defaults
+++ b/profiles/default-s390-2004.0/use.defaults
@@ -42,5 +42,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-s390-2004.1/make.defaults b/profiles/default-s390-2004.1/make.defaults
index b868ae0371e3..6fa9f5492b02 100644
--- a/profiles/default-s390-2004.1/make.defaults
+++ b/profiles/default-s390-2004.1/make.defaults
@@ -23,8 +23,7 @@ CFLAGS=""
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="berkdb crypt cups 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 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype xprint 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/use.defaults b/profiles/default-s390-2004.1/use.defaults
index 339346ef1197..b11ffd22aa00 100644
--- a/profiles/default-s390-2004.1/use.defaults
+++ b/profiles/default-s390-2004.1/use.defaults
@@ -42,5 +42,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index 8bfb579c0538..546a2c89d0e2 100644
--- a/profiles/default-sparc-1.4/make.defaults
+++ b/profiles/default-sparc-1.4/make.defaults
@@ -21,8 +21,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb crypt cups 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 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 xprint 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-1.4/use.defaults b/profiles/default-sparc-1.4/use.defaults
index 30d0aede5d81..988d986fc803 100644
--- a/profiles/default-sparc-1.4/use.defaults
+++ b/profiles/default-sparc-1.4/use.defaults
@@ -42,5 +42,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-sparc-2004.0/make.defaults b/profiles/default-sparc-2004.0/make.defaults
index 3a6e8eb01a5a..0c106c228640 100644
--- a/profiles/default-sparc-2004.0/make.defaults
+++ b/profiles/default-sparc-2004.0/make.defaults
@@ -23,8 +23,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb crypt cups 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 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 xprint 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/use.defaults b/profiles/default-sparc-2004.0/use.defaults
index 30d0aede5d81..988d986fc803 100644
--- a/profiles/default-sparc-2004.0/use.defaults
+++ b/profiles/default-sparc-2004.0/use.defaults
@@ -42,5 +42,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults
index 770b6b593207..0e80ef8b25f8 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 crypt cups encode esd 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 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 xprint zlib"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/default-sparc64-1.4/use.defaults b/profiles/default-sparc64-1.4/use.defaults
index 3b32265c15f0..040a0804506c 100644
--- a/profiles/default-sparc64-1.4/use.defaults
+++ b/profiles/default-sparc64-1.4/use.defaults
@@ -42,5 +42,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-sparc64-2004.0/make.defaults b/profiles/default-sparc64-2004.0/make.defaults
index 770b6b593207..0e80ef8b25f8 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 crypt cups encode esd 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 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 xprint zlib"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/default-sparc64-2004.0/use.defaults b/profiles/default-sparc64-2004.0/use.defaults
index 3b32265c15f0..040a0804506c 100644
--- a/profiles/default-sparc64-2004.0/use.defaults
+++ b/profiles/default-sparc64-2004.0/use.defaults
@@ -42,5 +42,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-x86-1.4/make.defaults b/profiles/default-x86-1.4/make.defaults
index 274a21699920..bec683c98030 100644
--- a/profiles/default-x86-1.4/make.defaults
+++ b/profiles/default-x86-1.4/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"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-x86-1.4/use.defaults b/profiles/default-x86-1.4/use.defaults
index 4b76bdeaf33a..36b4bbadb579 100644
--- a/profiles/default-x86-1.4/use.defaults
+++ b/profiles/default-x86-1.4/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-x86-2004.0/make.defaults b/profiles/default-x86-2004.0/make.defaults
index 274a21699920..bec683c98030 100644
--- a/profiles/default-x86-2004.0/make.defaults
+++ b/profiles/default-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"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-x86-2004.0/use.defaults b/profiles/default-x86-2004.0/use.defaults
index fd20cd9f133e..4559d5c166ca 100644
--- a/profiles/default-x86-2004.0/use.defaults
+++ b/profiles/default-x86-2004.0/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults
index 61ced4f3b470..0dc10cca63e9 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 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"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-x86-2004.2/use.defaults b/profiles/default-x86-2004.2/use.defaults
index fd20cd9f133e..4559d5c166ca 100644
--- a/profiles/default-x86-2004.2/use.defaults
+++ b/profiles/default-x86-2004.2/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/default-x86-obsd-2004/use.defaults b/profiles/default-x86-obsd-2004/use.defaults
index 743632ece36d..1cc2a7856fd1 100644
--- a/profiles/default-x86-obsd-2004/use.defaults
+++ b/profiles/default-x86-obsd-2004/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/embedded/use.defaults b/profiles/embedded/use.defaults
index d0e26385d0bc..1cd3c4bcb1f5 100644
--- a/profiles/embedded/use.defaults
+++ b/profiles/embedded/use.defaults
@@ -1,3 +1,3 @@
 static		sys-apps/busybox
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/gcc33-sparc64-1.4/use.defaults b/profiles/gcc33-sparc64-1.4/use.defaults
index 01a549489f1d..532fa8e78b88 100644
--- a/profiles/gcc33-sparc64-1.4/use.defaults
+++ b/profiles/gcc33-sparc64-1.4/use.defaults
@@ -44,5 +44,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/gcc34-amd64-2004.1/use.defaults b/profiles/gcc34-amd64-2004.1/use.defaults
index 059d5ea4bcf1..d8297770387e 100644
--- a/profiles/gcc34-amd64-2004.1/use.defaults
+++ b/profiles/gcc34-amd64-2004.1/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/gcc34-x86-2004.2/use.defaults b/profiles/gcc34-x86-2004.2/use.defaults
index fd20cd9f133e..4559d5c166ca 100644
--- a/profiles/gcc34-x86-2004.2/use.defaults
+++ b/profiles/gcc34-x86-2004.2/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/hardened-amd64-2004.0/use.defaults b/profiles/hardened-amd64-2004.0/use.defaults
index 059d5ea4bcf1..d8297770387e 100644
--- a/profiles/hardened-amd64-2004.0/use.defaults
+++ b/profiles/hardened-amd64-2004.0/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/hardened-x86-1.4/use.defaults b/profiles/hardened-x86-1.4/use.defaults
index 7bfa9df55a70..20479174f093 100644
--- a/profiles/hardened-x86-1.4/use.defaults
+++ b/profiles/hardened-x86-1.4/use.defaults
@@ -58,5 +58,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/hardened-x86-2004.0/use.defaults b/profiles/hardened-x86-2004.0/use.defaults
index 7bfa9df55a70..20479174f093 100644
--- a/profiles/hardened-x86-2004.0/use.defaults
+++ b/profiles/hardened-x86-2004.0/use.defaults
@@ -58,5 +58,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/hardened/amd64/use.defaults b/profiles/hardened/amd64/use.defaults
index 059d5ea4bcf1..d8297770387e 100644
--- a/profiles/hardened/amd64/use.defaults
+++ b/profiles/hardened/amd64/use.defaults
@@ -54,5 +54,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/hardened/x86/use.defaults b/profiles/hardened/x86/use.defaults
index a7b4f59061bd..6f286b441b4d 100644
--- a/profiles/hardened/x86/use.defaults
+++ b/profiles/hardened/x86/use.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/hardened/x86/use.defaults,v 1.4 2004/09/08 18:29:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/use.defaults,v 1.5 2004/09/09 08:07:10 seemant Exp $
+
+
 
-bitmap-fonts
-xprint
diff --git a/profiles/n32-mips-2004.1/use.defaults b/profiles/n32-mips-2004.1/use.defaults
index e9774b81988a..eaa2388e2cf8 100644
--- a/profiles/n32-mips-2004.1/use.defaults
+++ b/profiles/n32-mips-2004.1/use.defaults
@@ -52,5 +52,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/selinux-ppc-1.4/use.defaults b/profiles/selinux-ppc-1.4/use.defaults
index 35f967e11629..54fd04769ac1 100644
--- a/profiles/selinux-ppc-1.4/use.defaults
+++ b/profiles/selinux-ppc-1.4/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/selinux-sparc64-1.4/use.defaults b/profiles/selinux-sparc64-1.4/use.defaults
index 5487df8f4f16..8ddb56305e66 100644
--- a/profiles/selinux-sparc64-1.4/use.defaults
+++ b/profiles/selinux-sparc64-1.4/use.defaults
@@ -43,5 +43,5 @@ tcpd		sys-apps/tcp-wrappers
 tetex		app-text/tetex
 ungif		media-libs/ungif
 #xinerama
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/selinux-x86-1.4/use.defaults b/profiles/selinux-x86-1.4/use.defaults
index ef611b18d5da..b549dd1631d5 100644
--- a/profiles/selinux-x86-1.4/use.defaults
+++ b/profiles/selinux-x86-1.4/use.defaults
@@ -56,5 +56,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/uclibc/use.defaults b/profiles/uclibc/use.defaults
index d52f96015492..ec86da90544f 100644
--- a/profiles/uclibc/use.defaults
+++ b/profiles/uclibc/use.defaults
@@ -1,3 +1,3 @@
 zlib			sys-libs/zlib
-bitmap-fonts
-xprint
+
+
diff --git a/profiles/xbox-x86-2004.0/use.defaults b/profiles/xbox-x86-2004.0/use.defaults
index fd20cd9f133e..4559d5c166ca 100644
--- a/profiles/xbox-x86-2004.0/use.defaults
+++ b/profiles/xbox-x86-2004.0/use.defaults
@@ -55,5 +55,5 @@ ldap		net-nds/openldap
 snmp		net-analyzer/ucd-snmp
 cdr		app-cdr/cdrtools
 scanner		media-gfx/sane-backends
-bitmap-fonts
-xprint
+
+