gentoo resync : 18.08.2019

3 files changed, 75 insertions, 0 deletions

diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index cd79e05eef3a..da93df9ecb8b 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,4 +1,7 @@
 AUX 0.12-tests.patch 1596 BLAKE2B 2150cdfd5ae8135f83bd77f6260ab9bc4c2396c9ec6c7fe0e6d4c595ccf09272fd6b991aac89e93f3e267ab129ac15a0ba7c1589af291001987f9be5b279fd87 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d
+AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c8682da0a507d5d9c6f1a92f8d42daceaab214c1d033b4ddeb8f6f5081c53f7e464f72830202b048067d8685eaf761f9aa1bdb3 SHA512 cea2d0b0744cc76d52abda07a031b0e61a96e6019172e0e5490f6e32f757c6850344caa41b22d0db9fd814153c1f78d9d48260281d362ebf1eb2d9a05f9b4800
 DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
+DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 EBUILD imapclient-0.13.ebuild 1707 BLAKE2B 19d3cf70fe646da3b55033656ac0d4e0bf40be9b0549db998751ba5cca4ff14d19b4997146e4d5c5294a29ea2aec70672e70cfb87fefeb224e2b8cf4a9a62873 SHA512 99919483e6f7ff1d585ab7ea44e54ea4101a096035ff4a6972d32da2a2c8af4d16bbd1fd2c13831d3f33f993a609cce573b2afc847c768525d8728b6f85aeac7
+EBUILD imapclient-2.1.0.ebuild 1113 BLAKE2B 99d851c9455ba6f4cea1473e8947c74f89a2e7d3610af9c753e52b75a4670e1773f5d5c662dab292332d07e3bad9567e90970bff262c1104c2c3bd441437a9c4 SHA512 80e2690f10c123d9abbd7f768d7ce49cc29e40afe281596318a3ea3dd0aef22b07b7b4e308e276e0bb6b9afd2e90f452fe2c8667c12e78894ebcf4882c615133
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
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
new file mode 100644
index 000000000000..d9a429a27671
--- /dev/null
+++ b/dev-python/imapclient/files/imapclient-2.1.0-py36-tests.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000000..2b5dec6af405
--- /dev/null
+++ b/dev-python/imapclient/imapclient-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+
+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 test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+
+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
+}