gentoo auto-resync : 08:12:2022 - 21:16:36

5 files changed, 28 insertions, 23 deletions

diff --git a/metadata/news/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt b/metadata/news/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt
index 4bf3e05303a8..be1870c18d5f 100644
--- a/metadata/news/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt
+++ b/metadata/news/2022-12-01-systemd-usrmerge/2022-12-01-systemd-usrmerge.en.txt
@@ -1,7 +1,7 @@
 Title: /usr merge for systemd users
 Author: Mike Gilbert <floppym@gentoo.org>
 Posted: 2022-12-01
-Revision: 2
+Revision: 3
 News-Item-Format: 2.0
 Display-If-Installed: sys-apps/systemd
 
@@ -22,14 +22,19 @@ To migrate a system to merged-usr, follow this procedure:
 
 2. Install sys-apps/merge-usr.
 
-3. Run the merge-usr script in a root shell (not using 'sudo', as a precautionary
-   measure). The --dryrun option may be used to check for error conditions
-   before running the script for real.
+3. Run "merge-usr --dryrun" as root to check for conflicts. These will
+   appear with the word ERROR at the start of the line.
 
-4. Switch to a merged-usr profile.
+4. Resolve any conflicts. This may involve deleting duplicate files. If
+   in doubt, seek support in a Gentoo support channel.
+
+5. Run the merge-usr script from a root shell. Avoid running it via sudo
+   directly to avoid locking yourself out if an unexpected error occurs.
+
+6. Switch to a merged-usr profile.
      eg. eselect profile set default/linux/amd64/17.1/systemd/merged-usr
 
-5. Run emerge with the --newuse or --changed-use option to rebuild
+7. Run emerge with the --newuse or --changed-use option to rebuild
    any packages that have a "split-usr" USE flag.
      eg. emerge -uDN @world
 
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 74d1ddf2f8e7..af214b81007f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14598 BLAKE2B dd3bd1269baca9127ec20d35028ac080296d0f294040056402ba0b8b32f65d9b77b38974a70f4979cc85acd7f28d3ab278e9c58e548b6166a53bef6c9a5fd97d SHA512 fa21828a5a015c35127c2ab36ff2dc8197f2159e8002397e5e72877978e625b2ed4b80479487964a67eb2e5e2432f81d46188162c5b895a1cef9c293ad73cc21
-TIMESTAMP 2022-12-08T14:39:48Z
+MANIFEST Manifest.files.gz 14601 BLAKE2B b2b03f784771869c2af8238b7eb177f68542d9936c68fb72d5570f7586fc5bfa6ebef91d68006df82de3cb72959aeb4bab278be90309ec4475d99a0a7c116698 SHA512 63ddd1056929f887c0a4815b7d7a2bf2cee40e7678885b8dae9d5f1bfc4b69ae36456367dc791d7e3ada9047919456bd6d6dbfc92df0cef91b9e64733254a40c
+TIMESTAMP 2022-12-08T20:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOR9zRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOSS5RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCvsg/+ItxU/cGnfbKrGzg1gP9xRGhZp7cY9gag3aTa7+4bJ8jDD9pYuFZ3A0WU
-i75N23XrYL51QHj3kqByHfpLYlKA/LhjRl2e+GvNj1AMLsfbGkTo2QpBW7Qp6Fiz
-sYH1+LgeR6mMde4pfoBfb/pAEPHvNoXL+++nzUZAZ9WsA69sX9q2Y/Yced0YVIUh
-7Qt/be2of8lDsO04GvfEYpR5UI28EAnPqG5EToft2rVuQlh1S4lOhq1wehaN14Ko
-3n8vjE/pwhpJgpRUwBKaTMtirmKmSo2qkMmzbodR8A+4Jv7rekvobOahAqUI3PCm
-/Y/sMXt+gzDAST1xgWj9Tp/PNKbeqkkUbcXCFmOGevswN6OytRPefDSVsdvEVPq0
-5WCgmS2NZPGZVh46xxafeNm7T6rcFP1Lj1VWnI488q7WfhDkDXastABTSHerx/X3
-asRnB6Vi0c12X1nqvF/ssN2m6EKzYvHP43x2jmg6s80n4++IPXJYtbomClGJTSM1
-SNL+2IFgKHTBEU5oPtNEj/kMD4JP3n8+/2CAP6AROk3RQsyMpWdoSL6UzohQT0Re
-LlzvgXraiy1lqyMrS8a5em1SfdxE9Fn+b/YVL8jv8PyqYj7hTQ+GO1vWowSyamgP
-ZPqQFIjL5gcyVB6Sc34SxOmDhxuPLL4DM4eKtkaNszuUCl6gy94=
-=93O+
+klAAWRAAjD0WRr1TU6s/N3XBpCoPVw6cmvBHuGE169926uyPQRmN5QP80c1fRWX6
+HR455svNa+4/pTQQxz56BuCvIKOpTG4wXIAkjHZT/jIW/FCqe0zFe07X2ZWPD6bX
+41VmAsHMfj1iAdevrFnI+kH3Xa3Pbd1U95Ajv1B/8g3s9PvPmlBHY565/O7/uAk1
+fk8BLNm+HFHbzpz5km8HmhcECfQb7H+fBjNBySaH+jXDinJx8XUUW0DE5VuCnnMm
+1kO9V77yb/dAv6lLEp2mvlzvrbIbR8SUQUmtlyEK1aIWpSsO7jE9e2dV7KVPd8If
+EY1L6+XkJvrlbY9kdzfTM+HVbVnwCvjK6HE1TdDQrrSbf3l+ue3YP3F0FudqJT4e
+fYKu3wbpsfcGVADRf34XkeVzwzEqt1Fb6NbIjxxlZnkvDrY/ymFYoj2Dk5a+NlOE
+6GexWluzkmPLn0sVd/1ejmjmUIo/h/JI8xqg09mP6QvOlCS+XqFfVooLLMniPBXc
+clEVJMgxr6DtiWaOoCUHiRJ/BldN3eM9HqP3ngNnHhyYWhjxI4JqY/DvDPpWWK9B
+KTijj8euxkJW25pdoAzH8nPFX17lRkqUlivppaoLRpUvEtCesoN3vHgs/IT4Ejgg
+pNz4OywQll59hQtDYlfo3/uo0qkce+2pPX6Ox1zncWGePAmN9p0=
+=zqg4
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index a7bd75279680..3a6fe1e382b7 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 573325f3271f..1a7ebd2cd2f7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 08 Dec 2022 14:39:44 +0000
+Thu, 08 Dec 2022 20:39:45 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 58e84503598f..dfebe113b776 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-e6bd58b5ea5c1ba189359ff10b71b9e64005ca42 1670229744 2022-12-05T08:42:24+00:00
+5d869a12d47362055873f519a82313c6f40fdbdb 1670518482 2022-12-08T16:54:42+00:00