gentoo resync : 20.03.2022

3 files changed, 47 insertions, 11 deletions

diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index 98ed44b664e6..83dfb11dfb1c 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,3 +1,4 @@
-DIST myst_parser-0.16.1_p20220119.gh.tar.gz 876622 BLAKE2B 4cac39ec9935a1f97d5f1484eed3fcfe6d2ff5013290ea93c1fc6f9894c363d83ddaf9af5f088ba5e1284bb1f28c2e0b4cf935860c5641953baaae39c5f6bdbe SHA512 a9460501651d598bb9ed3d108a47ef27554cf7a52589a0ef8ddcb1fa2b94a25bb24cb8b51a9a367b58eef5c6d8d96f8170ad924f105d5dffe9bc4f6557e701c7
-EBUILD myst_parser-0.16.1_p20220119.ebuild 1407 BLAKE2B 7f4072641f337be2ef625187f516c40c3b937a1a4ca2229bbc917f042ab060373139df41d725730b0fe5e88aad1734cba19f7c6181ecb4304805d45d149a9490 SHA512 5fa6c3f9a6ded3c2229520b498149b75e0818ca56f709ce427b9596c01312cde6aaebdd999bf64c975d3d59a049671d278b9d74ad16599976b500b32ad433575
+AUX myst_parser-0.17.0-32-bit-test-fix.patch 1273 BLAKE2B d1d46785f723a61bdeb6e4fa62b2d61aebc4e525128b488c749956708f5b51e23ae265d6811d4ced35a4b10e8565abb9358518dd27ed6b494706bf8ad1bf5ae7 SHA512 315e9b82a13bf599313e431d57b75308689a7ba649d8eec08c0bf489691399badab68ca449ca0c5d2fff96f96bd8e4ce8d18880781ddb9d0e393fa05cd515c51
+DIST MyST-Parser-0.17.0.gh.tar.gz 877372 BLAKE2B 00dea98fa9cd8770480047a824e18a903098600dd52cea427e1cf3a4ff0a4930502967e136a3c6e9ccb4a7f6c54c8c4c8f9c5bfc701e1b24a0006b867f8ce74a SHA512 e9f4ea05ab55b0979b26f0211603aee0835a30fb37a0ca23f23b96e0b47670b6b8e443ee9759df5011d009e20d817eaffd4066c4be4920f96786c283aa206239
+EBUILD myst_parser-0.17.0.ebuild 1378 BLAKE2B 930e6ba489b1f4236beaceb06871db16ea6e0892b6187d79060787ca552ff9e63d41685f8edc519218a47481c1e24d18c24004ee33196e91e17f067dd7eddcf2 SHA512 3dffd5d489890a05279026eb8228d94eee22f2f5e32782aa81b33a20775ded34ae9e2c8466e99551ea4eba7a7cb009b540c82607d341591698803ff7d43132ff
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch b/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch
new file mode 100644
index 000000000000..2363ac639c60
--- /dev/null
+++ b/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch
@@ -0,0 +1,33 @@
+https://github.com/executablebooks/MyST-Parser/pull/523
+https://bugs.gentoo.org/832823
+
+From 84b0223eace0a1022935f2766da6c930181503e4 Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefano@rivera.za.net>
+Date: Sat, 19 Feb 2022 14:57:58 -0400
+Subject: [PATCH] Massage test output on 32-bit systems to match 64-bit systems
+
+Fixes test_sphinx_directives[35-highlight (sphinx.directives.code.Highlight):]
+which was failing on 32-bit platforms due to linenothreshold defaulting
+to sys.maxsize.
+
+Fixes: #522
+--- a/tests/test_renderers/test_fixtures_sphinx.py
++++ b/tests/test_renderers/test_fixtures_sphinx.py
+@@ -3,6 +3,7 @@
+ Note, the output AST is before any transforms are applied.
+ """
+ import re
++import sys
+ from pathlib import Path
+ 
+ import pytest
+@@ -50,6 +51,9 @@ def test_sphinx_directives(file_params):
+     document = to_docutils(file_params.content, in_sphinx_env=True).pformat()
+     # see https://github.com/sphinx-doc/sphinx/issues/9827
+     document = document.replace('<glossary sorted="False">', "<glossary>")
++    # see https://github.com/executablebooks/MyST-Parser/issues/522
++    if sys.maxsize == 2147483647:
++        document = document.replace('"2147483647"', '"9223372036854775807"')
+     file_params.assert_expected(document, rstrip_lines=True)
+ 
+ 
diff --git a/dev-python/myst_parser/myst_parser-0.16.1_p20220119.ebuild b/dev-python/myst_parser/myst_parser-0.17.0.ebuild
index 3b464949b36f..bc4b72e42a42 100644
--- a/dev-python/myst_parser/myst_parser-0.16.1_p20220119.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.17.0.ebuild
@@ -5,23 +5,21 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
 
-# one time use of snapshot for some changes from master
-# next bump, just use github tarballs for tests
-COMMIT="7654462dc8521c0090478efa4dcfba6227e97a84"
+inherit distutils-r1
 
+MY_P=MyST-Parser-${PV}
 DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
 HOMEPAGE="https://pypi.org/project/myst-parser/ https://github.com/executablebooks/MyST-Parser"
 SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
+	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
-S="${WORKDIR}/MyST-Parser-${COMMIT}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
@@ -40,10 +38,14 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.17.0-32-bit-test-fix.patch
+)
 
 EPYTEST_DESELECT=(
 	# Unimportant tests needing a new dep linkify
 	tests/test_renderers/test_myst_config.py::test_cmdline
 	tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
 )
+
+distutils_enable_tests pytest