gentoo Easter resync : 12.04.2020

4 files changed, 21 insertions, 60 deletions

diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 40372f9e8ce9..e109fe38a72f 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,5 @@
-DIST sphinxcontrib-spelling-2.1.2.tar.gz 35411 BLAKE2B 9738e18664fb68f6f8f7aafb626b6712f7c30947681f6c5ed288dd76c2b24245cb4083887330fc05ef4fdc64756245d997797ae36899c2c762489fff13219a21 SHA512 993f371e064e8748eb61faae649fb293b154a35955ff84d86fd041f4e2cc4c6e22c686007a67c3b63b0c50fc01ed226708f27db347e58847a46ca733c997d51f
-DIST sphinxcontrib-spelling-2.3.0.tar.gz 35687 BLAKE2B 9b48f1953616875bd5f0106ab0a01ac22d176b93eca88da7e36804eaf744aaf6e941d3dcb9f905f9bfe54ea51eb5c0d14d954b3def809994e7ba661e09cdb18e SHA512 194023d2c5ba594a264740a2a45ebd90d37fc17fbd3bc8c53fa303581a652c58332f998a159c9c6c58718dd9898c9b4639e98ee114a2ee1e5f2097e545134a1a
 DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
-EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1016 BLAKE2B d8eee76e4c4b6eb68670b4187b3cc6cf6be4ad00df561fb4ddb1d2eda532189e122281cf6f7bc5e97043df993480f852187cf9bb2a47cf9f6fc21764c42fbcff SHA512 b3ab1b3d0ef7dd361012a56b6981845307ede585595ec18336050ba8645375e745feedd05314161a3d13cf1cf8e0d8288860088760cd442dd6be28f92726f7cf
-EBUILD sphinxcontrib-spelling-2.3.0.ebuild 959 BLAKE2B b56a0709ea73ca912a614a3e125f5122402a66484d3bc56312736aa69db793afb9d7fb553ce3c96ec20f78fa5e025f42ca4d0ed26d026734fdd86ff69fabc901 SHA512 d0a7ba2b2c7e60411f799e948e3400afbb058f13fb73af751347e1b587b8611eaae184316723750b77b16347363f2ff75112446caf2f1128065b63bde2000996
-EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1207 BLAKE2B 7270ddfee5920572cb0ccbd53f84e67f2786e39962c9efabdb98c6d2c6308bb88f385d63f5292813956d59175198a90cef4204fa9b4e96fe4a0df8c1644a960c SHA512 ca4a3a1f641d250bcf4546e0fe83e7bdf8b8f476487459d1356e35493e3f0022023fa9920c4828125eff5e3fbafedfa25434bf7bf49529ca28c7f8e18c1513a7
+DIST sphinxcontrib-spelling-5.0.0.tar.gz 38479 BLAKE2B 5fb20cb08529e1db9d5df25a31f09849dacf41003893dcc74355d70161269b18b3bda7eb2dcc279250190e6eb2ead7a3bb1d40ac4a4d5db1a390f339a22da777 SHA512 bd608e13d1643924d69336da6a5fedac3f60ffbbf0d367c203936395270b2504f45db2ec0d2fe179a86dc91616e458c6fa0d2a6f66a20ee956c5f52ece1140ce
+EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1205 BLAKE2B 8aa26a7e4bb89148db02ed0b838fd5b03b8e85dfdd9e7929e39a3a9edfd7675a3f6673d3851f8af6f204b6f9164cdee62a9f3575a852afb55c4cb2a1cae68eb7 SHA512 77e9ded8067b711906e21eee5284d13381c4e602907598e9452fe238358db3c56d7bfee1ffe7f35c861f45aabd55c89f17cacdc06b9c6cba1d58c08b9d01a1ef
+EBUILD sphinxcontrib-spelling-5.0.0.ebuild 1209 BLAKE2B 92eb4a99dc60d0af565abeb9a58e9cfbc6e25d48e5f14a65736cbb1970803fc1d88d2dc65ceba173113e18679a4303b0d9222ce105a381c44406c1b395405a81 SHA512 e0a56379d29dafa92648c59bc1676dc00e39ca01be55efd599422a066cf22052846330001d30baecc452e39a28c0bc2781a2fb118e29b7ccab6c3dc567ae9373
 MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
deleted file mode 100644
index 9bbc74035563..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://bitbucket.org/dhellmann/sphinxcontrib-spelling"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	>=dev-python/pyenchant-1.6.5[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
-	test? (
-		${CDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
index 83bbaae4a721..f897fd1fd866 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.0.0.ebuild
index 4c610d2704c0..5a6af6229499 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.0.0.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="https://bitbucket.org/dhellmann/sphinxcontrib-spelling"
+HOMEPAGE="https://github.com/sphinx-contrib/spelling"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
-CDEPEND="
+COMMON_DEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/pyenchant[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
@@ -24,15 +25,24 @@ CDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${COMMON_DEPEND}
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
 "
-RDEPEND="${CDEPEND}
-		dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+RDEPEND="${COMMON_DEPEND}
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 "
 
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/build/html/. )
 	distutils-r1_python_install_all