gentoo resync : 25.08.2020

6 files changed, 27 insertions, 18 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 437a4f6e1120..4f07a51129a5 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -24,7 +24,6 @@ app-arch/stuffit
 app-benchmarks/cpuburn
 app-editors/emacs:18
 app-emulation/crossover-bin
-app-emulation/playonlinux
 app-emulation/protontricks
 app-emulation/q4wine
 app-emulation/winetricks
@@ -37,7 +36,6 @@ games-action/badland
 games-action/beathazardultra
 games-action/brutal-legend
 games-action/crimsonland
-games-action/cs2d
 games-action/descent3
 games-action/descent3-demo
 games-action/guacamelee
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 3e6eb33f3df4..6529a10bc8e5 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann <whissi@gentoo.org> (2020-08-17)
+# Columnstore engine is supported on amd64
+dev-db/mariadb -columnstore
+
+# Thomas Deutschmann <whissi@gentoo.org> (2020-07-27)
+# media-video/pipewire:0/0.3 is available for amd64
+www-client/firefox -screencast
+
+# Sam James <sam@gentoo.org> (2020-07-03)
+# Rust is available here
+# Bug #728558
+media-video/ffmpeg -rav1e
+
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
 sys-block/fio -io-uring -zbc
@@ -43,6 +56,7 @@ sci-physics/root -cudnn
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-03-11)
 # Encrypted Media Extensions (eme-free) can be disabled on amd64
+mail-client/thunderbird -eme-free
 www-client/firefox -eme-free
 
 # Mart Raudsepp <leio@gentoo.org> (2020-03-01)
@@ -73,9 +87,8 @@ net-misc/curl -quiche
 sys-firmware/seabios -debug
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-28)
-# upstream provides docs and tools for tier-1 arches
+# upstream provides docs only for tier-1 arches
 dev-lang/rust-bin -doc
->=dev-lang/rust-bin-1.37 -clippy -rustfmt
 
 # Thomas Deutschmann <whissi@gentoo.org> (2019-08-03)
 # Early microcode loading is supported on amd64
@@ -162,10 +175,6 @@ app-admin/rsyslog -mdblookup
 # https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html
 dev-lang/ocaml -spacetime
 
-# Alexis Ballier <aballier@gentoo.org> (2017-01-31)
-# nvidia drivers are unmasked here
-media-video/ffmpeg -nvenc
-
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2017-01-04)
 # Assembly optimisations are supported on amd64 for all versions
 dev-libs/libsecp256k1 -asm
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 7c324ee2e519..f55e89a559d5 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,9 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann <whissi@gentoo.org> (2020-08-05)
+# sys-cluster/slurm has no stable keywords
+app-metrics/collectd collectd_plugins_slurm
+
 # Joonas Niilola <juippis@gentoo.org> (2020-06-21)
 # sys-apps/apparmor doesn't have stable keywords.
 app-emulation/lxc apparmor
+app-emulation/lxd apparmor
 
 # Thomas Deutschmann <whissi@gentoo.org> (2019-10-28)
 # net-libs/quiche is an early HTTP/3 implementation
@@ -29,9 +34,9 @@ net-misc/curl quiche
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-08-18)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
-kde-apps/krfb wayland
-kde-plasma/xdg-desktop-portal-kde screencast
-sys-apps/xdg-desktop-portal screencast
+<kde-apps/krfb-20.07.80 wayland
+<kde-plasma/xdg-desktop-portal-kde-5.19.4 screencast
+<sys-apps/xdg-desktop-portal-1.7.2 screencast
 x11-wm/mutter screencast
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-05-21)
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index c8490d1dc62d..d2d7f36c1b24 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -8,11 +8,6 @@
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
 
-# Mike Gilbert <floppym@gentoo.org> (2017-06-08)
-# dev-lang/python:3.8 is not stable.
-python_targets_python3_8
-python_single_target_python3_8
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-05-26)
 # dev-db/firebird is keyworded ~amd64
 firebird
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 6a58f6aa5274..c5665e8060f6 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ben Kohler <bkohler@gentoo.org> (2020-08-12)
+# Breaks several portage features, see bug 736904
+=sys-libs/glibc-2.31-r6
+
 # Marek Szuba <marecki@gentoo.org> (2020-05-08)
 # Requires sys-cluster/ceph, which is masked in this profile as well
 # (see below)
@@ -37,7 +41,6 @@ net-im/slack
 # Michał Górny <mgorny@gentoo.org> (2018-01-12)
 # ...and their reverse dependencies.
 dev-lang/coffee-script
-dev-python/bokeh
 dev-ruby/autoprefixer-rails
 dev-ruby/coffee-rails
 dev-ruby/coffee-script
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 010e4d02fb78..1f29982d9de9 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -10,7 +10,6 @@ app-emulation/libvirt rbd
 app-emulation/qemu rbd
 net-analyzer/rrdtool rados
 net-fs/samba ceph
-net-libs/xrootd rbd
 sys-block/fio rbd
 sys-block/tgt rbd
 sys-fs/multipath-tools rbd