gentoo resync : 10.09.2021

5 files changed, 66 insertions, 17 deletions

diff --git a/metadata/news/2021-09-05-setuptools_scm-6_3_0-temporary-breakage/2021-09-05-setuptools_scm-6_3_0-temporary-breakage.en.txt b/metadata/news/2021-09-05-setuptools_scm-6_3_0-temporary-breakage/2021-09-05-setuptools_scm-6_3_0-temporary-breakage.en.txt
new file mode 100644
index 000000000000..988002c7dc18
--- /dev/null
+++ b/metadata/news/2021-09-05-setuptools_scm-6_3_0-temporary-breakage/2021-09-05-setuptools_scm-6_3_0-temporary-breakage.en.txt
@@ -0,0 +1,49 @@
+Title: setuptools_scm-6.3.0 temporary runtime breakage
+Author: Arthur Zamarin <arthurzam@gentoo.org>
+Author: Sam James <sam@gentoo.org>
+Posted: 2021-09-05
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: =dev-python/setuptools_scm-6.3.0
+
+Users who upgraded to =dev-python/setuptools_scm-6.3.0 between 2021-09-03
+15:42 UTC and 2021-09-03 19:03 UTC may be affected by a bug [0]. If you have not
+upgraded to this version or have >=dev-python/setuptools_scm-6.3.0-r1 installed,
+you are not affected.
+
+A missing dependency in the setuptools_scm ebuild meant there was a timeframe in
+which anyone who installed dev-python/setuptools_scm and dev-python/packaging in
+the wrong order won't be able to build any Python package using setuptools
+unless a workaround is applied.
+
+Specifically, this affects users with =dev-python/setuptools_scm-6.3.0 installed
+and where dev-python/packaging is not installed (applies separately for each/any
+Python target). The bad tree state was between gentoo.git commits
+8882e54abf78d3af69faed5844e3ad441482f23e and
+0c76b447cd1be9cf611f649970851750304d9ca6.
+
+Affected users will see errors similar to the following when installing Python
+packages:
+```
+pkg_resources.DistributionNotFound: The 'packaging>=20.0' distribution was not
+found and is required by the application
+```
+
+To fix this manually, you need to fully remove all dev-python/setuptools_scm
+files by running the following commands:
+
+# Necessary to obtain a fixed version of setuptools_scm
+$ emerge --sync
+
+# --unmerge is NOT advised normally, but is required to avoid setuptools picking
+# up the runtime-broken setuptools_scm version when re-installing setuptools_scm
+$ emerge --unmerge =dev-python/setuptools_scm-6.3.0
+
+$ emerge --oneshot dev-python/setuptools dev-python/pyparsing dev-python/packaging
+$ emerge --oneshot ">=dev-python/setuptools_scm-6.3.0-r1"
+
+Note that the version specifiers above are not strictly necessary if you have an
+up-to-date copy of the tree but provide a safety net.
+
+[0] https://bugs.gentoo.org/811504
+
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9a9b815aa3c5..7159ff79438b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 14200 BLAKE2B 83d1ac5d89a288dc709ef2f5816841e63852e8a254df02bcca689f43d5d2fa138b91de825c2cd73063f5297bfab499d725cca24a2f5875dab1a4ee660cb4dd43 SHA512 1f8ef571b4b11518ca1bd808b14747b1db32a926c86a6f8f145e892c5cb56b5b612a4a374fa364dfc4ebce39bcfa1bd949a832bff6351d2e64f71d60858edb49
-TIMESTAMP 2021-09-03T19:09:04Z
+MANIFEST Manifest.files.gz 14400 BLAKE2B 72bbfe918af64d5789a535336efe915a799a2a34c7041c149f3f65b48002f919fe38c72354e9cd71d1620cb21f011cbe9bf82a635da6518dc4238701194c683c SHA512 04fe229154bdfc55769cce1e84cb35300863ca5ef4622338ed4169ba3a2f9a97622a9657f9c4b8f81280ac33ef86aef93d8648950552ad9c26d21d2da7e43a65
+TIMESTAMP 2021-09-10T02:39:15Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmEyctBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmE6xVNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC6yA/9ECi2Dk+Carmp4eqkpuMP+T13tbmffbZRoF14wHCNaEYaRYo0Fbv8icYF
-mbbeOZZd8jTqUfTxWLjCyiwZoK1EBXi/TGwPNbAlQ6yNovEbCV6ttja2Da7QCXMS
-PAtfmgzpVIFkOdcm07PP3zrZKixjLQtDmstEbP/kZRpUx0RFkKdoCgmonGCHcITk
-LHbvsAMbpirq/hiXOlM5dQ1IOzzaDppGU7pM4Oc6QyNjQKr8uOPdzT/lB+GxXJ3D
-PQkl1ezEKPhHL9WQ+tgdSuoldkL1FANPm2C9xNha5fzA6bjrK9efz3+DGGtDehLH
-UubHxzI2+RCJw0xXuBSOcZMJbBSNcuyr0A0zCsaATYA2LyC2JZ4hKUheoQ3MUPEg
-zpVsf0l8bAu6w6ib+7QflDe8V4XTHcPlGD0D2gymZ1iG16+WGdiwm7Rpuozj9dae
-mOkjNsmdR9AqQWYkERknpTl/DuiK+Zup0JaNudLo6t8rTtA38xkqS/rVkEjFuzlN
-+ymQxuXrm0jPAE7qgcFFWNIdiWyIol89Ac0ok11rK8XIKVLdoUtKCeWiHEKDKUKC
-zvTLQQDLUxW11B4ZHoWYUOtnVZW0fNWM0tgMkjcyN/1OhqZyeQoMJzy+tENdw/a1
-tpuVepO9Ho+rh1sQz8NSXR9q1/0mNdzCA5o9uKCh45W2eRiAE6s=
-=wzxU
+klC/+hAAqWmBVqCk5wJm1r+a8E2khQgNO3jMtrarsAghyuAXSVtTugsdOsQBV7EU
++l1eRYjpFMsC2FFIKsyflOkkDADRHQz9xD5eeDg8ySxsuDfOQQl0ROHZ0RKlo+9/
+rEbPzB2htDY+EoPYaA+2jHBQJVH0x0py/GjptHC6PvaqcNOyVBbY7YPqKEbILnRf
+3sb8WzQx/QsZm0CN2lDBxEqdTrOTX//KS6iZyZdL+bMlGjicEb0CwUlM0yhWTRlp
+zryF2L+T+S/Ij3kVHiD3pfI8XwRiN4GdlX+TtBNeNrLcbuqPv9ovcXdmeCAlB68d
+M4tt3tzzjxu69vkaf6PNf6+vA296/ZH7YdvJ9ZdAmUMYIU1r97p4cLnKXE3d2gMH
+s45HcRdLq/ctjVR6fj+3IG3holDa7Tjxn2GI4uSVvMboEyflAu/rwOMtA5IWZcsH
+LijxlFb4IMstda8mhHM1/HZflahpTfwxLH5oEcwFwg6OxHAJzDpuPELEItXYVVqx
+7akCLfNjd2+jSXDmdrAcPgeMjrURoItJdj+raRhh6NViHyge9WXVsZkk5HkG3pei
+ZnUnWKelwN6622Q3lmwWT+e2F3bel+WjESurxk9ZPajZYNLD69QT8piQDaJUgdUS
+6WGv+M6vjM+cqsuJVtuVbsT/TzbCfOPQ28/qFBw12RvRTA1D//U=
+=BOd5
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index dfb04051dfbf..80ba03aa054f 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 2df7b0dc1ffa..dc3dc3e5f975 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Sep 2021 19:09:01 +0000
+Fri, 10 Sep 2021 02:39:12 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index d5aeab680629..51f558386cdb 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-4a7df7c965fa8c251e32ef1d82ffad43bcf9436f 1629809155 2021-08-24T12:45:55+00:00
+1cb5d7bab0f5f9da37a0b68d234c66484ec592d2 1630861250 2021-09-05T17:00:50+00:00