summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2021-07-14 20:47:12 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2021-07-14 22:45:54 +0200
commit4ced298fd259cbd089f994e084b30a58718b37fe (patch)
tree15de8bab2847e475e11b3915ee811765217cea7c /profiles/features/uclibc
parentsys-libs/glibc: ~arch revision bump without changes (diff)
downloadgentoo-4ced298fd259cbd089f994e084b30a58718b37fe.tar.gz
gentoo-4ced298fd259cbd089f994e084b30a58718b37fe.tar.bz2
gentoo-4ced298fd259cbd089f994e084b30a58718b37fe.zip
package.use.{mask,force}: adapt for libxcrypt transition, except musl/uclibc
Bug: https://bugs.gentoo.org/699422 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'profiles/features/uclibc')
-rw-r--r--profiles/features/uclibc/package.use.force6
-rw-r--r--profiles/features/uclibc/package.use.mask4
2 files changed, 10 insertions, 0 deletions
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
new file mode 100644
index 000000000000..82ca48bfea6c
--- /dev/null
+++ b/profiles/features/uclibc/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2021 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# 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
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
index 1c6069c30db8..b3f8a9ebe24a 100644
--- a/profiles/features/uclibc/package.use.mask
+++ b/profiles/features/uclibc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
# Anthony G. Basile <blueness@gentoo.org>
# sanitize is broken on at least all hardened uclibc
sys-devel/gcc sanitize