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 075D4138334 for ; Wed, 11 Jul 2018 00:42:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41E72E08A2; Wed, 11 Jul 2018 00:42:08 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (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 C25F1E041F for ; Wed, 11 Jul 2018 00:42:07 +0000 (UTC) From: "Marty E. Plummer" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1531269726; bh=jZfNaD1XCT1bC56TXCb8Re3E4zb2Wu9W5l4sCiodb7Q=; h=From:To:Cc:Subject:Date:From; b=P1eRc+t2q0V3+Fkl95S7J35DhuUMGCRf2XwQKZOFByb4egslz0iw6YhWcBmHNIJc8 a7bLpcjOqJ+C4Rj99jVeCgkjymEsPCucs0v2zzSy/I24eTZiaax4Vs+d8cwFBGWx4E UyjBGWj7CI6bD02r10WwgsJhzgwcUZGEDrwgq3pQthKVAonQGnsfNgxf+knBDOo2Da FvCFv9OAmwRhzXOBmyg5XgqhcGXO7+QUJGPHE7RCAguIvlQ2lnFj/GY20VYd07lzpB 6RLnHvIp4wuPTc3Qzbh4MPnriMt+/0G6fMBSNvceQi27tzH8Sc4M6praKcmCHsCcN3 qDWoePELdYraA== To: gentoo-dev@lists.gentoo.org Cc: "Marty E. Plummer" Subject: [gentoo-dev] [PATCH] meson.eclass: add EAPI 7 support Date: Tue, 10 Jul 2018 19:40:44 -0500 Message-Id: <20180711004044.15849-1-hanetzer@startmail.com> 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-Archives-Salt: ac784671-990a-4253-a065-6b86ec0e24ed X-Archives-Hash: 6c6f8cd07041ff1719dc4fc84b22a05b --- It seems this is all that is needed, and all the eclasses inherited by it are supported for EAPI 7. I could be missing something, so please do comment if I have. eclass/meson.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index f2202a04593..7c5b3da6ffa 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -34,7 +34,7 @@ # @CODE case ${EAPI:-0} in - 6) ;; + 6|7) ;; *) die "EAPI=${EAPI} is not supported" ;; esac @@ -69,7 +69,11 @@ MESON_DEPEND=">=dev-util/meson-0.40.0 # their own DEPEND string. : ${MESON_AUTO_DEPEND:=yes} if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then - DEPEND=${MESON_DEPEND} + if [[ ${EAPI:-0} == [0123456] ]]; then + DEPEND=${MESON_DEPEND} + else + BDEPEND=${MESON_DEPEND} + fi fi __MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass -- 2.18.0