[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/files/

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/files/

[Aaron Bauman]

commit:     528ba58a5a77db2a1adeacbca7602bcb0c2d345f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 13:01:10 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 16:39:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528ba58a

dev-vcs/mercurial: remove unused patches

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16254
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../mercurial/files/mercurial-3.0.1-po_fixes.patch | 40 ----------------------
 .../files/mercurial-4.8.1-unbundle_zstd.patch      | 15 --------
 2 files changed, 55 deletions(-)

diff --git a/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch b/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch
deleted file mode 100644
index a48932ee9fe..00000000000
--- a/dev-vcs/mercurial/files/mercurial-3.0.1-po_fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- mercurial-3.0.1/i18n/el.po
-+++ mercurial-3.0.1/i18n/el.po
-@@ -11,6 +11,7 @@
- "PO-Revision-Date: 2009-12-02 03:23+0200\n"
- "Last-Translator: <keramida@ceid.upatras.gr>\n"
- "Language-Team: Greek\n"
-+"Language: el\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- mercurial-3.0.1/i18n/fr.po
-+++ mercurial-3.0.1/i18n/fr.po
-@@ -90,6 +90,7 @@
- "PO-Revision-Date: 2009-10-25 12:43+0100\n"
- "Last-Translator: Cedric Duval <cedricduval@free.fr>\n"
- "Language-Team: French\n"
-+"Language: fr\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- mercurial-3.0.1/i18n/ro.po
-+++ mercurial-3.0.1/i18n/ro.po
-@@ -110,6 +110,7 @@
- "PO-Revision-Date: 2011-06-08 17:00+0200\n"
- "Last-Translator: Daniel Dumitriu <daniel.dumitriu@gmail.com>\n"
- "Language-Team: Romanian <>\n"
-+"Language: ro\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- mercurial-3.0.1/i18n/zh_CN.po
-+++ mercurial-3.0.1/i18n/zh_CN.po
-@@ -51,6 +51,7 @@
- "PO-Revision-Date: 2009-03-31 20:38+0200\n"
- "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
- "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n"
-+"Language: zh_CN\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"

diff --git a/dev-vcs/mercurial/files/mercurial-4.8.1-unbundle_zstd.patch b/dev-vcs/mercurial/files/mercurial-4.8.1-unbundle_zstd.patch
deleted file mode 100644
index 075645b2845..00000000000
--- a/dev-vcs/mercurial/files/mercurial-4.8.1-unbundle_zstd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mercurial-4.8.1/setup.py
-+++ mercurial-4.8.1/setup.py
-@@ -983,12 +983,6 @@
-               ['hgext/fsmonitor/pywatchman/bser.c']),
-     ]
- 
--sys.path.insert(0, 'contrib/python-zstandard')
--import setup_zstd
--extmodules.append(setup_zstd.get_c_extension(
--    name='mercurial.zstd',
--    root=os.path.abspath(os.path.dirname(__file__))))
--
- try:
-     from distutils import cygwinccompiler
- 

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/files/

[Conrad Kostecki]

commit:     321152e0505a7a008434fc90584156ed687eadee
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Apr  2 19:15:02 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 21:12:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321152e0

dev-vcs/mercurial: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30448
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/mercurial-5.8.1-testing-timeout.patch    | 12 ----
 .../mercurial-6.0.2-testing-pygments211.patch      | 64 ----------------------
 2 files changed, 76 deletions(-)

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)
-   !

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/files/

[Conrad Kostecki]

commit:     42c39dc5349f0e9d612c9d06bc8eeda2cc0ab28f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:06:20 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c39dc5

dev-vcs/mercurial: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../mercurial-6.3.2-setup-rust-makedirs.patch      | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/dev-vcs/mercurial/files/mercurial-6.3.2-setup-rust-makedirs.patch b/dev-vcs/mercurial/files/mercurial-6.3.2-setup-rust-makedirs.patch
deleted file mode 100644
index d2082ec6cd24..000000000000
--- a/dev-vcs/mercurial/files/mercurial-6.3.2-setup-rust-makedirs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Cédric Krier <ced@b2ck.com>
-# Date 1674932937 -3600
-#      Sat Jan 28 20:08:57 2023 +0100
-# Node ID 65a97b8b1268169fecc21749b7472fd155bfb399
-# Parent  a1123772333204cbeb766b17de8089a1d13d4a68
-# EXP-Topic setup-rust-build-makedirs-target
-Ensure target directory exists with building rust extension
-
-When the rust extension is the first to be build, the target directory may not
-exist so the copy fails.
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -1454,11 +1454,13 @@ class RustStandaloneExtension(RustExtens
-         target = [target_dir]
-         target.extend(self.name.split('.'))
-         target[-1] += DYLIB_SUFFIX
-+        target = os.path.join(*target)
-+        os.makedirs(os.path.dirname(target), exist_ok=True)
-         shutil.copy2(
-             os.path.join(
-                 self.rusttargetdir, self.dylibname + self.rustdylibsuffix()
-             ),
--            os.path.join(*target),
-+            target,
-         )
- 
-