gentoo resync : 14.05.2020

3 files changed, 11 insertions, 14 deletions

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 16288fe226f7..caea569f2bf5 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
+# sys-cluster/slurm is keyworded on x86
+app-metrics/collectd -collectd_plugins_slurm
+
+# Georgy Yakovlev <gyakovlev@gentoo.org (2020-04-26)
+# static-pie works on x86, #719444
+sys-libs/glibc -static-pie
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-03-11)
 # Encrypted Media Extensions (eme-free) can be disabled on x86
 www-client/firefox -eme-free
@@ -151,10 +159,6 @@ x11-wm/awesome doc
 # nvidia drivers are unmasked here
 media-video/ffmpeg -nvenc
 
-# Luca Barbato <lu_zero@gentoo.org> (2017-01-22)
-# cuda is not available on x86 nvidia-video-codec depends on it
-media-video/libav nvidia
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2016-12-31)
 # on behalf of Andreas K. Hüttel <dilfridge@gentoo.org> (2016-12-14)
 # Fails to build with newly unmasked ffmpeg-3, so mask this useflag
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index da3604fdb088..520a1f700ee4 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -29,11 +29,6 @@ kde-plasma/xdg-desktop-portal-kde screencast
 sys-apps/xdg-desktop-portal screencast
 x11-wm/mutter screencast
 
-# Brian Evans <grknight@gentoo.org> (2019-05-22)
-# Allow python-exec to install all targets
-# Ack by mgorny
-dev-lang/python-exec -python_targets_python3_7 -python_targets_python3_8
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-05-21)
 # dev-db/oracle-instantclient ain't stable
 dev-qt/qtsql oci8
@@ -90,4 +85,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_pypy3
+dev-lang/python-exec -python_targets_pypy3 -python_targets_python3_8
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 580c08661a6b..e8270840f6f7 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -1,13 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
-# dev-lang/python:3.7 is not stable.
-python_targets_python3_7
-python_single_target_python3_7
+# dev-lang/python:3.8 is not stable.
 python_targets_python3_8
 python_single_target_python3_8