gentoo resync : 28.04.2021

3 files changed, 11 insertions, 26 deletions

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