Removing GRP_STAGE23_USE as it is no longer used anywhere.

27 files changed, 28 insertions, 82 deletions

diff --git a/profiles/default-linux/mips/2004.2/make.defaults b/profiles/default-linux/mips/2004.2/make.defaults
index 65a0f6c197cc..a533b875e316 100644
--- a/profiles/default-linux/mips/2004.2/make.defaults
+++ b/profiles/default-linux/mips/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/mips/2004.2/make.defaults,v 1.6 2005/12/24 16:10:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2004.2/make.defaults,v 1.7 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -15,5 +15,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
-
diff --git a/profiles/default-linux/mips/2005.0/make.defaults b/profiles/default-linux/mips/2005.0/make.defaults
index 92ce6641a8ec..b73f995f8539 100644
--- a/profiles/default-linux/mips/2005.0/make.defaults
+++ b/profiles/default-linux/mips/2005.0/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/mips/2005.0/make.defaults,v 1.2 2005/12/24 16:10:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -15,5 +15,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
-
diff --git a/profiles/default-linux/mips/cobalt/2004.2/make.defaults b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
index fa883215cf53..a6a84d1de455 100644
--- a/profiles/default-linux/mips/cobalt/2004.2/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2004.2/make.defaults,v 1.9 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2004.2/make.defaults,v 1.10 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -24,4 +24,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/cobalt/2005.0/make.defaults b/profiles/default-linux/mips/cobalt/2005.0/make.defaults
index 2f01fdf21b43..3dd5b4725470 100644
--- a/profiles/default-linux/mips/cobalt/2005.0/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2005.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/make.defaults,v 1.2 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -24,4 +24,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/cobalt/2006.0/make.defaults b/profiles/default-linux/mips/cobalt/2006.0/make.defaults
index 287c349cef4d..f7988559488f 100644
--- a/profiles/default-linux/mips/cobalt/2006.0/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2006.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2006.0/make.defaults,v 1.2 2006/01/31 22:52:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -24,4 +24,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/mips64/2004.2/make.defaults b/profiles/default-linux/mips/mips64/2004.2/make.defaults
index bc3817cf5fff..bcdc1b91b442 100644
--- a/profiles/default-linux/mips/mips64/2004.2/make.defaults
+++ b/profiles/default-linux/mips/mips64/2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/make.defaults,v 1.9 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/make.defaults,v 1.10 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -23,5 +23,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-
diff --git a/profiles/default-linux/mips/mips64/2005.0/make.defaults b/profiles/default-linux/mips/mips64/2005.0/make.defaults
index aa48d2193711..cdb17da24235 100644
--- a/profiles/default-linux/mips/mips64/2005.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/2005.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/make.defaults,v 1.2 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -23,5 +23,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-
diff --git a/profiles/default-linux/mips/mips64/2006.0/make.defaults b/profiles/default-linux/mips/mips64/2006.0/make.defaults
index 17ce522e04f8..0b9480b91927 100644
--- a/profiles/default-linux/mips/mips64/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/2006.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2006.0/make.defaults,v 1.2 2006/01/31 22:52:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -23,5 +23,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
-
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults b/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
index de7c7dc4fbcd..4486f1b79b3c 100644
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults,v 1.2 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -21,5 +21,3 @@ CXXFLAGS=${CFLAGS}
 ACCEPT_KEYWORDS="mips"
 
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
-
diff --git a/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults b/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults
index 39afad93a0bd..f0d6b6c510d4 100644
--- a/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults,v 1.2 2006/01/31 22:52:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -22,5 +22,3 @@ ACCEPT_KEYWORDS="mips"
 
 STAGE1_USE="ip28"
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
-GRP_STAGE23_USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip28"
-
diff --git a/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults b/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults
index fc746e51f8a6..5b90246b4084 100644
--- a/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults
+++ b/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults
@@ -1,10 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults,v 1.2 2005/12/24 16:10:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2005.1/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
-STAGE1_USE=""
-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 png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
+USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales 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
diff --git a/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults b/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults
index abed3df9a2d2..a87a7d2a9ff9 100644
--- a/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults,v 1.3 2006/01/31 22:52:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/multilib/2006.0/make.defaults,v 1.4 2006/02/01 13:41:15 wolf31o2 Exp $
 
-GRP_STAGE23_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 png xml acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xrandr xv"
+USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses readline zlib -java bitmap-fonts truetype-fonts type1-fonts oss alsa crypt fortran f77 jpeg nls userlocales png xml 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
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
index 435b9e5ba438..b75ec474a68e 100644
--- a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults,v 1.11 2005/04/26 18:50:02 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults,v 1.12 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -26,5 +26,3 @@ ACCEPT_KEYWORDS="mips ~mips"
 
 STAGE1_USE="n32"
 USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-GRP_STAGE23_USE="${STAGE1_USE} readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults b/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
index 1edef7590817..0db987c50eab 100644
--- a/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults,v 1.3 2005/04/26 18:50:02 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults,v 1.4 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -26,5 +26,3 @@ ACCEPT_KEYWORDS="mips ~mips"
 
 STAGE1_USE="n32"
 USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-GRP_STAGE23_USE="${STAGE1_USE} readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-
diff --git a/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults b/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults
index 083f192e633b..9c13ec4bb986 100644
--- a/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults,v 1.2 2006/01/31 22:52:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2006.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
 
 ARCH="mips"
 
@@ -26,5 +26,3 @@ ACCEPT_KEYWORDS="mips ~mips"
 
 STAGE1_USE="n32"
 USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-GRP_STAGE23_USE="${STAGE1_USE} readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
-
diff --git a/profiles/default-linux/s390/2004.3/make.defaults b/profiles/default-linux/s390/2004.3/make.defaults
index ca2576d2f842..3e2c3c77d47f 100644
--- a/profiles/default-linux/s390/2004.3/make.defaults
+++ b/profiles/default-linux/s390/2004.3/make.defaults
@@ -1,5 +1,3 @@
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-
 USE="
 bitmap-fonts
 foomaticdb
diff --git a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
index 4d473197d621..5a68b2fd0d64 100644
--- a/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2004.3/make.defaults
@@ -1,7 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.6 2005/03/09 00:35:07 vapier Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2004.3/make.defaults,v 1.7 2006/02/01 13:43:49 wolf31o2 Exp $
 
 USE="arts berkdb bitmap-fonts crypt cups dlloader fortran fbcon font-server 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 truetype-fonts type1-fonts X xv zlib"
diff --git a/profiles/default-linux/sparc/sparc32/2005.0/make.defaults b/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
index 41b2091fe20d..93e2d96bb817 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2005.0/make.defaults
@@ -1,7 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/make.defaults,v 1.6 2005/03/14 15:12:27 gustavoz Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/make.defaults,v 1.7 2006/02/01 13:43:49 wolf31o2 Exp $
 
 USE="arts berkdb bitmap-fonts crypt cups dlloader fortran fbcon foomaticdb gdbm gif 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 truetype-fonts type1-fonts X xv zlib"
diff --git a/profiles/default-linux/sparc/sparc32/2005.1/make.defaults b/profiles/default-linux/sparc/sparc32/2005.1/make.defaults
index 91fc1eaf55e1..65ec3d34728c 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/2005.1/make.defaults
@@ -1,7 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/make.defaults,v 1.2 2005/08/01 22:54:06 wolf31o2 Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/make.defaults,v 1.3 2006/02/01 13:43:49 wolf31o2 Exp $
 
 USE="arts berkdb bitmap-fonts crypt cups dlloader eds fortran fbcon foomaticdb gdbm gif gstreamer 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 truetype-fonts type1-fonts X xv zlib"
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
index 4b9398d7a4c3..669077b3fbc8 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
@@ -1,9 +1,6 @@
 # Copyright 1999-2005 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.13 2005/03/30 19:20:22 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.14 2006/02/01 13:43:49 wolf31o2 Exp $
 
 # USE settings
 USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran fbcon font-server 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 sdl spell ssl tcpd truetype truetype-fonts type1-fonts 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/sparc/sparc64/2005.0/make.defaults b/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
index 171b90f1e1f7..d11441c8603b 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2005.0/make.defaults
@@ -1,9 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/make.defaults,v 1.5 2005/03/30 19:13:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/make.defaults,v 1.6 2006/02/01 13:43:49 wolf31o2 Exp $
 
 # USE settings
 USE="arts avi berkdb bitmap-fonts crypt cups dlloader encode esd fortran 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 sdl spell ssl tcpd truetype truetype-fonts type1-fonts 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/sparc/sparc64/2005.1/make.defaults b/profiles/default-linux/sparc/sparc64/2005.1/make.defaults
index c68b87929722..89be5d75bf68 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2005.1/make.defaults
@@ -1,9 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/make.defaults,v 1.2 2005/08/01 22:54:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/make.defaults,v 1.3 2006/02/01 13:43:49 wolf31o2 Exp $
 
 # USE settings
 USE="arts avi berkdb bitmap-fonts crypt cups dlloader eds encode esd fortran fbcon foomaticdb gdbm gcc64 gif gstreamer gtk gtk2 gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls ogg oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype truetype-fonts type1-fonts vorbis 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/sparc/sparc64/server/make.defaults b/profiles/default-linux/sparc/sparc64/server/make.defaults
index 7abe4829755c..a2c2166451de 100644
--- a/profiles/default-linux/sparc/sparc64/server/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/server/make.defaults
@@ -1,9 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/make.defaults,v 1.1 2005/03/30 19:38:57 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/server/make.defaults,v 1.2 2006/02/01 13:43:49 wolf31o2 Exp $
 
 # USE settings
 USE="acl apache2 berkdb crypt gdbm gcc64 ncurses nls pam perl python readline spell ssl tcpd xml xml2 zlib"
-
-# Catalyst stage/grp USE
-GRP_STAGE23_USE="acl apache2 berkdb crypt gdbm gcc64 ncurses nls pam perl python readline ssl tcpd xml xml2 zlib"
diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults
index a761e1f4c903..b358aa819c87 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults
+++ b/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults
@@ -1,7 +1,5 @@
 # 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/gcc34/2.6/make.defaults,v 1.8 2005/02/18 03:46:39 ribosome Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults,v 1.9 2006/02/01 13:45:48 wolf31o2 Exp $
 
 USE="oss apm arts avi berkdb crypt cups emboss encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.2/gcc34/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/make.defaults
index 283659b13e09..9bcaf2044f7e 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/make.defaults
+++ b/profiles/default-linux/x86/2004.2/gcc34/make.defaults
@@ -1,7 +1,5 @@
 # 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/gcc34/make.defaults,v 1.10 2005/02/18 03:46:39 ribosome Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/gcc34/make.defaults,v 1.11 2006/02/01 13:45:48 wolf31o2 Exp $
 
 USE="oss apm arts avi berkdb crypt cups emboss encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/2004.2/make.defaults b/profiles/default-linux/x86/2004.2/make.defaults
index 8b6b0e6ef759..b071cc8a3d4c 100644
--- a/profiles/default-linux/x86/2004.2/make.defaults
+++ b/profiles/default-linux/x86/2004.2/make.defaults
@@ -1,7 +1,5 @@
 # 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/2004.2/make.defaults,v 1.15 2005/03/09 00:35:07 vapier Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.16 2006/02/01 13:45:48 wolf31o2 Exp $
 
 USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server foomaticdb gdbm gif gnome gpm gtk gtk2 imlib ipv6 jpeg kde libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib perl png python qt quicktime readline sdl slang spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
diff --git a/profiles/default-linux/x86/xbox/make.defaults b/profiles/default-linux/x86/xbox/make.defaults
index 052354ecd1f2..be2a4da9b881 100644
--- a/profiles/default-linux/x86/xbox/make.defaults
+++ b/profiles/default-linux/x86/xbox/make.defaults
@@ -1,8 +1,6 @@
 # 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/xbox/make.defaults,v 1.9 2005/03/09 00:35:07 vapier Exp $
-
-GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.10 2006/02/01 13:45:48 wolf31o2 Exp $
 
 USE="oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran font-server 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 truetype-fonts type1-fonts X xml2 xmms xv zlib"