gentoo resync : 16.01.2021

5 files changed, 35 insertions, 7 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 6548a518da5e..8b1a489be4ad 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -134,11 +134,11 @@ PYTHON_SINGLE_TARGET="python3_9"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
-# 1) do not uninstall kernel modules and therefore allow replacing them,
+# 1) do not uninstall kernel modules/dtbs and therefore allow replacing them,
 # 2,3) removed wrt bug #663170,
 # 4) protect /var/{run,lock} symlinks for bug 519620
-COLLISION_IGNORE="/lib/modules/*"
-UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
+COLLISION_IGNORE="/boot/dtbs/* /lib/modules/*"
+UNINSTALL_IGNORE="/boot/dtbs/* /lib/modules/* /var/run /var/lock"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2013-08-23)
 # Make emerge messages default to English as per Council decision
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 4ca682d365f3..f84cb4c43393 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (20222-01-08
+# -xft broken, investigate in bug #830777
+~x11-misc/xscreensaver-6.02 xft
+
 # Michał Górny <mgorny@gentoo.org> (2021-11-04)
 # Enable all LLVM targets unconditionally.  Unfortunately, disabling
 # targets tend to break reverse dependencies (e.g. Rust) and we are yet
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0d2a178a42f0..526fd89968f0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,16 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-01-12)
+# Unmask PCH for now for GCC to avoid unnecessary rebuilds
+# (USE=pch is now use.mask-ed globally)
+<sys-devel/gcc-11.3:11 -pch
+<sys-devel/gcc-10.4:10 -pch
+=sys-devel/gcc-9* -pch
+=sys-devel/gcc-8* -pch
+=sys-devel/gcc-7* -pch
+=sys-devel/gcc-6* -pch
+
 # John Helmert III <ajak@gentoo.org> (2021-12-31)
 # Rizin tests require a tarball of binaries of ambiguous license.
 # As such, we cannot properly test it, so mask the flag until this
@@ -491,9 +501,6 @@ media-video/ffmpeg appkit
 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
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (2017-09-09)
 # Potentially destructive. Use it only if you know what you're doing.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index a6daffedef1f..e25a8cff704d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,15 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-01-09)
+# virtual/{jdk,jre}:11 just got unmasked but are not yet stable
+# 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:11 gentoo-vm
+dev-java/openjdk-bin:11 gentoo-vm
+dev-java/openjdk:11 gentoo-vm
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-12-24)
 # test deps are not stable
 >=sys-fs/zfs-2.0.7 test-suite
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index eee41ca8c6f8..c6a22bb1577f 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,14 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-01-12)
+# PCH has proven itself to be unreliable and lead to spurious build
+# failures. Masking so users aren't exposed to such failures without opting-in.
+# Failures aren't always reproducible and implementations are often fragile.
+# Please speak to <toolchain@gentoo.org> and/or <qa@gentoo.org> before dropping.
+# See e.g. bug #753323, bug #822690.
+pch
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25