commit: 06d36978fc47e8fb25193fe379a200d41b926f7d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 24 10:17:42 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 24 14:51:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d36978
mate.eclass: Drop EAPI-6 support Move EXPORT_FUNCTIONS to end of file and drop duplicate EAPI guard Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/mate.eclass | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/eclass/mate.eclass b/eclass/mate.eclass index 4e46fd27c011..66b4cf446249 100644 --- a/eclass/mate.eclass +++ b/eclass/mate.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mate.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Authors: NP-Hardass <[email protected]> based upon the gnome2 # and autotools-utils eclasses -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 7 # @PROVIDES: mate-desktop.org # @BLURB: Provides phases for MATE based packages. # @DESCRIPTION: @@ -17,7 +17,7 @@ # Check EAPI only case "${EAPI:-0}" in - 6|7) ;; + 7) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -27,10 +27,6 @@ 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 @@ -39,11 +35,6 @@ GNOME2_LA_PUNT="${MATE_LA_PUNT}" inherit gnome2 autotools mate-desktop.org -case "${EAPI:-0}" in - 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;; - *) die "EAPI=${EAPI:-0} is not supported" ;; -esac - # Autotools requires our MATE m4 files DEPEND=">=mate-base/mate-common-${MATE_BRANCH}" @@ -165,3 +156,5 @@ mate_pkg_postinst() { mate_pkg_postrm() { gnome2_pkg_postrm "$@" } + +EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm
