gentoo resync : 22.10.2018

4 files changed, 103 insertions, 3 deletions

diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index 4023900a35fd..0b31784daeda 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,6 +1,9 @@
-AUX mapping.patch 440 BLAKE2B 85788659884ba57f093680a6796ce0e71f0bf6a0f1f221d3d79ecd9055862b472d2cde87c436bbd18b387a4694c09d63e95974552f3f5652060f77e0625653ab SHA512 d69af2a319dc5f3511063b36b456a11c44b8d85d93b541cb223542b71eaef71fecd5405bdaa688d9516ca162060f64a4abe284841b7cbeaf69203f37ee5df120
+AUX mapping.patch 444 BLAKE2B 5d7da6146cb68d71d367900da68e7b1d18cf789c5df7ba4c614e32f6b8c18e17fe0c03c1bbb599438d052ed241590634c6011497adbe0128544b93294ab464af SHA512 09836864043b8f9d7e8eee7ed9bb2613d3ec34b90a1af3fc30239c54ea901a13b7ab89bdd3dc49a42873de783d1f622cc8b691b02f48b04947dd3667b4dc4fda
+AUX python-ldap-3.patch 1541 BLAKE2B 28a7ee4636c00a78ebcbbeaa86a33fe3e962d0fe8457a2e48817da48fcc2f6d3b1fc7dbdab785795f2a42e735f969fc63b3858634ee8e6ea63bfe754c44ce973 SHA512 ff112f3f0b5646d745c88319ed66bedf97b8c3b8b80ac84ea836f2fc6cc9427fcc600980bc3fc5c31f0ec8de73e23ca60bb9ff4b9ba6a11b2dae8382867fc2d7
 DIST mockldap-0.2.3.tar.gz 22369 BLAKE2B 0021951556c0b8ea1f043b702f4d8f8719d272559db3ad8ee4e49955bb17a3caab4083a37486366145d8a7aea927fdc0528c1194f849917471ba6174b52bb46a SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788
 DIST mockldap-0.2.6.tar.gz 22892 BLAKE2B 9ed6e7cb7c8ab770ec7ab3af01fb2228190c505ac2025adb7b728d9daa4851f51eeafdcaa3a7413d44a181f005a19ee25da99d93a7c71b9d0207c454a533401d SHA512 7ff0219eb349bc9cffd0580eb80fc7428ea856824428c048ee7e133d4c6609edfb713a73d6a26e2293156482304bdd4fb8034f600631c8b1e290355a4e9e7f4c
+DIST mockldap-0.3.0.tar.gz 18973 BLAKE2B d13665afb0fbbb8095036ab7576ff5a8c77f5711a0c6ec96032924191ff8b86f16031895ec7c1d8a0c67993121a70b2d62d645e5a2a4df713e48d82e2fe0e1e7 SHA512 0af4cf1762e280024525e8fbf897493925b91393311b36beec83dfb152c1dda5b8c7e45ddd10c02ea329a62b25133a4113a0a12292dcc669416ed4cebcabbaa8
 EBUILD mockldap-0.2.3.ebuild 1044 BLAKE2B fbbf56b1cf41eeeca71eebf637711643f7c254441d7d4f605c5b5e00970c4ca71c55c5c88609c666c10816c9c7f9d04c0f2426b5ba4b14899f284e2e229c42d2 SHA512 83fa5a12c8e030b1a4e181f3312f88ebcb6a3c8fd119da6f26884ba72b97fb5755021cf7be1da0a0b41ff4898218e100134b0db299e761e5e1b83c165cc8da36
 EBUILD mockldap-0.2.6.ebuild 1169 BLAKE2B 1c49245f498486d3416b4fcb5cf0a45826e8ddfe26009f34d217b5e3fda0a491467cffe5a070cc093206d7e085eb67eddcae0d0223503e75e2ff744aa9a60b0f SHA512 3c391760df32f971a39a2043c0c4f7f021e9c2478a560b198ee7256debe20cb12d629127928db24136ee03456102729529ccd9dab432c8a3c749fb90d519975b
+EBUILD mockldap-0.3.0.ebuild 1255 BLAKE2B a1e8aad6a61fb752f401bbaaf3bc0552eefaae2ab9aa93fccbb237bb56c5dd6ae6f69acbd093ffafe25cae4f70d564ce4809080d5c6fde1165c79f0dc293608e SHA512 3fb0280dd392d3d6c1e0be36f2a274c0b03383d0910c2ac596c521d7f8714b5ae13311b6beafdeb2d64c3807f1e284c78e5f6adbfaaf0a9b64feb4b7f730887b
 MISC metadata.xml 382 BLAKE2B ad5c85cdb04b4f63756abdfbeda8c5f7b5a03a763c0249119a8d8bd2cc72d4283217731b4abe0dd8b90d607ec9309c42d82b8292f75b1884c41a439331df263c SHA512 2b137abc6da4c0782249954a50bdf8d6ba9dd0254e04afdc5e0d7f5406a0451c78c2ed8b8fbc0c2214eb04a3ad842b250dc1910327cdab58fa5aa43f0de296da
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
index f3cdd862a9d6..b8c25eca5833 100644
--- a/dev-python/mockldap/files/mapping.patch
+++ b/dev-python/mockldap/files/mapping.patch
@@ -1,7 +1,7 @@
 Disable un-needed d'loading during doc build
 diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
---- docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
-+++ docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
+--- a/docs/source/conf.py	2014-03-08 00:51:00.000000000 +0800
++++ b/docs/source/conf.py	2014-04-12 16:04:52.113446583 +0800
 @@ -28,7 +28,6 @@
  # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = [
diff --git a/dev-python/mockldap/files/python-ldap-3.patch b/dev-python/mockldap/files/python-ldap-3.patch
new file mode 100644
index 000000000000..e047032ed56c
--- /dev/null
+++ b/dev-python/mockldap/files/python-ldap-3.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User Jon Dufresne <jon.dufresne@gmail.com>
+# Date 1521133853 25200
+# Node ID c938f5b558833dd290bbdcbde26c97a6bbfea623
+# Parent  8784bdea1cb29b2a5b5d21045b024880ab84c05d
+Unify Python 2 and 3 dependency on python-ldap >= 3.0
+
+python-ldap now supports both Python 2 and 3. The pyldap package is
+deprecated. The project recommends switching to python-ldap instead.
+From the github page:
+
+https://github.com/pyldap/pyldap
+
+> THIS FORK IS DEPRECATED
+>
+> The pyldap fork was merged back into python-ldap, and released as
+> python-ldap 3.0.0b1.
+
+diff --git a/README b/README
+--- a/README
++++ b/README
+@@ -1,6 +1,6 @@
+-This project provides a mock replacement for python-ldap (pyldap on Python
+-3). It's useful for any project that would like to write unit tests against
+-LDAP code without relying on a running LDAP server.
++This project provides a mock replacement for python-ldap. It's useful for any
++project that would like to write unit tests against LDAP code without relying
++on a running LDAP server.
+ 
+ * Repository: https://bitbucket.org/psagers/mockldap
+ * Documentation: https://mockldap.readthedocs.io/
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -40,11 +40,8 @@
+     keywords=['mock', 'ldap'],
+     install_requires=[
+         'funcparserlib == 0.3.6',
+-
+-        'pyldap; python_version >= "3.0"',
+-        'python-ldap >= 2.0; python_version < "3.0"',
+-
+         'mock; python_version < "3.0"',
++        'python-ldap >= 3.0',
+     ],
+     setup_requires=[
+         'setuptools >= 0.6c11',
diff --git a/dev-python/mockldap/mockldap-0.3.0.ebuild b/dev-python/mockldap/mockldap-0.3.0.ebuild
new file mode 100644
index 000000000000..320fd5560f03
--- /dev/null
+++ b/dev-python/mockldap/mockldap-0.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A simple mock implementation of python-ldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+	virtual/python-unittest-mock[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests are not distributed as part of the release
+RESTRICT="test"
+
+# Disable un-needed d'loading during doc build
+# Import python-ldap 3.0 instead as a requirement from upstream
+PATCHES=( "${FILESDIR}"/mapping.patch "${FILESDIR}"/python-ldap-3.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "hashed password support" dev-python/passlib
+}