gentoo auto-resync : 02:04:2023 - 23:19:00

4 files changed, 0 insertions, 78 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f71c39901312..70a13f814152 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 4461e3ed05a9..4481e51763f5 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,7 +1,5 @@
 AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb5a867cfcc2c2301dcadd01c54745fca3504460c13546f6947677764c87a2e3f30c1949baa4da4c4fe402c SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
-AUX mercurial-5.8.1-testing-timeout.patch 494 BLAKE2B 010ab51a2bf4963ab8340052c5becee5a4ace471755b97e8d9409a9697a6697ac87bb2a5fc7556948a68f81bd3a78d17a7ec7523a70ca79848b5c175ff4f3515 SHA512 d4a8f05ebc2f8f44f9646fbaebee4f522cd271dcb4f72681fcb53df58b09fd031643dd5644aff80bda0480aaa21daf333245cb5d83d71941fa74d81858f8da33
-AUX mercurial-6.0.2-testing-pygments211.patch 2363 BLAKE2B ae098930f1f92ee851c2d3ec213f77e7da31b6e8a97ce3d04e6f13da719708ac70dc8851ff0079ff80ce81936277a131703ac1264cf5452d6fdbe2c28c882f9a SHA512 c50c76db08410c7006138d36c93d35dc7ec56b6846773d0b969c99f2303fc136beb86cc5105e453ddb4c8ec6ef0e3eebb419ed7b0cd0b0a1b21b26e75e6ee815
 AUX mercurial-6.3.2-setup-rust-makedirs.patch 988 BLAKE2B f05f8fa856674062b79a7d769ba72343384a80cdb3b2c3cac44eef22165e6ef27d4cca0bc986af81961ec3376e55d3c05bb35eafcc6c022f7ffe12b0c8b9fa0b SHA512 b7849db5ec83e06ce8f6bb86a9b8dd9eca949eb349077307d4b1d347b12ca9fba462cdb2661539186ea8951ae9cf08b7c0a233140eaf8bd07dd7f182a3ab78c1
 DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
diff --git a/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch b/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch
deleted file mode 100644
index 5c68835ccf75..000000000000
--- a/dev-vcs/mercurial/files/mercurial-5.8.1-testing-timeout.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mercurial/testing/__init__.py b/mercurial/testing/__init__.py
---- a/mercurial/testing/__init__.py
-+++ b/mercurial/testing/__init__.py
-@@ -25,7 +25,7 @@ def wait_file(path, timeout=10):
-     timeout *= _timeout_factor()
-     start = time.time()
-     while not os.path.exists(path):
--        if time.time() - start > timeout:
-+        if timeout and time.time() - start > timeout:
-             raise RuntimeError(b"timed out waiting for file: %s" % path)
-         time.sleep(0.01)
- 
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
deleted file mode 100644
index 31dab2c0c0b2..000000000000
--- a/dev-vcs/mercurial/files/mercurial-6.0.2-testing-pygments211.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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)
-   !