Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 30 Jun 2021 14:36:58
Message-Id: 1625063790.433f97861e0133b141a0a2f5d5fcf49476381f8f.np-hardass@gentoo
1 commit: 433f97861e0133b141a0a2f5d5fcf49476381f8f
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 23 01:53:25 2021 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 14:36:30 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433f9786
7
8 eclass/mate.eclass: Add EAPI 7 support
9
10 Closes: https://bugs.gentoo.org/770277
11 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
12
13 eclass/mate.eclass | 10 +++++++---
14 1 file changed, 7 insertions(+), 3 deletions(-)
15
16 diff --git a/eclass/mate.eclass b/eclass/mate.eclass
17 index 34d5e47acc2..a3b4cfd0b60 100644
18 --- a/eclass/mate.eclass
19 +++ b/eclass/mate.eclass
20 @@ -7,7 +7,7 @@
21 # @AUTHOR:
22 # Authors: NP-Hardass <NP-Hardass@g.o> based upon the gnome2
23 # and autotools-utils eclasses
24 -# @SUPPORTED_EAPIS: 6
25 +# @SUPPORTED_EAPIS: 6 7
26 # @BLURB: Provides phases for MATE based packages.
27 # @DESCRIPTION:
28 # Exports portage base functions used by ebuilds written for packages using the
29 @@ -16,7 +16,7 @@
30
31 # Check EAPI only
32 case "${EAPI:-0}" in
33 - 6) ;;
34 + 6|7) ;;
35 *) die "EAPI=${EAPI:-0} is not supported" ;;
36 esac
37
38 @@ -26,8 +26,12 @@ esac
39 # @DESCRIPTION:
40 # Available values for MATE_LA_PUNT:
41 # - "no": will not clean any .la files
42 +# - In EAPI < 7:
43 # - "yes": will run prune_libtool_files --modules
44 # - If it is not set, it will run prune_libtool_files
45 +# - In EAPI 7:
46 +# - Any non-"no" value will run
47 +# find "${ED}" -name '*.la' -delete || die
48 # MATE_LA_PUNT is a stub to GNOME2_LA_PUNT
49 MATE_LA_PUNT=${MATE_LA_PUNT:-""}
50 GNOME2_LA_PUNT="${MATE_LA_PUNT}"
51 @@ -35,7 +39,7 @@ GNOME2_LA_PUNT="${MATE_LA_PUNT}"
52 inherit gnome2 autotools mate-desktop.org
53
54 case "${EAPI:-0}" in
55 - 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;;
56 + 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;;
57 *) die "EAPI=${EAPI:-0} is not supported" ;;
58 esac