summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-08-25 13:58:06 +0000
committerMike Frysinger <vapier@gentoo.org>2004-08-25 13:58:06 +0000
commit6c7c97bf65b00df8d8301a95e7094a3fae9b3795 (patch)
tree7900458118677a288423df03300cd7dfbb95440f /profiles
parentgoodbye $COMPILER (Manifest recommit) (diff)
downloadgentoo-2-6c7c97bf65b00df8d8301a95e7094a3fae9b3795.tar.gz
gentoo-2-6c7c97bf65b00df8d8301a95e7094a3fae9b3795.tar.bz2
gentoo-2-6c7c97bf65b00df8d8301a95e7094a3fae9b3795.zip
sync headers and punt $COMPILER
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default-linux/alpha/2004.0/make.defaults12
-rw-r--r--profiles/default-linux/amd64/2004.0/make.defaults13
-rw-r--r--profiles/default-linux/amd64/2004.1/make.defaults13
-rw-r--r--profiles/default-linux/amd64/gcc34-2004.2/make.defaults12
-rw-r--r--profiles/default-linux/arm/2004.0/make.defaults8
-rw-r--r--profiles/default-linux/hppa/2004.2/make.defaults8
-rw-r--r--profiles/default-linux/ppc/1.0/make.defaults6
-rw-r--r--profiles/default-linux/ppc/1.0_rc/make.defaults6
-rw-r--r--profiles/default-linux/ppc/1.2/make.defaults6
-rw-r--r--profiles/default-linux/ppc/1.4/make.defaults9
-rw-r--r--profiles/default-linux/ppc/2004.0/make.defaults8
-rw-r--r--profiles/default-linux/ppc/2004.1/make.defaults8
-rw-r--r--profiles/default-linux/ppc/2004.2/make.defaults8
-rw-r--r--profiles/default-linux/sparc/sparc32/make.defaults8
-rw-r--r--profiles/default-linux/x86/2004.0/make.defaults16
-rw-r--r--profiles/default-linux/x86/2004.2/gcc34/make.defaults12
-rw-r--r--profiles/default-linux/x86/2004.2/make.defaults16
-rw-r--r--profiles/default-linux/x86/gcc2/make.defaults11
-rw-r--r--profiles/default-linux/x86/gcc31/make.defaults13
19 files changed, 108 insertions, 85 deletions
diff --git a/profiles/default-linux/alpha/2004.0/make.defaults b/profiles/default-linux/alpha/2004.0/make.defaults
index dc6a1cd82ce6..2fbcd37a633f 100644
--- a/profiles/default-linux/alpha/2004.0/make.defaults
+++ b/profiles/default-linux/alpha/2004.0/make.defaults
@@ -1,8 +1,9 @@
-# Copyright 2004 Gentoo Foundation.
-# System-wide defaults for the Portage system on alpha
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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.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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -61,5 +62,4 @@ zlib
"
ARCH="alpha"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="alpha"
diff --git a/profiles/default-linux/amd64/2004.0/make.defaults b/profiles/default-linux/amd64/2004.0/make.defaults
index e1aed30bbc06..d18df552fa87 100644
--- a/profiles/default-linux/amd64/2004.0/make.defaults
+++ b/profiles/default-linux/amd64/2004.0/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 2002 Gentoo Foundation.
-# System-wide defaults for the gcc 3.3 Portage system
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.0/make.defaults,v 1.4 2004/07/09 19:29:26 lv Exp $
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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.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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
@@ -14,7 +14,6 @@ opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl
tcpd truetype X xml2 xmms xv zlib"
ARCH="amd64"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="amd64"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
diff --git a/profiles/default-linux/amd64/2004.1/make.defaults b/profiles/default-linux/amd64/2004.1/make.defaults
index 5ae8f9e1f795..a2592678cc33 100644
--- a/profiles/default-linux/amd64/2004.1/make.defaults
+++ b/profiles/default-linux/amd64/2004.1/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 2002 Gentoo Foundation.
-# System-wide defaults for the gcc 3.3 Portage system
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2004.1/make.defaults,v 1.4 2004/07/09 19:29:26 lv Exp $
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
@@ -14,7 +14,6 @@ opengl pam pdflib png python -qt quicktime readline sdl slang spell sse ssl
tcpd truetype X xml2 xmms xv zlib"
ARCH="amd64"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="amd64"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
diff --git a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
index 9b18c5fb5b24..b02760bc592c 100644
--- a/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
+++ b/profiles/default-linux/amd64/gcc34-2004.2/make.defaults
@@ -1,8 +1,9 @@
-# Copyright 2002 Gentoo Foundation.
-# System-wide defaults for the gcc 3.3 Portage system
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses -java -nptl"
@@ -10,7 +11,6 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
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"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="amd64"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
diff --git a/profiles/default-linux/arm/2004.0/make.defaults b/profiles/default-linux/arm/2004.0/make.defaults
index a57083e6625b..395628d9f749 100644
--- a/profiles/default-linux/arm/2004.0/make.defaults
+++ b/profiles/default-linux/arm/2004.0/make.defaults
@@ -1,7 +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/arm/2004.0/make.defaults,v 1.3 2004/08/25 13:58:05 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
+
USE="arm crypt ncurses readline ssl zlib"
ARCH="arm"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="arm"
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/hppa/2004.2/make.defaults b/profiles/default-linux/hppa/2004.2/make.defaults
index c12c79b8731f..d7b0df95932b 100644
--- a/profiles/default-linux/hppa/2004.2/make.defaults
+++ b/profiles/default-linux/hppa/2004.2/make.defaults
@@ -1,3 +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/hppa/2004.2/make.defaults,v 1.2 2004/08/25 13:58:05 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
+
# System-wide defaults for the Portage system
USE="
@@ -48,7 +55,6 @@ zlib
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
ARCH="hppa"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="hppa"
FEATURES="sandbox sfperms strict"
diff --git a/profiles/default-linux/ppc/1.0/make.defaults b/profiles/default-linux/ppc/1.0/make.defaults
index cc1446f02fa2..bc0106e74929 100644
--- a/profiles/default-linux/ppc/1.0/make.defaults
+++ b/profiles/default-linux/ppc/1.0/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
ARCH="ppc"
diff --git a/profiles/default-linux/ppc/1.0_rc/make.defaults b/profiles/default-linux/ppc/1.0_rc/make.defaults
index 7ae41a55f24d..c7fcaf774ce9 100644
--- a/profiles/default-linux/ppc/1.0_rc/make.defaults
+++ b/profiles/default-linux/ppc/1.0_rc/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
ARCH="ppc"
diff --git a/profiles/default-linux/ppc/1.2/make.defaults b/profiles/default-linux/ppc/1.2/make.defaults
index cc1446f02fa2..36d24cb97d81 100644
--- a/profiles/default-linux/ppc/1.2/make.defaults
+++ b/profiles/default-linux/ppc/1.2/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
ARCH="ppc"
diff --git a/profiles/default-linux/ppc/1.4/make.defaults b/profiles/default-linux/ppc/1.4/make.defaults
index 018ae49554c9..b74f086997f6 100644
--- a/profiles/default-linux/ppc/1.4/make.defaults
+++ b/profiles/default-linux/ppc/1.4/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -17,7 +21,6 @@ MAKEOPTS="-j2"
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}
@@ -32,6 +35,4 @@ motif opengl mozilla png truetype ppc cups foomaticdb"
ACCEPT_KEYWORDS="ppc"
-COMPILER="gcc3"
-
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index 2b94cfb4ecf0..525aeda4f5f6 100644
--- a/profiles/default-linux/ppc/2004.0/make.defaults
+++ b/profiles/default-linux/ppc/2004.0/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -32,6 +36,4 @@ motif opengl mozilla png truetype ppc cups foomaticdb"
ACCEPT_KEYWORDS="ppc"
-COMPILER="gcc3"
-
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.1/make.defaults b/profiles/default-linux/ppc/2004.1/make.defaults
index 2b94cfb4ecf0..0a446a65b74d 100644
--- a/profiles/default-linux/ppc/2004.1/make.defaults
+++ b/profiles/default-linux/ppc/2004.1/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -32,6 +36,4 @@ motif opengl mozilla png truetype ppc cups foomaticdb"
ACCEPT_KEYWORDS="ppc"
-COMPILER="gcc3"
-
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.2/make.defaults b/profiles/default-linux/ppc/2004.2/make.defaults
index 2b94cfb4ecf0..080652f4e4a3 100644
--- a/profiles/default-linux/ppc/2004.2/make.defaults
+++ b/profiles/default-linux/ppc/2004.2/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2000 Daniel Robbins, Gentoo Foundation.
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -32,6 +36,4 @@ motif opengl mozilla png truetype ppc cups foomaticdb"
ACCEPT_KEYWORDS="ppc"
-COMPILER="gcc3"
-
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/sparc/sparc32/make.defaults b/profiles/default-linux/sparc/sparc32/make.defaults
index 65255fbe89eb..ab7fdd33bb19 100644
--- a/profiles/default-linux/sparc/sparc32/make.defaults
+++ b/profiles/default-linux/sparc/sparc32/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 2002 Gentoo Foundation.
+# 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
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -29,7 +33,5 @@ USE="arts berkdb crypt cups fbcon foomaticdb gdbm gtk gtk2 imlib jpeg kde gnome
# The following USE flags are NOT recommended for sparc32 and might cause breakage...
# mmx, 3dnow, sse, svga, gpm,
-COMPILER="gcc3"
-
ACCEPT_KEYWORDS="sparc"
diff --git a/profiles/default-linux/x86/2004.0/make.defaults b/profiles/default-linux/x86/2004.0/make.defaults
index d4a291b9215e..07351cd21344 100644
--- a/profiles/default-linux/x86/2004.0/make.defaults
+++ b/profiles/default-linux/x86/2004.0/make.defaults
@@ -1,12 +1,9 @@
-# Copyright 2002 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.3 2004/08/03 04:39:47 vapier Exp $
-
-# System-wide defaults for the gcc 3.2 Portage system (2004.0)
-
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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.4 2004/08/25 13:58:05 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -21,7 +18,6 @@ opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
svga tcpd truetype X xml2 xmms xv zlib"
ARCH="x86"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="x86"
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/x86/2004.2/gcc34/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/make.defaults
index c49a0dfac988..24e22451d7ce 100644
--- a/profiles/default-linux/x86/2004.2/gcc34/make.defaults
+++ b/profiles/default-linux/x86/2004.2/gcc34/make.defaults
@@ -1,8 +1,9 @@
-# Copyright 2002-2004 Gentoo Foundation.
-# System-wide defaults for the >=gcc 3.2 Portage system
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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.2 2004/08/25 13:58:06 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -14,7 +15,6 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
USE="x86 oss apm arts avi berkdb crypt cups 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"
ARCH="x86"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="x86"
CFLAGS="-O2 -pipe"
CXXFLAGS="${CFLAGS}"
diff --git a/profiles/default-linux/x86/2004.2/make.defaults b/profiles/default-linux/x86/2004.2/make.defaults
index 6621b3108b4b..d34cdb44ab0a 100644
--- a/profiles/default-linux/x86/2004.2/make.defaults
+++ b/profiles/default-linux/x86/2004.2/make.defaults
@@ -1,12 +1,9 @@
-# Copyright 2002 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.2 2004/08/03 04:39:47 vapier Exp $
-
-# System-wide defaults for the gcc 3.2 Portage system (2004.0)
-
-
-#Experimental: trying to use these USE variables to build up from stage 2->3
-#thus eliminating the inherent fragility of using USE for this
+# 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.3 2004/08/25 13:58:05 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
@@ -21,7 +18,6 @@ opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
svga tcpd truetype X xml2 xmms xv zlib"
ARCH="x86"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="x86"
FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/x86/gcc2/make.defaults b/profiles/default-linux/x86/gcc2/make.defaults
index 4ad45003fe20..fea11a9d6476 100644
--- a/profiles/default-linux/x86/gcc2/make.defaults
+++ b/profiles/default-linux/x86/gcc2/make.defaults
@@ -1,8 +1,9 @@
-# Copyright 2000 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.3 2004/08/03 04:39:47 vapier Exp $
-
-# System-wide defaults for the Portage system (1.0)
+# 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.4 2004/08/25 13:58:06 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
USE="x86 oss 3dnow apm arts avi berkdb crypt cups encode gdbm gif gpm gtk imlib
java jpeg kde libg++ libwww mikmod mmx motif mpeg ncurses nls
diff --git a/profiles/default-linux/x86/gcc31/make.defaults b/profiles/default-linux/x86/gcc31/make.defaults
index 74bb05e7f552..1beeb0ef3bf9 100644
--- a/profiles/default-linux/x86/gcc31/make.defaults
+++ b/profiles/default-linux/x86/gcc31/make.defaults
@@ -1,9 +1,9 @@
-# Copyright 2002 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.4 2004/08/14 13:43:26 swegener Exp $
-
-# System-wide defaults for the gcc 3 Portage system (1.0)
-
+# 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.5 2004/08/25 13:58:06 vapier Exp $
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
USE="x86 oss 3dnow apm arts avi berkdb crypt cups encode gdbm gif gpm gtk imlib
java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis
@@ -11,7 +11,6 @@ opengl pam pdflib png python qt quicktime readline sdl slang spell ssl
svga tcpd truetype X xml2 xmms xv zlib"
ARCH="x86"
-COMPILER="gcc3"
ACCEPT_KEYWORDS="x86"
FEATURES="sandbox sfperms"