gentoo resync : 12.05.2022

4 files changed, 69 insertions, 41 deletions

diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 307ac1f6ab01..98de4aded70e 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,7 +1,7 @@
-DIST starlette-0.17.1.tar.gz 403781 BLAKE2B 75de462afc507d89159f17002eb2acc5453520ad312573d5697f5da8fc7d76fcb2407bf41086c923a60a59766f5ac02de1b003962a4d1031c062bd80a0d50e6c SHA512 a8f8cee0dc40d19eab62996f4ef1230fa758375fa9b51e15eae5c906a89b76519ebe4e423aa567d73e4c055cef63e9bbae11b47d4372e28b615f6edaf22a06a7
 DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d17316025330c8fda0c79dc21422399bcff01ccf5baf85eda7941f40aac5845d18fdcefaa23ba8ba442d30f0b9e194f7287c SHA512 521d39c1eec818250da3f2dc24cd2fb08393b76e6314a9bd5f3e520bdfa4652ae4ace5876b7e7f3a7ddc5540160e1086997a40b86a1b1bfd694c6aa1abde9106
-DIST starlette-0.19.0.gh.tar.gz 412337 BLAKE2B 31d8c7a7b0c1708ed23cf001061e03dbeb9ee7e57fb81cb4bc349cb6642f2a0a5aba973e96f6337c0d304a5e3c5be3ed4ed68045c3c165a4c952529278b859df SHA512 7b889c2cfd453882a9c34e0451975b6cdbf4a0274872225473bf196901ded01b03484c01fafbac8e8f5df4fe9bd146df966cd7f5b278592d0ef88e7cff5010a2
-EBUILD starlette-0.17.1.ebuild 919 BLAKE2B ef07501adf51d3d10b2d524f424d47fa6e0ca94205db514181e964e0362808cb75a2b1353e4764443f3455537f13999d222d59340c09cc0f2eabe2996737383c SHA512 487d154183f6098304605970f68e9d6d507b9943828bb63a29e29251a06b3e26f4788f43e030a34df41585790b1454330c96aaf9a152ef2de86646e75412ff51
+DIST starlette-0.19.1.gh.tar.gz 415049 BLAKE2B 15842a521b9cef2ed823e857f984d7d8db7a9fb4c0fb06d811fe29336a104c600b9c4f0a14b535ad1a84743cb4a1452d87f3ff0ae9245270b765af89254be86e SHA512 3fd721e4a8accfd4f0c1c87b4b0eb62b559066aeeb7ddd31dcacb73c2b4e8619fe727b10f2e3053199e710a561063ef7bbd73ad65294d0ce5db778d458ffbd91
+DIST starlette-0.20.0.gh.tar.gz 414497 BLAKE2B 47c6ef632a600bd18075c8ea65811ed18e08c285ed01cb34e5f74c00b2349430703ac041beacb35b91d941501001d2b93b79b777b403f5b6bef4682f6c13b02a SHA512 f28aff53732ec5950b2432ea644667d408e80cb4b51a177652a9bfe6731c6fa1208cba644fcaa84405bf51ef00f500a277c86e48f5446e2014369c1d1edda357
 EBUILD starlette-0.18.0.ebuild 1156 BLAKE2B 2c31219a2ec2d15ff2c2771e321aa36371d61f79eefb3bee6243bd22bbc27da479329cc36beaf4d4b231f7854808682c4885169660a5890b1aef7cd95175832e SHA512 f23e3ea3bbb5bb198c517195dee9bf6210b0dc714d5e86ffdb0831d15fd29b8be8a9be0b2700ac189bb37e1b2a61503893398f85f1026df71829c044a12a92e0
-EBUILD starlette-0.19.0.ebuild 1204 BLAKE2B 558be21f845261ea32d4387ec37c8c3652c6eef3b574e5e4aaed2a5cef5a5b39da24e708495fba46bf89e6725f3da139f8d80adc2ee74531d3072b2e4ddc4ef1 SHA512 890b60fbc7fea6dc1d6624077e87838cf1566e03525c54947c13417ee17e67ffde55c89c5a8b089ef4f2429e5a55b3db65d489e2d86aefdd3b5ad13ee8e01e1f
+EBUILD starlette-0.19.1.ebuild 1204 BLAKE2B 558be21f845261ea32d4387ec37c8c3652c6eef3b574e5e4aaed2a5cef5a5b39da24e708495fba46bf89e6725f3da139f8d80adc2ee74531d3072b2e4ddc4ef1 SHA512 890b60fbc7fea6dc1d6624077e87838cf1566e03525c54947c13417ee17e67ffde55c89c5a8b089ef4f2429e5a55b3db65d489e2d86aefdd3b5ad13ee8e01e1f
+EBUILD starlette-0.20.0.ebuild 1422 BLAKE2B b69ac68faf2c8a1df9c5c544cfc00258e639c193f5ec2a3211593e9ad22eacaed5fbb9bdd45057bea573257953fe92718dd934f8a0e7ec031155c2bbb161163d SHA512 ec6e970c536574dc59e46fb7cccf7a974514f0e2bb503a2daefb69a2604c9b9bcf798c525e834d8162e8a5b68a6527bb1fc45c4b9838138b45df1082edbcb77a
 MISC metadata.xml 324 BLAKE2B cbdb5983f2620f296eed8d81541e6ffbb084fdbcb698e52a6d86a64122834184e71ac423c21fa81d395be5505cb497be9172cd28d8fc633b6d31b844c480f741 SHA512 02c4d176ccc9c1b12e94f25c0de9792b6dc087a5d897bff8a46b2053951afad28b5c40f181ece8209acb3a8db1ec9e21a29af06b55f66efbc0d8f325d6958123
diff --git a/dev-python/starlette/starlette-0.17.1.ebuild b/dev-python/starlette/starlette-0.17.1.ebuild
deleted file mode 100644
index 81bb333e77d0..000000000000
--- a/dev-python/starlette/starlette-0.17.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="https://www.starlette.io/"
-SRC_URI="https://github.com/encode/starlette/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Needs fixing with trio deprecations (dies on ModuleWithDeprecations)
-RESTRICT="test"
-
-RDEPEND="dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/trio[${PYTHON_USEDEP}] )"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-
-	# Unpackaged 'multipart' dependency
-	tests/test_formparsers.py
-)
-
-EPYTEST_DESELECT=(
-	# Unpackaged 'multipart' dependency
-	tests/test_requests.py::test_request_form_urlencoded
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.19.0.ebuild b/dev-python/starlette/starlette-0.19.1.ebuild
index b006d8c4552e..b006d8c4552e 100644
--- a/dev-python/starlette/starlette-0.19.0.ebuild
+++ b/dev-python/starlette/starlette-0.19.1.ebuild
diff --git a/dev-python/starlette/starlette-0.20.0.ebuild b/dev-python/starlette/starlette-0.20.0.ebuild
new file mode 100644
index 000000000000..2d29021cef28
--- /dev/null
+++ b/dev-python/starlette/starlette-0.20.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+# brotli needed for consistent test output
+BDEPEND="
+	test? (
+		|| (
+			dev-python/brotlicffi[${PYTHON_USEDEP}]
+			app-arch/brotli[python,${PYTHON_USEDEP}]
+		)
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}