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 8D24E138334 for ; Mon, 24 Sep 2018 00:45:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B18DE08F9; Mon, 24 Sep 2018 00:45:50 +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 F210EE08EC for ; Mon, 24 Sep 2018 00:45:49 +0000 (UTC) Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id 5C248335C9F for ; Mon, 24 Sep 2018 00:45:48 +0000 (UTC) Received: by mail-io1-f52.google.com with SMTP id l25-v6so3255428ioj.0 for ; Sun, 23 Sep 2018 17:45:48 -0700 (PDT) X-Gm-Message-State: ABuFfoj6D7Jyf1iOGBzbfZSLFyEL0ByqanUL61UPsw6vg/wSLchHkjMZ FpLEOsnkhIBuFamHGbqwRVcrcgLkF2coUT4RhB0= X-Google-Smtp-Source: ACcGV62OBFaeKV7Z+JQ1L0hUzPjmEUkKR2RJp4ojzabY+L5TW55Ytx9HVYkAb3+aKVX6XrSyg1yhT8Tgu5njzcRSxHs= X-Received: by 2002:a6b:ea0a:: with SMTP id m10-v6mr6253989ioc.18.1537749946351; Sun, 23 Sep 2018 17:45:46 -0700 (PDT) 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 MIME-Version: 1.0 References: <20180923152017.26128-1-floppym@gentoo.org> In-Reply-To: From: Mike Gilbert Date: Sun, 23 Sep 2018 20:45:35 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [gentoo-dev] [PATCH] udev.eclass: support EAPI 7 To: Gentoo Dev Cc: udev-bugs@gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: 65deb507-3bfa-439c-9937-38c6b16123aa X-Archives-Hash: 6e1ec7d8fa4346e7328896b193cc07f0 On Sun, Sep 23, 2018 at 3:33 PM M. J. Everitt wrote: > > On 23/09/18 16:20, Mike Gilbert wrote: > > Signed-off-by: Mike Gilbert > > --- > > eclass/udev.eclass | 14 +++++++++----- > > 1 file changed, 9 insertions(+), 5 deletions(-) > > > > diff --git a/eclass/udev.eclass b/eclass/udev.eclass > > index 4f23c9ebbdf8..baf60584938f 100644 > > --- a/eclass/udev.eclass > > +++ b/eclass/udev.eclass > > @@ -1,10 +1,10 @@ > > -# Copyright 1999-2014 Gentoo Foundation > > +# Copyright 1999-2018 Gentoo Authors > > # Distributed under the terms of the GNU General Public License v2 > > > > # @ECLASS: udev.eclass > > # @MAINTAINER: > > # udev-bugs@gentoo.org > > -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 > > +# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 > > # @BLURB: Default eclass for determining udev directories. > > # @DESCRIPTION: > > # Default eclass for determining udev directories. > > @@ -34,12 +34,16 @@ _UDEV_ECLASS=1 > > inherit toolchain-funcs > > > > case ${EAPI:-0} in > > - 0|1|2|3|4|5|6) ;; > > + 0|1|2|3|4|5|6|7) ;; > > *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." > > esac > > > > -RDEPEND="" > > -DEPEND="virtual/pkgconfig" > > +if [[ ${EAPI:-0} == [0123456] ]]; then > > + RDEPEND="" > > + DEPEND="virtual/pkgconfig" > > +else > > + BDEPEND="virtual/pkgconfig" > > +fi > > > > # @FUNCTION: _udev_get_udevdir > > # @INTERNAL > Hate to nit-pick, but this *is* Gentoo .. the last IF, if EAPI <> 7 then > BDEPEND could also be dragged in, probably better to explicitly mention '7'. That's by design: future EAPIs will probably have BDEPEND, and I don't want to have to update this if statement for every new EAPI.