Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: net-fs/samba/
Date: Sun, 09 Feb 2020 17:00:57
Message-Id: 1581267648.2ffacd6316e707c5b6c7da98ba0eb6585ba51dec.mgorny@gentoo
1 commit: 2ffacd6316e707c5b6c7da98ba0eb6585ba51dec
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 17:22:29 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 17:00:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffacd63
7
8 net-fs/samba: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 net-fs/samba/samba-4.10.11.ebuild | 22 +++++++++++---------
13 net-fs/samba/samba-4.10.13.ebuild | 22 +++++++++++---------
14 ...{samba-4.10.2.ebuild => samba-4.10.2-r1.ebuild} | 22 +++++++++++---------
15 net-fs/samba/samba-4.11.4.ebuild | 22 +++++++++++---------
16 ...mba-4.11.6-r1.ebuild => samba-4.11.6-r2.ebuild} | 22 +++++++++++---------
17 net-fs/samba/samba-4.11.6.ebuild | 22 +++++++++++---------
18 ...{samba-4.5.16.ebuild => samba-4.5.16-r1.ebuild} | 10 +++++----
19 net-fs/samba/samba-4.8.12.ebuild | 24 ++++++++++++----------
20 ...samba-4.8.6-r2.ebuild => samba-4.8.6-r4.ebuild} | 24 ++++++++++++----------
21 ...samba-4.8.6-r3.ebuild => samba-4.8.6-r5.ebuild} | 24 ++++++++++++----------
22 net-fs/samba/samba-4.9.17.ebuild | 24 ++++++++++++----------
23 net-fs/samba/samba-4.9.18.ebuild | 24 ++++++++++++----------
24 12 files changed, 143 insertions(+), 119 deletions(-)
25
26 diff --git a/net-fs/samba/samba-4.10.11.ebuild b/net-fs/samba/samba-4.10.11.ebuild
27 index 329dc7c2412..e782b5089c5 100644
28 --- a/net-fs/samba/samba-4.10.11.ebuild
29 +++ b/net-fs/samba/samba-4.10.11.ebuild
30 @@ -46,26 +46,28 @@ CDEPEND="
31 dev-libs/libbsd[${MULTILIB_USEDEP}]
32 dev-libs/iniparser:0
33 dev-libs/popt[${MULTILIB_USEDEP}]
34 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
35 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
36 net-libs/libnsl:=[${MULTILIB_USEDEP}]
37 sys-apps/attr[${MULTILIB_USEDEP}]
38 - >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
39 - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
40 + >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
41 + <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
42 sys-libs/libcap
43 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
44 sys-libs/readline:0=
45 - >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
46 - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
47 - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
48 + >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
49 + >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
50 + >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
51 sys-libs/zlib[${MULTILIB_USEDEP}]
52 virtual/libiconv
53 pam? ( sys-libs/pam )
54 acl? ( virtual/acl )
55 - addns? (
56 - net-dns/bind-tools[gssapi]
57 - dev-python/dnspython:=[${PYTHON_USEDEP}]
58 - )
59 + $(python_gen_cond_dep "
60 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
61 + addns? (
62 + net-dns/bind-tools[gssapi]
63 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
64 + )
65 + ")
66 ceph? ( sys-cluster/ceph )
67 cluster? (
68 net-libs/rpcsvc-proto
69
70 diff --git a/net-fs/samba/samba-4.10.13.ebuild b/net-fs/samba/samba-4.10.13.ebuild
71 index 329dc7c2412..e782b5089c5 100644
72 --- a/net-fs/samba/samba-4.10.13.ebuild
73 +++ b/net-fs/samba/samba-4.10.13.ebuild
74 @@ -46,26 +46,28 @@ CDEPEND="
75 dev-libs/libbsd[${MULTILIB_USEDEP}]
76 dev-libs/iniparser:0
77 dev-libs/popt[${MULTILIB_USEDEP}]
78 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
79 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
80 net-libs/libnsl:=[${MULTILIB_USEDEP}]
81 sys-apps/attr[${MULTILIB_USEDEP}]
82 - >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
83 - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
84 + >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
85 + <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
86 sys-libs/libcap
87 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
88 sys-libs/readline:0=
89 - >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
90 - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
91 - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
92 + >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
93 + >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
94 + >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
95 sys-libs/zlib[${MULTILIB_USEDEP}]
96 virtual/libiconv
97 pam? ( sys-libs/pam )
98 acl? ( virtual/acl )
99 - addns? (
100 - net-dns/bind-tools[gssapi]
101 - dev-python/dnspython:=[${PYTHON_USEDEP}]
102 - )
103 + $(python_gen_cond_dep "
104 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
105 + addns? (
106 + net-dns/bind-tools[gssapi]
107 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
108 + )
109 + ")
110 ceph? ( sys-cluster/ceph )
111 cluster? (
112 net-libs/rpcsvc-proto
113
114 diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
115 similarity index 93%
116 rename from net-fs/samba/samba-4.10.2.ebuild
117 rename to net-fs/samba/samba-4.10.2-r1.ebuild
118 index 8e78eb25717..78940866cb2 100644
119 --- a/net-fs/samba/samba-4.10.2.ebuild
120 +++ b/net-fs/samba/samba-4.10.2-r1.ebuild
121 @@ -45,26 +45,28 @@ CDEPEND="
122 dev-libs/libbsd[${MULTILIB_USEDEP}]
123 dev-libs/iniparser:0
124 dev-libs/popt[${MULTILIB_USEDEP}]
125 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
126 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
127 net-libs/libnsl:=[${MULTILIB_USEDEP}]
128 sys-apps/attr[${MULTILIB_USEDEP}]
129 - >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
130 - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
131 + >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
132 + <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
133 sys-libs/libcap
134 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
135 sys-libs/readline:0=
136 - >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
137 - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
138 - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
139 + >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
140 + >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
141 + >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
142 sys-libs/zlib[${MULTILIB_USEDEP}]
143 virtual/libiconv
144 pam? ( sys-libs/pam )
145 acl? ( virtual/acl )
146 - addns? (
147 - net-dns/bind-tools[gssapi]
148 - dev-python/dnspython:=[${PYTHON_USEDEP}]
149 - )
150 + $(python_gen_cond_dep "
151 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
152 + addns? (
153 + net-dns/bind-tools[gssapi]
154 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
155 + )
156 + ")
157 ceph? ( sys-cluster/ceph )
158 cluster? (
159 net-libs/rpcsvc-proto
160
161 diff --git a/net-fs/samba/samba-4.11.4.ebuild b/net-fs/samba/samba-4.11.4.ebuild
162 index 56647c0a98f..fb5e20da359 100644
163 --- a/net-fs/samba/samba-4.11.4.ebuild
164 +++ b/net-fs/samba/samba-4.11.4.ebuild
165 @@ -47,27 +47,29 @@ CDEPEND="
166 dev-libs/libgcrypt:0
167 dev-libs/iniparser:0
168 dev-libs/popt[${MULTILIB_USEDEP}]
169 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
170 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
171 >=net-libs/gnutls-3.2.0
172 net-libs/libnsl:=[${MULTILIB_USEDEP}]
173 sys-apps/attr[${MULTILIB_USEDEP}]
174 - >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
175 - <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
176 + >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
177 + <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
178 sys-libs/libcap
179 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
180 sys-libs/readline:0=
181 - >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
182 - >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
183 - >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
184 + >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
185 + >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
186 + >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
187 sys-libs/zlib[${MULTILIB_USEDEP}]
188 virtual/libiconv
189 pam? ( sys-libs/pam )
190 acl? ( virtual/acl )
191 - addns? (
192 - net-dns/bind-tools[gssapi]
193 - dev-python/dnspython:=[${PYTHON_USEDEP}]
194 - )
195 + $(python_gen_cond_dep "
196 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
197 + addns? (
198 + net-dns/bind-tools[gssapi]
199 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
200 + )
201 + ")
202 ceph? ( sys-cluster/ceph )
203 cluster? (
204 net-libs/rpcsvc-proto
205
206 diff --git a/net-fs/samba/samba-4.11.6-r1.ebuild b/net-fs/samba/samba-4.11.6-r2.ebuild
207 similarity index 93%
208 rename from net-fs/samba/samba-4.11.6-r1.ebuild
209 rename to net-fs/samba/samba-4.11.6-r2.ebuild
210 index 139579aac45..511b8d74c73 100644
211 --- a/net-fs/samba/samba-4.11.6-r1.ebuild
212 +++ b/net-fs/samba/samba-4.11.6-r2.ebuild
213 @@ -47,27 +47,29 @@ CDEPEND="
214 dev-libs/libgcrypt:0
215 dev-libs/iniparser:0
216 dev-libs/popt[${MULTILIB_USEDEP}]
217 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
218 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
219 >=net-libs/gnutls-3.2.0
220 net-libs/libnsl:=[${MULTILIB_USEDEP}]
221 sys-apps/attr[${MULTILIB_USEDEP}]
222 - >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
223 - <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
224 + >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
225 + <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
226 sys-libs/libcap
227 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
228 sys-libs/readline:0=
229 - >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
230 - >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
231 - >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
232 + >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
233 + >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
234 + >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
235 sys-libs/zlib[${MULTILIB_USEDEP}]
236 virtual/libiconv
237 pam? ( sys-libs/pam )
238 acl? ( virtual/acl )
239 - addns? (
240 - net-dns/bind-tools[gssapi]
241 - dev-python/dnspython:=[${PYTHON_USEDEP}]
242 - )
243 + $(python_gen_cond_dep "
244 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
245 + addns? (
246 + net-dns/bind-tools[gssapi]
247 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
248 + )
249 + ")
250 ceph? ( sys-cluster/ceph )
251 cluster? (
252 net-libs/rpcsvc-proto
253
254 diff --git a/net-fs/samba/samba-4.11.6.ebuild b/net-fs/samba/samba-4.11.6.ebuild
255 index 56647c0a98f..fb5e20da359 100644
256 --- a/net-fs/samba/samba-4.11.6.ebuild
257 +++ b/net-fs/samba/samba-4.11.6.ebuild
258 @@ -47,27 +47,29 @@ CDEPEND="
259 dev-libs/libgcrypt:0
260 dev-libs/iniparser:0
261 dev-libs/popt[${MULTILIB_USEDEP}]
262 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
263 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
264 >=net-libs/gnutls-3.2.0
265 net-libs/libnsl:=[${MULTILIB_USEDEP}]
266 sys-apps/attr[${MULTILIB_USEDEP}]
267 - >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
268 - <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
269 + >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
270 + <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
271 sys-libs/libcap
272 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
273 sys-libs/readline:0=
274 - >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
275 - >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
276 - >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
277 + >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
278 + >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
279 + >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
280 sys-libs/zlib[${MULTILIB_USEDEP}]
281 virtual/libiconv
282 pam? ( sys-libs/pam )
283 acl? ( virtual/acl )
284 - addns? (
285 - net-dns/bind-tools[gssapi]
286 - dev-python/dnspython:=[${PYTHON_USEDEP}]
287 - )
288 + $(python_gen_cond_dep "
289 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
290 + addns? (
291 + net-dns/bind-tools[gssapi]
292 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
293 + )
294 + ")
295 ceph? ( sys-cluster/ceph )
296 cluster? (
297 net-libs/rpcsvc-proto
298
299 diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
300 similarity index 96%
301 rename from net-fs/samba/samba-4.5.16.ebuild
302 rename to net-fs/samba/samba-4.5.16-r1.ebuild
303 index 0a8cd5fdfec..c9c162895ae 100644
304 --- a/net-fs/samba/samba-4.5.16.ebuild
305 +++ b/net-fs/samba/samba-4.5.16-r1.ebuild
306 @@ -1,4 +1,4 @@
307 -# Copyright 1999-2019 Gentoo Authors
308 +# Copyright 1999-2020 Gentoo Authors
309 # Distributed under the terms of the GNU General Public License v2
310
311 EAPI=6
312 @@ -52,7 +52,9 @@ CDEPEND="${PYTHON_DEPS}
313 dev-libs/libbsd[${MULTILIB_USEDEP}]
314 dev-libs/iniparser:0
315 dev-libs/popt[${MULTILIB_USEDEP}]
316 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
317 + $(python_gen_cond_dep "
318 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
319 + ")
320 net-libs/libnsl:=[${MULTILIB_USEDEP}]
321 sys-apps/attr[${MULTILIB_USEDEP}]
322 >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
323 @@ -60,8 +62,8 @@ CDEPEND="${PYTHON_DEPS}
324 sys-libs/libcap
325 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
326 sys-libs/readline:0=
327 - >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
328 - >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
329 + >=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
330 + >=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
331 >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
332 sys-libs/zlib[${MULTILIB_USEDEP}]
333 virtual/libiconv
334
335 diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
336 index ad3cf03c238..5ddbdf19249 100644
337 --- a/net-fs/samba/samba-4.8.12.ebuild
338 +++ b/net-fs/samba/samba-4.8.12.ebuild
339 @@ -1,4 +1,4 @@
340 -# Copyright 1999-2019 Gentoo Authors
341 +# Copyright 1999-2020 Gentoo Authors
342 # Distributed under the terms of the GNU General Public License v2
343
344 EAPI=6
345 @@ -46,26 +46,28 @@ CDEPEND="
346 dev-libs/libbsd[${MULTILIB_USEDEP}]
347 dev-libs/iniparser:0
348 dev-libs/popt[${MULTILIB_USEDEP}]
349 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
350 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
351 net-libs/libnsl:=[${MULTILIB_USEDEP}]
352 sys-apps/attr[${MULTILIB_USEDEP}]
353 - >=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
354 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
355 + >=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
356 + <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
357 sys-libs/libcap
358 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
359 sys-libs/readline:0=
360 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
361 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
362 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
363 + >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
364 + >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
365 + >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
366 sys-libs/zlib[${MULTILIB_USEDEP}]
367 virtual/libiconv
368 pam? ( sys-libs/pam )
369 acl? ( virtual/acl )
370 - addns? (
371 - net-dns/bind-tools[gssapi]
372 - dev-python/dnspython:=[${PYTHON_USEDEP}]
373 - )
374 + $(python_gen_cond_dep "
375 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
376 + addns? (
377 + net-dns/bind-tools[gssapi]
378 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
379 + )
380 + ")
381 ceph? ( sys-cluster/ceph )
382 cluster? (
383 net-libs/rpcsvc-proto
384
385 diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r4.ebuild
386 similarity index 92%
387 rename from net-fs/samba/samba-4.8.6-r2.ebuild
388 rename to net-fs/samba/samba-4.8.6-r4.ebuild
389 index 4461b2d6f1c..edd8d3088f6 100644
390 --- a/net-fs/samba/samba-4.8.6-r2.ebuild
391 +++ b/net-fs/samba/samba-4.8.6-r4.ebuild
392 @@ -1,4 +1,4 @@
393 -# Copyright 1999-2019 Gentoo Authors
394 +# Copyright 1999-2020 Gentoo Authors
395 # Distributed under the terms of the GNU General Public License v2
396
397 EAPI=6
398 @@ -45,26 +45,28 @@ CDEPEND="
399 dev-libs/libbsd[${MULTILIB_USEDEP}]
400 dev-libs/iniparser:0
401 dev-libs/popt[${MULTILIB_USEDEP}]
402 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
403 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
404 net-libs/libnsl:=[${MULTILIB_USEDEP}]
405 sys-apps/attr[${MULTILIB_USEDEP}]
406 - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
407 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
408 + >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
409 + <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
410 sys-libs/libcap
411 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
412 sys-libs/readline:0=
413 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
414 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
415 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
416 + >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
417 + >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
418 + >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
419 sys-libs/zlib[${MULTILIB_USEDEP}]
420 virtual/libiconv
421 pam? ( sys-libs/pam )
422 acl? ( virtual/acl )
423 - addns? (
424 - net-dns/bind-tools[gssapi]
425 - dev-python/dnspython:=[${PYTHON_USEDEP}]
426 - )
427 + $(python_gen_cond_dep "
428 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
429 + addns? (
430 + net-dns/bind-tools[gssapi]
431 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
432 + )
433 + ")
434 ceph? ( sys-cluster/ceph )
435 cluster? (
436 net-libs/rpcsvc-proto
437
438 diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r5.ebuild
439 similarity index 93%
440 rename from net-fs/samba/samba-4.8.6-r3.ebuild
441 rename to net-fs/samba/samba-4.8.6-r5.ebuild
442 index 9d93bd81c79..67b7b1eb326 100644
443 --- a/net-fs/samba/samba-4.8.6-r3.ebuild
444 +++ b/net-fs/samba/samba-4.8.6-r5.ebuild
445 @@ -1,4 +1,4 @@
446 -# Copyright 1999-2019 Gentoo Authors
447 +# Copyright 1999-2020 Gentoo Authors
448 # Distributed under the terms of the GNU General Public License v2
449
450 EAPI=6
451 @@ -45,26 +45,28 @@ CDEPEND="
452 dev-libs/libbsd[${MULTILIB_USEDEP}]
453 dev-libs/iniparser:0
454 dev-libs/popt[${MULTILIB_USEDEP}]
455 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
456 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
457 net-libs/libnsl:=[${MULTILIB_USEDEP}]
458 sys-apps/attr[${MULTILIB_USEDEP}]
459 - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
460 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
461 + >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
462 + <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
463 sys-libs/libcap
464 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
465 sys-libs/readline:0=
466 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
467 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
468 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
469 + >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
470 + >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
471 + >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
472 sys-libs/zlib[${MULTILIB_USEDEP}]
473 virtual/libiconv
474 pam? ( sys-libs/pam )
475 acl? ( virtual/acl )
476 - addns? (
477 - net-dns/bind-tools[gssapi]
478 - dev-python/dnspython:=[${PYTHON_USEDEP}]
479 - )
480 + $(python_gen_cond_dep "
481 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
482 + addns? (
483 + net-dns/bind-tools[gssapi]
484 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
485 + )
486 + ")
487 ceph? ( sys-cluster/ceph )
488 cluster? (
489 net-libs/rpcsvc-proto
490
491 diff --git a/net-fs/samba/samba-4.9.17.ebuild b/net-fs/samba/samba-4.9.17.ebuild
492 index 3ad0587ccb3..9d8f3c2110e 100644
493 --- a/net-fs/samba/samba-4.9.17.ebuild
494 +++ b/net-fs/samba/samba-4.9.17.ebuild
495 @@ -1,4 +1,4 @@
496 -# Copyright 1999-2019 Gentoo Authors
497 +# Copyright 1999-2020 Gentoo Authors
498 # Distributed under the terms of the GNU General Public License v2
499
500 EAPI=6
501 @@ -46,26 +46,28 @@ CDEPEND="
502 dev-libs/libbsd[${MULTILIB_USEDEP}]
503 dev-libs/iniparser:0
504 dev-libs/popt[${MULTILIB_USEDEP}]
505 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
506 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
507 net-libs/libnsl:=[${MULTILIB_USEDEP}]
508 sys-apps/attr[${MULTILIB_USEDEP}]
509 - >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
510 - <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
511 + >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
512 + <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
513 sys-libs/libcap
514 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
515 sys-libs/readline:0=
516 - >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
517 - >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
518 - >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
519 + >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
520 + >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
521 + >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
522 sys-libs/zlib[${MULTILIB_USEDEP}]
523 virtual/libiconv
524 pam? ( sys-libs/pam )
525 acl? ( virtual/acl )
526 - addns? (
527 - net-dns/bind-tools[gssapi]
528 - dev-python/dnspython:=[${PYTHON_USEDEP}]
529 - )
530 + $(python_gen_cond_dep "
531 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
532 + addns? (
533 + net-dns/bind-tools[gssapi]
534 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
535 + )
536 + ")
537 ceph? ( sys-cluster/ceph )
538 cluster? (
539 net-libs/rpcsvc-proto
540
541 diff --git a/net-fs/samba/samba-4.9.18.ebuild b/net-fs/samba/samba-4.9.18.ebuild
542 index 3ad0587ccb3..9d8f3c2110e 100644
543 --- a/net-fs/samba/samba-4.9.18.ebuild
544 +++ b/net-fs/samba/samba-4.9.18.ebuild
545 @@ -1,4 +1,4 @@
546 -# Copyright 1999-2019 Gentoo Authors
547 +# Copyright 1999-2020 Gentoo Authors
548 # Distributed under the terms of the GNU General Public License v2
549
550 EAPI=6
551 @@ -46,26 +46,28 @@ CDEPEND="
552 dev-libs/libbsd[${MULTILIB_USEDEP}]
553 dev-libs/iniparser:0
554 dev-libs/popt[${MULTILIB_USEDEP}]
555 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
556 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
557 net-libs/libnsl:=[${MULTILIB_USEDEP}]
558 sys-apps/attr[${MULTILIB_USEDEP}]
559 - >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
560 - <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
561 + >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
562 + <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
563 sys-libs/libcap
564 sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
565 sys-libs/readline:0=
566 - >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
567 - >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
568 - >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
569 + >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
570 + >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
571 + >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
572 sys-libs/zlib[${MULTILIB_USEDEP}]
573 virtual/libiconv
574 pam? ( sys-libs/pam )
575 acl? ( virtual/acl )
576 - addns? (
577 - net-dns/bind-tools[gssapi]
578 - dev-python/dnspython:=[${PYTHON_USEDEP}]
579 - )
580 + $(python_gen_cond_dep "
581 + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
582 + addns? (
583 + net-dns/bind-tools[gssapi]
584 + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
585 + )
586 + ")
587 ceph? ( sys-cluster/ceph )
588 cluster? (
589 net-libs/rpcsvc-proto
Report Message
Find on MARC Find on Google Groups