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

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

[Andreas K. Hüttel]

commit:     4ced298fd259cbd089f994e084b30a58718b37fe
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 18:47:12 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 20:45:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ced298f

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 <AT> gentoo.org>

 profiles/base/package.use.force            |  8 ++++----
 profiles/base/package.use.mask             | 10 ++++++----
 profiles/features/musl/package.use.force   |  4 ++++
 profiles/features/musl/package.use.mask    |  4 ++++
 profiles/features/uclibc/package.use.force |  6 ++++++
 profiles/features/uclibc/package.use.mask  |  4 ++++
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index eb7bc3a9dd5..aa66e55ed5b 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -91,12 +91,12 @@ sys-libs/libcxx libcxxabi
 # the flag.
 sys-kernel/vanilla-kernel initramfs
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06)
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
 # Upstream plans to drop libcrypt.so.1/crypt.h from glibc
 # distribution and rely on external providers like libxcrypt.
-# Gentoo will follow suit but today we are not yet ready.
-# Unmask at your risk. Bug #699422 tracks the effort.
-sys-libs/glibc crypt
+# Here we are following that path too.
+<sys-libs/glibc-2.33-r2 crypt
+>=sys-libs/libxcrypt-4.4.23-r1 system compat
 
 # Matt Turner <mattst88@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 3535925e456..af41a8e0062 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -286,10 +286,12 @@ dev-python/statsmodels doc
 # broken static-linking in glibc and maybe others
 >app-shells/mksh-57-r1 static
 
-# Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
-# Collides with sys-libc/glibc[crypt]
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-sys-libs/libxcrypt split-usr system
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
+# 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
 
 # Michał Górny <mgorny@gentoo.org> (2019-10-05)
 # net-libs/openslp is being removed.

diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index c26a7ba83f2..da728fcc47a 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 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
+
 # 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.

diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index afdd59ca5f5..58cd6477116 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 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
+
 # James Le Cuirot <chewi@gentoo.org> (2020-05-16)
 # execinfo.h is required for debug.
 dev-games/cegui debug

diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
new file mode 100644
index 00000000000..82ca48bfea6
--- /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 1c6069c30db..b3f8a9ebe24 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