Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-ldap/
Date: Sat, 28 Mar 2020 21:11:52
Message-Id: 1585429873.b27fb1a0538d53e0a25cd456f096a1251c413692.mgorny@gentoo
1 commit: b27fb1a0538d53e0a25cd456f096a1251c413692
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 28 21:02:50 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 28 21:11:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b27fb1a0
7
8 dev-python/python-ldap: Remove redundant versions
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/python-ldap/Manifest | 1 -
13 dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild | 95 ----------------------
14 2 files changed, 96 deletions(-)
15
16 diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
17 index d13aa9c012f..055f928ceea 100644
18 --- a/dev-python/python-ldap/Manifest
19 +++ b/dev-python/python-ldap/Manifest
20 @@ -1,2 +1 @@
21 -DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
22 DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
23
24 diff --git a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild b/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
25 deleted file mode 100644
26 index a6fe2cbd1ac..00000000000
27 --- a/dev-python/python-ldap/python-ldap-3.1.0-r1.ebuild
28 +++ /dev/null
29 @@ -1,95 +0,0 @@
30 -# Copyright 1999-2020 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=7
34 -PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
35 -
36 -inherit distutils-r1
37 -
38 -DESCRIPTION="Various LDAP-related Python modules"
39 -HOMEPAGE="https://www.python-ldap.org/en/latest/
40 - https://pypi.org/project/python-ldap/"
41 -if [[ ${PV} == *9999* ]]; then
42 - EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
43 - inherit git-r3
44 -else
45 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
46 - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
47 -fi
48 -
49 -LICENSE="PSF-2"
50 -SLOT="0"
51 -IUSE="doc examples sasl ssl test"
52 -RESTRICT="!test? ( test )"
53 -
54 -# We do not need OpenSSL, it is never directly used:
55 -# https://github.com/python-ldap/python-ldap/issues/224
56 -RDEPEND="
57 - !dev-python/pyldap
58 - >=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
59 - >=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
60 - >net-nds/openldap-2.4.11:=[sasl?,ssl?]
61 -"
62 -# We do not link against cyrus-sasl but we use some
63 -# of its headers during the build.
64 -DEPEND="
65 - >net-nds/openldap-2.4.11:=[sasl?,ssl?]
66 - dev-python/setuptools[${PYTHON_USEDEP}]
67 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
68 - sasl? ( >=dev-libs/cyrus-sasl-2.1 )
69 - test? (
70 - ${RDEPEND}
71 - dev-python/pytest[${PYTHON_USEDEP}]
72 - )
73 -"
74 -
75 -python_prepare_all() {
76 - # The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
77 - # https://github.com/pypa/setuptools_scm/issues/228
78 - if [[ ${PV} == *9999* ]]; then
79 - rm -r .git || die
80 - fi
81 -
82 - if ! use sasl; then
83 - sed -i 's/HAVE_SASL//g' setup.cfg || die
84 - fi
85 - if ! use ssl; then
86 - sed -i 's/HAVE_TLS//g' setup.cfg || die
87 - fi
88 -
89 - distutils-r1_python_prepare_all
90 -}
91 -
92 -python_compile_all() {
93 - if use doc; then
94 - sphinx-build Doc Doc/_build/html || die
95 - HTML_DOCS=( Doc/_build/html/. )
96 - fi
97 -}
98 -
99 -python_test() {
100 - # Run all tests which don't require slapd
101 - local ignored_tests=(
102 - t_bind.py
103 - t_cext.py
104 - t_edit.py
105 - t_ldapobject.py
106 - t_ldap_options.py
107 - t_ldap_sasl.py
108 - t_ldap_schema_subentry.py
109 - t_ldap_syncrepl.py
110 - t_slapdobject.py
111 - )
112 - cd Tests || die
113 - py.test ${ignored_tests[@]/#/--ignore } \
114 - || die "tests failed with ${EPYTHON}"
115 -}
116 -
117 -python_install_all() {
118 - if use examples; then
119 - docinto examples
120 - dodoc -r Demo/.
121 - docompress -x /usr/share/doc/${PF}/examples
122 - fi
123 - distutils-r1_python_install_all
124 -}