gentoo resync : 15.12.2019

4 files changed, 14 insertions, 20 deletions

diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 9c460cf1147b..6f1a449c6ab9 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
-DIST rst.linker-1.10.tar.gz 8820 BLAKE2B 3615353dcce16652aa3528985997467e1501161b012fad44203fd98cc5e91dc32acf6c8492f0797ae748a87c008e5f3437833b435c5cbd85845340b91665e664 SHA512 5541d0ba5299a6efee444ed3c4fb4f108bcdd7c84e4be0b0a44f71c9f13e18d5b5c4c38328a542fe5666d435e1e04c35c0db5535706a45932dc01590813a85cc
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
-EBUILD rst-linker-1.10.ebuild 1438 BLAKE2B 525c2bbbe29e3e4add32850fb137f8bfea6ab8d04ebc073f9afbbf8080aa1b8ee48fa33c7a853bc5cf433eb75ea1bb5d5abdd3ba3a87463ecc1747593bb3b9de SHA512 3a869f85efc99b7230f63d19387fddbaf06b09db5bd4c88a29a45833b05bf672e32b7d782375146c2480006f5473f35c5d29d742c1a49f9ed984a9a38b4d1842
-EBUILD rst-linker-1.11.ebuild 1487 BLAKE2B 09a277c6992df5c312dd9c66ccab4b1386ca4dccabbf0b9043f0b20ec3e4d5d93a9506a258745a3285daf937100ca0d7578021df65b1de9cefa98b88b7439b45 SHA512 e251eec656097eb0e322af4ff22d6cd3e6331d0c2f4c8f89ced54ecb8547f5c4e4e2e280b06acf1b4b1d496c4d3ddc4b09d61b3239b3c0ae24637dcce934c862
-EBUILD rst-linker-1.9-r1.ebuild 1372 BLAKE2B 62edbad4a9557c8c5cd88243b253dd9d32f0f39c2fb010478350e0065f2abb12b6531c2ed75b4f05acc95929e7e0e215031b7d7a0354347acb54b42f20331fa2 SHA512 4a79224e5358addd84acd33c21421f34791ea7f932cb704fd75f2547f317bdfafd9a1f8c8e6f82a318201994550a51b779e8321791b42aa16465135362be56cc
+DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
+EBUILD rst-linker-1.11.ebuild 1512 BLAKE2B 691b5144a537af1ae6862f48e329185fea040ee6d453046110cae9dc01260e854bd676868532667e2576da45f60b78695b5bc799043d0ad715f5cf6bb0484856 SHA512 6993dd38ef9bebd0d50e1c39a404f3ab63bbe33b6f92684f8a2e1b1b4ae8a38e191da2bd61097759992c9af55781588847d4d9997af27016a097d06416e048ae
+EBUILD rst-linker-1.9-r1.ebuild 1399 BLAKE2B 8e494289a86a9af714e8a0c599eabd7edd27482a21f1769fd9c6fe4b1bf6d29ff78d2c0bb67ff952ff953ef42419a7896b27f560bd7302fcdf719b1ffde760ec SHA512 3dc5fc5c84312ccb249e6fc636e497565cee369ce9479564c55bda61e81835eee79165e370b76c287d0c2da9e7494f3b5b2d13c6acf5b039443c35d1e9b3cdf3
+EBUILD rst-linker-2.0.0.ebuild 1349 BLAKE2B 3b99c6d0150b92e2dcf07fa334c9c0366254004734ccac2f4fe362b12a4bff57e4f4975770f4d5a7ec3300d307f8fa7d11023badcbe2769c0aaed09b7e06cef5 SHA512 558fe27f0b6ac95bab6fb10d3824761aa40f3a3f276f594a3482c742b87e28c292ca91a0e7e772f50cfd8be09b394b6be229f0a56432439bc64f377eddbc060f
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index 912fa680d874..a590722d60c0 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -14,8 +14,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
index ca82c108b2b6..11d52d1516bd 100644
--- a/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.9-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/rst-linker/rst-linker-1.10.ebuild b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
index 389752db19ac..596c9c6f5461 100644
--- a/dev-python/rst-linker/rst-linker-1.10.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,19 +15,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		dev-python/path-py[${PYTHON_USEDEP}]
@@ -37,18 +34,13 @@ DEPEND="
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
+distutils_enable_sphinx docs ">=dev-python/jaraco-packaging-3.2"
 
 python_test() {
 	# Ignore the module from ${S}, use the one from ${BUILD_DIR}
 	# Otherwise, ImportMismatchError may occur
 	# https://github.com/gentoo/gentoo/pull/1622#issuecomment-224482396
 	# Override pytest options to skip flake8
-	py.test -v --ignore=rst --override-ini="addopts=--doctest-modules" \
+	pytest -vv --ignore=rst --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }