From b83b16e0f6c963583f6323fe1bb12ecbd11d6f81 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Jul 2023 14:55:44 +0100 Subject: gentoo auto-resync : 24:07:2023 - 14:55:44 --- dev-python/docutils/Manifest | 3 - dev-python/docutils/docutils-0.17.1-r1.ebuild | 76 ------------ .../docutils/files/docutils-0.18.1-py311.patch | 135 --------------------- 3 files changed, 214 deletions(-) delete mode 100644 dev-python/docutils/docutils-0.17.1-r1.ebuild delete mode 100644 dev-python/docutils/files/docutils-0.18.1-py311.patch (limited to 'dev-python/docutils') diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest index 4ba7f7028c6c..c1107f20bc75 100644 --- a/dev-python/docutils/Manifest +++ b/dev-python/docutils/Manifest @@ -1,9 +1,6 @@ -AUX docutils-0.18.1-py311.patch 4637 BLAKE2B d103e5f4fa6b8c1ab06f2b07c33ee3f707f0c1224d9bfa6f57504c3f30177dcb46cb8ed32dcc03c413937a94212bc64a9963cc0cede766e50b81b1f73531fcef SHA512 7c7c97e150914ddc12948236f84314b3ce49d043a7e5245ae0defbbf1d0845a8e3b06ebd63fb466c92bc970305578243dc97103230d80a810fa3cd54528b70bd AUX docutils-0.19-pygments-2.14.patch 18917 BLAKE2B 889de063bfd6aae39512103c0da0d9e6bec108a59b9687ed1d2cfa650b541726bf215651dae8566e73c5c7beaff3911ba477a198640161ff1ee20d8cc49ffa27 SHA512 94941801590739dd760c5a5344481f99cf57c38776fc335643c7734f77a8c70e7408228149e3488a1b93f47ec57c54a419cf23cb3b2649b8246e0f8fc2e420e2 -DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5 DIST docutils-0.20.1.tar.gz 2058365 BLAKE2B 73fb8302599ffe57b0840c898b0b2e3ccd39ff9ea6eec2b5d345d02c950e1a8357bd821e62733b0484e82bc30e71d30fab381390b0edaef4375b02bcd9eeeb40 SHA512 a0ddca315d03677003036d6a8052ac96fbd3fcc4508564938ea684d79bedb4d322d83449c7b26e55b19b0aadd6e46ca9ac409bb16279a20f06c70e9c15ef5eb0 -EBUILD docutils-0.17.1-r1.ebuild 1726 BLAKE2B 843d40b5cbb2dc1c90bc4e996d3c4357be8f74aa6940d626c6af220858f7004ed7ab7b3c45d21ac1d94b84c4713db5419ee7edbba30f13e3edb457d9dda88119 SHA512 97597a4fb7921ebc3492625fd9e21e24bae738bf564ad2988351ae96ecd2d5b364ac4908b0feaf515919eaad314d2b20b881cb5fbc9c39c6eff214c85e1e471b EBUILD docutils-0.19.ebuild 1729 BLAKE2B 83518b007ed7f6fe5491ad883c6272ea93ee91a177271bb791f63cda6d5b7048d5b8981a734307f8926e41ffdde6c5bb328b1edc41ade6f2e543a5cb9b65c851 SHA512 120702a6a0d4d495c4f9367e11b6b8190352c007ffa8ce767a9f5284bcd366e462dc7e19427e208b1fa98418785de13d17b9bbe1530091cf7a6307611e0a9573 EBUILD docutils-0.20.1.ebuild 1672 BLAKE2B 2ce0b4edf3edcbda4571a50b7f5bc05fe813eae84169f02bf4eadb52a1c9cc76b313ddf63a8b025839d485f3c3d9b4b9c73dd848427c7351df4dbad0fdda2b52 SHA512 70edc01a9930c74ab11bc959e45307a5069c54b6a0ef0d0276ac9a63ce31b5d72f13244b4ba829bdc31839b2761b91305628d50f1e1fb9af81745443a1b0a0e1 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f diff --git a/dev-python/docutils/docutils-0.17.1-r1.ebuild b/dev-python/docutils/docutils-0.17.1-r1.ebuild deleted file mode 100644 index 4764ca403b5d..000000000000 --- a/dev-python/docutils/docutils-0.17.1-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)" -HOMEPAGE=" - https://docutils.sourceforge.io/ - https://pypi.org/project/docutils/ -" - -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -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. - - # 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/files/docutils-0.18.1-py311.patch b/dev-python/docutils/files/docutils-0.18.1-py311.patch deleted file mode 100644 index 878c6f1961db..000000000000 --- a/dev-python/docutils/files/docutils-0.18.1-py311.patch +++ /dev/null @@ -1,135 +0,0 @@ -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 = """\ -+ -+ -+ -+ 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 -- cgit v1.2.3