gentoo resync : 29.12.2022

5 files changed, 31 insertions, 103 deletions

diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index a5d29f3d810d..401305f9b5b0 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,8 +1,5 @@
-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
-DIST MyST-Parser-0.17.1.gh.tar.gz 877466 BLAKE2B 79f2e03f07ad0887318e4d38745b7bbcfba5ffcb8a56a689489e2202c151702c3b1200607c7f8a0bb29b276c6ab74c201dd819a93a5b1dcfce556bf2bc38ffe1 SHA512 8b149f35d83285d54ad5e6c530eded9c9c838e65f5971c0c0fd5c1be55f365eca9d2c2871fa3c176daa58a7d7498fe06df747818c46f9fefcf9641db3286817d
 DIST MyST-Parser-0.17.2.gh.tar.gz 878600 BLAKE2B 0c5b9dd5aa1e1e54706c1a04770fac33f8b2233164f2462a27dccdd405592dde4d41ab986632a2903aa26a6e7ae942e0ad54103c48f0829d410b080facb061a8 SHA512 625894686093266af03ef2cf01cd3dc2fea80c933479d6df3a4b99a103f17e8afd7120fe7a56ef21bdc8aa33569741a675caf4a7e1ed6ddbe3facae19b3c222a
-EBUILD myst_parser-0.17.0.ebuild 1376 BLAKE2B 4e7eaa3c4c07795b2ce7278dd3ac1a12ac097c06cfaeaff2be7db417a4532c92128e72809324fb621cbea5e0534d32f6705e70b55b0c33dde097999ce5ca3ab6 SHA512 9714196c4dd0ff376fffeadbc9599c17433f0e687f06b4d3d8be23aefbdf20ea8de31939359d754458d3c4f633b3203b3d8e426f38cd7d94bc57a67da0660994
-EBUILD myst_parser-0.17.1.ebuild 1314 BLAKE2B 8d3662daf3255794bbf8e12ac39100e8a8dfa8160e2068277b035791cee2584d9afb33ca8a9053401628d8c2fc6ce0fb00b89044e8603504e428c897920e2e89 SHA512 6b2a56527693d48635f449afb183d567449939b8f26fe4dda266e0010018b268ad02cc024e784f45187921d8bb3dd14223f14145f86766ea3f81a57398d028b3
-EBUILD myst_parser-0.17.2.ebuild 1315 BLAKE2B 241f3bd442cd9f9fb4922a5c6a5fc836e7703a38a0a815b01e14d0efefd25223fa0e185f728e4927f3294534974bb778c591c0c3c793fda8eeb900199be4c8b0 SHA512 976e71e53b81a6ff173a9d7a48fb98c3b83c03f1823a33ccd80b62076df86949a0eafc770f941ebac8988eca3e079c9722a4310b85e36f99b768dbde4f20231d
+DIST MyST-Parser-0.18.0.gh.tar.gz 768448 BLAKE2B efb5d1907b5779b1816f1cc4fd5ede9543cf246e4029f4bf6d763a8aacdf54b5c8c5efa2fea61de4bf257f5979871409ee907b3349cdb4f099ac689131d0805a SHA512 919494467de3f0cd97c9c8062626b88c22fd0596e120b7ca117b8bce18d9fad9faf06a36e4c5bd8a4dad838c888524c780beceaf3e7acb42232bd3c903fabc3f
+EBUILD myst_parser-0.17.2.ebuild 1307 BLAKE2B 0b16429855acefc1bca9c867c20f5f03b6125d2df0083d25c30fac7e503daa08cd9a7aab1fa4da0eb70441d4b9be4580a273a3c54f2618ad1d46aa379ed44c16 SHA512 d6c780e2078bef21d367bbfbec9c544ab0c9bb853018dc7e560f99b95e32642373cf0f78a9ad95220dc9355f55ddb13dafeb138024f8c431a2491ae279468ed4
+EBUILD myst_parser-0.18.0.ebuild 1622 BLAKE2B 5b8049fd918f20c8d164bfc78428e25db0253fc67814bd6a81dad529aa53778e208a31c1d404ec50bf8cfcdf9af3c541d19d3d1a51861734d8ccd5760e34c9af SHA512 79cf43f33189615ee9e989cc0f261b9437c4ee068486b981042e16b4141819191eb88c023a9806f6d39f206f938945b041fa0dcec38b89d14e99e12b99b5a237
 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
deleted file mode 100644
index 2363ac639c60..000000000000
--- a/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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.17.0.ebuild b/dev-python/myst_parser/myst_parser-0.17.0.ebuild
deleted file mode 100644
index e2a7f33c4954..000000000000
--- a/dev-python/myst_parser/myst_parser-0.17.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-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/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-	)
-"
-
-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
diff --git a/dev-python/myst_parser/myst_parser-0.17.2.ebuild b/dev-python/myst_parser/myst_parser-0.17.2.ebuild
index b52f2822628f..89a18be3805b 100644
--- a/dev-python/myst_parser/myst_parser-0.17.2.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.17.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
diff --git a/dev-python/myst_parser/myst_parser-0.17.1.ebuild b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
index 765e019e6eee..784cb08154fd 100644
--- a/dev-python/myst_parser/myst_parser-0.17.1.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
@@ -4,12 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 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"
+HOMEPAGE="
+	https://github.com/executablebooks/MyST-Parser/
+	https://pypi.org/project/myst-parser/
+"
 SRC_URI="
 	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
 		-> ${MY_P}.gh.tar.gz
@@ -18,15 +22,16 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv"
 
 RDEPEND="
-	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/markdown-it-py[${PYTHON_USEDEP}]
 	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-5[${PYTHON_USEDEP}]
+	<dev-python/sphinx-6[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -34,13 +39,23 @@ BDEPEND="
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 		dev-python/pytest-regressions[${PYTHON_USEDEP}]
 		dev-python/pytest-param-files[${PYTHON_USEDEP}]
+		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
 	)
 "
 
-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
+
+python_test() {
+	local 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
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# bad test relying on exact exception messages
+		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
+	)
+
+	epytest
+}