gentoo resync : 20.03.2022

6 files changed, 50 insertions, 18 deletions

diff --git a/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt b/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
index d821eace0bb1..74e80d58f7e6 100644
--- a/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
+++ b/metadata/news/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
@@ -43,7 +43,7 @@ aggressive in protecting even orphaned files. Instead,
 use FEATURES="unmerge-orphans" which is almost identical
 in behaviour.
 
-## Delaying the migration
+## Delaying the migration *or* circular dependencies
 
 If for whatever reason you do *not* wish to switch now -
 which is only delaying the inevitable - you
@@ -53,6 +53,11 @@ need to take the following steps:
 * mask >=virtual/libcrypt-2
 * unmask virtual/libcrypt:0/1
 
+If hitting circular dependencies involving Python 3.10,
+see the wiki for more details [3], but the same steps
+listed above must be taken (mask newer libcrypt temporarily,
+do a world upgrade, then unmask).
+
 ## Migrating early
 
 If you wish to manually migrate now, there are a series
@@ -102,3 +107,4 @@ For more information or troubleshooting tips, please see:
 [0] https://bugs.gentoo.org/802267
 [1] https://bugs.gentoo.org/802807
 [2] https://bugs.gentoo.org/802210
+[3] https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt
diff --git a/metadata/news/2022-03-05-singularity_to_apptainer/2022-03-05-singularity_to_apptainer.en.txt b/metadata/news/2022-03-05-singularity_to_apptainer/2022-03-05-singularity_to_apptainer.en.txt
new file mode 100644
index 000000000000..0d9c99268982
--- /dev/null
+++ b/metadata/news/2022-03-05-singularity_to_apptainer/2022-03-05-singularity_to_apptainer.en.txt
@@ -0,0 +1,26 @@
+Title: Transition from sys-cluster/singularity to app-containers/apptainer
+Author: Marek Szuba <marecki@gentoo.org>
+Posted: 2022-03-05
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: sys-cluster/singularity
+
+In autumn 2021 the Singularity project joined the Linux Foundation
+and changed its name to Apptainer [1]. The change has been reflected
+in the renaming of files and environment variables, as well as a reset
+of version numbers back to 1.0.0.
+
+Apptainer packages include compatibility symlinks to old Singularity
+executables, provide bash-completion rules for both the old and the new
+name, continue to honour old environment variables, and will upon
+the first run import user data from Singularity directories. Therefore,
+for most users it will be sufficient to deselect the old package and
+install the new one, e.g.:
+
+emerge --deselect sys-cluster/singularity
+emerge app-containers/apptainer
+
+However, customisations made to system-wide configuration
+in /etc/singularity will have to be applied to /etc/apptainer by hand.
+
+[1] https://apptainer.org/news/community-announcement-20211130/
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 027615e8af2b..641505266c64 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 15561 BLAKE2B 30d14554c361ecc2db312266d9a96736586a74d15ae25de153aae93816d58fb72e0577a0ce0d08fbed62009358d460331bd52141bf576a73346d006f1e7ff10c SHA512 c39bb0d5ac9d60d346266b7e16a8308e1a9954eef08902e01a2337fe5be084f5a06ea3a47ac08030502c738f5f565cdb6fa298a0f2c3edfbb1a533e78bd1f2ee
-TIMESTAMP 2022-02-02T00:09:13Z
+MANIFEST Manifest.files.gz 15759 BLAKE2B db866b663840daa2a768d3fb83579462195ac84e3ebabada9e6a81566207c655641f38c473d259f19a45ac077e921204c451f3cac49ae4c902ca770991793701 SHA512 29452d4a767a69c6e5e9c5b5db3daa5e96cf3ee88a48b1f9ec50993c300ec30ff9adfcb7203d42712287a609772dcffc1509b0f71ba01b806f7ddeb155b59928
+TIMESTAMP 2022-03-19T23:39:33Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmH5y6lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmI2abVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBszQ/+IvVXhRmchvBbM4hss40xoXpxGP3O3dlbaX5x9p+Qlt/tN+zeKvN8qZ17
-ejKfI4/bsqRJNewqSi75eTTJ0fXZvtcUuoVaEviFTd736c+rBIM54Qp7PoHKYQ+U
-RVVEfB8u5ZZIWJe3rjYrLNktdfqEBtpGtI8QFfiP2EKUiJ0g290bNfi3IjWTc/RM
-UX7DftgmWn9h2b97qZ3mlsiHSxqQAuBIAL4TP0uq71u4ZlMxDdYpP6iDNcIjQXM8
-AWbGKnMjOtB+P7+3yDxTjF8jMYAoq7TKXsqsqFVLsAIwokKbfxX/wIKwkQ3GVkbF
-bsiRzuJusjMoZ+AdeFWR/e+O0gScU1NLTpZm3CyRo7FeNzFq8Laj2k1ODV9zfweX
-HsphMLkEMdpXK3/9Fptqib+rBYX51Z/EBQOWA/QQZYLo8qBc4dTLBM55vNM9m8QU
-MVz9NezmHaTRAEoBGmSPZLFDeF8Du+alSC8NG/W1GXQvbgDvi5X9d4FtgiTBcNY1
-HUpF7CvWCdxFWdSU0V8fHlFnGHu4btVoNDN9LupkCO9ho9XbTRaHjpA+DYWj5Jq/
-pRsMVhio+BKqfpW507DusrQ5XbNISBnAzPOvA2V2g0Pe5nYidrRGC+OanFJAomfC
-LEqpNdixdGjywCz03+RPgrhD6ZJgpItOqesz8N40lkdsyFe99P0=
-=Iz7i
+klBEmA/+Jj+pOVcBIEs0VPwURHVbWimU9iHGGPdNvLjywChiZhdtDXJaPAWLzv2b
+5JaKcuXnDq9A+WzoLhsxHZ4fGQwel6PCBOZ06UOedOP4cdGFS/QczfA576H6o3pV
+uSzU5xNxYpU9xN/dc2gQpvabnS13b0c4DCRSAkxphRB64AF7YANsDO52/9H8ij/u
+quE2zmGLs+wBkN/7PZF8xUhO8qyFrBvvE+cVDlUmu8EKucVi5yJthagOSefE4R2s
+sEQB0XINugtlLVYMFGM6vg/S+h+FQoDkO0kuVcOKifjdPRrUYiFVEX2cyg2bGp4x
+5Mbfz6gVntx7YNHCLXqGMdxLK3INokdVO4r5SduBQfH2wHAamLfWzEDHMIRWvjut
+vbgggcFQLrn9kzHMu7M2jugrKPa+/sBz7xu4mdqK4ymnzVe7ey0/iLsGfiS2+fcV
+zbFvpkV0mUO0K3HTdl9hwNNupHkEKzSipvlZVvVBUl8+sXkbXQOWSVU3gSswJo9f
+cauyw3eIMWMVoCkqGN+lTPL6zWwaHkW85RyYFNu/KryJ0nIq9TAaUfq08GGAZry/
+eiBYBCJV6HvAuUinj5eWyVpy7yc5llD+ppS75C50yITA7sRlq+0wnYM3KfQzAt3R
+H0HWUljcqZ2tdAHhttMAocW7UQ2L+9nncfe9AnPEkvzMCjxvv3M=
+=bawr
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index c631ddd9ea17..80519ef54940 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e3077fd5cd3d..1b660cba95b5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 02 Feb 2022 00:09:07 +0000
+Sat, 19 Mar 2022 23:39:30 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 8342e80c822e..455a2f229a73 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-dd2e0fd1e7031f0d45828f6177b2e3d080d7b438 1642187171 2022-01-14T19:06:11+00:00
+2b7edd6d19f027aed15052b08ae113ce7f4f1f6b 1646443743 2022-03-05T01:29:03+00:00