[gentoo-commits] data/gentoo-news:master commit in: 2021-10-18-libxcrypt-migration-stable/

["Sam James" <sam@gentoo.org>]

commit:     c0fc80bac65a65d04ca4ce503c233d238d43d390
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 21:22:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 21:25:05 2021 +0000
URL:        https://gitweb.gentoo.org/data/gentoo-news.git/commit/?id=c0fc80ba

2021-10-18-libxcrypt-migration-stable: tweak guidance slightly

Bug: https://bugs.gentoo.org/809410
Bug: https://bugs.gentoo.org/699422
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../2021-10-18-libxcrypt-migration-stable.en.txt          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt b/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
index ccfcddd..63eaaa8 100644
--- a/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
+++ b/2021-10-18-libxcrypt-migration-stable/2021-10-18-libxcrypt-migration-stable.en.txt
@@ -21,6 +21,12 @@ specific case, it is useful to have a simplified depgraph
 to ensure that Portage is able to smoothly calculate
 an upgrade path.
 
+It is also recommended that users do _not_ have
+FEATURES="collision-protect" enabled because it is
+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.
 
@@ -55,9 +61,18 @@ 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
+common helpful tips are:
+* try more backtracking (e.g. --backtrack=1000)
+* try --ignore-built-slot-operator-deps=y temporarily on the world upgrade,
+then run a world upgrade again without it.
+
+Do NOT attempt to unmerge glibc at any point.
+
 For more information or troubleshooting tips, please see:
 * https://wiki.gentoo.org/wiki/Project:Toolchain/libcrypt_implementation
 * https://bugs.gentoo.org/699422
+* Reach out to our support channels (https://www.gentoo.org/support/)
 
 [0] https://bugs.gentoo.org/802267
 [1] https://bugs.gentoo.org/802807