Restructure to accomodate new multilib scheme

24 files changed, 72 insertions, 67 deletions

diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 723ebd0cbc9d..896000cd7cc3 100644
--- a/profiles/arch/mips/ChangeLog
+++ b/profiles/arch/mips/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for Gentoo/MIPS profile directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.147 2014/10/04 11:41:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.148 2014/10/11 08:22:41 blueness Exp $
+
+  11 Oct 2014; Anthony G. Basile <blueness@gentoo.org> make.defaults,
+  mips64/make.defaults, mips64/n32/use.mask, mips64/n64/use.mask,
+  -mips64/use.force, -mips64/use.mask, -mipsel/eapi, -mipsel/make.defaults,
+  mipsel/mips64el/n32/use.mask, mipsel/mips64el/n64/use.mask,
+  -mipsel/mips64el/use.force, -mipsel/mips64el/use.mask, +mipsel/o32/eapi,
+  +mipsel/o32/make.defaults, +mipsel/o32/parent, +mipsel/o32/use.force,
+  +mipsel/o32/use.mask, +o32/eapi, +o32/make.defaults, +o32/parent,
+  +o32/use.force, +o32/use.mask, use.force, use.mask:
+  Restructure to accomodate new multilib scheme
 
   04 Oct 2014; Markos Chandras <hwoarang@gentoo.org> use.mask:
   Drop qt4 mask. The package is keyworded on MIPS. Mask it again on a
diff --git a/profiles/arch/mips/make.defaults b/profiles/arch/mips/make.defaults
index 6d30366cd980..fde399bdf671 100644
--- a/profiles/arch/mips/make.defaults
+++ b/profiles/arch/mips/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2008-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/make.defaults,v 1.13 2014/07/01 14:34:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/make.defaults,v 1.14 2014/10/11 08:22:41 blueness Exp $
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
@@ -13,20 +13,10 @@ PROFILE_ARCH="mips"
 
 USE="-fortran -openmp"
 
-CHOST="mips-unknown-linux-gnu"
-CHOST_o32="mips-unknown-linux-gnu"
-
 LIBDIR_o32="lib"
 LIBDIR_n32="lib32"
 LIBDIR_n64="lib64"
 
-ABI="o32"
-DEFAULT_ABI="o32"
-MULTILIB_ABIS="o32"
-
-ABI_MIPS="o32"
-IUSE_IMPLICIT="abi_mips_o32"
-
 # 2010/12/06 - Matt Turner <mattst88@gentoo.org>
 # Probably missing a bunch for various SGI systems.
 ALSA_CARDS="au1x00"
diff --git a/profiles/arch/mips/mips64/make.defaults b/profiles/arch/mips/mips64/make.defaults
index 528d069cbc36..47eccc568753 100644
--- a/profiles/arch/mips/mips64/make.defaults
+++ b/profiles/arch/mips/mips64/make.defaults
@@ -1,9 +1,7 @@
 # Copyright 2010-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/make.defaults,v 1.3 2014/06/30 15:34:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/make.defaults,v 1.4 2014/10/11 08:22:41 blueness Exp $
 
 PROFILE_ARCH="mips64"
 
 CHOST="mips64-unknown-linux-gnu"
-
-IUSE_IMPLICIT="-abi_mips_o32"
diff --git a/profiles/arch/mips/mips64/n32/use.mask b/profiles/arch/mips/mips64/n32/use.mask
index 426858caefa8..d5c49aa65e2d 100644
--- a/profiles/arch/mips/mips64/n32/use.mask
+++ b/profiles/arch/mips/mips64/n32/use.mask
@@ -1,7 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/n32/use.mask,v 1.1 2014/06/30 15:16:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/n32/use.mask,v 1.2 2014/10/11 08:22:41 blueness Exp $
 
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
 -abi_mips_n32
diff --git a/profiles/arch/mips/mips64/n64/use.mask b/profiles/arch/mips/mips64/n64/use.mask
index edf67b17ac5b..3c2909a91906 100644
--- a/profiles/arch/mips/mips64/n64/use.mask
+++ b/profiles/arch/mips/mips64/n64/use.mask
@@ -1,7 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/n64/use.mask,v 1.1 2014/06/30 15:16:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/n64/use.mask,v 1.2 2014/10/11 08:22:41 blueness Exp $
 
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
 -abi_mips_n64
diff --git a/profiles/arch/mips/mips64/use.force b/profiles/arch/mips/mips64/use.force
deleted file mode 100644
index 51b0dbb8298f..000000000000
--- a/profiles/arch/mips/mips64/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2008-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/use.force,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unforce o32 back for mips64 subprofiles.
--abi_mips_o32
diff --git a/profiles/arch/mips/mips64/use.mask b/profiles/arch/mips/mips64/use.mask
deleted file mode 100644
index 1f7e8cdcd95f..000000000000
--- a/profiles/arch/mips/mips64/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mips64/use.mask,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Mask o32 back for mips64 subprofiles.
-abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/make.defaults b/profiles/arch/mips/mipsel/make.defaults
deleted file mode 100644
index e9bbec3b596d..000000000000
--- a/profiles/arch/mips/mipsel/make.defaults
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2010-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/make.defaults,v 1.3 2014/07/01 14:34:52 mgorny Exp $
-
-PROFILE_ARCH="mipsel"
-
-CHOST="mipsel-unknown-linux-gnu"
-CHOST_o32="mipsel-unknown-linux-gnu"
diff --git a/profiles/arch/mips/mipsel/mips64el/n32/use.mask b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
index 64a57da5539e..8a49f60f2a9a 100644
--- a/profiles/arch/mips/mipsel/mips64el/n32/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n32/use.mask
@@ -1,7 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/n32/use.mask,v 1.1 2014/06/30 15:16:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/n32/use.mask,v 1.2 2014/10/11 08:22:41 blueness Exp $
 
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
 -abi_mips_n32
diff --git a/profiles/arch/mips/mipsel/mips64el/n64/use.mask b/profiles/arch/mips/mipsel/mips64el/n64/use.mask
index b846477f1c90..0932d5c9ddb2 100644
--- a/profiles/arch/mips/mipsel/mips64el/n64/use.mask
+++ b/profiles/arch/mips/mipsel/mips64el/n64/use.mask
@@ -1,7 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/n64/use.mask,v 1.1 2014/06/30 15:16:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/n64/use.mask,v 1.2 2014/10/11 08:22:41 blueness Exp $
 
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unmask the matching multilib flag.
 -abi_mips_n64
diff --git a/profiles/arch/mips/mipsel/mips64el/use.force b/profiles/arch/mips/mipsel/mips64el/use.force
deleted file mode 100644
index 2212cda5373d..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2008-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/use.force,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Unforce o32 back for mips64 subprofiles.
--abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/mips64el/use.mask b/profiles/arch/mips/mipsel/mips64el/use.mask
deleted file mode 100644
index e4f0841e1fcf..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/mips64el/use.mask,v 1.1 2014/06/30 15:34:54 mgorny Exp $
-
-# Michał Górny <mgorny@gentoo.org> (30 Jun 2014)
-# Mask o32 back for mips64el subprofiles.
-abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/eapi b/profiles/arch/mips/mipsel/o32/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/arch/mips/mipsel/eapi
+++ b/profiles/arch/mips/mipsel/o32/eapi
diff --git a/profiles/arch/mips/mipsel/o32/make.defaults b/profiles/arch/mips/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..00323236959e
--- /dev/null
+++ b/profiles/arch/mips/mipsel/o32/make.defaults
@@ -0,0 +1,15 @@
+# Copyright 2010-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/o32/make.defaults,v 1.1 2014/10/11 08:22:41 blueness Exp $
+
+PROFILE_ARCH="mipsel"
+
+CHOST="mipsel-unknown-linux-gnu"
+CHOST_o32="mipsel-unknown-linux-gnu"
+
+ABI="o32"
+DEFAULT_ABI="o32"
+MULTILIB_ABIS="o32"
+
+ABI_MIPS="o32"
+IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/arch/mips/mipsel/o32/parent b/profiles/arch/mips/mipsel/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/mipsel/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/mipsel/o32/use.force b/profiles/arch/mips/mipsel/o32/use.force
new file mode 100644
index 000000000000..0a877ced8e4b
--- /dev/null
+++ b/profiles/arch/mips/mipsel/o32/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/o32/use.force,v 1.1 2014/10/11 08:22:41 blueness Exp $
+
+abi_mips_o32
diff --git a/profiles/arch/mips/mipsel/o32/use.mask b/profiles/arch/mips/mipsel/o32/use.mask
new file mode 100644
index 000000000000..9886a9ea4c16
--- /dev/null
+++ b/profiles/arch/mips/mipsel/o32/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/mipsel/o32/use.mask,v 1.1 2014/10/11 08:22:41 blueness Exp $
+
+-abi_mips_o32
diff --git a/profiles/arch/mips/o32/eapi b/profiles/arch/mips/o32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/mips/o32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/mips/o32/make.defaults b/profiles/arch/mips/o32/make.defaults
new file mode 100644
index 000000000000..6a04a64f438b
--- /dev/null
+++ b/profiles/arch/mips/o32/make.defaults
@@ -0,0 +1,15 @@
+# Copyright 2010-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/o32/make.defaults,v 1.1 2014/10/11 08:22:41 blueness Exp $
+
+PROFILE_ARCH="mipsel"
+
+CHOST="mips-unknown-linux-gnu"
+CHOST_o32="mips-unknown-linux-gnu"
+
+ABI="o32"
+DEFAULT_ABI="o32"
+MULTILIB_ABIS="o32"
+
+ABI_MIPS="o32"
+IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/arch/mips/o32/parent b/profiles/arch/mips/o32/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/mips/o32/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/mips/o32/use.force b/profiles/arch/mips/o32/use.force
new file mode 100644
index 000000000000..a4ecdb9c1188
--- /dev/null
+++ b/profiles/arch/mips/o32/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/o32/use.force,v 1.1 2014/10/11 08:22:41 blueness Exp $
+
+abi_mips_o32
diff --git a/profiles/arch/mips/o32/use.mask b/profiles/arch/mips/o32/use.mask
new file mode 100644
index 000000000000..f9228d95fb6b
--- /dev/null
+++ b/profiles/arch/mips/o32/use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/o32/use.mask,v 1.1 2014/10/11 08:22:41 blueness Exp $
+
+-abi_mips_o32
diff --git a/profiles/arch/mips/use.force b/profiles/arch/mips/use.force
index 890f1e4b3e76..f0e1fd039c4b 100644
--- a/profiles/arch/mips/use.force
+++ b/profiles/arch/mips/use.force
@@ -1,7 +1,6 @@
 # Copyright 2008-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.force,v 1.3 2014/06/30 15:34:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.force,v 1.4 2014/10/11 08:22:41 blueness Exp $
 
 # Force the flag which corresponds to ARCH.
 mips
-abi_mips_o32
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index efe35b449000..197691059f19 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.76 2014/10/04 11:41:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.77 2014/10/11 08:22:41 blueness Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -mips
--abi_mips_o32
 
 # Markos Chandras <hwoarang@gentoo.org>
 # app-arch/lz4 does not seem to build on MIPS