[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/musl/, profiles/arch/loong/

2022-11-01 Thread Sam James 
commit: 880798b419fcfff3e37ff1509257fb986483f4a5
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 02:45:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 02:48:24 2022 +
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  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  (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  (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/libxcrypt-4.4.23-r1 system compat
+sys-libs/libxcrypt system compat
 
 # Matt Turner  (2019-09-01)
 # =sys-libs/glibc-2.33-r2 crypt
- (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  (2022-11-02)
+# The libxcrypt migration is optional for musl.
+sys-libs/libxcrypt -system -compat
+
 # Sam James  (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  (2021-07-14)
-# Do not force system install for libxcrypt here
-

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/features/musl/

2022-09-10 Thread Sam James 
commit: e617820e9eba576c0546c2a756a1b564370aa43b
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 13:31:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 13:48:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e617820e

profiles: mask/unmask musl on musl/non musl profiles

Closes: https://bugs.gentoo.org/869515
Signed-off-by: Sam James  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/27199
Signed-off-by: Sam James  gentoo.org>

 profiles/base/package.mask  | 6 +-
 profiles/features/musl/package.mask | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 58f5f5ac5739..4d33927de983 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James  (2022-09-10)
+# Mask in general and unmask on specific profiles
+sys-libs/musl
+
 # Sam James  (2021-11-22)
 # Mask the older libcrypt virtual (which accepted glibc[crypt]) to ease
 # dependency resolution. In a fair number of cases, this has helped

diff --git a/profiles/features/musl/package.mask 
b/profiles/features/musl/package.mask
index 52e3d47eb93c..ae834bd2698b 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -287,6 +287,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.