Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: Gentoo Dev <gentoo-dev@l.g.o>
Cc: base-system@g.o
Subject: Re: [gentoo-dev] [PATCH] fcaps.eclass: use BDEPEND for EAPI 7
Date: Fri, 13 Mar 2020 18:56:59
Message-Id: CAJ0EP43q2zAwYcyn9RvpfgJ-kyVy3qJMfs7QSdkpX3QNOz+jvA@mail.gmail.com
In Reply to: [gentoo-dev] [PATCH] fcaps.eclass: use BDEPEND for EAPI 7 by David Michael
1 On Fri, Mar 13, 2020 at 2:23 PM David Michael <fedora.dm0@×××××.com> wrote:
2 >
3 > The eclass installs libcap to execute the setcap program, so it
4 > must be installed in /. Optional libcap linking is handled by the
5 > USE=caps flag, which is unrelated to this eclass, so the DEPEND
6 > declaration is not needed on EAPI 7.
7 >
8 > Closes: https://bugs.gentoo.org/700018
9 > Signed-off-by: David Michael <fedora.dm0@×××××.com>
10 > ---
11 > eclass/fcaps.eclass | 7 +++++--
12 > 1 file changed, 5 insertions(+), 2 deletions(-)
13 >
14 > diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
15 > index 467f955f5e9..b0479f32456 100644
16 > --- a/eclass/fcaps.eclass
17 > +++ b/eclass/fcaps.eclass
18 > @@ -1,4 +1,4 @@
19 > -# Copyright 1999-2015 Gentoo Foundation
20 > +# Copyright 1999-2020 Gentoo Authors
21 > # Distributed under the terms of the GNU General Public License v2
22 >
23 > # @ECLASS: fcaps.eclass
24 > @@ -34,7 +34,10 @@ _FCAPS_ECLASS=1
25 > IUSE="+filecaps"
26 >
27 > # We can't use libcap-ng atm due to #471414.
28 > -DEPEND="filecaps? ( sys-libs/libcap )"
29 > +case "${EAPI:-0}" in
30 > + 7) BDEPEND="filecaps? ( sys-libs/libcap )" ;;
31 > + *) DEPEND="filecaps? ( sys-libs/libcap )" ;;
32 > +esac
33
34 Please reverse the logic: if EAPI is in 0-6, set DEPEND, otherwise set
35 BDEPEND. Assuming future EAPIs support BDEPEND, this will future-proof
36 the eclass somewhat.