Various tweaks to mips cascade:

  - Made module-init-tools default for virtual/modutils
  - Lock all mips profiles to 2.4 headers except n32
  - Allow glibc-2.3.4.20040808 and greater for n32 profile only
  - Added mips32 package to o32 mips64 profile
  - Masked binutils-2.15* and gcc-3.4.2* on n32 due to oddities

7 files changed, 70 insertions, 15 deletions

diff --git a/profiles/default-linux/mips/cobalt/2004.2/make.defaults b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
index 97da03c22f1e..94cf635d89b2 100644
--- a/profiles/default-linux/mips/cobalt/2004.2/make.defaults
+++ b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
@@ -1,14 +1,18 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2004.2/make.defaults,v 1.2 2004/09/23 13:50:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2004.2/make.defaults,v 1.3 2004/09/27 09:12:55 kumba Exp $
 
 ARCH="mips"
 
+# cobalt is a little endian, 32bit-only system
+CHOST="mipsel-unknown-linux-gnu"
+
 # Distinguish cobalt from other mips profiles
 PROFILE_ARCH="cobalt"
 
-FEATURES="ccache"
-
-USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache"
 
 ACCEPT_KEYWORDS="mips"
+
+USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl"
diff --git a/profiles/default-linux/mips/mips64/2004.2/make.defaults b/profiles/default-linux/mips/mips64/2004.2/make.defaults
index e054bce111e8..f7007272a79b 100644
--- a/profiles/default-linux/mips/mips64/2004.2/make.defaults
+++ b/profiles/default-linux/mips/mips64/2004.2/make.defaults
@@ -1,13 +1,19 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/make.defaults,v 1.2 2004/09/23 13:51:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/make.defaults,v 1.3 2004/09/27 09:12:55 kumba Exp $
 
 ARCH="mips"
 
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Used in ebuilds for verifying mips64 profile
 PROFILE_ARCH="mips64"
 
-FEATURES="ccache"
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache"
+
+ACCEPT_KEYWORDS="mips"
 
 USE="slang readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
 
-ACCEPT_KEYWORDS="mips"
diff --git a/profiles/default-linux/mips/mips64/2004.2/packages b/profiles/default-linux/mips/mips64/2004.2/packages
index 4172e94b789e..58efc90761c8 100644
--- a/profiles/default-linux/mips/mips64/2004.2/packages
+++ b/profiles/default-linux/mips/mips64/2004.2/packages
@@ -1,9 +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/mips/mips64/2004.2/packages,v 1.2 2004/09/23 13:53:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2004.2/packages,v 1.3 2004/09/27 09:12:55 kumba Exp $
 
 # mips64 o32 packages
 
 # Since we're running a mips64 kernel w/ 32bit (o32) userland,
 # we need gcc-mips64 for kernels
 *sys-devel/gcc-mips64
+
+# Sometimes necessary to trick programs into thinking we're really
+# a mips32 system.
+*sys-devel/mips32
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
index 25091e35f7c0..b9f6d9917d6a 100644
--- a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
+++ b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
@@ -1,14 +1,22 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults,v 1.2 2004/09/23 13:52:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults,v 1.3 2004/09/27 09:12:55 kumba Exp $
 
 ARCH="mips"
-ABI=n32
+ABI="n32"
 
+# n32 is a type of 32bit userland that can only be built with
+# a 64bit compiler, thus we technically use a 64bit userland.
+CHOST="mips64-unknown-linux-gnu"
+
+# Used in ebuilds for verifying mips64 profile
 PROFILE_ARCH="mips64"
 
-FEATURES="debug"
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache"
+
+# There is no "stable" n32 support yet.  It's aaaalllll experimental
+ACCEPT_KEYWORDS="mips ~mips"
 
 USE="slang readline gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips n32 -multilib"
 
-ACCEPT_KEYWORDS="mips ~mips"
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/packages b/profiles/default-linux/mips/mips64/n32/2004.2/packages
new file mode 100644
index 000000000000..5ad2b4f8a39d
--- /dev/null
+++ b/profiles/default-linux/mips/mips64/n32/2004.2/packages
@@ -0,0 +1,24 @@
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2004.2/packages,v 1.1 2004/09/27 09:12:55 kumba Exp $
+
+# mips64 n32 packages
+
+# We want 2.6.6+ headers for n32.  2.6.6 headers are not ready for
+# general consumption, though, so we lock all other mips profiles
+# to 2.4, and unlock 2.6 only for n32.
+-*<sys-kernel/mips-headers-2.6.6
+*>=sys-kernel/mips-headers-2.6.6
+
+# binutils-2.15* is broken for n32.  No idea why, but it won't
+# build glibc correctly, so lets mask it for now.
+*<sys-devel/binutils-2.15.90.0.1.1
+
+# There is apparently something very funny in gcc-3.4.2 on n32.
+# Something related to GOT (global offset table).  Have to figure 
+# this out eventually.
+*<sys-devel/gcc-3.4.2
+
+# n32 needs a relatively modern glibc
+-*<sys-libs/glibc-2.3.4.20040808
+*>=sys-libs/glibc-2.3.4.20040808
diff --git a/profiles/default-linux/mips/packages b/profiles/default-linux/mips/packages
index b870e00abaa7..a76192bc2014 100644
--- a/profiles/default-linux/mips/packages
+++ b/profiles/default-linux/mips/packages
@@ -1,6 +1,14 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/packages,v 1.3 2004/09/23 13:46:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/packages,v 1.4 2004/09/27 09:12:55 kumba Exp $
 
+# Top-level mips profile
+
+# We rely on this package *so* much
 *>=sys-devel/gnuconfig-20030708
-*>=sys-kernel/mips-headers-2.4.21
+
+# Not ready for general consumption (except n32)
+*<sys-kernel/mips-headers-2.6.6
+
+# Doesn't fully work on o32 yet
+*<sys-libs/glibc-2.3.4.20040808
diff --git a/profiles/default-linux/mips/virtuals b/profiles/default-linux/mips/virtuals
index 1bd7305fa0d8..7ffc19e73e0f 100644
--- a/profiles/default-linux/mips/virtuals
+++ b/profiles/default-linux/mips/virtuals
@@ -1,8 +1,9 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.2 2004/09/23 13:43:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.3 2004/09/27 09:12:55 kumba Exp $
 
 virtual/bootloader		sys-boot/dvhtool
 virtual/kernel			sys-kernel/mips-headers
 virtual/linux-sources		sys-kernel/mips-sources
 virtual/os-headers		sys-kernel/mips-headers
+virtual/modutils		sys-apps/module-init-tools