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

Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible-base/, app-admin/ansible/, dev-python/ansible-compat/, ...
Date: Fri, 02 Sep 2022 09:32:21
Message-Id: 1662110964.f3f90018e3bd4e9258b24c63d1159d43cc4371a0.marecki@gentoo
1 commit: f3f90018e3bd4e9258b24c63d1159d43cc4371a0
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 2 09:29:24 2022 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 09:29:24 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f90018
7
8 app-admin/ansible-core: rename from app-admin/ansible-base
9
10 This is the name upstream has eventually settled on. Change discussed
11 with and approved by monsieurp on IRC.
12
13 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
14
15 app-admin/{ansible-base => ansible-core}/Manifest | 0
16 .../ansible-core-2.11.7.ebuild} | 5 +----
17 .../ansible-core-2.12.7.ebuild} | 5 +----
18 .../ansible-core-2.12.8.ebuild} | 5 +----
19 .../ansible-core-2.13.2.ebuild} | 5 +----
20 .../ansible-core-2.13.3.ebuild} | 5 +----
21 .../ansible-core-9999.ebuild} | 7 ++-----
22 app-admin/{ansible-base => ansible-core}/metadata.xml | 2 +-
23 app-admin/ansible-lint/ansible-lint-6.4.0.ebuild | 2 +-
24 app-admin/ansible-lint/ansible-lint-6.5.2.ebuild | 2 +-
25 app-admin/ansible/ansible-4.6.0.ebuild | 6 +++---
26 app-admin/ansible/ansible-5.10.0.ebuild | 4 ++--
27 app-admin/ansible/ansible-5.9.0.ebuild | 4 ++--
28 app-admin/ansible/ansible-6.1.0.ebuild | 4 ++--
29 app-admin/ansible/ansible-6.2.0.ebuild | 4 ++--
30 dev-python/ansible-compat/ansible-compat-2.1.0.ebuild | 2 +-
31 dev-python/ansible-compat/ansible-compat-2.2.0.ebuild | 2 +-
32 profiles/features/wd40/package.mask | 2 +-
33 profiles/updates/3Q-2022 | 1 +
34 19 files changed, 25 insertions(+), 42 deletions(-)
35
36 diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-core/Manifest
37 similarity index 100%
38 rename from app-admin/ansible-base/Manifest
39 rename to app-admin/ansible-core/Manifest
40
41 diff --git a/app-admin/ansible-base/ansible-base-2.11.7.ebuild b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
42 similarity index 91%
43 rename from app-admin/ansible-base/ansible-base-2.11.7.ebuild
44 rename to app-admin/ansible-core/ansible-core-2.11.7.ebuild
45 index 3b6b3c0d41e6..e84226ab4437 100644
46 --- a/app-admin/ansible-base/ansible-base-2.11.7.ebuild
47 +++ b/app-admin/ansible-core/ansible-core-2.11.7.ebuild
48 @@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
49 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
50 EGIT_BRANCH="devel"
51 else
52 - MY_PN="${PN/-base/-core}"
53 - MY_P="${MY_PN}-${PV}"
54 - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
55 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
56 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
57 - S="${WORKDIR}"/${MY_P}
58 fi
59
60 LICENSE="GPL-3"
61
62 diff --git a/app-admin/ansible-base/ansible-base-2.12.7.ebuild b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
63 similarity index 91%
64 rename from app-admin/ansible-base/ansible-base-2.12.7.ebuild
65 rename to app-admin/ansible-core/ansible-core-2.12.7.ebuild
66 index e8c2a3cb1c45..aebbfcec8b52 100644
67 --- a/app-admin/ansible-base/ansible-base-2.12.7.ebuild
68 +++ b/app-admin/ansible-core/ansible-core-2.12.7.ebuild
69 @@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
70 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
71 EGIT_BRANCH="devel"
72 else
73 - MY_PN="${PN/-base/-core}"
74 - MY_P="${MY_PN}-${PV}"
75 - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
76 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
77 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
78 - S="${WORKDIR}"/${MY_P}
79 fi
80
81 LICENSE="GPL-3"
82
83 diff --git a/app-admin/ansible-base/ansible-base-2.12.8.ebuild b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
84 similarity index 91%
85 rename from app-admin/ansible-base/ansible-base-2.12.8.ebuild
86 rename to app-admin/ansible-core/ansible-core-2.12.8.ebuild
87 index 06d9ba54c027..10e608c937a9 100644
88 --- a/app-admin/ansible-base/ansible-base-2.12.8.ebuild
89 +++ b/app-admin/ansible-core/ansible-core-2.12.8.ebuild
90 @@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
91 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
92 EGIT_BRANCH="devel"
93 else
94 - MY_PN="${PN/-base/-core}"
95 - MY_P="${MY_PN}-${PV}"
96 - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
97 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
98 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
99 - S="${WORKDIR}"/${MY_P}
100 fi
101
102 LICENSE="GPL-3"
103
104 diff --git a/app-admin/ansible-base/ansible-base-2.13.2.ebuild b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
105 similarity index 91%
106 rename from app-admin/ansible-base/ansible-base-2.13.2.ebuild
107 rename to app-admin/ansible-core/ansible-core-2.13.2.ebuild
108 index 20a3a7eaa8dd..49cb6548905c 100644
109 --- a/app-admin/ansible-base/ansible-base-2.13.2.ebuild
110 +++ b/app-admin/ansible-core/ansible-core-2.13.2.ebuild
111 @@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
112 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
113 EGIT_BRANCH="devel"
114 else
115 - MY_PN="${PN/-base/-core}"
116 - MY_P="${MY_PN}-${PV}"
117 - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
118 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
119 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
120 - S="${WORKDIR}"/${MY_P}
121 fi
122
123 LICENSE="GPL-3"
124
125 diff --git a/app-admin/ansible-base/ansible-base-2.13.3.ebuild b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
126 similarity index 91%
127 rename from app-admin/ansible-base/ansible-base-2.13.3.ebuild
128 rename to app-admin/ansible-core/ansible-core-2.13.3.ebuild
129 index 87c538eaf16d..d4dfeb185432 100644
130 --- a/app-admin/ansible-base/ansible-base-2.13.3.ebuild
131 +++ b/app-admin/ansible-core/ansible-core-2.13.3.ebuild
132 @@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
133 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
134 EGIT_BRANCH="devel"
135 else
136 - MY_PN="${PN/-base/-core}"
137 - MY_P="${MY_PN}-${PV}"
138 - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
139 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
140 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
141 - S="${WORKDIR}"/${MY_P}
142 fi
143
144 LICENSE="GPL-3"
145
146 diff --git a/app-admin/ansible-base/ansible-base-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
147 similarity index 89%
148 rename from app-admin/ansible-base/ansible-base-9999.ebuild
149 rename to app-admin/ansible-core/ansible-core-9999.ebuild
150 index caee1ffe1113..10e608c937a9 100644
151 --- a/app-admin/ansible-base/ansible-base-9999.ebuild
152 +++ b/app-admin/ansible-core/ansible-core-9999.ebuild
153 @@ -1,4 +1,4 @@
154 -# Copyright 1999-2021 Gentoo Authors
155 +# Copyright 1999-2022 Gentoo Authors
156 # Distributed under the terms of the GNU General Public License v2
157
158 EAPI=8
159 @@ -16,11 +16,8 @@ if [[ ${PV} == 9999 ]]; then
160 EGIT_REPO_URI="https://github.com/ansible/ansible.git"
161 EGIT_BRANCH="devel"
162 else
163 - MY_PN="${PN/-base/-core}"
164 - MY_P="${MY_PN}-${PV}"
165 - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
166 + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
167 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
168 - S="${WORKDIR}"/${MY_P}
169 fi
170
171 LICENSE="GPL-3"
172
173 diff --git a/app-admin/ansible-base/metadata.xml b/app-admin/ansible-core/metadata.xml
174 similarity index 95%
175 rename from app-admin/ansible-base/metadata.xml
176 rename to app-admin/ansible-core/metadata.xml
177 index 3f94edf04c28..92fba0212508 100644
178 --- a/app-admin/ansible-base/metadata.xml
179 +++ b/app-admin/ansible-core/metadata.xml
180 @@ -10,7 +10,7 @@
181 <name>Patrice Clement</name>
182 </maintainer>
183 <upstream>
184 - <remote-id type="pypi">ansible-base</remote-id>
185 + <remote-id type="pypi">ansible-core</remote-id>
186 <remote-id type="github">ansible/ansible</remote-id>
187 <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
188 </upstream>
189
190 diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
191 index 071feb3061bb..bc3e252daa8c 100644
192 --- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
193 +++ b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
194 @@ -18,7 +18,7 @@ SLOT="0"
195 KEYWORDS="~amd64 ~riscv"
196
197 RDEPEND="
198 - >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
199 + >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
200 >=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
201 >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
202 >=dev-python/jsonschema-4.8.0[${PYTHON_USEDEP}]
203
204 diff --git a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
205 index 25c5750d037c..71e510a4133d 100644
206 --- a/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
207 +++ b/app-admin/ansible-lint/ansible-lint-6.5.2.ebuild
208 @@ -18,7 +18,7 @@ SLOT="0"
209 KEYWORDS="~amd64 ~riscv"
210
211 RDEPEND="
212 - >=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
213 + >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
214 >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}]
215 dev-python/black[${PYTHON_USEDEP}]
216 >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
217
218 diff --git a/app-admin/ansible/ansible-4.6.0.ebuild b/app-admin/ansible/ansible-4.6.0.ebuild
219 index d96231433bb4..a932683ff21d 100644
220 --- a/app-admin/ansible/ansible-4.6.0.ebuild
221 +++ b/app-admin/ansible/ansible-4.6.0.ebuild
222 @@ -1,4 +1,4 @@
223 -# Copyright 1999-2021 Gentoo Authors
224 +# Copyright 1999-2022 Gentoo Authors
225 # Distributed under the terms of the GNU General Public License v2
226
227 EAPI=7
228 @@ -16,8 +16,8 @@ SLOT="0"
229 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
230 RESTRICT="test"
231
232 -RDEPEND=">=app-admin/ansible-base-2.11.1
233 - <app-admin/ansible-base-2.12"
234 +RDEPEND=">=app-admin/ansible-core-2.11.1
235 + <app-admin/ansible-core-2.12"
236
237 python_compile() {
238 local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
239
240 diff --git a/app-admin/ansible/ansible-5.10.0.ebuild b/app-admin/ansible/ansible-5.10.0.ebuild
241 index 999bc1a1edb8..10da86624659 100644
242 --- a/app-admin/ansible/ansible-5.10.0.ebuild
243 +++ b/app-admin/ansible/ansible-5.10.0.ebuild
244 @@ -16,8 +16,8 @@ SLOT="0"
245 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
246 RESTRICT="test"
247
248 -RDEPEND=">=app-admin/ansible-base-2.12.0
249 - <app-admin/ansible-base-2.13"
250 +RDEPEND=">=app-admin/ansible-core-2.12.0
251 + <app-admin/ansible-core-2.13"
252
253 python_compile() {
254 local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
255
256 diff --git a/app-admin/ansible/ansible-5.9.0.ebuild b/app-admin/ansible/ansible-5.9.0.ebuild
257 index 21e85e45cd01..187c0ab3cccb 100644
258 --- a/app-admin/ansible/ansible-5.9.0.ebuild
259 +++ b/app-admin/ansible/ansible-5.9.0.ebuild
260 @@ -16,8 +16,8 @@ SLOT="0"
261 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
262 RESTRICT="test"
263
264 -RDEPEND=">=app-admin/ansible-base-2.12.0
265 - <app-admin/ansible-base-2.13"
266 +RDEPEND=">=app-admin/ansible-core-2.12.0
267 + <app-admin/ansible-core-2.13"
268
269 python_compile() {
270 local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
271
272 diff --git a/app-admin/ansible/ansible-6.1.0.ebuild b/app-admin/ansible/ansible-6.1.0.ebuild
273 index 162e798cc5b4..2117a72eafcb 100644
274 --- a/app-admin/ansible/ansible-6.1.0.ebuild
275 +++ b/app-admin/ansible/ansible-6.1.0.ebuild
276 @@ -16,8 +16,8 @@ SLOT="0"
277 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
278 RESTRICT="test"
279
280 -RDEPEND=">=app-admin/ansible-base-2.13.0
281 - <app-admin/ansible-base-2.14"
282 +RDEPEND=">=app-admin/ansible-core-2.13.0
283 + <app-admin/ansible-core-2.14"
284
285 python_compile() {
286 local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
287
288 diff --git a/app-admin/ansible/ansible-6.2.0.ebuild b/app-admin/ansible/ansible-6.2.0.ebuild
289 index 6edb26b0dbf7..dc69c24b7721 100644
290 --- a/app-admin/ansible/ansible-6.2.0.ebuild
291 +++ b/app-admin/ansible/ansible-6.2.0.ebuild
292 @@ -16,8 +16,8 @@ SLOT="0"
293 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
294 RESTRICT="test"
295
296 -RDEPEND=">=app-admin/ansible-base-2.13.0
297 - <app-admin/ansible-base-2.14"
298 +RDEPEND=">=app-admin/ansible-core-2.13.0
299 + <app-admin/ansible-core-2.14"
300
301 python_compile() {
302 local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
303
304 diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
305 index 7f566730059f..438acfa7dc99 100644
306 --- a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
307 +++ b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
308 @@ -20,7 +20,7 @@ SLOT="0"
309 KEYWORDS="~amd64 ~riscv"
310
311 RDEPEND="
312 - >=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
313 + >=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
314 >=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
315 dev-python/pyyaml[${PYTHON_USEDEP}]
316 >=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
317
318 diff --git a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
319 index 36ec1e075135..5abc44e6b8de 100644
320 --- a/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
321 +++ b/dev-python/ansible-compat/ansible-compat-2.2.0.ebuild
322 @@ -20,7 +20,7 @@ SLOT="0"
323 KEYWORDS="~amd64 ~riscv"
324
325 RDEPEND="
326 - >=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
327 + >=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
328 >=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
329 dev-python/packaging[${PYTHON_USEDEP}]
330 dev-python/pyyaml[${PYTHON_USEDEP}]
331
332 diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
333 index 1bfc099be13f..6dc55ad9a1bc 100644
334 --- a/profiles/features/wd40/package.mask
335 +++ b/profiles/features/wd40/package.mask
336 @@ -3,7 +3,7 @@
337
338 # Various packages requiring Rust.
339 app-admin/ansible
340 -app-admin/ansible-base
341 +app-admin/ansible-core
342 app-crypt/acme
343 app-crypt/certbot
344 app-crypt/certbot-nginx
345
346 diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
347 index 2cdcd10dc1c9..91742f7d8e70 100644
348 --- a/profiles/updates/3Q-2022
349 +++ b/profiles/updates/3Q-2022
350 @@ -12,3 +12,4 @@ move gnome-extra/chrome-gnome-shell gnome-extra/gnome-browser-connector
351 move dev-python/PyQt6_sip dev-python/PyQt6-sip
352 move dev-python/PyQt6_WebEngine dev-python/PyQt6-WebEngine
353 move net-p2p/go-ipfs net-p2p/kubo
354 +move app-admin/ansible-base app-admin/ansible-core
Report Message
Find on MARC Find on Google Groups