gentoo resync : 16.01.2021

3 files changed, 3 insertions, 72 deletions

diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 65449e0006f3..f8b75bdc092b 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -2,9 +2,7 @@ AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
-DIST docutils-0.18.tar.gz 2036219 BLAKE2B cb18016eaf674df18880cfac07484a68cfc158b68adc8c6ff5944b39407460a7feab192fb1c4bbef0293dacf58463e95c04bba53de578cf4e7c9ab8de14f6ed7 SHA512 c61bbe26b5f771dbfa4df94249bf19575088160f82a4a5cdf427a78d2675de915e9d979fffd515e353259ac57a08e7096c970f06ae20d7ca6f48d223072f0096
 EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
 EBUILD docutils-0.17.1.ebuild 1748 BLAKE2B 150d82c9667c782fcd015ec933a647fddf41022dac98253c7c4a187575d4526ad768cf6967f37dcbc89cd1030613b8a76466e6626021c23bf76020be24578cc0 SHA512 08d1c248a3db7098d50f8283b0d7a8b8e1cab5ffd7a8ff4ab8c779b216d3c74ec097f7185514c25ce1154b21f2ed3c03f09ef5b0d8d7ec69abd3f03d2cdb14df
-EBUILD docutils-0.18.1.ebuild 1756 BLAKE2B 42e23242c4edfbbb7bec80d33c1cd89689c6aa70be9fe610d9db6f9c3a2281f0c9782110bd981df915f3ea1629736e8f4c8a6ea4201e30daaa7bf5215a672f29 SHA512 9c8f201f3621614e6d62db780cde5c3cf95402b41d4ba14f846bbd456b25ce1d4e421a82ceb27ea054b1e83e9cc0aec8cb3cb6fcbf44d3bde333c2ef9e25c348
-EBUILD docutils-0.18.ebuild 1748 BLAKE2B ca7185e8f02cd7ac679725e55119543be4e9a19853fb23aca2abfcca4fbd9042405ac5bd3520c3b0ffdface39c245b31b6ce329650ac98a2f65b9b3a8ffa934e SHA512 c52fe86b64915a31e3bed105592afe798db79d32b5ae3c634a89bd9d488763c2d5b6faf5a41cc74ee4bf28ce21bd0f3eab225f4ce14d8b590745f347c89233f7
+EBUILD docutils-0.18.1.ebuild 1748 BLAKE2B 0ef8c8f4d5b8a7e5486b22da44ab1e2590896a926808805aeb014f9e166010240090a32df9ab733c600c0d9ccecf1fad7b29104c36dee2dcede65cf5ac80e123 SHA512 7ed7da4f0cbdad4bed26a29cfc17a1691203b1a050bbf0992cf08cdb04b0364d33aa44f8c4e412532e78f73931a8a1542960f7b5e251261319f87a55ed3aa248
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.18.1.ebuild b/dev-python/docutils/docutils-0.18.1.ebuild
index 59a8486954f7..4ae40190793a 100644
--- a/dev-python/docutils/docutils-0.18.1.ebuild
+++ b/dev-python/docutils/docutils-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ 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"
+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=""
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.18.ebuild b/dev-python/docutils/docutils-0.18.ebuild
deleted file mode 100644
index e826ac2f7fba..000000000000
--- a/dev-python/docutils/docutils-0.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-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)
-}