13 files changed, 42 insertions, 55 deletions
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 8da07dbfd836..155629c2d659 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# dev-python/sphinx_lv2_theme isn't keyworded here (bug #769413)
+>=media-libs/lilv-0.24.12 doc
+>=media-libs/sratom-0.6.8 doc
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
@@ -237,7 +246,8 @@ media-sound/pulseaudio native-headset
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
 # Stack protector code is not ported to alpha (and may not ever be)
@@ -356,10 +366,6 @@ app-accessibility/orca braille
 # media-libs/x265 doesn't work on alpha (bug 519046)
 media-video/ffmpeg x265
 
-# Tobias Klausmann <klausman@gentoo.org (2014-07-16)
-# neither dietlibc nor klibc will likely ever build/work on alpha, bug #487672
->=sys-fs/dmraid-1.0.0_rc16-r3 dietlibc klibc
-
 # Pacho Ramos <pacho@gentoo.org> (2014-02-22)
 # Missing keywords, bug #495250
 >=gnome-base/gnome-extra-apps-3.10 tracker
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 09f9c070aae8..30a9c31b7f1d 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Sam James <sam@gentoo.org> (2021-02-17)
 # Unmask dev-libs/libpcre2[jit] support on PHP
 # where available
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index b945eac92266..4f4d0363ae58 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -118,10 +118,6 @@ dev-db/mariadb galera
 # Not going to be stable for now
 dev-util/geany-plugins gtkspell
 
-# Pacho Ramos <pacho@gentoo.org> (2016-12-31)
-# No stable for arm
-sys-fs/dmraid dietlibc klibc
-
 # Christoph Junghans <junghans@gentoo.org> (2016-11-27)
 # no stable mpi on arm yet, but maybe in the future
 <=sci-libs/fftw-3.3.4 mpi
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 5dee8c8714bd..b70b37363f1c 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,10 +4,13 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
+# Rolf Eike Beer <eike@sf-mail.de> (2021-03-14)
+# dependencies not yet keyworded
+dev-ruby/globalid test
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
@@ -189,7 +192,8 @@ net-libs/gnutls test-full
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d1e17a416ce4..6bfcdedccd32 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
@@ -203,7 +202,8 @@ media-sound/pulseaudio native-headset
 # Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-07-20)
 # pulls in unkeyworded java
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 16422cf53632..cb0529744641 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Patrick McLean <chutzpah@gentoo.org> (2021-02-25)
 # Requires unkeyworded dev-libs/pmdk, mask until keyworded
 sys-cluster/ceph pmdk rbd-rwl
@@ -341,10 +345,6 @@ net-misc/connman ofono
 # Mask some use flags for openmpi due to unkeyworded deps
 sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_connectx-xrc openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl openmpi_ofed_features_failover
 
-# Kacper Kowalik <xarthisius@gentoo.org> (2011-11-20)
-# Dropped dietlibc wrt #364103
-sys-fs/dmraid dietlibc
-
 # Patrick McLean <chutzpah@gentoo.org> (2011-09-07)
 # missing keywords on dependencies
 media-video/x264-encoder ffmpegsource
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index be4de0c9bee6..7e39be4b306c 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -5,11 +5,6 @@
 # new package dev-libs/libthreadar has no keywords
 app-backup/dar threads
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index fbee7f294634..9707c7f5f922 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-02-25)
 # depends on ring crate, which is not so portable
 # https://github.com/briansmith/ring/issues/389
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 26ae8393fc24..fa4819770c32 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # PPC Specific use flags
@@ -50,9 +50,6 @@ gnuefi
 appindicator
 ayatana
 
-#Klibc does not work
-klibc
-
 # These flags should only be used for ppc
 -ppcsha1
 # Unmask the Altivec instruction set
@@ -135,4 +132,3 @@ nvtt
 # Pacho Ramos <pacho@gentoo.org> (2014-01-08)
 # Unmask systemd since it is keyworded here.
 -systemd
-
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 480003b3c1d5..2401394ba464 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -66,7 +66,7 @@ sys-fs/e2fsprogs cron
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
-dev-vcs/git pcre-jit
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Not yet tested / unkeyworded dependencies
 # This includes also packages which do not support python-3 or
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
index 1783fe2a335d..343cd157d4d4 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,10 +1,15 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-03-20)
+# jit isn't supported on sparc64 and causes a bus error
+# in for grep -P. Debian completely disable it too.
+dev-libs/libpcre jit
+
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # Upstream Git is switching to PCRE2 w/ JIT.
 # This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
+<dev-vcs/git-2.31.0 pcre-jit
 
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # jit not supported on sparc64
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 187886b8fa08..fa0a7cfb7c69 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,15 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-03-13)
+# virtual/jdk isn't keyworded here
+media-libs/rubberband jni
+
 # Viorel Munteanu <ceamac.paragon@gmail.com> (2020-03-11)
 # new package dev-libs/libthreadar has no keywords
 app-backup/dar threads
 
-# Marek Szuba <marecki@gentoo.org> (2021-03-11)
-# Awaiting keywording of dev-python/ruamel-std-pathlib
-# on this arch (Bug #775242)
-dev-python/ruamel-yaml test
-
 # Sam James <sam@gentoo.org> (2021-03-13)
 # media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index d12134be1b65..762bcb6d86a8 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -61,10 +61,6 @@ net-libs/libssh2 mbedtls
 net-vpn/openvpn mbedtls
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-04)
-# Needs stable dev-libs/klibc, bug #653384
-sys-fs/dmraid klibc
-
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-04)
 # Needs stable x11-terms/xterm, bug #706118
 app-editors/joe xterm