[gentoo-commits] repo/gentoo:master commit in: dev-python/mockldap/files/, dev-python/mockldap/

[Brian Evans]

commit:     a3e43024b7416c4af894184be488eeef7b7ce701
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 14:45:32 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 14:45:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e43024

dev-python/mockldap: Version bump for 0.3.0

Non-maintainer commit reviewed by python team
One patch modified to p1 header format for easier application

Bug: https://bugs.gentoo.org/668066
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-python/mockldap/Manifest                  |  1 +
 dev-python/mockldap/files/mapping.patch       |  4 +--
 dev-python/mockldap/files/python-ldap-3.patch | 47 +++++++++++++++++++++++++
 dev-python/mockldap/mockldap-0.3.0.ebuild     | 50 +++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index 6c14835a303..f91b5647b13 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
index f3cdd862a9d..b8c25eca583 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 00000000000..e047032ed56
--- /dev/null
+++ b/dev-python/mockldap/files/python-ldap-3.patch
@@ -0,0 +1,47 @@
+# HG changeset patch
+# User Jon Dufresne <jon.dufresne@×××××.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 00000000000..320fd5560f0
--- /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
+}