profiles/arch/s390: Move s390-specific stuff to subprofile

Rather than setting stuff specific to not-x s390 in the top profile
and undoing it for s390x, move it to the new subprofile.

Signed-off-by: Michał Górny <mgorny@gentoo.org>

11 files changed, 39 insertions, 55 deletions

diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index fc8cc4a45203..3fde361195fe 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,14 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="s390"
 ACCEPT_KEYWORDS="s390 ~s390"
 
-MULTILIB_ABIS="s390"
-DEFAULT_ABI="s390"
-ABI="${DEFAULT_ABI}"
-
-CHOST="s390-ibm-linux-gnu"
 CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
@@ -20,14 +15,6 @@ LIBDIR_s390="lib"
 INPUT_DEVICES="void"
 VIDEO_CARDS="dummy"
 
-# Michał Górny <mgorny@gentoo.org> (2014-07-01)
-# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
-# by non-multilib ebuilds when non-native ABIs are disabled.
-IUSE_IMPLICIT="abi_s390_32"
-
-# Enable abi_s390_32 for packages that don't have it forced.
-ABI_S390="32"
-
 # While multilib is available, we don't default it to on.
 BOOTSTRAP_USE="${BOOTSTRAP_USE} -multilib"
 USE="-multilib"
diff --git a/profiles/arch/s390/s390/make.defaults b/profiles/arch/s390/s390/make.defaults
new file mode 100644
index 000000000000..8e77858de386
--- /dev/null
+++ b/profiles/arch/s390/s390/make.defaults
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MULTILIB_ABIS="s390"
+DEFAULT_ABI="s390"
+ABI="${DEFAULT_ABI}"
+
+CHOST="s390-ibm-linux-gnu"
+
+# Michał Górny <mgorny@gentoo.org> (2014-07-01)
+# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
+# by non-multilib ebuilds when non-native ABIs are disabled.
+IUSE_IMPLICIT="abi_s390_32"
+
+# Enable abi_s390_32 for packages that don't have it forced.
+ABI_S390="32"
diff --git a/profiles/arch/s390/package.mask b/profiles/arch/s390/s390/package.mask
index 0f483435d0a0..0f483435d0a0 100644
--- a/profiles/arch/s390/package.mask
+++ b/profiles/arch/s390/s390/package.mask
diff --git a/profiles/arch/s390/s390/use.force b/profiles/arch/s390/s390/use.force
new file mode 100644
index 000000000000..6f275ed053ce
--- /dev/null
+++ b/profiles/arch/s390/s390/use.force
@@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Force the flag corresponding to the only ABI.
+abi_s390_32
diff --git a/profiles/arch/s390/s390/use.mask b/profiles/arch/s390/s390/use.mask
new file mode 100644
index 000000000000..ec8bfdf76289
--- /dev/null
+++ b/profiles/arch/s390/s390/use.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask ABI flags for this arch.
+-abi_s390_32
+
+# sys-libs/libunwind is masked on s390, but enabled on s390x
+unwind
+libunwind
diff --git a/profiles/arch/s390/s390x/make.defaults b/profiles/arch/s390/s390x/make.defaults
index 1cb8ff7551a4..b02ae878cf6e 100644
--- a/profiles/arch/s390/s390x/make.defaults
+++ b/profiles/arch/s390/s390x/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MULTILIB_ABIS="s390x"
@@ -10,7 +10,7 @@ CHOST="s390x-ibm-linux-gnu"
 # Michał Górny <mgorny@gentoo.org> (2014-07-01)
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
 # by non-multilib ebuilds when non-native ABIs are disabled.
-IUSE_IMPLICIT="abi_s390_64 -abi_s390_32"
+IUSE_IMPLICIT="abi_s390_64"
 
 # Enable abi_s390_64 for packages that don't have it forced.
 ABI_S390="64"
diff --git a/profiles/arch/s390/s390x/package.mask b/profiles/arch/s390/s390x/package.mask
deleted file mode 100644
index acf76ebf5f09..000000000000
--- a/profiles/arch/s390/s390x/package.mask
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Sam James <sam@gentoo.org> (2022-04-25)
-# Rust is available for s390x, but not s390.
-# bug #769446
--app-eselect/eselect-rust
--app-text/mdbook
--dev-lang/rust
--dev-lang/rust-bin
-->=dev-python/cryptography-36
-->=dev-python/pyopenssl-22
--dev-python/setuptools-rust
--dev-python/watchfiles
--dev-util/maturin
--virtual/rust
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-03-20)
-# sys-libs/libunwind works on s390x
--sys-libs/libunwind
diff --git a/profiles/arch/s390/s390x/use.force b/profiles/arch/s390/s390x/use.force
index adf5b7184416..d7fa48c83ab9 100644
--- a/profiles/arch/s390/s390x/use.force
+++ b/profiles/arch/s390/s390x/use.force
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2022 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
 # Force the flag corresponding to the only ABI.
--abi_s390_32
 abi_s390_64
diff --git a/profiles/arch/s390/s390x/use.mask b/profiles/arch/s390/s390x/use.mask
index fe2cac38c232..57f5e213dcf5 100644
--- a/profiles/arch/s390/s390x/use.mask
+++ b/profiles/arch/s390/s390x/use.mask
@@ -1,11 +1,9 @@
-# Switch ABI flags for this arch.
-abi_s390_32
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask ABI flags for this arch.
 -abi_s390_64
 
 # Sam James <sam@gentoo.org> (2022-05-02)
 # Rust is available for s390x (but not s390)
 -rust
-
-# sys-libs/libunwind is keyworded on s390x
--unwind
--libunwind
diff --git a/profiles/arch/s390/use.force b/profiles/arch/s390/use.force
index 89bbb956da41..1ff4f261a6dc 100644
--- a/profiles/arch/s390/use.force
+++ b/profiles/arch/s390/use.force
@@ -1,11 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2022 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
 
 # Force the flag which corresponds to ARCH.
 s390
 
-# Force the flag corresponding to the only ABI.
-abi_s390_32
-
 # We do not have multilib by default.
 -multilib
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 1a8fc49c64d4..e41e11486626 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -55,9 +55,6 @@ luajittex
 # media-libs/libglvnd is not keyworded
 libglvnd
 
-# Unmask ABI flags for this arch.
--abi_s390_32
-
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
 # Unmask as this profile is big endian.
 -big-endian
@@ -152,7 +149,3 @@ video_cards_radeonsi
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-08-22)
 # virtual/opencl is not keyworded
 opencl
-
-# sys-libs/libunwind is masked on s390, but enabled on s390x
-unwind
-libunwind