summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-10-09 06:04:04 -0400
committerMike Gilbert <floppym@gentoo.org>2015-10-09 06:04:08 -0400
commit44b2a73e7a3d70a2a0546c95d426edf73f42a51e (patch)
tree3f932d33b6611d2b74b8cd039752ff67cc0a7fe3
parentdev-python/pyldap: Remove PYTHON_USEDEP from python-ldap blocker (diff)
downloadgentoo-44b2a73e7a3d70a2a0546c95d426edf73f42a51e.tar.gz
gentoo-44b2a73e7a3d70a2a0546c95d426edf73f42a51e.tar.bz2
gentoo-44b2a73e7a3d70a2a0546c95d426edf73f42a51e.zip
dev-python/python-ldap: Add blocker for pyldap
Bug: https://bugs.gentoo.org/562058 Package-Manager: portage-2.2.22_p20
-rw-r--r--dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild (renamed from dev-python/python-ldap/python-ldap-2.4.19.ebuild)1
-rw-r--r--dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild (renamed from dev-python/python-ldap/python-ldap-2.4.21.ebuild)2
-rw-r--r--dev-python/python-ldap/python-ldap-9999.ebuild1
3 files changed, 3 insertions, 1 deletions
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
index c3696c3055f8..44369ed8d095 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
index 3309a2b3783c..652605475883 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 fe9c91712673..78856a7c5478 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:" \