gentoo resync : 15.01.2020

31 files changed, 92 insertions, 122 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 2dcc1415ed5d..d91d5e28c9f5 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 433e985b3362..f39480229b5f 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -26,6 +26,7 @@ app-benchmarks/cpuburn
 app-editors/emacs:18
 app-emulation/crossover-bin
 app-emulation/playonlinux
+app-emulation/protontricks
 app-emulation/q4wine
 app-emulation/winetricks
 app-office/ooextras
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index f83b6bb95645..37241d814ba3 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -14,8 +14,6 @@ app-emulation/xen-tools ovmf
 # abi_x86_32 at this time.
 app-emulation/wine-vanilla test
 app-emulation/wine-staging test
-app-emulation/wine-d3d9 test
-app-emulation/wine-any test
 
 # Mike Frysinger <vapier@gentoo.org> (2016-08-12)
 # Requires sys-boot/grub:0 which is masked here.
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 0f4c85a656e0..9af2e4978197 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -13,8 +13,6 @@ dev-lang/rust llvm_targets_X86
 # Packages with optional 64-bit variant
 app-emulation/wine-vanilla -abi_x86_64
 app-emulation/wine-staging -abi_x86_64
-app-emulation/wine-d3d9 -abi_x86_64
-app-emulation/wine-any -abi_x86_64
 virtual/wine -abi_x86_64
 
 # Michał Górny <mgorny@gentoo.org> (2017-04-08)
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4b1be845a52d..301ed55a9fc0 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -83,10 +83,6 @@ net-analyzer/testssl -bundled-openssl -kerberos
 # Unmask libheif support where media-libs/libheif is keyworded
 media-gfx/imagemagick -heif
 
-# Ben Kohler <bkohler@gentoo.org> (2018-08-23)
-# Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/networkmanager -iwd
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
 # Dependency sys-cluster/ceph is keyworded for amd64
 net-fs/samba -ceph
@@ -106,8 +102,6 @@ media-video/mpv -vulkan
 
 # Nick Sarnie <sarnex@gentoo.org> (2018-04-29)
 # media-libs/vulkan-loader and app-emulation/vkd3d are keyworded on amd64
-app-emulation/wine-any -vkd3d -vulkan
-app-emulation/wine-d3d9 -vkd3d -vulkan
 app-emulation/wine-staging -vkd3d -vulkan
 app-emulation/wine-vanilla -vkd3d -vulkan
 
@@ -247,10 +241,8 @@ sys-apps/hwloc -gl
 
 # Michał Górny <mgorny@gentoo.org> (2013-07-22)
 # Meaningless on amd64 (it controls the 32-bit x86 JIT).
-dev-python/pypy cpu_flags_x86_sse2
-dev-python/pypy-bin cpu_flags_x86_sse2
-dev-python/pypy3 cpu_flags_x86_sse2
-dev-python/pypy3-bin cpu_flags_x86_sse2
+dev-python/pypy-exe cpu_flags_x86_sse2
+dev-python/pypy3-exe cpu_flags_x86_sse2
 
 # Christoph Junghans <junghans@gentoo.org> (2012-12-26)
 # cuda works on x86/amd64 (masked in base)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0cc079514425..ae366e0960f3 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -22,11 +22,6 @@
 # not yet ready for everyone.
 net-misc/curl quiche
 
-# Nick Sarnie <sarnex@gentoo.org> (2019-10-14)
-# Allow on stable for now
-app-emulation/wine-d3d9 -d3d9
-virtual/wine -d3d9
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-08-18)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
@@ -52,10 +47,6 @@ media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfe
 # unmask sssd for sudo
 app-admin/sudo -sssd
 
-# Mart Raudsepp <leio@gentoo.org> (2018-11-01)
-# net-wireless/iwd not stable yet
-net-misc/networkmanager iwd
-
 # Mikle Kolyada <zlogene@gentoo.org> (2018-09-15)
 # the dependency is unstable
 media-video/libav nvidia
@@ -77,7 +68,7 @@ sci-libs/gdal oracle
 
 # NP-Hardass <NP-Hardass@gentoo.org> (2017-09-27)
 # patchset variants are not stable
-virtual/wine d3d9 staging
+virtual/wine staging
 
 # Tim Harder <radhermit@gentoo.org> (2017-09-11)
 # Pulls in dev-ruby/asciidoctor which has too large of a ruby testing
@@ -105,5 +96,4 @@ gnustep-base/gnustep-make libobjc2
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 273afa3f77fb..c2af8ba1c891 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -42,8 +42,6 @@
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
--python_targets_pypy
--python_single_target_pypy
 -python_targets_pypy3
 -python_single_target_pypy3
 
@@ -72,11 +70,6 @@
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
 
-# Ralph Sennhauser <sera@gentoo.org> (2012-07-31)
-# Keyworded on amd64
--python_targets_jython2_7
--python_single_target_jython2_7
-
 # Joerg Bornkessel <hd_brummy@gentoo.org> (2012-03-05)
 # Unmask, works with v4l2, #350211
 -dxr3
@@ -124,6 +117,7 @@
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel
+-video_cards_iris
 -video_cards_nvidia
 -video_cards_siliconmotion
 -video_cards_vesa
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 632b974f29fb..5d32143f73f4 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -25,7 +25,5 @@ clozurecl
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
-python_targets_pypy
-python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index fe9b8213891d..10f4ba530681 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -5,3 +5,4 @@ dev-lang/nim
 # There is no prebuilt rustc for armv4 by upstream
 dev-lang/rust-bin
 dev-lang/rust
+virtual/rust
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index fe9b8213891d..10f4ba530681 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -5,3 +5,4 @@ dev-lang/nim
 # There is no prebuilt rustc for armv4 by upstream
 dev-lang/rust-bin
 dev-lang/rust
+virtual/rust
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index 0b8f847177ac..a4d8f03b198b 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -5,3 +5,4 @@ dev-lang/nim
 # There is no prebuilt rustc for armv5 by upstream
 dev-lang/rust-bin
 dev-lang/rust
+virtual/rust
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index db5e9dd7c74d..f764792e4eac 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org (2020-01-04)
+# zfs is not keyworded on arm
+dev-util/schroot zfs
+
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
@@ -60,7 +68,7 @@ sys-apps/fwupd dell thunderbolt
 www-apps/nextcloud imagemagick
 
 # Corentin Pazdera <nado@troglodyte.be> (2018-12-28)
-# Requires virtual/pypy which isn't keyworded for ARM.
+# Requires dev-python/pypy which isn't keyworded for ARM.
 www-servers/uwsgi pypy
 
 # Davide Pesavento <pesa@gentoo.org> (2018-12-27)
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 4648105ebeb2..357a73151c3a 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Aaron Bauman <bman@gentoo.org> (2019-12-27)
+# ffmpeg does support 64 bit neon
+media-video/ffmpeg cpu_flags_arm_neon
+
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
 sys-firmware/seabios -binary
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 0f3e6848e733..f454975229d7 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-01-11)
+# Unkeyworded dep.
+kde-apps/cantor julia
+
+# Rick Farina <zerochaos@gentoo.com> (2020-01-03)
+# ubertooth needs net-libs/libbtbb and net-wireless/ubertooth which aren't keyworded
+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
+
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # Craig Andrews <candrews@gentoo.org> (2019-11-26)
 # net-misc/quiche is available on this arch
 net-misc/curl -quiche
@@ -70,7 +86,6 @@ kde-plasma/discover firmware
 app-emulation/qemu -sdl
 dev-libs/zziplib -sdl
 media-libs/libmpeg2 -sdl
-media-libs/mediastreamer -sdl
 media-libs/mlt -sdl
 media-libs/openal -sdl
 media-sound/mpg123 -sdl
@@ -255,19 +270,11 @@ media-sound/mumble g15
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
 media-libs/mesa vulkan vulkan-overlay
 
-# Alexis Ballier <aballier@gentoo.org> (2017-07-31)
-# Passes -mfpu=neon with neon enabled
-mail-client/thunderbird neon
-
 # Alexis Ballier <aballier@gentoo.org> (2017-07-20)
 # media-libs/libemf fails with #error unknown CPU.
 media-gfx/pstoedit emf
 
 # Alexis Ballier <aballier@gentoo.org> (2017-07-14)
-# Appends -mfpu=neon and asm seems arm32
-net-misc/freerdp cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-07-14)
 # zfs does not build on arm64 (yet?)
 app-emulation/libvirt zfs
 sys-cluster/ceph zfs
@@ -311,28 +318,10 @@ app-crypt/libsecret test
 app-shells/bash-completion test
 
 # Alexis Ballier <aballier@gentoo.org> (2017-06-21)
-# Appends -mfpu=neon that doesnt work on arm64
-media-libs/speexdsp cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-06-21)
 # net-fs/openafs-kernel does not recognize arm64 properly
 # Need to check if this has a chance to work with in-kernel drivers
 app-crypt/heimdal afs
 
-# Alexis Ballier <aballier@gentoo.org> (2017-06-20)
-# Jory A. Pratt <anarchy@gentoo.org> (2019-11-29)
-# Appends -mfpu=neon which is only valid for arm32 and suggests this is arm32
-# only
-media-sound/pulseaudio neon cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-06-19)
-# This is for arm32 only neon asm
-media-libs/vo-aacenc cpu_flags_arm_neon
-
-# Alexis Ballier <aballier@gentoo.org> (2017-06-16)
-# pixman's neon code is armv7 only.
-x11-libs/pixman cpu_flags_arm_neon neon
-
 # James Le Cuirot <chewi@gentoo.org> (2017-05-22)
 # Only available on some architectures.
 dev-java/icedtea -shenandoah
diff --git a/profiles/arch/arm64/use.force b/profiles/arch/arm64/use.force
index ad4cb1b4c759..9747410d0417 100644
--- a/profiles/arch/arm64/use.force
+++ b/profiles/arch/arm64/use.force
@@ -9,7 +9,6 @@ cpu_flags_arm_v7
 cpu_flags_arm_v8
 
 cpu_flags_arm_edsp
-cpu_flags_arm_neon
 cpu_flags_arm_thumb
 cpu_flags_arm_thumb2
 cpu_flags_arm_vfp
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 8f25ea517e3e..21d730d54cd3 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -4,9 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -arm64
 
-# Matt Turner <mattst88@gentoo.org> (2019-12-05)
-# media-libs/libglvnd is not keyworded
-libglvnd
+# Aaron Bauman <bman@gentoo.org> (2019-12-27)
+# Mask cpu_flags_arm_neon for all of arm64
+# A neon64 USE is being discussed
+cpu_flags_arm_neon
 
 # Unmask arm specific USE flags
 -cpu_flags_arm_v4
@@ -19,7 +20,6 @@ libglvnd
 -cpu_flags_arm_aes
 -cpu_flags_arm_crc32
 -cpu_flags_arm_edsp
--cpu_flags_arm_neon
 -cpu_flags_arm_sha1
 -cpu_flags_arm_sha2
 -cpu_flags_arm_thumb
@@ -30,7 +30,6 @@ libglvnd
 -cpu_flags_arm_vfp-d32
 
 # Unmask [old] arm specific USE flags
--neon
 -armvfp
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 78ea5c5b8052..884bf63c8e93 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -14,14 +14,6 @@ net-misc/curl quiche
 # net-libs/nghttp3 net-libs/ngtcp2[ssl] are not available on all arches
 net-misc/curl nghttp3
 
-# Nick Sarnie <sarnex@gentoo.org> (2019-10-14)
-# No longer updated or supported by the Wine project
-# wine-d3d9 superceeded by nine-standalone
-# wine-any has no value without wine-d3d9
-# Removal in 30 days
-app-emulation/wine-d3d9 d3d9
-virtual/wine d3d9
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # Moved from arch/powerpc/ppc64 as it applies to most architectures.
 sys-firmware/seabios debug
@@ -70,10 +62,6 @@ net-analyzer/testssl bundled-openssl kerberos
 # Requires media-libs/libheif which is only keyworded for amd64 and x86
 media-gfx/imagemagick heif
 
-# Ben Kohler <bkohler@gentoo.org> (2018-08-23)
-# Mask iwd support until net-wireless/iwd is keyworded
-net-misc/networkmanager iwd
-
 # Rick Farina <zerochaos@gentoo.org> (2018-06-27)
 # Catalyst only has support for assembling bootloader on some arches
 dev-util/catalyst system-bootloader
@@ -85,8 +73,6 @@ media-video/mpv vulkan
 
 # Nick Sarnie <sarnex@gentoo.org> (2018-04-29)
 # media-libs/vulkan-loader and app-emulation/vkd3d are not available everywhere
-app-emulation/wine-any vkd3d vulkan
-app-emulation/wine-d3d9 vkd3d vulkan
 app-emulation/wine-staging vkd3d vulkan
 app-emulation/wine-vanilla vkd3d vulkan
 
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 4a46bc011556..dabc00d37ee3 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -131,6 +131,7 @@ video_cards_ast
 video_cards_i915
 video_cards_i965
 video_cards_intel
+video_cards_iris
 video_cards_nvidia
 video_cards_vesa
 video_cards_via
@@ -191,8 +192,6 @@ orc
 # Mike Gilbert <floppym@gentoo.org> (2013-01-02)
 # PyPy is unkeyworded on most arches. If you are running amd64 or x86,
 # please switch to one of the testing 13.0 profiles to get it.
-python_targets_pypy
-python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3
 
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 91be06a665e7..79813b99791b 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-12-07)
 # app-emulation/xen-tools is not keyworded on ia64.
 sys-boot/grub grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 89cb69691208..dd385788423b 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ia64
 
+# # Sergei Trofimovich <slyfox@gentoo.org> (2019-12-28)
+# ruby-2.7 dropped ia64 support.
+ruby_targets_ruby27
+
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libindicate).
 ayatana
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 51113143c424..4b2e7f540f3e 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-01-11)
+# Unkeyworded test deps.
+dev-cpp/eigen test
+
+# Rick Farina <zerochaos@gentoo.com> (2020-01-03)
+# ubertooth needs net-libs/libbtbb and net-wireless/ubertooth which aren't keyworded
+# rtl-sdr needs net-wireless/rtl-sdr
+net-wireless/kismet rtlsdr ubertooth
+
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is stable on ppc
 sys-firmware/seabios -debug
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 4430074885e3..6800622d7f02 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-28)
+# not keyworded or irrelevant on ~ppc64, bug 679888
+app-emulation/libvirt virtualbox xen
+
 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 9a7a5a7ce313..81d8a7a4e6d2 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -22,7 +22,7 @@ dev-vcs/git pcre-jit
 # This includes also packages which do not support python-3 or
 # do not support python-3.7 yet.
 
-app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp
+app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp test
 app-admin/sysstat lm-sensors
 app-arch/libarchive lz4 lzo zstd
 app-arch/unzip natspec
@@ -30,7 +30,7 @@ app-crypt/gnupg smartcard tofu wks-server
 app-crypt/mit-krb5 doc test xinetd
 app-crypt/pinentry fltk gnome-keyring
 app-doc/doxygen latex dot
-app-editors/emacs alsa lcms mailutils
+app-editors/emacs alsa json lcms mailutils
 app-editors/emacs-vcs alsa json lcms mailutils
 app-misc/pax-utils python
 app-text/asciidoc graphviz test
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
index 529c1d546345..6e01a574cebb 100644
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -7,8 +7,6 @@
 
 # Our Python has a lot of trouble with the two-level libdir.
 python_targets_python2_7
-python_targets_python3_5
 python_targets_python3_6
 python_single_target_python2_7
-python_single_target_python3_5
 python_single_target_python3_6
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 621c5b39af2a..719207e03b74 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -4,9 +4,9 @@
 # Unmask the flag which corresponds to ARCH.
 -riscv
 
-# Matt Turner <mattst88@gentoo.org> (2019-12-05)
-# media-libs/libglvnd is not keyworded
-libglvnd
+# Ben Kohler <bkohler@gentoo.org> (2019-01-09)
+# no fam providers keyworded yet
+fam
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-11-27)
 # valgrind has no RISCV port.
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index f1f9dab66c11..9d0e0614f8ba 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -10,7 +10,6 @@ dev-vcs/subversion ruby
 app-crypt/pinentry fltk
 dev-python/cssselect doc
 dev-vcs/subversion kwallet
-app-text/ghostscript-gpl cups
 # not really interested in supporting alternative
 # VCS for oberlays yet.
 app-portage/layman bazaar darcs mercurial
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index bc533bd72fa7..551f47e5f3f5 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -4,10 +4,6 @@
 # Unmask the flag which corresponds to ARCH.
 -sparc
 
-# Matt Turner <mattst88@gentoo.org> (2019-12-05)
-# media-libs/libglvnd is not keyworded
-libglvnd
-
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libappindicator).
 ayatana
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 1ba90bc44275..27e3302fde53 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org (2020-01-04)
+# zfs is not keyworded on x86
+dev-util/schroot zfs
+
+# Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
+# dev-libs/criterion is not keyworded yet
+app-admin/syslog-ng test
+
 # James Le Cuirot <chewi@gentoo.org> (2019-12-10)
 # The JIT feature only works on amd64 and x86.
 app-emulation/aranym -jit
@@ -72,10 +80,6 @@ dev-python/pymongo test
 # media-libs/qtav not keyworded
 media-video/orion qtav
 
-# Ben Kohler <bkohler@gentoo.org> (2018-08-23)
-# Unmask iwd support where net-wireless/iwd is keyworded
-net-misc/networkmanager -iwd
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
 # Dependency sys-cluster/ceph is keyworded for x86
 net-fs/samba -ceph
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index c1b987d076a8..57547de9d75c 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,10 +17,9 @@
 
 #--- END OF EXAMPLES ---
 
-# Nick Sarnie <sarnex@gentoo.org> (2019-10-14)
-# Allow on stable for now
-app-emulation/wine-d3d9 -d3d9
-virtual/wine -d3d9
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-04)
+# net-libs/libktorrent:5 is not stable anymore, bug #696858
+kde-apps/kget bittorrent
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-09-13)
 # media-video/pipewire is not stable yet
@@ -47,10 +46,6 @@ media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfe
 # unmask sssd for sudo
 app-admin/sudo -sssd
 
-# Mart Raudsepp <leio@gentoo.org> (2018-11-01)
-# net-wireless/iwd not stable yet
-net-misc/networkmanager iwd
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-09-27)
 # sys-devel/lld is unstable
 www-client/firefox clang
@@ -72,7 +67,7 @@ sci-libs/gdal oracle
 
 # NP-Hardass <NP-Hardass@gentoo.org> (2017-09-27)
 # patchset variants are not stable
-virtual/wine d3d9 staging
+virtual/wine staging
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2017-03-01)
 # Requires not yet stabilised dev-db/oracle-instantclient.
@@ -99,5 +94,4 @@ dev-cpp/eigen test
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index d7fb537d7955..7948162763a6 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -38,8 +38,6 @@ python_single_target_python3_7
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is keyworded on this arch.
--python_targets_pypy
--python_single_target_pypy
 -python_targets_pypy3
 -python_single_target_pypy3
 
@@ -69,11 +67,6 @@ python_single_target_python3_7
 # IPMI is only implemented for x86, amd64 and ia64
 -ipmi
 
-# Ralph Sennhauser <sera@gentoo.org> (2012-07-31)
-# Keyworded on x86
--python_targets_jython2_7
--python_single_target_jython2_7
-
 # Joerg Bornkessel <hd_brummy@gentoo.org> (2012-03-05)
 # Unmask, works with v4l2, #350211
 -dxr3
@@ -141,6 +134,7 @@ python_single_target_python3_7
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel
+-video_cards_iris
 -video_cards_nvidia
 -video_cards_siliconmotion
 -video_cards_vmware
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index eae8d7442ac9..580c08661a6b 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -25,7 +25,5 @@ clozurecl
 
 # Michał Górny <mgorny@gentoo.org> (2014-03-30)
 # PyPy is unstable on this arch.
-python_targets_pypy
-python_single_target_pypy
 python_targets_pypy3
 python_single_target_pypy3