commit: ca545f53d73635456f2efcc5b10c95b3d1d47622
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 20:44:01 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 11:05:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca545f53
profiles: Drop ABI_RISCV from riscv profiles; it's multilib overkill
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
profiles/arch/base/use.mask | 4 ----
profiles/arch/riscv/rv32imac/ilp32/make.defaults | 3 ---
profiles/arch/riscv/rv32imac/ilp32/package.use.force | 2 --
profiles/arch/riscv/rv32imac/ilp32/use.force | 7 ++-----
profiles/arch/riscv/rv32imac/ilp32/use.mask | 5 -----
profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 3 ---
profiles/arch/riscv/rv32imac/ilp32d/package.use.force | 5 +----
profiles/arch/riscv/rv32imac/ilp32d/use.mask | 7 +------
profiles/arch/riscv/rv32imac/make.defaults | 9 ---------
profiles/arch/riscv/rv32imac/use.force | 5 +----
profiles/arch/riscv/rv32imac/use.mask | 6 +-----
profiles/arch/riscv/rv64gc/lp64/make.defaults | 3 ---
profiles/arch/riscv/rv64gc/lp64/package.use.force | 5 +----
profiles/arch/riscv/rv64gc/lp64/use.force | 7 ++-----
profiles/arch/riscv/rv64gc/lp64/use.mask | 7 +------
profiles/arch/riscv/rv64gc/lp64d/make.defaults | 3 ---
profiles/arch/riscv/rv64gc/lp64d/package.use.force | 5 +----
profiles/arch/riscv/rv64gc/lp64d/use.mask | 5 -----
profiles/arch/riscv/rv64gc/make.defaults | 9 ---------
profiles/arch/riscv/rv64gc/use.force | 5 +----
profiles/arch/riscv/rv64gc/use.mask | 8 +-------
profiles/base/make.defaults | 4 ++--
profiles/desc/abi_riscv.desc | 11 -----------
profiles/embedded/make.defaults | 4 ++--
profiles/features/multilib/package.use | 2 +-
25 files changed, 18 insertions(+), 116 deletions(-)
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 1287a5f4097..366da76c51f 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -195,10 +195,6 @@ abi_mips_n32
abi_mips_n64
abi_ppc_32
abi_ppc_64
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32d
-abi_riscv_ilp32
abi_s390_32
abi_s390_64
diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults
b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
index 959de434af0..1065af43c9a 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
@@ -7,6 +7,3 @@
MULTILIB_ABIS="ilp32"
DEFAULT_ABI="ilp32"
ABI="ilp32"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force
b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
index dc5b60c2dd2..aacc29b1d56 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/package.use.force
+++ b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
@@ -1,5 +1,3 @@
# Copyright 2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force
b/profiles/arch/riscv/rv32imac/ilp32/use.force
index e54ac40ffd2..82bb958a577 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/use.force
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.force
@@ -1,5 +1,2 @@
-# Un-force the original multilib default-abi flag
--abi_riscv_ilp32d
-
-# Force the abi of this profile here
-abi_riscv_ilp32
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask
b/profiles/arch/riscv/rv32imac/ilp32/use.mask
index c717be8a4aa..991c792750a 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask
@@ -3,8 +3,3 @@
# Mask multilib, since we do not want to use it.
multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
index bd66a518eab..a53334741ed 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -10,6 +10,3 @@ FCFLAGS="${CFLAGS}"
# We have only one ABI
MULTILIB_ABIS="ilp32d"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
index cf764cd5413..9de5ab73449 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
+++ b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask
b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
index b2c900da504..d8172baa5f5 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
@@ -1,10 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Mask multilib, since we do not want to use it.
multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64d
-abi_riscv_lp64
-abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/make.defaults
b/profiles/arch/riscv/rv32imac/make.defaults
index e23fe63fb25..da381b453f8 100644
--- a/profiles/arch/riscv/rv32imac/make.defaults
+++ b/profiles/arch/riscv/rv32imac/make.defaults
@@ -12,12 +12,3 @@ CHOST="riscv32-unknown-linux-gnu"
MULTILIB_ABIS="ilp32d ilp32"
DEFAULT_ABI="ilp32d"
ABI="ilp32d"
-
-# Enable ilp32d by default
-ABI_RISCV="ilp32d"
-
-# Unhide the riscv/riscv-specific USE_EXPANDs
-USE_EXPAND_HIDDEN="-ABI_RISCV"
-
-# Implicitly enable ilp32d in ebuilds without multilib support
-IUSE_IMPLICIT="abi_riscv_ilp32d"
diff --git a/profiles/arch/riscv/rv32imac/use.force
b/profiles/arch/riscv/rv32imac/use.force
index 069813e1771..9de5ab73449 100644
--- a/profiles/arch/riscv/rv32imac/use.force
+++ b/profiles/arch/riscv/rv32imac/use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag corresponding to the default ABI.
-abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/use.mask
b/profiles/arch/riscv/rv32imac/use.mask
index d57df4d6abe..9de5ab73449 100644
--- a/profiles/arch/riscv/rv32imac/use.mask
+++ b/profiles/arch/riscv/rv32imac/use.mask
@@ -1,6 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the multilib flags for this arch.
--abi_riscv_ilp32d
--abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults
b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index f4b3042683c..4aeb573215d 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -12,6 +12,3 @@ FCFLAGS="${CFLAGS}"
MULTILIB_ABIS="lp64"
DEFAULT_ABI="lp64"
ABI="lp64"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force
b/profiles/arch/riscv/rv64gc/lp64/package.use.force
index e25bb13182b..9de5ab73449 100644
--- a/profiles/arch/riscv/rv64gc/lp64/package.use.force
+++ b/profiles/arch/riscv/rv64gc/lp64/package.use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64d
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force
b/profiles/arch/riscv/rv64gc/lp64/use.force
index d04bb8b3d83..9de5ab73449 100644
--- a/profiles/arch/riscv/rv64gc/lp64/use.force
+++ b/profiles/arch/riscv/rv64gc/lp64/use.force
@@ -1,5 +1,2 @@
-# Un-force the original multilib default-abi flag
--abi_riscv_lp64d
-
-# Force the abi of this profile here
-abi_riscv_lp64
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask
b/profiles/arch/riscv/rv64gc/lp64/use.mask
index 1e0176b85cb..d8172baa5f5 100644
--- a/profiles/arch/riscv/rv64gc/lp64/use.mask
+++ b/profiles/arch/riscv/rv64gc/lp64/use.mask
@@ -1,10 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Mask multilib, since we do not want to use it.
multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64d
-abi_riscv_ilp32d
-abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults
b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
index 85372ab5928..f595f6ac443 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
@@ -10,6 +10,3 @@ FCFLAGS="${CFLAGS}"
# We have only one ABI
MULTILIB_ABIS="lp64d"
-
-# We hide the useflags for the ABIs
-USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force
b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
index 73fe93666cc..9de5ab73449 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force
+++ b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Undo multilib forcing.
-sys-apps/sandbox -abi_riscv_lp64
diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask
b/profiles/arch/riscv/rv64gc/lp64d/use.mask
index 10152808062..991c792750a 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/use.mask
+++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask
@@ -3,8 +3,3 @@
# Mask multilib, since we do not want to use it.
multilib
-
-# Mask the other multilib flags back for non-multilib profile.
-abi_riscv_lp64
-abi_riscv_ilp32d
-abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv64gc/make.defaults
b/profiles/arch/riscv/rv64gc/make.defaults
index a5963cb2fcb..e35f63c8d1e 100644
--- a/profiles/arch/riscv/rv64gc/make.defaults
+++ b/profiles/arch/riscv/rv64gc/make.defaults
@@ -12,12 +12,3 @@ CHOST="riscv64-unknown-linux-gnu"
MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
DEFAULT_ABI="lp64d"
ABI="lp64d"
-
-# Enable lp64d by default
-ABI_RISCV="lp64d"
-
-# Unhide the riscv/rv64gc-specific USE_EXPANDs
-USE_EXPAND_HIDDEN="-ABI_RISCV"
-
-# Implicitly enable lp64d in ebuilds without multilib support
-IUSE_IMPLICIT="abi_riscv_lp64d"
diff --git a/profiles/arch/riscv/rv64gc/use.force
b/profiles/arch/riscv/rv64gc/use.force
index eb2add7ba6b..9de5ab73449 100644
--- a/profiles/arch/riscv/rv64gc/use.force
+++ b/profiles/arch/riscv/rv64gc/use.force
@@ -1,5 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag corresponding to the default ABI.
-abi_riscv_lp64d
diff --git a/profiles/arch/riscv/rv64gc/use.mask
b/profiles/arch/riscv/rv64gc/use.mask
index b38fe8be382..9de5ab73449 100644
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -1,8 +1,2 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the multilib flags for this arch.
--abi_riscv_lp64d
--abi_riscv_lp64
--abi_riscv_ilp32d
--abi_riscv_ilp32
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index f2b15dd9a7e..b3d8b951d41 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on [email protected].
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS
APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS
CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES
FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES
LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS
NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS
OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM
PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS
QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS
USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS
XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS
APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS
CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES
FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES
LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS
NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS
OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM
PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS
QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS
USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS
XTABLES_ADDONS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390
ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86
CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
diff --git a/profiles/desc/abi_riscv.desc b/profiles/desc/abi_riscv.desc
deleted file mode 100644
index f11a1dad60b..00000000000
--- a/profiles/desc/abi_riscv.desc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ABI_RISCV USE_EXPAND flags.
-
-# Keep it sorted. Please do not add anything without prior discussion
-# on gentoo-dev.
-lp64d - 64-bit (rv64) double hard-float libraries
-lp64 - 64-bit (rv64) soft-float libraries
-ilp32d - 32-bit (rv32) double hard-float libraries
-ilp32 - 32-bit (rv32) soft-float libraries
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index cc003fd8857..97be65cd4cb 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -30,11 +30,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on [email protected].
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ALSA_CARDS
APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS
CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS
GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES
LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS
NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS
OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM
PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS
QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS
USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS
XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES
APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM
CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS
GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS
LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL
NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS
OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS
PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS
ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS
VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390
ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86
CPU_FLAGS_ARM CPU_FLAGS_X86"
# Variables that are set exclusively by the profile
# and not by user configuration files.
diff --git a/profiles/features/multilib/package.use
b/profiles/features/multilib/package.use
index 33f47dfe41a..2e331dfb04f 100644
--- a/profiles/features/multilib/package.use
+++ b/profiles/features/multilib/package.use
@@ -3,4 +3,4 @@
# Enable all ABIs by default so we can protect any non-native binaries that
# might be executed.
-sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32
abi_mips_n64 abi_riscv_lp64d abi_riscv_lp64 abi_riscv_ilp32d abi_riscv_ilp32
abi_s390_32 abi_s390_64
+sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32
abi_mips_n64 abi_s390_32 abi_s390_64
