gentoo resync : 25.11.2020

5 files changed, 116 insertions, 15 deletions

diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 7d84dc2472ef..0b21cc63f283 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,8 @@
+AUX markdown-3.3-pygments-2.7.patch 4422 BLAKE2B cdc9c1520ae780299cdcbef675e12009bcd9626b306cfc49800df5998e8ddf90c354316c540c5a72d88f3c9b67c7bf58c81fdf850f841b34483a71de51f39779 SHA512 853431ab2f16ec89178008f8be4fc87e1da584283ac9ec9e0930140d10883e4f5d1a6f6c5c0da86759a404dc10e003076c06518e0ee3ec3bae51d228b9dde95b
 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
-EBUILD markdown-2.6.11.ebuild 853 BLAKE2B 6005ec084404b66a9a9ed697405cc44db07c784255aa207d7c133b90d73cc84903988826b4af8d7338824ddd5fb72906ec81f3dddc8cd7cb13e18544ce0177a9 SHA512 249822e2c5715a8dd1e04becad68faf6926077cf42e67197dcd550879f1453f61772bfd84c2b0ce05687f5a6c87d7a0f6ed9906c2ca4cbaf1b52673f22f158df
-EBUILD markdown-3.1.1-r1.ebuild 752 BLAKE2B 747fed1e747f1a2a9b5ea692cb824ce0450d3429337e65dc25a9596de75eccea7b0b863df61aae69bed8b43b8bb9c08d48ddd996e0ab899c7748c83517c6d0df SHA512 afc7de06c8798d33d1057fd0d2bf6e9427940b18201d25d5d577d7f9db9442c4696582e2eac75953526be7d1a8ac800d01bc8b11bab5f112300d300303fb8aa6
-EBUILD markdown-3.2.2.ebuild 1087 BLAKE2B 7058888df12ed02a3cf894c4dd0814b593a407c55ad24229f77d2554bfe252edfea06c6187063b933686d775a3272967778daca0219e5bb72ef2ef1ae01f102c SHA512 79cb2516a15f66614366d0c9246aa2968aa7457e51c2ad85f1907462c2c8cd1c2902729a37a2b64da7bb8d04ac2eef9f41ba17f9dc3cfd11c1ae16d76465c4b1
+DIST Markdown-3.3.1.tar.gz 317115 BLAKE2B 8c46dec8717cfdd03bd32b48071af042ca25508ca39d2a747a85d8c3044889d374b2f37ba6eba577c776c415d74c2f832810842faa19ff2febe596405a0a9157 SHA512 b1e53fe903612f8defbaf31f1f40a5ba4c58670ffb49cce8cf39fbe3a6445072520b7fe23eff594a8583a030b12d6295f124a13e4b58cad311d5d11ec699b4c6
+DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
+EBUILD markdown-2.6.11.ebuild 843 BLAKE2B 0152b3a4257139792a50a10fe8835d4b4b21bf3d452d9ade9d9094ad830fa4dea59f9e519297449aa5e42911ad219efcbce7f8bb08cd7fab717edd951fdf36b5 SHA512 3221f6253071760598e33c5c2483361308dd424e7504e05ebadd84be18fa789407d841a66e4aca3001a5a14c13d50395487e1ed646db397140cc703d0c8fdc61
+EBUILD markdown-3.3.1.ebuild 1086 BLAKE2B f854426f76d902c398021367f4322663cdd4d036f22a77dbc19487aff451925d701c203f3bea1bbc2ed281dba2c7b5919bd3e5ee6a0eed5505cb93b1f6a7ed77 SHA512 07be66953a44d4483c1e707f29964280a5026d85c0834a60e6c1b28d4a13a2ce982c739ad2cea9fa83c1fe9ef8b15c8067480657a1783c2a4e7c53f834ef4d58
+EBUILD markdown-3.3.3.ebuild 1094 BLAKE2B aa520fe7bb5602c2836aeee23cb375a7371f02488be90f32f062b2477d92275f5414037a411cc485dc78d802d94c3a5ad7722040988b73563d6b68d537aeedf4 SHA512 94b12d7579261f9add61edc8b8c7159ad503585daf15bcf73ff0a6426575ace017ecc803edcbde3e4e2396cf11bfaec0a44e8eaaf76c4e033cf85dc7b04acb3a
 MISC metadata.xml 410 BLAKE2B 933baa8eaf3a60970578ffa8490985e509403b0bc63e99e72da94e2bfc77f821c0df57b8d957a0a3dd1e0c521091aa6f63990a0a8023f04e85faeb8a8f3ae9de SHA512 a4cab000bc793355213d53d84ecb541001afa1b91b0f284d8083c2ac9218e12e7bd01f3eb39768a97cc7e8f214aeccfb9b3227eb8bd12c8649873028da629fe1
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-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index af9423e865d1..a1fe2b2f1761 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 python3_8 pypy3 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/markdown/markdown-3.2.2.ebuild b/dev-python/markdown/markdown-3.3.1.ebuild
index 10513178f132..195831f69fce 100644
--- a/dev-python/markdown/markdown-3.2.2.ebuild
+++ b/dev-python/markdown/markdown-3.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_tests pytest
+distutils_enable_tests unittest
 
 python_install_all() {
 	use doc && dodoc -r docs/
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.3.3.ebuild
index 36073784c3ad..be8ae2476b58 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.3.3.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
 DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
@@ -15,15 +14,27 @@ HOMEPAGE="
 	https://pypi.org/project/Markdown/
 	https://github.com/Python-Markdown/markdown"
 SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-
-IUSE="doc"
+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"
-RESTRICT="test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
 
-S="${WORKDIR}/${P^}"
+# 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}]
+	)"
+
+distutils_enable_tests unittest
 
 python_install_all() {
 	use doc && dodoc -r docs/