gentoo resync : 15.01.2020

4 files changed, 14 insertions, 24 deletions

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