Remove xprint from make.defaults. X builds libXp by default even with USE=-xprint, so this is no longer needed. This will restore all other xprint-using apps to their previous default behavior.

57 files changed, 72 insertions, 79 deletions

diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults
index cb8033a7338e..7d709840fd27 100644
--- a/profiles/cobalt-mips-1.4/make.defaults
+++ b/profiles/cobalt-mips-1.4/make.defaults
@@ -24,6 +24,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts 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 cb8033a7338e..7d709840fd27 100644
--- a/profiles/cobalt-mips-2004.1/make.defaults
+++ b/profiles/cobalt-mips-2004.1/make.defaults
@@ -24,6 +24,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/default-1.0-gcc3/make.defaults b/profiles/default-1.0-gcc3/make.defaults
index 98f46b40c54b..821894c5190b 100644
--- a/profiles/default-1.0-gcc3/make.defaults
+++ b/profiles/default-1.0-gcc3/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2002 Daniel Robbins, Gentoo Foundation.
 # System-wide defaults for the gcc 3.1 Portage system
 
-USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode f77 gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xprint xv zlib"
+USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode f77 gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-1.0/make.defaults b/profiles/default-1.0/make.defaults
index e550d0cf057a..97d056fe43a3 100644
--- a/profiles/default-1.0/make.defaults
+++ b/profiles/default-1.0/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 2000 Daniel Robbins, Gentoo Foundation.
 # System-wide defaults for the Portage system
 
-USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv" 
+USE="x86 oss 3dnow apm arts avi berkdb bitmap-fonts crypt cups encode 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" 
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults
index c1410f8c414f..9324f216ae40 100644
--- a/profiles/default-alpha-1.4/make.defaults
+++ b/profiles/default-alpha-1.4/make.defaults
@@ -44,7 +44,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults
index cea2db3cfbd0..34db1e978090 100644
--- a/profiles/default-alpha-2004.0/make.defaults
+++ b/profiles/default-alpha-2004.0/make.defaults
@@ -58,7 +58,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-amd64-1.4/make.defaults b/profiles/default-amd64-1.4/make.defaults
index 417fb1dae70a..1ae56893b571 100644
--- a/profiles/default-amd64-1.4/make.defaults
+++ b/profiles/default-amd64-1.4/make.defaults
@@ -7,7 +7,7 @@
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 
-USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xprint xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-amd64-2004.0/make.defaults b/profiles/default-amd64-2004.0/make.defaults
index 7f3f904956f2..a25eca90d4fe 100644
--- a/profiles/default-amd64-2004.0/make.defaults
+++ b/profiles/default-amd64-2004.0/make.defaults
@@ -7,7 +7,7 @@
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 
-USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib nogcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xprint xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib nogcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults
index 7f3f904956f2..a25eca90d4fe 100644
--- a/profiles/default-amd64-2004.2/make.defaults
+++ b/profiles/default-amd64-2004.2/make.defaults
@@ -7,7 +7,7 @@
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 
-USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib nogcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xprint xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode f77 foomaticdb gdbm gif gpm gtk  gtk2 imlib nogcj -java -nptl jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-arm-2004.0/make.defaults b/profiles/default-arm-2004.0/make.defaults
index 55e9803f8f39..790927504266 100644
--- a/profiles/default-arm-2004.0/make.defaults
+++ b/profiles/default-arm-2004.0/make.defaults
@@ -3,7 +3,7 @@
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-USE="arm berkdb bitmap-fonts crypt cups encode foomaticdb gdbm gif gpm jpeg libg++ libwww mpeg ncurses nls pam png perl python readline spell ssl tcpd truetype xprint 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 zlib"
 
 ARCH="arm"
 ACCEPT_KEYWORDS="arm"
diff --git a/profiles/default-hppa-2004.0/make.defaults b/profiles/default-hppa-2004.0/make.defaults
index acab625304b4..178752739de3 100644
--- a/profiles/default-hppa-2004.0/make.defaults
+++ b/profiles/default-hppa-2004.0/make.defaults
@@ -43,7 +43,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-ia64-1.4/make.defaults b/profiles/default-ia64-1.4/make.defaults
index 03b3ff0e7add..25cc474c3b95 100644
--- a/profiles/default-ia64-1.4/make.defaults
+++ b/profiles/default-ia64-1.4/make.defaults
@@ -44,7 +44,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-linux/alpha/2004.3/make.defaults b/profiles/default-linux/alpha/2004.3/make.defaults
index b994b3268c3e..bb92d484d58f 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.2 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/make.defaults,v 1.3 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -59,7 +59,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index fdffce41fab2..b9f2668bab54 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/lib64/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/lib64/make.defaults,v 1.8 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.9 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -10,7 +10,7 @@ ACCEPT_KEYWORDS="${ARCH}"
 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 f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xprint xrandr xv"
+USE="${GRP_STAGE23_USE} bitmap-fonts oss alsa crypt f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 ARCH="amd64"
 
diff --git a/profiles/default-linux/amd64/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index a6c9311caf41..9ae742785e71 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.9 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.10 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -12,7 +12,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 oss alsa crypt f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xprint xrandr xv"
+USE="${GRP_STAGE23_USE} bitmap-fonts oss alsa crypt f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 ARCH="amd64"
 
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
index d985de42790e..587a7f54c352 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.7 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/make.defaults,v 1.8 2004/10/28 19:35:24 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 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 xprint xv zlib"
+USE="amd64 bitmap-fonts oss 3dnow apm arts avi berkdb crypt -cups encode 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"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/default-linux/hppa/2004.2/make.defaults b/profiles/default-linux/hppa/2004.2/make.defaults
index 1729050c9174..d7ad7598a450 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.5 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2004.2/make.defaults,v 1.6 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -50,7 +50,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-linux/ia64/2004.3/make.defaults b/profiles/default-linux/ia64/2004.3/make.defaults
index 38e6773d8493..1cb798cef362 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.2 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ia64/2004.3/make.defaults,v 1.3 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -48,7 +48,6 @@ truetype
 X
 xml2
 xmms
-xprint
 xv
 zlib
 "
diff --git a/profiles/default-linux/make.defaults b/profiles/default-linux/make.defaults
index efbba293c5f1..73a673143ad4 100644
--- a/profiles/default-linux/make.defaults
+++ b/profiles/default-linux/make.defaults
@@ -6,5 +6,5 @@
 # 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"
+# bitmap-fonts: build X the (upstream) default way
+USE="bitmap-fonts"
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index 13ef34f281b0..3a46c7a066e8 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.10 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.11 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls  png ppc truetype xprint f77"
+USE="bitmap-fonts dvd gif jpeg nls  png ppc truetype 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 e50d20e33fd1..cb975c785e5b 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.10 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.11 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls  png ppc truetype xprint f77"
+USE="bitmap-fonts dvd gif jpeg nls  png ppc truetype 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 a9d7bfc3292c..366667873e56 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.10 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.11 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls png ppc truetype xprint f77"
+USE="bitmap-fonts dvd gif jpeg nls png ppc truetype 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 dbeb3f5a6831..079db64ff766 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.4 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.5 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-USE="bitmap-fonts dvd gif jpeg nls png ppc truetype xprint f77"
+USE="bitmap-fonts dvd gif jpeg nls png ppc truetype f77"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/s390/2004.3/make.defaults b/profiles/default-linux/s390/2004.3/make.defaults
index c45c5f0fb96f..af1457d5c318 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.2 2004/10/08 16:03:10 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/s390/2004.3/make.defaults,v 1.3 2004/10/28 19:35:24 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 f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype xprint zlib"
+USE="berkdb bitmap-fonts crypt cups f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype zlib"
 
 ACCEPT_KEYWORDS="s390"
diff --git a/profiles/default-linux/sparc/sparc32/make.defaults b/profiles/default-linux/sparc/sparc32/make.defaults
index a7bcd2595d09..43bf7358bc2a 100644
--- a/profiles/default-linux/sparc/sparc32/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/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/sparc32/make.defaults,v 1.6 2004/10/08 16:03:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/make.defaults,v 1.7 2004/10/28 19:35:24 spyderous Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
@@ -8,6 +8,6 @@ ARCH="sparc"
 
 PROFILE_ARCH="sparc"
 
-USE="arts berkdb bitmap-fonts crypt cups 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 xprint xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups 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"
 
 ACCEPT_KEYWORDS="sparc"
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
index 268ab45749d7..de820a1fbb58 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.4 2004/10/08 16:03:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.5 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="sparc"
 
@@ -20,6 +20,6 @@ FEATURES="sandbox ccache"
 ACCEPT_KEYWORDS="sparc"
 
 # USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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 xprint zlib gtk2"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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"
 
 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/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
index a2aea6b501bf..f9c57e3bd816 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.2 2004/10/08 16:03:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.3 2004/10/28 19:35:24 spyderous Exp $
 
 ARCH="sparc"
 
@@ -20,7 +20,7 @@ FEATURES="sandbox ccache"
 ACCEPT_KEYWORDS="sparc"
 
 # USE settings
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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 slang sdl spell ssl tcpd truetype X xv xml2 xmms xprint zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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 slang sdl spell ssl tcpd truetype 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 cb8cbb4b5ab0..5c83901ef893 100644
--- a/profiles/default-linux/x86/2004.0/make.defaults
+++ b/profiles/default-linux/x86/2004.0/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/x86/2004.0/make.defaults,v 1.6 2004/10/08 16:03:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/make.defaults,v 1.7 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,7 +12,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode foomaticdb 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode foomaticdb 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"
 
 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 a97ec45ec5da..ef4c439883cf 100644
--- a/profiles/default-linux/x86/2004.2/make.defaults
+++ b/profiles/default-linux/x86/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/x86/2004.2/make.defaults,v 1.5 2004/10/08 16:03:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.6 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,7 +12,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 
 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 876651a7f52a..3714cef6557f 100644
--- a/profiles/default-linux/x86/2004.3/make.defaults
+++ b/profiles/default-linux/x86/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/x86/2004.3/make.defaults,v 1.2 2004/10/08 16:03:11 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/make.defaults,v 1.3 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,7 +12,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-linux/x86/gcc2/make.defaults b/profiles/default-linux/x86/gcc2/make.defaults
index bcbff99b6351..2146da240ab1 100644
--- a/profiles/default-linux/x86/gcc2/make.defaults
+++ b/profiles/default-linux/x86/gcc2/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/x86/gcc2/make.defaults,v 1.7 2004/10/13 01:48:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.8 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv" 
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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" 
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-linux/x86/gcc31/make.defaults b/profiles/default-linux/x86/gcc31/make.defaults
index a8d4b5e181fb..db4405546bf9 100644
--- a/profiles/default-linux/x86/gcc31/make.defaults
+++ b/profiles/default-linux/x86/gcc31/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/x86/gcc31/make.defaults,v 1.8 2004/10/13 01:48:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc31/make.defaults,v 1.9 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
-USE="x86 oss apm arts avi berkdb bitmap=fonts crypt cups encode f77 gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap=fonts crypt cups encode f77 gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-linux/x86/xbox/make.defaults b/profiles/default-linux/x86/xbox/make.defaults
index b07ccabea783..b0470a4688c6 100644
--- a/profiles/default-linux/x86/xbox/make.defaults
+++ b/profiles/default-linux/x86/xbox/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/x86/xbox/make.defaults,v 1.1 2004/10/25 12:46:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.2 2004/10/28 19:35:24 spyderous Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -12,7 +12,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 
 ARCH="x86"
 PROFILE_ARCH="xbox"
diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults
index e50b4241d354..0fd8158e3d6d 100644
--- a/profiles/default-mips-1.4/make.defaults
+++ b/profiles/default-mips-1.4/make.defaults
@@ -20,6 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint slang readline gpm berkdb f77 gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline gpm berkdb f77 gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults
index b05318cf1a56..6bd2e3115b66 100644
--- a/profiles/default-mips-2004.1/make.defaults
+++ b/profiles/default-mips-2004.1/make.defaults
@@ -20,6 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults
index b38a026a1550..2288a4f42dfd 100644
--- a/profiles/default-mips64-1.4/make.defaults
+++ b/profiles/default-mips64-1.4/make.defaults
@@ -21,6 +21,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+USE="bitmap-fonts slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults
index 0f9f7d8c36a5..881b38303854 100644
--- a/profiles/default-ppc-1.0/make.defaults
+++ b/profiles/default-ppc-1.0/make.defaults
@@ -20,7 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint oss dvd xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype ppc" 
+USE="bitmap-fonts oss dvd xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype ppc" 
 
 # The following USE should _not_ bet set on ppc as they can cause breakage
 # in some pacakges (are mostly x86 only options)
diff --git a/profiles/default-ppc-1.4/make.defaults b/profiles/default-ppc-1.4/make.defaults
index fe659c9554e9..81ff8b3c0383 100644
--- a/profiles/default-ppc-1.4/make.defaults
+++ b/profiles/default-ppc-1.4/make.defaults
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint oss dvd xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype ppc cups foomaticdb"
+USE="bitmap-fonts oss dvd xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype ppc cups foomaticdb"
 
 # The following USE should _not_ bet set on ppc as they can cause breakage
 # in some pacakges (are mostly x86 only options)
diff --git a/profiles/default-ppc/make.defaults b/profiles/default-ppc/make.defaults
index 5d625e4f277d..8a71fdc4326c 100644
--- a/profiles/default-ppc/make.defaults
+++ b/profiles/default-ppc/make.defaults
@@ -20,6 +20,6 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint oss xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla"
+USE="bitmap-fonts oss xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla"
 
 ACCEPT_KEYWORDS="ppc"
diff --git a/profiles/default-ppc64-2004.1/make.defaults b/profiles/default-ppc64-2004.1/make.defaults
index e9c0edae6166..a393e72f6ff5 100644
--- a/profiles/default-ppc64-2004.1/make.defaults
+++ b/profiles/default-ppc64-2004.1/make.defaults
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint oss dvd xv slang readline gpm f77 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 oss dvd xv slang readline gpm f77 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.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults
index 9f5b4c72ae62..17c9cbd72037 100644
--- a/profiles/default-ppc64-2004.2/make.defaults
+++ b/profiles/default-ppc64-2004.2/make.defaults
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint oss dvd xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype ppc64 cups foomaticdb"
+USE="bitmap-fonts oss dvd xv slang readline f77 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.3/make.defaults b/profiles/default-ppc64-2004.3/make.defaults
index 9f5b4c72ae62..17c9cbd72037 100644
--- a/profiles/default-ppc64-2004.3/make.defaults
+++ b/profiles/default-ppc64-2004.3/make.defaults
@@ -24,7 +24,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint oss dvd xv slang readline f77 gpm berkdb gdbm tcpd pam libwww ssl jpeg nls mitshm perl python gif imlib sdl oggvorbis png truetype ppc64 cups foomaticdb"
+USE="bitmap-fonts oss dvd xv slang readline f77 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-s390-2004.0/make.defaults b/profiles/default-s390-2004.0/make.defaults
index df0e6396def9..9033427073b3 100644
--- a/profiles/default-s390-2004.0/make.defaults
+++ b/profiles/default-s390-2004.0/make.defaults
@@ -23,7 +23,7 @@ CFLAGS=""
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="berkdb bitmap-fonts crypt cups f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype xprint zlib"
+USE="berkdb bitmap-fonts crypt cups f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype zlib"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-s390-2004.1/make.defaults b/profiles/default-s390-2004.1/make.defaults
index df0e6396def9..9033427073b3 100644
--- a/profiles/default-s390-2004.1/make.defaults
+++ b/profiles/default-s390-2004.1/make.defaults
@@ -23,7 +23,7 @@ CFLAGS=""
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="berkdb bitmap-fonts crypt cups f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype xprint zlib"
+USE="berkdb bitmap-fonts crypt cups f77 fbcon foomaticdb gdbm imlib jpeg libwww mikmod motif mad mpeg ncurses nls pam perl png python readline slang spell ssl tcpd truetype zlib"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults
index 6999e346fc01..d2a15df2d09b 100644
--- a/profiles/default-sparc-1.4/make.defaults
+++ b/profiles/default-sparc-1.4/make.defaults
@@ -21,7 +21,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb bitmap-fonts crypt cups 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 xprint xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups 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"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-sparc-2004.0/make.defaults b/profiles/default-sparc-2004.0/make.defaults
index dc46e5c1365a..17412438ef6c 100644
--- a/profiles/default-sparc-2004.0/make.defaults
+++ b/profiles/default-sparc-2004.0/make.defaults
@@ -23,7 +23,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts berkdb bitmap-fonts crypt cups 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 xprint xv zlib"
+USE="arts berkdb bitmap-fonts crypt cups 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"
 
 # The following USE flags are NOT recommended for sparc32 and might cause breakage...
 # mmx, 3dnow, sse, svga, gpm,  
diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults
index 5d2517e86b24..75b60ca20dfc 100644
--- a/profiles/default-sparc64-1.4/make.defaults
+++ b/profiles/default-sparc64-1.4/make.defaults
@@ -25,7 +25,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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 xprint zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/default-sparc64-2004.0/make.defaults b/profiles/default-sparc64-2004.0/make.defaults
index 5d2517e86b24..75b60ca20dfc 100644
--- a/profiles/default-sparc64-2004.0/make.defaults
+++ b/profiles/default-sparc64-2004.0/make.defaults
@@ -25,7 +25,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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 xprint zlib"
+USE="arts avi berkdb bitmap-fonts crypt cups encode esd 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"
 
 
 # The following USE flags are NOT recommended for sparc64 and might cause breakage...
diff --git a/profiles/default-x86-1.4/make.defaults b/profiles/default-x86-1.4/make.defaults
index 34bc78d4a845..4cb3098fb5b6 100644
--- a/profiles/default-x86-1.4/make.defaults
+++ b/profiles/default-x86-1.4/make.defaults
@@ -11,7 +11,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-x86-2004.0/make.defaults b/profiles/default-x86-2004.0/make.defaults
index 34bc78d4a845..4cb3098fb5b6 100644
--- a/profiles/default-x86-2004.0/make.defaults
+++ b/profiles/default-x86-2004.0/make.defaults
@@ -11,7 +11,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults
index fdad045c743c..1cedb1910313 100644
--- a/profiles/default-x86-2004.2/make.defaults
+++ b/profiles/default-x86-2004.2/make.defaults
@@ -11,7 +11,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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 xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode 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"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults
index 33d4e318a32f..cce629875569 100644
--- a/profiles/gcc33-sparc64-1.4/make.defaults
+++ b/profiles/gcc33-sparc64-1.4/make.defaults
@@ -20,7 +20,7 @@ CFLAGS="-O2 -pipe"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd f77 fbcon foomaticdb gdbm gif gtk gnome imlib java jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype X xv xml2 xmms xprint zlib"
+USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd f77 fbcon foomaticdb gdbm gif gtk gnome imlib java jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype X xv xml2 xmms zlib"
 
 
 # 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 ae7d1be61e77..aea6834a1333 100644
--- a/profiles/gcc34-amd64-2004.1/make.defaults
+++ b/profiles/gcc34-amd64-2004.1/make.defaults
@@ -7,7 +7,7 @@
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
 
 
-USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode 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 xprint xv zlib"
+USE="amd64 oss 3dnow apm arts avi berkdb bitmap-fonts crypt -cups encode 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"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
diff --git a/profiles/gcc34-x86-2004.2/make.defaults b/profiles/gcc34-x86-2004.2/make.defaults
index 835fd316e8e9..1e6d4f47590e 100644
--- a/profiles/gcc34-x86-2004.2/make.defaults
+++ b/profiles/gcc34-x86-2004.2/make.defaults
@@ -11,7 +11,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode f77 foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xprint xv zlib"
+USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode f77 foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults
index d008ed4efff6..1b4ba5d359b7 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.6 2004/09/09 08:17:08 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.7 2004/10/28 19:35:25 spyderous Exp $
 
 GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic pie hardened"
 
 # <zhen@gentoo.org> defaults for a hardened system
 # <zhen@gentoo.org> pam added until bug 10135 is fixed
-USE="x86 berkdb bitmap-fonts crypt readline nls ssl tcpd xprint zlib pam pic pie hardened"
+USE="x86 berkdb bitmap-fonts crypt readline nls ssl tcpd zlib pam pic pie hardened"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults
index b0e06304fa44..48609a8bf9d1 100644
--- a/profiles/n32-mips-2004.1/make.defaults
+++ b/profiles/n32-mips-2004.1/make.defaults
@@ -22,7 +22,7 @@ CFLAGS="-O2 -pipe -mabi=n32 -mips4"
 # C++ Compiler flags
 CXXFLAGS=${CFLAGS}
 
-USE="bitmap-fonts xprint slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib"
+USE="bitmap-fonts slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib"
 
 ACCEPT_KEYWORDS="mips ~mips"
 
diff --git a/profiles/xbox-x86-2004.0/make.defaults b/profiles/xbox-x86-2004.0/make.defaults
index 97f4aed04e14..10017ca84b18 100644
--- a/profiles/xbox-x86-2004.0/make.defaults
+++ b/profiles/xbox-x86-2004.0/make.defaults
@@ -11,7 +11,7 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # has a conditional dependency on java (which it does,) then a JDK will be 
 # pulled in during *emerge system*!
 
-USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xprint 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 xv zlib"
 
 ARCH="x86"
 PROFILE_ARCH="xbox"