gentoo resync : 17.07.2021

4 files changed, 31 insertions, 18 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index eb7bc3a9dd50..aa66e55ed5b5 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 83513d5d82c1..925b60a9c4da 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,17 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# Several known issues (possibly with older pastix versions as well but
+# in v6 they result in clear errors):
+# * CUDA support needs testing, may or may not work as it is;
+# * With MPI enabled two tests fail (when linked against openmpi, at least)
+#   due to incorrect implementation of either MPI support itself or
+#   said tests - example_drv_facto0_d_reentrant tries to initialise MPI
+#   more than once, test_bvec_gemv_tests calls MPI_Query_thread() after
+#   invocation of MPI_FINALIZE.
+>=sci-libs/pastix-6.0.0 cuda mpi
+
 # Alfredo Tupone <tupone@gentoo.org> (2021-06-27)
 # lto does not work on dev-lang/gnat-gpl-2021
 dev-lang/gnat-gpl:10 lto
@@ -267,10 +278,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/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index eaa49d098f58..7c7be35a0f19 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Sam James <sam@gentoo.org> (2021-07-12)
-# Haskell isn't stable on amd64 (or anywhere)
-# bug #801649
-dev-util/diffoscope haskell
+# Patrick McLean <chutzpah@gentoo.org> (2021-07-13)
+# Pulls in dev-libs/pmdk which has Haskell deps, a dep on rocr-runtime
+# all of which are not stable anywhere.
+sys-cluster/ceph pmdk rbd-rwl
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-30)
 # dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1201801394bb..d805d7c7b66b 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version
+lua_single_target_lua5-2
+lua_targets_lua5-2
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
@@ -12,12 +18,6 @@ ruby_targets_ruby25
 # PostgreSQL 9.5 masked for removal
 postgres_targets_postgres9_5
 
-# David Seifert <soap@gentoo.org> (2021-06-20)
-# Abandoned upstream, last release 17 years ago, unmaintained, tons of
-# QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
-canna
-canna-2ch
-
 # Brian Evans <grknight@gentoo.org> (2021-01-07)
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot