gentoo resync : 03.03.2021

5 files changed, 4 insertions, 76 deletions

diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 543ae724d2ac..34aea5dc8a1b 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,6 +1,3 @@
-AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
-DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
-EBUILD imapclient-2.1.0.ebuild 977 BLAKE2B 3b19d3889da214c3d6e8e83194f0ce70a8426ac62444fa25eee38fd4f7bdcba194a2bdcf73cfc3eaa58aefd9fec5688e1bf5ff6f08adf21b178baea8b48d0f32 SHA512 c61b95efb6d9388c008f3fe94d0b8e6d4988600c8c1b7fae15bc2fe29ec3eb9eac8e3c0a48c5f892370f138d3b1c29c5c404bca12f8d422f30877dcaff4d3eb9
-EBUILD imapclient-2.2.0.ebuild 634 BLAKE2B 636bfd7e016e3272486ddb7f4039dddfb3bbd04b9aa4590f3b7970180acaa27e26a3f243199f813d4c1d10efce31eb5d1442a081c70276bc309ba550c58a770e SHA512 081f0931eea439f930d70e5f2de00ef8dad52c0ed44e2f98f94a329d3470f3c77a8044d8b0e86a5a59cc7f75330d2d04afccf98c046ec9ea33d580b32d48af90
-MISC metadata.xml 367 BLAKE2B e8e78992c7b20719db0dbf8ad12b3be2233755a23c252067d4108854721f71e5210154ced2ec1ad17c6e0b2196ca328a5d8b651ae138c66b5d6904f5c97e6fc5 SHA512 d4fcecd0bba2fc7c51b71a05cfff6ebc4c823e7cb0ee56d58ddca5596fb9fd59bf132fb285c3570280fa91a95fc51a75f442854163372ad383506489ede29e40
+EBUILD imapclient-2.2.0.ebuild 632 BLAKE2B d3c7eee95f1e59a30d59f422486067bad8f70017697a3364c044daa95fb8c5fd35730d65218e5b6dc0f466da6eba3e9b61a2d936d2927388563f8f584eebf1e2 SHA512 1cdbe03a30833bb21095d5d9acb7427bccf974603ab250eaefd433f168b0c007489f88f39ad7a43da983c6b7aaf88f92536551e5174e870382db4d464b8c4fb9
+MISC metadata.xml 391 BLAKE2B 4ecbaacc88911d9cb4e071aa9621451aa1bb81af27b2241040f8fe138bd863f2a9000d80e5c0d69f5c94e828d045f48db9fb01283f731fe904695a45beb3fc16 SHA512 07ce6935970d9897e98af7a576c679be236c37b419292ab95bb63bcc7cb2d505dc12966d6eac9e83301073b366f7f63572620b18a6c47359b99ad8003b833370
diff --git a/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch b/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
deleted file mode 100644
index d9a429a27671..000000000000
--- a/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 26fb9c9794ad0b2541320d71d5704fce5642a53c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 10 Aug 2019 09:15:37 +0200
-Subject: [PATCH] test_imapclient: Fix LoggerAdapter version check
-
-The LoggerAdapter behavior change has been backported into Python 3.6.4.
-Update the check to expect logger.log() call in 3.6.4+ rather than 3.7+.
-
-Fixes #383.
----
- tests/test_imapclient.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_imapclient.py b/tests/test_imapclient.py
-index 91ccfa9..0f12823 100644
---- a/tests/test_imapclient.py
-+++ b/tests/test_imapclient.py
-@@ -604,8 +604,8 @@ def test_redacted_password(self):
-         adapter = IMAPlibLoggerAdapter(logger_mock, dict())
-         if six.PY3:
-             adapter.info("""> b'ICHH1 LOGIN foo@bar.org "secret"'""")
--            if sys.version_info >= (3, 7):
--                # LoggerAdapter in Python 3.7+ calls logger.log()
-+            if sys.version_info >= (3, 6, 4):
-+                # LoggerAdapter in Python 3.6.4+ calls logger.log()
-                 logger_mock.log.assert_called_once_with(
-                     logging.INFO,
-                     "> b'ICHH1 LOGIN **REDACTED**",
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
deleted file mode 100644
index bca796278b14..000000000000
--- a/dev-python/imapclient/imapclient-2.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="https://github.com/mjs/imapclient"
-SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# fix incorrect assumption about py3.6 behavior
-	# https://github.com/mjs/imapclient/pull/384
-	"${FILESDIR}"/imapclient-2.1.0-py36-tests.patch
-)
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.rst NEWS.rst README.rst )
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/imapclient/imapclient-2.2.0.ebuild b/dev-python/imapclient/imapclient-2.2.0.ebuild
index 14f71e42f9a5..584b7a19fed0 100644
--- a/dev-python/imapclient/imapclient-2.2.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/imapclient/metadata.xml b/dev-python/imapclient/metadata.xml
index 810750331cb1..6569c46b35fd 100644
--- a/dev-python/imapclient/metadata.xml
+++ b/dev-python/imapclient/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">IMAPClient</remote-id>
 		<remote-id type="github">mjs/imapclient</remote-id>