gentoo resync : 08.10.2021

15 files changed, 27 insertions, 37 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index eddebf3d0ee1..16eb9ca985ee 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -192,10 +192,6 @@ app-admin/conserver -freeipmi
 # - rdrand plugin is supported on amd64
 net-vpn/strongswan -strongswan_plugins_aesni -strongswan_plugins_rdrand
 
-# James Le Cuirot <chewi@gentoo.org> (2018-11-02)
-# Vulkan is only available on amd64 at present.
-media-libs/libsdl2 -vulkan
-
 # Michael Palimaka <kensington@gentoo.org> (2018-10-12)
 # Unmask arch-specific USE flags available on amd64
 net-analyzer/testssl -bundled-openssl -kerberos
@@ -360,7 +356,6 @@ gnustep-base/gnustep-make -libobjc2
 # so the flag is masked in the base profile and unmasked here.
 dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
 
 # Robin H. Johnson <robbat2@gentoo.org> (2011-07-10), updated 2019-12-06
 # PPS should work on all arches, but only keyworded on some arches
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index a0232eb6ec61..05c072b5f607 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -81,7 +81,6 @@ kde-misc/kmarkdownwebview:5
 kde-misc/tellico:5
 kde-misc/zanshin:5
 mail-client/kube
-mail-client/trojita
 media-gfx/digikam:5
 media-gfx/luminance-hdr
 media-sound/frescobaldi
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 3101e24236fd..3ebd7cadb6df 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -54,4 +54,3 @@ dev-python/QtPy test
 # The QML (V4) and JSC JITs do not work on x32.
 dev-qt/qtdeclarative jit
 dev-qt/qtscript jit
-dev-qt/qtwebkit jit
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index bc106a751a10..80329451c6a1 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.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
 
 # Joonas Niilola <juippis@gentoo.org> (2020-09-26)
@@ -25,3 +25,4 @@
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-22)
 # This is built for armv7a so unmask here.
 -dev-java/openjdk-bin:11
+-dev-java/openjdk-bin:17
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 7834df6416c0..cd022be2b22d 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -27,3 +27,4 @@ dev-java/icedtea-bin
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-22)
 # This is built for armv7a and will not work on earlier generations.
 dev-java/openjdk-bin:11
+dev-java/openjdk-bin:17
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3ea8dc29561c..c855277818be 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -332,6 +332,7 @@ media-gfx/xsane ocr
 # Alexis Ballier <aballier@gentoo.org> (2015-11-14)
 # MMAL is available on the Raspberry Pi (armv6 & armv7 so far)
 media-video/ffmpeg -mmal
+media-video/ffmpeg-chromium -mmal
 
 # Markus Meier <maekke@gentoo.org> (2015-10-10)
 # unkeyworded deps, bug #552330
@@ -493,7 +494,6 @@ net-vpn/tinc vde
 # so the flag is masked in the base profile and unmasked here.
 dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
 
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug vcd wavpack
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 5612ce870a4b..90e884f46c82 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -13,6 +13,7 @@ dev-libs/keystone llvm_targets_AArch64
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
 media-video/ffmpeg cpu_flags_arm_neon
+media-video/ffmpeg-chromium cpu_flags_arm_neon
 
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index a8b66f07c433..ddc7dccfcf54 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jakov Smolić <jsmolic@gentoo.org> (2021-10-07)
+# dev-libs/mongo-c-driver is not keyworded here
+net-analyzer/zmap mongo
+
 # Sam James <sam@gentoo.org> (2021-08-14)
 # Needs Raspberry Pi specific applications
 media-video/mjpg-streamer -input-raspicam
@@ -27,10 +31,6 @@ dev-util/diffoscope pascal
 # and media-plugins/zam-plugins not keyworded here
 media-sound/easyeffects rnnoise webrtc zamaudio
 
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
-# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
-games-fps/yamagi-quake2 vulkan
-
 # Stefan Strogin <steils@gentoo.org> (2021-06-27)
 # Requires dev-python/adblock which is not keyworded on arm64 yet
 www-client/qutebrowser adblock
@@ -192,6 +192,7 @@ net-wireless/kismet ubertooth
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
 media-video/ffmpeg -cpu_flags_arm_neon
+media-video/ffmpeg-chromium -cpu_flags_arm_neon
 
 # Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
 # dev-libs/criterion is not keyworded yet
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 740c44392c08..089f99dfad2e 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -164,10 +164,6 @@ x11-apps/igt-gpu-tools overlay
 # - padlock plugin is only supported on amd64 and x86
 net-vpn/strongswan strongswan_plugins_aesni strongswan_plugins_rdrand strongswan_plugins_padlock
 
-# James Le Cuirot <chewi@gentoo.org> (2018-11-02)
-# Vulkan is only available on amd64 at present.
-media-libs/libsdl2 vulkan
-
 # Michael Palimaka <kensington@gentoo.org> (2018-10-12)
 # Only available on amd64/x86
 net-analyzer/testssl bundled-openssl kerberos
@@ -261,6 +257,7 @@ media-video/mpv raspberry-pi
 # MMAL is only available on the Raspberry Pi:
 # Mask it globally, unmask it on arm.
 media-video/ffmpeg mmal
+media-video/ffmpeg-chromium mmal
 
 # Brian Evans <grknight@gentoo.org (2015-09-14)
 # Mask new USE flags for mariadb which all arches do not yet have dependencies
@@ -338,7 +335,6 @@ media-video/transcode nuv pic
 # mask the flag here and unmask it in the appropriate arch profiles.
 dev-qt/qtdeclarative jit
 dev-qt/qtscript jit
-dev-qt/qtwebkit jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (2011-11-25)
 # Expose USE="suid" for USE="svga" only for x86 users,
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 7dc591aeedf7..b478a13dfc42 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -25,6 +25,8 @@ app-text/htmltidy test
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # Requires texlive and friends to be keyworded.
 app-doc/doxygen doc
+dev-libs/libcbor doc
+media-libs/libcaca doc
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-21)
 # Avoid lots of unkeyworded dependencies of Python tests.
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index f3fc5130ffa9..d06346dd9a9b 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2021-10-02)
+# Keywording aside, m68k CPUs are probably too slow for PulseAudio.
+pulseaudio
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-28)
 # Too many unkeyworded dependencies for now.
 efl
@@ -72,6 +76,7 @@ audit
 # Masking these globally, since we don't have X
 gnome
 gnome-keyring
+nas
 
 # Masking since net-dns/avahi and net-misc/mDNSResponder are masked
 zeroconf
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 1544eb028159..caf4ed631a0a 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.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
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-17)↲
@@ -42,9 +42,10 @@ sci-mathematics/geogebra-bin
 -x11-drivers/xf86-video-amdgpu
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-04)
-# AdoptOpenJDK's ppc64 build is little-endian only
+# Temurin ppc64 build is little-endian only
 # so we can use bins and build from source
 -dev-java/openjdk:11
+-dev-java/openjdk:17
 -dev-java/openjdk-bin
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-04-11)
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index eadb9e0c4156..fbfee3c8638a 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -41,7 +41,6 @@ dev-qt/qtdeclarative -vulkan
 dev-qt/qtgui -vulkan
 dev-qt/qtwayland -vulkan
 media-libs/mesa -vulkan -vulkan-overlay
-media-libs/libsdl2 -vulkan
 media-video/mpv -vulkan
 media-video/vlc -libplacebo
 
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.mask b/profiles/arch/powerpc/ppc64/64ul/package.mask
index 053f87a07a01..50a78625fb11 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.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
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
@@ -6,7 +6,8 @@
 net-im/telegram-desktop
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-01)
-# AdoptOpenJDK's ppc64 build is little-endian only so it's impossible
-# to build openjdk:11, but it's possible to build openjdk:8 with icedtea{,-bin}
+# Temurin ppc64 build is little-endian only so it's impossible
+# to build openjdk:11 and later, but it's possible to build openjdk:8 with icedtea{,-bin}
 dev-java/openjdk:11
+dev-java/openjdk:17
 dev-java/openjdk-bin
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 6c9eaa3ba660..f8dbe499da81 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -29,10 +29,6 @@ media-sound/pulseeffects rnnoise webrtc zamaudio
 # bug #801649
 dev-util/diffoscope -haskell
 
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
-# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
-games-fps/yamagi-quake2 vulkan
-
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # Feature currently relies on amd64 prebuilt binaries.
 media-video/obs-studio browser
@@ -75,13 +71,6 @@ net-misc/asterisk -blocks
 # Depends on media-plugins/gst-plugins-cairo, which isn't keyworded on x86.
 app-misc/pdfpc gstreamer
 
-# Sam James <sam@gentoo.org> (2021-01-14)
-# Needs libsdl2[vulkan]
-# Vulkan may be supported on x86, as per
-# Qt unmasking below, but not able to test
-# libsdl2 + Vulkan on x86 at the moment.
-games-strategy/warzone2100 vulkan
-
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
 sys-libs/compiler-rt-sanitizers -asan -lsan
@@ -129,8 +118,9 @@ app-text/texlive-core -xindy
 sci-physics/lammps kokkos
 
 # Joonas Niilola <juippis@gentoo.org> (2020-05-14)
-# Dependency not keyworded on this arch.
+# sys-apps/apparmor not keyworded on x86.
 app-emulation/lxc apparmor
+app-emulation/lxd apparmor
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # sys-cluster/slurm is keyworded on x86
@@ -390,7 +380,6 @@ media-video/transcode -nuv -pic
 # so the flag is masked in the base profile and unmasked here.
 dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (2011-11-25)
 # Expose USE="suid" for USE="svga" only for x86 users,