5 files changed, 61 insertions, 3 deletions
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 3d8bc12d24df..11991c2a3db2 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,4 +1,5 @@
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
+AUX python3.12.patch 2212 BLAKE2B f5992925ca9e89e97908b155bcdb722882c150983248010ddbc7f63afc36b2cec40f984568d029ec69f59171e5b8d5a2dadb5701943a1984c7d24acfa4060db8 SHA512 8571a633867b505f2af860f07ba24f5b92cb3bb94db2714887006d32f24d3b2974c77fd546b836e6dcea648d919fb48fc0937d517adc90358ab5ec4b208ba513
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST ahash-0.8.2.crate 42491 BLAKE2B 95e07f014d3e985bf7b32f71741d18c87201c0a57d85b5f433834a40d964c73ec9f121f20523bb5ff9f3579fc9fa733a745765ff718261e468ef5d7b18e89df4 SHA512 efc633b4dcd790e8dbc2da4e103a7ee82c3e0f97d37e15a06fd6fc0b73923d721604708f13435a9dcba50c4d53ca5db498e62f84320d8e966581889c2e9d9722
 DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
@@ -199,9 +200,9 @@ DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b279
 DIST zstd-0.12.3+zstd.1.5.2.crate 29693 BLAKE2B 57789ec212f12d3416784d7d8830a197437fd5a7c90ed62dd4b5add87f84039fe7afebb1c37f0973644845129868c0c6009bd39163b6afcc8b218653d2491b98 SHA512 1ee79370e2a7517638e51ea3c5c2f7f9d3f42364eefc5b10e909f52e50bffd141ecf2ac4d3701bd7655c965dd03a608ca5b69743fc2ed877f4dbfcb79715b70f
 DIST zstd-safe-6.0.4+zstd.1.5.4.crate 20856 BLAKE2B 05ef99fecb0d49c47dda75c23e89b7c5193ea00cee153be1856818ce3cbb97171b631ad27c01bde6fb02cc532a4aa8115ad9c6f2359ae6917e86062d833b75e4 SHA512 db03385ae800053ddb1bb6a2089712f284c21e43a99deeed6367ca8dabbb3f96b12066dfb57f484172a386fc9576c28e38d1a7bbf838debc05877bc68cd5c9cf
 DIST zstd-sys-2.0.7+zstd.1.5.4.crate 732100 BLAKE2B 1859d1feb7c31d53df56b198b88a391bf09e221d09d449878043dc780ae6e3b3a0ad05fe3fb4980e849ab914f68d281d41f51f7bbceec6e1403d9b4e25572b4c SHA512 dcddc4f0d7486ee144df4e2173536dc02c9714b6f702edb9a9e04b4c02f4d347b5a70fbc020c1d08c079d38a423c4dc8b6b86e7e43ec3ccfcc8e3ff9861be11b
-EBUILD mercurial-6.5.3.ebuild 7847 BLAKE2B 90304cbca056149b78079d75e65bb9afe7aac2112f2e9c9ac14d51d4e75f3633080426d6cbfb0775e2722a5165d7667a35aaecc6342aeffdcf306e00aa13b7bf SHA512 8172449ed1e4420df6be0dadd243413005abe071238a4b6cb5038ce7117fc5392df117a4b35a901b018bb338049aa7e8d9ce04ff212bec9e77527b8b020918d8
-EBUILD mercurial-6.6.2.ebuild 8004 BLAKE2B d6acf1ec67c3e97022759a6973a7d4080de210de70afa0930ccb14e0519bbbe3af563c2e339615377a001a797e32ffe7e41acf817aebd589bb4d718051d03375 SHA512 7b01f36347dad2feb53a4ee245d1da175b547b8f3b31e6ed71e86698f3073018177b62ea60c06df6e6c87631c2e8bed369c7f099b27dbb2901d33de9011cd09a
-EBUILD mercurial-6.7.4.ebuild 8248 BLAKE2B af3ddcb9f117c20ac2526cc85315892da7e16406c5cc4c6da4f70ec057608d9fada48aed1b67f3423749b5dff19c0fa4cc9784b01590ab72f6468063f97e56fe SHA512 12e719693cea4d721156ac596fb41dc172de393de8ab910342c120a929ae48fb299e00843a3d1b8477cdd308538c0d3db4a736b6fb549cea2c4f386f6551524c
+EBUILD mercurial-6.5.3-r1.ebuild 7891 BLAKE2B 84355ecfa08b53366bc807d7db77596bbe9239ac074088842af83bb1fa05c0f691e8a432fc8c6fb874754a7c1068029da81113766a7a1d4feb32439e461435f1 SHA512 efe6aed6d69b6a72e5c3cb1c3b66da792264628f76e3d9c9508e973266effb597d1b42922220addcb3331aa68f52335e30e724e49b6809104aaa1ed6273cea8d
+EBUILD mercurial-6.6.2-r1.ebuild 8048 BLAKE2B 91e6ed15dbfa6a6f651f24f15bdada2887c8f9865318532a43218a91baa029ef4cf5256ff28d47db4bc8bb4d4baf88af3937932ad2976e42ef873056c8cfea44 SHA512 f3a12126cc09e8ef0d68f28ccb182b5174bb14d5b7c86a1eb1b470e3b3d407c5107027bcd41dca635d9577e34f03b8f48dd6571469a242e42dbd084cbfca695c
+EBUILD mercurial-6.7.4-r1.ebuild 8292 BLAKE2B 50f94d52aa1802425eca4651b06c03e4004c4668aa5479914713df38afe045080a817c3b5353048b8639bfc58959f72b976a115c974bf8f85105cd962fbe963b SHA512 666c99299ed4f10f33a506283002ec7f30accf9ed41e8bac798dc910465e08638051bb0e0e082a9dd785c1e4f8559d2d74707bbe564fde9533a84e1c740c2434
 EBUILD mercurial-6.8.1.ebuild 8618 BLAKE2B 52e3879ff1ed05d0f496215100dda878cf2254a8a24e33ea9a47fd550b42f152992e1e98c7e25bac5d39d54aab5d921cb7569d7ff7073473df8b7179e5f7a325 SHA512 10188afdd84ae20afa5a3eb8a9b9d3c3f63b476df78c1566e4ffa4990a47657ed5a2be06c49231ffb480b314ebfeaa580f9dbcb525b3c3c725de92b0719d8892
 EBUILD mercurial-9999.ebuild 4689 BLAKE2B 1d53deeb550932bce07a2fca83330a5a83b3ccd53b4bd911efa642e38225283243a596d9326286cb2ee6f8a9711928a442475b201fef4d40256d3903867486d0 SHA512 eefa3be078437daca8622b0e150f58ac0e48b374d6203dc8dc8420e303f935064370c5b5752f4284fcb82cb4e9ecc2719d25a7a692465c4eeb8ac28fb4d6092c
 MISC metadata.xml 543 BLAKE2B 648353ce40bb4e93585e0f34b7bd7eba764b421ae9962835d2e00ae6e893e1b0c9f7e94e1e3548f098a57f5901840986784e5c7e163679b41f6475ff9ba190ce SHA512 e6850e1b5088298ad42f2a9ce5313a4c974562242ee77e7af5c53bcb91bddb1676a24690a14d67dbac911735aaef462d70019b6fb764e1e17556df29b0ac7e1b
diff --git a/dev-vcs/mercurial/files/python3.12.patch b/dev-vcs/mercurial/files/python3.12.patch
new file mode 100644
index 000000000000..ad0e5772739d
--- /dev/null
+++ b/dev-vcs/mercurial/files/python3.12.patch
@@ -0,0 +1,51 @@
+# HG changeset patch
+# User Julien Cristau <jcristau@debian.org>
+# Date 1721983948 -7200
+#      Fri Jul 26 10:52:28 2024 +0200
+# Branch stable
+# Node ID 63ede7a43a3731fecc7e5b535144c6bd59911284
+# Parent  e6508d1e0b47fb5437a36e1f5fe00dc032991b9b
+demandimport: don't delay threading import
+
+A recent cpython change breaks demandimport by importing threading
+locally in importlib.util.LazyLoader.exec_module; add it (plus warnings
+and _weakrefset, which are imported by threading) to demandimport's
+ignore list.
+
+```
+Traceback (most recent call last):
+  File "/usr/bin/hg", line 57, in <module>
+    from mercurial import dispatch
+  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
+  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
+  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
+  File "/usr/lib/python3/dist-packages/hgdemandimport/demandimportpy3.py", line 52, in exec_module
+    super().exec_module(module)
+  File "<frozen importlib.util>", line 257, in exec_module
+  File "<frozen importlib._bootstrap>", line 1360, in _find_and_load
+  File "<frozen importlib._bootstrap>", line 1331, in _find_and_load_unlocked
+  File "<frozen importlib._bootstrap>", line 935, in _load_unlocked
+  File "/usr/lib/python3/dist-packages/hgdemandimport/demandimportpy3.py", line 52, in exec_module
+    super().exec_module(module)
+  File "<frozen importlib.util>", line 267, in exec_module
+AttributeError: partially initialized module 'threading' has no attribute 'RLock' (most likely due to a circular import)
+```
+
+Ref: https://github.com/python/cpython/issues/117983
+     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076449
+     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076747
+
+diff --git a/hgdemandimport/__init__.py b/hgdemandimport/__init__.py
+--- a/hgdemandimport/__init__.py
++++ b/hgdemandimport/__init__.py
+@@ -58,6 +58,10 @@
+     # setuptools uses this hack to inject it's own distutils at import time
+     'setuptools',
+     '_distutils_hack.override',
++    # threading is locally imported by importlib.util.LazyLoader.exec_module
++    '_weakrefset',
++    'warnings',
++    'threading',
+ }
+ 
+ _pypy = '__pypy__' in sys.builtin_module_names
diff --git a/dev-vcs/mercurial/mercurial-6.5.3.ebuild b/dev-vcs/mercurial/mercurial-6.5.3-r1.ebuild
index 8c1137cfcd01..be2e9ed6132c 100644
--- a/dev-vcs/mercurial/mercurial-6.5.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.5.3-r1.ebuild
@@ -192,6 +192,8 @@ SITEFILE="70${PN}-gentoo.el"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}/python3.12.patch" )
+
 src_unpack() {
 	default_src_unpack
 	if use rust; then
diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2-r1.ebuild
index ed79e2235c03..f9b1e2544f31 100644
--- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.6.2-r1.ebuild
@@ -202,6 +202,8 @@ SITEFILE="70${PN}-gentoo.el"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}/python3.12.patch" )
+
 src_unpack() {
 	default_src_unpack
 	if use rust; then
diff --git a/dev-vcs/mercurial/mercurial-6.7.4.ebuild b/dev-vcs/mercurial/mercurial-6.7.4-r1.ebuild
index 6207efb0c49b..ffb9e0d727d7 100644
--- a/dev-vcs/mercurial/mercurial-6.7.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.7.4-r1.ebuild
@@ -213,6 +213,8 @@ SITEFILE="70${PN}-gentoo.el"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}/python3.12.patch" )
+
 src_unpack() {
 	default_src_unpack
 	if use rust; then