profiles: Inline features/multilib/lib32

NFC except for effective LIBDIR_* for architectures irrelevant to
the profile at hand.

9 files changed, 11 insertions, 19 deletions

diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
index 432f7743cf58..36e84de2c64b 100644
--- a/profiles/arch/amd64-fbsd/make.defaults
+++ b/profiles/arch/amd64-fbsd/make.defaults
@@ -31,6 +31,7 @@ VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
 # distros.
 # Adjust multilib dirs for multilib-strict.
 LIBDIR_amd64_fbsd="lib"
+LIBDIR_x86_fbsd="lib32"
 MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X11R6/lib32"
 SYMLINK_LIB="no"
 
diff --git a/profiles/arch/amd64-fbsd/parent b/profiles/arch/amd64-fbsd/parent
index db3aa68cdfc0..014611b2535c 100644
--- a/profiles/arch/amd64-fbsd/parent
+++ b/profiles/arch/amd64-fbsd/parent
@@ -1,3 +1,3 @@
 ../base
-../../features/multilib/lib32
+../../features/multilib
 todo
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index df7976d89a1d..140fa0b6b0b6 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -18,6 +18,10 @@ DEFAULT_ABI="amd64"
 # Do not remove this one, or all kinds of hell breaks loose.
 ABI="amd64"
 
+# TODO: move this to a deprecated subprofile
+LIBDIR_x86="lib32"
+SYMLINK_LIB="yes"
+
 # 64bit specific settings.
 CFLAGS_amd64="-m64"
 LDFLAGS_amd64="-m elf_x86_64"
diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent
index d8d1efff8456..c5b66f7e9c9c 100644
--- a/profiles/arch/amd64/parent
+++ b/profiles/arch/amd64/parent
@@ -1,2 +1,2 @@
 ../base
-../../features/multilib/lib32
+../../features/multilib
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults
index e7aebfdaa360..c8bad628fd9a 100644
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults
+++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,3 +11,5 @@ FEATURES="userpriv"
 # can't set this in the top level make.defaults as it breaks
 # sys-kernel/linux-headers for non-multilib profiles
 CFLAGS_sparc64="-m64"
+
+LIBDIR_sparc32="lib32"
diff --git a/profiles/default/linux/sparc/experimental/multilib/parent b/profiles/default/linux/sparc/experimental/multilib/parent
index 7607023366ad..04ec01cf0979 100644
--- a/profiles/default/linux/sparc/experimental/multilib/parent
+++ b/profiles/default/linux/sparc/experimental/multilib/parent
@@ -1,3 +1,3 @@
 ..
 ../../../../../releases/13.0
-../../../../../features/multilib/lib32
+../../../../../features/multilib
diff --git a/profiles/features/multilib/lib32/eapi b/profiles/features/multilib/lib32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/features/multilib/lib32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/multilib/lib32/make.defaults b/profiles/features/multilib/lib32/make.defaults
deleted file mode 100644
index b3ab33c98e43..000000000000
--- a/profiles/features/multilib/lib32/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Let baselayout create the lib symlink.
-SYMLINK_LIB="yes"
-
-# 32-bit LIBDIR
-LIBDIR_ppc="lib32"
-LIBDIR_x86="lib32"
-LIBDIR_x86_fbsd="lib32"
-LIBDIR_sparc32="lib32"
-LIBDIR_s390="lib32"
diff --git a/profiles/features/multilib/lib32/parent b/profiles/features/multilib/lib32/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/features/multilib/lib32/parent
+++ /dev/null
@@ -1 +0,0 @@
-..