From 44b2a73e7a3d70a2a0546c95d426edf73f42a51e Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 9 Oct 2015 06:04:04 -0400 Subject: dev-python/python-ldap: Add blocker for pyldap Bug: https://bugs.gentoo.org/562058 Package-Manager: portage-2.2.22_p20 --- .../python-ldap/python-ldap-2.4.19-r1.ebuild | 75 ++++++++++++++++++++++ dev-python/python-ldap/python-ldap-2.4.19.ebuild | 74 --------------------- .../python-ldap/python-ldap-2.4.21-r1.ebuild | 74 +++++++++++++++++++++ dev-python/python-ldap/python-ldap-2.4.21.ebuild | 74 --------------------- dev-python/python-ldap/python-ldap-9999.ebuild | 1 + 5 files changed, 150 insertions(+), 148 deletions(-) create mode 100644 dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild delete mode 100644 dev-python/python-ldap/python-ldap-2.4.19.ebuild create mode 100644 dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild delete mode 100644 dev-python/python-ldap/python-ldap-2.4.21.ebuild (limited to 'dev-python/python-ldap') diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild new file mode 100644 index 000000000000..44369ed8d095 --- /dev/null +++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# setup.py is written only for py2, which suits pypy +PYTHON_COMPAT=( python2_7 pypy ) + +inherit distutils-r1 multilib + +DESCRIPTION="Various LDAP-related Python modules" +HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris" +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 incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires +RDEPEND=">net-nds/openldap-2.4.11 + dev-python/pyasn1[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + sasl? ( >=dev-libs/cyrus-sasl-2.1 )" +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:" \ + -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ + -i setup.cfg || die "error fixing setup.cfg" + + local mylibs="ldap" + if use sasl; then + use ssl && mylibs="ldap_r" + mylibs="${mylibs} sasl2" + else + sed -e 's/HAVE_SASL//g' -i setup.cfg || die + fi + use ssl && mylibs="${mylibs} ssl crypto" + use elibc_glibc && mylibs="${mylibs} resolv" + + sed -e "s:^libs = .*:libs = lber ${mylibs}:" \ + -i setup.cfg || die "error setting up libs in setup.cfg" + + # set test expected to fail to expectedFailure + sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \ + -i Tests/t_ldapurl.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C Doc html +} + +python_test() { + # XXX: the tests supposedly can start local slapd + # but it requires some manual config, it seems. + + "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use examples && local EXAMPLES=( Demo/. ) + use doc && local HTML_DOCS=( Doc/.build/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/python-ldap/python-ldap-2.4.19.ebuild b/dev-python/python-ldap/python-ldap-2.4.19.ebuild deleted file mode 100644 index c3696c3055f8..000000000000 --- a/dev-python/python-ldap/python-ldap-2.4.19.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# setup.py is written only for py2, which suits pypy -PYTHON_COMPAT=( python2_7 pypy ) - -inherit distutils-r1 multilib - -DESCRIPTION="Various LDAP-related Python modules" -HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris" -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 incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires -RDEPEND=">net-nds/openldap-2.4.11 - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - sasl? ( >=dev-libs/cyrus-sasl-2.1 )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ - -i setup.cfg || die "error fixing setup.cfg" - - local mylibs="ldap" - if use sasl; then - use ssl && mylibs="ldap_r" - mylibs="${mylibs} sasl2" - else - sed -e 's/HAVE_SASL//g' -i setup.cfg || die - fi - use ssl && mylibs="${mylibs} ssl crypto" - use elibc_glibc && mylibs="${mylibs} resolv" - - sed -e "s:^libs = .*:libs = lber ${mylibs}:" \ - -i setup.cfg || die "error setting up libs in setup.cfg" - - # set test expected to fail to expectedFailure - sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \ - -i Tests/t_ldapurl.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C Doc html -} - -python_test() { - # XXX: the tests supposedly can start local slapd - # but it requires some manual config, it seems. - - "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use examples && local EXAMPLES=( Demo/. ) - use doc && local HTML_DOCS=( Doc/.build/html/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild new file mode 100644 index 000000000000..652605475883 --- /dev/null +++ b/dev-python/python-ldap/python-ldap-2.4.21-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 pypy ) + +inherit distutils-r1 multilib + +DESCRIPTION="Various LDAP-related Python modules" +HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" +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 sets setuptools and misses pyasn1 and pyasn1-modules in install_requires +RDEPEND=">net-nds/openldap-2.4.11 + dev-python/pyasn1[${PYTHON_USEDEP}] + dev-python/pyasn1-modules[${PYTHON_USEDEP}] + sasl? ( >=dev-libs/cyrus-sasl-2.1 )" +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:" \ + -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ + -i setup.cfg || die "error fixing setup.cfg" + + local mylibs="ldap" + if use sasl; then + use ssl && mylibs="ldap_r" + mylibs="${mylibs} sasl2" + else + sed -e 's/HAVE_SASL//g' -i setup.cfg || die + fi + use ssl && mylibs="${mylibs} ssl crypto" + use elibc_glibc && mylibs="${mylibs} resolv" + + sed -e "s:^libs = .*:libs = lber ${mylibs}:" \ + -i setup.cfg || die "error setting up libs in setup.cfg" + + # set test expected to fail to expectedFailure + sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \ + -i Tests/t_ldapurl.py || die + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C Doc html +} + +python_test() { + # XXX: the tests supposedly can start local slapd + # but it requires some manual config, it seems. + + "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use examples && local EXAMPLES=( Demo/. ) + use doc && local HTML_DOCS=( Doc/.build/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/python-ldap/python-ldap-2.4.21.ebuild b/dev-python/python-ldap/python-ldap-2.4.21.ebuild deleted file mode 100644 index 3309a2b3783c..000000000000 --- a/dev-python/python-ldap/python-ldap-2.4.21.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# setup.py is written only for py2, which suits pypy -PYTHON_COMPAT=( python2_7 pypy ) - -inherit distutils-r1 multilib - -DESCRIPTION="Various LDAP-related Python modules" -HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" -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 sets setuptools and misses pyasn1 and pyasn1-modules in install_requires -RDEPEND=">net-nds/openldap-2.4.11 - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - sasl? ( >=dev-libs/cyrus-sasl-2.1 )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ - -i setup.cfg || die "error fixing setup.cfg" - - local mylibs="ldap" - if use sasl; then - use ssl && mylibs="ldap_r" - mylibs="${mylibs} sasl2" - else - sed -e 's/HAVE_SASL//g' -i setup.cfg || die - fi - use ssl && mylibs="${mylibs} ssl crypto" - use elibc_glibc && mylibs="${mylibs} resolv" - - sed -e "s:^libs = .*:libs = lber ${mylibs}:" \ - -i setup.cfg || die "error setting up libs in setup.cfg" - - # set test expected to fail to expectedFailure - sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \ - -i Tests/t_ldapurl.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C Doc html -} - -python_test() { - # XXX: the tests supposedly can start local slapd - # but it requires some manual config, it seems. - - "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use examples && local EXAMPLES=( Demo/. ) - use doc && local HTML_DOCS=( Doc/.build/html/. ) - - distutils-r1_python_install_all -} 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:" \ -- cgit v1.2.3