diff --git a/dev-python/python-ldap/python-ldap-2.4.19.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
similarity index 98%
rename from dev-python/python-ldap/python-ldap-2.4.19.ebuild
rename to dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
index c3696c3055f86..44369ed8d095f 100644
--- a/dev-python/python-ldap/python-ldap-2.4.19.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND=">net-nds/openldap-2.4.11
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
diff --git a/dev-python/python-ldap/python-ldap-2.4.21.ebuild b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild
similarity index 97%
rename from dev-python/python-ldap/python-ldap-2.4.21.ebuild
rename to dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild
index 3309a2b3783c6..652605475883a 100644
--- a/dev-python/python-ldap/python-ldap-2.4.21.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-# setup.py is written only for py2, which suits pypy
 PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1 multilib
@@ -29,6 +28,7 @@ RDEPEND=">net-nds/openldap-2.4.11
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index fe9c91712673c..78856a7c54784 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -29,6 +29,7 @@ RDEPEND=">=net-nds/openldap-2.4
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/pyasn1-modules[${PYTHON_USEDEP}] )"
+RDEPEND+=" !dev-python/pyldap"
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \