commit: 880798b419fcfff3e37ff1509257fb986483f4a5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Nov 2 02:45:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 2 02:48:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880798b4
profiles: cleanup obsolete libxcrypt masks We no longer have older libxcrypt in tree. Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/arch/loong/package.use.mask | 2 +- profiles/base/package.use.force | 2 +- profiles/base/package.use.mask | 1 - profiles/features/musl/package.use.force | 8 ++++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask index 466175442007..55d0cb78a907 100644 --- a/profiles/arch/loong/package.use.mask +++ b/profiles/arch/loong/package.use.mask @@ -36,7 +36,7 @@ sys-block/fio -io-uring -zbc # WANG Xuerui <xe...@gentoo.org> (2022-04-18) # We never had non-deprecated libcrypt support from glibc, so disable compat # from libxcrypt for a world without libcrypt.so.1 ->=sys-libs/libxcrypt-4.4.23-r1 compat +sys-libs/libxcrypt compat # WANG Xuerui <xe...@gentoo.org> (2022-04-18) # Catalyst has support for assembling bootloader on this arch diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index f19dbdaf80c5..76b5768c656b 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -130,7 +130,7 @@ sys-kernel/vanilla-kernel initramfs # distribution and rely on external providers like libxcrypt. # Here we are following that path too. <sys-libs/glibc-2.33-r2 crypt ->=sys-libs/libxcrypt-4.4.23-r1 system compat +sys-libs/libxcrypt system compat # Matt Turner <matts...@gentoo.org> (2019-09-01) # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 5dd77f442ac0..389658bab392 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -486,7 +486,6 @@ dev-python/statsmodels doc # distribution and rely on external providers like libxcrypt. # Here we are following that path too. >=sys-libs/glibc-2.33-r2 crypt -<sys-libs/libxcrypt-4.4.23-r1 split-usr system # Craig Andrews <candr...@gentoo.org> (2019-09-12) # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force index e74bebd7fe25..369d1774b6dc 100644 --- a/profiles/features/musl/package.use.force +++ b/profiles/features/musl/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 +# Sam James <s...@gentoo.org> (2022-11-02) +# The libxcrypt migration is optional for musl. +sys-libs/libxcrypt -system -compat + # Sam James <s...@gentoo.org> (2022-10-04) # net-misc/netkit-rsh is masked on musl and USE=-crypt depends on it sys-cluster/torque crypt @@ -9,10 +13,6 @@ sys-cluster/torque crypt # The musl allocator works well with telegram net-im/telegram-desktop -jemalloc -# Andreas K. Hüttel <dilfri...@gentoo.org> (2021-07-14) -# Do not force system install for libxcrypt here -<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 # See bug 574830 for more info.
