Moved GRP_STAGE23_USE and USE from 2005.0/make.defaults to make.defaults.

2 files changed, 3 insertions, 63 deletions

diff --git a/profiles/default-linux/x86/2005.0/make.defaults b/profiles/default-linux/x86/2005.0/make.defaults
deleted file mode 100644
index 723508d4bfca..000000000000
--- a/profiles/default-linux/x86/2005.0/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/make.defaults,v 1.7 2005/02/18 03:46:39 ribosome Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
-
-USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/make.defaults b/profiles/default-linux/x86/make.defaults
index e213f4ea959c..39daac9b7dde 100644
--- a/profiles/default-linux/x86/make.defaults
+++ b/profiles/default-linux/x86/make.defaults
@@ -1,63 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.2 2005/01/12 16:45:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.3 2005/03/05 17:32:07 wolf31o2 Exp $
 
-GRP_STAGE23_USE="
-berkdb
-gpm
-ipv6
-ncurses
-nls
-pam
-perl
-python
-readline
-ssl
-tcpd
-"
+GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-# Please avoid enabling things by default in here if possible.  Understand 
-# any implications with core packages.  For example, if "java" is in USE and 
-# db  has a conditional dependency on java (which it does,) then a JDK will be 
-# pulled in during *emerge system*!
-
-USE="${GRP_STAGE23_USE}
-apm
-arts
-avi
-berkdb
-crypt
-cups
-encode
-foomaticdb
-fortran
-gdbm
-gif
-gnome gtk gtk2
-gpm
-jpeg
-kde qt
-libwww
-mad
-mikmod
-motif
-mpeg
-oggvorbis
-opengl
-pdflib 
-png
-quicktime
-oss
-sdl
-spell
-svga
-truetype
-X
-xml2
-xmms
-xv
-zlib
-"
+USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mp3 mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"