gentoo resync : 15.12.2019

4 files changed, 14 insertions, 18 deletions

diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 4e4a53f32bac..4449484fb04b 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
-DIST jaraco.text-3.0.1.tar.gz 11969 BLAKE2B 8eed750e81aa6a82baaa25483a2b60d2adb9f7a1769f92556a3a5c3fc53c3dc63a7910615317007dd0b934e73987da5de53d0e52a3cd44da955b717b48348dd4 SHA512 dcac7de44de4f1ae4dcfbe3e1857a4017b967bbbfc46df05cbf7d0f319a0f841440406b75a6e84b3283d8946ee1753c99f16438228dd2393fa023571c3911a10
 DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314bf5304521fde020c6e52e92bf6f534b2c6c4d8cc0b73aec8bd118030e455d8a5eeb19fb4e927105fa7e4477817 SHA512 9edd50e3b67d40a1a5dfe8796dd55f80aac52cef9ba2f1ad565cf597c1ff8824d2c61900cedd104210b60dcc6dced8c01321af67e2e1a755be89e1c15945da1e
-EBUILD jaraco-text-1.10.1-r1.ebuild 1379 BLAKE2B f6721435bdb371f6f7061a4e575411a9a3812b0d4780fc5f87bd3866e295821e88d9df8891721e153a04415e678219942c92f3907dc8606736bae2ce03987985 SHA512 cce7096bd5dfe97bbc0c2fcb5ca04f2ed06016a8d4468b87286364e1ee7420663419caefbc9138d3dcc2a2f7bd9c11736192a4ee81d51618e4cac67c27b6fe53
-EBUILD jaraco-text-3.0.1.ebuild 1526 BLAKE2B b0ec3c68eceb40b5350e147b7b76b0fb3ce2fc625d951239c77839c9564320c1f6f0c5e1a4c66d32783a7c46907d8ab1602a59bd3d309993498777dc9c0ff073 SHA512 20577f82ae24da7621426e08a2015407cffdad9e55280ca3d4dabb2b42d2fc3c5fc51297eb52208e0876452c53d4ac1f17503a1e7bd3c05dabbccd9cbe88c295
-EBUILD jaraco-text-3.1.ebuild 1642 BLAKE2B 45156ceb2b164928f3beab053c3f2db9a9a6a6587f5f66368951ef2cd9a355f7c23c600da663bebf90c394b799376d8aee25b2b4f85ad3661565eee474dd1dac SHA512 055719a99840ae15049d205e27c591a1f496dcb358d91dea8d23e65a8f2c019ea83450426148e6a11a5e813e429aae3705c5bc5575e97fb84556bc1a4fbc3ad3
+DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
+EBUILD jaraco-text-1.10.1-r1.ebuild 1406 BLAKE2B 39df4a1c0182a428a7af5e43b114f3db480999464e28365444331107079bc196db88ab51802d4bf2e3dfa781e359298f179e42194eff77447babec63687120da SHA512 149042ece67cc168a21cb57e58db809fc81c37aded5997d11594ad2d008a9aa6d09ffbc8d03708903aafbe0f698cfd74cdbeb686c5273ed316bc23067ed46c5c
+EBUILD jaraco-text-3.1.ebuild 1669 BLAKE2B 2f684c6b5403bb544dec9fd7cc1ae40f6c9f4b9e386e8cdeb930b19c7dc8481af80e99345a95b027928fcf0f5307a609475bd868db9ae59dbd0aa4241091c0ac SHA512 907a477e14dcd7e835fccbf215a8faef3245fe4a4e66b38b1b84c92985a1634469a4f7b5c17ecd8fbe6673a15639f4f5030250136a69dee38c5e766f3ed3aed1
+EBUILD jaraco-text-3.2.0.ebuild 1471 BLAKE2B c275cad64a56658a94d7300ca3f585fd6689a337b753609e46f0ffadd1ab8cf55e1c7944ee7cb951401ed97353dbbd3e6033dbda652880a47d7cbadb539e0bb7 SHA512 0ad6436fd1a90ffe9c3f537fbd066ac8b1221e600b5ac44d912efd15a30618ba8aa401fd054b7860fa9120841737c2543154353dd99653506618452589c1946d
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
index 2f1f531343ed..b1e961411893 100644
--- a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/jaraco-text/jaraco-text-3.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
index a3fda424dffe..7a2066c941c3 100644
--- a/dev-python/jaraco-text/jaraco-text-3.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.0.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 65391ac9c63b..af0f4eceead8 100644
--- a/dev-python/jaraco-text/jaraco-text-3.0.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
 
 inherit distutils-r1
 
@@ -15,21 +15,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python{2_7,3_{5,6}})
 "
-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/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
@@ -38,12 +35,9 @@ 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" \
+	">=dev-python/rst-linker-1.9"
 
 python_test() {
 	# Override pytest options to skip flake8