| 1 |
commit: 44b2a73e7a3d70a2a0546c95d426edf73f42a51e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 9 10:04:04 2015 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 9 10:04:08 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b2a73e |
| 7 |
|
| 8 |
dev-python/python-ldap: Add blocker for pyldap |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/562058 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.22_p20 |
| 13 |
|
| 14 |
.../{python-ldap-2.4.19.ebuild => python-ldap-2.4.19-r1.ebuild} | 1 + |
| 15 |
.../{python-ldap-2.4.21.ebuild => python-ldap-2.4.21-r1.ebuild} | 2 +- |
| 16 |
dev-python/python-ldap/python-ldap-9999.ebuild | 1 + |
| 17 |
3 files changed, 3 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
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 |
| 20 |
similarity index 98% |
| 21 |
rename from dev-python/python-ldap/python-ldap-2.4.19.ebuild |
| 22 |
rename to dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild |
| 23 |
index c3696c3..44369ed 100644 |
| 24 |
--- a/dev-python/python-ldap/python-ldap-2.4.19.ebuild |
| 25 |
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild |
| 26 |
@@ -29,6 +29,7 @@ RDEPEND=">net-nds/openldap-2.4.11 |
| 27 |
DEPEND="${RDEPEND} |
| 28 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 29 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" |
| 30 |
+RDEPEND+=" !dev-python/pyldap" |
| 31 |
|
| 32 |
python_prepare_all() { |
| 33 |
sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ |
| 34 |
|
| 35 |
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 |
| 36 |
similarity index 97% |
| 37 |
rename from dev-python/python-ldap/python-ldap-2.4.21.ebuild |
| 38 |
rename to dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild |
| 39 |
index 3309a2b..6526054 100644 |
| 40 |
--- a/dev-python/python-ldap/python-ldap-2.4.21.ebuild |
| 41 |
+++ b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild |
| 42 |
@@ -4,7 +4,6 @@ |
| 43 |
|
| 44 |
EAPI=5 |
| 45 |
|
| 46 |
-# setup.py is written only for py2, which suits pypy |
| 47 |
PYTHON_COMPAT=( python2_7 pypy ) |
| 48 |
|
| 49 |
inherit distutils-r1 multilib |
| 50 |
@@ -29,6 +28,7 @@ RDEPEND=">net-nds/openldap-2.4.11 |
| 51 |
DEPEND="${RDEPEND} |
| 52 |
dev-python/setuptools[${PYTHON_USEDEP}] |
| 53 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" |
| 54 |
+RDEPEND+=" !dev-python/pyldap" |
| 55 |
|
| 56 |
python_prepare_all() { |
| 57 |
sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ |
| 58 |
|
| 59 |
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild |
| 60 |
index fe9c917..78856a7 100644 |
| 61 |
--- a/dev-python/python-ldap/python-ldap-9999.ebuild |
| 62 |
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild |
| 63 |
@@ -29,6 +29,7 @@ RDEPEND=">=net-nds/openldap-2.4 |
| 64 |
DEPEND="${RDEPEND} |
| 65 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] |
| 66 |
dev-python/pyasn1-modules[${PYTHON_USEDEP}] )" |
| 67 |
+RDEPEND+=" !dev-python/pyldap" |
| 68 |
|
| 69 |
python_prepare_all() { |
| 70 |
sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ |
Archives