Masking 2.6 core stuff (kernel, udev) on non-2.6 profiles

6 files changed, 44 insertions, 21 deletions

diff --git a/profiles/default-linux/sparc/sparc32/2005.0/package.mask b/profiles/default-linux/sparc/sparc32/2005.0/package.mask
index 84b7112f2167..1c3363abd621 100644
--- a/profiles/default-linux/sparc/sparc32/2005.0/package.mask
+++ b/profiles/default-linux/sparc/sparc32/2005.0/package.mask
@@ -1,18 +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/sparc32/2005.0/package.mask,v 1.8 2006/01/11 15:42:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.0/package.mask,v 1.9 2006/02/08 14:24:44 gustavoz Exp $
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# We mask core 2.6 stuff to avoid bootstrap issues
+>=sys-kernel/gentoo-sources-2.6.0
+>=sys-kernel/vanilla-sources-2.6.0
+sys-fs/udev
 
 # Masked until bug #60413 is fixed.
 media-libs/xine-lib
 
-# Still needing 2.4 default
-sys-kernel/linux26-headers
->=sys-kernel/linux-headers-2.6.0
->=sys-kernel/gentoo-dev-sources-2.6.8
->=sys-kernel/gentoo-sources-2.6.8
->=sys-kernel/development-sources-2.6.8
->=sys-kernel/vanilla-sources-2.6.8
-
 # 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/sparc32/2005.1/package.mask b/profiles/default-linux/sparc/sparc32/2005.1/package.mask
index 6c45b4353616..0b0eeda8cfdd 100644
--- a/profiles/default-linux/sparc/sparc32/2005.1/package.mask
+++ b/profiles/default-linux/sparc/sparc32/2005.1/package.mask
@@ -1,18 +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/sparc32/2005.1/package.mask,v 1.7 2006/01/11 15:42:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2005.1/package.mask,v 1.8 2006/02/08 14:24:44 gustavoz Exp $
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# We mask core 2.6 stuff to avoid bootstrap issues
+>=sys-kernel/gentoo-sources-2.6.0
+>=sys-kernel/vanilla-sources-2.6.0
+sys-fs/udev
 
 # Masked until bug #60413 is fixed.
 media-libs/xine-lib
 
-# Still needing 2.4 default
-sys-kernel/linux26-headers
->=sys-kernel/linux-headers-2.6.0
->=sys-kernel/gentoo-dev-sources-2.6.8
->=sys-kernel/gentoo-sources-2.6.8
->=sys-kernel/development-sources-2.6.8
->=sys-kernel/vanilla-sources-2.6.8
-
 # 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/sparc32/2006.0/2.4/package.mask b/profiles/default-linux/sparc/sparc32/2006.0/2.4/package.mask
new file mode 100644
index 000000000000..4a5e4445b69a
--- /dev/null
+++ b/profiles/default-linux/sparc/sparc32/2006.0/2.4/package.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc32/2006.0/2.4/package.mask,v 1.1 2006/02/08 14:24:44 gustavoz Exp $
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# We mask core 2.6 stuff to avoid bootstrap issues
+>=sys-kernel/gentoo-sources-2.6.0
+>=sys-kernel/vanilla-sources-2.6.0
+sys-fs/udev
diff --git a/profiles/default-linux/sparc/sparc64/2005.0/package.mask b/profiles/default-linux/sparc/sparc64/2005.0/package.mask
index ecf101699c55..1dbfb92aaace 100644
--- a/profiles/default-linux/sparc/sparc64/2005.0/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2005.0/package.mask
@@ -1,6 +1,12 @@
 # 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/package.mask,v 1.19 2006/01/11 15:42:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.0/package.mask,v 1.20 2006/02/08 14:24:44 gustavoz Exp $
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# We mask core 2.6 stuff to avoid bootstrap issues
+>=sys-kernel/gentoo-sources-2.6.0
+>=sys-kernel/vanilla-sources-2.6.0
+sys-fs/udev
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
diff --git a/profiles/default-linux/sparc/sparc64/2005.1/package.mask b/profiles/default-linux/sparc/sparc64/2005.1/package.mask
index 04c5f148e587..a29a3552627b 100644
--- a/profiles/default-linux/sparc/sparc64/2005.1/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2005.1/package.mask
@@ -1,6 +1,12 @@
 # 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.1/package.mask,v 1.8 2006/01/11 15:42:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2005.1/package.mask,v 1.9 2006/02/08 14:24:44 gustavoz Exp $
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# We mask core 2.6 stuff to avoid bootstrap issues
+>=sys-kernel/gentoo-sources-2.6.0
+>=sys-kernel/vanilla-sources-2.6.0
+sys-fs/udev
 
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Something between 2.3.3.20040420 and 2.3.4.20040619 breaks blackdown-jdk
diff --git a/profiles/default-linux/sparc/sparc64/2006.0/2.4/package.mask b/profiles/default-linux/sparc/sparc64/2006.0/2.4/package.mask
index 0f2011014eae..63c5a3b5ba78 100644
--- a/profiles/default-linux/sparc/sparc64/2006.0/2.4/package.mask
+++ b/profiles/default-linux/sparc/sparc64/2006.0/2.4/package.mask
@@ -1,6 +1,12 @@
 # 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/2006.0/2.4/package.mask,v 1.3 2006/01/11 15:42:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64/2006.0/2.4/package.mask,v 1.4 2006/02/08 14:24:44 gustavoz Exp $
+
+# Gustavo Zacarias <gustavoz@gentoo.org>
+# We mask core 2.6 stuff to avoid bootstrap issues
+>=sys-kernel/gentoo-sources-2.6.0
+>=sys-kernel/vanilla-sources-2.6.0
+sys-fs/udev
 
 # Gustavo Zacarias <gustavoz@gentoo.org>
 # New toys enabled by 2.6 headers