gentoo resync : 28.04.2021

31 files changed, 112 insertions, 101 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 4eab47df955e..ba6b5cee170c 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -59,6 +59,7 @@ games-arcade/thinktanks-demo
 games-emulation/caps
 games-emulation/nestra
 games-emulation/pcsx2
+games-emulation/vgba
 games-emulation/zinc
 games-emulation/zsnes
 games-fps/avp
diff --git a/profiles/arch/amd64/package.use b/profiles/arch/amd64/package.use
index d54c8e8baca2..a8ec3b16bc06 100644
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@@ -3,7 +3,7 @@
 
 # Mike Gilbert <floppym@gentoo.org> (2016-11-17)
 # Enable both efi and pc by default.
-# https://bugs.gentoo.org/600110
+# bug #600110
 sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
 
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 0a05a79d2523..a97c6325f2e3 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.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
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# Unmask TPM on supported archs.
+sys-apps/systemd -tpm
+
+# Michael Orlitzky <mjo@gentoo.org> (2021-03-27)
+# Unmask the use of 64-bit dev-lisp/clozurecl on 64-bit arches.
+# Only maxima makes a distinction between the 32-bit and 64-bit
+# USE flags.
+sci-mathematics/fricas -clozurecl
+<sci-mathematics/maxima-5.44.0-r5 -clozurecl
+sci-mathematics/maxima -clozurecl64
+
 # Thomas Deutschmann <whissi@gentoo.org> (2021-02-17)
 # Unmask PCRE JIT support where dev-libs/libpcre2[jit] is available
 dev-lang/php -jit
@@ -289,8 +301,8 @@ games-emulation/mupen64plus-core new-dynarec
 # Tim Harder <radhermit@gentoo.org> (2013-08-13)
 # dev-lang/luajit keyworded for amd64 (masked in base)
 # dev-scheme/racket keyworded for amd64 (masked in base)
-app-editors/vim -luajit -racket
-app-editors/gvim -luajit -racket
+app-editors/vim -racket
+app-editors/gvim -racket
 
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-08-09)
 # Works on amd64
@@ -305,10 +317,6 @@ dev-python/pypy3-exe cpu_flags_x86_sse2
 # Unmask here, as it's masked in base.
 net-libs/gnutls -dane
 
-# Ben de Groot <yngwin@gentoo.org> (2012-07-30)
-# dependency keyworded here, masked in base
-media-libs/freetype -infinality
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-04-12)
 # Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
 # gobject-introspection[doctool], bug #411761
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 30c8a9b41147..b5cba9077afb 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -55,7 +55,6 @@
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # keyworded on amd64
 -clisp
--clozurecl
 -ecls
 -gcl
 -sbcl
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index ba88ea41c2eb..ee9b21e49fec 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -20,10 +20,6 @@ firebird
 # The modern versions of CUDA SDK are not suitable for stabilization.
 cuda
 
-# Andrey Grozin <grozin@gentoo.org> (2014-06-25)
-# no stable versions on amd64
-clozurecl
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
 python_targets_pypy3
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 8f25b3f974c6..a0a8241c9377 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -68,7 +68,6 @@ kde-apps/parley:5
 kde-apps/pim-data-exporter:5
 kde-apps/pim-sieve-editor:5
 kde-apps/plasma-telepathy-meta:5
-<kde-misc/kio-gdrive-20.12.0
 kde-misc/kmarkdownwebview:5
 kde-misc/tellico:5
 kde-misc/zanshin:5
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 563a7f2c2884..4781af1cf4e0 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -9,7 +9,7 @@ kde-apps/kde-apps-meta:5 pim
 kde-apps/kdenetwork-meta:5 bittorrent
 kde-apps/umbrello:5 php
 kde-misc/kio-gdrive kaccounts
-media-gfx/gmic digikam krita
+media-gfx/gmic krita
 net-irc/quassel urlpreview
 net-misc/fatrat bittorrent
 net-misc/seafile-client shibboleth
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index e6f4a6e4a113..7541737a7e43 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-12)
+# no stable virtual/jdk on this arch
+media-libs/rubberband jni
+
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# Unmask TPM on supported archs.
+sys-apps/systemd -tpm
+
 # Sam James <sam@gentoo.org> (2021-02-17)
 # Unmask dev-libs/libpcre2[jit] support on PHP
 # where available
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index e86babbbb35e..5c02a6bcdc3f 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-04-14)
+# Supports 64-bit NEON
+# Note: libpng-compat 1.5.30 does NOT seem to.
+media-libs/libpng -cpu_flags_arm_neon
+
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# Unmask TPM on supported archs.
+sys-apps/systemd -tpm
+
 # Sam James <sam@gentoo.org> (2021-03-20)
 # Supports both 'neon32' and 'neon64'
 sys-libs/zlib-ng -cpu_flags_arm_neon
@@ -66,14 +75,6 @@ sys-block/gparted xfs
 # dev-util/kdevelop-php is not keyworded, bug #751337
 >=kde-apps/umbrello-20.08.3 php
 
-# Marek Szuba <marecki@gentoo.org> (2020-11-06)
-# media-gfx/digikam has no arm64 keyword yet. Bug #753362.
-media-gfx/gmic digikam
-
-# Marek Szuba <marecki@gentoo.org> (2020-11-06)
-# media-gfx/gmic has no arm64 keyword yet. Bug #753356.
-media-gfx/darktable gmic
-
 # Sam James <sam@gentoo.org> (2020-10-03)
 # Builds & tests pass on arm64.
 # Available on: amd64, x86, arm{,64}.
@@ -103,10 +104,6 @@ sys-block/tgt rbd
 # dev-lua/busted is not keyworded yet
 dev-lua/mpack test
 
-# Felix Janda <felix.janda@posteo.de> (2020-08-01)
-# Requires unkeyworded dev-lang/spidermonkey:17
->=www-client/elinks-0.13.3 javascript
-
 # Sam James <sam@gentoo.org> (2020-07-09)
 # mariadb[rocksdb] fails to build on arm64
 # bug #731998
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index b314718a518c..38d96d878055 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# TPM only exists on some archs.
+sys-apps/systemd tpm
+
+# Michael Orlitzky <mjo@gentoo.org> (2021-03-27)
+# The clozurecl and clozurecl64 flags are now arch-specific in maxima,
+# so we mask them both by default beginning with v5.44.0-r5 where
+# their meanings first diverged. You should unmask "clozurecl" on
+# 32-bit arches and unmask "clozurecl64" on 64-bit ones.
+# We don't list "clozurecl" here since it's already in use.mask.
+>=sci-mathematics/maxima-5.44.0-r5 clozurecl64
+
 # Sam James <sam@gentoo.org> (2021-03-02)
 # Java build is extremely sensitive to environment
 # Previously stable-masked but moved here
@@ -93,7 +105,7 @@ sys-block/fio python gnuplot
 # Craig Andrews <candrews@gentoo.org> (2019-10-08)
 # net-libs/quiche is not available on all arches
 # Track addition arch keywording of quiche at:
-# https://bugs.gentoo.org/694320
+# bug #694320
 net-misc/curl quiche
 
 # Craig Andrews <candrews@gentoo.org> (2019-10-08)
@@ -266,9 +278,9 @@ dev-vcs/git mediawiki mediawiki-experimental
 dev-libs/boost context
 
 # Tim Harder <radhermit@gentoo.org> (2013-08-13)
-# Related deps dev-lang/luajit and dev-scheme/racket are not keyworded by most arches.
-app-editors/vim luajit racket
-app-editors/gvim luajit racket
+# Related dep dev-scheme/racket is not keyworded by most arches.
+app-editors/vim racket
+app-editors/gvim racket
 
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-08-09)
 # Doesn't work on most profiles. Easier to mask here and
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index b70b37363f1c..4027d9a93767 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -50,10 +50,6 @@ dev-libs/efl avif lua_single_target_luajit physics
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Felix Janda <felix.janda@posteo.de> (2020-08-01)
-# Requires masked dev-lang/spidermonkey:17
->=www-client/elinks-0.13.3 javascript
-
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
 sys-block/fio -io-uring -zbc
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index d55401d7ec44..5ef64c04f901 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
+# sys-libs/llvm-libunwind not supported on HPPA.
+llvm-libunwind
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
 # media-sound/jack-audio-connection-kit re-keywording timeout, bug #736725
 jack
@@ -195,7 +199,7 @@ networkmanager
 gcj
 
 # Samuli Suominen <drac@gentoo.org> (2007-03-02)
-# See https://bugs.gentoo.org/show_bug.cgi?id=157881#c3
+# See bug #157881#c3
 battery
 
 # Saleem Abdulrasool <compnerd@gentoo.org> (2006-08-18)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 6bfcdedccd32..81ccf7e037a0 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -425,10 +425,6 @@ app-text/asciidoc test
 # needs sys-libs/libcap-ng that is masked right now
 sys-apps/smartmontools caps
 
-# Raúl Porcel <armin76@gentoo.org> (2010-12-05)
-# Needs testing
-www-client/elinks javascript
-
 # Raúl Porcel <armin76@gentoo.org> (2010-06-26)
 # custom-optimization doesn't work on ia64
 www-client/seamonkey custom-optimization
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 97150d2c10e6..9fb4872834d2 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ia64
 
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
+# sys-libs/llvm-libunwind not supported on IA64.
+llvm-libunwind
+
 # Matt Turner <mattst88@gentoo.org> (2020-07-01)
 # Unlikely.
 vulkan
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 4fe3342af34d..50ef31ed5839 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -158,10 +158,6 @@ net-fs/samba ads cluster
 mail-client/mutt tokyocabinet
 
 # Matt Turner <mattst88@gentoo.org> (2010-12-26)
-# dev-lang/spidermonkey not keyworded
-www-client/elinks javascript
-
-# Matt Turner <mattst88@gentoo.org> (2010-12-26)
 # media-gfx/ufraw not keyworded
 media-gfx/imagemagick raw
 
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index cb0529744641..671ff88dd947 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -122,10 +122,6 @@ net-analyzer/icinga2 mariadb
 # grub pc is not supported on powerpc
 sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen grub_platforms_xen-pvh
 
-# Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2018-06-08)
-# sys-devel/llvmgold not yet keyworded
-sys-devel/llvm gold
-
 # Tomáš Mózes <hydrapolic@gmail.com> (2018-06-05)
 # Unkeyworded dependencies.
 app-admin/syslog-ng kafka mongodb
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 7e39be4b306c..6e6b4922096c 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Viorel Munteanu <ceamac.paragon@gmail.com> (2020-03-11)
-# new package dev-libs/libthreadar has no keywords
-app-backup/dar threads
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
+# sys-devel/clang not keyworded on PPC32.
+sys-libs/llvm-libunwind test
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 9d6ce8802203..3cccc93153f3 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# Unmask TPM on supported archs.
+sys-apps/systemd -tpm
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-02-25)
 # depends on ring crate, which is not so portable
 # https://github.com/briansmith/ring/issues/389
@@ -58,10 +62,6 @@ media-video/vlc -libplacebo
 # works on ppc64
 app-emulation/qemu -spice -usbredir
 
-# Georgy Yakovlev <gyakovlev@gentoo.org (2020-05-03)
-# works on ppc64
-sys-devel/llvm -gold
-
 # Jimi Huotari <chiitoo@gentoo.org> (2020-05-17)
 # Mask until 'app-arch/lxqt-archiver' is keyworded.
 lxqt-base/lxqt-meta archiver
@@ -93,7 +93,7 @@ sys-apps/flashrom jlink-spi
 
 # Jimi Huotari <chiitoo@gentoo.org> (2019-07-28)
 # Mask unkeyworded, untested dependencies.
-# https://bugs.gentoo.org/689606
+# bug #689606
 lxqt-base/lxqt-meta admin powermanagement processviewer screenshot sudo
 lxqt-base/lxqt-panel cpuload networkmonitor pulseaudio sysstat
 
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 2401394ba464..7d08d2482843 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -149,6 +149,6 @@ sys-devel/gettext cvs
 sys-devel/llvm doc
 sys-fs/squashfs-tools lzma
 sys-libs/libcap-ng python
-sys-process/audit gssapi python
+sys-process/audit gssapi
 x11-base/xorg-server  unwind
 x11-libs/libvdpau doc
diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
index 5e5e335685cb..7bf964bf53c8 100644
--- a/profiles/arch/riscv/use.force
+++ b/profiles/arch/riscv/use.force
@@ -1,5 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force the flag which corresponds to ARCH.
 riscv
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
+# sys-libs/libunwind not supported on RISC-V.
+llvm-libunwind
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 97f32f2a91fa..fc8cc4a45203 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="s390"
-ACCEPT_KEYWORDS="s390"
+ACCEPT_KEYWORDS="s390 ~s390"
 
 MULTILIB_ABIS="s390"
 DEFAULT_ABI="s390"
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index fca3adf4dad7..20fa51d1695f 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -17,7 +17,7 @@ dev-python/cssselect doc
 app-portage/layman darcs mercurial
 dev-python/setuptools_scm test
 # no lua support for vim
-app-editors/vim luajit lua
+app-editors/vim lua
 # not keyworded yet
 media-gfx/imagemagick raw
 dev-db/mariadb numa
diff --git a/profiles/arch/s390/package.use.stable.mask b/profiles/arch/s390/package.use.stable.mask
deleted file mode 100644
index aaf7d617fab5..000000000000
--- a/profiles/arch/s390/package.use.stable.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/use.mask b/profiles/arch/s390/use.mask
index c24a977058f1..17dfcdd30afd 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag which corresponds to ARCH.
 -s390
 
+# 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
 luajittex
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 614f1dca6a5e..3916bbb563de 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-04-27)
+# Deps not yet tested/keyworded.
+sys-devel/clang default-compiler-rt default-libcxx default-lld
+sys-devel/clang-runtime compiler-rt libcxx
+sys-devel/llvm gold z3
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
+# sys-devel/clang not keyworded on SPARC.
+sys-libs/llvm-libunwind test
+
 # Sam James <sam@gentoo.org> (2021-03-19)
 # On sparc, we have to force sys-apps/grep[libsigsegv]
 # for accurate stack overflow handling. dev-libs/libsigsegv
@@ -145,10 +155,6 @@ dev-util/geany-plugins git
 dev-util/geany-plugins workbench
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-11)
-# uses slot 0 of dev-lang/spidermonkey that is broken on sparc
-www-client/elinks javascript
-
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-11)
 # Required dependencies are not keyworded.
 x11-themes/qtcurve plasma
 
diff --git a/profiles/arch/sparc/use.force b/profiles/arch/sparc/use.force
index f95aef4e1765..191e6829c54d 100644
--- a/profiles/arch/sparc/use.force
+++ b/profiles/arch/sparc/use.force
@@ -1,2 +1,6 @@
 # Force the flag which corresponds to ARCH.
 sparc
+
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
+# sys-libs/libunwind not supported on SPARC.
+llvm-libunwind
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index af2de0a77787..683a8cdeafff 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -145,7 +145,6 @@ aacplus
 soundcloud
 devil
 gts
-clang
 metalink
 tremor
 fdk
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 677ceba8fd13..95fbcad5300c 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sam James <sam@gentoo.org> (2021-04-27)
+# Clang and friends aren't (yet?) stable on sparc
+clang
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/gstreamer is not stable for sparc
 gstreamer
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 446fff67ed8b..38a7fe6960de 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Viorel Munteanu <ceamac.paragon@gmail.com> (2020-03-11)
-# new package dev-libs/libthreadar has no keywords
-app-backup/dar threads
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-04-25)
+# Depends on either unkeyworded dev-java/openjdk:11
+# or unavailable >=dev-java/icedtea-4, bug #785640
+>=app-office/libreoffice-7 base java
+
+# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
+# Unmask TPM on supported archs.
+sys-apps/systemd -tpm
 
 # Daniel Novomesky <dnovomesky@gmail.com> (2021-02-24)
 # Depends on media-libs/svt-av1, which is unavailable on x86
@@ -38,7 +43,7 @@ sys-libs/compiler-rt-sanitizers -profile
 
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2020-10-28)
 # dev-qt/linguist-tools-5.15.0 and 5.15.1 OOM with bad_alloc.
-# https://bugs.gentoo.org/751418
+# bug #751418
 >=sci-astronomy/stellarium-0.20.3 nls
 
 # Sam James <sam@gentoo.org> (2020-10-05)
@@ -58,10 +63,6 @@ dev-db/mariadb -columnstore
 # media-video/pipewire:0/0.3 is available for x86
 www-client/firefox -screencast
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-07-11)
-# net-libs/libslirp is not yet keyworded on x86, bug #732144
-app-emulation/qemu slirp
-
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is available here
 # Bug #728558
@@ -299,10 +300,6 @@ sys-apps/systemd -gnuefi
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag
 media-libs/libbluray -bdplus
 
-# Jeroen Roovers <jer@gentoo.org> (2015-01-31)
-# >x11-drivers/nvidia-drivers-346 on x86 has no UVM support (bug #534156)
->x11-drivers/nvidia-drivers-346 uvm
-
 # Yixun Lan <dlan@gentoo.org> (2014-05-21)
 # sys-fs/zfs not keyworded on x86
 sys-cluster/ceph zfs
@@ -323,8 +320,8 @@ dev-libs/boost	-context
 # Tim Harder <radhermit@gentoo.org> (2013-08-13)
 # dev-lang/luajit keyworded for x86 (masked in base)
 # dev-scheme/racket keyworded for amd64 (masked in base)
-app-editors/vim -luajit -racket
-app-editors/gvim -luajit -racket
+app-editors/vim -racket
+app-editors/gvim -racket
 
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-08-09)
 # Works on x86
@@ -334,10 +331,6 @@ sys-apps/hwloc -gl -nvml
 # Unmask here, as it's masked in base.
 net-libs/gnutls -dane
 
-# Ben de Groot <yngwin@gentoo.org> (2012-07-30)
-# dependency keyworded here, masked in base
-media-libs/freetype -infinality
-
 # Michał Górny <mgorny@gentoo.org> (2012-04-11)
 # JIT compilation in zpaq generates code for x86/amd64.
 app-arch/zpaq -jit
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 74c4373b2168..737847d26d77 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -35,10 +35,6 @@ www-client/firefox screencast
 # sys-cluster/slurm has no stable keywords
 app-metrics/collectd collectd_plugins_slurm
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-04)
-# net-libs/libktorrent:5 is not stable anymore, bug #696858
-<kde-apps/kget-20.12 bittorrent
-
 # Amy Liffey <amynka@gentoo.org> (2019-01-15)
 # Mask experimental contrib repo
 # (except what's needed by digikam, dilfridge)
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 3b3d1cfe3b17..76cb48cac485 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -26,10 +26,6 @@ firebird
 # sys-libs/libapparmor
 apparmor
 
-# Andrey Grozin <grozin@gentoo.org> (2014-06-25)
-# no stable versions on x86
-clozurecl
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
 python_targets_pypy3