gentoo resync : 12.05.2022

3 files changed, 19 insertions, 1 deletions

diff --git a/profiles/arch/s390/s390x/package.mask b/profiles/arch/s390/s390x/package.mask
index e8b44399b15a..9313987677b5 100644
--- a/profiles/arch/s390/s390x/package.mask
+++ b/profiles/arch/s390/s390x/package.mask
@@ -1,6 +1,18 @@
 # 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 577dcc99cc07..54d9b2d19c6f 100644
--- a/profiles/arch/s390/s390x/package.use.force
+++ b/profiles/arch/s390/s390x/package.use.force
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (2016-11-11)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_SystemZ
+dev-lang/rust llvm_targets_SystemZ
 sys-devel/clang llvm_targets_SystemZ
 sys-devel/llvm llvm_targets_SystemZ
diff --git a/profiles/arch/s390/s390x/use.mask b/profiles/arch/s390/s390x/use.mask
index 990337bfff6b..fe2cac38c232 100644
--- a/profiles/arch/s390/s390x/use.mask
+++ b/profiles/arch/s390/s390x/use.mask
@@ -2,5 +2,10 @@
 abi_s390_32
 -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