Gentoo Archives: gentoo-dev

From: Adam Feldman <NP-Hardass@g.o>
To: gentoo-dev@l.g.o
Cc: Adam Feldman <NP-Hardass@g.o>
Subject: [gentoo-dev] [PATCH 2/2] eclass/mate.eclass: Add EAPI 7 support
Date: Tue, 23 Mar 2021 02:04:58
Message-Id: 20210323020407.25311-2-NP-Hardass@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/2] eclass/mate-desktop.org.eclass: Add EAPI 7 support by Adam Feldman
1 ---
2 eclass/mate.eclass | 10 +++++++---
3 1 file changed, 7 insertions(+), 3 deletions(-)
4
5 diff --git a/eclass/mate.eclass b/eclass/mate.eclass
6 index 34d5e47acc22..a3b4cfd0b602 100644
7 --- a/eclass/mate.eclass
8 +++ b/eclass/mate.eclass
9 @@ -7,7 +7,7 @@
10 # @AUTHOR:
11 # Authors: NP-Hardass <NP-Hardass@g.o> based upon the gnome2
12 # and autotools-utils eclasses
13 -# @SUPPORTED_EAPIS: 6
14 +# @SUPPORTED_EAPIS: 6 7
15 # @BLURB: Provides phases for MATE based packages.
16 # @DESCRIPTION:
17 # Exports portage base functions used by ebuilds written for packages using the
18 @@ -16,7 +16,7 @@
19
20 # Check EAPI only
21 case "${EAPI:-0}" in
22 - 6) ;;
23 + 6|7) ;;
24 *) die "EAPI=${EAPI:-0} is not supported" ;;
25 esac
26
27 @@ -26,8 +26,12 @@ esac
28 # @DESCRIPTION:
29 # Available values for MATE_LA_PUNT:
30 # - "no": will not clean any .la files
31 +# - In EAPI < 7:
32 # - "yes": will run prune_libtool_files --modules
33 # - If it is not set, it will run prune_libtool_files
34 +# - In EAPI 7:
35 +# - Any non-"no" value will run
36 +# find "${ED}" -name '*.la' -delete || die
37 # MATE_LA_PUNT is a stub to GNOME2_LA_PUNT
38 MATE_LA_PUNT=${MATE_LA_PUNT:-""}
39 GNOME2_LA_PUNT="${MATE_LA_PUNT}"
40 @@ -35,7 +39,7 @@ GNOME2_LA_PUNT="${MATE_LA_PUNT}"
41 inherit gnome2 autotools mate-desktop.org
42
43 case "${EAPI:-0}" in
44 - 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;;
45 + 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;;
46 *) die "EAPI=${EAPI:-0} is not supported" ;;
47 esac
48
49 --
50 2.26.2