gentoo resync : 18.11.2019

4 files changed, 21 insertions, 13 deletions

diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index fedb2ddf43fe..25f6321dd74d 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,6 +1,6 @@
 DIST atomicwrites-1.1.5.tar.gz 18951 BLAKE2B b0932995aae3ca23c11aace182429f4888819ea542a12b59d5b7ed4621c4759285d0cba306437bd1ce35b1ba32eac8ae6afc6548f2bae61870dbf03927c4fe75 SHA512 4de8ab93dcb226c55e8ae1b0ef883c2e1eeae50ac6596afe036ca51dbf6b094c13dbf2d792972312d4c53551886aaa2713aac54bfab42b85abef4d1146e039ac
 DIST atomicwrites-1.2.1.tar.gz 11660 BLAKE2B 06b4ca25f39be0e7e8d8e8b46749d7dce052f912e82b1ccd39e308c8ed51ab0d4891f00c11d0e52ef50901c01566f20fcf1318cb472c9a1f3a08617fd1b56235 SHA512 4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5
-EBUILD atomicwrites-1.1.5-r2.ebuild 573 BLAKE2B 01814a1e9f3c4d4c899416714eff73de3d599881422441be8cb061f7101812c4d4a99a0e0ef34ab25a039918008ff6345cde3b5f8eac6f319294849b51fe9ca0 SHA512 06c6f9885ba0b487d38705f4cc220747ac1499a7efb23dd5d6bd2b4f47833462ee8fa25f6031b0370342716470d01ce046c9cc997fa63cf5897f67659adc9d58
-EBUILD atomicwrites-1.1.5-r3.ebuild 951 BLAKE2B 81ed4c414e91f38db89a66a112b60a3baa025e2c9e01b0be91027fff1ccb9e0a75a58ca3860fbf21f04ed173ea06f4607ec6500024859fe5444283051dd1eb14 SHA512 8ed6fb7939a731a66f4ee58bda5d7c8de345a220f40edd7f9ae2ee617b1c3d9f571c1e4019040ea5da5ddb15e0d1abca798892ac5ead1e4d2fb3afc588428f5e
-EBUILD atomicwrites-1.2.1.ebuild 1000 BLAKE2B 4e772494f3c83a9c75172b69f78108c1fcf6cddc1d4bb3393eacb4feef2ff65349101ce328edb8c1021d8ca7af31bf2bf015d462e2f0dd2a9a3744d0578102a5 SHA512 bfb4301b376b7b0a37034df7bf51a646597e541cd7991deb097e06b7404eefd76576def98177636f18b547d8114e24c109cb54c26b73a88dafe149141026b7e6
+EBUILD atomicwrites-1.1.5-r2.ebuild 600 BLAKE2B 92abb65ee53d5c64bac87e7c4049e1a40ac46027d1b447ea194a1da61a8ae6f06e072e66cde5aba247b971467031329413c7473be6cf7a8f26b2885bc9c2e0b7 SHA512 cda65d0bb3d988f87805856e9b709eb2f280e87a0f67a8405ceddbfd03a6fe637f42356c4011e8cb5367f6cece54f6e08a8a71cfc5c74dd724fe2b6816449c8b
+EBUILD atomicwrites-1.1.5-r3.ebuild 978 BLAKE2B 1af1ac447b0f4a48f812f3e4dd79f99ea8300c5f907be6feae0c4a34e359c8b6f6639e15b2685e7e4ed6da6cca9cd2d0c6c1a21f67c2214f5e58ee68c40842f9 SHA512 86f87683c024771921c59d396cae1e16c65167dbe5689a5a0dc6a1bac1796d466fdeed77a5c7d314b773957e14da5138c438e809862b0c0e7532f7cffa59cf21
+EBUILD atomicwrites-1.2.1.ebuild 1158 BLAKE2B 48f3189e2551847430ab24889f8c784d55984d019cf5aac31f6a75070c1579aa2cd332bf6d6412a016c76507b8cf2cc2f12124c70f03a026e91f948991fb0240 SHA512 6233b2ef4585d2871fb99fde41be01be4eb12237bdcc8add3c0de0b810a0ade3c98ed10125dce121be466b6d7ccc944cf3ea00b3d4ee88c77ace14ea5be43319
 MISC metadata.xml 438 BLAKE2B c2a138ede668039b703fdc3e2ca8e1a7a07546e01540fdc502d79a48a8ddfae8dc7a79ed371373d95054731fcb25af67daf75ef5a1c08fafe9976f7a2c30525d SHA512 f38332e752b8bb660d8d8291b897fc96865a134108198e01df2dc4365c0c6e87c6039a907da38080a4d07d7c57750f8a32c6d6c3653b57f5aa193ca5b5b53449
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
index cf4f6bdb77d3..85b1e5aa6843 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r2.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
index fa0256dcacf6..12017592573b 100644
--- a/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.1.5-r3.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
index 9c11548028a0..6a247bcf6e23 100644
--- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7,8}} )
 
 inherit distutils-r1
 
@@ -13,17 +13,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
+IUSE="doc"
 
-DEPEND="
+# TODO: remove impl limiters when sphinx is py38
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
 	)
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+distutils_enable_tests pytest
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
 python_prepare_all() {
 	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
 	distutils-r1_python_prepare_all
@@ -35,7 +45,3 @@ python_compile_all() {
 		HTML_DOCS=( docs/_build/html/. )
 	fi
 }
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}