diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-10-17 11:17:34 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-10-17 11:17:34 +0000 |
| commit | 74dfb37423f2b2ff89e8d58930150540d2694683 (patch) | |
| tree | 2e1daea22dd85b852f6ae3d29129a6fe200abc68 /dev-python/python-ldap | |
| parent | Bump to 4.8, thanks to slepnoga (diff) | |
| download | gentoo-2-74dfb37423f2b2ff89e8d58930150540d2694683.tar.gz gentoo-2-74dfb37423f2b2ff89e8d58930150540d2694683.tar.bz2 gentoo-2-74dfb37423f2b2ff89e8d58930150540d2694683.zip | |
correction to deps, noted by Arfrever
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-python/python-ldap')
| -rw-r--r-- | dev-python/python-ldap/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/python-ldap/python-ldap-2.4.15.ebuild | 6 | ||||
| -rw-r--r-- | dev-python/python-ldap/python-ldap-2.4.18.ebuild | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog index 964c3e5d91e3..b134a986377a 100644 --- a/dev-python/python-ldap/ChangeLog +++ b/dev-python/python-ldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/python-ldap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.136 2014/10/17 07:31:18 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.137 2014/10/17 11:17:34 idella4 Exp $ + + 17 Oct 2014; Ian Delaney <idella4@gentoo.org> python-ldap-2.4.15.ebuild, + python-ldap-2.4.18.ebuild: + correction to deps, noted by Arfrever *python-ldap-2.4.18 (17 Oct 2014) diff --git a/dev-python/python-ldap/python-ldap-2.4.15.ebuild b/dev-python/python-ldap/python-ldap-2.4.15.ebuild index afcde8312b29..c1441bfa2534 100644 --- a/dev-python/python-ldap/python-ldap-2.4.15.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v 1.3 2014/10/17 07:31:18 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v 1.4 2014/10/17 11:17:34 idella4 Exp $ EAPI=5 @@ -24,9 +24,9 @@ IUSE="examples sasl ssl" # OpenSSL is an optional runtime dep. RDEPEND=">net-nds/openldap-2.4.11 dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] sasl? ( >=dev-libs/cyrus-sasl-2.1 )" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" 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.18.ebuild b/dev-python/python-ldap/python-ldap-2.4.18.ebuild index d2aee1ca0769..de9a28883e93 100644 --- a/dev-python/python-ldap/python-ldap-2.4.18.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.18.ebuild,v 1.1 2014/10/17 07:31:18 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.18.ebuild,v 1.2 2014/10/17 11:17:34 idella4 Exp $ EAPI=5 @@ -21,13 +21,14 @@ IUSE="doc examples sasl ssl" # If you need support for openldap-2.3.x, please use python-ldap-2.3.9. # python team: Please do not remove python-ldap-2.3.9 from the tree. # OpenSSL is an optional runtime dep. +# setup.py's install_requires entry is a debacle. RDEPEND=">net-nds/openldap-2.4.11 dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] sasl? ( >=dev-libs/cyrus-sasl-2.1 )" DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] )" + dev-python/setuptools[${PYTHON_USEDEP}]" python_prepare_all() { sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ @@ -66,7 +67,7 @@ python_test() { } python_install_all() { - use examples && local EXAMPLES=( Demo/. ) +. use examples && local EXAMPLES=( Demo/. ) use doc && local HTML_DOCS=( Doc/.build/html/. ) distutils-r1_python_install_all |