Gentoo Archives: gentoo-dev

From: David Michael <fedora.dm0@×××××.com>
To: gentoo-dev@l.g.o
Cc: base-system@g.o
Subject: [gentoo-dev] [PATCH v2] fcaps.eclass: use BDEPEND for EAPI 7
Date: Fri, 13 Mar 2020 19:21:53
Message-Id: 871rpwdpro.fsf@gmail.com
1 The eclass installs libcap to execute the setcap program, so it
2 must be installed in /. Optional libcap linking is handled by the
3 USE=caps flag, which is unrelated to this eclass, so the DEPEND
4 declaration is not needed on EAPI 7.
5
6 Closes: https://bugs.gentoo.org/700018
7 Signed-off-by: David Michael <fedora.dm0@×××××.com>
8 ---
9
10 Changes since v1:
11 * Inverted patterns so EAPI 7+ is the default.
12
13 eclass/fcaps.eclass | 7 +++++--
14 1 file changed, 5 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
17 index 467f955f5e9..2b6e5be4683 100644
18 --- a/eclass/fcaps.eclass
19 +++ b/eclass/fcaps.eclass
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2015 Gentoo Foundation
22 +# Copyright 1999-2020 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 # @ECLASS: fcaps.eclass
26 @@ -34,7 +34,10 @@ _FCAPS_ECLASS=1
27 IUSE="+filecaps"
28
29 # We can't use libcap-ng atm due to #471414.
30 -DEPEND="filecaps? ( sys-libs/libcap )"
31 +case "${EAPI:-0}" in
32 + [0-6]) DEPEND="filecaps? ( sys-libs/libcap )" ;;
33 + *) BDEPEND="filecaps? ( sys-libs/libcap )" ;;
34 +esac
35
36 # @ECLASS-VARIABLE: FILECAPS
37 # @DEFAULT_UNSET
38 --
39 2.21.1