gentoo resync : 15.12.2019

6 files changed, 176 insertions, 1 deletions

diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index bad270f5440b..707e1db5286f 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,8 @@
+AUX passlib-1.7.1-tests.patch 1552 BLAKE2B 86cfedd409d6aff983c31ec33362577e5e353fa00fafed47927cec318d79d79fea75af80a283ef23b6453fb2da1bb5c46ae513b784e97941a8a45dfd4089bb26 SHA512 ccdf6814890e1c25b5eed9b2685ca2778fe155c3f7d75f2b76433a91785baa93b692aa6ee0f3a85b768f3b0189be185acce1e570961d28540d8f9dd12a81db7d
+AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.1.tar.gz 645724 BLAKE2B f34e3bbc5a61ff71cc989fa26edb9f992909bfdcc6ca1b094ebc02fc9942eb1db1ea18fc3dd5bb7d9fcecf6b4bd82e93aba07c7ce63ec85452b5d7117a6e1968 SHA512 3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168
-EBUILD passlib-1.7.1-r1.ebuild 924 BLAKE2B ea4f6bd10d9d5291cf41b8198a80597dd9b93e66c8635b5176c282b093c97dd961e3a1b490ca87a43267afa0961313cf823d5b8f693d5aace4a0f17b6345e06e SHA512 899b6c4a9336f07697869dd55d84602551904a765285045233f9249d49a134eaf4faf502cfd269dd84f0a37e6b45ec90c4118e791f685d96a291bdfe0857e56e
+DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
+EBUILD passlib-1.7.1-r1.ebuild 951 BLAKE2B 360d814517701b163e92800af22089522bab1cda92798fa29a946218a8e45c20b65affdfd9ac62ee76e2611f4b703b2b9140c585e1dbd7da7bd012264b508f73 SHA512 79d89aca9012f2843f39b7193faa4f07ca10694a82621e17bc1c57aa03f66b5195bb77202cbcbb49bd756d4c538f6725d7e05f3070926ead0b22fffa6fe98238
+EBUILD passlib-1.7.1-r2.ebuild 1024 BLAKE2B 9b18e3d13e79804f38ef7976d29af99c97c0e124db4ec4e4f3e498bbdea35b82e29292a5e9f734f9a9cb4191a4c09ac701f792cf2dd3e7404d1911ade8c08536 SHA512 2ceff70b8b569a603b3e1b7420f6121e89df54d6ac5332bdd56de2f052a8873562a0f5da4a2bf051f14227273e179b4af9677738f990120110e721cf6c0b677d
+EBUILD passlib-1.7.2.ebuild 875 BLAKE2B 3e0cafea93c6c12a2415d17fe75858b1509c9f3826d0eb4f9abbf9ac9a4732e6cc524634a090fa0a619dabce8ba65d5d52201f77664f7fb0d4ffe6fb4a0dedaf SHA512 b8a7c48a9f24f9b242fb73562dc571c50dbfdbfe7f74fd4c4e402b66431fa72b99d835c44a69eaf092d52771950ef229c23ccc84ca4238fc5bce36c72ac18029
 MISC metadata.xml 913 BLAKE2B e5e596a7d8039ea24c92c7cc33702c8adbfec59171a6dfb6ddf83beb213d5a29ca0c2c12b3f7d59f7dd5e5234984bdcdeae0f9dc859faa2bb23f2c3ac072b322 SHA512 942c129b6e9213511959c07967ca77c8888571b8e8ddda7e57da964f4dbb58f55ff10f90d1322d3a95752f00f1439bfb29604600e7a3b926660513d52a6c8b1c
diff --git a/dev-python/passlib/files/passlib-1.7.1-tests.patch b/dev-python/passlib/files/passlib-1.7.1-tests.patch
new file mode 100644
index 000000000000..697262fcd9b3
--- /dev/null
+++ b/dev-python/passlib/files/passlib-1.7.1-tests.patch
@@ -0,0 +1,33 @@
+Only in passlib-1.7.1.orig/passlib/tests: .utils.py.swp
+Only in passlib-1.7.1/passlib/tests: .utils.py.un~
+diff -ur passlib-1.7.1.orig/passlib/tests/utils.py passlib-1.7.1/passlib/tests/utils.py
+--- passlib-1.7.1.orig/passlib/tests/utils.py	2019-11-19 21:39:07.373344777 -0800
++++ passlib-1.7.1/passlib/tests/utils.py	2019-11-19 21:39:13.525351120 -0800
+@@ -16,6 +16,7 @@
+ import tempfile
+ import threading
+ import time
++import unittest
+ from passlib.exc import PasslibHashWarning, PasslibConfigWarning
+ from passlib.utils.compat import PY3, JYTHON
+ import warnings
+@@ -3149,6 +3150,7 @@
+             self.assertRaises(MissingBackendError, self.do_genhash, 'stub', hash)
+             self.assertRaises(MissingBackendError, self.do_verify, 'stub', hash)
+ 
++    @unittest.skip("fails due to unexpected support on linux, probably out of date")
+     def test_82_crypt_support(self):
+         """test platform-specific crypt() support detection"""
+         # NOTE: this is mainly just a sanity check to ensure the runtime
+diff -ur passlib-1.7.1.orig/passlib/utils/__init__.py passlib-1.7.1/passlib/utils/__init__.py
+--- passlib-1.7.1.orig/passlib/utils/__init__.py	2019-11-19 22:55:46.438000094 -0800
++++ passlib-1.7.1/passlib/utils/__init__.py	2019-11-19 22:56:37.144958345 -0800
+@@ -903,7 +903,7 @@
+ 
+         # the current time, to whatever precision os uses
+         time.time(),
+-        time.clock(),
++        tick(),
+ 
+         # if urandom available, might as well mix some bytes in.
+         os.urandom(32).decode("latin-1") if has_urandom else 0,
diff --git a/dev-python/passlib/files/passlib-1.7.2-pypy3.patch b/dev-python/passlib/files/passlib-1.7.2-pypy3.patch
new file mode 100644
index 000000000000..304388196b23
--- /dev/null
+++ b/dev-python/passlib/files/passlib-1.7.2-pypy3.patch
@@ -0,0 +1,65 @@
+diff -ur a/passlib/utils/__init__.py b/passlib/utils/__init__.py
+--- a/passlib/utils/__init__.py	2019-11-19 11:41:26.000000000 -0800
++++ b/passlib/utils/__init__.py	2019-12-03 14:16:15.153791186 -0800
+@@ -57,7 +57,7 @@
+ )
+ from passlib.exc import ExpectedStringError
+ from passlib.utils.compat import (add_doc, join_bytes, join_byte_values,
+-                                  join_byte_elems, irange, imap, PY3, u,
++                                  join_byte_elems, irange, imap, PY3, PYPY, u,
+                                   join_unicode, unicode, byte_elem_value, nextgetter,
+                                   unicode_or_bytes_types,
+                                   get_method_function, suppress_cause)
+@@ -776,23 +776,41 @@
+
+     if PY3:
+         def safe_crypt(secret, hash):
+-            if isinstance(secret, bytes):
+-                # Python 3's crypt() only accepts unicode, which is then
+-                # encoding using utf-8 before passing to the C-level crypt().
+-                # so we have to decode the secret.
+-                orig = secret
++            if not PYPY:
++                if isinstance(secret, bytes):
++                    # Python 3's crypt() only accepts unicode, which is then
++                    # encoding using utf-8 before passing to the C-level crypt().
++                    # so we have to decode the secret.
++                    orig = secret
++                    try:
++                        secret = secret.decode("utf-8")
++                    except UnicodeDecodeError:
++                        return None
++                    assert secret.encode("utf-8") == orig, \
++                                "utf-8 spec says this can't happen!"
++                if _NULL in secret:
++                    raise ValueError("null character in secret")
++            else:
++                if isinstance(secret, str):
++                    orig = secret
++                    try:
++                        secret = secret.encode("utf-8")
++                    except UnicodeEncodeError:
++                        return None
++                    assert secret.decode("utf-8") == orig, \
++                                "utf-8 spec says this can't happen!"
+                 try:
+-                    secret = secret.decode("utf-8")
++                    if _NULL in secret.decode("utf-8"):
++                        raise ValueError("null character in secret")
+                 except UnicodeDecodeError:
+                     return None
+-                assert secret.encode("utf-8") == orig, \
+-                            "utf-8 spec says this can't happen!"
+-            if _NULL in secret:
+-                raise ValueError("null character in secret")
++
+             if isinstance(hash, bytes):
+                 hash = hash.decode("ascii")
+             result = _crypt(secret, hash)
+-            if not result or result[0] in _invalid_prefixes:
++            if PYPY and isinstance(result, bytes):
++                result = result.decode("utf-8")
++            if not result or result[0:1] in _invalid_prefixes:
+                 return None
+             return result
+     else:
diff --git a/dev-python/passlib/passlib-1.7.1-r1.ebuild b/dev-python/passlib/passlib-1.7.1-r1.ebuild
index 31ff00f1fde6..5791a80c010c 100644
--- a/dev-python/passlib/passlib-1.7.1-r1.ebuild
+++ b/dev-python/passlib/passlib-1.7.1-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD-2"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt test +totp"
+RESTRICT="!test? ( test )"
 
 RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
 	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
diff --git a/dev-python/passlib/passlib-1.7.1-r2.ebuild b/dev-python/passlib/passlib-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..f72758004e54
--- /dev/null
+++ b/dev-python/passlib/passlib-1.7.1-r2.ebuild
@@ -0,0 +1,38 @@
+# 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,6,7,8}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
+HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+SLOT="0"
+IUSE="+bcrypt doc +scrypt test +totp"
+
+RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
+	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+	scrypt? ( dev-python/scrypt[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/passlib-1.7.1-tests.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	nosetests -v -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
+}
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
new file mode 100644
index 000000000000..90238f185175
--- /dev/null
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -0,0 +1,33 @@
+# 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,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
+HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+IUSE="+bcrypt doc +scrypt +totp"
+
+RDEPEND="bcrypt? ( dev-python/bcrypt[${PYTHON_USEDEP}] )
+	totp? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+	scrypt? ( dev-python/scrypt[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/passlib-1.7.2-pypy3.patch"
+)
+
+distutils_enable_tests nose
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
+}