gentoo resync : 08.10.2021

3 files changed, 15 insertions, 26 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ec229ccf0326..646cbed4a0ae 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,15 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-10-07)
+# parallel-compiler feature is not tested by upstream
+# and is not recommended for general usage and may silently
+# miscompile code if used (unlikely, but not impossible)
+# feel free to unmask, but be prepared to deal with possible bugs
+# https://bugs.gentoo.org/813954
+# https://github.com/rust-lang/rust/issues/89108
+dev-lang/rust parallel-compiler
+
 # Stephan Hartmann <sultan@gentoo.org> (2021-09-16)
 # Uses a function that is not available in media-video/ffmpeg.
 >=www-client/chromium-94 system-ffmpeg
@@ -16,12 +25,6 @@
 # see also: https://github.com/rspamd/rspamd/issues/3871
 ~mail-filter/rspamd-3.0 jemalloc
 
-# James Le Cuirot <chewi@gentoo.org> (2021-09-04)
-# Currently requires an unreleased version of FFmpeg. If you really want it,
-# unmask the flag and emerge ffmpeg-9999 with this environment variable set:
-# EGIT_OVERRIDE_COMMIT_FFMPEG=8649f5dca6688feb66f787dcf232d42ed20fdb28
->=www-client/vivaldi-snapshot-4.2.2406.4 proprietary-codecs
-
 # Matt Turner <mattst88@gentoo.org> (2021-08-28)
 # Mask experimental options.
 gui-libs/gtk ffmpeg vulkan
@@ -35,16 +38,6 @@ gui-libs/gtk ffmpeg vulkan
 # The ORBlite scanner plugin only works on amd64 and x86.
 net-print/hplip-plugin orblite
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
-# Two years after the tracker was opened it is time to mask dev-qt/qtwebkit
-# for good. No commits to upstream repository for >9 months, latest available
-# tarball still "alpha" with warning about known unpatched vulnerabilities.
-# Bugs: #684580, #750893
-app-office/kexi webkit
-dev-libs/kreport webkit
-media-plugins/mythplugins mythbrowser mythmusic
-net-irc/kvirc webkit
-
 # Sam James <sam@gentoo.org> (2021-07-24)
 # USE=exec-static-trampoline can break consumers due to
 # faulty assumptions. Masked for now due to the possibility
@@ -194,10 +187,6 @@ dev-libs/efl efl-one
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
-media-plugins/mythplugins mythnetvision
-
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# The respective dependencies are masked for removal.
 app-metrics/collectd collectd_plugins_onewire
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
@@ -452,10 +441,14 @@ dev-db/mysql client-libs
 media-video/ffmpeg appkit
 
 # James Le Cuirot <chewi@gentoo.org> (2017-12-17)
+# Georgy Yakovlev <gyakovlev@gentoo.org (2021-10-08)
 # Java 9+ is not yet fully supported on Gentoo. Having a masked
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
+dev-java/openjdk-jre-bin:17 gentoo-vm
+dev-java/openjdk-bin:17 gentoo-vm
+dev-java/openjdk:17 gentoo-vm
 dev-java/openjdk-jre-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b8250321b864..80c9e923ffde 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -77,7 +77,7 @@ mate-base/mate bluetooth
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
-dev-lang/rust miri nightly parallel-compiler system-bootstrap
+dev-lang/rust miri nightly system-bootstrap
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-09)
 # Declared experimental, and dev-cpp/websocketpp not stable yet
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 577d8fa2a780..218e736762fc 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
 
-# Brian Evans <grknight@gentoo.org> (2020-12-08)
-# Allow packages to add php 8.0 support while waiting on its stable
-php_targets_php8-0
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs