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