gentoo (valentine's day) resync : 14.02.2021

5 files changed, 228 insertions, 14 deletions

diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 869624124b6a..7a151aeb3db7 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,3 +1,7 @@
+AUX recommonmark-0.6.0-sphinx3-1.patch 3684 BLAKE2B 23692ee5c248f2ba72194dec9908c56df252aea2482e242b3541deca0e19d705d82949bab3b82a451d3926792bee3d4dd1a37da71850e1799e9f36035ce82564 SHA512 f774f143b23e51556551a75f13eb8da3e6f22bc223406bced4158e366accef637591e8b299ba0fe2565208ecb71ce44677c0cc29bd914721f1fd3d229b1cfc46
+AUX recommonmark-0.6.0-sphinx3-2.patch 2547 BLAKE2B 9bf1c55cfedef690a0377cb7ee59941e6d42bf464d073e578576b8e57dc9209e97811e0715089d8c8cf1fec27d32c63a180bc2c76eb1881530c6d84971392f43 SHA512 78ee5758d1fe3a805f3e40bb8e49d76155b56ff4f87910b084c9f18e0dd06559fcf91c55abea547537c02dead8ab029f77bf080c9c07e239b2dd0193aa1c619c
 DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
-EBUILD recommonmark-0.6.0.ebuild 952 BLAKE2B ee2284700599978f7bc4defdfa9168ec46a31322e506df667099b0173e429621c4d8ef41ffc172345aa6f3f98b292a89eb8d5d5c3c0bbdf39f021d4e5e70f37d SHA512 a0a4947020233f8fe686c683d017c157d0faa4a6f262a8a0cb381a4a807bd6ea1e9cb7653186210188dc74997e6ddd419825cac68c867360dfced777b38138ae
+DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
+EBUILD recommonmark-0.6.0-r1.ebuild 788 BLAKE2B 7eecb95b3802d0afbb47fc612fd6b7e7f5bedd5c4da7dd0b6ddccdb9d3f2ddebdbfa7228c9970205e103a4acec0035344f3007b34a056e4055bad7ba8dfddc85 SHA512 478d1740184172f09b6b3bc6d0e5985f9e2a4476a6dc80c455f9781390aef5b537bf588c04f725a4e807a9a90dab16d822a922dd57a94b82f236a64746d408ee
+EBUILD recommonmark-0.7.1.ebuild 795 BLAKE2B 314cd527d89f3e613ad147ff2a80e0315723253edfb95530a55c1fec704f2388350de0c706126fbc9b3095e79803456d76488f69e0adeb1bf4deb34e8e0c2587 SHA512 3a5c2262ae4a89356abc7a3d3480a0ca3e455e0a826071aedffaaaa13ad4076d7a3920ce5f9d244a67f4d949d8dc75f1ab02f6b924b5284318e8253368422862
 MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch
new file mode 100644
index 000000000000..f628630c2009
--- /dev/null
+++ b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch
@@ -0,0 +1,122 @@
+https://bugs.gentoo.org/723468#c4
+By Anon Emuss <abuslbea@centurylink.net>
+----
+Update tests for sphinx-3
+
+The deprecated source_parsers no longer works with sphinx-3.  Modify
+conf.py files to use the recommonmark extension, which sphinx supports.
+
+Tested and appears to work with sphinx-2.4.4 and sphinx-3.2.1.
+
+diff --git a/tests/sphinx_code_block/conf.py b/tests/sphinx_code_block/conf.py
+index 6b0140e..ddfafd5 100644
+--- a/tests/sphinx_code_block/conf.py
++++ b/tests/sphinx_code_block/conf.py
+@@ -1,11 +1,9 @@
+ 
+ # -*- coding: utf-8 -*-
+ 
+-from recommonmark.parser import CommonMarkParser
+-
+ templates_path = ['_templates']
+-source_suffix = '.md'
+-source_parsers = { '.md': CommonMarkParser }
++extensions = ['recommonmark']
++source_suffix = { '.md': 'markdown' }
+ master_doc = 'index'
+ project = u'sphinxproj'
+ copyright = u'2015, rtfd'
+diff --git a/tests/sphinx_custom_md/conf.py b/tests/sphinx_custom_md/conf.py
+index b29157b..9073346 100644
+--- a/tests/sphinx_custom_md/conf.py
++++ b/tests/sphinx_custom_md/conf.py
+@@ -1,12 +1,11 @@
+ 
+ # -*- coding: utf-8 -*-
+ 
+-from recommonmark.parser import CommonMarkParser
+ from recommonmark.transform import AutoStructify
+ 
+ templates_path = ['_templates']
+-source_suffix = '.markdown'
+-source_parsers = { '.markdown': CommonMarkParser }
++extensions = ['recommonmark']
++source_suffix = { '.markdown': 'markdown' }
+ master_doc = 'index'
+ project = u'sphinxproj'
+ copyright = u'2015, rtfd'
+diff --git a/tests/sphinx_generic/conf.py b/tests/sphinx_generic/conf.py
+index 6b0140e..ddfafd5 100644
+--- a/tests/sphinx_generic/conf.py
++++ b/tests/sphinx_generic/conf.py
+@@ -1,11 +1,9 @@
+ 
+ # -*- coding: utf-8 -*-
+ 
+-from recommonmark.parser import CommonMarkParser
+-
+ templates_path = ['_templates']
+-source_suffix = '.md'
+-source_parsers = { '.md': CommonMarkParser }
++extensions = ['recommonmark']
++source_suffix = { '.md': 'markdown' }
+ master_doc = 'index'
+ project = u'sphinxproj'
+ copyright = u'2015, rtfd'
+diff --git a/tests/sphinx_indented_code/conf.py b/tests/sphinx_indented_code/conf.py
+index f441071..90c5692 100644
+--- a/tests/sphinx_indented_code/conf.py
++++ b/tests/sphinx_indented_code/conf.py
+@@ -1,11 +1,9 @@
+ 
+ # -*- coding: utf-8 -*-
+ 
+-from recommonmark.parser import CommonMarkParser
+-
+ templates_path = ['_templates']
+-source_suffix = '.md'
+-source_parsers = { '.md': CommonMarkParser }
++extensions = ['recommonmark']
++source_suffix = { '.md': 'markdown' }
+ master_doc = 'index'
+ project = u'sphinxproj'
+ copyright = u'2015, rtfd'
+diff --git a/tests/sphinx_nested_header_block/conf.py b/tests/sphinx_nested_header_block/conf.py
+index 6b0140e..ddfafd5 100644
+--- a/tests/sphinx_nested_header_block/conf.py
++++ b/tests/sphinx_nested_header_block/conf.py
+@@ -1,11 +1,9 @@
+ 
+ # -*- coding: utf-8 -*-
+ 
+-from recommonmark.parser import CommonMarkParser
+-
+ templates_path = ['_templates']
+-source_suffix = '.md'
+-source_parsers = { '.md': CommonMarkParser }
++extensions = ['recommonmark']
++source_suffix = { '.md': 'markdown' }
+ master_doc = 'index'
+ project = u'sphinxproj'
+ copyright = u'2015, rtfd'
+diff --git a/tests/sphinx_xref/conf.py b/tests/sphinx_xref/conf.py
+index 443a026..acd840b 100644
+--- a/tests/sphinx_xref/conf.py
++++ b/tests/sphinx_xref/conf.py
+@@ -1,14 +1,11 @@
+ 
+ # -*- coding: utf-8 -*-
+ 
+-from recommonmark.parser import CommonMarkParser
+-
+-extensions = 'sphinx.ext.autosectionlabel']
++extensions = ['sphinx.ext.autosectionlabel', 'recommonmark']
+ autosectionlabel_prefix_document = True
+ 
+ templates_path = ['_templates']
+-source_suffix = '.md'
+-source_parsers = { '.md': CommonMarkParser }
++source_suffix = { '.md': 'markdown' }
+ master_doc = 'index'
+ project = u'sphinxproj'
+ copyright = u'2015, rtfd'
diff --git a/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch
new file mode 100644
index 000000000000..75d9b1c961cb
--- /dev/null
+++ b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/723468#c5
+By Anon Emuss <abuslbea@centurylink.net>
+----
+Fix minor HTML changes in tests
+
+Newer versions of sphinx now put <p> tags around various elements.
+Update the test_lists and CustomExtensionTests tests to expect that.
+Also do not expect a class="first" for the Contents in the
+CustomExtensionTests.
+
+Tested and appears to work with sphinx-2.4.4 and sphinx-3.2.1.
+
+diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py
+index 06078b1..8f4acb2 100644
+--- a/tests/test_sphinx.py
++++ b/tests/test_sphinx.py
+@@ -142,17 +142,17 @@ class GenericTests(SphinxIntegrationTests):
+         output = self.read_file('index.html')
+         self.assertIn(
+             ('<ul class="simple">\n'
+-             '<li>Item A</li>\n'
+-             '<li>Item B</li>\n'
+-             '<li>Item C</li>\n'
++             '<li><p>Item A</p></li>\n'
++             '<li><p>Item B</p></li>\n'
++             '<li><p>Item C</p></li>\n'
+              '</ul>'),
+             output
+         )
+         self.assertIn(
+             ('<ol class="simple">\n'
+-             '<li>Item 1</li>\n'
+-             '<li>Item 2</li>\n'
+-             '<li>Item 3</li>\n'
++             '<li><p>Item 1</p></li>\n'
++             '<li><p>Item 2</p></li>\n'
++             '<li><p>Item 3</p></li>\n'
+              '</ol>'),
+             output
+         )
+@@ -207,16 +207,17 @@ class CustomExtensionTests(SphinxIntegrationTests):
+     def test_integration(self):
+         output = self.read_file('index.html')
+         self.assertIn('<table ', output)
+-        self.assertIn('<th class="head">abc</th>', output)
+-        self.assertIn('<th class="head">data</th>', output)
++        self.assertIn('<th class="head"><p>abc</p></th>', output)
++        self.assertIn('<th class="head"><p>data</p></th>', output)
+         self.assertIn('</table>', output)
+ 
+         self.assertIn(
+             ('<div class="contents topic" id="contents">\n'
+-             '<p class="topic-title first">Contents</p>\n'
++             '<p class="topic-title">Contents</p>\n'
+              '<ul class="simple">\n'
+-             '<li><a class="reference internal" href="#header" id="id1">Header</a><ul>\n'
+-             '<li><a class="reference internal" href="#header-2" id="id2">Header 2</a></li>\n'
++             '<li><p><a class="reference internal" href="#header" id="id1">Header</a></p>\n'
++             '<ul>\n'
++             '<li><p><a class="reference internal" href="#header-2" id="id2">Header 2</a></p></li>\n'
+              '</ul>\n</li>\n</ul>'),
+             output
+             )
diff --git a/dev-python/recommonmark/recommonmark-0.6.0.ebuild b/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild
index 8fc040ab8a5c..87668d90b2ec 100644
--- a/dev-python/recommonmark/recommonmark-0.6.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -19,17 +19,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	<dev-python/sphinx-3[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
-
-src_prepare() {
-	# known broken with new sphinx
-	# https://github.com/readthedocs/recommonmark/issues/164
-	sed -e 's:test_lists:_&:' \
-		-e '/CustomExtensionTests/s:SphinxIntegrationTests:object:' \
-		-i tests/test_sphinx.py || die
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
+)
 
-	distutils-r1_src_prepare
-}
+distutils_enable_tests pytest
diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
new file mode 100644
index 000000000000..e9b2fe6b79ce
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
+)
+
+distutils_enable_tests pytest