gentoo resync : 06.04.2022

4 files changed, 2 insertions, 96 deletions

diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 052b080bceac..e63a9e2b7444 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,6 +1,3 @@
-AUX trio-0.19.0-python3.10.patch 967 BLAKE2B 78989da73496beb5058feedb8218a718b67dfe5b2bb3d6f975a89f972f14f2ac6cb4a21e1beac626aeaf9b4d8678b54a4899cf9714962309c241b4d09e08f17b SHA512 c1e01e0a1b74132cd2421def3c8e78d777e1ae45aa3b8abe234ce4212182769df3241c29ccbe173ba17b247dbc84edbf292cc38e5f9d7c2c8984816197efe669
-DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
 DIST trio-0.20.0.tar.gz 491254 BLAKE2B 354e8019d1ba8ac35bbb00477806ab87d62de0e9a94b1ff3a4d63c024af8cd40261c46a2c9449f38550e809938f3c6ee620a47e866bc31203c3c4a4984446fa5 SHA512 9aa431d0bc28737dd48a7358446acaffbf34860dc467ac121166f7241ebf4a4ed8bcdc8dc0277034e3c3fd70f1f8a57d790e98bdda7a1141f2c53c6b85a97a3c
-EBUILD trio-0.19.0.ebuild 1877 BLAKE2B b2c6229033d38538835aa347d95b701c1a30ed6d859a43620c000c2d2b1824387281e0bc7f160a22c08c339c73140fcd5839fb0dabc8e91199cc0a1949b0fe1e SHA512 9a544a686b564b82010adcd93076306f12e9a4749c7dc07fed656dc401add9ce6f049f04a7f0de14bbde5081befd7676731721a587ce7e2532be4082da2a2fc4
-EBUILD trio-0.20.0.ebuild 1856 BLAKE2B b4cc219897103ac2464f4a241afa68253deacc52db3c669b37c37207bf52d50bcb9e7ebe243615ce0ce12d843acfab9229076efd49d4b0184a4247e01c7b8ecf SHA512 4f8eb4e531e126ba478ba84770a9d1fa71f3df134039cbd2003060a62ec72bf7b3c304d62c35b18a0ca1833b28b5efccde4abf8b8d3c5e2b762d38751f4dc0ad
+EBUILD trio-0.20.0.ebuild 1848 BLAKE2B f243d34756433855c9964a4978e2956894a1ea5e3dbe1a67b9a52af6ee1295c54111ec86b1508ec03dc83d505ca2fd6dead72791b50489544a5fd549d920b969 SHA512 8cc77add9c6335bc4e3cad922c8e0452ef5e38565bd73800bf8de3e1707f78a8a0d31bd53060bb418c7659d68a25b49346f109357db93345d467539290061502
 MISC metadata.xml 1959 BLAKE2B 8b8c53b057e11c334de01db932a4b7cb9dba98c200142765224af1252be7e3e756ebd2e8c1295212d8930df2afecafdaf252375e3e842c58d8149432ed038606 SHA512 d7ad911af38df2e7ef4e0659b3a8abf25c334e10d0a637c1d901a05e517e5caeee68932e4263c1bdedbee6af6e15b80cb1bb377ababe4078a507fc5096073b1a
diff --git a/dev-python/trio/files/trio-0.19.0-python3.10.patch b/dev-python/trio/files/trio-0.19.0-python3.10.patch
deleted file mode 100644
index 45af8955df3e..000000000000
--- a/dev-python/trio/files/trio-0.19.0-python3.10.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/python-trio/trio/commit/0a0b75c914e63366f23790d72caa10bdfcc186f6
-https://github.com/python-trio/trio/pull/2061
-
-From a9c54747b90129776f6d2d384e0f64efaac324ee Mon Sep 17 00:00:00 2001
-From: "Nathaniel J. Smith" <njs@pobox.com>
-Date: Tue, 13 Jul 2021 17:34:26 -0700
-Subject: [PATCH] Export IP_RECVTOS, newly added in python 3.10
-
----
- trio/socket.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trio/socket.py b/trio/socket.py
-index 5402f5bc7..afbcefa1d 100644
---- a/trio/socket.py
-+++ b/trio/socket.py
-@@ -117,7 +117,7 @@
-         J1939_PGN_MAX, J1939_PGN_PDU1_MAX, J1939_PGN_REQUEST,
-         SCM_J1939_DEST_ADDR, SCM_J1939_DEST_NAME, SCM_J1939_ERRQUEUE,
-         SCM_J1939_PRIO, SO_J1939_ERRQUEUE, SO_J1939_FILTER, SO_J1939_PROMISC,
--        SO_J1939_SEND_PRIO, UDPLITE_RECV_CSCOV, UDPLITE_SEND_CSCOV
-+        SO_J1939_SEND_PRIO, UDPLITE_RECV_CSCOV, UDPLITE_SEND_CSCOV, IP_RECVTOS
-     )
-     # fmt: on
- except ImportError:
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
deleted file mode 100644
index b02ca40ed6e5..000000000000
--- a/dev-python/trio/trio-0.19.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for async concurrency and I/O"
-HOMEPAGE="
-	https://github.com/python-trio/trio
-	https://pypi.org/project/trio
-"
-SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-# NB: we're ignoring tests that require trustme+pyopenssl
-BDEPEND="
-	test? (
-		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3.10.patch
-)
-
-EPYTEST_DESELECT=(
-	# Times out on slower arches (ia64 in this case)
-	# https://github.com/python-trio/trio/issues/1753
-	trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
-
-	# Fail with Python 3.10 on 'IPPROTO_MPTCP'
-	# Everything else passes and this is a simple check for exported symbols
-	# Let's try again with the next release (after 0.19.0).
-	trio/tests/test_exports.py::test_static_tool_sees_all_symbols
-)
-
-EPYTEST_IGNORE=(
-	# these tests require internet access
-	trio/tests/test_ssl.py
-	trio/tests/test_highlevel_ssl_helpers.py
-)
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx docs/source \
-					dev-python/immutables \
-					dev-python/sphinxcontrib-trio \
-					dev-python/sphinx_rtd_theme \
-					dev-python/towncrier
diff --git a/dev-python/trio/trio-0.20.0.ebuild b/dev-python/trio/trio-0.20.0.ebuild
index 4d8c69bb7ba7..5611597d176c 100644
--- a/dev-python/trio/trio-0.20.0.ebuild
+++ b/dev-python/trio/trio-0.20.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]