gentoo resync : 15.12.2019

3 files changed, 116 insertions, 0 deletions

diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 155bb67c4164..1dcb55795c6b 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,7 +1,10 @@
+AUX docutils-0.15.2-tests.patch 1547 BLAKE2B 361285ad1ffd4d32a7e04b5e9e56a9dd91c69475a5c7b9fffd64b6735d789b4793ec35d0fa733d016ffd4eb5c97a8a8baba64bbb79b8f5cece71e9f4d3d947bc SHA512 83856452008c041295659c95e45d477672a1faedfae642d3980c3ac416864a77f21bdaebc88b67f43f7da87a92b3bd6baf04e37f44c66a46e2bbc941c0d75131
 DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
 DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
 DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
+DIST docutils-0.15.2.tar.gz 1797388 BLAKE2B d7f78c37346fe30156335f31bab0fbec420980e08b10806b62ca67135388c161daf758378d74ca4650546d519923444e9343605de125295e3ca271d6109adc73 SHA512 b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6
 EBUILD docutils-0.12.ebuild 1785 BLAKE2B 41c300ba5131ae5e43ed0e56d286a743c29865d0ba6c44fbd2125ccc4f58e4c32e4db5a0c3e5f869379f96be0beaad4f65a0a9e6ab3bfce154e7d52121903bec SHA512 a34dc97537a6f039e023c60496187e8ed0ed58346ccc2c0cf1b1e9f3b79a857e0c13eb1eb5cfa9db61368dba878e89f176049cd428a406006ecac78e9cebca8c
 EBUILD docutils-0.13.1.ebuild 1799 BLAKE2B 7a0396b993588019fc2bf391bd5fba88fc75e3199d2d6feb43ec6359179fa20614ef5e93267c68b932077448de4d7463684f70a3c922cc088413f001bc07801b SHA512 d94979112f9e87a35ecac5369453f70820034289a47a9cbff69521557a8c22eae8e0e67a124db30866de1cc7be67825e12ff036f1eb6c6227965577f1b3a5412
 EBUILD docutils-0.14.ebuild 1811 BLAKE2B 4893bfed0ed2f30718141854cf405dae52cbfcd27af0e85355c92ea134a62e9b185962c403bca20a8f6af4d8396d907077cb682cb6a19e87c5e8888ce10ad31d SHA512 c4d32acd0fa96ff972fd33d6e98a5cbb52ef71eb6a29d7e4e4c8f2fcb71d0350fc7ef66d2cd8e28a216faa4ef437820bbf8ee4a4262bc282033ab6dc5c926bff
+EBUILD docutils-0.15.2.ebuild 1982 BLAKE2B e53f5f3740f1f0fc5779835ce075bb3889eaf5e0951cd243b31d57217193954d9e56adba648edd46f69c7ac94345535747f18943eb6c303e7c00ccca3e5ef3ed SHA512 be904c221a7bf34a6be83d03d36a587a58332d986e5f907ec0cbe7dd06cd4293e75ffb9ec07cc64c9a5d85df8a9c415784b29af8f75de70438fdf6c2b16afcf0
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.15.2.ebuild b/dev-python/docutils/docutils-0.15.2.ebuild
new file mode 100644
index 000000000000..036c2fa367c5
--- /dev/null
+++ b/dev-python/docutils/docutils-0.15.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/docutils-0.15.2-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
+
+	pushd tools >/dev/null || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+	if python_is_python3; then
+		pushd test3 > /dev/null || die
+	else
+		pushd test > /dev/null || die
+	fi
+	"${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+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.15.2-tests.patch b/dev-python/docutils/files/docutils-0.15.2-tests.patch
new file mode 100644
index 000000000000..11ccbd01b90e
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.15.2-tests.patch
@@ -0,0 +1,40 @@
+diff -ru docutils-0.15.2.orig/test/test_writers/test_odt.py docutils-0.15.2/test/test_writers/test_odt.py
+--- docutils-0.15.2.orig/test/test_writers/test_odt.py	2019-11-25 19:38:23.327374852 -0800
++++ docutils-0.15.2/test/test_writers/test_odt.py	2019-11-25 19:38:13.585433399 -0800
+@@ -38,6 +38,7 @@
+
+ from __init__ import DocutilsTestSupport
+
++import unittest
+ import docutils
+ import docutils.core
+ from docutils._compat import BytesIO
+@@ -146,12 +147,13 @@
+     #     xxxx is replaced with a name for the new test.
+     # See instructions above in module doc-string.
+     #
+-
++    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+     def test_odt_basic(self):
+         self.process_test('odt_basic.txt', 'odt_basic.odt',
+             save_output_name='odt_basic.odt'
+             )
+
++    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+     def test_odt_nested_class(self):
+         self.process_test('odt_nested_class.txt',
+                           'odt_nested_class.odt',
+@@ -166,11 +168,13 @@
+                           save_output_name='odt_no_class.odt'
+         )
+
++    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+     def test_odt_tables1(self):
+         self.process_test('odt_tables1.txt', 'odt_tables1.odt',
+             save_output_name='odt_tables1.odt'
+             )
+
++    @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+     def test_odt_custom_headfoot(self):
+         settings_overrides = {
+             'custom_header': 'Page %p% of %P%',