gentoo resync : 29.12.2022

3 files changed, 8 insertions, 65 deletions

diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index b0030ed3a562..e170c79cf772 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,5 +1,3 @@
-DIST watchfiles-0.8.1.gh.tar.gz 15405 BLAKE2B ea5d6d59b930f00d6b4b8d6236a38dbb2463866246f1ff4cda828a99a7383fac9c47b131417d8f375a105733c7567f32895759a8dc4503f5671b524977e282ed SHA512 2f611786d267ceae5d6e9094400f5dc6eb59a008f047a511b58b329762e63bbcd83a56cc95cca54c8480b1702c160548baa30549e907e6b85c8bf176ba339fb6
 DIST watchfiles-0.8.2.gh.tar.gz 15515 BLAKE2B 97c17737c6970c8b799707547cef760c307cd000d09cf3a338e47c0735d537e0321643066eab592f7f7e6ccc25272ea1e7e0bbc02f6274864f7cc39a177b83ba SHA512 a44b831352ace03c450781bc815b1813c44c386d666a9b724b562ff69228705651bfc23e81b7344d0f79c62577d4f910b323c734298e2a609f85bbc4a0f0498e
-EBUILD watchgod-0.8.1.ebuild 1289 BLAKE2B b674459b7943b48cacbe424bbe3a9f71289febea1072190bdee4579b678ed2a6854a23145ec97ee0d121e5c8febf82d5f40b4a61587892730e7e29c3fc0c7287 SHA512 e243f4ef4b52ba92fb4859c708344d2f2e834d8f5fae0bc2599e99465b5f99cd437977ada48f030390e6e068b69d1d252ea5259e9ee46763c61fd8f8bd737fee
-EBUILD watchgod-0.8.2.ebuild 1310 BLAKE2B 1e4ff7d7e08e599f465270faf94dcb13b916bdb75de579bfcacbbb26f844d6c8a3836b746014b5ba22f57d496b6a12f2596feb2e36b558c4957428f04eeb4718 SHA512 7c071b9c7eeb2d98cd050b9df083db4b3dd15f6397200a7258611b2f30c40c54800c338afef1feb24be2d673c66c5e204ed0c5673a7dba4b889f62f80313de27
+EBUILD watchgod-0.8.2-r1.ebuild 1396 BLAKE2B 02d1a30949eff5193cfa07751044f4eb068fbe3cd85114507b5fdb683641b6f94641604f99938de8ef46e6b36571545ffb143a6695f45e6a233a11e9b0debe25 SHA512 df3a4f91fb9cab84864405b670c27246564812ae7eb5c82574c8853c1bb69b0efd4efe93629944f5e24ca96596c2add167af1c251aee1de60d37cef692f99a66
 MISC metadata.xml 353 BLAKE2B 9fba49b9fcbfb15db8c5709ba52b803063c010ebeaed0ab6ee715e776a7da16c295ef6ae6495dd94372835970b34676dbf5b05d96b6bfc737bd68f504384d9f1 SHA512 ca0d0d4135e2ce7678ce004a48389ac614f512f502194ec542d461592ab73d63d68ed5d9a4f9ccc1a37b74435bfb6c75d309bccc43eba8d53fdc36520199d751
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
index 2efec4c90eb0..a19fe1d0b4f5 100644
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/anyio-3*[${PYTHON_USEDEP}]
@@ -39,10 +39,12 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
 	distutils-r1_src_prepare
+
+	# increase timeout
+	sed -i -e '/sleep/s/0.01/1.0/' tests/test_watch.py || die
+	# fix version number in metadata
+	sed -i -e "s:0\.0\.dev0:${PV}:" watchgod/version.py || die
 }
 
 python_test() {
diff --git a/dev-python/watchgod/watchgod-0.8.2.ebuild b/dev-python/watchgod/watchgod-0.8.2.ebuild
deleted file mode 100644
index 1c0a5bceb127..000000000000
--- a/dev-python/watchgod/watchgod-0.8.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=watchfiles-${PV}
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-		tests/test_watch.py::test_awatch_log
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_watch.py::test_does_not_exist
-	)
-	epytest
-}