Adding metadatav21.1.5

5 files changed, 13 insertions, 82 deletions

diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 50295fae8cf1..59232385963d 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,2 +1 @@
-DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
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 26628d485e92..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_{6,7,8,9,10} )
-
-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 3836910c76c2..03da0b609fe4 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..f118b0234b4b 100644
--- a/dev-python/imapclient/metadata.xml
+++ b/dev-python/imapclient/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">IMAPClient</remote-id>
-		<remote-id type="github">mjs/imapclient</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">IMAPClient</remote-id>
+  <remote-id type="github">mjs/imapclient</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file