From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10E671382C5 for ; Tue, 23 Mar 2021 02:04:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3C1BE085B; Tue, 23 Mar 2021 02:04:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75068E0833 for ; Tue, 23 Mar 2021 02:04:35 +0000 (UTC) From: Adam Feldman To: gentoo-dev@lists.gentoo.org Cc: Adam Feldman Subject: [gentoo-dev] [PATCH 2/2] eclass/mate.eclass: Add EAPI 7 support Date: Mon, 22 Mar 2021 22:04:07 -0400 Message-Id: <20210323020407.25311-2-NP-Hardass@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323020407.25311-1-NP-Hardass@gentoo.org> References: <20210323020407.25311-1-NP-Hardass@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 8c250f48-7381-4c0b-8b97-cb2c4e215613 X-Archives-Hash: 46e68ebe4d675d0e03266c96d58d86c2 --- 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 -- 2.26.2