Merge branch 'edge' into next

3 files changed, 2 insertions, 38 deletions

diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 09e0dce7c4ec..3bc2dfb23eab 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-r2.ebuild 861 BLAKE2B 070bafe08d44109c44a77efdd0efb94020c183c6ed6dc7fbf3f737b80b4a81f23555925ec800891b9ab5ec59fa0ad15fedc4e25198ea8aaf8eef39be6d28c039 SHA512 7150865640631d784f9edfb2d2034d9c6bfe7bffd784cbe14eadc6a5b4dd1e5271da820e94a2b280753d3d4c47b2ec317e355b546e18226496b8377f2405bc38
-EBUILD watchdog-0.9.0-r1.ebuild 847 BLAKE2B 31365ffd12a7bed7e41eb4a1cc767f8ee73bad60228ed12825bc82ee57b65b4e5d4961846082404d60ee215c2dfdb768c221a1fe4c046affc7a6dd5c7a72172b SHA512 3877d58b93c4b75e2a240ab79bdbd6c29e6b806bfbc05bc14c9d804e3f5b9725c1ea330876a27f58e929efefb12f1b7816555164db862e97260402fe9ca8615f
-EBUILD watchdog-0.9.0.ebuild 843 BLAKE2B 4cef8895eaaa9f9700fdd4a4fd9291030febaf03c846040930714c23622d35ef8939cfbe0a618d0e2960452c47a7cf599b03bdcade87985773319ebeae28992d SHA512 a8755d6d151c0733042516c4275b0c55338bf23735f4ec65a2aa22b7424afb470b37acc4c17c8ff29cd9d123fbabe865e8fcb99803f188ed5d081a0f0567ffb5
+EBUILD watchdog-0.9.0-r1.ebuild 845 BLAKE2B 99fc184e8f2282d5e7b4291f7215bb6fc50accd843aa3b1b48150598bbf628ec9d37ab74521247de0d49f3fbb321f5cd518ecb6a04a0b5bfb5b6fb47c3f8bf9c SHA512 a2efaa1b2f6d6a8d21230a64deb919a52eb5289d56f94681bf3a10ca863451e9988f530bb64b20780d12fcc0b7c56c3e031b70001a6707b523ecea7c751f5562
 MISC metadata.xml 384 BLAKE2B 4aa02b5d26bb82f0f0ef9d7369f984114d6b0de77f662ec150e6433324f4500b5b5004b626e7ce3558dc1190a31cbe788793ddbeab4a10f13d2b9be5de36e77e SHA512 0883ee5d6169f36b061be829e7b2e4a69f7efada9f7a2b446a9baad15c8e119d24a7bb3d80bf253a760332bfb8a03ef06b3bc91cb97b7a86d0773252fbc3db90
diff --git a/dev-python/watchdog/watchdog-0.9.0-r1.ebuild b/dev-python/watchdog/watchdog-0.9.0-r1.ebuild
index 4e9cf06984d0..e9a1476eb9d1 100644
--- a/dev-python/watchdog/watchdog-0.9.0-r1.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
deleted file mode 100644
index 6c1c209bf61c..000000000000
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="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-timeout-0.3[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	rm tox.ini || die
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}