From 6f79a445a9d0cfeec8ff47d591b3f76cbe2e8b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Wed, 14 Jul 2021 20:48:11 +0200 Subject: [PATCH] package.mask: unmask virtual/libcrypt-2, except on musl/uclibc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://bugs.gentoo.org/699422 Signed-off-by: Andreas K. Hüttel --- profiles/features/musl/package.mask | 4 ++++ profiles/features/uclibc/package.mask | 4 ++++ profiles/package.mask | 5 ----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask index 2cdc63f8b8528..d8d887a8fe5ca 100644 --- a/profiles/features/musl/package.mask +++ b/profiles/features/musl/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas K. Hüttel (2021-07-14) +# Mask the libxcrypt-based virtual +~virtual/libcrypt-2 + # David Seifert (2021-02-08) # nvidia-drivers only works against glibc. x11-drivers/nvidia-drivers diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask index fe51d352f2f1d..ba157ac6b0c5f 100644 --- a/profiles/features/uclibc/package.mask +++ b/profiles/features/uclibc/package.mask @@ -5,6 +5,10 @@ sys-libs/musl sys-libs/glibc sys-libs/pam +# Andreas K. Hüttel (2021-07-14) +# Mask the libxcrypt-based virtual +~virtual/libcrypt-2 + # Ionen Wolkens (2021-07-09) # Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106) sys-apps/systemd-tmpfiles diff --git a/profiles/package.mask b/profiles/package.mask index 2152c9b4a1899..e19794fcc058d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -633,11 +633,6 @@ kde-apps/kdebase-meta:5 # Mask for testing revdeps. >=dev-games/mygui-3.4.0 -# Patrick McLean (2020-02-07) -# Mask until sys-libs/libxcrypt[system] is unmasked -# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely) -~virtual/libcrypt-2 - # Lars Wendler (2019-11-14) # Breaks archives containing relative paths # when being called with --no-absolute-filenames