From ddb6788a65b927cce34dc7c69e0c35f20d07c6b0 Mon Sep 17 00:00:00 2001
From: Joshua Kinard <kumba@gentoo.org>
Date: Thu, 11 Nov 2004 09:12:03 +0000
Subject: [PATCH] Mask gcc-sparc64-3.4.x in all sparc64 profiles exceot the
 gcc34 test profile.

---
 profiles/default-linux/sparc/sparc64/2004.2/packages      | 7 ++++---
 profiles/default-linux/sparc/sparc64/2004.3/packages      | 7 ++++---
 .../default-linux/sparc/sparc64/gcc34/2004.3/packages     | 8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/profiles/default-linux/sparc/sparc64/2004.2/packages b/profiles/default-linux/sparc/sparc64/2004.2/packages
index 5bed2d4d5541..bc67e38cfab9 100644
--- a/profiles/default-linux/sparc/sparc64/2004.2/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.2/packages
@@ -1,12 +1,13 @@
 # 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.1 2004/10/01 22:07:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.2/packages,v 1.2 2004/11/11 09:12:03 kumba Exp $
 
 # sparc64 v9 32-bit userland packages
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
-# we need gcc-sparc64 for kernels
-*sys-devel/gcc-sparc64
+# 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
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
diff --git a/profiles/default-linux/sparc/sparc64/2004.3/packages b/profiles/default-linux/sparc/sparc64/2004.3/packages
index d054676d3eb6..e9b55865e534 100644
--- a/profiles/default-linux/sparc/sparc64/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/2004.3/packages
@@ -1,12 +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/sparc/sparc64/2004.3/packages,v 1.1 2004/10/06 21:48:05 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2004.3/packages,v 1.2 2004/11/11 09:12:03 kumba Exp $
 
 # sparc64 v9 32-bit userland packages
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
-# we need gcc-sparc64 for kernels
-*sys-devel/gcc-sparc64
+# 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
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
diff --git a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
index fcb7f2d1af9d..409eb6dbf2a5 100644
--- a/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
+++ b/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages
@@ -1,13 +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/sparc/sparc64/gcc34/2004.3/packages,v 1.1 2004/11/06 18:11:46 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/gcc34/2004.3/packages,v 1.2 2004/11/11 09:12:03 kumba Exp $
 
 
 # sparc64 v9 32-bit userland packages
 
 # Since we're running a sparc64 kernel w/ 32bit (v9) userland,
-# we need gcc-sparc64 for kernels
-*sys-devel/gcc-sparc64
+# 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-3.4.0
 
 # Sometimes necessary to trick programs into thinking we're really
 # a sparc32 system.
-- 
2.26.2