summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-11-22 06:08:11 +0000
committerSam James <sam@gentoo.org>2021-11-22 06:28:17 +0000
commit01fd1ed53bffbcb11aa1734eb0ca42d3597318f5 (patch)
tree0c8b250be34787ffc18388109f65f69175ec4c6d /profiles/features
parentsys-kernel/pf-sources: add 5.15-pf2 (diff)
downloadgentoo-01fd1ed53bffbcb11aa1734eb0ca42d3597318f5.tar.gz
gentoo-01fd1ed53bffbcb11aa1734eb0ca42d3597318f5.tar.bz2
gentoo-01fd1ed53bffbcb11aa1734eb0ca42d3597318f5.zip
profiles: mask (older) virtual/libcrypt:0/1 for glibc to ease upgrades
Mask the older virtual/libcrypt subslot (which permits glibc[crypt] instead of libxcrypt) to ease upgrades. Not yet doing this for musl (need to figure that out still) or uclibc (which is going away, see news). Was on the fence about doing this given it makes it slightly more awkward to put off the upgrade if desired, but that's really discouraged at this point, and I think it's worth it to make upgrades easier for more people. This helps Portage realise it can/should upgrade to virtual/libcrypt:0/2 rather than giving very confusing blocker errors (which it often, but not always, gets past). Final push to do this was a forum post: https://forums.gentoo.org/viewtopic-t-1145602.html Bug: https://bugs.gentoo.org/699422 Bug: https://bugs.gentoo.org/809410 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'profiles/features')
-rw-r--r--profiles/features/musl/package.mask1
-rw-r--r--profiles/features/uclibc/package.mask1
2 files changed, 2 insertions, 0 deletions
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 8868bd6108ae..8bf8e5b3342e 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -21,6 +21,7 @@ net-misc/netkit-rsh
# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
# Mask the libxcrypt-based virtual
~virtual/libcrypt-2
+-virtual/libcrypt:0/1
# David Seifert <soap@gentoo.org> (2021-02-08)
# nvidia-drivers only works against glibc.
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index 8aa72890043e..39a81a82d33a 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -8,6 +8,7 @@ sys-libs/pam
# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
# Mask the libxcrypt-based virtual
~virtual/libcrypt-2
+-virtual/libcrypt:0/1
# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)