dev-python/markdown: Bump to 3.3

Signed-off-by: Michał Górny <mgorny@gentoo.org>

3 files changed, 137 insertions, 0 deletions

diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 55adf34a7a05..f365e761b8c8 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,3 +1,4 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
 DIST Markdown-3.2.2.tar.gz 299658 BLAKE2B c5a0337b6633ac3d795885d138ee3c078e36fdcacee659d8908ecdb839e0496c06ac8c721efd16183f03026ebf681e8382cdadd28d910abf5c021fdef9237e2a SHA512 72ce79b0daed4df2d09a458dad24da3e303143307640fb15d15cb10edc6c641d422dcf5043380c1572c4b9ed8f5fc11ec52e28928d8215d687309e4ce9ae3d7c
+DIST Markdown-3.3.tar.gz 315253 BLAKE2B 35fbe7f03b9261e1506bb5b2ebb19cfd37e6f1ad2ad6f5464b90c850bec642a5518a6470db640bbf6ded8b589bdfbd83bd0482724b6be6e89dba133d0122d721 SHA512 3f6e29b917135638fba703c3711c8f7baec544293a93bcf3554cad7dbd6a9678a49408c202e70f2cd41813f6a7ec0ff856e1c3888355b1321eb2801eb9552a1c
diff --git a/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch b/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch
new file mode 100644
index 000000000000..be94fe028755
--- /dev/null
+++ b/dev-python/markdown/files/markdown-3.3-pygments-2.7.patch
@@ -0,0 +1,89 @@
+From c2904eac1a6daf8a3aaef6af0791b101e1971544 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 7 Oct 2020 15:01:07 +0200
+Subject: [PATCH] Update tests for pygments-2.7.1
+
+Closes #1030
+---
+ .../extensions/test_code_hilite.py            | 22 +++++++++----------
+ .../extensions/test_fenced_code.py            |  2 +-
+ tox.ini                                       |  2 +-
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/tests/test_syntax/extensions/test_code_hilite.py b/tests/test_syntax/extensions/test_code_hilite.py
+index 8d5512d..3e36ae5 100644
+--- a/tests/test_syntax/extensions/test_code_hilite.py
++++ b/tests/test_syntax/extensions/test_code_hilite.py
+@@ -205,7 +205,7 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenos_inline(self):
+         if has_pygments:
+             expected = (
+-                '<div class="codehilite"><pre><span></span><code><span class="lineno">1 </span>plain text\n'
++                '<div class="codehilite"><pre><span></span><code><span class="linenos">1</span>plain text\n'
+                 '</code></pre></div>'
+             )
+         else:
+@@ -259,7 +259,7 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenostart(self):
+         if has_pygments:
+             expected = (
+-                '<div class="codehilite"><pre><span></span><code><span class="lineno">42 </span>plain text\n'
++                '<div class="codehilite"><pre><span></span><code><span class="linenos">42</span>plain text\n'
+                 '</code></pre></div>'
+             )
+         else:
+@@ -274,9 +274,9 @@ class TestCodeHiliteClass(TestCase):
+         if has_pygments:
+             expected = (
+                 '<div class="codehilite"><pre><span></span><code>'
+-                '<span class="lineno">1 </span><span class="hll">line 1\n'
+-                '</span><span class="lineno">2 </span>line 2\n'
+-                '<span class="lineno">3 </span><span class="hll">line 3\n'
++                '<span class="linenos">1</span><span class="hll">line 1\n'
++                '</span><span class="linenos">2</span>line 2\n'
++                '<span class="linenos">3</span><span class="hll">line 3\n'
+                 '</span></code></pre></div>'
+             )
+         else:
+@@ -291,9 +291,9 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenos_linenostep(self):
+         if has_pygments:
+             expected = (
+-                '<div class="codehilite"><pre><span></span><code><span class="lineno">  </span>line 1\n'
+-                '<span class="lineno">2 </span>line 2\n'
+-                '<span class="lineno">  </span>line 3\n'
++                '<div class="codehilite"><pre><span></span><code><span class="linenos"> </span>line 1\n'
++                '<span class="linenos">2</span>line 2\n'
++                '<span class="linenos"> </span>line 3\n'
+                 '</code></pre></div>'
+             )
+         else:
+@@ -308,9 +308,9 @@ class TestCodeHiliteClass(TestCase):
+     def test_codehilite_linenos_linenospecial(self):
+         if has_pygments:
+             expected = (
+-                '<div class="codehilite"><pre><span></span><code><span class="lineno">1 </span>line 1\n'
+-                '<span class="lineno special">2 </span>line 2\n'
+-                '<span class="lineno">3 </span>line 3\n'
++                '<div class="codehilite"><pre><span></span><code><span class="linenos">1</span>line 1\n'
++                '<span class="linenos special">2</span>line 2\n'
++                '<span class="linenos">3</span>line 3\n'
+                 '</code></pre></div>'
+             )
+         else:
+diff --git a/tests/test_syntax/extensions/test_fenced_code.py b/tests/test_syntax/extensions/test_fenced_code.py
+index e5de0b7..8fa75f7 100644
+--- a/tests/test_syntax/extensions/test_fenced_code.py
++++ b/tests/test_syntax/extensions/test_fenced_code.py
+@@ -629,7 +629,7 @@ class TestFencedCode(TestCase):
+         if self.has_pygments:
+             expected = (
+                 '<div class="python codehilite" style="background: #f8f8f8">'
+-                '<pre style="line-height: 125%"><span></span><code>'
++                '<pre style="line-height: 125%; margin: 0;"><span></span><code>'
+                 '<span style="color: #408080; font-style: italic"># Some python code</span>\n'
+                 '</code></pre></div>'
+             )
+-- 
+2.28.0
+
diff --git a/dev-python/markdown/markdown-3.3.ebuild b/dev-python/markdown/markdown-3.3.ebuild
new file mode 100644
index 000000000000..4d10f26b4526
--- /dev/null
+++ b/dev-python/markdown/markdown-3.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	https://python-markdown.github.io/
+	https://pypi.org/project/Markdown/
+	https://github.com/Python-Markdown/markdown"
+SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+# importlib_metadata is only necessary for <python:3.8 according to setup.py
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+"
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/markdown-3.3-pygments-2.7.patch
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && dodoc -r docs/
+
+	distutils-r1_python_install_all
+}