gentoo (valentine's day) resync : 14.02.2021

4 files changed, 21 insertions, 7 deletions

diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index acf4b550ddf9..fca3adf4dad7 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -5,20 +5,15 @@
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-07-13)
-# Luajit does not work on s390
-app-text/texlive-core luajittex
-
 # Hans de Graaff <graaff@gentoo.org> (2019-04-08)
 # Obsolete ruby version, no newer versions keyworded or stable.
 dev-vcs/subversion ruby
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-06-03)
 # Not tested
-app-crypt/pinentry fltk
 dev-python/cssselect doc
 # not really interested in supporting alternative
-# VCS for oberlays yet.
+# VCS for overlays yet.
 app-portage/layman darcs mercurial
 dev-python/setuptools_scm test
 # no lua support for vim
@@ -38,7 +33,7 @@ net-analyzer/rrdtool rados
 dev-vcs/git pcre-jit
 
 # Lars Wendler <polynomial-c@gentoo.org> (2016-11-17)
-# jit not supported on ia64 (bug #600052).
+# jit not supported on s390
 dev-libs/libpcre2 jit
 
 # Sergey Popov <pinkbyte@gentoo.org> (2015-10-24)
diff --git a/profiles/arch/s390/package.use.stable.mask b/profiles/arch/s390/package.use.stable.mask
new file mode 100644
index 000000000000..aaf7d617fab5
--- /dev/null
+++ b/profiles/arch/s390/package.use.stable.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Marek Szuba <marecki@gentoo.org> (2021-02-09)
+# Lua has been dropped to ~s390
+net-mail/dovecot lua
+
diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask
new file mode 100644
index 000000000000..9d4593ef4b49
--- /dev/null
+++ b/profiles/arch/s390/s390x/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# 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
+dev-vcs/git pcre-jit
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 77e2c7a2f020..c24a977058f1 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
 
+# Sam James <sam@gentoo.org> (2021-02-05)
+# No luajit available for s390
+luajittex
+
 # Matt Turner <mattst88@gentoo.org> (2019-12-05)
 # media-libs/libglvnd is not keyworded
 libglvnd