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 6DFE9138334 for ; Sun, 12 Aug 2018 07:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F813E0869; Sun, 12 Aug 2018 07:23:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2D6B0E083E for ; Sun, 12 Aug 2018 07:23:58 +0000 (UTC) Received: from localhost.localdomain (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id ECCD2335C9F; Sun, 12 Aug 2018 07:23:54 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 04/98] base.eclass: Fix EAPI guards to cover EAPI 7 onwards Date: Sun, 12 Aug 2018 09:22:09 +0200 Message-Id: <20180812072343.19947-5-mgorny@gentoo.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180812072343.19947-1-mgorny@gentoo.org> References: <20180812072343.19947-1-mgorny@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-Archives-Salt: f972c1bc-245a-4e44-abf7-9f6116d5dcbb X-Archives-Hash: 54d4fbb44f4336f7f6d3be17fd208af9 --- eclass/base.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/base.eclass b/eclass/base.eclass index edb50a4184b3..d304934c7102 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -33,9 +33,9 @@ inherit eutils BASE_EXPF="src_unpack src_compile src_install" case "${EAPI:-0}" in - 6) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";; + 0|1) ;; 2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;; - *) ;; + *) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";; esac EXPORT_FUNCTIONS ${BASE_EXPF} -- 2.18.0