gentoo resync : 20.03.2022

6 files changed, 28 insertions, 22 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 8ceefa57faa7..68ce0ddafe21 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -78,6 +78,8 @@ games-fps/ut2003-demo
 games-fps/ut2004-demo
 games-misc/little-inferno
 games-misc/papers-please
+games-puzzle/braid-hb
+games-puzzle/braid-gog
 games-puzzle/triptych
 games-roguelike/adom
 games-rpg/baldurs-gate-ee
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 72750d69bf00..5d00e171a985 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -47,10 +47,6 @@ dev-util/diffoscope -haskell
 x11-base/xwayland -video_cards_nvidia
 x11-wm/mutter -video_cards_nvidia
 
-# 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
@@ -315,7 +311,7 @@ dev-vcs/git -mediawiki -mediawiki-experimental
 
 # Sergey Popov <pinkbyte@gentoo.org> (2013-12-27)
 # Boost.Context can be built on amd64
-dev-libs/boost	-context
+dev-libs/boost -context
 
 # Michał Górny <mgorny@gentoo.org> (2013-12-15)
 # mupen64plus' 2.0 new dynamic recompiler is supported on x86 and arm
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0847976fbd7b..b73ea069d9a0 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# needs stabilizing
+media-video/ffmpeg vmaf
+
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
+# needs stabilizing
+media-video/ffmpeg amf
+
 # Sam James <sam@gentoo.org> (2022-02-01)
 # sys-cluster/ucx is not marked stable on amd64
 sys-cluster/slurm ucx
@@ -45,11 +53,6 @@ app-office/libreoffice base
 # dev-util/nvidia-cuda-toolkit has no stable keywords
 app-metrics/collectd collectd_plugins_slurm collectd_plugins_gpu_nvidia
 
-# Joonas Niilola <juippis@gentoo.org> (2020-06-21)
-# sys-apps/apparmor doesn't have stable keywords.
-app-containers/lxc apparmor
-app-containers/lxd apparmor
-
 # Thomas Deutschmann <whissi@gentoo.org> (2019-10-28)
 # net-libs/quiche is an early HTTP/3 implementation
 # not yet ready for everyone.
@@ -86,7 +89,7 @@ virtual/wine staging
 
 # Christoph Junghans <junghans@gentoo.org> (2017-02-26)
 # Stable mask some fabrics (bug #525534)
-sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_pbs 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
+sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_rm_slurm openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl
 
 # Brian Evans <grknight@gentoo.org> (2017-01-17)
 # Stable mask groonga on mariadb as I don't know how stable
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index b7c2e5f118cb..6040e0cc0374 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -4,6 +4,11 @@
 # Unmask the flag which corresponds to ARCH.
 -amd64
 
+# David Seifert <soap@gentoo.org> (2022-03-13)
+# Cuda/NVENC works here
+-cuda
+-nvenc
+
 # Michał Górny <mgorny@gentoo.org> (2021-01-07)
 # Prebuilt kernels are supported here.
 -dist-kernel
@@ -37,10 +42,6 @@
 # sys-libs/libapparmor
 -apparmor
 
-# Alexey Shvetsov <alexxy@gentoo.org> (2014-04-08)
-# Cuda works here
--cuda
-
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
 -python_targets_pypy3
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 5b194e7de8b9..85a56dd72735 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,11 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-02-13)
+# Requires qtwebengine
+sci-electronics/eagle
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-09-09)
 # Jupyterlab and friends require net-libs/nodejs
 dev-python/jupyterlab
 dev-python/jupyterlab-lsp
 sci-misc/jupyterlab-desktop-bin
+dev-python/plotly
+dev-python/plotly-geo
+dev-python/chart-studio
+sci-visualization/dash
+sci-visualization/jupyter-dash
 
 # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-02-13)
 # Is reverse-dependency of dev-qt/qtwebengine
@@ -32,12 +41,8 @@ app-text/kchmviewer
 app-text/sigil
 dev-lang/typescript
 dev-python/spyder
-dev-python/spyder-line-profiler
-dev-python/spyder-memory-profiler
-dev-python/spyder-notebook
 dev-python/spyder-terminal
 dev-python/spyder-unittest
-dev-python/spyder-vim
 dev-util/kdevelop:5
 dev-util/kdevelop-php:5
 dev-util/kdevelop-python:5
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index c0a63dfeeb71..4123fc89f691 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-02-09)
@@ -46,7 +46,6 @@ dev-ruby/rails asset-pipeline
 dev-ruby/sprockets test
 dev-ruby/tilt test
 net-analyzer/netdata nodejs
-www-apps/gitea build-client
 www-apps/jekyll test
 www-apps/xpra-html5 minify
 dev-python/QtPy test