4 files changed, 9 insertions, 53 deletions
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 0b8d5ec33805..46650dbaa942 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,6 +1,5 @@
 DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-0.9.0.tar.gz 90597 BLAKE2B 4b83061f49204f13ccdb129c31bd53af256e5541d7a3f6452e59682ab64f37dc2a38e9a82ddcc2cec0ed5c52baed27d62b2fab7eebe2433d924209860b5d4a00 SHA512 97fca2642209150a611d931d6f2049a9941a3494a6c566bc18eaa45a8fc2fbd02c712b37a85cc1375eeb65715706ba6b8ecf781b99951721988c318f81eff7c6
-EBUILD watchdog-0.8.3-r1.ebuild 876 BLAKE2B 89918be3535b04ffe283d3560bc07abcf43e50dfb24e8ecb205e4ff6e1007090d5d3bf872371fe421f92600e7ccb570be8a3d4515cfde4694a4155a7b8f45c1b SHA512 c9ac4c196e35012d6d260791e80b099735f3da134822d000299c3e2d50e9c4ce359de4ac4f50ddcbf2fd2c7e4204553755bd8aaa8c1f86a708c4f6b7e497f3ad
-EBUILD watchdog-0.8.3-r2.ebuild 880 BLAKE2B ea994b824533b177825a9faeccd7b6061462ecc1f8c1b435567cda4241dbbd9b5082245bbbff84cdb3565d021f6508b010cd74f291e060811502bdf143b01aec SHA512 d61f100afe9327964628c9b2664c00d6a7395582c6024750c348ccb6e1d4c4ad827be4f6ae120ed605b4cbf4bd525d28578a7f4f671639089046425eb8527c61
-EBUILD watchdog-0.9.0.ebuild 965 BLAKE2B 5ac7ec329de6f2befcae9fe8a2772bad2bbabd6706108e7fde65004be5901107e7ec1bb0d4444851b4c593e8dcfdb908fcb05eac33b6bd357c5577511ba1c48e SHA512 d84113474ba8fd5a5fc97013e301fb0428e5c6da7c414c3dd1739785a898df3097e89a21d6b97475f124b7f1d09e8471ef21dec3a45dd0dd595f10303b9f30ae
+EBUILD watchdog-0.8.3-r2.ebuild 871 BLAKE2B 5fa1d5d91d5ed94e2265bb6ed005e651b2e5f22a263cf18244b0351ea19d80f6d18f40b0f80313140ea3a22e6d95e8dfb69da87223d99516c7cf6c109400c6cb SHA512 b5d47f81d21f0b33e8cd9b4428d3276781848bf8a3744f9990c6625738f5743b9866acf187da339634e3443fb3387246730e4da1df0bd2cac7b5476ad506a263
+EBUILD watchdog-0.9.0.ebuild 854 BLAKE2B 44aa76d83fef5cf1dc4b6c307a43bc1f1823f539ca0f5855544d4bcb4e50c56461a6e2d0afedc8ce23acc2a135f0197564d3fd1ed36b17f3030e0a234aaf9f64 SHA512 08cfae3fdfb7294ba331a7068ea62c27a2809cb08f5663c286901e9f9176bfac892d237f4001d1adfa1c6721296b5fd9a0e881f142632f325e934d5c8b89c36c
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.8.3-r1.ebuild b/dev-python/watchdog/watchdog-0.8.3-r1.ebuild
deleted file mode 100644
index adddcf54e178..000000000000
--- a/dev-python/watchdog/watchdog-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 pypy)
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
index b3659f601242..0eda092020e3 100644
--- a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
+++ b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_6)
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index 4dbe580e9f7c..66298b176993 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy)
+PYTHON_COMPAT=( python2_7 python3_{6,7})
 
 inherit distutils-r1 eutils
 
@@ -15,27 +15,21 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	dev-python/argh[${PYTHON_USEDEP}]
 	dev-python/pathtools[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)"
+	test? ( >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
 	rm tox.ini || die
 }
 
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
 pkg_postinst() {
 	optfeature "Bash completion" dev-python/argcomplete
 }