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 33/41] toolchain-autoconf.eclass: drop EAPI 6, add EAPI 8 support
Date: Sun, 25 Dec 2022 22:24:29
Message-Id: 20221225221552.8023-33-soap@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support by David Seifert
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/toolchain-autoconf.eclass | 22 ++++++++--------------
4 1 file changed, 8 insertions(+), 14 deletions(-)
5
6 diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass
7 index 2c8184f894c..2ba27638468 100644
8 --- a/eclass/toolchain-autoconf.eclass
9 +++ b/eclass/toolchain-autoconf.eclass
10 @@ -1,29 +1,22 @@
11 -# Copyright 1999-2019 Gentoo Authors
12 +# Copyright 1999-2022 Gentoo Authors
13 # Distributed under the terms of the GNU General Public License v2
14
15 # @ECLASS: toolchain-autoconf.eclass
16 # @MAINTAINER:
17 # <base-system@g.o>
18 -# @SUPPORTED_EAPIS: 6 7
19 +# @SUPPORTED_EAPIS: 7 8
20 # @BLURB: Common code for sys-devel/autoconf ebuilds
21 # @DESCRIPTION:
22 # This eclass contains the common phase functions migrated from
23 # sys-devel/autoconf eblits.
24
25 -case ${EAPI:-0} in
26 - [0-5])
27 - die "${ECLASS} is banned in EAPI ${EAPI:-0}"
28 - ;;
29 - [6-7])
30 - ;;
31 - *)
32 - die "Unknown EAPI ${EAPI:-0}"
33 - ;;
34 +case ${EAPI} in
35 + 7|8) ;;
36 + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
37 esac
38
39 if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then
40 -
41 -EXPORT_FUNCTIONS src_prepare src_configure src_install
42 +_TOOLCHAIN_AUTOCONF_ECLASS=1
43
44 toolchain-autoconf_src_prepare() {
45 find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + || die
46 @@ -75,5 +68,6 @@ toolchain-autoconf_src_install() {
47 slot_info_pages
48 }
49
50 -_TOOLCHAIN_AUTOCONF_ECLASS=1
51 fi
52 +
53 +EXPORT_FUNCTIONS src_prepare src_configure src_install
54 --
55 2.39.0