gentoo resync : 25.08.2020

5 files changed, 86 insertions, 40 deletions

diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 3d8dbb83727f..05e39df6c538 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,7 +1,8 @@
 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.3.0.tar.gz 159748 BLAKE2B cd7844545f3ee749d1dce865e21065c2b8e0c1ebf4715a3f8ec01064e534fa5b8b872539aece8a7e3a7ae147942ff5e0dc1878d84449d8248fd8e33c4234e3f1 SHA512 58e539900e7754b0a3d41960ebe20d21fd7245ce71fccb31d6a1204298dd71cacd742b2cb2b4c49c3a9b28ce5c664c412334f29e23a3c608aad8018142ba3e14
+AUX yarl-1.5.0-typing_ext.patch 1762 BLAKE2B e633e9dac216db8c530338b87275fa0b655623adc3a1e651bc5a13d82ff8f064507bb2bd875f23124ca329b6c6d7dc146bb2f058400aa3e71db8c87c6c2e8870 SHA512 ac2b28541876815d9e8e7ad15a30d6cb183315bea56c8c7ab1aefe0eb8e95797a81846045371a03ec2ffa797f6ba0587c15a479b263726b08869287be9821653
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
-EBUILD yarl-1.3.0.ebuild 830 BLAKE2B cc31ea0ccab8787c7b0a4fc50c4c4859b70d4bbd2264ecd5fbb65d944b5be7f4a3d77416643b447d4d85da79225dace6af20d9244cedd0c913f43b06cdadab65 SHA512 81237147ffab8d8497bb5305a766d656725c9b0f2d168e6f42c5b713f8a3feb3080d61c91ff0e33da531c081fe4837900e3876e11c8490efb33a183d123b8663
-EBUILD yarl-1.4.2.ebuild 727 BLAKE2B b9256d903e30bc0de5f1c0bf193de0298308c7dc90c15dcadbdfe9292b69053e7cea9ab50ddc48fab9cbb3854008a08ac6a0e775b042aba5fb273131b2c77b80 SHA512 4a3e36be601f4deed9780d1afe451229c58cf35060152efeaec24a1ba9968845b8f2fc1fdcb262471c3fd21ddae1518f49341e28a2b47b5832c3f7330c26e00b
+DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
+EBUILD yarl-1.4.2.ebuild 723 BLAKE2B d0ec747247e1342272e63daf606b5637d413a06fbed263a73cb04cd3e89ed15c16c31416a52c966075cc0c9ed0c33280e8e6447f494b3c29bca1937752d3c70e SHA512 39c3dccccac74e8244d466b5c62ba1959b790545680cab67a67ce444453295b0665872905ca4f39ce42e0d001ff758f137b03057ecbb05650cacc8af99aa6387
+EBUILD yarl-1.5.1.ebuild 724 BLAKE2B 22f6d1f3db8859ebd110edf1560395a7fbb3bebdc35c04b60483066b3391c3dbf12e8a12f0d55bb87e6fcfe99feebf21ef6cf2c3f5ad64caa680381ef4526d49 SHA512 7a5ec414096aab918b1086d27dcb8802d56055375d51818de50176f7e8836929d4c8b26331d2382a57a5fc1904e576867ebd0eca0a24754f0e919b799f203f45
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch b/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch
new file mode 100644
index 000000000000..737135b0ff00
--- /dev/null
+++ b/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch
@@ -0,0 +1,52 @@
+From 47478e942992aaaa26c2defc3294cac45ede2cfe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 27 Jul 2020 07:13:19 +0200
+Subject: [PATCH] Require typing_extensions for py<3.8 only
+
+All the names imported from typing_extensions are available already
+in Python 3.8, so there is no need to use the additional dependency
+there.  Furthermore, typing_extensions currently do not support
+Python 3.9, effectively blocking yarl from doing so.  To solve this,
+use external typing_extensions only for py<3.8, and just use builtin
+typing in 3.8+.
+---
+ requirements/test.txt | 2 +-
+ setup.py              | 3 ++-
+ yarl/__init__.pyi     | 7 ++++++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 41d684d..1ed5bfe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,8 @@ with fname.open(encoding="utf8") as fp:
+     except IndexError:
+         raise RuntimeError("Unable to determine version.")
+ 
+-install_requires = ["multidict>=4.0", "idna>=2.0", "typing_extensions>=3.7.4"]
++install_requires = ["multidict>=4.0", "idna>=2.0",
++                    "typing_extensions>=3.7.4;python_version<\"3.8\""]
+ 
+ 
+ def read(name):
+diff --git a/yarl/__init__.pyi b/yarl/__init__.pyi
+index b3b58ec..eb4a12f 100644
+--- a/yarl/__init__.pyi
++++ b/yarl/__init__.pyi
+@@ -1,7 +1,12 @@
+ from typing import overload, Any, Tuple, Optional, Mapping, Union, Sequence, Type
+-from typing_extensions import TypedDict, Final, final
+ import multidict
+ from functools import _CacheInfo
++import sys
++
++if sys.hexversion >= 0x03080000:
++    from typing import TypedDict, Final, final
++else:
++    from typing_extensions import TypedDict, Final, final
+ 
+ _QueryVariable = Union[str, int]
+ _Query = Union[
+-- 
+2.27.0
+
diff --git a/dev-python/yarl/yarl-1.3.0.ebuild b/dev-python/yarl/yarl-1.3.0.ebuild
deleted file mode 100644
index f541d5c0f1d2..000000000000
--- a/dev-python/yarl/yarl-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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="amd64 ~arm arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# don't use pytest-runner for tests
-	sed -i 's|"pytest-runner"||' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index 33d927f6403b..f58f2871d2bf 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.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 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
new file mode 100644
index 000000000000..87144d1075ec
--- /dev/null
+++ b/dev-python/yarl/yarl-1.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+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}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
+)