commit: 44b2a73e7a3d70a2a0546c95d426edf73f42a51e Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Oct 9 10:04:04 2015 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Oct 9 10:04:08 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b2a73e
dev-python/python-ldap: Add blocker for pyldap Bug: https://bugs.gentoo.org/562058 Package-Manager: portage-2.2.22_p20 .../{python-ldap-2.4.19.ebuild => python-ldap-2.4.19-r1.ebuild} | 1 + .../{python-ldap-2.4.21.ebuild => python-ldap-2.4.21-r1.ebuild} | 2 +- dev-python/python-ldap/python-ldap-9999.ebuild | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 c3696c3..44369ed 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 3309a2b..6526054 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 fe9c917..78856a7 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:" \
