1 |
commit: a4a20588d894cbfc1312546a2fa4fe29fa9c9e63 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 12 10:06:10 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 16 17:40:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a20588 |
7 |
|
8 |
multilib-build.eclass: remove EAPI 5 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
eclass/multilib-build.eclass | 42 +++++------------------------------------- |
14 |
1 file changed, 5 insertions(+), 37 deletions(-) |
15 |
|
16 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
17 |
index 17cd7da0d189..a47e65611354 100644 |
18 |
--- a/eclass/multilib-build.eclass |
19 |
+++ b/eclass/multilib-build.eclass |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 2013-2021 Gentoo Authors |
22 |
+# Copyright 2013-2022 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
# @ECLASS: multilib-build.eclass |
26 |
@@ -6,7 +6,7 @@ |
27 |
# Michał Górny <mgorny@g.o> |
28 |
# @AUTHOR: |
29 |
# Author: Michał Górny <mgorny@g.o> |
30 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
31 |
+# @SUPPORTED_EAPIS: 6 7 8 |
32 |
# @PROVIDES: multibuild |
33 |
# @BLURB: flags and utility functions for building multilib packages |
34 |
# @DESCRIPTION: |
35 |
@@ -19,14 +19,13 @@ |
36 |
# to properly request multilib enabled. |
37 |
|
38 |
case ${EAPI} in |
39 |
- 5|6|7|8) ;; |
40 |
+ 6|7|8) ;; |
41 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
42 |
esac |
43 |
|
44 |
-if [[ -z ${_MULTILIB_BUILD} ]]; then |
45 |
-_MULTILIB_BUILD=1 |
46 |
+if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then |
47 |
+_MULTILIB_BUILD_ECLASS=1 |
48 |
|
49 |
-[[ ${EAPI} == 5 ]] && inherit eutils |
50 |
inherit multibuild multilib |
51 |
|
52 |
# @ECLASS-VARIABLE: _MULTILIB_FLAGS |
53 |
@@ -244,23 +243,6 @@ multilib_parallel_foreach_abi() { |
54 |
multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" |
55 |
} |
56 |
|
57 |
-# @FUNCTION: multilib_for_best_abi |
58 |
-# @USAGE: <argv>... |
59 |
-# @DESCRIPTION: |
60 |
-# Runs the given command with setup for the 'best' (usually native) ABI. |
61 |
-multilib_for_best_abi() { |
62 |
- debug-print-function ${FUNCNAME} "${@}" |
63 |
- |
64 |
- [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" |
65 |
- |
66 |
- eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" |
67 |
- eqawarn "not be used. The multilib_is_native_abi() check may be used instead." |
68 |
- |
69 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
70 |
- |
71 |
- multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" |
72 |
-} |
73 |
- |
74 |
# @FUNCTION: multilib_check_headers |
75 |
# @DESCRIPTION: |
76 |
# Check whether the header files are consistent between ABIs. |
77 |
@@ -583,20 +565,6 @@ multilib_is_native_abi() { |
78 |
[[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] |
79 |
} |
80 |
|
81 |
-# @FUNCTION: multilib_build_binaries |
82 |
-# @DESCRIPTION: |
83 |
-# Deprecated synonym for multilib_is_native_abi |
84 |
-multilib_build_binaries() { |
85 |
- debug-print-function ${FUNCNAME} "${@}" |
86 |
- |
87 |
- [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" |
88 |
- |
89 |
- eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" |
90 |
- eqawarn "multilib_is_native_abi function instead." |
91 |
- |
92 |
- multilib_is_native_abi "${@}" |
93 |
-} |
94 |
- |
95 |
# @FUNCTION: multilib_native_use_with |
96 |
# @USAGE: <flag> [<opt-name> [<opt-value>]] |
97 |
# @DESCRIPTION: |