Moved GRP_STAGE23_USE and USE to make.defaults from sub-profiles to ease administration.

3 files changed, 10 insertions, 12 deletions

diff --git a/profiles/default-linux/amd64/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index 00200eaa1d1d..e6d4474c0762 100644
--- a/profiles/default-linux/amd64/2004.3/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/make.defaults
@@ -1,16 +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/amd64/2004.3/make.defaults,v 1.16 2005/02/01 18:48:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.17 2005/03/05 16:41:02 wolf31o2 Exp $
 
 # GCC 3.4.2 has multilib enabled by default, but we still need multilib in USE
 # for compatibility. also, without this we might actually fail to build stages.
 STAGE1_USE="multilib"
 
-GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java -nptl"
-
-# Sane, functional, almost-but-not-quite-minimal default for USE
-USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts font-server oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
-
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox autoconfig"
 
diff --git a/profiles/default-linux/amd64/2005.0/make.defaults b/profiles/default-linux/amd64/2005.0/make.defaults
index 6e274563aff6..24397fb1bd1f 100644
--- a/profiles/default-linux/amd64/2005.0/make.defaults
+++ b/profiles/default-linux/amd64/2005.0/make.defaults
@@ -1,13 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/make.defaults,v 1.10 2005/03/03 14:27:05 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/make.defaults,v 1.11 2005/03/05 16:41:02 wolf31o2 Exp $
 
-#removed because managers vote requires us to do so("when we go nptl, we all go nptl")
+#removed because managers vote requires us to do so
+#("when we go nptl, we all go nptl")
 #STAGE1_USE="nptl -nptlonly"
 
-GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java"
-USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
-
 # This profile doesn't fully support multilib portage yet.  We still rely
 # on the emul-* packages.  As such, we have -multilib-pkg here to emphasise
 # that point.
diff --git a/profiles/default-linux/amd64/make.defaults b/profiles/default-linux/amd64/make.defaults
index 5604b6135c73..b32c66b4b288 100644
--- a/profiles/default-linux/amd64/make.defaults
+++ b/profiles/default-linux/amd64/make.defaults
@@ -1,6 +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/amd64/make.defaults,v 1.4 2005/01/23 11:15:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.5 2005/03/05 16:41:02 wolf31o2 Exp $
+
+GRP_STAGE23_USE="${STAGE1_USE} ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java"
+
+# Sane, functional, almost-but-not-quite-minimal default for USE
+USE="${GRP_STAGE23_USE} bitmap-fonts truetype-fonts type1-fonts font-server oss alsa crypt fortran f77 jpeg mp3 nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"