Gentoo Archives: gentoo-dev

From: David Seifert <soap@g.o>
To: gentoo-dev@l.g.o
Cc: David Seifert <soap@g.o>
Subject: [gentoo-dev] [PATCH v2 1/5] multilib-minimal.eclass: remove EAPI 5
Date: Tue, 11 Jan 2022 22:24:32
Message-Id: 20220111222413.5291-1-soap@gentoo.org
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/multilib-minimal.eclass | 19 ++++++++++---------
4 1 file changed, 10 insertions(+), 9 deletions(-)
5
6 diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
7 index 9a1efe2cc46..97c8d618c42 100644
8 --- a/eclass/multilib-minimal.eclass
9 +++ b/eclass/multilib-minimal.eclass
10 @@ -1,10 +1,10 @@
11 -# Copyright 1999-2021 Gentoo Authors
12 +# Copyright 1999-2022 Gentoo Authors
13 # Distributed under the terms of the GNU General Public License v2
14
15 # @ECLASS: multilib-minimal.eclass
16 # @MAINTAINER:
17 # Michał Górny <mgorny@g.o>
18 -# @SUPPORTED_EAPIS: 5 6 7 8
19 +# @SUPPORTED_EAPIS: 6 7 8
20 # @PROVIDES: multilib-build
21 # @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions
22 # @DESCRIPTION:
23 @@ -23,18 +23,15 @@
24 #
25 # If you need generic install rules, use multilib_src_install_all function.
26
27 -
28 -case ${EAPI} in
29 - 5|6|7|8) ;;
30 +case ${EAPI:-0} in
31 + 6|7|8) ;;
32 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
33 esac
34
35 -
36 -[[ ${EAPI} == 5 ]] && inherit eutils
37 inherit multilib-build
38
39 -EXPORT_FUNCTIONS src_configure src_compile src_test src_install
40 -
41 +if [[ ! ${_MULTILIB_MINIMAL_ECLASS} ]]; then
42 +_MULTILIB_MINIMAL_ECLASS=1
43
44 multilib-minimal_src_configure() {
45 debug-print-function ${FUNCNAME} "$@"
46 @@ -123,3 +120,7 @@ multilib-minimal_src_install() {
47 einstalldocs
48 fi
49 }
50 +
51 +fi
52 +
53 +EXPORT_FUNCTIONS src_configure src_compile src_test src_install
54 --
55 2.34.1

Replies