gentoo resync : 30.05.2020

4 files changed, 66 insertions, 6 deletions

diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 9fdc93ca95dc..9e0227e9da4c 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,7 +1,8 @@
+AUX deprecated-1.2.10-py39.patch 2040 BLAKE2B cd8f7c7b29c3a81bcccf907fca26864801db0440fa675581222d20d39dbfc19eeead1a708cea3b500ae15af0f3f0c64e2838a7ec8a8b57b540ced07d1641e1d5 SHA512 5cece72f18f0faab35814cd2b59bd441a0f21ebb3b2c392d9e0936df4c321d15dcefe7333615462d2fda57cf640cb8e5a95d2e2486502caec33894ddb1faf49e
 DIST deprecated-1.2.10.gh.tar.gz 2967353 BLAKE2B 941fa81dd27940be4fde1219a9fe127777354aa2054b15178cade4a859b01f8dff426e0da8161bac580ff6446b44767f3207b474bb5f555826239db039085497 SHA512 4bd53b759d04ab15c74a4c147b2c69c73aed6e40555acf0e84cf0c5b7ffe248da234bd1311c5629f9357d50bc08e55e81363340dcfdabe88933525bcc7859a70
 DIST deprecated-1.2.7.gh.tar.gz 5044697 BLAKE2B 5e295ce21a3e536e08b6e57d78d3682b31e9041f4c53d97c06af03f8272a5b729c892449210471b80500ce499fe9e6af22df8ac0aeec5ac774fd74590ebdfc3b SHA512 da99a22410fdcc2a96cb5b15c489971078ce34e251406ae3dce6b3f97e284a4f09aaf1c5702407abe85a94cb6c8d9237f373a3096d6182e4a9cd1990be2817f1
 DIST deprecated-1.2.9.gh.tar.gz 5332765 BLAKE2B 0b88c15a0186d3adcfe3076a477e1bce3565caf39feb8e25c28865d85a168ed4cecda33fd68158571ebaed429e61b2de290f0c7e832dc87baa9cd4d439dcb093 SHA512 04a248d78021c45a1254f80966e6e4e6817ff3f8312d36fa9874c300fc106b7bed3600702a6953044f88cfa08f8ea8d6447c160554d8c1e1568051d3ce4a175b
-EBUILD deprecated-1.2.10.ebuild 550 BLAKE2B 2c34765cc8ca09a11fb7a0b84061bf4f6a71f836f264db9eabc4587a573b13398dd0bac87e8c3afbe66bd24eaed9e3e75bb138416ad2eb5fb952fbd2e5857ad5 SHA512 3f4ab2cbd18fc099437aec2fb90acd6bba5e654f2db1162eeec30b09c6a75d2b6af902d393bd684dc441f6c2086fb02af3e8f7fcbe41c818237a65530977e697
+EBUILD deprecated-1.2.10.ebuild 543 BLAKE2B bd1778ccd27bc3884a19e9f231d50e19c91c4eda2f53d3865f7f0be555ef540346bcd18f1514f87171b50aba739d324ac143642a7a2c8da7889f039249d8bbc6 SHA512 378f3bc94b2b238a910409d4b7eeebc519fdaffa91fa8347df8d7532147cd13a5f115be418568a78c86500793ef7dedb64fda08458ea6d22c85ea269d77f11f5
 EBUILD deprecated-1.2.7.ebuild 548 BLAKE2B 662dd028bd1b654d0fe7c889c742f032ca724bf52b5065351cd730bedc7f9c0ecb0f0c9152717fac6eedc8113c87ea30cd787e7adf5b850f9d332dda675a4081 SHA512 5b9f69ac4bab6d2cc439ffd8480db90e1d826802717dda966e2f95d3c05ae98bc3afcdf0f31644ef05d8f563831b735690d56afea88dfdc1fa43c35c47ad6fb3
-EBUILD deprecated-1.2.9.ebuild 550 BLAKE2B 2c34765cc8ca09a11fb7a0b84061bf4f6a71f836f264db9eabc4587a573b13398dd0bac87e8c3afbe66bd24eaed9e3e75bb138416ad2eb5fb952fbd2e5857ad5 SHA512 3f4ab2cbd18fc099437aec2fb90acd6bba5e654f2db1162eeec30b09c6a75d2b6af902d393bd684dc441f6c2086fb02af3e8f7fcbe41c818237a65530977e697
+EBUILD deprecated-1.2.9.ebuild 498 BLAKE2B 10d268b3bf2575854d700f280b37410253a53729224b99360271bfe68264a738689cca3fa5a34277e2da8aa2d0fe4de4f08f35a28821adae5c0b72f7f4bb75d7 SHA512 537f727f58c9ee07304b92a4d2aa0a84a4f0d842ce56cbd19fc5980d9928e2af242f40aa4bfffde6976104616b5bd28bd2d1435a63744e4a3e285e34d337e35c
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/deprecated/deprecated-1.2.10.ebuild b/dev-python/deprecated/deprecated-1.2.10.ebuild
index a5088d2c205c..b2b1fcd65d1d 100644
--- a/dev-python/deprecated/deprecated-1.2.10.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python @deprecated decorator to deprecate old API"
@@ -15,6 +15,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py39.patch
+)
diff --git a/dev-python/deprecated/deprecated-1.2.9.ebuild b/dev-python/deprecated/deprecated-1.2.9.ebuild
index a5088d2c205c..cf3f9570dd6a 100644
--- a/dev-python/deprecated/deprecated-1.2.9.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.9.ebuild
@@ -12,9 +12,8 @@ SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/dev-python/deprecated/files/deprecated-1.2.10-py39.patch b/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
new file mode 100644
index 000000000000..42ab81445b7a
--- /dev/null
+++ b/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
@@ -0,0 +1,57 @@
+From 629e7b702ede03262afeb86cd7a6d42d739504d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 30 May 2020 09:30:58 +0200
+Subject: [PATCH] Update expected class method deprecation msgs in tests for
+ py3.9
+
+Python 3.9 has fixed @classmethod combining with other decorators,
+making deprecated correctly report 'class method' (instead of function
+or static method).  Update the tests to account for that.
+
+Fixes #29
+---
+ tests/test_deprecated.py | 6 +++++-
+ tests/test_sphinx.py     | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_deprecated.py b/tests/test_deprecated.py
+index 3796640..e4c00ef 100644
+--- a/tests/test_deprecated.py
++++ b/tests/test_deprecated.py
+@@ -1,4 +1,5 @@
+ # -*- coding: utf-8 -*-
++import sys
+ import warnings
+ 
+ import pytest
+@@ -184,7 +185,10 @@ def test_classic_deprecated_class_method__warns(classic_deprecated_class_method)
+     assert len(warns) == 1
+     warn = warns[0]
+     assert issubclass(warn.category, DeprecationWarning)
+-    assert "deprecated function (or staticmethod)" in str(warn.message)
++    if sys.version_info >= (3, 9):
++        assert "deprecated class method" in str(warn.message)
++    else:
++        assert "deprecated function (or staticmethod)" in str(warn.message)
+     assert warn.filename == __file__, 'Incorrect warning stackLevel'
+ 
+ 
+diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py
+index 42f2460..efc8628 100644
+--- a/tests/test_sphinx.py
++++ b/tests/test_sphinx.py
+@@ -334,7 +334,10 @@ def test_sphinx_deprecated_class_method__warns(sphinx_deprecated_class_method):
+     assert len(warns) == 1
+     warn = warns[0]
+     assert issubclass(warn.category, DeprecationWarning)
+-    assert "deprecated function (or staticmethod)" in str(warn.message)
++    if sys.version_info >= (3, 9):
++        assert "deprecated class method" in str(warn.message)
++    else:
++        assert "deprecated function (or staticmethod)" in str(warn.message)
+ 
+ 
+ def test_should_raise_type_error():
+-- 
+2.26.2
+