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: Sun, 29 Apr 2018 10:30:18
Message-Id: 1524997788.dcfa42ebd72fbda1c401cb97c4a30fa7070c8c10.mgorny@gentoo
1 commit: dcfa42ebd72fbda1c401cb97c4a30fa7070c8c10
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Sat Apr 28 00:23:29 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 10:29:48 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfa42eb
7
8 dev-python/python-ldap: git-2->git-r3
9
10 Closes: https://bugs.gentoo.org/458558
11 Closes: https://github.com/gentoo/gentoo/pull/8176
12 Package-Manager: Portage-2.3.31, Repoman-2.3.9
13
14 .../python-ldap/python-ldap-2.4.19-r1.ebuild | 9 ++++++--
15 dev-python/python-ldap/python-ldap-2.4.32.ebuild | 12 +++++++---
16 dev-python/python-ldap/python-ldap-9999.ebuild | 26 +++++++++++++---------
17 3 files changed, 32 insertions(+), 15 deletions(-)
18
19 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
20 index f727a2ec88f..3de4a5a0d0a 100644
21 --- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
22 +++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
23 @@ -11,11 +11,16 @@ inherit distutils-r1 multilib
24 DESCRIPTION="Various LDAP-related Python modules"
25 HOMEPAGE="https://www.python-ldap.org/en/latest/
26 https://pypi.org/project/python-ldap/"
27 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
28 +if [[ ${PV} == *9999* ]]; then
29 + EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
30 + inherit git-r3
31 +else
32 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
33 + KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
34 +fi
35
36 LICENSE="PSF-2"
37 SLOT="0"
38 -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
39 IUSE="doc examples sasl ssl"
40
41 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
42
43 diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
44 index c43b6bc092c..623b5213fb8 100644
45 --- a/dev-python/python-ldap/python-ldap-2.4.32.ebuild
46 +++ b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
47 @@ -10,11 +10,16 @@ inherit distutils-r1 multilib
48 DESCRIPTION="Various LDAP-related Python modules"
49 HOMEPAGE="https://www.python-ldap.org/en/latest/
50 https://pypi.org/project/python-ldap/"
51 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
52 +if [[ ${PV} == *9999* ]]; then
53 + EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
54 + inherit git-r3
55 +else
56 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
57 + KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
58 +fi
59
60 LICENSE="PSF-2"
61 SLOT="0"
62 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
63 IUSE="examples sasl ssl"
64
65 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
66 @@ -26,7 +31,8 @@ RDEPEND=">net-nds/openldap-2.4.11
67 dev-python/pyasn1-modules[${PYTHON_USEDEP}]
68 sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
69 DEPEND="${RDEPEND}
70 - dev-python/setuptools[${PYTHON_USEDEP}]"
71 + dev-python/setuptools[${PYTHON_USEDEP}]
72 +"
73 RDEPEND+=" !dev-python/pyldap"
74
75 python_prepare_all() {
76
77 diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
78 index 468171efb88..ee6ebf08e0e 100644
79 --- a/dev-python/python-ldap/python-ldap-9999.ebuild
80 +++ b/dev-python/python-ldap/python-ldap-9999.ebuild
81 @@ -1,33 +1,39 @@
82 # Copyright 1999-2018 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84
85 -EAPI=5
86 +EAPI=6
87
88 -# pypy: bug #458558 (wrong linker options due to not respecting CC)
89 -PYTHON_COMPAT=( python2_7 )
90 -DISTUTILS_IN_SOURCE_BUILD=1
91 +PYTHON_COMPAT=( python2_7 pypy )
92
93 -inherit distutils-r1 git-2 multilib
94 +inherit distutils-r1
95
96 DESCRIPTION="Various LDAP-related Python modules"
97 HOMEPAGE="https://www.python-ldap.org/en/latest/
98 https://pypi.org/project/python-ldap/"
99 -EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
100 +if [[ ${PV} == *9999* ]]; then
101 + EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
102 + inherit git-r3
103 +else
104 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
105 + KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
106 +fi
107
108 LICENSE="PSF-2"
109 SLOT="0"
110 -KEYWORDS=""
111 IUSE="doc examples sasl ssl"
112
113 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
114 # python team: Please do not remove python-ldap-2.3.9 from the tree.
115 RDEPEND=">=net-nds/openldap-2.4
116 dev-python/pyasn1[${PYTHON_USEDEP}]
117 - dev-python/setuptools[${PYTHON_USEDEP}]
118 sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
119 DEPEND="${RDEPEND}
120 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
121 - dev-python/pyasn1-modules[${PYTHON_USEDEP}] )"
122 + dev-python/setuptools[${PYTHON_USEDEP}]
123 + doc? (
124 + dev-python/sphinx[${PYTHON_USEDEP}]
125 + dev-python/pyasn1-modules[${PYTHON_USEDEP}]
126 + )
127 +"
128 RDEPEND+=" !dev-python/pyldap"
129
130 python_prepare_all() {