gentoo auto-resync : 14:09:2022 - 11:10:10

6 files changed, 23 insertions, 9 deletions

diff --git a/profiles/features/clang/use.force b/profiles/features/clang/use.force
index e671fa21003e..b1067fb9ea86 100644
--- a/profiles/features/clang/use.force
+++ b/profiles/features/clang/use.force
@@ -1 +1,2 @@
 clang
+llvm-libunwind
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 372a11cc8cf8..8a5625dab7b6 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-09-12)
+# The libxcrypt migration is optional for musl.
+-virtual/libcrypt:0/1
+
+# Sam James <sam@gentoo.org> (2022-09-12)
+# virtual/libcrypt-2 doesn't migrate anything on musl,
+# we need virtual/libcrypt-2-r1 for the libxcrypt migration there, so
+# avoid a useless rebuild, and ensure it happens at the right time instead.
+=virtual/libcrypt-2
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-09-06)
 # Binary package linked against glibc
 games-action/minecraft-launcher
@@ -261,11 +271,6 @@ app-text/po4a
 # Uses glibc-specific rexec(3) function, bug #715898
 net-misc/netkit-rsh
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Mask the libxcrypt-based virtual
-~virtual/libcrypt-2
--virtual/libcrypt:0/1
-
 # David Seifert <soap@gentoo.org> (2021-02-08)
 # nvidia-drivers only works against glibc.
 dev-libs/optix
@@ -292,6 +297,7 @@ app-emulation/dosemu
 # Old undated blocks of masks
 #
 sys-libs/glibc
+-sys-libs/musl
 
 # As of 2021-08-08, >=sys-fs/udev-249-r2 is patched in Gentoo
 # to work on musl, so no need to mask udev.
diff --git a/profiles/features/musl/package.use b/profiles/features/musl/package.use
index 686670ae9ef4..db211e90d794 100644
--- a/profiles/features/musl/package.use
+++ b/profiles/features/musl/package.use
@@ -1,6 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation.
+# Copyright 1999-2022 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-09-08)
+# musl isn't removing support for its own crypt,
+# so we don't need to mask the flag, just turn it
+# off by default to steer towards libxcrypt.
+sys-libs/musl -crypt
+
 # Esteve Varela Colominas <esteve.varela@gmail.com> (2022-02-19)
 # The musl allocator works well with telegram
 net-im/telegram-desktop -jemalloc
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index c5f7ed10b1ea..71a3432ba12f 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -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
 
 # Esteve Varela Colominas <esteve.varela@gmail.com> (2022-02-19)
@@ -7,7 +7,7 @@ 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
+<sys-libs/libxcrypt-4.4.28-r2 -system -compat
 
 # Force system-libevent use flag on mozilla packages, since the building of
 # bundled libevent cannot accomodate a system without sysctl.h
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 53a1c21b3025..e33e6d34a9f3 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -50,7 +50,7 @@ sys-libs/compiler-rt-sanitizers gwp-asan
 
 # Andreas K. Hüttel <dilfridge@gentoo.org>
 # Restore mask here that is gone elsewhere
-sys-libs/libxcrypt split-usr system
+<sys-libs/libxcrypt-4.4.28-r2 split-usr system
 
 # James Le Cuirot <chewi@gentoo.org> (2020-05-16)
 # execinfo.h is required for debug.
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 7ef53b96fb46..6f46776db0a7 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -4,6 +4,7 @@
 # Various packages requiring Rust.
 app-admin/ansible
 app-admin/ansible-core
+>=app-antivirus/clamav-0.105.1
 app-crypt/acme
 app-crypt/certbot
 app-crypt/certbot-nginx