Make better use of cascading profiles.

diff --git a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
index b53ead9f70e8c7bcf0fa3be856367d50d40f2ded..4af9fa170c2f42bca72c58b9bacc4810aa2a3386 100644 (file)
--- a/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.2/make.defaults
@@ -1,17 +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/sparc/sparc64/2004.2/make.defaults,v 1.8 2004/12/30 22:05:57 eradicator Exp $
-
-ARCH="sparc"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
-CHOST="sparc-unknown-linux-gnu"
-
-# What ctargets do we want from binutils
-CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"
-
-# Used in ebuilds for verifying sparc64 profile
-PROFILE_ARCH="sparc64"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/make.defaults,v 1.9 2004/12/31 10:29:28 eradicator Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -19,7 +8,6 @@ CXXFLAGS=${CFLAGS}
 
 # Misc
 FEATURES="sandbox ccache"
-ACCEPT_KEYWORDS="sparc"
 
 # USE settings
 USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gif gtk gnome imlib jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline slang sdl spell ssl tcpd truetype X xv xml2 xmms zlib gtk2"

diff --git a/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults
index d4a52da560a7863b988ae6b07b666fc6e7c2f0d8..6f08dd934335149192165816743cafad2acdffc5 100644 (file)
--- a/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults
@@ -1,25 +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/sparc/sparc64/2004.3/alsa/make.defaults,v 1.3 2004/12/30 22:05:57 eradicator Exp $
-
-ARCH="sparc"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
-CHOST="sparc-unknown-linux-gnu"
-
-# What ctargets do we want from binutils
-CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"
-
-# Used in ebuilds for verifying sparc64 profile
-PROFILE_ARCH="sparc64"
-
-# Compiler flags
-CFLAGS="-O2 -pipe"
-CXXFLAGS=${CFLAGS}
-
-# Misc
-FEATURES="sandbox ccache"
-ACCEPT_KEYWORDS="sparc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/alsa/make.defaults,v 1.4 2004/12/31 10:29:28 eradicator Exp $
 
 # USE settings
 USE="alsa arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack jpeg kde libwww mad mikmod motif mpeg ncurses nls oggvorbis oss opengl pam perl png python pdflib qt readline sdl spell ssl tcpd truetype X xv xml2 xmms zlib"

diff --git a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
index d1ce15f69eb43bc20f5e7c1024e6ac97dff84122..f12aa64a5bd5c529f3e737e7f26489897accee26 100644 (file)
--- a/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/2004.3/make.defaults
@@ -1,17 +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/sparc/sparc64/2004.3/make.defaults,v 1.7 2004/12/30 22:05:57 eradicator Exp $
-
-ARCH="sparc"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
-CHOST="sparc-unknown-linux-gnu"
-
-# What ctargets do we want from binutils
-CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"
-
-# Used in ebuilds for verifying sparc64 profile
-PROFILE_ARCH="sparc64"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/make.defaults,v 1.8 2004/12/31 10:29:28 eradicator Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -19,7 +8,6 @@ CXXFLAGS=${CFLAGS}
 
 # Misc
 FEATURES="sandbox ccache"
-ACCEPT_KEYWORDS="sparc"
 
 # USE settings
 USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 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 X xv xml2 xmms zlib"

diff --git a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults
index cf6651b5faf664b0eeff68a2946b2a43f1276751..b1f3f303c65a7300668a97fc14e1bf6c6f419f74 100644 (file)
--- a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults
+++ b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults
@@ -1,17 +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/sparc/sparc64/gcc34/2004.3/make.defaults,v 1.6 2004/12/30 22:05:57 eradicator Exp $
-
-ARCH="sparc"
-
-# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
-CHOST="sparc-unknown-linux-gnu"
-
-# What ctargets do we want from binutils
-CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"
-
-# Used in ebuilds for verifying sparc64 profile
-PROFILE_ARCH="sparc64"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/make.defaults,v 1.7 2004/12/31 10:29:28 eradicator Exp $
 
 # Compiler flags
 CFLAGS="-O2 -pipe"
@@ -19,7 +8,6 @@ CXXFLAGS=${CFLAGS}
 
 # Misc
 FEATURES="sandbox ccache"
-ACCEPT_KEYWORDS="sparc"
 
 # USE settings
 USE="alsa arts avi berkdb bitmap-fonts crypt cups encode esd fortran f77 fbcon foomaticdb gdbm gcc64 gif gtk gtk2 gnome imlib jack 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"

diff --git a/profiles/default-linux/sparc/sparc64/make.defaults b/profiles/default-linux/sparc/sparc64/make.defaults
new file mode 100644 (file)
index 0000000..7cdcebc
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64/make.defaults
@@ -0,0 +1,12 @@
+# 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/sparc64/make.defaults,v 1.1 2004/12/31 10:29:28 eradicator Exp $
+
+ARCH="sparc"
+ACCEPT_KEYWORDS="${ARCH}"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (v9)
+CHOST="sparc-unknown-linux-gnu"
+
+# We need sparc64 binutils for linux-headers
+CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu"