6 files changed, 21 insertions, 16 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ad41a4262773..cd9d80b5b5af 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults
index 22be1cd833fb..f8433cd75e77 100644
--- a/profiles/prefix/linux/amd64/make.defaults
+++ b/profiles/prefix/linux/amd64/make.defaults
@@ -1,10 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 #Note: this is Gentoo Prefix specific! (2008-07-13, darkside)
 
-# The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-amd64 ~amd64-linux"
+# The base profile sets ACCEPT_KEYWORDS=amd64, add unstable on top of
+# that, and retain historical Prefix-only amd64-linux keyword for a
+# transition period, bug #473598.
+ACCEPT_KEYWORDS="~amd64 ~amd64-linux"
 
 # We don't have lib64 or multilib in prefix, but single ABI, so remove it here.
 SYMLINK_LIB=""
diff --git a/profiles/prefix/linux/ppc64/make.defaults b/profiles/prefix/linux/ppc64/make.defaults
index 6be345d8d6b6..7e20f0928180 100644
--- a/profiles/prefix/linux/ppc64/make.defaults
+++ b/profiles/prefix/linux/ppc64/make.defaults
@@ -1,11 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ppc64"
 CHOST="powerpc64-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
-# Eventually, ~* should be removed once someone is motivated for this arch
-ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
+# The base profile sets ACCEPT_KEYWORDS=ppc64, add unstable
+ACCEPT_KEYWORDS="~ppc64"
 
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""
diff --git a/profiles/prefix/linux/ppc64le/make.defaults b/profiles/prefix/linux/ppc64le/make.defaults
index 477b3c262767..95c3cb0ca9f9 100644
--- a/profiles/prefix/linux/ppc64le/make.defaults
+++ b/profiles/prefix/linux/ppc64le/make.defaults
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="ppc64"
 CHOST="powerpc64le-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=ppc64 and we don't have that in prefix.
-# Eventually, ~* should be removed once someone is motivated for this arch
-ACCEPT_KEYWORDS="-ppc64 ~ppc64-linux ~*"
+# The base profile sets ACCEPT_KEYWORDS=ppc64, add unstable on top of that
+ACCEPT_KEYWORDS="~ppc64"
 
 # We don't have lib64 in prefix so, remove it here.
 SYMLINK_LIB=""
diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults
index 8a679deb0752..704bcb6ff405 100644
--- a/profiles/prefix/linux/x86/make.defaults
+++ b/profiles/prefix/linux/x86/make.defaults
@@ -1,8 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-x86 ~x86-linux"
+# The base profile sets ACCEPT_KEYWORDS=x86, add unstable on top of
+# that, and retain historical prefix-only x86-linux keyword for
+# transition period, bug #473598
+ACCEPT_KEYWORDS="~x86 ~x86-linux"
 
 # in case we are bootstrapping with the host compiler on an amd64 linux host:
 CFLAGS="${CFLAGS} -m32"
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 11b3bf20b77f..a73268336d7b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -537,7 +537,7 @@ app-emulation/libspectrum:gcrypt - Use dev-libs/libgcrypt for low-level crypto o
 app-emulation/libvirt:apparmor - Enable AppArmor support
 app-emulation/libvirt:dtrace - Enable dtrace support via dev-util/systemtap
 app-emulation/libvirt:firewalld - DBus interface to iptables/ebtables allowing for better runtime management of your firewall.
-app-emulation/libvirt:fuse - Allow LXC to use sys-fs/fuse for mount points
+app-emulation/libvirt:fuse - Allow LXC to use sys-fs/fuse for mountpoints
 app-emulation/libvirt:glusterfs - Enable GlusterFS support via sys-cluster/glusterfs
 app-emulation/libvirt:iscsi - Allow using an iSCSI remote storage server as pool for disk image storage
 app-emulation/libvirt:iscsi-direct - Allow using libiscsi for iSCSI storage pool backend
@@ -1964,7 +1964,7 @@ dev-libs/aws-sdk-cpp:unity-build - Build using a single unified .cpp file for ea
 dev-libs/aws-sdk-cpp:waf - The Web Application Firewall (WAF) can monitor web requests that are forwarded to Amazon CloudFront distributions or an Application Load Balancer. Can also be used to block or allow requests based on conditions such as the IP addresses that requests originate from or values in the requests. Also enables fms, network-firewall, waf-regional and wafv2
 dev-libs/aws-sdk-cpp:wellarchitected - Use the AWS Well-Architected Tool to review your workloads against current AWS architectural best practices. The AWS Well-Architected Tool measures the workload and provides recommendations on how to improve your architecture.
 dev-libs/bitset:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations
-dev-libs/boehm-gc:large - optimize for large heap size (also increases max root sets)x
+dev-libs/boehm-gc:large - optimize for large heap size (also increases max root sets)
 dev-libs/boost:context - Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it
 dev-libs/boost:debug - Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.
 dev-libs/boost:doc - Install the full API documentation documentation. This takes over 200MB of extra disk space.
@@ -8451,8 +8451,10 @@ sys-libs/libblockdev:nvme - Add nvme support via sys-libs/libnvme
 sys-libs/libblockdev:tools - Build tools
 sys-libs/libblockdev:vdo - Enable Virtual Data Optimizer support.
 sys-libs/libcap:tools - Install captree, which requires dev-lang/go
+sys-libs/libcxx:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
 sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
 sys-libs/libcxx:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.
+sys-libs/libcxxabi:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
 sys-libs/libcxxabi:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc
 sys-libs/libnvme:json - Support JSON output via dev-libs/json-c
 sys-libs/libnvme:uuid - UUID support via sys-apps/util-linux
@@ -8466,6 +8468,7 @@ sys-libs/libunwind:debug-frame - Adds support for DWARF .debug_frame section: Us
 sys-libs/libunwind:libatomic - Use libatomic instead of builtin atomic operations
 sys-libs/libxcrypt:compat - Build with compatibility interfaces for other crypt implementations
 sys-libs/libxcrypt:system - Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version)
+sys-libs/llvm-libunwind:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
 sys-libs/musl-nscd:minimal - Only installs the header files
 sys-libs/ncurses:ada - Add bindings for the ADA programming language
 sys-libs/ncurses:stack-realign - Realign the stack in the 32-bit build for compatibility with older binaries at some performance cost. Avoids crashes in older 32-bit binaries. Only affects x86/32-bit multilib builds on amd64.