Re: [gentoo-dev] [PATCH] udev.eclass: support EAPI 7
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-b...@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.
Re: [gentoo-dev] [PATCH] udev.eclass: support EAPI 7
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-b...@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'. Cheers, Michael. Replying off-list due to black-listing. signature.asc Description: OpenPGP digital signature
[gentoo-dev] [PATCH] udev.eclass: support EAPI 7
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-b...@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 -- 2.19.0