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

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

[Andreas K. Hüttel]

commit:     6f79a445a9d0cfeec8ff47d591b3f76cbe2e8b86
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 18:48:11 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 20:45:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f79a445

package.mask: unmask virtual/libcrypt-2, except on musl/uclibc

Bug: https://bugs.gentoo.org/699422
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 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 2cdc63f8b85..d8d887a8fe5 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 <dilfridge@gentoo.org> (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
 # David Seifert <soap@gentoo.org> (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 fe51d352f2f..ba157ac6b0c 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 <dilfridge@gentoo.org> (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
 # Ionen Wolkens <ionen@gentoo.org> (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 2152c9b4a18..e19794fcc05 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 <chutzpah@gentoo.org> (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 <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames