gentoo resync : 12.05.2022

7 files changed, 183 insertions, 9 deletions

diff --git a/profiles/arch/s390/package.mask b/profiles/arch/s390/package.mask
index c666a0c11158..c92ad8c0f647 100644
--- a/profiles/arch/s390/package.mask
+++ b/profiles/arch/s390/package.mask
@@ -1,11 +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 doesn't work on s390
 sys-libs/libunwind
-
-# Sam James <sam@gentoo.org> (2021-11-05)
-# Perl segfaults during build on s390(x). Presumably related to
-# now truly respecting CFLAGS. bug #821577
->=dev-lang/perl-5.34.0-r5
diff --git a/profiles/arch/s390/package.use.force b/profiles/arch/s390/package.use.force
index 7d7cebc771ad..7a031392e14a 100644
--- a/profiles/arch/s390/package.use.force
+++ b/profiles/arch/s390/package.use.force
@@ -1,6 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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
+
 # Mike Frysinger <vapier@gentoo.org> (2016-12-09)
 # The ABI changes when the flag is disabled.  Force it for now.
 # https://gmplib.org/list-archives/gmp-bugs/2016-December/004039.html
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 5117a01c2908..44b521e3f5f2 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,111 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Unkeyworded dependencies
+app-text/htmltidy test
+dev-ruby/activerecord mysql postgres sqlite test
+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
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Avoid unkeyworded dependencies
+app-text/enchant hunspell nuspell voikko
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Needs unkeyworded virtual/szip provider
+sci-libs/hdf5 szip
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Needs unkeyworded dev-libs/librdkafka
+# dev-libs/boxfort does not support s390 either
+app-admin/syslog-ng kafka test
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Large number of unkeyworded sci testdeps
+dev-cpp/eigen test
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Avoid unkeyworded sci-libs/umfpack
+dev-python/scipy sparse
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Avoid unkeyworded media-gfx/libimagequant
+dev-python/pillow imagequant
+
+# Sam James <sam@gentoo.org> (2022-04-26)
+# Avoid unkeyworded media-gfx/inkscape
+app-text/dblatex inkscape
+
+# Sam James <sam@gentoo.org> (2022-04-25)
+# Needs unkeyworded dev-python/commonmark, dev-python/recommonmark
+dev-libs/libinput doc
+
+# Sam James <sam@gentoo.org> (2022-04-25)
+# Needs unkeyworded dev-python/markdown
+dev-libs/gobject-introspection doctool
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# dev-libs/efl not keyworded here and is a desktop application mainly
+app-crypt/pinentry efl
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# sssd not keyworded here
+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
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# 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
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# media-libs/libheif isn't keyworded here
+# media-libs/libavif isn't keyworded here
+media-libs/gd avif heif
+media-gfx/graphicsmagick heif
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# Unkeyworded dev-tcltk/* dependencies
+dev-libs/libisoburn launch-frontend launch-frontend-setuid frontend-optional
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# dev-libs/libzip not keyworded on s390
+media-gfx/imagemagick zip
+dev-lang/php zip
+
+# Sam James <sam@gentoo.org> (2022-04-20)
+# sys-apps/hwloc is not keyworded on s390
+sys-process/htop hwloc
+
+# Sam James <sam@gentoo.org> (2022-04-20)
+# Needs Ruby (dev-ruby/asciidoctor)
+dev-util/ccache doc
+
+# Sam James <sam@gentoo.org> (2022-04-20)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
@@ -30,8 +135,8 @@ dev-vcs/subversion ruby
 # Not tested
 dev-python/cssselect doc
 # not really interested in supporting alternative
-# VCS for overlays yet.
-app-portage/layman darcs mercurial
+# VCS for overlays yet. Layman needs SVN for tests too.
+app-portage/layman darcs mercurial test
 dev-python/setuptools_scm test
 # no lua support for vim
 app-editors/vim lua
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
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 978f1839ad23..12e89cac2891 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -4,12 +4,47 @@
 # Unmask the flag which corresponds to ARCH.
 -s390
 
+# Sam James <sam@gentoo.org> (2022-04-26)
+# dev-libs/mongo-c-driver not keyworded here
+mongodb
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# Avoid unkeyworded dev-util/google-perftools
+tcmalloc
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# Desktopy stacks not currently keyworded
+alsa
+gstreamer
+pulseaudio
+jack
+samba
+
+# Sam James <sam@gentoo.org> (2022-04-24)
+# gi-docgen (and friends?) not keyworded here
+gtk-doc
+
+# Sam James <sam@gentoo.org> (2022-04-20)
+# dev-vcs/subversion is not keyworded here
+subversion
+
+# Sam James <sam@gentoo.org> (2022-04-20)
+# app-crypt/tpm2-tss is not keyworded here
+tpm
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-04-20)
+# Not keyworded
+emacs
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
 # sys-libs/llvm-libunwind not supported on S390.
 llvm-libunwind
 
 # Sam James <sam@gentoo.org> (2021-02-05)
 # No luajit available for s390
+lua_single_target_luajit
+lua_targets_luajit
+luajit
 luajittex
 
 # Matt Turner <mattst88@gentoo.org> (2019-12-05)
@@ -122,3 +157,4 @@ opencl
 
 # sys-libs/libunwind is masked on s390, but enabled on s390x
 unwind
+libunwind