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 3EB1813933E for ; Mon, 19 Jul 2021 05:57:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90BA7E0ADE; Mon, 19 Jul 2021 05:57:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 484EDE0ACB for ; Mon, 19 Jul 2021 05:57:18 +0000 (UTC) Message-ID: <2ebd4a21eb2267d4a1b384d2ed6361c8417dcf6f.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] virtualx.eclass: Support EAPI-8 From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Mon, 19 Jul 2021 07:57:12 +0200 In-Reply-To: <2139995.vFx2qVVIhK@tuxbook> References: <2139995.vFx2qVVIhK@tuxbook> Organization: Gentoo Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.2 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: d62b5f7c-e0b4-412c-9f8b-b71fdb7beb1b X-Archives-Hash: 8c652d6fb219fdc03eb695aca9fbb27f On Sun, 2021-07-18 at 22:46 +0200, Andreas Sturmlechner wrote: > Standardise include guard, fix minor typo. > > Signed-off-by: Andreas Sturmlechner > --- > eclass/virtualx.eclass | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass > index ca52e8d2815..f362327cf77 100644 > --- a/eclass/virtualx.eclass > +++ b/eclass/virtualx.eclass > @@ -6,17 +6,16 @@ > # x11@gentoo.org > # @AUTHOR: > # Original author: Martin Schlemmer > -# @SUPPORTED_EAPIS: 6 7 > -# @BLURB: This eclass can be used for packages that needs a working X environment to build. > +# @SUPPORTED_EAPIS: 6 7 8 > +# @BLURB: This eclass can be used for packages that need a working X environment to build. > > case ${EAPI:-0} in > - [0-5]) die "virtualx.eclass: EAPI ${EAPI} is too old." ;; > - 6|7) ;; > - *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;; > + 6|7|8) ;; > + *) die "virtualx.eclass: EAPI ${EAPI:-0} is not supported." ;; > esac > > -if [[ ! ${_VIRTUAL_X} ]]; then > -_VIRTUAL_X=1 > +if [[ ! ${_VIRTUAL_X_ECLASS} ]]; then > +_VIRTUAL_X_ECLASS=1 > > # @ECLASS-VARIABLE: VIRTUALX_REQUIRED > # @PRE_INHERIT Things to consider changing: 1. The dual-function of VIRTUALX_DEPEND is ugly (and I don't think it meets global variable invariancy requirements; not that the assignment variant is used anywhere). 2. Maybe VIRTUALX_DEPEND can be exported conditionally to VIRTUALX_REQUIRED!=always, to avoid some mistakes. 3. The eclass is leaving stray BDEPEND in global scope in EAPI 6. -- Best regards, Michał Górny