dev-python/mockldap: Version Bump

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher <jlec@gentoo.org>

5 files changed, 22 insertions, 66 deletions

diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest
index 442ce209d6ab..493a9176b091 100644
--- a/dev-python/mockldap/Manifest
+++ b/dev-python/mockldap/Manifest
@@ -1,4 +1,3 @@
-DIST mockldap-0.2.2.tar.gz 22237 SHA256 a2327eeb735a283da7dfa91a878a80d8804fc0bee66e835ac9b62054cf8d00b5 SHA512 79beb00d663e7ba48972cfe85eae59916f2d10f9924ee232f71bdd2b8b821d9d6276b4c54a2480d2726afb0f162193058e390aa7ee614dad0a9ffa652f8cd244 WHIRLPOOL 4457c4d8b6ec75ac0b4379dcd0c2927455d0ba2acd74d15db86c328a49bdd476a5a32cf81fad5c89e67461f4b09272740eb0d52fd5dd1c5827ab182d72e149b7
 DIST mockldap-0.2.3.tar.gz 22369 SHA256 a37eb912cbc0cab5320cb848530c90729d87939ff9264dc38adba3bffc596e65 SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788 WHIRLPOOL 2cf75ee5fabf4a350f82fc7b70b7c834e20f3bfddbc33741668c9d6765b57141dd18ae81b3fc2b15c9df20389374f3129e826e193723b220c51f2c721c48f7ba
-DIST mockldap-0.2.4.tar.gz 22460 SHA256 6d96035920cec440ca415fc809a37f60ccf394ef169b0693c03e5bba65927532 SHA512 536c511e28ac2a3ed0b1a525db71a60f12a8e6bddb93fe2873fdfeddc80067e83a3f3ba8f8cd98a50fe6ce931232da9575102dba9fa9525644d0f1b3733c694e WHIRLPOOL 6b70446e01f7fb0e18cc6c0333e926e4ef8976b95bfb058341a739f55e6ab951b07f9e41f5e787dd0264100e82e31efd0b523c2095d317c6f9fa0f80908ce941
 DIST mockldap-0.2.5.tar.gz 22775 SHA256 994eae87a9ff4a13ceb192d71c66a3bc041663f07db227cfbac81c9a87b94d77 SHA512 d1a2eb1d860daaa7e9063d80ec1df3ad69a44639ce6894db3ee47766a40d92a50d6fc1e0ae84000798fb86b7a6082c353bb9a3941dd01571bd52d761bcb05010 WHIRLPOOL d4dec0cb06a93100be309351a459f741ffb90849629b8a68ef81711b002b73afc81619c091687983606d9490802cb1c8a24e180093b70d9e891cfdb256d2383c
+DIST mockldap-0.2.6.tar.gz 22892 SHA256 cbcf0480f3f55c427b1c3798f1509b367aa65bece244b87c2d6f7c3ec43f8c5a SHA512 7ff0219eb349bc9cffd0580eb80fc7428ea856824428c048ee7e133d4c6609edfb713a73d6a26e2293156482304bdd4fb8034f600631c8b1e290355a4e9e7f4c WHIRLPOOL 1a9b2a08173aecd23eb35b1a7c60d74a7c92e06d9efbe2a6b5883c88cf81b003e3efb95e20edf8425ccb3809d88a79cd0d0e62132a5ff79c3c08254fb19f6fe1
diff --git a/dev-python/mockldap/mockldap-0.2.2.ebuild b/dev-python/mockldap/mockldap-0.2.2.ebuild
deleted file mode 100644
index dd8d7ca967ea..000000000000
--- a/dev-python/mockldap/mockldap-0.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/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}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-ldap[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Disable un-needed d'loading during doc build
-PATCHES=( "${FILESDIR}"/mapping.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() {
-	if ! has_version dev-python/passlib; then
-		elog "Please install dev-python/passlib for hashed password support."
-	fi
-}
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
index 4007b5ada437..e37a56226194 100644
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 pypy )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="A simple mock implementation of python-ldap"
 HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-ldap[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -41,7 +42,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	if ! has_version dev-python/passlib; then
-		elog "Please install dev-python/passlib for hashed password support."
-	fi
+	optfeature "hashed password support" dev-python/passlib
 }
diff --git a/dev-python/mockldap/mockldap-0.2.5.ebuild b/dev-python/mockldap/mockldap-0.2.5.ebuild
index 12f38f5629a6..371ec288e838 100644
--- a/dev-python/mockldap/mockldap-0.2.5.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 pypy )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="A simple mock implementation of python-ldap"
 HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-ldap[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
@@ -41,7 +42,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	if ! has_version dev-python/passlib; then
-		elog "Please install dev-python/passlib for hashed password support."
-	fi
+	optfeature "hashed password support" dev-python/passlib
 }
diff --git a/dev-python/mockldap/mockldap-0.2.4.ebuild b/dev-python/mockldap/mockldap-0.2.6.ebuild
index 12f38f5629a6..bbb10048075b 100644
--- a/dev-python/mockldap/mockldap-0.2.4.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.6.ebuild
@@ -4,9 +4,9 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="A simple mock implementation of python-ldap"
 HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap"
@@ -17,9 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
+RDEPEND="
+	~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-ldap[${PYTHON_USEDEP}]"
+	dev-python/pyldap[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
@@ -27,6 +28,13 @@ DEPEND="${RDEPEND}
 # Disable un-needed d'loading during doc build
 PATCHES=( "${FILESDIR}"/mapping.patch )
 
+python_prepare_all() {
+	sed \
+		-e "s:pyldap.*:pyldap',:g" \
+		-i setup.py
+		distutils-r1_python_prepare_all
+}
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
@@ -41,7 +49,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	if ! has_version dev-python/passlib; then
-		elog "Please install dev-python/passlib for hashed password support."
-	fi
+	optfeature "hashed password support" dev-python/passlib
 }