19 files changed, 67 insertions, 95 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/package.mask b/profiles/arch/s390/package.mask
deleted file mode 100644
index c92ad8c0f647..000000000000
--- a/profiles/arch/s390/package.mask
+++ /dev/null
@@ -1,18 +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
-dev-lang/rust
-dev-lang/rust-bin
->=dev-python/cryptography-36
->=dev-python/pyopenssl-22
-dev-python/setuptools-rust
-dev-python/watchfiles
-virtual/rust
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-03-20)
-# sys-libs/libunwind doesn't work on s390
-sys-libs/libunwind
diff --git a/profiles/arch/s390/package.use.force b/profiles/arch/s390/package.use.force
index 7a031392e14a..7b02f8859485 100644
--- a/profiles/arch/s390/package.use.force
+++ b/profiles/arch/s390/package.use.force
@@ -1,10 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2022-04-26)
-# Spidermonkey needs Rust and LLVM, not available for s390
-sys-auth/polkit duktape
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2022-04-20)
 # s390-tools (in @system) needs this for building some bootloader code
 sys-devel/binutils multitarget
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 44b521e3f5f2..e0bf16f31c2d 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -10,9 +10,8 @@ dev-ruby/stringex test
 # Sam James <sam@gentoo.org> (2022-04-26)
 # eps: app-text/libspectre not keyworded here
 # heif: media-libs/libheif not keyworded here
-# svg: rustified librsvg not keyworded here
 # jpegxl: libjxl not keyworded here
-media-libs/imlib2 eps heif svg jpegxl
+media-libs/imlib2 eps heif jpegxl
 
 # Sam James <sam@gentoo.org> (2022-04-26)
 # Avoid unkeyworded dependencies
@@ -60,10 +59,6 @@ app-crypt/pinentry efl
 app-admin/sudo sssd
 
 # Sam James <sam@gentoo.org> (2022-04-24)
-# sys-apps/systemd is not keyworded here
-sys-auth/pambase homed
-
-# Sam James <sam@gentoo.org> (2022-04-24)
 # app-crypt/dieharder and dev-libs/softhsm:2 unkeyworded here
 net-libs/gnutls test-full
 
@@ -71,10 +66,6 @@ net-libs/gnutls test-full
 # net-fs/samba unkeyworded here
 net-fs/cifs-utils acl
 
-# Sam James <sam@gentoo.org> (2022-04-24)
-# No Rust here, so no librsvg
-media-libs/freetype svg
-
 # Sam James <sam@gentoo.org> (2022-04-20)
 # x11-themes/sound-theme-freedesktop unkeyworded here
 media-libs/libcanberra sound
diff --git a/profiles/arch/s390/s390/eapi b/profiles/arch/s390/s390/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/s390/s390/eapi
@@ -0,0 +1 @@
+5
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/s390/package.mask b/profiles/arch/s390/s390/package.mask
new file mode 100644
index 000000000000..a3155b7509b2
--- /dev/null
+++ b/profiles/arch/s390/s390/package.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-03-20)
+# sys-libs/libunwind doesn't work on s390
+sys-libs/libunwind
diff --git a/profiles/arch/s390/s390/parent b/profiles/arch/s390/s390/parent
new file mode 100644
index 000000000000..154b8158dc01
--- /dev/null
+++ b/profiles/arch/s390/s390/parent
@@ -0,0 +1,2 @@
+..
+../../../features/wd40
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 9313987677b5..000000000000
--- a/profiles/arch/s390/s390x/package.mask
+++ /dev/null
@@ -1,18 +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
--dev-lang/rust
--dev-lang/rust-bin
-->=dev-python/cryptography-36
-->=dev-python/pyopenssl-22
--dev-python/setuptools-rust
--dev-python/watchfiles
--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/package.use.force b/profiles/arch/s390/s390x/package.use.force
index 54d9b2d19c6f..a91fe713a600 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-06-18)
+# dev-lang/spidermonkey not keyworded yet.
+sys-auth/polkit duktape
+
 # Michał Górny <mgorny@gentoo.org> (2016-11-11)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_SystemZ
diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask
index 9af431104cb5..2db48ad88c12 100644
--- a/profiles/arch/s390/s390x/package.use.mask
+++ b/profiles/arch/s390/s390x/package.use.mask
@@ -1,7 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-06-18)
+# media-libs/librsvg not keyworded yet.
+media-libs/freetype svg
+media-libs/imlib2 svg
+
 # Sam James <sam@gentoo.org> (2021-02-05)
 # libpcre2 has JIT support for s390x (not s390)
 # but it doesn't seem to build right now?
 dev-libs/libpcre2 jit
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-06-28)
+# Fails to build
+=dev-libs/nettle-3.8* asm
diff --git a/profiles/arch/s390/s390x/parent b/profiles/arch/s390/s390x/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/arch/s390/s390x/parent
@@ -0,0 +1 @@
+..
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..b7a7f1dac69b 100644
--- a/profiles/arch/s390/s390x/use.mask
+++ b/profiles/arch/s390/s390x/use.mask
@@ -1,11 +1,5 @@
-# Switch ABI flags for this arch.
-abi_s390_32
--abi_s390_64
-
-# Sam James <sam@gentoo.org> (2022-05-02)
-# Rust is available for s390x (but not s390)
--rust
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
-# sys-libs/libunwind is keyworded on s390x
--unwind
--libunwind
+# Unmask ABI flags for this arch.
+-abi_s390_64
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 12e89cac2891..e41e11486626 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -s390
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-05-20)
+# Keyworded here
+-systemd
+
 # Sam James <sam@gentoo.org> (2022-04-26)
 # dev-libs/mongo-c-driver not keyworded here
 mongodb
@@ -51,14 +55,6 @@ luajittex
 # media-libs/libglvnd is not keyworded
 libglvnd
 
-# Unmask ABI flags for this arch.
--abi_s390_32
-
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependencies not keyworded.
-appindicator
-ayatana
-
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
 # Unmask as this profile is big endian.
 -big-endian
@@ -78,7 +74,6 @@ lpsol
 openexr
 enchant
 fftw
-systemd
 devil
 gts
 clang
@@ -154,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