Gentoo Archives: gentoo-portage-dev

From: Matt Turner <mattst88@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-portage-dev] [PATCH 1/2] Remove support for EAPIs "4-python" and "5-progress"
Date: Mon, 21 Feb 2022 22:27:13
Message-Id: 20220221222701.2511747-1-mattst88@gentoo.org
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 GitHub PR: https://github.com/gentoo/portage/pull/789
4
5 bin/dohtml.py | 2 -
6 bin/eapi.sh | 116 ++++----
7 bin/phase-functions.sh | 4 +-
8 bin/phase-helpers.sh | 2 +-
9 doc/package/ebuild/eapi/4-python.docbook | 160 ------------
10 doc/package/ebuild/eapi/5-progress.docbook | 247 ------------------
11 doc/portage.docbook | 2 -
12 lib/portage/__init__.py | 2 -
13 lib/portage/eapi.py | 44 +---
14 lib/portage/tests/dep/test_isvalidatom.py | 9 -
15 .../tests/update/test_update_dbentry.py | 32 +--
16 repoman/cnf/repository/linechecks.yaml | 3 -
17 .../modules/linechecks/patches/patches.py | 2 -
18 13 files changed, 75 insertions(+), 550 deletions(-)
19 delete mode 100644 doc/package/ebuild/eapi/4-python.docbook
20 delete mode 100644 doc/package/ebuild/eapi/5-progress.docbook
21
22 diff --git a/bin/dohtml.py b/bin/dohtml.py
23 index e7cfa591e..ae0abeb64 100755
24 --- a/bin/dohtml.py
25 +++ b/bin/dohtml.py
26 @@ -161,8 +161,6 @@ class OptionsClass:
27 self.DOCDESTTREE = normalize_path(self.DOCDESTTREE)
28
29 self.allowed_exts = ["css", "gif", "htm", "html", "jpeg", "jpg", "js", "png"]
30 - if os.environ.get("EAPI", "0") in ("4-python", "5-progress"):
31 - self.allowed_exts += ["ico", "svg", "xhtml", "xml"]
32 self.allowed_files = []
33 self.disallowed_dirs = ["CVS"]
34 self.recurse = False
35 diff --git a/bin/eapi.sh b/bin/eapi.sh
36 index 362cc07c0..b6d2e07f1 100644
37 --- a/bin/eapi.sh
38 +++ b/bin/eapi.sh
39 @@ -17,7 +17,7 @@ ___eapi_has_src_configure() {
40 }
41
42 ___eapi_default_src_test_disables_parallel_jobs() {
43 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
44 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
45 }
46
47 ___eapi_has_S_WORKDIR_fallback() {
48 @@ -31,19 +31,19 @@ ___eapi_has_prefix_variables() {
49 }
50
51 ___eapi_has_BROOT() {
52 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
53 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
54 }
55
56 ___eapi_has_SYSROOT() {
57 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
58 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
59 }
60
61 ___eapi_has_BDEPEND() {
62 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
63 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
64 }
65
66 ___eapi_has_IDEPEND() {
67 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress|6|7)$ ]]
68 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|5-hdepend|6|7)$ ]]
69 }
70
71 ___eapi_has_RDEPEND_DEPEND_fallback() {
72 @@ -51,15 +51,15 @@ ___eapi_has_RDEPEND_DEPEND_fallback() {
73 }
74
75 ___eapi_has_PORTDIR_ECLASSDIR() {
76 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
77 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
78 }
79
80 ___eapi_has_accumulated_PROPERTIES() {
81 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
82 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
83 }
84
85 ___eapi_has_accumulated_RESTRICT() {
86 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
87 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
88 }
89
90 # HELPERS PRESENCE
91 @@ -73,11 +73,11 @@ ___eapi_has_dosed() {
92 }
93
94 ___eapi_has_einstall() {
95 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
96 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
97 }
98
99 ___eapi_has_dohtml() {
100 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
101 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
102 }
103
104 ___eapi_has_dohtml_deprecated() {
105 @@ -85,7 +85,7 @@ ___eapi_has_dohtml_deprecated() {
106 }
107
108 ___eapi_has_dolib_libopts() {
109 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
110 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
111 }
112
113 ___eapi_has_docompress() {
114 @@ -93,7 +93,7 @@ ___eapi_has_docompress() {
115 }
116
117 ___eapi_has_dostrip() {
118 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
119 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
120 }
121
122 ___eapi_has_nonfatal() {
123 @@ -101,85 +101,85 @@ ___eapi_has_nonfatal() {
124 }
125
126 ___eapi_has_doheader() {
127 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
128 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
129 }
130
131 ___eapi_has_usex() {
132 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
133 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
134 }
135
136 ___eapi_has_get_libdir() {
137 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
138 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
139 }
140
141 ___eapi_has_einstalldocs() {
142 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
143 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
144 }
145
146 ___eapi_has_eapply() {
147 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
148 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
149 }
150
151 ___eapi_has_eapply_user() {
152 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
153 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
154 }
155
156 ___eapi_has_in_iuse() {
157 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
158 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
159 }
160
161 ___eapi_has_version_functions() {
162 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
163 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
164 }
165
166 ___eapi_has_hasq() {
167 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
168 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
169 }
170
171 ___eapi_has_hasv() {
172 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
173 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
174 }
175
176 ___eapi_has_useq() {
177 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
178 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
179 }
180
181 ___eapi_has_master_repositories() {
182 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
183 + [[ ${1-${EAPI-0}} =~ ^$ ]]
184 }
185
186 ___eapi_has_repository_path() {
187 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
188 + [[ ${1-${EAPI-0}} =~ ^$ ]]
189 }
190
191 ___eapi_has_available_eclasses() {
192 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
193 + [[ ${1-${EAPI-0}} =~ ^$ ]]
194 }
195
196 ___eapi_has_eclass_path() {
197 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
198 + [[ ${1-${EAPI-0}} =~ ^$ ]]
199 }
200
201 ___eapi_has_license_path() {
202 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
203 + [[ ${1-${EAPI-0}} =~ ^$ ]]
204 }
205
206 ___eapi_has_package_manager_build_user() {
207 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
208 + [[ ${1-${EAPI-0}} =~ ^$ ]]
209 }
210
211 ___eapi_has_package_manager_build_group() {
212 - [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
213 + [[ ${1-${EAPI-0}} =~ ^$ ]]
214 }
215
216 # HELPERS BEHAVIOR
217
218 ___eapi_best_version_and_has_version_support_--host-root() {
219 - [[ ${1-${EAPI-0}} =~ ^(5|5-progress|6)$ ]]
220 + [[ ${1-${EAPI-0}} =~ ^(5|6)$ ]]
221 }
222
223 ___eapi_best_version_and_has_version_support_-b_-d_-r() {
224 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
225 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
226 }
227
228 ___eapi_unpack_supports_xz() {
229 @@ -187,19 +187,19 @@ ___eapi_unpack_supports_xz() {
230 }
231
232 ___eapi_unpack_supports_txz() {
233 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
234 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
235 }
236
237 ___eapi_unpack_supports_7z() {
238 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
239 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
240 }
241
242 ___eapi_unpack_supports_lha() {
243 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
244 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
245 }
246
247 ___eapi_unpack_supports_rar() {
248 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
249 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
250 }
251
252 ___eapi_econf_passes_--disable-dependency-tracking() {
253 @@ -207,23 +207,23 @@ ___eapi_econf_passes_--disable-dependency-tracking() {
254 }
255
256 ___eapi_econf_passes_--disable-silent-rules() {
257 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
258 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
259 }
260
261 ___eapi_econf_passes_--datarootdir() {
262 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
263 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
264 }
265
266 ___eapi_econf_passes_--disable-static() {
267 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
268 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
269 }
270
271 ___eapi_econf_passes_--docdir_and_--htmldir() {
272 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
273 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
274 }
275
276 ___eapi_econf_passes_--with-sysroot() {
277 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
278 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
279 }
280
281 ___eapi_use_enable_and_use_with_support_empty_third_argument() {
282 @@ -239,7 +239,7 @@ ___eapi_doins_and_newins_preserve_symlinks() {
283 }
284
285 ___eapi_newins_supports_reading_from_standard_input() {
286 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
287 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
288 }
289
290 ___eapi_helpers_can_die() {
291 @@ -247,61 +247,61 @@ ___eapi_helpers_can_die() {
292 }
293
294 ___eapi_unpack_is_case_sensitive() {
295 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5)$ ]]
296 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
297 }
298
299 ___eapi_unpack_supports_absolute_paths() {
300 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5)$ ]]
301 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
302 }
303
304 ___eapi_die_can_respect_nonfatal() {
305 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
306 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
307 }
308
309 ___eapi_domo_respects_into() {
310 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
311 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
312 }
313
314 ___eapi_has_DESTTREE_INSDESTTREE() {
315 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
316 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
317 }
318
319 ___eapi_has_dosym_r() {
320 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
321 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
322 }
323
324 ___eapi_usev_has_second_arg() {
325 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
326 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
327 }
328
329 ___eapi_doconfd_respects_insopts() {
330 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
331 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
332 }
333
334 ___eapi_doenvd_respects_insopts() {
335 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
336 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
337 }
338
339 ___eapi_doheader_respects_insopts() {
340 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
341 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
342 }
343
344 ___eapi_doinitd_respects_exeopts() {
345 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
346 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
347 }
348
349 # OTHERS
350
351 ___eapi_enables_failglob_in_global_scope() {
352 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
353 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
354 }
355
356 ___eapi_enables_globstar() {
357 - [[ ${1-${EAPI-0}} =~ ^(4-python|5-progress)$ ]]
358 + [[ ${1-${EAPI-0}} =~ ^$ ]]
359 }
360
361 ___eapi_bash_3_2() {
362 - [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
363 + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
364 }
365
366 ___eapi_bash_4_2() {
367 @@ -313,9 +313,9 @@ ___eapi_bash_5_0() {
368 }
369
370 ___eapi_has_ENV_UNSET() {
371 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
372 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
373 }
374
375 ___eapi_has_strict_keepdir() {
376 - [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|5|5-progress|6|7)$ ]]
377 + [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
378 }
379 diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
380 index 5eb031805..301ce75ea 100644
381 --- a/bin/phase-functions.sh
382 +++ b/bin/phase-functions.sh
383 @@ -918,7 +918,7 @@ __ebuild_phase_funcs() {
384 fi
385
386 # defaults starting with EAPI 6
387 - if ! has ${eapi} 2 3 4 4-python 4-slot-abi 5 5-progress; then
388 + if ! has ${eapi} 2 3 4 4-slot-abi 5; then
389 [[ ${phase_func} == src_prepare ]] && \
390 default_src_prepare() { __eapi6_src_prepare; }
391 [[ ${phase_func} == src_install ]] && \
392 @@ -929,7 +929,7 @@ __ebuild_phase_funcs() {
393 fi
394
395 # defaults starting with EAPI 8
396 - if ! has ${eapi} 2 3 4 4-python 4-slot-abi 5 5-progress 6 7; then
397 + if ! has ${eapi} 2 3 4 4-slot-abi 5 6 7; then
398 [[ ${phase_func} == src_prepare ]] && \
399 default_src_prepare() { __eapi8_src_prepare; }
400 fi
401 diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
402 index 6a078caad..a6aaa7926 100644
403 --- a/bin/phase-helpers.sh
404 +++ b/bin/phase-helpers.sh
405 @@ -246,7 +246,7 @@ use() {
406 [[ -n ${EBUILD_PHASE} && -n ${PORTAGE_INTERNAL_CALLER} ]] ; then
407 if ! ___in_portage_iuse "${u}"; then
408 if [[ ${EMERGE_FROM} != binary &&
409 - ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]] ; then
410 + ! ${EAPI} =~ ^(0|1|2|3|4|4-slot-abi)$ ]] ; then
411 # This is only strict starting with EAPI 5, since implicit IUSE
412 # is not well defined for earlier EAPIs (see bug #449708).
413 die "USE Flag '${u}' not in IUSE for ${CATEGORY}/${PF}"
414 diff --git a/doc/package/ebuild/eapi/4-python.docbook b/doc/package/ebuild/eapi/4-python.docbook
415 deleted file mode 100644
416 index 5fc6ea023..000000000
417 --- a/doc/package/ebuild/eapi/4-python.docbook
418 +++ /dev/null
419 @@ -1,160 +0,0 @@
420 -<section id='package-ebuild-eapi-4-python'>
421 - <title>EAPI 4-python</title>
422 - <para>
423 - Also see the <ulink url="https://people.apache.org/~Arfrever/EAPI_4-python_Specification">official EAPI 4-python Specification</ulink>.
424 - </para>
425 - <section id='package-ebuild-eapi-4-python-helpers'>
426 - <title>Helpers</title>
427 - <section id='package-ebuild-eapi-4-python-helpers-dohtml-extended-default-list-of-extensions'>
428 - <title>Extended default list of extensions in dohtml</title>
429 - <para>
430 - dohtml by default additionally installs files with .ico, .svg, .xhtml and .xml extensions.
431 - </para>
432 - </section>
433 - <section id='package-ebuild-eapi-4-python-helpers-banned-in-global-scope'>
434 - <title>Helpers Banned in Global Scope</title>
435 - <para>
436 - <itemizedlist>
437 - <listitem><para>diropts</para></listitem>
438 - <listitem><para>docompress</para></listitem>
439 - <listitem><para>exeopts</para></listitem>
440 - <listitem><para>insopts</para></listitem>
441 - <listitem><para>libopts</para></listitem>
442 - <listitem><para>use</para></listitem>
443 - <listitem><para>use_enable</para></listitem>
444 - <listitem><para>use_with</para></listitem>
445 - <listitem><para>useq</para></listitem>
446 - <listitem><para>usev</para></listitem>
447 - </itemizedlist>
448 - </para>
449 - </section>
450 - </section>
451 - <section id='package-ebuild-eapi-4-python-metadata'>
452 - <title>Metadata</title>
453 - <section id='package-ebuild-eapi-4-python-metadata-package-names-allow-period-characters'>
454 - <title>Support for Period Characters in Package Names</title>
455 - <para>
456 - The "." character is allowed in package names.
457 - </para>
458 - </section>
459 - <section id='package-ebuild-eapi-4-python-metadata-use-flags-allow-period-characters'>
460 - <title>Support for Period Characters in USE Flags</title>
461 - <para>
462 - The "." character is allowed in USE flags.
463 - </para>
464 - </section>
465 - <section id='package-ebuild-eapi-4-python-metadata-repository-dependencies'>
466 - <title>Repository Dependencies</title>
467 - <para>
468 - Repository dependencies are supported in atoms in DEPEND, PDEPEND and RDEPEND and atoms passed to best_version and has_version functions.
469 - Repository dependency is specified by two colons followed by repository name.
470 - </para>
471 - <table><title>Repository Dependency Examples</title>
472 - <tgroup cols='1' align='left'>
473 - <colspec colname='atom'/>
474 - <thead>
475 - <row>
476 - <entry>Atom</entry>
477 - </row>
478 - </thead>
479 - <tbody>
480 - <row>
481 - <entry>dev-lang/python::progress</entry>
482 - </row>
483 - <row>
484 - <entry>&gt;=dev-lang/python-3.2::progress</entry>
485 - </row>
486 - <row>
487 - <entry>dev-lang/python:3.2::progress</entry>
488 - </row>
489 - <row>
490 - <entry>dev-lang/python::progress[xml]</entry>
491 - </row>
492 - <row>
493 - <entry>dev-lang/python:3.2::progress[xml]</entry>
494 - </row>
495 - </tbody>
496 - </tgroup>
497 - </table>
498 - </section>
499 - </section>
500 - <section id='package-ebuild-eapi-4-python-globstar'>
501 - <title>globstar shell option enabled by default</title>
502 - <para>
503 - globstar shell option is enabled by default, which enables recursive expansion of ** pattern in pathname expansion context.
504 - </para>
505 - </section>
506 - <section id='package-ebuild-eapi-4-python-variables'>
507 - <title>Variables</title>
508 - <section id='package-ebuild-eapi-4-python-variables-repository'>
509 - <title>REPOSITORY Variable</title>
510 - <para>
511 - The new REPOSITORY variable is set in ebuild environment. This variable contains name of repository, which contains currently used ebuild.
512 - </para>
513 - </section>
514 - </section>
515 - <section id='package-ebuild-eapi-4-python-repo-level-config'>
516 - <title>Extended Repository-Level Configuration</title>
517 - <para>
518 - Repository-level configuration in ${repository_path}/profiles is supported for the following files:
519 - <itemizedlist>
520 - <listitem><para>make.defaults</para></listitem>
521 - <listitem><para>package.use</para></listitem>
522 - <listitem><para>package.use.force</para></listitem>
523 - <listitem><para>package.use.mask</para></listitem>
524 - <listitem><para>use.force</para></listitem>
525 - <listitem><para>use.mask</para></listitem>
526 - </itemizedlist>
527 - </para>
528 - </section>
529 - <section id='package-ebuild-eapi-4-python-directories'>
530 - <title>Directories Allowed for Profile-Level and Repository-Level Configuration</title>
531 - <para>
532 - The following files can be directories:
533 - <itemizedlist>
534 - <listitem><para>package.mask</para></listitem>
535 - <listitem><para>package.use</para></listitem>
536 - <listitem><para>package.use.force</para></listitem>
537 - <listitem><para>package.use.mask</para></listitem>
538 - <listitem><para>use.force</para></listitem>
539 - <listitem><para>use.mask</para></listitem>
540 - </itemizedlist>
541 - </para>
542 - </section>
543 - <section id='package-ebuild-eapi-4-python-use-aliases'>
544 - <title>USE Flag Aliases</title>
545 - <para>
546 - USE flag aliases are supported to allow to satisfy dependencies of packages from other repositories, which require differently named USE flags. USE flag aliases are defined in ${repository_path}/profiles/use.aliases and ${repository_path}/profiles/package.use.aliases files.
547 - </para>
548 - <table><title>use.aliases Example</title>
549 - <tgroup cols='1' align='left'>
550 - <tbody>
551 - <row>
552 - <entry>real_flag1 alias1 alias2</entry>
553 - </row>
554 - <row>
555 - <entry>real_flag2 alias3 alias4</entry>
556 - </row>
557 - </tbody>
558 - </tgroup>
559 - </table>
560 - <table><title>package.use.aliases Example</title>
561 - <tgroup cols='1' align='left'>
562 - <tbody>
563 - <row>
564 - <entry>category/package1 real_flag1 alias1 alias2</entry>
565 - </row>
566 - <row>
567 - <entry>category/package1 real_flag2 alias3 alias4</entry>
568 - </row>
569 - <row>
570 - <entry>=category/package2-1* real_flag3 alias5 alias6</entry>
571 - </row>
572 - <row>
573 - <entry>=category/package2-2* real_flag4 alias5 alias6</entry>
574 - </row>
575 - </tbody>
576 - </tgroup>
577 - </table>
578 - </section>
579 -</section>
580 diff --git a/doc/package/ebuild/eapi/5-progress.docbook b/doc/package/ebuild/eapi/5-progress.docbook
581 deleted file mode 100644
582 index 4d07be86e..000000000
583 --- a/doc/package/ebuild/eapi/5-progress.docbook
584 +++ /dev/null
585 @@ -1,247 +0,0 @@
586 -<section id='package-ebuild-eapi-5-progress'>
587 - <title>EAPI 5-progress</title>
588 - <para>
589 - Also see the <ulink url="https://people.apache.org/~Arfrever/EAPI_5-progress_Specification">official EAPI 5-progress Specification</ulink>.
590 - </para>
591 - <section id='package-ebuild-eapi-5-progress-helpers'>
592 - <title>Helpers</title>
593 - <section id='package-ebuild-eapi-5-progress-helpers-master-repositories'>
594 - <title>master_repositories</title>
595 - <para>
596 - New master_repositories function prints space-separated list of master repositories for specified repository.
597 - </para>
598 - </section>
599 - <section id='package-ebuild-eapi-5-progress-helpers-repository-path'>
600 - <title>repository_path</title>
601 - <para>
602 - New repository_path function prints path to specified repository.
603 - </para>
604 - </section>
605 - <section id='package-ebuild-eapi-5-progress-helpers-available-eclasses'>
606 - <title>available_eclasses</title>
607 - <para>
608 - New available_eclasses function prints space-separated list of available eclasses for current repository.
609 - </para>
610 - </section>
611 - <section id='package-ebuild-eapi-5-progress-helpers-eclass-path'>
612 - <title>eclass_path</title>
613 - <para>
614 - New eclass_path function prints path to specified eclass for current repository.
615 - </para>
616 - </section>
617 - <section id='package-ebuild-eapi-5-progress-helpers-license-path'>
618 - <title>license_path</title>
619 - <para>
620 - New license_path function prints path to specified license for current repository.
621 - </para>
622 - </section>
623 - <section id='package-ebuild-eapi-5-progress-helpers-package-manager-build-user'>
624 - <title>package_manager_build_user</title>
625 - <para>
626 - New package_manager_build_user function prints name of user used by package manager in build phases.
627 - </para>
628 - </section>
629 - <section id='package-ebuild-eapi-5-progress-helpers-package-manager-build-group'>
630 - <title>package_manager_build_group</title>
631 - <para>
632 - New package_manager_build_group function prints name of group used by package manager in build phases.
633 - </para>
634 - </section>
635 - <section id='package-ebuild-eapi-5-progress-helpers-dohtml-extended-default-list-of-extensions'>
636 - <title>Extended default list of extensions in dohtml</title>
637 - <para>
638 - dohtml by default additionally installs files with .ico, .svg, .xhtml and .xml extensions.
639 - </para>
640 - </section>
641 - <section id='package-ebuild-eapi-5-progress-helpers-unpack-case-insensitive'>
642 - <title>Case-insensitive matching of extensions in unpack</title>
643 - <para>
644 - unpack matches extensions case-insensitively.
645 - </para>
646 - </section>
647 - <section id='package-ebuild-eapi-5-progress-helpers-banned-in-global-scope'>
648 - <title>Helpers Banned in Global Scope</title>
649 - <para>
650 - <itemizedlist>
651 - <listitem><para>diropts</para></listitem>
652 - <listitem><para>docompress</para></listitem>
653 - <listitem><para>exeopts</para></listitem>
654 - <listitem><para>insopts</para></listitem>
655 - <listitem><para>libopts</para></listitem>
656 - <listitem><para>use</para></listitem>
657 - <listitem><para>use_enable</para></listitem>
658 - <listitem><para>use_with</para></listitem>
659 - <listitem><para>useq</para></listitem>
660 - <listitem><para>usev</para></listitem>
661 - <listitem><para>usex</para></listitem>
662 - </itemizedlist>
663 - </para>
664 - </section>
665 - </section>
666 - <section id='package-ebuild-eapi-5-progress-metadata'>
667 - <title>Metadata</title>
668 - <section id='package-ebuild-eapi-5-progress-metadata-package-names-allow-period-characters'>
669 - <title>Support for Period Characters in Package Names</title>
670 - <para>
671 - The "." character is allowed in package names.
672 - </para>
673 - </section>
674 - <section id='package-ebuild-eapi-5-progress-metadata-use-flags-allow-period-characters'>
675 - <title>Support for Period Characters in USE Flags</title>
676 - <para>
677 - The "." character is allowed in USE flags.
678 - </para>
679 - </section>
680 - <section id='package-ebuild-eapi-5-progress-metadata-repository-dependencies'>
681 - <title>Repository Dependencies</title>
682 - <para>
683 - Repository dependencies are supported in atoms in DEPEND, PDEPEND and RDEPEND and atoms passed to best_version and has_version functions.
684 - Repository dependency is specified by two colons followed by repository name.
685 - </para>
686 - <table><title>Repository Dependency Examples</title>
687 - <tgroup cols='1' align='left'>
688 - <colspec colname='atom'/>
689 - <thead>
690 - <row>
691 - <entry>Atom</entry>
692 - </row>
693 - </thead>
694 - <tbody>
695 - <row>
696 - <entry>dev-lang/python::progress</entry>
697 - </row>
698 - <row>
699 - <entry>&gt;=dev-lang/python-3.2::progress</entry>
700 - </row>
701 - <row>
702 - <entry>dev-lang/python:3.2::progress</entry>
703 - </row>
704 - <row>
705 - <entry>dev-lang/python::progress[xml]</entry>
706 - </row>
707 - <row>
708 - <entry>dev-lang/python:3.2::progress[xml]</entry>
709 - </row>
710 - </tbody>
711 - </tgroup>
712 - </table>
713 - </section>
714 - <section id='package-ebuild-eapi-5-progress-metadata-automatic-unpack-dependencies'>
715 - <title>Automatic Unpack Dependencies</title>
716 - <para>
717 - Dependencies on packages required to unpack archives specified in SRC_URI are automatically appended to DEPEND. These dependencies are calculated from filename extensions of archives specified in SRC_URI. Dependencies (for ebuilds using given EAPI) corresponding to given filename extensions are configured in ${repository_path}/profiles/unpack_dependencies/${EAPI} files.
718 - </para>
719 - <table><title>Unpack Dependencies Configuration Examples</title>
720 - <tgroup cols='1' align='left'>
721 - <tbody>
722 - <row>
723 - <entry>bz2 app-arch/bzip2</entry>
724 - </row>
725 - <row>
726 - <entry>gz app-arch/gzip</entry>
727 - </row>
728 - <row>
729 - <entry>tar app-arch/tar</entry>
730 - </row>
731 - <row>
732 - <entry>tar.bz2 app-arch/tar app-arch/bzip2</entry>
733 - </row>
734 - <row>
735 - <entry>tar.gz app-arch/tar app-arch/gzip</entry>
736 - </row>
737 - <row>
738 - <entry>zip app-arch/unzip</entry>
739 - </row>
740 - </tbody>
741 - </tgroup>
742 - </table>
743 - </section>
744 - </section>
745 - <section id='package-ebuild-eapi-5-progress-globstar'>
746 - <title>globstar shell option enabled by default</title>
747 - <para>
748 - globstar shell option is enabled by default, which enables recursive expansion of ** pattern in pathname expansion context.
749 - </para>
750 - </section>
751 - <section id='package-ebuild-eapi-5-progress-variables'>
752 - <title>Variables</title>
753 - <section id='package-ebuild-eapi-5-progress-variables-repository'>
754 - <title>REPOSITORY Variable</title>
755 - <para>
756 - The new REPOSITORY variable is set in ebuild environment. This variable contains name of repository, which contains currently used ebuild.
757 - </para>
758 - </section>
759 - </section>
760 - <section id='package-ebuild-eapi-5-progress-repo-level-config'>
761 - <title>Extended Repository-Level Configuration</title>
762 - <para>
763 - Repository-level configuration in ${repository_path}/profiles is supported for the following files:
764 - <itemizedlist>
765 - <listitem><para>make.defaults</para></listitem>
766 - <listitem><para>package.use</para></listitem>
767 - <listitem><para>package.use.force</para></listitem>
768 - <listitem><para>package.use.mask</para></listitem>
769 - <listitem><para>package.use.stable.force</para></listitem>
770 - <listitem><para>package.use.stable.mask</para></listitem>
771 - <listitem><para>use.force</para></listitem>
772 - <listitem><para>use.mask</para></listitem>
773 - <listitem><para>use.stable.force</para></listitem>
774 - <listitem><para>use.stable.mask</para></listitem>
775 - </itemizedlist>
776 - </para>
777 - </section>
778 - <section id='package-ebuild-eapi-5-progress-directories'>
779 - <title>Directories Allowed for Profile-Level and Repository-Level Configuration</title>
780 - <para>
781 - The following files can be directories:
782 - <itemizedlist>
783 - <listitem><para>package.mask</para></listitem>
784 - <listitem><para>package.use</para></listitem>
785 - <listitem><para>package.use.force</para></listitem>
786 - <listitem><para>package.use.mask</para></listitem>
787 - <listitem><para>package.use.stable.force</para></listitem>
788 - <listitem><para>package.use.stable.mask</para></listitem>
789 - <listitem><para>use.force</para></listitem>
790 - <listitem><para>use.mask</para></listitem>
791 - <listitem><para>use.stable.force</para></listitem>
792 - <listitem><para>use.stable.mask</para></listitem>
793 - </itemizedlist>
794 - </para>
795 - </section>
796 - <section id='package-ebuild-eapi-5-progress-use-aliases'>
797 - <title>USE Flag Aliases</title>
798 - <para>
799 - USE flag aliases are supported to allow to satisfy dependencies of packages from other repositories, which require differently named USE flags. USE flag aliases are defined in ${repository_path}/profiles/use.aliases and ${repository_path}/profiles/package.use.aliases files.
800 - </para>
801 - <table><title>use.aliases Example</title>
802 - <tgroup cols='1' align='left'>
803 - <tbody>
804 - <row>
805 - <entry>real_flag1 alias1 alias2</entry>
806 - </row>
807 - <row>
808 - <entry>real_flag2 alias3 alias4</entry>
809 - </row>
810 - </tbody>
811 - </tgroup>
812 - </table>
813 - <table><title>package.use.aliases Example</title>
814 - <tgroup cols='1' align='left'>
815 - <tbody>
816 - <row>
817 - <entry>category/package1 real_flag1 alias1 alias2</entry>
818 - </row>
819 - <row>
820 - <entry>category/package1 real_flag2 alias3 alias4</entry>
821 - </row>
822 - <row>
823 - <entry>=category/package2-1* real_flag3 alias5 alias6</entry>
824 - </row>
825 - <row>
826 - <entry>=category/package2-2* real_flag4 alias5 alias6</entry>
827 - </row>
828 - </tbody>
829 - </tgroup>
830 - </table>
831 - </section>
832 -</section>
833 diff --git a/doc/portage.docbook b/doc/portage.docbook
834 index 04db26303..77cf7e87e 100644
835 --- a/doc/portage.docbook
836 +++ b/doc/portage.docbook
837 @@ -20,10 +20,8 @@
838 <!ENTITY package_ebuild_eapi_2 SYSTEM "package/ebuild/eapi/2.docbook">
839 <!ENTITY package_ebuild_eapi_3 SYSTEM "package/ebuild/eapi/3.docbook">
840 <!ENTITY package_ebuild_eapi_4 SYSTEM "package/ebuild/eapi/4.docbook">
841 - <!ENTITY package_ebuild_eapi_4_python SYSTEM "package/ebuild/eapi/4-python.docbook">
842 <!ENTITY package_ebuild_eapi_4_slot_abi SYSTEM "package/ebuild/eapi/4-slot-abi.docbook">
843 <!ENTITY package_ebuild_eapi_5 SYSTEM "package/ebuild/eapi/5.docbook">
844 - <!ENTITY package_ebuild_eapi_5_progress SYSTEM "package/ebuild/eapi/5-progress.docbook">
845 <!ENTITY qa SYSTEM "qa.docbook">
846 <!ENTITY config SYSTEM "config.docbook">
847 <!ENTITY config_bashrc SYSTEM "config/bashrc.docbook">
848 diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
849 index 3042de1aa..7687c5971 100644
850 --- a/lib/portage/__init__.py
851 +++ b/lib/portage/__init__.py
852 @@ -546,11 +546,9 @@ _deprecated_eapis = frozenset(
853 "3_pre1",
854 "3_pre2",
855 "4_pre1",
856 - "4-python",
857 "4-slot-abi",
858 "5_pre1",
859 "5_pre2",
860 - "5-progress",
861 "6_pre1",
862 "7_pre1",
863 ]
864 diff --git a/lib/portage/eapi.py b/lib/portage/eapi.py
865 index adee87d00..56d87b7ce 100644
866 --- a/lib/portage/eapi.py
867 +++ b/lib/portage/eapi.py
868 @@ -13,7 +13,7 @@ def eapi_has_iuse_defaults(eapi):
869
870
871 def eapi_has_iuse_effective(eapi):
872 - return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
873 + return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
874
875
876 def eapi_has_slot_deps(eapi):
877 @@ -21,7 +21,7 @@ def eapi_has_slot_deps(eapi):
878
879
880 def eapi_has_slot_operator(eapi):
881 - return eapi not in ("0", "1", "2", "3", "4", "4-python")
882 + return eapi not in ("0", "1", "2", "3", "4")
883
884
885 def eapi_has_src_uri_arrows(eapi):
886 @@ -35,10 +35,8 @@ def eapi_has_selective_src_uri_restriction(eapi):
887 "2",
888 "3",
889 "4",
890 - "4-python",
891 "4-slot-abi",
892 "5",
893 - "5-progress",
894 "6",
895 "7",
896 )
897 @@ -77,7 +75,7 @@ def eapi_exports_replace_vars(eapi):
898
899
900 def eapi_exports_EBUILD_PHASE_FUNC(eapi):
901 - return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
902 + return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
903
904
905 def eapi_exports_PORTDIR(eapi):
906 @@ -87,10 +85,8 @@ def eapi_exports_PORTDIR(eapi):
907 "2",
908 "3",
909 "4",
910 - "4-python",
911 "4-slot-abi",
912 "5",
913 - "5-progress",
914 "6",
915 )
916
917 @@ -102,16 +98,14 @@ def eapi_exports_ECLASSDIR(eapi):
918 "2",
919 "3",
920 "4",
921 - "4-python",
922 "4-slot-abi",
923 "5",
924 - "5-progress",
925 "6",
926 )
927
928
929 def eapi_exports_REPOSITORY(eapi):
930 - return eapi in ("4-python", "5-progress")
931 + return False
932
933
934 def eapi_has_pkg_pretend(eapi):
935 @@ -131,7 +125,7 @@ def eapi_has_required_use(eapi):
936
937
938 def eapi_has_required_use_at_most_one_of(eapi):
939 - return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
940 + return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
941
942
943 def eapi_has_use_dep_defaults(eapi):
944 @@ -145,27 +139,25 @@ def eapi_requires_posixish_locale(eapi):
945 "2",
946 "3",
947 "4",
948 - "4-python",
949 "4-slot-abi",
950 "5",
951 - "5-progress",
952 )
953
954
955 def eapi_has_repo_deps(eapi):
956 - return eapi in ("4-python", "5-progress")
957 + return False
958
959
960 def eapi_allows_dots_in_PN(eapi):
961 - return eapi in ("4-python", "5-progress")
962 + return False
963
964
965 def eapi_allows_dots_in_use_flags(eapi):
966 - return eapi in ("4-python", "5-progress")
967 + return False
968
969
970 def eapi_supports_stable_use_forcing_and_masking(eapi):
971 - return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
972 + return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
973
974
975 def eapi_allows_directories_on_profile_level_and_repository_level(eapi):
976 @@ -173,11 +165,11 @@ def eapi_allows_directories_on_profile_level_and_repository_level(eapi):
977
978
979 def eapi_has_use_aliases(eapi):
980 - return eapi in ("4-python", "5-progress")
981 + return False
982
983
984 def eapi_has_automatic_unpack_dependencies(eapi):
985 - return eapi in ("5-progress",)
986 + return False
987
988
989 def eapi_allows_package_provided(eapi):
990 @@ -187,10 +179,8 @@ def eapi_allows_package_provided(eapi):
991 "2",
992 "3",
993 "4",
994 - "4-python",
995 "4-slot-abi",
996 "5",
997 - "5-progress",
998 "6",
999 )
1000
1001 @@ -202,10 +192,8 @@ def eapi_has_bdepend(eapi):
1002 "2",
1003 "3",
1004 "4",
1005 - "4-python",
1006 "4-slot-abi",
1007 "5",
1008 - "5-progress",
1009 "6",
1010 )
1011
1012 @@ -217,10 +205,8 @@ def eapi_has_idepend(eapi):
1013 "2",
1014 "3",
1015 "4",
1016 - "4-python",
1017 "4-slot-abi",
1018 "5",
1019 - "5-progress",
1020 "6",
1021 "7",
1022 )
1023 @@ -233,10 +219,8 @@ def eapi_empty_groups_always_true(eapi):
1024 "2",
1025 "3",
1026 "4",
1027 - "4-python",
1028 "4-slot-abi",
1029 "5",
1030 - "5-progress",
1031 "6",
1032 )
1033
1034 @@ -248,10 +232,8 @@ def eapi_path_variables_end_with_trailing_slash(eapi):
1035 "2",
1036 "3",
1037 "4",
1038 - "4-python",
1039 "4-slot-abi",
1040 "5",
1041 - "5-progress",
1042 "6",
1043 )
1044
1045 @@ -263,10 +245,8 @@ def eapi_has_broot(eapi):
1046 "2",
1047 "3",
1048 "4",
1049 - "4-python",
1050 "4-slot-abi",
1051 "5",
1052 - "5-progress",
1053 "6",
1054 )
1055
1056 @@ -278,10 +258,8 @@ def eapi_has_sysroot(eapi):
1057 "2",
1058 "3",
1059 "4",
1060 - "4-python",
1061 "4-slot-abi",
1062 "5",
1063 - "5-progress",
1064 "6",
1065 )
1066
1067 diff --git a/lib/portage/tests/dep/test_isvalidatom.py b/lib/portage/tests/dep/test_isvalidatom.py
1068 index ddd2b58db..c21fb6376 100644
1069 --- a/lib/portage/tests/dep/test_isvalidatom.py
1070 +++ b/lib/portage/tests/dep/test_isvalidatom.py
1071 @@ -184,9 +184,6 @@ class IsValidAtom(TestCase):
1072 IsValidAtomTestCase(
1073 "sys-apps/portage::repo", False, allow_repo=None, eapi="5"
1074 ),
1075 - IsValidAtomTestCase(
1076 - "sys-apps/portage::repo", True, allow_repo=None, eapi="5-progress"
1077 - ),
1078 IsValidAtomTestCase(
1079 "sys-apps/portage::repo", False, allow_repo=None, eapi="7"
1080 ),
1081 @@ -195,9 +192,6 @@ class IsValidAtom(TestCase):
1082 IsValidAtomTestCase(
1083 "sys-apps/portage::repo", False, allow_repo=False, eapi="5"
1084 ),
1085 - IsValidAtomTestCase(
1086 - "sys-apps/portage::repo", False, allow_repo=False, eapi="5-progress"
1087 - ),
1088 IsValidAtomTestCase(
1089 "sys-apps/portage::repo", False, allow_repo=False, eapi="7"
1090 ),
1091 @@ -205,9 +199,6 @@ class IsValidAtom(TestCase):
1092 IsValidAtomTestCase(
1093 "sys-apps/portage::repo", True, allow_repo=True, eapi="5"
1094 ),
1095 - IsValidAtomTestCase(
1096 - "sys-apps/portage::repo", True, allow_repo=True, eapi="5-progress"
1097 - ),
1098 IsValidAtomTestCase(
1099 "sys-apps/portage::repo", True, allow_repo=True, eapi="7"
1100 ),
1101 diff --git a/lib/portage/tests/update/test_update_dbentry.py b/lib/portage/tests/update/test_update_dbentry.py
1102 index 3b49cba9d..25cab198d 100644
1103 --- a/lib/portage/tests/update/test_update_dbentry.py
1104 +++ b/lib/portage/tests/update/test_update_dbentry.py
1105 @@ -190,7 +190,7 @@ class UpdateDbentryTestCase(TestCase):
1106 },
1107 "dev-libs/B-1::test_repo": {
1108 "RDEPEND": "dev-libs/M dev-libs/N dev-libs/P",
1109 - "EAPI": "4-python",
1110 + "EAPI": "4",
1111 },
1112 "dev-libs/M-1::test_repo": {
1113 "EAPI": "4",
1114 @@ -199,7 +199,7 @@ class UpdateDbentryTestCase(TestCase):
1115 "EAPI": "4",
1116 },
1117 "dev-libs/N-2::test_repo": {
1118 - "EAPI": "4-python",
1119 + "EAPI": "4",
1120 },
1121 }
1122
1123 @@ -215,7 +215,7 @@ class UpdateDbentryTestCase(TestCase):
1124 },
1125 "dev-libs/B-1::test_repo": {
1126 "RDEPEND": "dev-libs/M dev-libs/N dev-libs/P",
1127 - "EAPI": "4-python",
1128 + "EAPI": "4",
1129 },
1130 }
1131
1132 @@ -224,7 +224,6 @@ class UpdateDbentryTestCase(TestCase):
1133 updates = textwrap.dedent(
1134 """
1135 move dev-libs/M dev-libs/M-moved
1136 - move dev-libs/N dev-libs/N.moved
1137 """
1138 )
1139
1140 @@ -296,29 +295,6 @@ class UpdateDbentryTestCase(TestCase):
1141 self.assertTrue(old_pattern.search(rdepend) is None)
1142 self.assertTrue("dev-libs/M-moved" in rdepend)
1143
1144 - # EAPI 4-python/*-progress N -> N.moved
1145 - rdepend = vardb.aux_get("dev-libs/B-1", ["RDEPEND"])[0]
1146 - old_pattern = re.compile(r"\bdev-libs/N(\s|$)")
1147 - self.assertTrue(old_pattern.search(rdepend) is None)
1148 - self.assertTrue("dev-libs/N.moved" in rdepend)
1149 - rdepend = bindb.aux_get("dev-libs/B-1", ["RDEPEND"])[0]
1150 - self.assertTrue(old_pattern.search(rdepend) is None)
1151 - self.assertTrue("dev-libs/N.moved" in rdepend)
1152 - self.assertRaises(KeyError, vardb.aux_get, "dev-libs/N-2", ["EAPI"])
1153 - vardb.aux_get("dev-libs/N.moved-2", ["RDEPEND"])[0]
1154 -
1155 - # EAPI 4 does not allow dots in package names for N -> N.moved
1156 - rdepend = vardb.aux_get("dev-libs/A-1", ["RDEPEND"])[0]
1157 - self.assertTrue("dev-libs/N" in rdepend)
1158 - self.assertTrue("dev-libs/N.moved" not in rdepend)
1159 - rdepend = bindb.aux_get("dev-libs/A-1", ["RDEPEND"])[0]
1160 - self.assertTrue("dev-libs/N" in rdepend)
1161 - self.assertTrue("dev-libs/N.moved" not in rdepend)
1162 - vardb.aux_get("dev-libs/N-1", ["RDEPEND"])[0]
1163 - self.assertRaises(
1164 - KeyError, vardb.aux_get, "dev-libs/N.moved-1", ["EAPI"]
1165 - )
1166 -
1167 # dont_apply_updates
1168 rdepend = vardb.aux_get("dev-libs/A-2", ["RDEPEND"])[0]
1169 self.assertTrue("dev-libs/M" in rdepend)
1170 @@ -330,8 +306,6 @@ class UpdateDbentryTestCase(TestCase):
1171 selected_set.load()
1172 self.assertTrue("dev-libs/M" not in selected_set)
1173 self.assertTrue("dev-libs/M-moved" in selected_set)
1174 - self.assertTrue("dev-libs/N" not in selected_set)
1175 - self.assertTrue("dev-libs/N.moved" in selected_set)
1176
1177 finally:
1178 playground.cleanup()
1179 diff --git a/repoman/cnf/repository/linechecks.yaml b/repoman/cnf/repository/linechecks.yaml
1180 index c323ac1f0..528fdd99c 100644
1181 --- a/repoman/cnf/repository/linechecks.yaml
1182 +++ b/repoman/cnf/repository/linechecks.yaml
1183 @@ -236,7 +236,6 @@ usex_supported_eapis:
1184 - "2"
1185 - "3"
1186 - "4"
1187 - - "4-python"
1188 - "4-slot-abi"
1189
1190 in_iuse_supported_eapis:
1191 @@ -245,7 +244,5 @@ in_iuse_supported_eapis:
1192 - "2"
1193 - "3"
1194 - "4"
1195 - - "4-python"
1196 - "4-slot-abi"
1197 - "5"
1198 - - "5-progress"
1199 diff --git a/repoman/lib/repoman/modules/linechecks/patches/patches.py b/repoman/lib/repoman/modules/linechecks/patches/patches.py
1200 index d5149d151..ca9a4cada 100644
1201 --- a/repoman/lib/repoman/modules/linechecks/patches/patches.py
1202 +++ b/repoman/lib/repoman/modules/linechecks/patches/patches.py
1203 @@ -17,8 +17,6 @@ class EbuildPatches(LineCheck):
1204 "2",
1205 "3",
1206 "4",
1207 - "4-python",
1208 "4-slot-abi",
1209 "5",
1210 - "5-progress",
1211 )
1212 --
1213 2.34.1

Replies