gentoo resync : 22.12.2021

6 files changed, 46 insertions, 28 deletions

diff --git a/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt b/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt
index c2b2b76c5d3b..ec6bdc7645d2 100644
--- a/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt
+++ b/metadata/news/2021-08-24-eudev-retirement/2021-08-24-eudev-retirement.en.txt
@@ -25,11 +25,12 @@ will still have to rely on eudev before also being removed on 2022-01-01.
 
   **WARNING 1**
 
-If you happen to have an INSTALL_MASK with a blanket "*systemd*" glob,
-you will inevitably break your system. sys-fs/udev contains "systemd" in
-some of its filenames, hence a blanket filter rule will likely lead to
-a non-functional udev installation.
+If you happen to have an INSTALL_MASK including "systemd", e.g. a
+blanket "*systemd*" glob, you will inevitably break your system. sys-fs/udev
+contains "systemd" in some of its directories and filenames, hence a blanket
+filter rule will likely lead to a non-functional udev installation.
 
+Please also verify you do not have "sys-fs/udev" in package.mask.
 
   **WARNING 2**
 
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 1b80f95cc5ea..d821eace0bb1 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
@@ -13,7 +13,10 @@ this has been tested for years already) and switching to the
 external libxcrypt implementation, now also in stable installations.
 
 This will be a regular update, and in nearly all cases you
-will not have to take any action and not observe any problems.
+will not have to take any action and not observe any problems. If
+you hit issues, please read on.
+
+## Upgrades before 2021-11-01
 
 We do recommend, however, that your system is *fully* up
 to date first. This is a standard recommendation but in this
@@ -21,6 +24,14 @@ specific case, it is useful to have a simplified depgraph
 to ensure that Portage is able to smoothly calculate
 an upgrade path.
 
+Please take the opportunity to fully upgrade your
+systems now, before the migration occurs, to simplify matters
+
+This change will occur on 2021-11-01 for stable users.
+~arch users by default should already have switched.
+
+## General advice
+
 We also recommend being in a root shell (not via 'sudo'
 or similar tools) so that if any issues occur during the upgrade,
 you are not locked out of the console. It is not expected
@@ -32,11 +43,7 @@ aggressive in protecting even orphaned files. Instead,
 use FEATURES="unmerge-orphans" which is almost identical
 in behaviour.
 
-That is, please take the opportunity to fully upgrade your
-systems now, before the migration occurs, to simplify matters.
-
-This change will occur on 2021-11-01 for stable users.
-~arch users by default should already have switched.
+## Delaying the migration
 
 If for whatever reason you do *not* wish to switch now -
 which is only delaying the inevitable - you
@@ -46,6 +53,8 @@ need to take the following steps:
 * mask >=virtual/libcrypt-2
 * unmask virtual/libcrypt:0/1
 
+## Migrating early
+
 If you wish to manually migrate now, there are a series
 of steps described on the wiki (see below), but the outline is:
 * unforce the crypt USE flag of sys-libs/glibc and disable it
@@ -53,12 +62,16 @@ of steps described on the wiki (see below), but the outline is:
 and enable it
 * unmask ~virtual/libcrypt-2
 
+## PAM warning
+
 Please note that if you last changed your password before ~2008,
 it may be using md5crypt or similar other weak mechanisms in /etc/shadow;
 a bug in PAM [0][1] may mean that you were unable to login. We recommend
 using "passwd" to change/refresh your password so it is using modern
 methods. A new version of PAM has been added to the tree to resolve this issue.
 
+## Build failures
+
 In some cases, Portage may schedule a rebuild of certain packages in an
 incorrect order [2]. If building a package fails, please try upgrading
 Python itself to help avoid spurious build failures, and then
@@ -69,7 +82,9 @@ libcrypt and libxcrypt first:
 
 And then continue the world upgrade with Portage's "--keep-going=y".
 
-If you hit conflicts, please see the wiki page linked below, but
+## Blockers/conflicts
+
+If you hit blockers/conflicts, please see the wiki page linked below, but
 common helpful tips are:
 * try more backtracking (e.g. --backtrack=1000)
 * try --ignore-built-slot-operator-deps=y temporarily on the world upgrade,
@@ -77,6 +92,8 @@ then run a world upgrade again without it.
 
 Do NOT attempt to unmerge glibc at any point.
 
+## More help
+
 For more information or troubleshooting tips, please see:
 * https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
 * https://bugs.gentoo.org/699422
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d10d172b6d8d..27f558d01d05 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 15567 BLAKE2B cd532bfb719406d28a57b3ff201e523cf2465ccb1ef12e028056ad08a70f52dac0ff2cdc2a1a6becac028f9420789fb8a7eccc136e85b813e2211dafca969b00 SHA512 4e4ccf855d52fe6ae642b0d51ffccea68f2f449bae6351a417bf21dc995a0926b8f758b22b2da537dd40a13b2b13e05609df664d895495aa3ba215abacbda0be
-TIMESTAMP 2021-12-05T01:39:13Z
+MANIFEST Manifest.files.gz 15563 BLAKE2B de135e6488ddf981f69c63c25215e6facf104d70eba96049c2ef35d70db344af8a2ecc031fd47d2ade8f7e7131a3ebb547dacc9d95347170ac2b98c3bd550280 SHA512 3b03ad337a567fa9bf851b48bd8ba4f0370167f9223bb3f373724110c6bf3ac60c2ced7a79dc0708b9299b94c92153c55cc42185a0fff58ab1fb7d32efd15e42
+TIMESTAMP 2021-12-22T12:39:20Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmGsGEJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHDHHlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCJ7A//VPSPxc0VN8bqxrN4DRiSlag3ilj0PS1XjNGQfuCqTzmw8riIk0fCzzIA
-qyjTxDCmijbs1X/ccpmlfW+Xp+71vvGtqdXbjrLHAAXC1ESCD4ycQNp13X53uF1p
-Ujsgz5VrcQYtiuqrIzqpxOoZb66VIzuIIkhyaobh+dUDWmAJD2OkBL9WCPgz/kTF
-/M4enGDNDq9K9zaA8Rt8uqfldOqc2GB8/w9tcTFqsgfXX9hQbONH/3yQtSJyDpTU
-iHrxrgO+iqsTqpGwGMky5N9KJmicIWr6qqk36lk9r+RjPEgGgDXdlGf9gCMACnTR
-A6L6PLbqPPgj8REQXnVr1CIfp4nIuj4co/L4jzK34hIHXqgiaZqOznGUh17VqAcE
-Nt/Kj9CeR1QBzc37/qtqqgNVgWqJvlMoqA8HJdeBtJ3JrN9Ge8LSk/wiQFBrKusq
-BycsUaxVBODJ0cZTSjV8Z5GeAQNVOyL/sB88ijyoZXeAmIxibeoj1vwW2i89BvOa
-eNCbTO0x1qKAA323HztjCUA9YNLL2ISA/IQz60Idk5M+HBQa6LB0mSoajc67PK5V
-PPbKxB5959xOAxUD08Rz3YPD6fEM1YFupAgZIQE2NHjatmZj3JkKUv1m8Rt5AGqZ
-Xo+pLVgwK1rtQeh/1ux2MNFZqYuQghriuBGuABBs3wWS6yFY9q8=
-=6cp7
+klBl8Q/9GHPaBctoQPzQstyzaymqDwuLL1r7OZkyaOc5fgWS6gkcMv/OxGNFw3Yk
+KXEIj9U1Yr2JiNKp35D2VihlIITm2sSVBf5jPbxzaNI/w0V8YY4H1xk8eRtDxcT4
+7aFonGBjSEzFg0iw6ShAlvn3qPfi9w5XzSmE0fjCYS2SKGmOOJzKR9NnHCBgBP8h
+bHhB5/I3KerH9EUhibCsOlJliTHuLgBKxMfIQWBCDftKH5Vc36RynbRbmzJdQeMp
+W5pX7rqZb8AN/JTi5HSjVK9ONmSv1o1Bz5RdpytRZdyI7ny4K6hDDW4vjyGfK0O+
+3JCx4XxSoBgNxdzvZMeJzsO3Fl2yA+vXgs815t3KxsSglqvD/sGTANeHmNNJ/2yc
+jfLa7D73wnd8F+0qgtsdINQ8AEv63b56538SgZEuKFd74eC8vtpBPcUO4mtaUjR7
+BNP2KUzKPxalgGGZ8dLwAuL+buLWR1AJgFmOo5TniHO55qJyNO81BcvJwFg/0wZ/
+T5hiDSzZEd8PkLQ8UAHecGUhy0hic9fyFKrptAr1lSnPC11IEqfVvfuRqDmqAnDz
+Ex/kh7hOGqLDj/32fXgr967ercE48Eg5dgldKKlg37uCSpSjFjRsOWl3pOUxkPHI
+nhHN3BLOmjMpADHsm0gGyiPj89yH5uzOm13kqiNSvg1RBWroYAI=
+=iY5Q
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 1f5f7a232566..efb8c9bffe2e 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 6510b8316a75..285aaf1400d8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Dec 2021 01:39:08 +0000
+Wed, 22 Dec 2021 12:39:14 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index ddafe0205a8f..9fe4d7096574 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-eba63773624dd2dbdceefdf8ab2c88aab22dab40 1638408994 2021-12-02T01:36:34+00:00
+96b008f1c3f64e6550efc18b24e9f44fb1b9ff4e 1640042647 2021-12-20T23:24:07+00:00