remove variables that dont belong in profile

14 files changed, 14 insertions, 244 deletions

diff --git a/profiles/default-linux/amd64/2004.1/make.defaults b/profiles/default-linux/amd64/2004.1/make.defaults
index a2592678cc33..e1c188cef78e 100644
--- a/profiles/default-linux/amd64/2004.1/make.defaults
+++ b/profiles/default-linux/amd64/2004.1/make.defaults
@@ -1,13 +1,9 @@
 # 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.1/make.defaults,v 1.5 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.1/make.defaults,v 1.6 2004/09/09 13:00:25 vapier Exp $
 
 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
@@ -15,9 +11,6 @@ tcpd truetype X xml2 xmms xv zlib"
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="amd64"
-CFLAGS="-O2 -pipe"
-CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
 
 # not having a 32bit sandbox breaks too much right now, and we cant even be
 # sure the user has a 32bit sandbox! it only gets installed if you add multilib
diff --git a/profiles/default-linux/amd64/2004.3/lib64/make.defaults b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
index 160c3e749d60..5fd67385ecda 100644
--- a/profiles/default-linux/amd64/2004.3/lib64/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/lib64/make.defaults
@@ -1,9 +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.2 2004/09/09 07:07:25 lv Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/lib64/make.defaults,v 1.3 2004/09/09 13:00:25 vapier Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -15,12 +12,7 @@ GRP_STAGE23_USE="${ARCH} ipv6 pam tcpd readline nls ssl gpm perl python berkdb a
 # Sane, functional, almost-but-not-quite-minimal default for USE
 USE="${GRP_STAGE23_USE} oss alsa crypt jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xprint xrandr xv"
 
-# unfortunately, gcc doesnt provide us with an -march=x86_64.
-CFLAGS="-O2 -pipe -march=k8"
-CXXFLAGS="${CFLAGS}"
-
 ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
 
 # currently theoretical multilib stuff only available if using portage 2.0.51
 CHOST32="i686-pc-linux-gnu"
@@ -33,4 +25,3 @@ CPP32="g++32"
 
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox"
-
diff --git a/profiles/default-linux/amd64/2004.3/make.defaults b/profiles/default-linux/amd64/2004.3/make.defaults
index 9fb12d4cff82..aae04ee4a725 100644
--- a/profiles/default-linux/amd64/2004.3/make.defaults
+++ b/profiles/default-linux/amd64/2004.3/make.defaults
@@ -1,9 +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.2 2004/09/09 07:07:25 lv Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.3/make.defaults,v 1.3 2004/09/09 13:00:25 vapier Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -15,12 +12,7 @@ GRP_STAGE23_USE="${ARCH} ipv6 pam tcpd readline nls ssl gpm perl python berkdb a
 # Sane, functional, almost-but-not-quite-minimal default for USE
 USE="${GRP_STAGE23_USE} oss alsa crypt jpeg nls userlocales opengl png xml2 acpi gif jp2 lzw lzw-tiff png tiff truetype usb xpm xprint xrandr xv"
 
-# unfortunately, gcc doesnt provide us with an -march=x86_64.
-CFLAGS="-O2 -pipe -march=k8"
-CXXFLAGS="${CFLAGS}"
-
 ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
 
 # currently theoretical multilib stuff only available if using portage 2.0.51
 CHOST32="i686-pc-linux-gnu"
@@ -35,4 +27,3 @@ CPP32="g++32"
 
 # we can enable sandbox now that we use multilib by default
 FEATURES="sandbox"
-
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
index b02760bc592c..f48b82f5fd1a 100644
--- a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
+++ b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
@@ -1,20 +1,13 @@
 # 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.3 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/gcc34-2004.2/make.defaults,v 1.4 2004/09/09 13:00:25 vapier Exp $
 
 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 -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"
-CFLAGS="-O2 -pipe"
-CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
 
 # not having a 32bit sandbox breaks too much right now, and we cant even be
 # sure the user has a 32bit sandbox! it only gets installed if you add multilib
diff --git a/profiles/default-linux/ppc/1.0/make.defaults b/profiles/default-linux/ppc/1.0/make.defaults
index bc0106e74929..dae1ea8b67e7 100644
--- a/profiles/default-linux/ppc/1.0/make.defaults
+++ b/profiles/default-linux/ppc/1.0/make.defaults
@@ -1,37 +1,13 @@
 # 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/1.0/make.defaults,v 1.4 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/make.defaults,v 1.5 2004/09/09 12:58:03 vapier Exp $
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
 
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse nas
-
 ACCEPT_KEYWORDS="ppc"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/1.0_rc/make.defaults b/profiles/default-linux/ppc/1.0_rc/make.defaults
index c7fcaf774ce9..8b387e07e232 100644
--- a/profiles/default-linux/ppc/1.0_rc/make.defaults
+++ b/profiles/default-linux/ppc/1.0_rc/make.defaults
@@ -1,29 +1,9 @@
 # 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/1.0_rc/make.defaults,v 1.4 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/make.defaults,v 1.5 2004/09/09 12:58:03 vapier Exp $
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
diff --git a/profiles/default-linux/ppc/1.2/make.defaults b/profiles/default-linux/ppc/1.2/make.defaults
index 36d24cb97d81..234c74a3d88f 100644
--- a/profiles/default-linux/ppc/1.2/make.defaults
+++ b/profiles/default-linux/ppc/1.2/make.defaults
@@ -1,37 +1,13 @@
 # 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/1.2/make.defaults,v 1.4 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/make.defaults,v 1.5 2004/09/09 12:58:03 vapier Exp $
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
 
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse nas
-
 ACCEPT_KEYWORDS="ppc"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/1.4/make.defaults b/profiles/default-linux/ppc/1.4/make.defaults
index b74f086997f6..5e63afedda80 100644
--- a/profiles/default-linux/ppc/1.4/make.defaults
+++ b/profiles/default-linux/ppc/1.4/make.defaults
@@ -1,38 +1,15 @@
 # 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/1.4/make.defaults,v 1.4 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/make.defaults,v 1.5 2004/09/09 12:58:03 vapier Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-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"
 
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
-
 ACCEPT_KEYWORDS="ppc"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index 525aeda4f5f6..65bc0aee3558 100644
--- a/profiles/default-linux/ppc/2004.0/make.defaults
+++ b/profiles/default-linux/ppc/2004.0/make.defaults
@@ -1,39 +1,15 @@
 # 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.5 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.6 2004/09/09 12:58:03 vapier Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
 
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
-
 ACCEPT_KEYWORDS="ppc"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.1/make.defaults b/profiles/default-linux/ppc/2004.1/make.defaults
index 0a446a65b74d..dfdc781632c4 100644
--- a/profiles/default-linux/ppc/2004.1/make.defaults
+++ b/profiles/default-linux/ppc/2004.1/make.defaults
@@ -1,39 +1,15 @@
 # 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.5 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.6 2004/09/09 12:58:03 vapier Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
 
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
-
 ACCEPT_KEYWORDS="ppc"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.2/make.defaults b/profiles/default-linux/ppc/2004.2/make.defaults
index 080652f4e4a3..894c01403e65 100644
--- a/profiles/default-linux/ppc/2004.2/make.defaults
+++ b/profiles/default-linux/ppc/2004.2/make.defaults
@@ -1,39 +1,15 @@
 # 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.5 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.6 2004/09/09 12:58:03 vapier Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
 ARCH="ppc"
 
-# Host-type
-
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
 
-# The following USE should _not_ bet set on ppc as they can cause breakage
-# in some pacakges (are mostly x86 only options)
-# 3dfx 3dnow avi icc icc-pgo mmx svga sse
-
 ACCEPT_KEYWORDS="ppc"
 
 FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/sparc/sparc32/make.defaults b/profiles/default-linux/sparc/sparc32/make.defaults
index ab7fdd33bb19..28800b3d6152 100644
--- a/profiles/default-linux/sparc/sparc32/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/make.defaults
@@ -1,37 +1,14 @@
 # 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.3 2004/08/25 13:58:05 vapier Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/make.defaults,v 1.4 2004/09/09 13:00:25 vapier Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
 ARCH="sparc"
 
-# Host type
-
-CHOST=sparc-unknown-linux-gnu
-PLATFORM=sparc-unknown-linux-gnu
 PROFILE_ARCH="sparc"
 
-# Options passed to make during the build process
-MAKEOPTS="-j2"
-
-# Fetching command (5 tries, passive ftp for firewall compatibility)
-FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
-# Global configure options
-
-# C Compiler flags
-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"
 
-# The following USE flags are NOT recommended for sparc32 and might cause breakage...
-# mmx, 3dnow, sse, svga, gpm,  
-
 ACCEPT_KEYWORDS="sparc"
-
diff --git a/profiles/selinux/2004.1/ppc/make.defaults b/profiles/selinux/2004.1/ppc/make.defaults
index 4a93b90b1bbb..7dd6eea5bf7f 100644
--- a/profiles/selinux/2004.1/ppc/make.defaults
+++ b/profiles/selinux/2004.1/ppc/make.defaults
@@ -1,14 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/make.defaults,v 1.6 2004/08/25 14:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/ppc/make.defaults,v 1.7 2004/09/09 13:01:36 vapier Exp $
 
 ARCH="ppc"
-CHOST=powerpc-unknown-linux-gnu
-PLATFORM=$CHOST
-MAKEOPTS="-j2"
-
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
 
 USE="ppc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
 GRP_STAGE23_USE="ppc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
diff --git a/profiles/selinux/2004.1/sparc64/make.defaults b/profiles/selinux/2004.1/sparc64/make.defaults
index 997c00bb835f..8f1b33ef7356 100644
--- a/profiles/selinux/2004.1/sparc64/make.defaults
+++ b/profiles/selinux/2004.1/sparc64/make.defaults
@@ -1,17 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/make.defaults,v 1.7 2004/08/25 14:03:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2004.1/sparc64/make.defaults,v 1.8 2004/09/09 13:01:36 vapier Exp $
 
 ARCH="sparc"
 
-# Host type
-CHOST=sparc-unknown-linux-gnu
-PLATFORM=sparc64-unknown-linux-gnu
 PROFILE_ARCH="sparc64"
 
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
-
 USE="sparc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"
 GRP_STAGE23_USE="sparc berkdb crypt ncurses pam python readline selinux ssl tcpd zlib"