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 AA856139335 for ; Mon, 28 Jun 2021 17:32:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8009E0855; Mon, 28 Jun 2021 17:32:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CD8ACE0855 for ; Mon, 28 Jun 2021 17:32:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAF50335D76 for ; Mon, 28 Jun 2021 17:32:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 182FA7B1 for ; Mon, 28 Jun 2021 17:32:34 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1624900999.cc7d0d075fe7fc9e3228eb7c108c122b855fd8b8.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/meson.eclass X-VCS-Directories: eclass/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: cc7d0d075fe7fc9e3228eb7c108c122b855fd8b8 X-VCS-Branch: master Date: Mon, 28 Jun 2021 17:32:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 159a4835-0940-4def-bb35-64d899cd2b5f X-Archives-Hash: d2e777a6e91df8525d5c9e5fd6bc766f commit: cc7d0d075fe7fc9e3228eb7c108c122b855fd8b8 Author: David Michael gmail com> AuthorDate: Thu Jun 24 15:25:03 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jun 28 17:23:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7d0d07 meson.eclass: EAPI 8 support Signed-off-by: David Michael gmail.com> Signed-off-by: Mike Gilbert gentoo.org> eclass/meson.eclass | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index c9a5e0b5956..a0b3906078c 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -5,7 +5,7 @@ # @MAINTAINER: # William Hubbs # Mike Gilbert -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: common ebuild functions for meson-based packages # @DESCRIPTION: # This eclass contains the default phase functions for packages which @@ -15,7 +15,7 @@ # Typical ebuild using meson.eclass: # # @CODE -# EAPI=6 +# EAPI=8 # # inherit meson # @@ -23,7 +23,7 @@ # # src_configure() { # local emesonargs=( -# $(meson_use qt4) +# $(meson_use qt5) # $(meson_feature threads) # $(meson_use bindist official_branding) # ) @@ -34,32 +34,25 @@ # # @CODE -case ${EAPI:-0} in - 6|7) ;; - *) die "EAPI=${EAPI} is not supported" ;; +case ${EAPI} in + 6|7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_MESON_ECLASS} ]]; then +_MESON_ECLASS=1 +[[ ${EAPI} == 6 ]] && inherit eapi7-ver inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs -if [[ ${EAPI} == 6 ]]; then - inherit eapi7-ver -fi - -fi - EXPORT_FUNCTIONS src_configure src_compile src_test src_install -if [[ -z ${_MESON_ECLASS} ]]; then -_MESON_ECLASS=1 - MESON_DEPEND=">=dev-util/meson-0.56.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array " -if [[ ${EAPI:-0} == [6] ]]; then +if [[ ${EAPI} == 6 ]]; then DEPEND=${MESON_DEPEND} else BDEPEND=${MESON_DEPEND}