1 |
commit: e37c501bffe39e1222bd1f6f9bd5a6ea86778026 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 1 07:01:28 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 1 07:03:15 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37c501b |
7 |
|
8 |
dev-python/mockldap: Version Bump |
9 |
|
10 |
Package-Manager: portage-2.2.22 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/mockldap/Manifest | 3 +- |
14 |
dev-python/mockldap/mockldap-0.2.2.ebuild | 47 ---------------------- |
15 |
dev-python/mockldap/mockldap-0.2.3.ebuild | 9 ++--- |
16 |
dev-python/mockldap/mockldap-0.2.5.ebuild | 9 ++--- |
17 |
...mockldap-0.2.4.ebuild => mockldap-0.2.6.ebuild} | 20 +++++---- |
18 |
5 files changed, 22 insertions(+), 66 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/mockldap/Manifest b/dev-python/mockldap/Manifest |
21 |
index 442ce20..493a917 100644 |
22 |
--- a/dev-python/mockldap/Manifest |
23 |
+++ b/dev-python/mockldap/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
-DIST mockldap-0.2.2.tar.gz 22237 SHA256 a2327eeb735a283da7dfa91a878a80d8804fc0bee66e835ac9b62054cf8d00b5 SHA512 79beb00d663e7ba48972cfe85eae59916f2d10f9924ee232f71bdd2b8b821d9d6276b4c54a2480d2726afb0f162193058e390aa7ee614dad0a9ffa652f8cd244 WHIRLPOOL 4457c4d8b6ec75ac0b4379dcd0c2927455d0ba2acd74d15db86c328a49bdd476a5a32cf81fad5c89e67461f4b09272740eb0d52fd5dd1c5827ab182d72e149b7 |
26 |
DIST mockldap-0.2.3.tar.gz 22369 SHA256 a37eb912cbc0cab5320cb848530c90729d87939ff9264dc38adba3bffc596e65 SHA512 3e17d9f3d6ae5a33014e2ccfe521170af1b136f38b68b216df721059941d958b87f03fb4ed5772282d319cfae9974cf1ae9e4e3bec629d161761e2018ed26788 WHIRLPOOL 2cf75ee5fabf4a350f82fc7b70b7c834e20f3bfddbc33741668c9d6765b57141dd18ae81b3fc2b15c9df20389374f3129e826e193723b220c51f2c721c48f7ba |
27 |
-DIST mockldap-0.2.4.tar.gz 22460 SHA256 6d96035920cec440ca415fc809a37f60ccf394ef169b0693c03e5bba65927532 SHA512 536c511e28ac2a3ed0b1a525db71a60f12a8e6bddb93fe2873fdfeddc80067e83a3f3ba8f8cd98a50fe6ce931232da9575102dba9fa9525644d0f1b3733c694e WHIRLPOOL 6b70446e01f7fb0e18cc6c0333e926e4ef8976b95bfb058341a739f55e6ab951b07f9e41f5e787dd0264100e82e31efd0b523c2095d317c6f9fa0f80908ce941 |
28 |
DIST mockldap-0.2.5.tar.gz 22775 SHA256 994eae87a9ff4a13ceb192d71c66a3bc041663f07db227cfbac81c9a87b94d77 SHA512 d1a2eb1d860daaa7e9063d80ec1df3ad69a44639ce6894db3ee47766a40d92a50d6fc1e0ae84000798fb86b7a6082c353bb9a3941dd01571bd52d761bcb05010 WHIRLPOOL d4dec0cb06a93100be309351a459f741ffb90849629b8a68ef81711b002b73afc81619c091687983606d9490802cb1c8a24e180093b70d9e891cfdb256d2383c |
29 |
+DIST mockldap-0.2.6.tar.gz 22892 SHA256 cbcf0480f3f55c427b1c3798f1509b367aa65bece244b87c2d6f7c3ec43f8c5a SHA512 7ff0219eb349bc9cffd0580eb80fc7428ea856824428c048ee7e133d4c6609edfb713a73d6a26e2293156482304bdd4fb8034f600631c8b1e290355a4e9e7f4c WHIRLPOOL 1a9b2a08173aecd23eb35b1a7c60d74a7c92e06d9efbe2a6b5883c88cf81b003e3efb95e20edf8425ccb3809d88a79cd0d0e62132a5ff79c3c08254fb19f6fe1 |
30 |
|
31 |
diff --git a/dev-python/mockldap/mockldap-0.2.2.ebuild b/dev-python/mockldap/mockldap-0.2.2.ebuild |
32 |
deleted file mode 100644 |
33 |
index dd8d7ca..0000000 |
34 |
--- a/dev-python/mockldap/mockldap-0.2.2.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,47 +0,0 @@ |
37 |
-# Copyright 1999-2014 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=5 |
42 |
- |
43 |
-PYTHON_COMPAT=( python2_7 pypy ) |
44 |
- |
45 |
-inherit distutils-r1 |
46 |
- |
47 |
-DESCRIPTION="A simple mock implementation of python-ldap" |
48 |
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap" |
49 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
50 |
- |
51 |
-LICENSE="BSD" |
52 |
-SLOT="0" |
53 |
-KEYWORDS="~amd64 ~x86" |
54 |
-IUSE="doc" |
55 |
- |
56 |
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
57 |
- dev-python/mock[${PYTHON_USEDEP}] |
58 |
- dev-python/python-ldap[${PYTHON_USEDEP}]" |
59 |
-DEPEND="${RDEPEND} |
60 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
61 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" |
62 |
- |
63 |
-# Disable un-needed d'loading during doc build |
64 |
-PATCHES=( "${FILESDIR}"/mapping.patch ) |
65 |
- |
66 |
-python_compile_all() { |
67 |
- use doc && emake -C docs html |
68 |
-} |
69 |
- |
70 |
-python_test() { |
71 |
- esetup.py test |
72 |
-} |
73 |
- |
74 |
-python_install_all() { |
75 |
- use doc && local HTML_DOCS=( docs/build/html/. ) |
76 |
- distutils-r1_python_install_all |
77 |
-} |
78 |
- |
79 |
-pkg_postinst() { |
80 |
- if ! has_version dev-python/passlib; then |
81 |
- elog "Please install dev-python/passlib for hashed password support." |
82 |
- fi |
83 |
-} |
84 |
|
85 |
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild |
86 |
index 4007b5a..e37a562 100644 |
87 |
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild |
88 |
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild |
89 |
@@ -6,7 +6,7 @@ EAPI=5 |
90 |
|
91 |
PYTHON_COMPAT=( python2_7 pypy ) |
92 |
|
93 |
-inherit distutils-r1 |
94 |
+inherit distutils-r1 eutils |
95 |
|
96 |
DESCRIPTION="A simple mock implementation of python-ldap" |
97 |
HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap" |
98 |
@@ -17,7 +17,8 @@ SLOT="0" |
99 |
KEYWORDS="amd64 x86" |
100 |
IUSE="doc" |
101 |
|
102 |
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
103 |
+RDEPEND=" |
104 |
+ ~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
105 |
dev-python/mock[${PYTHON_USEDEP}] |
106 |
dev-python/python-ldap[${PYTHON_USEDEP}]" |
107 |
DEPEND="${RDEPEND} |
108 |
@@ -41,7 +42,5 @@ python_install_all() { |
109 |
} |
110 |
|
111 |
pkg_postinst() { |
112 |
- if ! has_version dev-python/passlib; then |
113 |
- elog "Please install dev-python/passlib for hashed password support." |
114 |
- fi |
115 |
+ optfeature "hashed password support" dev-python/passlib |
116 |
} |
117 |
|
118 |
diff --git a/dev-python/mockldap/mockldap-0.2.5.ebuild b/dev-python/mockldap/mockldap-0.2.5.ebuild |
119 |
index 12f38f5..371ec28 100644 |
120 |
--- a/dev-python/mockldap/mockldap-0.2.5.ebuild |
121 |
+++ b/dev-python/mockldap/mockldap-0.2.5.ebuild |
122 |
@@ -6,7 +6,7 @@ EAPI=5 |
123 |
|
124 |
PYTHON_COMPAT=( python2_7 pypy ) |
125 |
|
126 |
-inherit distutils-r1 |
127 |
+inherit distutils-r1 eutils |
128 |
|
129 |
DESCRIPTION="A simple mock implementation of python-ldap" |
130 |
HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap" |
131 |
@@ -17,7 +17,8 @@ SLOT="0" |
132 |
KEYWORDS="~amd64 ~x86" |
133 |
IUSE="doc" |
134 |
|
135 |
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
136 |
+RDEPEND=" |
137 |
+ ~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
138 |
dev-python/mock[${PYTHON_USEDEP}] |
139 |
dev-python/python-ldap[${PYTHON_USEDEP}]" |
140 |
DEPEND="${RDEPEND} |
141 |
@@ -41,7 +42,5 @@ python_install_all() { |
142 |
} |
143 |
|
144 |
pkg_postinst() { |
145 |
- if ! has_version dev-python/passlib; then |
146 |
- elog "Please install dev-python/passlib for hashed password support." |
147 |
- fi |
148 |
+ optfeature "hashed password support" dev-python/passlib |
149 |
} |
150 |
|
151 |
diff --git a/dev-python/mockldap/mockldap-0.2.4.ebuild b/dev-python/mockldap/mockldap-0.2.6.ebuild |
152 |
similarity index 70% |
153 |
rename from dev-python/mockldap/mockldap-0.2.4.ebuild |
154 |
rename to dev-python/mockldap/mockldap-0.2.6.ebuild |
155 |
index 12f38f5..bbb1004 100644 |
156 |
--- a/dev-python/mockldap/mockldap-0.2.4.ebuild |
157 |
+++ b/dev-python/mockldap/mockldap-0.2.6.ebuild |
158 |
@@ -4,9 +4,9 @@ |
159 |
|
160 |
EAPI=5 |
161 |
|
162 |
-PYTHON_COMPAT=( python2_7 pypy ) |
163 |
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy ) |
164 |
|
165 |
-inherit distutils-r1 |
166 |
+inherit distutils-r1 eutils |
167 |
|
168 |
DESCRIPTION="A simple mock implementation of python-ldap" |
169 |
HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.python.org/pypi/mockldap" |
170 |
@@ -17,9 +17,10 @@ SLOT="0" |
171 |
KEYWORDS="~amd64 ~x86" |
172 |
IUSE="doc" |
173 |
|
174 |
-RDEPEND="~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
175 |
+RDEPEND=" |
176 |
+ ~dev-python/funcparserlib-0.3.6[${PYTHON_USEDEP}] |
177 |
dev-python/mock[${PYTHON_USEDEP}] |
178 |
- dev-python/python-ldap[${PYTHON_USEDEP}]" |
179 |
+ dev-python/pyldap[${PYTHON_USEDEP}]" |
180 |
DEPEND="${RDEPEND} |
181 |
dev-python/setuptools[${PYTHON_USEDEP}] |
182 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" |
183 |
@@ -27,6 +28,13 @@ DEPEND="${RDEPEND} |
184 |
# Disable un-needed d'loading during doc build |
185 |
PATCHES=( "${FILESDIR}"/mapping.patch ) |
186 |
|
187 |
+python_prepare_all() { |
188 |
+ sed \ |
189 |
+ -e "s:pyldap.*:pyldap',:g" \ |
190 |
+ -i setup.py |
191 |
+ distutils-r1_python_prepare_all |
192 |
+} |
193 |
+ |
194 |
python_compile_all() { |
195 |
use doc && emake -C docs html |
196 |
} |
197 |
@@ -41,7 +49,5 @@ python_install_all() { |
198 |
} |
199 |
|
200 |
pkg_postinst() { |
201 |
- if ! has_version dev-python/passlib; then |
202 |
- elog "Please install dev-python/passlib for hashed password support." |
203 |
- fi |
204 |
+ optfeature "hashed password support" dev-python/passlib |
205 |
} |