gentoo resync : 29.12.2022

6 files changed, 173 insertions, 158 deletions

diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 8f3d605664e9..fa1bcf3a8974 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,6 @@
-AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
-DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
+AUX docutils-0.18.1-py311.patch 4637 BLAKE2B d103e5f4fa6b8c1ab06f2b07c33ee3f707f0c1224d9bfa6f57504c3f30177dcb46cb8ed32dcc03c413937a94212bc64a9963cc0cede766e50b81b1f73531fcef SHA512 7c7c97e150914ddc12948236f84314b3ce49d043a7e5245ae0defbbf1d0845a8e3b06ebd63fb466c92bc970305578243dc97103230d80a810fa3cd54528b70bd
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
-EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
-EBUILD docutils-0.17.1.ebuild 1755 BLAKE2B 80aedacfe801d0843e922db5c43cf0e0f2c3072c1340dae848c91cb3e152c645996eb472c5684bf7fdafbd00a70983a5c7b2c823657cc51dc79402d01fba3d57 SHA512 d668880f53ec2f3f3e449ce49851ad1b3f3f37d5cf2261caf5a1771ad078d1ee0da054a7cd3bbe9d7647bfaee45c778b0ecef3e65168bdf198e27c59f0d29e82
-EBUILD docutils-0.18.1.ebuild 1755 BLAKE2B 880ab3f863af75a8531b5b5d3f48beaa9eb09b011ce2c6e2fee496f8b160a8281ba486ed020c70ffc28ededa00dc6b0d195ab65b4a47543df34ca0f6723e5429 SHA512 ee54df064180c08ff4bba0583088e63cba7b802f706e04575952ae23d71ed9164ac23fd661864a3d7d97bcf437de38c2632b181c8cf45174effcfd1af469d4b8
+EBUILD docutils-0.17.1-r1.ebuild 1830 BLAKE2B d13ba2e4998192d440e02fa4832ce67862d01b3731db0eb10f0c8df1a1403e5e356487d56599ef56cd154cc24ec37ac5dfaf6d9eec7b9aa429e54d5fc8ba4c3e SHA512 6cc1a8a27d9bcd575f9b9ab92629869583a28ac78592d47257bec360169987aea1a3a9d167f72e0ba6c38cd0868ca109ec8f0da739823b1ae24b923ff19e9215
+EBUILD docutils-0.18.1-r1.ebuild 1819 BLAKE2B 3a9611e2f5d592d762eeae1b72ab8fa364f0c0fef173d8c93a8bc6f5959d43fb4b2cd28d6d29ec8da3a096e3e0b6684d96b442070c97d044637d5a82eb6f7cbd SHA512 b36683561ef5367b0e1937693b14a867408b4d051b6a6680804c8c748da8f6c0369013a4aa5de40797fdf306f72490edc5219dd41fa5f0bbc8920d6d0945ec6b
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
deleted file mode 100644
index 3e297d6f7519..000000000000
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.17.1.ebuild b/dev-python/docutils/docutils-0.17.1-r1.ebuild
index 4f20978f653a..388cb8be2276 100644
--- a/dev-python/docutils/docutils-0.17.1.ebuild
+++ b/dev-python/docutils/docutils-0.17.1-r1.ebuild
@@ -1,24 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
+HOMEPAGE="
+	https://docutils.sourceforge.io/
+	https://pypi.org/project/docutils/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/docutils-0.18.1-py311.patch"
+)
 
 python_compile_all() {
 	# Generate html docs from reStructured text sources.
diff --git a/dev-python/docutils/docutils-0.18.1.ebuild b/dev-python/docutils/docutils-0.18.1-r1.ebuild
index ec09fc9ea24c..d916deb851d3 100644
--- a/dev-python/docutils/docutils-0.18.1.ebuild
+++ b/dev-python/docutils/docutils-0.18.1-r1.ebuild
@@ -3,22 +3,32 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
+HOMEPAGE="
+	https://docutils.sourceforge.io/
+	https://pypi.org/project/docutils/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
 
 python_compile_all() {
 	# Generate html docs from reStructured text sources.
diff --git a/dev-python/docutils/files/docutils-0.16-tests.patch b/dev-python/docutils/files/docutils-0.16-tests.patch
deleted file mode 100644
index 052578c727a4..000000000000
--- a/dev-python/docutils/files/docutils-0.16-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: docutils/test/test_parsers/test_rst/test_directives/test_code.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_code.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_code.py	(working copy)
-@@ -107,7 +107,7 @@
- <document source="test data">
-     <literal_block classes="code python testclass" xml:space="preserve">
-          \n\
--        <inline classes="keyword">
-+        <inline classes="name builtin">
-             print
-         <inline classes="punctuation">
-             (
-@@ -167,7 +167,7 @@
-         <inline classes="ln">
-             12 \n\
-             \n\
--        <inline classes="keyword">
-+        <inline classes="name builtin">
-             print
-         <inline classes="punctuation">
-             (
-Index: docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_code_long.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_code_long.py	(working copy)
-@@ -69,7 +69,7 @@
-         <inline classes="ln">
-             12 \n\
-             \n\
--        <inline classes="keyword">
-+        <inline classes="name builtin">
-             print
-         <inline classes="punctuation">
-             (
-Index: docutils/test/test_parsers/test_rst/test_directives/test_tables.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_tables.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_tables.py	(working copy)
-@@ -45,10 +45,11 @@
- # some error messages changed in Python 3.3, CPython has backported to 2.7.4,
- # PyPy has not
- csv_eod_error_str = 'unexpected end of data'
--if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
-+if sys.version_info < (2,7,4) or (platform.python_implementation() == 'PyPy'
-+                                  and sys.version_info < (3,0)):
-     csv_eod_error_str = 'newline inside string'
- # pypy adds a line number
--if sys.version_info >= (3, 0) and platform.python_implementation() == 'PyPy':
-+if platform.python_implementation() == 'PyPy':
-     csv_eod_error_str = 'line 1: ' + csv_eod_error_str
- csv_unknown_url = "'bogus.csv'"
- if sys.version_info < (3, 0):
-Index: docutils/test/test_parsers/test_rst/test_interpreted.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_interpreted.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_interpreted.py	(working copy)
-@@ -283,7 +283,7 @@
-     <paragraph>
-         Python code \n\
-         <literal classes="code testclass python">
--            <inline classes="keyword">
-+            <inline classes="name builtin">
-                 print
-             <inline classes="punctuation">
-                 (
diff --git a/dev-python/docutils/files/docutils-0.18.1-py311.patch b/dev-python/docutils/files/docutils-0.18.1-py311.patch
new file mode 100644
index 000000000000..878c6f1961db
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.18.1-py311.patch
@@ -0,0 +1,135 @@
+Combination of:
+http://svn.code.sf.net/p/docutils/code/trunk@8910
+http://svn.code.sf.net/p/docutils/code/trunk@8909
+
+diff --git a/test/DocutilsTestSupport.py b/test/DocutilsTestSupport.py
+index 592d3f9df..e1f33aa7a 100644
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -819,6 +819,7 @@ def exception_data(func, *args, **kwds):
+     except Exception as detail:
+         return (detail, detail.args,
+                 '%s: %s' % (detail.__class__.__name__, detail))
++    return None, [], "No exception"
+ 
+ 
+ def _format_str(*args):
+diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
+index 07be0122f..73724ed7e 100755
+--- a/test/test_parsers/test_rst/test_directives/test_tables.py
++++ b/test/test_parsers/test_rst/test_directives/test_tables.py
+@@ -65,6 +65,92 @@ def null_bytes():
+     next(reader)
+ 
+ null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes)[0]
++# Null bytes are valid in Python 3.11+:
++if null_bytes_exception is None:
++    bad_encoding_result = """\
++<document source="test data">
++    <table>
++        <title>
++            bad encoding
++        <tgroup cols="4">
++            <colspec colwidth="25">
++            <colspec colwidth="25">
++            <colspec colwidth="25">
++            <colspec colwidth="25">
++            <tbody>
++                <row>
++                    <entry>
++                        <paragraph>
++                            \xfe\xff"Treat"
++                    <entry>
++                        <paragraph>
++                            "Quantity"
++                    <entry>
++                        <paragraph>
++                            "Description"
++                    <entry>
++                <row>
++                    <entry>
++                        <paragraph>
++                            "Albatr\u00b0\u00df"
++                    <entry>
++                        <paragraph>
++                            2.99
++                    <entry>
++                        <paragraph>
++                            "\u00a1Ona\x03\xc3\x03\xc4\x03\xb9\x03\xba!"
++                    <entry>
++                <row>
++                    <entry>
++                        <paragraph>
++                            "CrunchyFrog"
++                    <entry>
++                        <paragraph>
++                            1.49
++                    <entry>
++                        <paragraph>
++                            "Ifwetooktheb\u00f6nesout
++                    <entry>
++                        <paragraph>
++                            itwouldn\x20\x19tbe
++                <row>
++                    <entry>
++                        <paragraph>
++                            crunchy
++                    <entry>
++                        <paragraph>
++                            nowwouldit?"
++                    <entry>
++                    <entry>
++                <row>
++                    <entry>
++                        <paragraph>
++                            "GannetRipple"
++                    <entry>
++                        <paragraph>
++                            1.99
++                    <entry>
++                        <paragraph>
++                            "\xbfOna\x03\xc3\x03\xc4\x03\xb9\x03\xba?"
++                    <entry>
++    <paragraph>
++        (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
++"""
++else:
++    bad_encoding_result = """\
++<document source="test data">
++    <system_message level="3" line="1" source="test data" type="ERROR">
++        <paragraph>
++            Error with CSV data in "csv-table" directive:
++            %s
++        <literal_block xml:space="preserve">
++            .. csv-table:: bad encoding
++               :file: %s
++               :encoding: latin-1
++    <paragraph>
++        (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
++""" % (null_bytes_exception, utf_16_csv)
++
+ 
+ totest = {}
+ 
+@@ -1031,19 +1117,8 @@ u"""\
+ 
+ (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+ """ % utf_16_csv,
+-"""\
+-<document source="test data">
+-    <system_message level="3" line="1" source="test data" type="ERROR">
+-        <paragraph>
+-            Error with CSV data in "csv-table" directive:
+-            %s
+-        <literal_block xml:space="preserve">
+-            .. csv-table:: bad encoding
+-               :file: %s
+-               :encoding: latin-1
+-    <paragraph>
+-        (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+-""" % (null_bytes_exception, utf_16_csv)],
++bad_encoding_result
++],
+ ["""\
+ .. csv-table:: good encoding
+    :file: %s