Push some settings into sup-profiles which shouldn't be in the master profiles.

9 files changed, 61 insertions, 32 deletions

diff --git a/profiles/default-linux/sparc/packages b/profiles/default-linux/sparc/packages
index a0f4c4e0dbb0..9c721dc0d3bd 100644
--- a/profiles/default-linux/sparc/packages
+++ b/profiles/default-linux/sparc/packages
@@ -1,15 +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/sparc/packages,v 1.13 2005/03/06 00:29:30 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/packages,v 1.14 2005/03/07 00:09:22 eradicator Exp $
 
 # Top-level sparc profile
 
 # SPARC specific stuff (32 and 64 bit)
 *sys-apps/sparc-utils
-
-# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
-*<sys-devel/gcc-3.4.1
-
-# Use 2.4 linux-headers by default
--*virtual/os-headers
-*<sys-kernel/linux-headers-2.5
diff --git a/profiles/default-linux/sparc/sparc32/packages b/profiles/default-linux/sparc/sparc32/packages
index 08813c4a75eb..44f83a3f878f 100644
--- a/profiles/default-linux/sparc/sparc32/packages
+++ b/profiles/default-linux/sparc/sparc32/packages
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/packages,v 1.4 2005/01/11 01:24:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/packages,v 1.5 2005/03/07 00:09:22 eradicator Exp $
 
 *>=sys-libs/glibc-2.3.1-r2
 *net-misc/dhcpcd
@@ -12,3 +12,11 @@
 *sys-libs/gdbm  
 *sys-libs/pam
 *net-misc/openssh
+
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+-*virtual/os-headers
+*<sys-kernel/linux-headers-2.5
+
diff --git a/profiles/default-linux/sparc/sparc64/package.mask b/profiles/default-linux/sparc/sparc64/2004.2/package.mask
index 48d1ecf3ccf4..e9660f86f5fc 100644
--- a/profiles/default-linux/sparc/sparc64/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2004.2/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/package.mask,v 1.4 2004/12/31 10:25:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/package.mask,v 1.1 2005/03/07 00:09:22 eradicator Exp $
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
@@ -9,7 +9,3 @@ media-libs/alsa-lib
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
 >=sys-libs/glibc-2.3.4            
-
-# Jeremy Huddleston <eradicator@gentoo.org>
-# Older versions of binutils-config won't create our sparc64-* symlinks
-<sys-devel/binutils-config-1.5
diff --git a/profiles/default-linux/sparc/sparc64/2004.2/packages b/profiles/default-linux/sparc/sparc64/2004.2/packages
index 50a6988eb367..5e8f1535d8f1 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.2/packages
@@ -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/sparc/sparc64/2004.2/packages,v 1.3 2004/11/29 12:59:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/packages,v 1.4 2005/03/07 00:09:22 eradicator Exp $
 
 # sparc64 v9 32-bit userland packages
 
@@ -8,3 +8,11 @@
 # we need gcc-sparc64 for kernels.
 # Only use gcc-sparc64-3.3.x for now.  3.4.x users want the gcc34 profile
 *<sys-devel/gcc-sparc64-3.4.0
+
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+-*virtual/os-headers
+*<sys-kernel/linux-headers-2.5
+
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/package.mask b/profiles/default-linux/sparc/sparc64/2004.3/package.mask
new file mode 100644
index 000000000000..ff9f008e6be9
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64/2004.3/package.mask
@@ -0,0 +1,11 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/package.mask,v 1.1 2005/03/07 00:09:22 eradicator Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
+# system with unsafe alsa drivers.
+media-sound/alsa-utils
+media-libs/alsa-lib
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
+>=sys-libs/glibc-2.3.4            
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/packages b/profiles/default-linux/sparc/sparc64/2004.3/packages
index 6fc564b67b31..4bdc5c86384b 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.3/packages
@@ -1,8 +1,16 @@
 # 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/packages,v 1.3 2004/11/29 12:59:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/packages,v 1.4 2005/03/07 00:09:22 eradicator Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
 # Only use gcc-sparc64-3.3.x for now.  3.4.x users want the gcc34 profile
 *<sys-devel/gcc-sparc64-3.4.0
+
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+-*virtual/os-headers
+*<sys-kernel/linux-headers-2.5
+
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/package.mask b/profiles/default-linux/sparc/sparc64/2005.0/package.mask
new file mode 100644
index 000000000000..51e12ba4f5b2
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc64/2005.0/package.mask
@@ -0,0 +1,11 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/package.mask,v 1.1 2005/03/07 00:09:22 eradicator Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Mask alsa-lib and alsa-utils so people don't accidently emerge them on a
+# system with unsafe alsa drivers.
+media-sound/alsa-utils
+media-libs/alsa-lib
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
+>=sys-libs/glibc-2.3.4            
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/packages b/profiles/default-linux/sparc/sparc64/2005.0/packages
index 8cbd1581e01a..64491ef2797b 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/packages
+++ b/profiles/default-linux/sparc/sparc64/2005.0/packages
@@ -1,8 +1,16 @@
 # 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/packages,v 1.1 2005/01/11 01:19:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/packages,v 1.2 2005/03/07 00:09:22 eradicator Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
 # Only use gcc-sparc64-3.3.x for now.  3.4.x users want the gcc34 profile
 *<sys-devel/gcc-sparc64-3.4.0
+
+# Lock to gcc-3.3.x and allow 3.4 for the testing profile only
+*<sys-devel/gcc-3.4.1
+
+# Use 2.4 linux-headers by default
+-*virtual/os-headers
+*<sys-kernel/linux-headers-2.5
+
diff --git a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
index 58b8c5f0f4da..804d097b0ef8 100644
--- a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
@@ -1,21 +1,7 @@
 # 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/packages,v 1.5 2005/01/03 21:06:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages,v 1.6 2005/03/07 00:09:22 eradicator Exp $
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
 # we need gcc-sparc64 for kernels.
-# Unmask the 3.4.x gcc-sparc64's and use those.
--*<sys-devel/gcc-sparc64-3.4.0
 *sys-devel/gcc-sparc64
-
-# GCC 3.4.x Testing Profile
-# Tests the following:
-#	>=sys-devel/gcc-3.4.1
-
--*<sys-devel/gcc-3.4.1
-*sys-devel/gcc
-
-# We use 2.6 headers           
--*<sys-kernel/linux-headers-2.5
-#*<sys-kernel/linux-headers-2.7
-*virtual/os-headers