Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/awscli/
Date: Wed, 29 Jun 2022 16:40:07
Message-Id: 1656520795.16641713a10d05b8c57effb3ccb70775443d2126.arthurzam@gentoo
1 commit: 16641713a10d05b8c57effb3ccb70775443d2126
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 16:39:22 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 16:39:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16641713
7
8 app-admin/awscli: add blocker on app-admin/awscli-bin
9
10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
11
12 ...cli-1.25.12.ebuild => awscli-1.25.12-r1.ebuild} | 1 +
13 ...cli-1.25.13.ebuild => awscli-1.25.13-r1.ebuild} | 1 +
14 ...cli-1.25.14.ebuild => awscli-1.25.14-r1.ebuild} | 1 +
15 ...cli-1.25.15.ebuild => awscli-1.25.15-r1.ebuild} | 1 +
16 ...cli-1.25.12.ebuild => awscli-1.25.16-r1.ebuild} | 1 +
17 app-admin/awscli/awscli-1.25.16.ebuild | 71 ----------------------
18 ...cli-1.25.12.ebuild => awscli-1.25.17-r1.ebuild} | 1 +
19 app-admin/awscli/awscli-1.25.17.ebuild | 71 ----------------------
20 ...cli-1.25.12.ebuild => awscli-1.25.18-r1.ebuild} | 1 +
21 app-admin/awscli/awscli-1.25.18.ebuild | 71 ----------------------
22 ...cli-1.25.12.ebuild => awscli-1.25.19-r1.ebuild} | 1 +
23 app-admin/awscli/awscli-1.25.19.ebuild | 71 ----------------------
24 ...wscli-1.25.7.ebuild => awscli-1.25.7-r1.ebuild} | 1 +
25 13 files changed, 9 insertions(+), 284 deletions(-)
26
27 diff --git a/app-admin/awscli/awscli-1.25.12.ebuild b/app-admin/awscli/awscli-1.25.12-r1.ebuild
28 similarity index 98%
29 copy from app-admin/awscli/awscli-1.25.12.ebuild
30 copy to app-admin/awscli/awscli-1.25.12-r1.ebuild
31 index 4154af977ee6..9f176fa05cc8 100644
32 --- a/app-admin/awscli/awscli-1.25.12.ebuild
33 +++ b/app-admin/awscli/awscli-1.25.12-r1.ebuild
34 @@ -33,6 +33,7 @@ RDEPEND="
35 dev-python/rsa[${PYTHON_USEDEP}]
36 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
37 dev-python/pyyaml[${PYTHON_USEDEP}]
38 + !app-admin/awscli-bin
39 "
40 BDEPEND="
41 test? (
42
43 diff --git a/app-admin/awscli/awscli-1.25.13.ebuild b/app-admin/awscli/awscli-1.25.13-r1.ebuild
44 similarity index 98%
45 rename from app-admin/awscli/awscli-1.25.13.ebuild
46 rename to app-admin/awscli/awscli-1.25.13-r1.ebuild
47 index 4154af977ee6..9f176fa05cc8 100644
48 --- a/app-admin/awscli/awscli-1.25.13.ebuild
49 +++ b/app-admin/awscli/awscli-1.25.13-r1.ebuild
50 @@ -33,6 +33,7 @@ RDEPEND="
51 dev-python/rsa[${PYTHON_USEDEP}]
52 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
53 dev-python/pyyaml[${PYTHON_USEDEP}]
54 + !app-admin/awscli-bin
55 "
56 BDEPEND="
57 test? (
58
59 diff --git a/app-admin/awscli/awscli-1.25.14.ebuild b/app-admin/awscli/awscli-1.25.14-r1.ebuild
60 similarity index 98%
61 rename from app-admin/awscli/awscli-1.25.14.ebuild
62 rename to app-admin/awscli/awscli-1.25.14-r1.ebuild
63 index 4154af977ee6..9f176fa05cc8 100644
64 --- a/app-admin/awscli/awscli-1.25.14.ebuild
65 +++ b/app-admin/awscli/awscli-1.25.14-r1.ebuild
66 @@ -33,6 +33,7 @@ RDEPEND="
67 dev-python/rsa[${PYTHON_USEDEP}]
68 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
69 dev-python/pyyaml[${PYTHON_USEDEP}]
70 + !app-admin/awscli-bin
71 "
72 BDEPEND="
73 test? (
74
75 diff --git a/app-admin/awscli/awscli-1.25.15.ebuild b/app-admin/awscli/awscli-1.25.15-r1.ebuild
76 similarity index 98%
77 rename from app-admin/awscli/awscli-1.25.15.ebuild
78 rename to app-admin/awscli/awscli-1.25.15-r1.ebuild
79 index 4154af977ee6..9f176fa05cc8 100644
80 --- a/app-admin/awscli/awscli-1.25.15.ebuild
81 +++ b/app-admin/awscli/awscli-1.25.15-r1.ebuild
82 @@ -33,6 +33,7 @@ RDEPEND="
83 dev-python/rsa[${PYTHON_USEDEP}]
84 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
85 dev-python/pyyaml[${PYTHON_USEDEP}]
86 + !app-admin/awscli-bin
87 "
88 BDEPEND="
89 test? (
90
91 diff --git a/app-admin/awscli/awscli-1.25.12.ebuild b/app-admin/awscli/awscli-1.25.16-r1.ebuild
92 similarity index 98%
93 copy from app-admin/awscli/awscli-1.25.12.ebuild
94 copy to app-admin/awscli/awscli-1.25.16-r1.ebuild
95 index 4154af977ee6..9f176fa05cc8 100644
96 --- a/app-admin/awscli/awscli-1.25.12.ebuild
97 +++ b/app-admin/awscli/awscli-1.25.16-r1.ebuild
98 @@ -33,6 +33,7 @@ RDEPEND="
99 dev-python/rsa[${PYTHON_USEDEP}]
100 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
101 dev-python/pyyaml[${PYTHON_USEDEP}]
102 + !app-admin/awscli-bin
103 "
104 BDEPEND="
105 test? (
106
107 diff --git a/app-admin/awscli/awscli-1.25.16.ebuild b/app-admin/awscli/awscli-1.25.16.ebuild
108 deleted file mode 100644
109 index 4154af977ee6..000000000000
110 --- a/app-admin/awscli/awscli-1.25.16.ebuild
111 +++ /dev/null
112 @@ -1,71 +0,0 @@
113 -# Copyright 1999-2022 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=8
117 -
118 -DISTUTILS_USE_PEP517=setuptools
119 -PYTHON_COMPAT=( python3_{8..10} )
120 -
121 -inherit bash-completion-r1 distutils-r1 multiprocessing
122 -
123 -MY_P=aws-cli-${PV}
124 -DESCRIPTION="Universal Command Line Environment for AWS"
125 -HOMEPAGE="
126 - https://github.com/aws/aws-cli/
127 - https://pypi.org/project/awscli/
128 -"
129 -SRC_URI="
130 - https://github.com/aws/aws-cli/archive/${PV}.tar.gz
131 - -> ${MY_P}.gh.tar.gz
132 -"
133 -S=${WORKDIR}/${MY_P}
134 -
135 -LICENSE="Apache-2.0"
136 -SLOT="0"
137 -KEYWORDS="~amd64 ~arm64 ~x86"
138 -
139 -# botocore is x.(y+2).z
140 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
141 -RDEPEND="
142 - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
143 - dev-python/colorama[${PYTHON_USEDEP}]
144 - dev-python/docutils[${PYTHON_USEDEP}]
145 - dev-python/rsa[${PYTHON_USEDEP}]
146 - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
147 - dev-python/pyyaml[${PYTHON_USEDEP}]
148 -"
149 -BDEPEND="
150 - test? (
151 - dev-python/pytest-forked[${PYTHON_USEDEP}]
152 - dev-python/pytest-xdist[${PYTHON_USEDEP}]
153 - )
154 -"
155 -
156 -distutils_enable_tests pytest
157 -
158 -src_prepare() {
159 - # do not rely on bundled deps in botocore (sic!)
160 - find -name '*.py' -exec sed -i \
161 - -e 's:from botocore[.]vendored import:import:' \
162 - -e 's:from botocore[.]vendored[.]:from :' \
163 - {} + || die
164 - # strip overzealous upper bounds on requirements
165 - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
166 - distutils-r1_src_prepare
167 -}
168 -
169 -python_test() {
170 - # integration tests require AWS credentials and Internet access
171 - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
172 -}
173 -
174 -python_install_all() {
175 - newbashcomp bin/aws_bash_completer aws
176 -
177 - insinto /usr/share/zsh/site-functions
178 - newins bin/aws_zsh_completer.sh _aws
179 -
180 - distutils-r1_python_install_all
181 -
182 - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
183 -}
184
185 diff --git a/app-admin/awscli/awscli-1.25.12.ebuild b/app-admin/awscli/awscli-1.25.17-r1.ebuild
186 similarity index 98%
187 copy from app-admin/awscli/awscli-1.25.12.ebuild
188 copy to app-admin/awscli/awscli-1.25.17-r1.ebuild
189 index 4154af977ee6..9f176fa05cc8 100644
190 --- a/app-admin/awscli/awscli-1.25.12.ebuild
191 +++ b/app-admin/awscli/awscli-1.25.17-r1.ebuild
192 @@ -33,6 +33,7 @@ RDEPEND="
193 dev-python/rsa[${PYTHON_USEDEP}]
194 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
195 dev-python/pyyaml[${PYTHON_USEDEP}]
196 + !app-admin/awscli-bin
197 "
198 BDEPEND="
199 test? (
200
201 diff --git a/app-admin/awscli/awscli-1.25.17.ebuild b/app-admin/awscli/awscli-1.25.17.ebuild
202 deleted file mode 100644
203 index 4154af977ee6..000000000000
204 --- a/app-admin/awscli/awscli-1.25.17.ebuild
205 +++ /dev/null
206 @@ -1,71 +0,0 @@
207 -# Copyright 1999-2022 Gentoo Authors
208 -# Distributed under the terms of the GNU General Public License v2
209 -
210 -EAPI=8
211 -
212 -DISTUTILS_USE_PEP517=setuptools
213 -PYTHON_COMPAT=( python3_{8..10} )
214 -
215 -inherit bash-completion-r1 distutils-r1 multiprocessing
216 -
217 -MY_P=aws-cli-${PV}
218 -DESCRIPTION="Universal Command Line Environment for AWS"
219 -HOMEPAGE="
220 - https://github.com/aws/aws-cli/
221 - https://pypi.org/project/awscli/
222 -"
223 -SRC_URI="
224 - https://github.com/aws/aws-cli/archive/${PV}.tar.gz
225 - -> ${MY_P}.gh.tar.gz
226 -"
227 -S=${WORKDIR}/${MY_P}
228 -
229 -LICENSE="Apache-2.0"
230 -SLOT="0"
231 -KEYWORDS="~amd64 ~arm64 ~x86"
232 -
233 -# botocore is x.(y+2).z
234 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
235 -RDEPEND="
236 - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
237 - dev-python/colorama[${PYTHON_USEDEP}]
238 - dev-python/docutils[${PYTHON_USEDEP}]
239 - dev-python/rsa[${PYTHON_USEDEP}]
240 - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
241 - dev-python/pyyaml[${PYTHON_USEDEP}]
242 -"
243 -BDEPEND="
244 - test? (
245 - dev-python/pytest-forked[${PYTHON_USEDEP}]
246 - dev-python/pytest-xdist[${PYTHON_USEDEP}]
247 - )
248 -"
249 -
250 -distutils_enable_tests pytest
251 -
252 -src_prepare() {
253 - # do not rely on bundled deps in botocore (sic!)
254 - find -name '*.py' -exec sed -i \
255 - -e 's:from botocore[.]vendored import:import:' \
256 - -e 's:from botocore[.]vendored[.]:from :' \
257 - {} + || die
258 - # strip overzealous upper bounds on requirements
259 - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
260 - distutils-r1_src_prepare
261 -}
262 -
263 -python_test() {
264 - # integration tests require AWS credentials and Internet access
265 - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
266 -}
267 -
268 -python_install_all() {
269 - newbashcomp bin/aws_bash_completer aws
270 -
271 - insinto /usr/share/zsh/site-functions
272 - newins bin/aws_zsh_completer.sh _aws
273 -
274 - distutils-r1_python_install_all
275 -
276 - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
277 -}
278
279 diff --git a/app-admin/awscli/awscli-1.25.12.ebuild b/app-admin/awscli/awscli-1.25.18-r1.ebuild
280 similarity index 98%
281 copy from app-admin/awscli/awscli-1.25.12.ebuild
282 copy to app-admin/awscli/awscli-1.25.18-r1.ebuild
283 index 4154af977ee6..9f176fa05cc8 100644
284 --- a/app-admin/awscli/awscli-1.25.12.ebuild
285 +++ b/app-admin/awscli/awscli-1.25.18-r1.ebuild
286 @@ -33,6 +33,7 @@ RDEPEND="
287 dev-python/rsa[${PYTHON_USEDEP}]
288 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
289 dev-python/pyyaml[${PYTHON_USEDEP}]
290 + !app-admin/awscli-bin
291 "
292 BDEPEND="
293 test? (
294
295 diff --git a/app-admin/awscli/awscli-1.25.18.ebuild b/app-admin/awscli/awscli-1.25.18.ebuild
296 deleted file mode 100644
297 index 4154af977ee6..000000000000
298 --- a/app-admin/awscli/awscli-1.25.18.ebuild
299 +++ /dev/null
300 @@ -1,71 +0,0 @@
301 -# Copyright 1999-2022 Gentoo Authors
302 -# Distributed under the terms of the GNU General Public License v2
303 -
304 -EAPI=8
305 -
306 -DISTUTILS_USE_PEP517=setuptools
307 -PYTHON_COMPAT=( python3_{8..10} )
308 -
309 -inherit bash-completion-r1 distutils-r1 multiprocessing
310 -
311 -MY_P=aws-cli-${PV}
312 -DESCRIPTION="Universal Command Line Environment for AWS"
313 -HOMEPAGE="
314 - https://github.com/aws/aws-cli/
315 - https://pypi.org/project/awscli/
316 -"
317 -SRC_URI="
318 - https://github.com/aws/aws-cli/archive/${PV}.tar.gz
319 - -> ${MY_P}.gh.tar.gz
320 -"
321 -S=${WORKDIR}/${MY_P}
322 -
323 -LICENSE="Apache-2.0"
324 -SLOT="0"
325 -KEYWORDS="~amd64 ~arm64 ~x86"
326 -
327 -# botocore is x.(y+2).z
328 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
329 -RDEPEND="
330 - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
331 - dev-python/colorama[${PYTHON_USEDEP}]
332 - dev-python/docutils[${PYTHON_USEDEP}]
333 - dev-python/rsa[${PYTHON_USEDEP}]
334 - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
335 - dev-python/pyyaml[${PYTHON_USEDEP}]
336 -"
337 -BDEPEND="
338 - test? (
339 - dev-python/pytest-forked[${PYTHON_USEDEP}]
340 - dev-python/pytest-xdist[${PYTHON_USEDEP}]
341 - )
342 -"
343 -
344 -distutils_enable_tests pytest
345 -
346 -src_prepare() {
347 - # do not rely on bundled deps in botocore (sic!)
348 - find -name '*.py' -exec sed -i \
349 - -e 's:from botocore[.]vendored import:import:' \
350 - -e 's:from botocore[.]vendored[.]:from :' \
351 - {} + || die
352 - # strip overzealous upper bounds on requirements
353 - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
354 - distutils-r1_src_prepare
355 -}
356 -
357 -python_test() {
358 - # integration tests require AWS credentials and Internet access
359 - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
360 -}
361 -
362 -python_install_all() {
363 - newbashcomp bin/aws_bash_completer aws
364 -
365 - insinto /usr/share/zsh/site-functions
366 - newins bin/aws_zsh_completer.sh _aws
367 -
368 - distutils-r1_python_install_all
369 -
370 - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
371 -}
372
373 diff --git a/app-admin/awscli/awscli-1.25.12.ebuild b/app-admin/awscli/awscli-1.25.19-r1.ebuild
374 similarity index 98%
375 rename from app-admin/awscli/awscli-1.25.12.ebuild
376 rename to app-admin/awscli/awscli-1.25.19-r1.ebuild
377 index 4154af977ee6..9f176fa05cc8 100644
378 --- a/app-admin/awscli/awscli-1.25.12.ebuild
379 +++ b/app-admin/awscli/awscli-1.25.19-r1.ebuild
380 @@ -33,6 +33,7 @@ RDEPEND="
381 dev-python/rsa[${PYTHON_USEDEP}]
382 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
383 dev-python/pyyaml[${PYTHON_USEDEP}]
384 + !app-admin/awscli-bin
385 "
386 BDEPEND="
387 test? (
388
389 diff --git a/app-admin/awscli/awscli-1.25.19.ebuild b/app-admin/awscli/awscli-1.25.19.ebuild
390 deleted file mode 100644
391 index 4154af977ee6..000000000000
392 --- a/app-admin/awscli/awscli-1.25.19.ebuild
393 +++ /dev/null
394 @@ -1,71 +0,0 @@
395 -# Copyright 1999-2022 Gentoo Authors
396 -# Distributed under the terms of the GNU General Public License v2
397 -
398 -EAPI=8
399 -
400 -DISTUTILS_USE_PEP517=setuptools
401 -PYTHON_COMPAT=( python3_{8..10} )
402 -
403 -inherit bash-completion-r1 distutils-r1 multiprocessing
404 -
405 -MY_P=aws-cli-${PV}
406 -DESCRIPTION="Universal Command Line Environment for AWS"
407 -HOMEPAGE="
408 - https://github.com/aws/aws-cli/
409 - https://pypi.org/project/awscli/
410 -"
411 -SRC_URI="
412 - https://github.com/aws/aws-cli/archive/${PV}.tar.gz
413 - -> ${MY_P}.gh.tar.gz
414 -"
415 -S=${WORKDIR}/${MY_P}
416 -
417 -LICENSE="Apache-2.0"
418 -SLOT="0"
419 -KEYWORDS="~amd64 ~arm64 ~x86"
420 -
421 -# botocore is x.(y+2).z
422 -BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
423 -RDEPEND="
424 - >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
425 - dev-python/colorama[${PYTHON_USEDEP}]
426 - dev-python/docutils[${PYTHON_USEDEP}]
427 - dev-python/rsa[${PYTHON_USEDEP}]
428 - >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
429 - dev-python/pyyaml[${PYTHON_USEDEP}]
430 -"
431 -BDEPEND="
432 - test? (
433 - dev-python/pytest-forked[${PYTHON_USEDEP}]
434 - dev-python/pytest-xdist[${PYTHON_USEDEP}]
435 - )
436 -"
437 -
438 -distutils_enable_tests pytest
439 -
440 -src_prepare() {
441 - # do not rely on bundled deps in botocore (sic!)
442 - find -name '*.py' -exec sed -i \
443 - -e 's:from botocore[.]vendored import:import:' \
444 - -e 's:from botocore[.]vendored[.]:from :' \
445 - {} + || die
446 - # strip overzealous upper bounds on requirements
447 - sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
448 - distutils-r1_src_prepare
449 -}
450 -
451 -python_test() {
452 - # integration tests require AWS credentials and Internet access
453 - epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
454 -}
455 -
456 -python_install_all() {
457 - newbashcomp bin/aws_bash_completer aws
458 -
459 - insinto /usr/share/zsh/site-functions
460 - newins bin/aws_zsh_completer.sh _aws
461 -
462 - distutils-r1_python_install_all
463 -
464 - rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
465 -}
466
467 diff --git a/app-admin/awscli/awscli-1.25.7.ebuild b/app-admin/awscli/awscli-1.25.7-r1.ebuild
468 similarity index 98%
469 rename from app-admin/awscli/awscli-1.25.7.ebuild
470 rename to app-admin/awscli/awscli-1.25.7-r1.ebuild
471 index afcfc6c6018b..f241876330bb 100644
472 --- a/app-admin/awscli/awscli-1.25.7.ebuild
473 +++ b/app-admin/awscli/awscli-1.25.7-r1.ebuild
474 @@ -33,6 +33,7 @@ RDEPEND="
475 dev-python/rsa[${PYTHON_USEDEP}]
476 >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
477 dev-python/pyyaml[${PYTHON_USEDEP}]
478 + !app-admin/awscli-bin
479 "
480 BDEPEND="
481 test? (