gentoo resync : 22.12.2021

20 files changed, 76 insertions, 53 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 5050fa825fa7..4424f1abce12 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Avoid keywording unnecessary depenencies for now, bug #804115
 dev-python/scipy pythran
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 772ea0b0ea5d..618cccae1a49 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -93,10 +93,6 @@ app-metrics/collectd -collectd_plugins_gpu_nvidia
 # Columnstore engine is supported on amd64
 dev-db/mariadb -columnstore
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-07-27)
-# media-video/pipewire:0/0.3 is available for amd64
-www-client/firefox -screencast
-
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is available here
 # Bug #728558
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 7802a944051c..1d5317c89ea4 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -43,8 +43,8 @@ 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-emulation/lxc apparmor
-app-emulation/lxd apparmor
+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
diff --git a/profiles/arch/arm/armv4/package.use.mask b/profiles/arch/arm/armv4/package.use.mask
index 4645bbb40cdb..db442dd26495 100644
--- a/profiles/arch/arm/armv4/package.use.mask
+++ b/profiles/arch/arm/armv4/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
 # Matt Turner <mattst88@gentoo.org> (07-25-2021)
 # gdm requires gnome-shell requires rustified librsvg.
 x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/armv4t/package.use.mask b/profiles/arch/arm/armv4t/package.use.mask
index 4645bbb40cdb..db442dd26495 100644
--- a/profiles/arch/arm/armv4t/package.use.mask
+++ b/profiles/arch/arm/armv4t/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
 # Matt Turner <mattst88@gentoo.org> (07-25-2021)
 # gdm requires gnome-shell requires rustified librsvg.
 x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/armv5te/package.use.mask b/profiles/arch/arm/armv5te/package.use.mask
index 4645bbb40cdb..db442dd26495 100644
--- a/profiles/arch/arm/armv5te/package.use.mask
+++ b/profiles/arch/arm/armv5te/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
 # Matt Turner <mattst88@gentoo.org> (07-25-2021)
 # gdm requires gnome-shell requires rustified librsvg.
 x11-misc/xscreensaver gdm
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 5a93cbad3647..f438ef894cc3 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
 # Sam James <sam@gentoo.org> (2021-11-19)
 # Avoid dragging in doc/sphinx deps where we can help it
 dev-python/anyio doc
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index d798f3f41a14..0a4b7c2a80de 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-12-15)
+# Unstable dependencies (dev-libs/libnl, sys-cluster/rdma-core)
+net-libs/libpcap netlink rdma
+
 # Sam James <sam@gentoo.org> (2021-11-17)
 # x11-libs/libXvMC is not marked stable on HPPA
 # media-libs/mesa is not marked stable on HPPA
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 455d535cd6f7..f7d836375ea4 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
 # Michał Górny <mgorny@gentoo.org> (2021-11-26)
 # These package flags require dev-python/cryptography which -- due
 # to the dependency on Rust -- is no longer portable to ia64.
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 5023abae516b..df0cf762626a 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -45,7 +45,7 @@ net-libs/webkit-gtk avif
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-05)
 # criu is masked on big-endian ppc*
-app-emulation/crun criu
+app-containers/crun criu
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-08-07)
 # dev-vcs/darcs is not keyworded on ppc/ppc64
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 0d8205bcb52d..a01b8aed5e6c 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -87,13 +87,6 @@ app-arch/p7zip kde
 dev-vcs/subversion kwallet
 x11-misc/xscreensaver new-login
 
-# Pacho Ramos <pacho@gentoo.org> (2015-09-06)
-# webkit-gtk is going to stay in ~all but amd64/x86
-# that are the only arches upstream is taking care
->=x11-libs/wxGTK-3.0.2.0-r1 webkit
-dev-util/glade webkit
-dev-python/wxpython webkit
-
 # Justin Lecher <jlec@gentoo.org> (2015-02-21)
 # Needs stable GNOME-3
 net-fs/netatalk tracker
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 3df67aeccf4d..d6929b9f383b 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,28 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-12-08)
+# Masks involving webkit-gtk; webkit-gtk was dekeyworded on ppc for a while.
+# We haven't (yet?) restored keywords for all the bits we had to drop, so
+# keep masks here (for now?).
+# Needs unkeyworded gnome-extra/sushi
+gnome-base/nautilus previewer
+# needs mail-client/evolution, depends on net-libs/webkit-gtk
+app-office/planner eds
+# needs gnome-extra/sushi, depends on net-libs/webkit-gtk
+gnome-base/nautilus previewer
+# needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
+gnome-base/gvfs google
+gnome-base/gnome-control-center flickr
+# needs mail-client/evolution, depends on net-libs/webkit-gtk
+net-mail/lbdb evo
+# needs dev-util/devhelp, depends on net-libs/webkit-gtk
+dev-util/anjuta devhelp
+
+# Daniel Pielmeier <billie@gentoo.org> (2021-11-07)
+# gnome-base/librsvg has no stable keywords here, bug #807130
+app-admin/conky lua-rsvg
+
 # Akinori Hattori <hattya@gentoo.org> (2021-10-24)
 # Requires unkeyworded dependencies
 app-i18n/uim kde
@@ -65,29 +87,6 @@ dev-ml/cudf test
 # gnome-base/librsvg, et al
 >=media-gfx/eog-3.33.1 svg
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
-# net-libs/webkit-gtk has no ppc keywords
-app-editors/emacs xwidgets
-gnome-extra/evolution-data-server oauth
-app-office/gnucash gui doc
-dev-util/geany-plugins markdown
->=media-gfx/gthumb-3.10.0 http
-# needs mail-client/evolution, depends on net-libs/webkit-gtk
-app-office/planner eds
-# needs gnome-extra/sushi, depends on net-libs/webkit-gtk
-gnome-base/nautilus previewer
-# needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
-gnome-base/gvfs google
-gnome-base/gnome-control-center flickr
-# needs x11-libs/wxGTK[webkit]
-sci-misc/boinc X
-# needs mail-client/evolution, depends on net-libs/webkit-gtk
-net-mail/lbdb evo
-# needs dev-util/devhelp, depends on net-libs/webkit-gtk
-dev-util/anjuta devhelp
-# app-text/libgepub depends on webkit-gtk
-xfce-extra/tumbler epub
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # clisp is keyworded on ppc
 app-text/texlive-core -xindy
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index 760fc9331531..c2325ed7fe8b 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ppc
 
+# Sam James <sam@gentoo.org> (2021-12-07)
+# net-libs/gnome-online-accounts is not marked keyworded on ppc
+gnome-online-accounts
+
 # Sam James <sam@gentoo.org> (2021-10-16)
 # media-libs/openexr doesn't work on BE (bug #818424)
 # ...and openscenegraph needs openexr.
@@ -18,12 +22,6 @@ llvm-libunwind
 # gnome-shell requires rustified librsvg.
 gnome-shell
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-07-18)
-# net-libs/webkit-gtk has no ppc keywords
-webkit
-# net-libs/gnome-online-accounts depends on net-libs/webkit-gtk
-gnome-online-accounts
-
 # James Le Cuirot <chewi@gentoo.org> (2015-01-12)
 # Java is no longer supported on ppc.
 java
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 5a33b5659e8f..a691c07c55ec 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -31,7 +31,7 @@ sci-mathematics/geogebra-bin
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-17)
 # works on ppc64le
--app-emulation/docker
+-app-containers/docker
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-22
 # criu works on ppc64le
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 7bd73835511c..26a05e73db9d 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -27,7 +27,7 @@ kde-apps/kdenetwork-meta webengine
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-05)
 # criu is unmasked on little-endian ppc64
-app-emulation/crun -criu
+app-containers/crun -criu
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-19)
 # openjfx is keyworded on ppc64le
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 7b32acd5c13c..52066e1297a4 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -32,7 +32,7 @@ sci-mathematics/geogebra-bin
 # Fails to build with buildmode=pie assumptions, which
 # does not work on big-endian ppc64
 # next releases remove that assumption and mask will be lifted
-app-emulation/docker
+app-containers/docker
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
 # openjfx:11 does not work on ppc64be
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index bb578bd989e1..8a95c710fd15 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Fan <alex.fan.q@gmail.com> (2021-12-12)
+# dev-python/uvloop fails test #806412
+# but with it installed, anyio passes all tests
+dev-python/anyio test
+
 # Alex Fan <alex.fan.q@gmail.com> (2021-11-19)
 # depends on dev-lang/ocaml
 app-accessibility/brltty ocaml ocamlopt
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
index a53334741ede..d19b0ba49931 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -3,7 +3,7 @@
 
 # RISC-V rv32imac/ilp32d no-multilib profile
 
-CFLAGS="-O2 -pipe -march=rv32imacdf -mabi=ilp32d"
+CFLAGS="-O2 -pipe -march=rv32imafdc -mabi=ilp32d"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 40ddf1c9f09e..cd3bd5afc540 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
+# ts-cli requires rust to be built, and rust is unavailable here ATM.
+dev-libs/tree-sitter ts-cli
+
+# Daniel Pielmeier <billie@gentoo.org> (2021-11-07)
+# gnome-base/librsvg is not keyworded here, bug #807130
+app-admin/conky lua-rsvg
+
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Avoid keywording unnecessary depenencies for now, bug #804115
 dev-python/scipy pythran
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index b2b1c34cb53f..b0e644494c6e 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -91,10 +91,6 @@ sys-libs/compiler-rt-sanitizers -profile
 # (See 9.3.8 in the Guile manual)
 dev-scheme/guile -jit
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-07-27)
-# media-video/pipewire:0/0.3 is available for x86
-www-client/firefox -screencast
-
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is available here
 # Bug #728558
@@ -127,8 +123,8 @@ sci-physics/lammps kokkos
 
 # Joonas Niilola <juippis@gentoo.org> (2020-05-14)
 # sys-apps/apparmor not keyworded on x86.
-app-emulation/lxc apparmor
-app-emulation/lxd apparmor
+app-containers/lxc apparmor
+app-containers/lxd apparmor
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # sys-cluster/slurm is keyworded on x86