gentoo resync : 20.10.2021

5 files changed, 31 insertions, 4 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index db1bba9bb64d..4aa838bae261 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
-# Updated to include ruby26 on 2020-09-14
-RUBY_TARGETS="ruby26"
+# Updated to include ruby27 on 2021-10-10
+RUBY_TARGETS="ruby26 ruby27"
 
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 2eb93144eb97..578d19fbb242 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-10-14)
+# Unconditional dependency on >= Lua 5.3, so let's just pick 5.4
+>=app-arch/rpm-4.17.0 lua_single_target_lua5-4
+
 # Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> (2021-09-13)
 # WirePlumber obligatory links and embeds either Lua 5.3 or 5.4
 # interpreter with the later being the upstream default.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 646cbed4a0ae..7aef25d015e5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,25 @@
 # 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-16)
+# openjfx for openjdk17 is not yet available
+dev-java/openjdk:17 javafx
+
+# Sam James <sam@gentoo.org> (2021-10-16)
+# Fails to compile, bug #787134
+=sys-fs/dd-rescue-1.99.11 cpu_flags_x86_avx2
+
+# Marek Szuba <marecki@gentoo.org> (2021-10-10)
+# Legacy interface that depends on dev-libs/libx86 and specific kernel
+# headers, both of which are only available on certain arches.
+x11-misc/read-edid vbe-mode
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-10-09)
+# ld.gold is essentially abandoned; using it as default may have
+# unintended consequences. Disabling this feature in future ebuilds.
+>sys-devel/binutils-2.37_p1 default-gold
+>sys-devel/binutils-hppa64-2.37_p1 default-gold
+
 # 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
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 80c9e923ffde..525f6417906f 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sergey Popov <pinkbyte@gentoo.org> (2021-10-14)
+# net-libs/grpc is not yet stabilized,
+# so mask optional use flag on net-misc/frr
+net-misc/frr grpc
+
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is only stabilized on two arches.
 app-crypt/pinentry efl
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 218e736762fc..07b55fe4e694 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,7 +13,6 @@ darcs
 python_targets_pypy3
 python_single_target_pypy3
 
-# Hans de Graaff <graaff@gentoo.org> (2020-12-26)
+# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby27
 ruby_targets_ruby30