gentoo Easter resync : 12.04.2020

4 files changed, 9 insertions, 31 deletions

diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index a3ad39e0914b..4ead94fec691 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,7 +1,7 @@
 AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c628d98c79e6733816ffe094af9ae45be632edfd0547086911fd3e2154cc13c5ca609bb436a3d73f6825bd8242074be323cee969192 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
-EBUILD subliminal-2.0.5-r2.ebuild 2377 BLAKE2B df06d4184287eb33dec78e54d39d812e1b3643b3a3221f3af4c40204ba8f4bc4cc8eaa83a8a10999bba375462c35065ecfabea1b76d3927b3c917ffbc0359661 SHA512 93636aebf88dfc90dee0b9fe517ecb6a6d0ebdc9dcae02c65dc2707311c550574760e279537c91207291536938b70d24fce42293010b20b436d29b4cd8cedeba
-EBUILD subliminal-2.0.5-r3.ebuild 2465 BLAKE2B 62df580689873ff71a88cf886818361eb0fc951e923bfe816faaad5826bbb3ef90dbffa0126df824608b1006abb59443416a0e56204838a4833cafa23b4883a5 SHA512 60e64f835da948a54043f92444b0b20d1fe5751824d42ceb9a54cd2ec0db2be01b62c2bb88ed44a728cf5974f64762d93068795a59193c73abcae8727370dff1
-EBUILD subliminal-9999.ebuild 2255 BLAKE2B e932656aaddc9fa283ba4f03d985c5d7376016283b53147cf58c69639905268195dd6f8839136c7dbd923c7836c8c7ce113caa71e636972225e2abbbd1a9842d SHA512 2729b29a80e468eac381e4c339def7814e744198d6412246ebea9ea37f47c007680a4f280ba7fec57297b44aa9513511260fa3fb0814be66e4d9c950487b56e8
+EBUILD subliminal-2.0.5-r2.ebuild 2178 BLAKE2B 59863aa347ee4be036ae707fefc8de0b4f29cf2210696a2ddea3dc76244134a3ff4747a21c5da99125b078715f908ff6eabce995f14fbfde3087568819c4d656 SHA512 089ad52eaece2c2a5b4e669481ecd7b1ddaefa96b839d0fba3e73c1aff9ab03dd89f42304b992bcd4909239dc64b2fb23917c7a6b3842ad9f80ee7a9dbe55840
+EBUILD subliminal-2.0.5-r3.ebuild 2198 BLAKE2B cc26d4de0039cda500b6d21caa6583d7de6a5bd7c90444151244248166710f323e1fe224d859c64cc5377947b5b9228515f93c5f3bbf2d3ffb51f453367a1a8f SHA512 2f65f2053917a075aa4f3dd91bf5613d46c5422bdc518583ea08c32f30628315c8721afb8b875bd45af0e1fee4ec2c90cdcca9060d773aa04f0001a5cfbde386
+EBUILD subliminal-9999.ebuild 1964 BLAKE2B 357ca6c7cfd833293baa32fa9ef1eee1ef776df194b7dbd46712dd79b681e7652d053541c1f4f0151dfa085e90727427c55977f4f9af9a3cbf26597839345c27 SHA512 c3cdbee121bb2ff0f018732b5550688f1598942d7a95a4d5c0868223296ac126dd20cbea27c960d669b045a87875641b1a19da937cf5c0392ba73d31dacbc276
 MISC metadata.xml 350 BLAKE2B 64054ae243f37db216c26428801347c2ef0b61b4f557b01e1e84213ca4d405e0ef44d2a121c97a507cb155c053e190c7b875e7e9e325ecd1d4ee6006fdf8f975 SHA512 573c536a3e3d2859085a60fdeb224475bc457b07c6b3d0ff4554bb7e8f49a7839d1f44489fd10261b404c33e2f6729a25ac8ea09701287c13f968ef2cff0aaad
diff --git a/media-video/subliminal/subliminal-2.0.5-r2.ebuild b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
index dbc7dd6e79f9..553544eeb7c5 100644
--- a/media-video/subliminal/subliminal-2.0.5-r2.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
@@ -37,17 +37,13 @@ RDEPEND="
 	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
 	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
 		app-arch/unzip
 		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 	)
 "
 
diff --git a/media-video/subliminal/subliminal-2.0.5-r3.ebuild b/media-video/subliminal/subliminal-2.0.5-r3.ebuild
index bfde2b82c963..1f8be45ef01b 100644
--- a/media-video/subliminal/subliminal-2.0.5-r3.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r3.ebuild
@@ -19,7 +19,6 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
@@ -38,17 +37,11 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
 		app-arch/unzip
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
 		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
 	)
@@ -61,6 +54,8 @@ PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" )
 
 S="${WORKDIR}/${PN}-${COMMIT_ID}"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	# Disable code checkers as they require unavailable dependencies.
 	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
@@ -76,7 +71,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 2576dc081f5a..13b314d12fb2 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -17,8 +17,6 @@ SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
@@ -37,20 +35,17 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		app-arch/unzip
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
 		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_tests pytest
+
 src_unpack() {
 	default_src_unpack
 	git-r3_src_unpack
@@ -71,7 +66,3 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
-
-python_test() {
-	esetup.py test
-}