10 files changed, 166 insertions, 26 deletions
diff --git a/profiles/features/clang/package.use b/profiles/features/clang/package.use
index 5d568cb8cb66..980c320218f9 100644
--- a/profiles/features/clang/package.use
+++ b/profiles/features/clang/package.use
@@ -2,7 +2,7 @@
 sys-devel/llvm -gold
 
 # use all defaults
-sys-devel/clang compiler-rt default-compiler-rt default-lld default-libcxx llvm-libunwind
+sys-devel/clang default-compiler-rt default-lld default-libcxx llvm-libunwind
 sys-libs/compiler-rt clang
 
 # disable sanitizers for now
@@ -11,7 +11,6 @@ sys-devel/clang-runtime compiler-rt libcxx -sanitize
 
 sys-libs/libcxx libunwind libcxxabi
 sys-libs/libcxxabi libunwind
-sys-libs/llvm-libunwind compiler-rt
 
 # libgcrypt doesn't like optimizations
 dev-libs/libgcrypt o-flag-munging
diff --git a/profiles/features/clang/package.use.mask b/profiles/features/clang/package.use.mask
new file mode 100644
index 000000000000..2aa65931d7b2
--- /dev/null
+++ b/profiles/features/clang/package.use.mask
@@ -0,0 +1,5 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# libquadmath is gcc-specific
+dev-lang/perl quadmath
diff --git a/profiles/features/hardened/package.mask b/profiles/features/hardened/package.mask
deleted file mode 100644
index 9544faf8b3d7..000000000000
--- a/profiles/features/hardened/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# broken on hardened, use sys-apps/elfix to fix gnustack
-sys-devel/prelink
-# depends on prelink
-app-crypt/hmaccalc
diff --git a/profiles/features/hardened/use.mask b/profiles/features/hardened/use.mask
index 1b90677af3d8..7a452f2323c2 100644
--- a/profiles/features/hardened/use.mask
+++ b/profiles/features/hardened/use.mask
@@ -1,10 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 -hardened
 
 # precompiled headers are not compat with ASLR.
 pch
-
-# prelink is masked for hardened
-prelink
diff --git a/profiles/features/multilib/package.use b/profiles/features/multilib/package.use
index 369c7a9a72e2..15d241794bbd 100644
--- a/profiles/features/multilib/package.use
+++ b/profiles/features/multilib/package.use
@@ -1,6 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
 
+# Sam James <sam@gentoo.org> (2022-03-08)
+# Enable libxcrypt & libcrypt as multilib by default
+# It's needed at least on amd64 because LLVM defaults to it, and we used
+# to have this available because glibc is always multilib too. It's lightweight
+# with no dependencies, so let's do it.
+sys-libs/libxcrypt abi_x86_32 abi_x86_64
+virtual/libcrypt abi_x86_32 abi_x86_64
+
 # Enable all ABIs by default so we can protect any non-native binaries that
 # might be executed.
 sys-apps/sandbox abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_o32 abi_mips_n32 abi_mips_n64 abi_s390_32 abi_s390_64
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 0123b422d70f..17fb7c6321b6 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,140 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Pacho Ramos <pacho@gentoo.org> (2022-03-13)
+# Binary package linked to glibc
+sys-power/dptfxtract
+
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2022-03-14)
+# Doesn't build with musl, bug #832742
+sci-libs/opencascade
+
+# Adel KARA SLIMANE <adel.ks@zegrapher.com> (2022-03-09)
+# Binary packages linked to glibc
+app-editors/vscode
+app-editors/vscodium
+
+# João Santos <joaompssantos@gmail.com> (2022-02-22)
+# Binary package linked to glibc
+app-text/master-pdf-editor
+
+# Sam James <sam@gentoo.org> (2022-02-20)
+# Binary package linked to glibc
+app-admin/bitwarden-desktop-bin
+
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
+# Binary package linked to glibc
+media-libs/amdgpu-pro-vulkan
+media-video/amdgpu-pro-amf
+
+# Ionen Wolkens <ionen@gentoo.org> (2022-02-17)
+# Binary package linked to glibc
+net-im/discord-bin
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-12)
+# Binary package linked to glibc
+x11-misc/xflux
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-10)
+# Binary package linked to glibc
+www-apps/chromedriver-bin
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-10)
+# Doesn't build on musl, bug #833028
+www-client/chromium
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-10)
+# Binary package linked to glibc
+www-plugins/chrome-binary-plugins
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-10)
+# Binary packages linked to glibc
+www-client/opera
+www-client/opera-beta
+www-client/opera-developer
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-10)
+# Binary packages linked to glibc
+www-client/google-chrome
+www-client/google-chrome-beta
+www-client/google-chrome-unstable
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-10)
+# Binary packages linked to glibc
+www-client/microsoft-edge
+www-client/microsoft-edge-beta
+www-client/microsoft-edge-dev
+
+# Paolo Pedroni <paolo.pedroni@iol.it> (2022-02-09)
+# Binary package linked to glibc
+sci-mathematics/gimps
+
+# Paolo Pedroni <paolo.pedroni@iol.it> (2022-02-09)
+# It doesn't build on musl
+# bug #832551
+net-misc/netkit-telnetd
+
+# Henning Schild <henning@hennsch.de> (2022-02-09)
+# Binary package linked to glibc
+net-im/telegram-desktop-bin
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-08)
+# Binary package linked to glibc
+sys-apps/ipmicfg
+
+# Sam James <sam@gentoo.org> (2022-02-06)
+# Latest version doesn't build on musl
+# bug #831363
+=sys-libs/efivar-38
+
+# Stephan Hartmann <sultan@gentoo.org> (2022-02-05)
+# Binary package linked to glibc
+net-im/teams
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+net-misc/ipmiview
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+media-sound/teamspeak-server
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+games-server/steamcmd
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+games-server/bedrock-server
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+dev-libs/luise
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+app-misc/kryoflux-dtc
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-02-03)
+# Binary package linked to glibc
+app-benchmarks/geekbench
+
+# Robert Siebeck <gentoo.2019@r123.de> (2022-02-02)
+# Binary package linked to glibc, bug #832483
+net-im/signal-desktop-bin
+
+# Ben Kohler <bkohler@gentoo.org> (2022-02-02)
+# Binary backage linked to glibc
+net-misc/dropbox
+
+# Sergey Popov <pinkbyte@gentoo.org> (2022-02-02)
+# Binary package linked to glibc, bug #832581
+net-misc/yandex-disk
+
+# David Seifert <soap@gentoo.org> (2022-02-02)
+# Binary package linked to glibc
+net-im/skypeforlinux
+
 # Viorel Munteanu <ceamac.paragon@gmail.com> (2022-02-01)
 # Binary package linked to glibc
 net-im/mattermost-desktop-bin
@@ -19,10 +153,6 @@ sci-electronics/labone
 # dev-db/oracle-instantclient package linked against glibc,
 # and the other packages depends on it.
 dev-db/oracle-instantclient
-dev-db/oracle-instantclient-basic
-dev-db/oracle-instantclient-jdbc
-dev-db/oracle-instantclient-odbc
-dev-db/oracle-instantclient-sqlplus
 dev-db/ocp
 dev-db/sqlcl-bin
 
@@ -32,6 +162,9 @@ app-text/zotero-bin
 media-video/popcorntime-bin
 net-im/rocketchat-desktop-bin
 net-im/whatsapp-desktop-bin
+sci-misc/jupyterlab-desktop-bin
+sci-misc/netlogo-bin
+sci-electronics/eagle
 
 # Ulrich Müller <ulm@gentoo.org> (2022-01-04)
 # Emacs 23 does not support x86_64-gentoo-linux-musl systems
@@ -72,10 +205,6 @@ net-misc/netkit-rsh
 # nvidia-drivers only works against glibc.
 x11-drivers/nvidia-drivers
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-04-11)
-# musl has no support for prelinked sections, bug #717020
-sys-devel/prelink
-
 # Ulrich Müller (2020-03-31)
 # Not ported to musl, bug #715642.
 # See https://wiki.gentoo.org/wiki/Project:Emacs/Emacs-like_editors
diff --git a/profiles/features/musl/package.use b/profiles/features/musl/package.use
index 9f8906ae5648..686670ae9ef4 100644
--- a/profiles/features/musl/package.use
+++ b/profiles/features/musl/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
+# Esteve Varela Colominas <esteve.varela@gmail.com> (2022-02-19)
+# The musl allocator works well with telegram
+net-im/telegram-desktop -jemalloc
+
 # Anthony G. Basile <blueness@gentoo.org> (2016-07-14)
 # We need this to break a circular dependency with
 # 'sys-libs/libcap pam' in stage3 catalyst builds
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index f11de170c840..c5f7ed10b1ea 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# Esteve Varela Colominas <esteve.varela@gmail.com> (2022-02-19)
+# The musl allocator works well with telegram
+net-im/telegram-desktop -jemalloc
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
 # Do not force system install for libxcrypt here
 >=sys-libs/libxcrypt-4.4.23-r1 -system -compat
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 85111fc57dfe..fedbaa145e37 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Petr Vaněk <arkamar@atlas.cz> (2022-03-15)
+# musl package does not currently provide gencat binary, which is needed for
+# nls support, see bug #712828
+x11-wm/fluxbox nls
+
 # Marco Genasci <fedeliallalinea@gmail.com> (2022-01-06)
 # Pulls dev-db/oracle-instantclient which doesn't work on musl
 app-metrics/collectd collectd_plugins_oracle
diff --git a/profiles/features/prefix/package.use b/profiles/features/prefix/package.use
index 2c6d13ceb043..149c84339598 100644
--- a/profiles/features/prefix/package.use
+++ b/profiles/features/prefix/package.use
@@ -5,7 +5,3 @@ sys-apps/util-linux -su
 
 # Don't enable the security measures for convienence
 sys-apps/portage -rsync-verify
-
-# Yiyang Wu <xgreenlandforwyy@gmail.com> (2021-03-03)
-# bazel should link libstdc++ statically in prefix to avoid finding host's libstdc++ when building other packages
-dev-util/bazel static-libs