From 433f97861e0133b141a0a2f5d5fcf49476381f8f Mon Sep 17 00:00:00 2001 From: Adam Feldman Date: Mon, 22 Mar 2021 21:53:25 -0400 Subject: eclass/mate.eclass: Add EAPI 7 support Closes: https://bugs.gentoo.org/770277 Signed-off-by: Adam Feldman --- eclass/mate.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/mate.eclass b/eclass/mate.eclass index 34d5e47acc22..a3b4cfd0b602 100644 --- a/eclass/mate.eclass +++ b/eclass/mate.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Authors: NP-Hardass based upon the gnome2 # and autotools-utils eclasses -# @SUPPORTED_EAPIS: 6 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Provides phases for MATE based packages. # @DESCRIPTION: # Exports portage base functions used by ebuilds written for packages using the @@ -16,7 +16,7 @@ # Check EAPI only case "${EAPI:-0}" in - 6) ;; + 6|7) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -26,8 +26,12 @@ esac # @DESCRIPTION: # Available values for MATE_LA_PUNT: # - "no": will not clean any .la files +# - In EAPI < 7: # - "yes": will run prune_libtool_files --modules # - If it is not set, it will run prune_libtool_files +# - In EAPI 7: +# - Any non-"no" value will run +# find "${ED}" -name '*.la' -delete || die # MATE_LA_PUNT is a stub to GNOME2_LA_PUNT MATE_LA_PUNT=${MATE_LA_PUNT:-""} GNOME2_LA_PUNT="${MATE_LA_PUNT}" @@ -35,7 +39,7 @@ GNOME2_LA_PUNT="${MATE_LA_PUNT}" inherit gnome2 autotools mate-desktop.org case "${EAPI:-0}" in - 6) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;; + 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac -- cgit v1.2.3-65-gdbad