dev-vcs/mercurial: version bumps

Closes: https://bugs.gentoo.org/830430
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Cédric Krier <cedk@gentoo.org>

3 files changed, 69 insertions, 1 deletions

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 1e2a4b7fef32..f45fea807a89 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -57,7 +57,7 @@ DIST memmap2-0.4.0.crate 19851 BLAKE2B 6bf418db7ad4af69121cc525be4ecb834c6ace06a
 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
 DIST mercurial-5.8.1.tar.gz 7988000 BLAKE2B 7805a7141a503f8533a25d0cfd3c58c421c966cb9ec83503c855e02aeb8a7fff98bf529f4807bf6fc5f606ae110c4a0571e0e249441bd4be6b5eefb07284958e SHA512 d17c809fc48c55d646b677ad23b5cf4a1755f5a81790988109cd50ac259acc230edad7bf5ccc7a6384a490aeba4a7492327bb9878a541d5fa7207e2c378be966
 DIST mercurial-5.8.tar.gz 7985326 BLAKE2B 3b64343b692c389368b9c61baf367fe739bb79a7b555308fcd4f09069472b393343f57608954017038c849d6812cd6fe5e1e20bbc6a95974d827d7e402c60bd7 SHA512 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
-DIST mercurial-6.0.1.tar.gz 8072365 BLAKE2B 45c510249580cb175e08096c84889d7f742933bc80321c834c45311e7a22d0867c324f4f02d69189bae828ddec7ebdfe2385b7dd621792c238eaa027b98bcd80 SHA512 dae18c38e7df001177867ed9cb1c9cea6f25fff6c23fd307c56c89bba0e4641d6cf993aabefe1fcb6ab99bd32732b858411f722bea839690fbc04c0a91c1dc53
+DIST mercurial-6.0.2.tar.gz 8089180 BLAKE2B 3141e20e844c451717c93c347bc30843d11b3f66fbea3808199ea3a18a992be0fdb8f8dabe0010e1f038cf797b6148b224e7d7cfb067c184bcfd4ca2060d9980 SHA512 1591618840a3e4b862f0eb9e560d511b59eb34815de2e6e6cc1179d32f88a1e9a6f14abf3e02d76e17dbab1ffe384e52d97721e39da252ac5ba98a2233853c9a
 DIST micro-timer-0.3.1.crate 3357 BLAKE2B 13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a SHA512 197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7
 DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B 148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa SHA512 9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
diff --git a/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch b/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch
new file mode 100644
index 000000000000..31dab2c0c0b2
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch
@@ -0,0 +1,64 @@
+# HG changeset patch
+# User Cédric Krier <ced@b2ck.com>
+# Date 1641731730 -3600
+#      Sun Jan 09 13:35:30 2022 +0100
+# Node ID 21c0ae0693bc048907b6e26a4fe160d1b7b48384
+# Parent  28f0092ec89f53ccf6d7b2b92dcaf8e1b02e8c13
+tests: support pygments 2.11 (issue6628)
+
+Differential Revision: https://phab.mercurial-scm.org/D11970
+
+diff --git a/tests/hghave.py b/tests/hghave.py
+--- a/tests/hghave.py
++++ b/tests/hghave.py
+@@ -663,6 +663,22 @@ def pygments25():
+     return (major, minor) >= (2, 5)
+ 
+ 
++@check("pygments211", "Pygments version >= 2.11")
++def pygments211():
++    try:
++        import pygments
++
++        v = pygments.__version__
++    except ImportError:
++        return False
++
++    parts = v.split(".")
++    major = int(parts[0])
++    minor = int(parts[1])
++
++    return (major, minor) >= (2, 11)
++
++
+ @check("outer-repo", "outer repo")
+ def has_outer_repo():
+     # failing for other reasons than 'no repo' imply that there is a repo
+diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
+--- a/tests/test-run-tests.t
++++ b/tests/test-run-tests.t
+@@ -176,14 +176,19 @@ test diff colorisation
+   running 1 tests using 1 parallel processes 
+   
+   \x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc)
+-  \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc)
++  \x1b[38;5;28m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (pygments211 !)
++  \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) (no-pygments211 !)
+   \x1b[38;5;90;01m@@ -1,4 +1,4 @@\x1b[39;00m (esc)
+-     $ echo "bar-baz"; echo "bar-bad"; echo foo
+-  \x1b[38;5;34m+  bar*baz (glob)\x1b[39m (esc)
+-     bar*bad (glob)
++  \x1b[38;5;250m \x1b[39m  $ echo "bar-baz"; echo "bar-bad"; echo foo (esc) (pygments211 !)
++     $ echo "bar-baz"; echo "bar-bad"; echo foo (no-pygments211 !)
++  \x1b[38;5;28m+  bar*baz (glob)\x1b[39m (esc) (pygments211 !)
++  \x1b[38;5;34m+  bar*baz (glob)\x1b[39m (esc) (no-pygments211 !)
++  \x1b[38;5;250m \x1b[39m  bar*bad (glob) (esc) (pygments211 !)
++     bar*bad (glob) (no-pygments211 !)
+   \x1b[38;5;124m-  bar*baz (glob)\x1b[39m (esc)
+   \x1b[38;5;124m-  | fo (re)\x1b[39m (esc)
+-  \x1b[38;5;34m+  foo\x1b[39m (esc)
++  \x1b[38;5;28m+  foo\x1b[39m (esc) (pygments211 !)
++  \x1b[38;5;34m+  foo\x1b[39m (esc) (no-pygments211 !)
+   
+   \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc)
+   !
diff --git a/dev-vcs/mercurial/mercurial-6.0.1.ebuild b/dev-vcs/mercurial/mercurial-6.0.2.ebuild
index 0f6e2e2856c6..2950dfdbe4ba 100644
--- a/dev-vcs/mercurial/mercurial-6.0.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.0.2.ebuild
@@ -149,6 +149,10 @@ DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 		dev-python/pygments[${PYTHON_USEDEP}]
 		)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-testing-pygments211.patch
+)
+
 SITEFILE="70${PN}-gentoo.el"
 
 RESTRICT="!test? ( test )"