8 files changed, 12 insertions, 29 deletions
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 140fa0b6b0b6..69d09abac549 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -18,8 +18,10 @@ DEFAULT_ABI="amd64"
 # Do not remove this one, or all kinds of hell breaks loose.
 ABI="amd64"
 
+LIBDIR_amd64="lib64"
 # TODO: move this to a deprecated subprofile
 LIBDIR_x86="lib32"
+LIBDIR_x32="libx32"
 SYMLINK_LIB="yes"
 
 # 64bit specific settings.
diff --git a/profiles/arch/amd64/x32/make.defaults b/profiles/arch/amd64/x32/make.defaults
index d06c616b15fa..c6c6c90d74ec 100644
--- a/profiles/arch/amd64/x32/make.defaults
+++ b/profiles/arch/amd64/x32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,6 +6,7 @@ DEFAULT_ABI="x32"
 ABI="x32"
 MULTILIB_ABIS="amd64 x86 x32"
 
+LIBDIR_x86="lib"
 SYMLINK_LIB="no"
 
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
diff --git a/profiles/arch/amd64/x32/parent b/profiles/arch/amd64/x32/parent
index 6ee1b9eff10c..f3229c5b9876 100644
--- a/profiles/arch/amd64/x32/parent
+++ b/profiles/arch/amd64/x32/parent
@@ -1,2 +1 @@
 ..
-../../../features/multilib
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 6a75c191a621..20318a45380b 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -12,5 +12,7 @@ CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
+LIBDIR_arm64="lib64"
+
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults
deleted file mode 100644
index 445a68b5ea0f..000000000000
--- a/profiles/arch/powerpc/make.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index aa7b92133fb3..a4076b2adfc1 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,6 +15,9 @@ CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
+LIBDIR_s390x="lib64"
+LIBDIR_s390="lib"
+
 INPUT_DEVICES="void"
 VIDEO_CARDS="dummy"
 
diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults
index c8bad628fd9a..85bff4ebd437 100644
--- a/profiles/default/linux/sparc/experimental/multilib/make.defaults
+++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults
@@ -13,3 +13,4 @@ FEATURES="userpriv"
 CFLAGS_sparc64="-m64"
 
 LIBDIR_sparc32="lib32"
+LIBDIR_sparc64="lib64"
diff --git a/profiles/features/multilib/make.defaults b/profiles/features/multilib/make.defaults
index 72248e2390ef..2e201e35d31a 100644
--- a/profiles/features/multilib/make.defaults
+++ b/profiles/features/multilib/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,25 +15,3 @@ USE="multilib"
 MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib"
 MULTILIB_STRICT_DENY="64-bit.*shared object"
 MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|binutils|eclipse-3|debug|portage|udev|systemd|clang|python-exec)"
-
-# 64-bit LIBDIR
-LIBDIR_amd64="lib64"
-LIBDIR_amd64_fbsd="lib64"
-LIBDIR_arm64="lib64"
-LIBDIR_n64="lib64"	# MIPS n64
-LIBDIR_ppc64="lib64"
-LIBDIR_s390x="lib64"
-LIBDIR_sparc64="lib64"
-
-# 32-bit LIBDIR
-LIBDIR_arm="lib"
-LIBDIR_x86="lib"
-LIBDIR_x86_fbsd="lib"
-LIBDIR_o32="lib"	# MIPS o32
-LIBDIR_ppc="lib"
-LIBDIR_s390="lib"
-LIBDIR_sparc32="lib"
-
-# Somewhere in-between!
-LIBDIR_x32="libx32"	# x86-64 x32
-LIBDIR_n32="lib32"	# MIPS n32