gentoo resync : 30.09.2020

4 files changed, 2 insertions, 59 deletions

diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 4a5bd6e4f9b4..372510dbf1b3 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,9 +1,6 @@
-AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
-DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
 DIST yarl-1.6.0.tar.gz 175492 BLAKE2B e6e3ebb30a591fa1e94d07c353700b1ebf7c21a729d8c9a4cd582f591235d54dee40a109e28fb806893e281b9ab36ca2b1ca1cdf7f093587bde8a5a9c4e7bf89 SHA512 d08d2c4a906706bba3c1fad2b02e01299d076d9f6c1a1eb172d116d0ccbb1e6143b7dd959d242f2a1b5d450416bb15ab6e53ee9e05876b161d61ec23e054f29b
-EBUILD yarl-1.4.2.ebuild 719 BLAKE2B 3354c40f113ed2db98e8680ab88f3cce22b87b3bd2eb3ad5c24ccdd08d3088bc75b7cedb63908df10043f98ed10ff5811698243c754fb32e12b38d452ad5063b SHA512 dfe79f360e1162543b5bd2870a3ad6d0421cc3941202702a8a72ba1c85c17722fd05230874461e6a1409a2fab55a932fe79f0d21cc818f0722dca00dd18d2af6
-EBUILD yarl-1.5.1.ebuild 725 BLAKE2B 4c163efccb4020f09267ad54f5d297ca4dadeb3bbf44607ce03c6139ba96e460be4e6968d156c58b3562574bfbaa9849faaf37f0c72f337eb351b446eb9f6817 SHA512 5113e5aee9d7a3e955551b99b869357ce52886b81cc5cb68fc45035c1ba324114857cda538571665d8ec7c87682b0027df5f495cd13fecf14df35d00df029fe5
+EBUILD yarl-1.5.1.ebuild 723 BLAKE2B 8897a20fab2df6b0adf8be24cad4981e54584aa95a376d0cbd41df756b825a03800520a3d21c25e5c349b622610766625c87a93b9346e5cee1578d3284abbe04 SHA512 61108f5fb825d7ef083e78f95ace2ce6941ccf0fae2986b5793a75346f233ec7b98df5dd3d5eeda6dee269c7736367371f9152800f14aa9059b9818122e72490
 EBUILD yarl-1.6.0.ebuild 731 BLAKE2B dc50c14dd0e15502daaf748c91b429b58bf284881c591301dbee301fc1ccd63c690ba6c70e7e9bb7f487c09b5bdf754303ebe1a9a2a52a4b59fa6d4c9a1f3981 SHA512 1c6818c83ec259d88bd9f2706c6170abdad72846e261de4f9d72edd502d243bf735965bd21c6aaddea9c5a3704ae7daa011e716774e2f10d80981b637dfc1dde
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
deleted file mode 100644
index b6f774a77eaa..000000000000
--- a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ca06b26582c08c6e75fa5588f712c4c2f7247223 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 4 Mar 2020 22:36:58 +0100
-Subject: [PATCH] Disable failing test TestScheme.test_no_scheme1
-
----
- tests/test_url_parsing.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py
-index beea365..58fa198 100644
---- a/tests/test_url_parsing.py
-+++ b/tests/test_url_parsing.py
-@@ -38,7 +38,7 @@ class TestScheme:
-         assert u.query_string == ""
-         assert u.fragment == ""
- 
--    def test_no_scheme1(self):
-+    def _test_no_scheme1(self):
-         u = URL("google.com:80")
-         assert u.scheme == ""
-         assert u.host is None
--- 
-2.24.1
-
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
deleted file mode 100644
index 8b0deec64b05..000000000000
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +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,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
-
-	# Upstream: https://github.com/aio-libs/yarl/issues/410
-	"${FILESDIR}"/${PN}-1.4.2-disable-broken-tests.patch
-)
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
index 4eb9a41647b8..335b8d485e09 100644
--- a/dev-python/yarl/yarl-1.5.1.ebuild
+++ b/dev-python/yarl/yarl-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]