gentoo resync : 29.12.2022

3 files changed, 20 insertions, 56 deletions

diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask
index 23119df444d5..ab795bdab09d 100644
--- a/profiles/arch/riscv/package.mask
+++ b/profiles/arch/riscv/package.mask
@@ -4,6 +4,3 @@
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-04-30)
 # Bootstrapping was created only for lp64d
 dev-java/openjdk
-
-# Doesnt work properly with the one-level libdirs
-<sys-apps/baselayout-2.7-r3
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 8bb0933fc1ea..67ade27261d0 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,12 +1,19 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2022-05-08)
-# Requires dev-util/pahole.
-sys-kernel/gentoo-kernel debug
-sys-kernel/vanilla-kernel debug
-
-# Marek Szuba <marecki@gmail.com> (2022-04-30)
+# Sam James <sam@gentoo.org> (2022-06-26)
+# Avoid dragging in "heavy"  parts of dev-qt/* unless/until
+# somebody needs them. bug #816981, bug #854261.
+# Unfortunately, tests demand qtwebengine too.
+dev-python/QtPy pyside2 webengine
+dev-python/QtPy test
+
+# Jakov Smolić <jsmolic@gentoo.org> (2022-06-07)
+# riscv has no sanitizers unmasked for the time being, so
+# mask to prevent emerge from erroring out by default
+sys-devel/clang-runtime sanitize
+
+# Marek Szuba <marecki@gentoo.org> (2022-04-30)
 # net-wireless/sdrplay contains prebuilt binaries, currently available
 # upstream only for amd64/x86 and arm
 net-wireless/gr-osmosdr sdrplay
@@ -20,20 +27,11 @@ net-ftp/proftpd memcache
 # so avoid keywording 4.8 slot
 dev-lisp/clisp berkdb
 
-# Matt Turner <mattst88@gentoo.org> (2022-04-18)
-# app-text/nuspell is not keyworded
-app-text/enchant nuspell
-
 # Jakov Smolić <jsmolic@gentoo.org> (2022-04-07)
 # Depends on sys-cluster/ceph which pulls in valgrind, which is
 # unavailable on riscv currently
 sys-block/fio rbd
 
-# Marek Szuba <marecki@gentoo.org> (2022-03-30)
-# Indirectly depends on dev-python/pytest-testinfra, which is currently
-# blocked from being keyworded on this arch by several errors (Bug #835717)
-dev-python/subprocess-tee test-full
-
 # Jakov Smolić <jsmolic@gentoo.org> (2022-03-25)
 # sys-process/criu doesn't support riscv (bug #835975)
 # Upstream bug for criu: https://github.com/checkpoint-restore/criu/issues/1702
@@ -44,10 +42,6 @@ app-containers/crun criu
 # failures on riscv (bug #811477)
 dev-python/pytest-services test
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
-# Untested useflag on other arches, needs keywording
-media-video/ffmpeg vmaf
-
 # Alex Fan <alex.fan.q@gmail.com> (2022-02-28)
 # dev-libs/vc is a dummy implementation on this arch
 # krita fails to build with it
@@ -61,8 +55,8 @@ media-video/ffmpeg amf
 # Yongxinag Liang <tanekliang@gmail.com> (2022-01-09)
 # app-emulation/xen-tools doesn't support riscv yet
 app-emulation/qemu xen
-# untested useflag: rbd glusterfs
-app-emulation/qemu rbd glusterfs
+# unkeyworded depdendency - sys-cluster/ceph
+app-emulation/qemu rbd
 sys-fs/multipath-tools rbd
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-16)
@@ -78,10 +72,6 @@ sci-astronomy/stellarium webengine
 # 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
-
 # Marek Szuba <marecki@gentoo.org> (2021-09-23)
 # mkdocs ecosystem only partly keyworded on riscv, has rather messy
 # Python-target requirements.
@@ -89,16 +79,13 @@ dev-python/backrefs doc
 dev-python/pyspelling doc
 dev-python/wcmatch doc
 
-# Marek Szuba <marecki@gentoo.org> (2021-09-19)
-# media-gfx/nvidia-texture-tools reports arch as unknown, fails to build
-media-libs/devil nvtt
-
-# Alex Fan <alexfanqi@yahoo.com> (2021-09-13)
+# Alex Fan <alex.fan.q@gmail.com> (2022-05-16)
 # These depend on Haskell:
 #  - dev-vcs/darcs
 app-portage/layman darcs
 #  - app-text/pandoc
 sys-cluster/ceph pmdk
+app-text/nuspell doc
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-09-15)
 # Marek Szuba <marecki@gentoo.org> (2021-09-07)
@@ -121,12 +108,6 @@ dev-ruby/dalli test
 # Requires CPU with SSSE3 support
 net-analyzer/suricata hyperscan
 
-# Marek Szuba <marecki@gentoo.org> (2021-09-02)
-# dev-python/pebble not keyworded here due to failing tests.
-# That said, with pebble-4.6.3 installed manually
-# (and without testing) all nbconvert-6.0.7 tests passed.
-dev-python/nbconvert test
-
 # Yixun Lan <dlan@gentoo.org> (2021-08-29)
 #  sys-apps/fwupd not tested, USE=spi,uefi,dell
 #  sys-apps/flashrom no risc-v support, bug 810880
@@ -151,11 +132,7 @@ gnome-base/gnome-shell browser-extension
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-08-17)
 # dependencies not keyworded/tested
-kde-plasma/plasma-meta grub plymouth
-
-# Marek Szuba <marecki@gentoo.org> (2021-08-17)
-# sys-libs/libfaketime does not work properly on this arch
-sys-auth/sssd test
+kde-plasma/plasma-meta plymouth
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
 # Currently requires dev-lang/spidermonkey:68, which explicitly
@@ -201,7 +178,7 @@ media-gfx/gimp lua
 www-servers/nginx nginx_modules_http_lua
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-11)
-# Causes 35 tests to fail with "fatal llvm error"
+# Causes 35 tests to fail with "fatal llvm error", bug #844946
 dev-db/postgresql llvm
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
@@ -209,23 +186,12 @@ dev-db/postgresql llvm
 sys-cluster/slurm ucx
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-05)
-# net-dialup/mgetty fails to compile on this arch
-mail-mta/courier fax
-
-# Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
 #  - sci-libs/vtk
 media-libs/opencv vtk
 sci-libs/opencascade vtk
-#  - dev-util/aruba
-sys-block/thin-provisioning-tools test
 
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
 www-servers/nginx pcre-jit
-
-# app-shells/fish not keyworded due to failing tests (Bug #807742).
-# That said, with fish-3.3.1-r1 installed manually (and without testing)
-# all argcomplete-1.12.3 tests passed.
-dev-python/argcomplete test
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
index 928df18feed2..ff27ddeea511 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force
+++ b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
@@ -5,3 +5,4 @@
 # Bootstrapping is possible using our build snapshot, so don't force
 # system bootstrap
 dev-java/openjdk:11 -system-bootstrap
+dev-java/openjdk:17 -system-bootstrap