Remove the two-abi multilib profiles

49 files changed, 40 insertions, 73 deletions

diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 6c83d0824d66..ee35e7bc9dc9 100644
--- a/profiles/arch/mips/ChangeLog
+++ b/profiles/arch/mips/ChangeLog
@@ -1,6 +1,45 @@
 # 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.141 2014/07/01 14:34:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.142 2014/07/10 19:23:46 blueness Exp $
+
+  10 Jul 2014; Anthony G. Basile <blueness@gentoo.org>
+  -mips64/multilib/n32-n64/deprecated, -mips64/multilib/n32-n64/eapi,
+  -mips64/multilib/n32-n64/make.defaults, -mips64/multilib/n32-n64/parent,
+  -mips64/multilib/n32-o32/deprecated, -mips64/multilib/n32-o32/eapi,
+  -mips64/multilib/n32-o32/make.defaults, -mips64/multilib/n32-o32/parent,
+  -mips64/multilib/n64-n32/deprecated, -mips64/multilib/n64-n32/eapi,
+  -mips64/multilib/n64-n32/make.defaults, -mips64/multilib/n64-n32/parent,
+  -mips64/multilib/n64-o32/deprecated, -mips64/multilib/n64-o32/eapi,
+  -mips64/multilib/n64-o32/make.defaults, -mips64/multilib/n64-o32/parent,
+  -mips64/multilib/o32-n32/deprecated, -mips64/multilib/o32-n32/eapi,
+  -mips64/multilib/o32-n32/make.defaults, -mips64/multilib/o32-n32/parent,
+  -mips64/multilib/o32-n64/deprecated, -mips64/multilib/o32-n64/eapi,
+  -mips64/multilib/o32-n64/make.defaults, -mips64/multilib/o32-n64/parent,
+  -mipsel/mips64el/multilib/n32-n64/deprecated,
+  -mipsel/mips64el/multilib/n32-n64/eapi,
+  -mipsel/mips64el/multilib/n32-n64/make.defaults,
+  -mipsel/mips64el/multilib/n32-n64/parent,
+  -mipsel/mips64el/multilib/n32-o32/deprecated,
+  -mipsel/mips64el/multilib/n32-o32/eapi,
+  -mipsel/mips64el/multilib/n32-o32/make.defaults,
+  -mipsel/mips64el/multilib/n32-o32/parent,
+  -mipsel/mips64el/multilib/n64-n32/deprecated,
+  -mipsel/mips64el/multilib/n64-n32/eapi,
+  -mipsel/mips64el/multilib/n64-n32/make.defaults,
+  -mipsel/mips64el/multilib/n64-n32/parent,
+  -mipsel/mips64el/multilib/n64-o32/deprecated,
+  -mipsel/mips64el/multilib/n64-o32/eapi,
+  -mipsel/mips64el/multilib/n64-o32/make.defaults,
+  -mipsel/mips64el/multilib/n64-o32/parent,
+  -mipsel/mips64el/multilib/o32-n32/deprecated,
+  -mipsel/mips64el/multilib/o32-n32/eapi,
+  -mipsel/mips64el/multilib/o32-n32/make.defaults,
+  -mipsel/mips64el/multilib/o32-n32/parent,
+  -mipsel/mips64el/multilib/o32-n64/deprecated,
+  -mipsel/mips64el/multilib/o32-n64/eapi,
+  -mipsel/mips64el/multilib/o32-n64/make.defaults,
+  -mipsel/mips64el/multilib/o32-n64/parent:
+  Remove the two-abi multilib profiles
 
   01 Jul 2014; Michał Górny <mgorny@gentoo.org> make.defaults,
   mipsel/make.defaults:
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/deprecated b/profiles/arch/mips/mips64/multilib/n32-n64/deprecated
deleted file mode 100644
index 1c4cbce43796..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mips64/multilib/n32
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/eapi b/profiles/arch/mips/mips64/multilib/n32-n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/make.defaults b/profiles/arch/mips/mips64/multilib/n32-n64/make.defaults
deleted file mode 100644
index 9fedd70bcdae..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-n64/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n64 n32"
-DEFAULT_ABI="n32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32-n64/parent b/profiles/arch/mips/mips64/multilib/n32-n64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-n64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/deprecated b/profiles/arch/mips/mips64/multilib/n32-o32/deprecated
deleted file mode 100644
index 1c4cbce43796..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mips64/multilib/n32
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/eapi b/profiles/arch/mips/mips64/multilib/n32-o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/make.defaults b/profiles/arch/mips/mips64/multilib/n32-o32/make.defaults
deleted file mode 100644
index c15dc478ccca..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-o32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="o32 n32"
-DEFAULT_ABI="n32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n32-o32/parent b/profiles/arch/mips/mips64/multilib/n32-o32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mips64/multilib/n32-o32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/deprecated b/profiles/arch/mips/mips64/multilib/n64-n32/deprecated
deleted file mode 100644
index b4b9f46b9d52..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mips64/multilib/n64
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/eapi b/profiles/arch/mips/mips64/multilib/n64-n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/make.defaults b/profiles/arch/mips/mips64/multilib/n64-n32/make.defaults
deleted file mode 100644
index 71bbbc1a7fbb..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-n32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n32 n64"
-DEFAULT_ABI="n64"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n64-n32/parent b/profiles/arch/mips/mips64/multilib/n64-n32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-n32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/deprecated b/profiles/arch/mips/mips64/multilib/n64-o32/deprecated
deleted file mode 100644
index b4b9f46b9d52..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mips64/multilib/n64
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/eapi b/profiles/arch/mips/mips64/multilib/n64-o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/make.defaults b/profiles/arch/mips/mips64/multilib/n64-o32/make.defaults
deleted file mode 100644
index 275eb765d437..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-o32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="o32 n64"
-DEFAULT_ABI="n64"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/n64-o32/parent b/profiles/arch/mips/mips64/multilib/n64-o32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mips64/multilib/n64-o32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/deprecated b/profiles/arch/mips/mips64/multilib/o32-n32/deprecated
deleted file mode 100644
index 1a1165591c98..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mips64/multilib/o32
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/eapi b/profiles/arch/mips/mips64/multilib/o32-n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/make.defaults b/profiles/arch/mips/mips64/multilib/o32-n32/make.defaults
deleted file mode 100644
index f5e72f35f314..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n32 o32"
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/o32-n32/parent b/profiles/arch/mips/mips64/multilib/o32-n32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/deprecated b/profiles/arch/mips/mips64/multilib/o32-n64/deprecated
deleted file mode 100644
index 1a1165591c98..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mips64/multilib/o32
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/eapi b/profiles/arch/mips/mips64/multilib/o32-n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/make.defaults b/profiles/arch/mips/mips64/multilib/o32-n64/make.defaults
deleted file mode 100644
index 0fbad2a60d02..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n64/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n64 o32"
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mips64/multilib/o32-n64/parent b/profiles/arch/mips/mips64/multilib/o32-n64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mips64/multilib/o32-n64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/deprecated b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/deprecated
deleted file mode 100644
index 848975e7e7df..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/eapi b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/make.defaults
deleted file mode 100644
index 9fedd70bcdae..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n64 n32"
-DEFAULT_ABI="n32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-n64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/deprecated b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/deprecated
deleted file mode 100644
index 848975e7e7df..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mipsel/mips64el/multilib/n32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/eapi b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/make.defaults
deleted file mode 100644
index c15dc478ccca..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="o32 n32"
-DEFAULT_ABI="n32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n32-o32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/deprecated b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/deprecated
deleted file mode 100644
index b47d4f531c53..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/eapi b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/make.defaults
deleted file mode 100644
index 71bbbc1a7fbb..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n32 n64"
-DEFAULT_ABI="n64"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-n32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/deprecated b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/deprecated
deleted file mode 100644
index b47d4f531c53..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mipsel/mips64el/multilib/n64
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/eapi b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/make.defaults
deleted file mode 100644
index 275eb765d437..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="o32 n64"
-DEFAULT_ABI="n64"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/n64-o32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/deprecated b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/deprecated
deleted file mode 100644
index d0c755dcfbab..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mipsel/mips64el/multilib/o32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/eapi b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/make.defaults
deleted file mode 100644
index f5e72f35f314..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n32 o32"
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/parent b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/deprecated b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/deprecated
deleted file mode 100644
index d0c755dcfbab..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/deprecated
+++ /dev/null
@@ -1 +0,0 @@
-arch/mips/mipsel/mips64el/multilib/o32
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/eapi b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/make.defaults b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/make.defaults
deleted file mode 100644
index 0fbad2a60d02..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_ABIS="n64 o32"
-DEFAULT_ABI="o32"
-ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/parent b/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/arch/mips/mipsel/mips64el/multilib/o32-n64/parent
+++ /dev/null
@@ -1 +0,0 @@
-..