gentoo resync : 02.02.2022

27 files changed, 137 insertions, 38 deletions

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 0d2b90931c43..2430e454f1e4 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="alpha"
@@ -21,7 +21,7 @@ LIBDIR_alpha="lib"
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon"
+VIDEO_CARDS="fbdev mga nv r128 radeon"
 
 # Tobias Klausmann <klausman@gentoo.org> (2018-06-25)
 # Enable USE=libtirpc by default, to ease dependency resolution during
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index cc4570566a11..5d43e7afc115 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-29)
+# app-text/ronn-ng not keyworded here, bug #801103
+app-accessibility/espeak-ng man
+
 # James Beddek <telans@posteo.de> (2022-01-15)
 # media-libs/svt-av1 is not keyworded here
 media-video/ffmpeg svt-av1
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 618cccae1a49..72750d69bf00 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -18,7 +18,7 @@
 #--- END OF EXAMPLES ---
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-01)
-# requires sys-apps/dbus-broker, which keyworded here.
+# requires sys-apps/dbus-broker, which is keyworded here.
 sys-apps/systemd -hostnamed-fallback
 
 # James Le Cuirot <chewi@gentoo.org> (2021-10-22)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index d15a5cf2783d..0847976fbd7b 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-02-01)
+# sys-cluster/ucx is not marked stable on amd64
+sys-cluster/slurm ucx
+
 # Joonas Niilola <juippis@gentoo.org> (2021-08-13)
 # dev-libs/efl is stabilized on amd64.
 app-crypt/pinentry -efl
diff --git a/profiles/arch/arm64/package.mask b/profiles/arch/arm64/package.mask
index 3f9caccc0709..bf78fca70c86 100644
--- a/profiles/arch/arm64/package.mask
+++ b/profiles/arch/arm64/package.mask
@@ -1,2 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-01-22)
+# Fails to build on arm64.
+# marbling.c:181:44: error: incompatible type for argument 1 of ‘vqdmulhq_s16’
+# bug #830914
+=x11-misc/xscreensaver-6.02
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index cce3c36ff64e..d47d97190576 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,12 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-02-01)
+# sys-cluster/ucx is not keyworded on arm64
+sys-cluster/slurm ucx
+
+# Sam James <sam@gentoo.org> (2022-01-22)
+# Supports 64-bit NEON
+dev-libs/libgcrypt -cpu_flags_arm_neon
+
 # Sam James <sam@gentoo.org> (2022-01-02)
 # sys-fabric/ofed is not keyworded here
 sys-cluster/slurm ofed
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-16)
-# requires sys-apps/dbus-broker, which keyworded here.
+# requires sys-apps/dbus-broker, which is keyworded here.
 sys-apps/systemd -hostnamed-fallback
 
 # Sam James <sam@gentoo.org> (2021-10-31)
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 3680e4c1f6d5..05748ac6a536 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -70,6 +70,7 @@ media-sound/jack2 ieee1394
 app-emulation/qemu smartcard rbd xen virgl
 app-emulation/qemu glusterfs io-uring
 app-emulation/spice smartcard
+net-misc/spice-gtk smartcard
 
 # Sam James <sam@gentoo.org> (2020-06-29)
 # Deps not yet stable
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index d5254d0e0777..2908b66bb4e6 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="hppa"
@@ -10,8 +10,6 @@ CXXFLAGS="${CFLAGS}"
 
 FEATURES="sandbox sfperms strict"
 
-USE="cups foomaticdb fortran gdbm gpm imlib libwww spell firefox"
-
 # Michał Górny <mgorny@gentoo.org> (2014-07-01)
 # Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild
 # checks simpler.
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 99399f29eb58..26772ef3cfec 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2022-01-29)
+# app-text/ronn-ng not keyworded here, bug #801103
+app-accessibility/espeak-ng man
+
 # Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
 # ts-cli requires rust to be built, and rust is unavailable here ATM.
 dev-libs/tree-sitter ts-cli
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 0a4b7c2a80de..9045d3e365ec 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-02-01)
+# Unstable Tcl/Tk dependencies
+dev-libs/libisoburn launch-frontend launch-frontend-setuid frontend-optional
+
+# Sam James <sam@gentoo.org> (2022-01-26)
+# Various unstable dependencies
+sys-apps/systemd fido2 http nat policykit qrcode xkb
+
+# Sam James <sam@gentoo.org> (2022-01-20)
+# net-misc/pps-tools is not marked stable on HPPA
+net-misc/chrony pps
+
 # Sam James <sam@gentoo.org> (2021-12-15)
 # Unstable dependencies (dev-libs/libnl, sys-cluster/rdma-core)
 net-libs/libpcap netlink rdma
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 873d96ddd30c..f6e015839f72 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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.
@@ -122,10 +122,6 @@ pulseaudio
 # sys-auth/elogind is not stable here.
 elogind
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-03-03)
-# No stable sys-apps/systemd on hppa.
-systemd
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-05-20)
 openal
 
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 5f183775458b..bf4569fc0060 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ia64"
@@ -26,6 +26,6 @@ CHOST_ia64="${CHOST}"
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
-#VIDEO_CARDS="fbdev glint mga nv r128 radeon"
+#VIDEO_CARDS="fbdev mga nv r128 radeon"
 INPUT_DEVICES="void"
 VIDEO_CARDS="dummy"
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 39449f591615..cb46912d793e 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-29)
+# app-text/ronn-ng not keyworded here, bug #801103
+app-accessibility/espeak-ng man
+
 # Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
 # ts-cli requires rust to be built, and rust is unavailable here ATM.
 dev-libs/tree-sitter ts-cli
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 2337bf3aeb88..3ecf60896168 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -36,6 +36,7 @@ media-gfx/imagemagick svg
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # Requires Ruby, which is broken on m68k.
 app-text/htmltidy test
+net-misc/chrony html
 sys-block/thin-provisioning-tools test
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
@@ -50,10 +51,11 @@ dev-python/argcomplete test
 dev-python/distlib test
 dev-python/fonttools test
 dev-python/isort test
+dev-python/jsonschema test
 dev-python/nose test
+dev-python/numpydoc test
 dev-python/pytest-regressions test
 dev-python/requests test
-dev-python/setuptools test
 dev-python/sphinx test
 dev-python/urllib3 test
 
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index e544df9e39d3..472ca7ed8849 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2022-01-30)
+# The app-shells/fish tests fail on m68k, so it remains unkeyworded.
+fish-completion
+
 # James Le Cuirot <chewi@gentoo.org> (2022-01-15)
 # Most of the PostgreSQL tests pass on m68k, but some fail and some hang. I
 # suggest you put your data elsewhere.
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 8877b26f1030..9ebda1ce108e 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joshua Kinard <kumba@gentoo.org> (2022-01-17)
+# Mask USE 'doc' for dev-libs/libcbor to avoid dragging in
+# a massive set of texlive dependencies.  This copies m68k.
+# See Bug #709752.
+dev-libs/libcbor doc
+
 # Marek Szuba <marecki@gentoo.org> (2021-08-17)
 # net-wireless/rtl-sdr not keyworded here
 sys-apps/rng-tools rtlsdr
@@ -43,10 +49,6 @@ app-text/enchant voikko
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
-# Mask until dev-libs/libfido2 is keyworded
-net-misc/openssh security-key
-
 # Michał Górny <mgorny@gentoo.org> (2018-01-23)
 # USE=collab requires unkeyworded net-libs/loudmouth & dev-cpp/asio.
 # USE=grammar requires dev-libs/link-grammar.
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 51f2ea0ad11e..19350be099f8 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
@@ -15,7 +15,7 @@ FCFLAGS="${CFLAGS}"
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga nv r128 radeon"
+VIDEO_CARDS="fbdev mga nv r128 radeon"
 
 # Michał Górny <mgorny@gentoo.org> (2014-06-27)
 # Multilib-related setup for compatibility with future multilib.
diff --git a/profiles/arch/powerpc/ppc64/32ul/package.mask b/profiles/arch/powerpc/ppc64/32ul/package.mask
new file mode 100644
index 000000000000..48fd10c7bac9
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/32ul/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-01-18)
+# No bootstrap binary available on big endian PPC64 right now
+# But there is one for PPC (big endian).
+-dev-lisp/sbcl
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 4d60e4b0c3c7..e6e546bebe8e 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-18)
+# No bootstrap binary available on big endian PPC64 right now, but there is
+# one for ppc64le.
+-dev-lisp/sbcl
+
 # Sam James <sam@gentoo.org> (2022-01-09)
 # No provider (e.g. OpenJDK) available on big endian PPC64 right now
 -virtual/jdk:11
@@ -31,8 +36,8 @@
 -www-client/chromium
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)↲
-# works on little-endian↲
-sci-mathematics/geogebra-bin
+# works on little-endian
+-sci-mathematics/geogebra-bin
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-17)
 # works on ppc64le
@@ -69,10 +74,10 @@ sci-mathematics/geogebra-bin
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-04)
 # Temurin ppc64 build is little-endian only
-# so we can use bins and build from source
--dev-java/openjdk:11
--dev-java/openjdk:17
+# so we can use bins.
 -dev-java/openjdk-bin
+-=dev-java/openjdk-11.0.13_p8
+-=dev-java/openjdk-17.0.1_p12
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-04-11)
 # ltrace is not ported to powerpc64le yet.
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.force b/profiles/arch/powerpc/ppc64/64le/package.use.force
index eb62329889f9..83f88604cf1e 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.force
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.force
@@ -1,6 +1,12 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-20)
+# force users to use system versions
+# internal bootstrap only needed in parent big-endian profile
+dev-java/openjdk:11 system-bootstrap
+dev-java/openjdk:17 system-bootstrap
+
 # Michał Górny <mgorny@gentoo.org> (2021-02-19)
 # We have ready-to-use configs here.
 sys-kernel/gentoo-kernel -savedconfig
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.mask b/profiles/arch/powerpc/ppc64/64ul/package.mask
index 50a78625fb11..8448900c17c9 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
@@ -6,8 +6,7 @@
 net-im/telegram-desktop
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-01)
-# Temurin ppc64 build is little-endian only so it's impossible
-# to build openjdk:11 and later, but it's possible to build openjdk:8 with icedtea{,-bin}
-dev-java/openjdk:11
-dev-java/openjdk:17
+# Temurin ppc64 builds are little-endiain only
 dev-java/openjdk-bin
+=dev-java/openjdk-11.0.13_p8
+=dev-java/openjdk-17.0.1_p12
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.force b/profiles/arch/powerpc/ppc64/64ul/package.use.force
new file mode 100644
index 000000000000..644089f749d4
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-01-13)
+# Bootstrapping is possible using our build snapshot, so don't force
+# system bootstrap
+dev-java/openjdk:11 -system-bootstrap
+dev-java/openjdk:17 -system-bootstrap
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 069f98587fee..859a54df2be9 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-18)
+# No bootstrap binary available on big endian PPC64 right now
+dev-lisp/sbcl
+
 # Miroslav Šulc <fordfrog@gentoo.org> (2020-02-27)
 # >=dev-java/ant-eclipse-ecj-4.10 depends on masked >=virtual/{jdk,jre}-11
 # www-servers/tomcat >= 9 depends on masked dev-java/eclipse-ecj
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 608c25cbfd04..90da82af540b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,21 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-29)
+# app-text/ronn-ng not keyworded here, bug #801103
+app-accessibility/espeak-ng man
+
+# Yongxinag Liang <tanekliang@gmail.com> (2022-01-09)
+# app-emulation/xen-tools doesn't support riscv yet
+app-emulation/qemu xen
+# untested useflag: rbd glusterfs
+app-emulation/qemu rbd glusterfs
+sys-fs/multipath-tools rbd
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-16)
+# requires sys-apps/dbus-broker, which is keyworded here.
+sys-apps/systemd -hostnamed-fallback
+
 # Andrey Grozin <grozin@gentoo.org> (2022-01-03)
 # dev-libs/utfcpp is not keyworded yet
 media-gfx/asymptote lsp
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 584be81c8c45..b25d074c2cd5 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="sparc"
@@ -40,7 +40,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 
 # Gustavo Zacarias <gustavoz@gentoo.org> (2006-10-05)
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mga r128 radeon"
+VIDEO_CARDS="fbdev mga r128 radeon"
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-06-24)
 # Enable USE=libtirpc by default, to ease dependency resolution during
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 419fe7152f2b..75822fdfcc44 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -1,6 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2022-01-16)
+# Bootstrapping is possible using our build snapshot, so don't force
+# system bootstrap
+dev-java/openjdk:11 -system-bootstrap
+dev-java/openjdk:17 -system-bootstrap
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
 # Force host target
 dev-libs/keystone llvm_targets_X86
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index dc77425a31ef..e968773153c9 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-01-20)
+# Only supports cpu_flags_x86_aes in 64-bit mode
+net-fs/samba cpu_flags_x86_aes
+
 # Conrad Kostecki <conikost@gentoo.org> (2021-11-16)
 # AppArmor is not available on x86
 app-benchmarks/stress-ng apparmor