From a34e50952567f2d9e5da34513255f5573832d295 Mon Sep 17 00:00:00 2001
From: Joshua Kinard <kumba@gentoo.org>
Date: Thu, 8 Jun 2006 20:26:08 +0000
Subject: [PATCH] The Great MIPS Profile Cleanup of 2006:    - Remove all
 2004.2 and 2005.0 Profiles -- they've been deprecated for awhile now    -
 Roll in the new profile layout under 2006.1 -- profiles are divided by
 machines      where needed, and further divided into ABI sub-levels under
 each grouping.  This      gives us flexibility to limit things (if needed)
 not only by machine, but also      by the different ABI/userland combinations
 possible.    - Update the top-level use.mask and virtuals file to account for
 the new masking      scheme under the 2006.1 profile layout.

---
 profiles/default-linux/mips/2004.2/deprecated |  8 ------
 .../default-linux/mips/2004.2/make.defaults   | 17 -----------
 profiles/default-linux/mips/2005.0/deprecated |  8 ------
 .../default-linux/mips/2005.0/make.defaults   | 17 -----------
 .../mips/2006.1/cobalt/o32/make.defaults      | 26 +++++++++++++++++
 .../mips/2006.1/cobalt/o32/nptl/make.defaults | 26 +++++++++++++++++
 .../mips/2006.1/cobalt/o32/nptl/package.mask  |  8 ++++++
 .../{2004.2 => 2006.1/cobalt/o32/nptl}/parent |  0
 .../mips/2006.1/cobalt/o32/nptl/use.mask      |  8 ++++++
 .../mips/{2005.0 => 2006.1/cobalt/o32}/parent |  0
 .../default-linux/mips/2006.1/cobalt/packages | 13 +++++++++
 .../{cobalt/2004.2 => 2006.1/cobalt}/parent   |  0
 .../default-linux/mips/2006.1/cobalt/use.mask |  7 +++++
 .../default-linux/mips/2006.1/cobalt/virtuals |  5 ++++
 .../mips/2006.1/generic-be/n32/make.defaults  | 27 ++++++++++++++++++
 .../2006.1/generic-be/n32/nptl/make.defaults  | 27 ++++++++++++++++++
 .../2006.1/generic-be/n32/nptl/package.mask   |  8 ++++++
 .../generic-be/n32/nptl}/parent               |  0
 .../mips/2006.1/generic-be/n32/nptl/use.mask  |  8 ++++++
 .../2004.2 => 2006.1/generic-be/n32}/parent   |  0
 .../mips/2006.1/generic-be/n32/use.mask       |  6 ++++
 .../mips/2006.1/generic-be/n64/make.defaults  | 27 ++++++++++++++++++
 .../2006.1/generic-be/n64/nptl/make.defaults  | 27 ++++++++++++++++++
 .../2006.1/generic-be/n64/nptl/package.mask   |  8 ++++++
 .../generic-be/n64/nptl}/parent               |  0
 .../mips/2006.1/generic-be/n64/nptl/use.mask  |  8 ++++++
 .../2005.0 => 2006.1/generic-be/n64}/parent   |  0
 .../mips/2006.1/generic-be/n64/use.mask       |  6 ++++
 .../generic-be/o32}/make.defaults             | 18 ++++++------
 .../2006.1/generic-be/o32/nptl/make.defaults  | 27 ++++++++++++++++++
 .../2006.1/generic-be/o32/nptl/package.mask   |  8 ++++++
 .../generic-be/o32/nptl}/parent               |  0
 .../mips/2006.1/generic-be/o32/nptl/use.mask  |  8 ++++++
 .../mips/2006.1/generic-be/o32/packages       |  9 ++++++
 .../2005.0 => 2006.1/generic-be/o32}/parent   |  0
 .../mips/2006.1/generic-be/packages           | 10 +++++++
 .../mips/2006.1/generic-be/parent             |  1 +
 .../mips/2006.1/generic-be/virtuals           |  5 ++++
 .../mips/2006.1/ip27/n32/make.defaults        | 24 ++++++++++++++++
 .../mips/2006.1/ip27/n32/nptl/make.defaults   | 24 ++++++++++++++++
 .../mips/2006.1/ip27/n32/nptl/package.mask    |  8 ++++++
 .../mips/2006.1/ip27/n32/nptl/parent          |  1 +
 .../mips/2006.1/ip27/n32/nptl/use.mask        |  8 ++++++
 .../default-linux/mips/2006.1/ip27/n32/parent |  1 +
 .../mips/2006.1/ip27/n32/use.mask             |  6 ++++
 .../mips/2006.1/ip27/o32/make.defaults        | 24 ++++++++++++++++
 .../mips/2006.1/ip27/o32/nptl/make.defaults   | 24 ++++++++++++++++
 .../mips/2006.1/ip27/o32/nptl/package.mask    |  8 ++++++
 .../mips/2006.1/ip27/o32/nptl/parent          |  1 +
 .../mips/2006.1/ip27/o32/nptl/use.mask        |  8 ++++++
 .../mips/2006.1/ip27/o32/packages             |  9 ++++++
 .../default-linux/mips/2006.1/ip27/o32/parent |  1 +
 .../default-linux/mips/2006.1/ip27/packages   | 10 +++++++
 .../default-linux/mips/2006.1/ip27/parent     |  1 +
 .../default-linux/mips/2006.1/ip27/virtuals   |  5 ++++
 .../mips/2006.1/ip28/n32/make.defaults        | 24 ++++++++++++++++
 .../mips/2006.1/ip28/n32/nptl/make.defaults   | 24 ++++++++++++++++
 .../mips/2006.1/ip28/n32/nptl/package.mask    |  8 ++++++
 .../mips/2006.1/ip28/n32/nptl/parent          |  1 +
 .../mips/2006.1/ip28/n32/nptl/use.mask        |  8 ++++++
 .../default-linux/mips/2006.1/ip28/n32/parent |  1 +
 .../mips/2006.1/ip28/n32/use.mask             |  6 ++++
 .../2005.0 => 2006.1/ip28/o32}/make.defaults  | 15 +++++-----
 .../mips/2006.1/ip28/o32/nptl/make.defaults   | 24 ++++++++++++++++
 .../mips/2006.1/ip28/o32/nptl/package.mask    |  8 ++++++
 .../mips/2006.1/ip28/o32/nptl/parent          |  1 +
 .../mips/2006.1/ip28/o32/nptl/use.mask        |  8 ++++++
 .../mips/2006.1/ip28/o32/packages             |  9 ++++++
 .../default-linux/mips/2006.1/ip28/o32/parent |  1 +
 .../default-linux/mips/2006.1/ip28/parent     |  1 +
 .../default-linux/mips/2006.1/ip28/virtuals   |  5 ++++
 .../mips/2006.1/ip30/n32/make.defaults        | 24 ++++++++++++++++
 .../mips/2006.1/ip30/n32/nptl/make.defaults   | 24 ++++++++++++++++
 .../mips/2006.1/ip30/n32/nptl/package.mask    |  8 ++++++
 .../mips/2006.1/ip30/n32/nptl/parent          |  1 +
 .../mips/2006.1/ip30/n32/nptl/use.mask        |  8 ++++++
 .../default-linux/mips/2006.1/ip30/n32/parent |  1 +
 .../mips/2006.1/ip30/n32/use.mask             |  6 ++++
 .../mips/2006.1/ip30/o32/make.defaults        | 24 ++++++++++++++++
 .../mips/2006.1/ip30/o32/nptl/make.defaults   | 24 ++++++++++++++++
 .../mips/2006.1/ip30/o32/nptl/package.mask    |  8 ++++++
 .../mips/2006.1/ip30/o32/nptl/parent          |  1 +
 .../mips/2006.1/ip30/o32/nptl/use.mask        |  8 ++++++
 .../mips/2006.1/ip30/o32/packages             |  9 ++++++
 .../default-linux/mips/2006.1/ip30/o32/parent |  1 +
 .../default-linux/mips/2006.1/ip30/packages   | 10 +++++++
 .../default-linux/mips/2006.1/ip30/parent     |  1 +
 .../default-linux/mips/2006.1/ip30/virtuals   |  5 ++++
 .../mips/cobalt/2004.2/deprecated             |  8 ------
 .../mips/cobalt/2004.2/make.defaults          | 26 -----------------
 .../mips/cobalt/2005.0/deprecated             |  8 ------
 .../mips/cobalt/2005.0/make.defaults          | 26 -----------------
 .../mips/mips64/2004.2/deprecated             |  8 ------
 .../default-linux/mips/mips64/2004.2/packages | 13 ---------
 .../mips/mips64/2005.0/deprecated             |  8 ------
 .../mips/mips64/2005.0/make.defaults          | 25 -----------------
 .../default-linux/mips/mips64/2005.0/packages | 13 ---------
 .../mips/mips64/ip28/2005.0/deprecated        |  8 ------
 .../mips/mips64/ip28/2005.0/packages          | 13 ---------
 .../mips/mips64/n32/2004.2/deprecated         |  8 ------
 .../mips/mips64/n32/2004.2/make.defaults      | 28 -------------------
 .../mips/mips64/n32/2004.2/packages           | 14 ----------
 .../mips/mips64/n32/2005.0/deprecated         |  8 ------
 .../mips/mips64/n32/2005.0/make.defaults      | 28 -------------------
 .../mips/mips64/n32/2005.0/packages           |  6 ----
 profiles/default-linux/mips/use.mask          |  7 ++---
 profiles/default-linux/mips/virtuals          | 11 +++++---
 107 files changed, 795 insertions(+), 322 deletions(-)
 delete mode 100644 profiles/default-linux/mips/2004.2/deprecated
 delete mode 100644 profiles/default-linux/mips/2004.2/make.defaults
 delete mode 100644 profiles/default-linux/mips/2005.0/deprecated
 delete mode 100644 profiles/default-linux/mips/2005.0/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/o32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/o32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/o32/nptl/package.mask
 rename profiles/default-linux/mips/{2004.2 => 2006.1/cobalt/o32/nptl}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/o32/nptl/use.mask
 rename profiles/default-linux/mips/{2005.0 => 2006.1/cobalt/o32}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/packages
 rename profiles/default-linux/mips/{cobalt/2004.2 => 2006.1/cobalt}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/cobalt/virtuals
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n32/nptl/package.mask
 rename profiles/default-linux/mips/{cobalt/2005.0 => 2006.1/generic-be/n32/nptl}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n32/nptl/use.mask
 rename profiles/default-linux/mips/{mips64/2004.2 => 2006.1/generic-be/n32}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n32/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n64/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n64/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n64/nptl/package.mask
 rename profiles/default-linux/mips/{mips64/2005.0 => 2006.1/generic-be/n64/nptl}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n64/nptl/use.mask
 rename profiles/default-linux/mips/{mips64/ip28/2005.0 => 2006.1/generic-be/n64}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/n64/use.mask
 rename profiles/default-linux/mips/{mips64/2004.2 => 2006.1/generic-be/o32}/make.defaults (51%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/o32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/o32/nptl/package.mask
 rename profiles/default-linux/mips/{mips64/n32/2004.2 => 2006.1/generic-be/o32/nptl}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/o32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/o32/packages
 rename profiles/default-linux/mips/{mips64/n32/2005.0 => 2006.1/generic-be/o32}/parent (100%)
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/packages
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/parent
 create mode 100644 profiles/default-linux/mips/2006.1/generic-be/virtuals
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/nptl/package.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/nptl/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/n32/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/nptl/package.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/nptl/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/packages
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/o32/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/packages
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip27/virtuals
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/nptl/package.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/nptl/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/n32/use.mask
 rename profiles/default-linux/mips/{mips64/ip28/2005.0 => 2006.1/ip28/o32}/make.defaults (55%)
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/o32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/o32/nptl/package.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/o32/nptl/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/o32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/o32/packages
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/o32/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip28/virtuals
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/nptl/package.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/nptl/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/n32/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/nptl/make.defaults
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/nptl/package.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/nptl/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/nptl/use.mask
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/packages
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/o32/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/packages
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/parent
 create mode 100644 profiles/default-linux/mips/2006.1/ip30/virtuals
 delete mode 100644 profiles/default-linux/mips/cobalt/2004.2/deprecated
 delete mode 100644 profiles/default-linux/mips/cobalt/2004.2/make.defaults
 delete mode 100644 profiles/default-linux/mips/cobalt/2005.0/deprecated
 delete mode 100644 profiles/default-linux/mips/cobalt/2005.0/make.defaults
 delete mode 100644 profiles/default-linux/mips/mips64/2004.2/deprecated
 delete mode 100644 profiles/default-linux/mips/mips64/2004.2/packages
 delete mode 100644 profiles/default-linux/mips/mips64/2005.0/deprecated
 delete mode 100644 profiles/default-linux/mips/mips64/2005.0/make.defaults
 delete mode 100644 profiles/default-linux/mips/mips64/2005.0/packages
 delete mode 100644 profiles/default-linux/mips/mips64/ip28/2005.0/deprecated
 delete mode 100644 profiles/default-linux/mips/mips64/ip28/2005.0/packages
 delete mode 100644 profiles/default-linux/mips/mips64/n32/2004.2/deprecated
 delete mode 100644 profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
 delete mode 100644 profiles/default-linux/mips/mips64/n32/2004.2/packages
 delete mode 100644 profiles/default-linux/mips/mips64/n32/2005.0/deprecated
 delete mode 100644 profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
 delete mode 100644 profiles/default-linux/mips/mips64/n32/2005.0/packages

diff --git a/profiles/default-linux/mips/2004.2/deprecated b/profiles/default-linux/mips/2004.2/deprecated
deleted file mode 100644
index da65e28b825d..000000000000
--- a/profiles/default-linux/mips/2004.2/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/2004.2/make.defaults b/profiles/default-linux/mips/2004.2/make.defaults
deleted file mode 100644
index a533b875e316..000000000000
--- a/profiles/default-linux/mips/2004.2/make.defaults
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2004.2/make.defaults,v 1.7 2006/02/01 13:41:15 wolf31o2 Exp $
-
-ARCH="mips"
-
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build a *minimum* of mips2, because just about any mips box we theoretically
-# support should meet the mips2 standard
-CFLAGS="-O2 -pipe -march=mips2"
-CXXFLAGS=${CFLAGS}
-
-ACCEPT_KEYWORDS="mips"
-
-USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
diff --git a/profiles/default-linux/mips/2005.0/deprecated b/profiles/default-linux/mips/2005.0/deprecated
deleted file mode 100644
index da65e28b825d..000000000000
--- a/profiles/default-linux/mips/2005.0/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/2005.0/make.defaults b/profiles/default-linux/mips/2005.0/make.defaults
deleted file mode 100644
index b73f995f8539..000000000000
--- a/profiles/default-linux/mips/2005.0/make.defaults
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
-
-ARCH="mips"
-
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build a *minimum* of mips2, because just about any mips box we theoretically
-# support should meet the mips2 standard
-CFLAGS="-O2 -pipe -march=mips2"
-CXXFLAGS=${CFLAGS}
-
-ACCEPT_KEYWORDS="mips"
-
-USE="readline gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips -multilib nomultilib -n32 -n64"
diff --git a/profiles/default-linux/mips/2006.1/cobalt/o32/make.defaults b/profiles/default-linux/mips/2006.1/cobalt/o32/make.defaults
new file mode 100644
index 000000000000..cf5be1221370
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/o32/make.defaults
@@ -0,0 +1,26 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/o32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Cobalt O32 Profile
+# Also Catalyst Build Profile for Cobalt O32
+
+ARCH="mips"
+PROFILE_ARCH="cobalt"
+
+# Cobalt systems are Little-Endian, and do not support (yet) 64bit kernels
+CHOST="mipsel-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as R5000, because Cobalts have an RM5231A CPU in them.  Enforce o32
+# as the default ABI as well.
+CFLAGS="-O2 -pipe -march=r5000 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips cobalt"
+STAGE1_USE="mips cobalt"
diff --git a/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/make.defaults
new file mode 100644
index 000000000000..8c147a8f4ea4
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/make.defaults
@@ -0,0 +1,26 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Cobalt O32/NPTL Profile
+# Also Catalyst Build Profile for Cobalt O32/NPTL
+
+ARCH="mips"
+PROFILE_ARCH="cobalt"
+
+# Cobalt systems are Little-Endian, and do not support (yet) 64bit kernels
+CHOST="mipsel-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as R5000, because Cobalts have an RM5231A CPU in them.  Enforce o32
+# as the default ABI as well.
+CFLAGS="-O2 -pipe -march=r5000 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips cobalt nptl nptlonly"
+STAGE1_USE="mips cobalt nptl nptlonly"
diff --git a/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/package.mask b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/package.mask
new file mode 100644
index 000000000000..5005fe87b553
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2004.2/parent b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/parent
similarity index 100%
rename from profiles/default-linux/mips/2004.2/parent
rename to profiles/default-linux/mips/2006.1/cobalt/o32/nptl/parent
diff --git a/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/use.mask b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/use.mask
new file mode 100644
index 000000000000..20f66a3ee422
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/o32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2005.0/parent b/profiles/default-linux/mips/2006.1/cobalt/o32/parent
similarity index 100%
rename from profiles/default-linux/mips/2005.0/parent
rename to profiles/default-linux/mips/2006.1/cobalt/o32/parent
diff --git a/profiles/default-linux/mips/2006.1/cobalt/packages b/profiles/default-linux/mips/2006.1/cobalt/packages
new file mode 100644
index 000000000000..4d0cca907e7c
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/packages
@@ -0,0 +1,13 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/packages,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Cobalt packages
+
+# Sometimes necessary to trick programs into thinking we're really
+# a mips32 system.
+# (Not needed on Cobalt yet, but might in the future)
+# *sys-apps/setarch
+
+# Cobalt's bootloader is Colo
+*sys-boot/colo
diff --git a/profiles/default-linux/mips/cobalt/2004.2/parent b/profiles/default-linux/mips/2006.1/cobalt/parent
similarity index 100%
rename from profiles/default-linux/mips/cobalt/2004.2/parent
rename to profiles/default-linux/mips/2006.1/cobalt/parent
diff --git a/profiles/default-linux/mips/2006.1/cobalt/use.mask b/profiles/default-linux/mips/2006.1/cobalt/use.mask
new file mode 100644
index 000000000000..9ac328c8b27e
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/use.mask
@@ -0,0 +1,7 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Cobalt only does mips32, thus it doesn't know about n32/n64 (yet)
+n32
+n64
diff --git a/profiles/default-linux/mips/2006.1/cobalt/virtuals b/profiles/default-linux/mips/2006.1/cobalt/virtuals
new file mode 100644
index 000000000000..0fa587271679
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/cobalt/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/cobalt/virtuals,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+virtual/bootloader		sys-boot/colo
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n32/make.defaults b/profiles/default-linux/mips/2006.1/generic-be/n32/make.defaults
new file mode 100644
index 000000000000..2e000cd2877a
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n32/make.defaults
@@ -0,0 +1,27 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP22/IP32 N32 Generic Profile
+# Also Catalyst Build Profile for N32
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build a *minimum* of mips3, because IP22/IP32 are, at minimum, mips3 capable
+# systems (IP22 R4x00 systems are mips3; IP32 is mips4).  Enforce n32 as the default
+# ABI as well.
+CFLAGS="-O2 -pipe -march=mips3 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32"
+STAGE1_USE="mips n32"
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/make.defaults
new file mode 100644
index 000000000000..6b3195a4dec2
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/make.defaults
@@ -0,0 +1,27 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP22/IP32 N32/NPTL Generic Profile
+# Also Catalyst Build Profile for N32/NPTL
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build a *minimum* of mips3, because IP22/IP32 are, at minimum, mips3 capable
+# systems (IP22 R4x00 systems are mips3; IP32 is mips4).  Enforce n32 as the default
+# ABI as well.
+CFLAGS="-O2 -pipe -march=mips3 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 nptl nptlonly"
+STAGE1_USE="mips n32 nptl nptlonly"
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/package.mask b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/package.mask
new file mode 100644
index 000000000000..f36705b90047
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/cobalt/2005.0/parent b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/parent
similarity index 100%
rename from profiles/default-linux/mips/cobalt/2005.0/parent
rename to profiles/default-linux/mips/2006.1/generic-be/n32/nptl/parent
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/use.mask b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/use.mask
new file mode 100644
index 000000000000..8a0189ad74ca
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/mips64/2004.2/parent b/profiles/default-linux/mips/2006.1/generic-be/n32/parent
similarity index 100%
rename from profiles/default-linux/mips/mips64/2004.2/parent
rename to profiles/default-linux/mips/2006.1/generic-be/n32/parent
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n32/use.mask b/profiles/default-linux/mips/2006.1/generic-be/n32/use.mask
new file mode 100644
index 000000000000..1ccf97b444fc
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n32/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n32/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask n32
+-n32
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n64/make.defaults b/profiles/default-linux/mips/2006.1/generic-be/n64/make.defaults
new file mode 100644
index 000000000000..0f3100faa849
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n64/make.defaults
@@ -0,0 +1,27 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n64/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP22/IP32 N64 Generic Profile
+# Also Catalyst Build Profile for n64
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n64 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build a *minimum* of mips3, because IP22/IP32 are, at minimum, mips3 capable
+# systems (IP22 R4x00 systems are mips3; IP32 is mips4).  Enforce n64 as the default
+# ABI as well.
+CFLAGS="-O2 -pipe -march=mips3 -mabi=64"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n64"
+STAGE1_USE="mips n64"
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/make.defaults b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/make.defaults
new file mode 100644
index 000000000000..b2758bc2d751
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/make.defaults
@@ -0,0 +1,27 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP22/IP32 N64/NPTL Generic Profile
+# Also Catalyst Build Profile for N64/NPTL
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n64 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build a *minimum* of mips3, because IP22/IP32 are, at minimum, mips3 capable
+# systems (IP22 R4x00 systems are mips3; IP32 is mips4).  Enforce n64 as the default
+# ABI as well.
+CFLAGS="-O2 -pipe -march=mips3 -mabi=64"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n64 nptl nptlonly"
+STAGE1_USE="mips n64 nptl nptlonly"
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/package.mask b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/package.mask
new file mode 100644
index 000000000000..116916f674cf
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/mips64/2005.0/parent b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/parent
similarity index 100%
rename from profiles/default-linux/mips/mips64/2005.0/parent
rename to profiles/default-linux/mips/2006.1/generic-be/n64/nptl/parent
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/use.mask b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/use.mask
new file mode 100644
index 000000000000..6ed23617e03b
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n64/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/parent b/profiles/default-linux/mips/2006.1/generic-be/n64/parent
similarity index 100%
rename from profiles/default-linux/mips/mips64/ip28/2005.0/parent
rename to profiles/default-linux/mips/2006.1/generic-be/n64/parent
diff --git a/profiles/default-linux/mips/2006.1/generic-be/n64/use.mask b/profiles/default-linux/mips/2006.1/generic-be/n64/use.mask
new file mode 100644
index 000000000000..fe2d0ee19456
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/n64/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/n64/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask n64
+-n64
diff --git a/profiles/default-linux/mips/mips64/2004.2/make.defaults b/profiles/default-linux/mips/2006.1/generic-be/o32/make.defaults
similarity index 51%
rename from profiles/default-linux/mips/mips64/2004.2/make.defaults
rename to profiles/default-linux/mips/2006.1/generic-be/o32/make.defaults
index bcdc1b91b442..8d23eaeebd11 100644
--- a/profiles/default-linux/mips/mips64/2004.2/make.defaults
+++ b/profiles/default-linux/mips/2006.1/generic-be/o32/make.defaults
@@ -1,25 +1,27 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2006 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.10 2006/02/01 13:41:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/o32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP22/IP32 O32 Generic Profile
+# Also Catalyst Build Profile for O32
 
 ARCH="mips"
+PROFILE_ARCH="mips64"
 
 # 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"
-
 # Sandbox is broken on mips (Bug #45814)
 FEATURES="-sandbox ccache autoconfig"
 
 # Compiler flags
-# We build a *minimum* of mips3, because just about any mips64 box we theoretically
-# support should meet the mips3 standard.  This is also the mips64 o32 profile,
-# so make that the default ABI
+# We build a *minimum* of mips3, because IP22/IP32 are, at minimum, mips3 capable
+# systems (IP22 R4x00 systems are mips3; IP32 is mips4).  Enforce o32 as the default
+# ABI as well.
 CFLAGS="-O2 -pipe -march=mips3 -mabi=32"
 CXXFLAGS=${CFLAGS}
 
 ACCEPT_KEYWORDS="mips"
 
 USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
+STAGE1_USE="mips"
diff --git a/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/make.defaults
new file mode 100644
index 000000000000..92306e613f33
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/make.defaults
@@ -0,0 +1,27 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP22/IP32 O32/NPTL Generic Profile
+# Also Catalyst Build Profile for O32/NPTL
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build a *minimum* of mips3, because IP22/IP32 are, at minimum, mips3 capable
+# systems (IP22 R4x00 systems are mips3; IP32 is mips4).  Enforce o32 as the default
+# ABI as well.
+CFLAGS="-O2 -pipe -march=mips3 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips nptl nptlonly"
+STAGE1_USE="mips nptl nptlonly"
diff --git a/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/package.mask b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/package.mask
new file mode 100644
index 000000000000..b092ad87e598
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/parent b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/parent
similarity index 100%
rename from profiles/default-linux/mips/mips64/n32/2004.2/parent
rename to profiles/default-linux/mips/2006.1/generic-be/o32/nptl/parent
diff --git a/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/use.mask b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/use.mask
new file mode 100644
index 000000000000..370f0f5a4340
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/o32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/generic-be/o32/packages b/profiles/default-linux/mips/2006.1/generic-be/o32/packages
new file mode 100644
index 000000000000..0e7bc82197f5
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/o32/packages
@@ -0,0 +1,9 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/o32/packages,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# o32-specific packages
+
+# Since we're running a mips64 kernel w/ 32bit (o32) userland,
+# we need gcc-mips64 for kernels
+*sys-devel/kgcc64
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/parent b/profiles/default-linux/mips/2006.1/generic-be/o32/parent
similarity index 100%
rename from profiles/default-linux/mips/mips64/n32/2005.0/parent
rename to profiles/default-linux/mips/2006.1/generic-be/o32/parent
diff --git a/profiles/default-linux/mips/2006.1/generic-be/packages b/profiles/default-linux/mips/2006.1/generic-be/packages
new file mode 100644
index 000000000000..c0e6b57bef56
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/packages
@@ -0,0 +1,10 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/packages,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Sometimes necessary to trick programs into thinking we're really
+# a mips32 system.
+*sys-apps/setarch
+
+# The default SGI Bootloader is ArcLoad
+*sys-boot/arcload
diff --git a/profiles/default-linux/mips/2006.1/generic-be/parent b/profiles/default-linux/mips/2006.1/generic-be/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/generic-be/virtuals b/profiles/default-linux/mips/2006.1/generic-be/virtuals
new file mode 100644
index 000000000000..bdb3f2acb958
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/generic-be/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/generic-be/virtuals,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+virtual/bootloader		sys-boot/arcload
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/make.defaults b/profiles/default-linux/mips/2006.1/ip27/n32/make.defaults
new file mode 100644
index 000000000000..14c110d81083
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/n32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP27 N32 Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP27 supports at minimum, a mips4
+# processor.  Enforce n32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 ip27"
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/make.defaults
new file mode 100644
index 000000000000..dbc88c7e5514
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/n32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP27 N32/NPTL Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP27 supports at minimum, a mips4
+# processor.  Enforce n32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 nptl nptlonly ip27"
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/nptl/package.mask b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/package.mask
new file mode 100644
index 000000000000..259b70abce58
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/n32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/nptl/parent b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/nptl/use.mask b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/use.mask
new file mode 100644
index 000000000000..3317d6daef60
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/n32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/parent b/profiles/default-linux/mips/2006.1/ip27/n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip27/n32/use.mask b/profiles/default-linux/mips/2006.1/ip27/n32/use.mask
new file mode 100644
index 000000000000..7ce73f82a498
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/n32/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/n32/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask n32
+-n32
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/make.defaults b/profiles/default-linux/mips/2006.1/ip27/o32/make.defaults
new file mode 100644
index 000000000000..c649070ccd08
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/o32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP27 O32 Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP27 supports at minimum, a mips4
+# processor.  Enforce o32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip27"
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/make.defaults
new file mode 100644
index 000000000000..58bbb473ba98
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/o32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP27 O32/NPTL Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP27 supports at minimum, a mips4
+# processor.  Enforce o32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips nptl nptlonly ip27"
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/nptl/package.mask b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/package.mask
new file mode 100644
index 000000000000..22c6b14a59b7
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/o32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/nptl/parent b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/nptl/use.mask b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/use.mask
new file mode 100644
index 000000000000..badfb7938632
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/o32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/packages b/profiles/default-linux/mips/2006.1/ip27/o32/packages
new file mode 100644
index 000000000000..0b80a153012f
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/packages
@@ -0,0 +1,9 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/o32/packages,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# o32-specific packages
+
+# Since we're running a mips64 kernel w/ 32bit (o32) userland,
+# we need gcc-mips64 for kernels
+*sys-devel/kgcc64
diff --git a/profiles/default-linux/mips/2006.1/ip27/o32/parent b/profiles/default-linux/mips/2006.1/ip27/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip27/packages b/profiles/default-linux/mips/2006.1/ip27/packages
new file mode 100644
index 000000000000..6cf40e4cd47a
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/packages
@@ -0,0 +1,10 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/packages,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Sometimes necessary to trick programs into thinking we're really
+# a mips32 system.
+*sys-apps/setarch
+
+# The default SGI Bootloader is ArcLoad
+*sys-boot/arcload
diff --git a/profiles/default-linux/mips/2006.1/ip27/parent b/profiles/default-linux/mips/2006.1/ip27/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip27/virtuals b/profiles/default-linux/mips/2006.1/ip27/virtuals
new file mode 100644
index 000000000000..27f24d9ccaa1
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip27/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip27/virtuals,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+virtual/bootloader		sys-boot/arcload
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/make.defaults b/profiles/default-linux/mips/2006.1/ip28/n32/make.defaults
new file mode 100644
index 000000000000..fae4c997f698
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/n32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP28 N32 Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP28 supports at minimum, a mips4
+# processor.  Enforce n32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 ip28"
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/make.defaults
new file mode 100644
index 000000000000..9c6d8eee4aa0
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/n32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP28 N32/NPTL Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP28 supports at minimum, a mips4
+# processor.  Enforce n32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 nptl nptlonly ip28"
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/nptl/package.mask b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/package.mask
new file mode 100644
index 000000000000..f760f0001f70
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/n32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/nptl/parent b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/nptl/use.mask b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/use.mask
new file mode 100644
index 000000000000..864a17f79bb5
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/n32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/parent b/profiles/default-linux/mips/2006.1/ip28/n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip28/n32/use.mask b/profiles/default-linux/mips/2006.1/ip28/n32/use.mask
new file mode 100644
index 000000000000..8cc8a22a3695
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/n32/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/n32/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask n32
+-n32
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults b/profiles/default-linux/mips/2006.1/ip28/o32/make.defaults
similarity index 55%
rename from profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
rename to profiles/default-linux/mips/2006.1/ip28/o32/make.defaults
index 4486f1b79b3c..b34e91c5cab1 100644
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/make.defaults
@@ -1,21 +1,22 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/ip28/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/o32/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP28 O32 Profile
 
 ARCH="mips"
+PROFILE_ARCH="mips64"
 
 # 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"
-
 # Sandbox is broken on mips (Bug #45814)
 FEATURES="-sandbox ccache autoconfig"
 
 # Compiler flags
-# IP28 only has one type of processor, an R10000
-CFLAGS="-O2 -pipe -march=r10000 -mtune=r10000 -mabi=32"
+# We build as mips4, because IP28 supports at minimum, a mips4
+# processor.  Enforce o32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
 CXXFLAGS=${CFLAGS}
 
 ACCEPT_KEYWORDS="mips"
diff --git a/profiles/default-linux/mips/2006.1/ip28/o32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/make.defaults
new file mode 100644
index 000000000000..3dffb57cafef
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/o32/nptl/make.defaults,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# IP28 O32/NPTL Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP28 supports at minimum, a mips4
+# processor.  Enforce o32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips nptl nptlonly ip28"
diff --git a/profiles/default-linux/mips/2006.1/ip28/o32/nptl/package.mask b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/package.mask
new file mode 100644
index 000000000000..c86941529efc
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/o32/nptl/package.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2006.1/ip28/o32/nptl/parent b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip28/o32/nptl/use.mask b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/use.mask
new file mode 100644
index 000000000000..755f166c4113
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/o32/nptl/use.mask,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/ip28/o32/packages b/profiles/default-linux/mips/2006.1/ip28/o32/packages
new file mode 100644
index 000000000000..c78b6137e726
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/packages
@@ -0,0 +1,9 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/o32/packages,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+# o32-specific packages
+
+# Since we're running a mips64 kernel w/ 32bit (o32) userland,
+# we need gcc-mips64 for kernels
+*sys-devel/kgcc64
diff --git a/profiles/default-linux/mips/2006.1/ip28/o32/parent b/profiles/default-linux/mips/2006.1/ip28/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip28/parent b/profiles/default-linux/mips/2006.1/ip28/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip28/virtuals b/profiles/default-linux/mips/2006.1/ip28/virtuals
new file mode 100644
index 000000000000..76faff02fb36
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip28/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip28/virtuals,v 1.1 2006/06/08 20:26:07 kumba Exp $
+
+virtual/bootloader		sys-boot/arcload
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/make.defaults b/profiles/default-linux/mips/2006.1/ip30/n32/make.defaults
new file mode 100644
index 000000000000..ec158c9585de
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/n32/make.defaults,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# IP30 N32 Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP30 supports at minimum, a mips4
+# processor.  Enforce n32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 ip30"
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/make.defaults
new file mode 100644
index 000000000000..8091b52feca1
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/n32/nptl/make.defaults,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# IP30 N32/NPTL Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# The n32 userland needs a 64bit compiler and CHOST
+CHOST="mips64-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP30 supports at minimum, a mips4
+# processor.  Enforce n32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=n32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips n32 nptl nptlonly ip30"
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/nptl/package.mask b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/package.mask
new file mode 100644
index 000000000000..638f69cc4e34
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/n32/nptl/package.mask,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/nptl/parent b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/nptl/use.mask b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/use.mask
new file mode 100644
index 000000000000..669805c29dda
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/n32/nptl/use.mask,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/parent b/profiles/default-linux/mips/2006.1/ip30/n32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip30/n32/use.mask b/profiles/default-linux/mips/2006.1/ip30/n32/use.mask
new file mode 100644
index 000000000000..950aec74fd61
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/n32/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/n32/use.mask,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# Unmask n32
+-n32
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/make.defaults b/profiles/default-linux/mips/2006.1/ip30/o32/make.defaults
new file mode 100644
index 000000000000..66c4c3afc174
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/o32/make.defaults,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# IP30 O32 Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP30 supports at minimum, a mips4
+# processor.  Enforce o32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips ip30"
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/nptl/make.defaults b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/make.defaults
new file mode 100644
index 000000000000..cb0660d5b6fa
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/make.defaults
@@ -0,0 +1,24 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/o32/nptl/make.defaults,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# IP30 O32/NPTL Profile
+
+ARCH="mips"
+PROFILE_ARCH="mips64"
+
+# Even though this is a 64bit kernel, we use a 32-bit userland (o32)
+CHOST="mips-unknown-linux-gnu"
+
+# Sandbox is broken on mips (Bug #45814)
+FEATURES="-sandbox ccache autoconfig"
+
+# Compiler flags
+# We build as mips4, because IP30 supports at minimum, a mips4
+# processor.  Enforce o32 as the default ABI as well.
+CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
+CXXFLAGS=${CFLAGS}
+
+ACCEPT_KEYWORDS="mips"
+
+USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips nptl nptlonly ip30"
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/nptl/package.mask b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/package.mask
new file mode 100644
index 000000000000..8dfc78cb42d8
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/package.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/o32/nptl/package.mask,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# Unmask gcc-4.x and glibc-2.4
+->=sys-devel/gcc-4.0
+->=sys-libs/glibc-2.4
+
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/nptl/parent b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/nptl/use.mask b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/use.mask
new file mode 100644
index 000000000000..2dfbdcfd6f61
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/nptl/use.mask
@@ -0,0 +1,8 @@
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/o32/nptl/use.mask,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# Unmask nptl
+-nptl
+-nptlonly
+
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/packages b/profiles/default-linux/mips/2006.1/ip30/o32/packages
new file mode 100644
index 000000000000..fbb14573dd55
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/packages
@@ -0,0 +1,9 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/o32/packages,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# o32-specific packages
+
+# Since we're running a mips64 kernel w/ 32bit (o32) userland,
+# we need gcc-mips64 for kernels
+*sys-devel/kgcc64
diff --git a/profiles/default-linux/mips/2006.1/ip30/o32/parent b/profiles/default-linux/mips/2006.1/ip30/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip30/packages b/profiles/default-linux/mips/2006.1/ip30/packages
new file mode 100644
index 000000000000..18edc6e9a629
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/packages
@@ -0,0 +1,10 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/packages,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+# Sometimes necessary to trick programs into thinking we're really
+# a mips32 system.
+*sys-apps/setarch
+
+# The default SGI Bootloader is ArcLoad
+*sys-boot/arcload
diff --git a/profiles/default-linux/mips/2006.1/ip30/parent b/profiles/default-linux/mips/2006.1/ip30/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default-linux/mips/2006.1/ip30/virtuals b/profiles/default-linux/mips/2006.1/ip30/virtuals
new file mode 100644
index 000000000000..804aec1a9267
--- /dev/null
+++ b/profiles/default-linux/mips/2006.1/ip30/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/2006.1/ip30/virtuals,v 1.1 2006/06/08 20:26:08 kumba Exp $
+
+virtual/bootloader		sys-boot/arcload
diff --git a/profiles/default-linux/mips/cobalt/2004.2/deprecated b/profiles/default-linux/mips/cobalt/2004.2/deprecated
deleted file mode 100644
index 7cd8e71ab2ed..000000000000
--- a/profiles/default-linux/mips/cobalt/2004.2/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/cobalt/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/cobalt/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/cobalt/2004.2/make.defaults b/profiles/default-linux/mips/cobalt/2004.2/make.defaults
deleted file mode 100644
index a6a84d1de455..000000000000
--- a/profiles/default-linux/mips/cobalt/2004.2/make.defaults
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 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.10 2006/02/01 13:41:15 wolf31o2 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"
-
-# Sandbox is broken on mips (Bug #45814)
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build mips4 by default because all cobalt systems use an RM5231 (or derivative)
-# CPU, which is in the R5000-class and is thus mips4 capable.  We also force the
-# ABI to o32 because there is no mips64 support on cobalt (yet) and it therefore
-# cannot run anything else.
-CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
-CXXFLAGS=${CFLAGS}
-
-ACCEPT_KEYWORDS="mips"
-
-USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/cobalt/2005.0/deprecated b/profiles/default-linux/mips/cobalt/2005.0/deprecated
deleted file mode 100644
index 7cd8e71ab2ed..000000000000
--- a/profiles/default-linux/mips/cobalt/2005.0/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/cobalt/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/cobalt/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/cobalt/2005.0/make.defaults b/profiles/default-linux/mips/cobalt/2005.0/make.defaults
deleted file mode 100644
index 3dd5b4725470..000000000000
--- a/profiles/default-linux/mips/cobalt/2005.0/make.defaults
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/cobalt/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 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"
-
-# Sandbox is broken on mips (Bug #45814)
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build mips4 by default because all cobalt systems use an RM5231 (or derivative)
-# CPU, which is in the R5000-class and is thus mips4 capable.  We also force the
-# ABI to o32 because there is no mips64 support on cobalt (yet) and it therefore
-# cannot run anything else.
-CFLAGS="-O2 -pipe -march=mips4 -mabi=32"
-CXXFLAGS=${CFLAGS}
-
-ACCEPT_KEYWORDS="mips"
-
-USE="readline gpm berkdb fortran gdbm tcpd pam libwww ssl nls perl python sdl cobalt -n32 -n64 -multilib nomultilib"
diff --git a/profiles/default-linux/mips/mips64/2004.2/deprecated b/profiles/default-linux/mips/mips64/2004.2/deprecated
deleted file mode 100644
index b3c119adf24c..000000000000
--- a/profiles/default-linux/mips/mips64/2004.2/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/mips64/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/mips64/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/mips64/2004.2/packages b/profiles/default-linux/mips/mips64/2004.2/packages
deleted file mode 100644
index 07072b49cfd6..000000000000
--- a/profiles/default-linux/mips/mips64/2004.2/packages
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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.4 2006/04/10 23:14:45 vapier 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-apps/setarch
diff --git a/profiles/default-linux/mips/mips64/2005.0/deprecated b/profiles/default-linux/mips/mips64/2005.0/deprecated
deleted file mode 100644
index b3c119adf24c..000000000000
--- a/profiles/default-linux/mips/mips64/2005.0/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/mips64/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/mips64/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/mips64/2005.0/make.defaults b/profiles/default-linux/mips/mips64/2005.0/make.defaults
deleted file mode 100644
index cdb17da24235..000000000000
--- a/profiles/default-linux/mips/mips64/2005.0/make.defaults
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/2005.0/make.defaults,v 1.3 2006/02/01 13:41:15 wolf31o2 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"
-
-# Sandbox is broken on mips (Bug #45814)
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build a *minimum* of mips3, because just about any mips64 box we theoretically
-# support should meet the mips3 standard.  This is also the mips64 o32 profile,
-# so make that the default ABI
-CFLAGS="-O2 -pipe -march=mips3 -mabi=32"
-CXXFLAGS=${CFLAGS}
-
-ACCEPT_KEYWORDS="mips"
-
-USE="readline fortran gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips"
diff --git a/profiles/default-linux/mips/mips64/2005.0/packages b/profiles/default-linux/mips/mips64/2005.0/packages
deleted file mode 100644
index 12dcb00fd770..000000000000
--- a/profiles/default-linux/mips/mips64/2005.0/packages
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/2005.0/packages,v 1.2 2006/04/10 23:14:45 vapier 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-apps/setarch
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/deprecated b/profiles/default-linux/mips/mips64/ip28/2005.0/deprecated
deleted file mode 100644
index 5c1e7cb1e846..000000000000
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/mips64/ip28/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/mips64/ip28/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/mips64/ip28/2005.0/packages b/profiles/default-linux/mips/mips64/ip28/2005.0/packages
deleted file mode 100644
index b77b1ffd9f38..000000000000
--- a/profiles/default-linux/mips/mips64/ip28/2005.0/packages
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/ip28/2005.0/packages,v 1.2 2006/04/10 23:14:45 vapier 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-apps/setarch
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/deprecated b/profiles/default-linux/mips/mips64/n32/2004.2/deprecated
deleted file mode 100644
index 956a59d7a07c..000000000000
--- a/profiles/default-linux/mips/mips64/n32/2004.2/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/mips64/n32/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/mips64/n32/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults b/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
deleted file mode 100644
index b75ec474a68e..000000000000
--- a/profiles/default-linux/mips/mips64/n32/2004.2/make.defaults
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 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.12 2006/02/01 13:41:15 wolf31o2 Exp $
-
-ARCH="mips"
-
-# 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"
-
-# Sandbox is broken on mips (Bug #45814)
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build a *minimum* of mips3, because just about any mips64 box we theoretically
-# support should meet the mips3 standard.  This is also the n32 profile, so set
-# the default build ABI to n32
-CFLAGS="-O2 -pipe -march=mips3 -mabi=n32"
-CXXFLAGS=${CFLAGS}
-
-# There is no "stable" n32 support yet.  It's aaaalllll experimental
-ACCEPT_KEYWORDS="mips ~mips"
-
-STAGE1_USE="n32"
-USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
diff --git a/profiles/default-linux/mips/mips64/n32/2004.2/packages b/profiles/default-linux/mips/mips64/n32/2004.2/packages
deleted file mode 100644
index 47cd9b84718a..000000000000
--- a/profiles/default-linux/mips/mips64/n32/2004.2/packages
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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.5 2005/04/02 01:03:48 kumba Exp $
-
-# mips64 n32 packages
-
-# 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. UPDATE: gcc-3.4.3 seems to work, unmasking
-#*<sys-devel/gcc-3.4.2
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/deprecated b/profiles/default-linux/mips/mips64/n32/2005.0/deprecated
deleted file mode 100644
index 956a59d7a07c..000000000000
--- a/profiles/default-linux/mips/mips64/n32/2005.0/deprecated
+++ /dev/null
@@ -1,8 +0,0 @@
-default-linux/mips/mips64/n32/2006.0
-# emerge -n '>=sys-apps/portage-2.0.51'
-# cd /etc/
-# rm make.profile
-# ln -s ../usr/portage/profiles/default-linux/mips/mips64/n32/2006.0 make.profile
-
-# More information can be found at the following URLs:
-# http://www.gentoo.org/doc/en/gentoo-upgrading.xml
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults b/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
deleted file mode 100644
index 0db987c50eab..000000000000
--- a/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/mips64/n32/2005.0/make.defaults,v 1.4 2006/02/01 13:41:15 wolf31o2 Exp $
-
-ARCH="mips"
-
-# 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"
-
-# Sandbox is broken on mips (Bug #45814)
-FEATURES="-sandbox ccache autoconfig"
-
-# Compiler flags
-# We build a *minimum* of mips3, because just about any mips64 box we theoretically
-# support should meet the mips3 standard.  This is also the n32 profile, so set
-# the default build ABI to n32
-CFLAGS="-O2 -pipe -march=mips3 -mabi=n32"
-CXXFLAGS=${CFLAGS}
-
-# There is no "stable" n32 support yet.  It's aaaalllll experimental
-ACCEPT_KEYWORDS="mips ~mips"
-
-STAGE1_USE="n32"
-USE="${STAGE1_USE} readline fortran gpm berkdb gdbm tcpd pam crypt libwww ssl nls perl python sdl mips -multilib nomultilib"
diff --git a/profiles/default-linux/mips/mips64/n32/2005.0/packages b/profiles/default-linux/mips/mips64/n32/2005.0/packages
deleted file mode 100644
index 424d63f3a2f9..000000000000
--- a/profiles/default-linux/mips/mips64/n32/2005.0/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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/2005.0/packages,v 1.4 2005/04/26 18:56:25 kumba Exp $
-
-# mips64 n32 packages
-
diff --git a/profiles/default-linux/mips/use.mask b/profiles/default-linux/mips/use.mask
index 8e8c930cb0d2..6834e415ec67 100644
--- a/profiles/default-linux/mips/use.mask
+++ b/profiles/default-linux/mips/use.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.48 2006/04/22 04:34:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/use.mask,v 1.49 2006/06/08 20:26:07 kumba Exp $
 
 # 2006/03/07 - Donnie Berkholz <spyderous@gentoo.org>
 # Modular X: mask for architectures lacking direct rendering
@@ -186,6 +186,7 @@ evo
 # Ilya A. Volynets-Evenbach
 # no nptl on mips yet
 nptl
+nptlonly
 
 # Paul de Vrieze <pauldv@gentoo.org>
 # There is no java in this profile (if there is it must be available). Without
@@ -274,7 +275,3 @@ glitz
 pike
 ocaml
 timidity
-
-# Unmask our instruction sets
--n32
--n64
diff --git a/profiles/default-linux/mips/virtuals b/profiles/default-linux/mips/virtuals
index 75e0b2e47b25..b9bfccc3ec1d 100644
--- a/profiles/default-linux/mips/virtuals
+++ b/profiles/default-linux/mips/virtuals
@@ -1,7 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.9 2006/04/20 16:40:53 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.10 2006/06/08 20:26:07 kumba Exp $
 
-virtual/alsa				sys-kernel/mips-sources
+virtual/alsa			sys-kernel/mips-sources
 virtual/linux-sources		sys-kernel/mips-sources
-virtual/os-headers			sys-kernel/mips-headers
+virtual/os-headers		sys-kernel/mips-headers
+virtual/dev-manager		sys-fs/udev
+virtual/modutils		sys-apps/module-init-tools
+virtual/logger			app-admin/syslog-ng
-- 
2.26.2