From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 836D415808B for ; Tue, 22 Mar 2022 23:33:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEE87E08EB; Tue, 22 Mar 2022 23:33:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DC81E08ED for ; Tue, 22 Mar 2022 23:33:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E49953432EC for ; Tue, 22 Mar 2022 23:33:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D5C9334 for ; Tue, 22 Mar 2022 23:32:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647991615.de6436589d3e0c9aee1e356e31be3832057d08ad.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-ldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/python-ldap/python-ldap-3.4.0.ebuild dev-python/python-ldap/python-ldap-9999.ebuild X-VCS-Directories: dev-python/python-ldap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: de6436589d3e0c9aee1e356e31be3832057d08ad X-VCS-Branch: master Date: Tue, 22 Mar 2022 23:32:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b6215e88-e49a-4c91-940a-b0d05d21e522 X-Archives-Hash: f6df784de44253cab6eb241f0acacff2 commit: de6436589d3e0c9aee1e356e31be3832057d08ad Author: Sam James gentoo org> AuthorDate: Tue Mar 22 22:55:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 22 23:26:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de643658 dev-python/python-ldap: add version limit on OpenLDAP (needs ldap_r) We need (for now) the reentrant library from OpenLDAP which is gone. Also, sync live. Bug: https://bugs.gentoo.org/835637 Signed-off-by: Sam James gentoo.org> dev-python/python-ldap/python-ldap-3.4.0.ebuild | 7 ++++--- dev-python/python-ldap/python-ldap-9999.ebuild | 19 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) 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?] + =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?] + =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 }