diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
commit | 401101f9c8077911929d3f2b60a37098460a5d89 (patch) | |
tree | c2bef4719f6787550f0916aeaa8f4f403a9296af /dev-python/python-ldap | |
parent | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff) |
gentoo resync : 25.03.2022
Diffstat (limited to 'dev-python/python-ldap')
-rw-r--r-- | dev-python/python-ldap/Manifest | 4 | ||||
-rw-r--r-- | dev-python/python-ldap/python-ldap-3.4.0.ebuild | 7 | ||||
-rw-r--r-- | dev-python/python-ldap/python-ldap-9999.ebuild | 19 |
3 files changed, 15 insertions, 15 deletions
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest index 01fbc3a67f30..e8784d43e3b6 100644 --- a/dev-python/python-ldap/Manifest +++ b/dev-python/python-ldap/Manifest @@ -1,4 +1,4 @@ DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605 -EBUILD python-ldap-3.4.0.ebuild 1981 BLAKE2B 89514ee16e046ce9d53d7228eb4c924c657ef77b1f546287b233da9f0d7f48b462cc751bca53844f7bc8ec01bac3a6e5fc9831c02e97b4f6d3ef6861f7bca9bf SHA512 f7dffd4d0eeaa7bad2ee5de84a9ed920806fab057163d9788c1e41301916834ea6341b93d53ac81ea203b0f27d7dbb75c6dc2ad7fc6b254c168344ef706e313c -EBUILD python-ldap-9999.ebuild 2121 BLAKE2B 41453d4bea20f0e62c78330f7f0c7c815471007c4b4f9f37796c4c88572d258067b27165664847dc84d7436a253c925af3948df461599b4bcdbfd67ed1b1b59b SHA512 4a1fe143cc02b90f29449929893a007714a164aa32e3e75c1df256c62d366825936a7593fde102a97c082bf16f4eaddc011f29829f2dad3672f5a733395ebd48 +EBUILD python-ldap-3.4.0.ebuild 2026 BLAKE2B b6cdb8c1c3de0c11d05625deaa7fca40ca7a9f82f8d219d674aa02def6e29e42b132f3e222ea81123d31936029226b1ec25ead54f3292d025194b91f1282d03e SHA512 21b1953aa5fb0efb195763f2129ed4357b3b5d37eaeea7da602f8a215221f9e73dfdca44fed1d94705c446acd2b3f8212b77967bf225c6a45772ee0e9c9e2f55 +EBUILD python-ldap-9999.ebuild 2030 BLAKE2B 32a24852de09d6b86c045942bbbf194513b4bb5c314fc8d3d17d333bc0467261bfed6fe43bc9187247d59e55ed89e87e9d29d1f2d74264e4274ac4a0234e4089 SHA512 6cdffdf419e5167a658e950552a78d50b4217e43c7cf1c8f90e2c47a32ecf5860d377d65c79703816b6b139468744dd9350449d1cfb632167ed3ebc5c6c142a8 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6 diff --git a/dev-python/python-ldap/python-ldap-3.4.0.ebuild b/dev-python/python-ldap/python-ldap-3.4.0.ebuild index 08db219b9570..f4d62b66991f 100644 --- a/dev-python/python-ldap/python-ldap-3.4.0.ebuild +++ b/dev-python/python-ldap/python-ldap-3.4.0.ebuild @@ -22,15 +22,16 @@ LICENSE="MIT PSF-2" SLOT="0" IUSE="examples sasl ssl" +# < dep on openldap for bug #835637, ldap_r is gone RDEPEND=" >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] - >net-nds/openldap-2.4.11:=[sasl?,ssl?] + <net-nds/openldap-2.6:=[sasl?,ssl?] " # We do not link against cyrus-sasl but we use some # of its headers during the build. -BDEPEND=" - >net-nds/openldap-2.4.11:=[sasl?,ssl?] +DEPEND=" + <net-nds/openldap-2.6:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) " diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild index 2abb6ecf585b..a01b853838d7 100644 --- a/dev-python/python-ldap/python-ldap-9999.ebuild +++ b/dev-python/python-ldap/python-ldap-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( pypy3 python3_{7..10} ) inherit distutils-r1 @@ -18,21 +18,20 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" fi -LICENSE="PSF-2" +LICENSE="MIT PSF-2" SLOT="0" IUSE="examples sasl ssl" -# We do not need OpenSSL, it is never directly used: -# https://github.com/python-ldap/python-ldap/issues/224 +# < dep on openldap for bug #835637, ldap_r is gone RDEPEND=" >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}] >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}] - >net-nds/openldap-2.4.11:=[sasl?,ssl?] + <net-nds/openldap-2.6:=[sasl?,ssl?] " # We do not link against cyrus-sasl but we use some # of its headers during the build. -BDEPEND=" - >net-nds/openldap-2.4.11:=[sasl?,ssl?] +DEPEND=" + <net-nds/openldap-2.6:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) " @@ -58,7 +57,7 @@ python_prepare_all() { python_test() { # Run all tests which don't require slapd - local ignored_tests=( + local EPYTEST_IGNORE=( t_bind.py t_cext.py t_edit.py @@ -70,7 +69,7 @@ python_test() { t_slapdobject.py ) pushd Tests >/dev/null || die - epytest ${ignored_tests[@]/#/--ignore } + epytest popd > /dev/null || die } |