gentoo resync : 03.03.2021

4 files changed, 2 insertions, 85 deletions

diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index e9f617d40a66..8e24095138c7 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,6 +1,3 @@
-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.11.gh.tar.gz 2968469 BLAKE2B 5b1b8872e8786897a51ff96a659ceef0deed81b3cf02edc1f69b6ee504a3c4510621b56678dd28fa795231dfe8481daf3a77bb151ee117fe0541af1983412548 SHA512 343f62a7a658569de885ac923a1de7f7b4cc5bf63d27d1b13474795ca38cc52932e35133b45d05c1b42d498af56f5945fad5c49b3cbdebda70337294da5d84c4
-EBUILD deprecated-1.2.10.ebuild 541 BLAKE2B e6fc86387d3865b69ff2ed9b7d49f1482e9e265367dbdc3a69624e232955a007f451350855e6c8b8dc0d64f56175be3f3f9ba69061a72f53831738c8ea26cc3d SHA512 0dd368dd5b324b464955fc81c1ee56fd36d034b90cf8bcb81d947d00f0b20962c6e8c87deb1eeb34127470949e15a783d77fb69f042d7bbe4dbf2c5db08dad29
-EBUILD deprecated-1.2.11.ebuild 789 BLAKE2B 19a6074b6cdaf5024001e5887aac551d1b5f3e752a9c85f3b8116a13c20dd33fbd77e6cb776aef6b15571dd614d053271af4fae0d72abddbeae2c6d368dd638a SHA512 cd746e095ae9947ecc01e74b7c1132a179a00d37b7665d821723ddeafc27cf7ed413cf87f3623b74027378ed466cadc9d5e298e68173d35ee6fa5384ffe327e9
+EBUILD deprecated-1.2.11.ebuild 787 BLAKE2B 81700df1ca147cd751039da2d5c085a2b77e1bcc359eaa3baec42f562658bcb11eb7e2bcf68e0c687180a5b4015ab313fdc5725ed21b925e6660bb9f811591d0 SHA512 793efa65a94b4d8f9d9216f5374ca35fc0ef8eeef68a5ecf0af3b70e0be08b6779cc45a8c8380b189512ef0991ccb4ba9665fc9ab1921d9c2265cb0c2ade31e6
 MISC metadata.xml 315 BLAKE2B 8016c6be7019b2ef9b31533e8a75480e8f57eb09f0d9f5de5ba53093fbd1e04fc4299f0b18ec4c56b89c2ee06718d3bab8442a28cf457a7fc87c99469738ca05 SHA512 c5c38075210982e49af49da7e3094c4aea053e3cbfce85fa7e8549d842cfefdf3f9d537b85380370093d3e9bc3d108822b1c620eadf369267cbec865c4d5d15e
diff --git a/dev-python/deprecated/deprecated-1.2.10.ebuild b/dev-python/deprecated/deprecated-1.2.10.ebuild
deleted file mode 100644
index d9befb9fe1a2..000000000000
--- a/dev-python/deprecated/deprecated-1.2.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="https://github.com/tantale/deprecated"
-SRC_URI="https://github.com/tantale/deprecated/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
diff --git a/dev-python/deprecated/deprecated-1.2.11.ebuild b/dev-python/deprecated/deprecated-1.2.11.ebuild
index 1b72f93f7450..aa8bf30defed 100644
--- a/dev-python/deprecated/deprecated-1.2.11.ebuild
+++ b/dev-python/deprecated/deprecated-1.2.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/deprecated/files/deprecated-1.2.10-py39.patch b/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
deleted file mode 100644
index 42ab81445b7a..000000000000
--- a/dev-python/deprecated/files/deprecated-1.2.10-py39.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-