Gentoo Archives: gentoo-dev

From: David Michael <fedora.dm0@×××××.com>
To: gentoo-dev@l.g.o
Cc: selinux@g.o
Subject: [gentoo-dev] [PATCH 1/2] selinux-policy-2.eclass: add EAPI 7
Date: Mon, 02 Nov 2020 21:46:11
Message-Id: 87h7q777qc.fsf@gmail.com
1 Closes: https://bugs.gentoo.org/748483
2 Signed-off-by: David Michael <fedora.dm0@×××××.com>
3 ---
4
5 Hi,
6
7 Please start allowing EAPI 7 SELinux policy ebuilds.
8
9 Thanks.
10
11 David
12
13 eclass/selinux-policy-2.eclass | 18 ++++++++++++------
14 1 file changed, 12 insertions(+), 6 deletions(-)
15
16 diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
17 index c1e21974021..3ba310e49de 100644
18 --- a/eclass/selinux-policy-2.eclass
19 +++ b/eclass/selinux-policy-2.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 for installing SELinux policy, and optionally
26 @@ -7,7 +7,7 @@
27 # @ECLASS: selinux-policy-2.eclass
28 # @MAINTAINER:
29 # selinux@g.o
30 -# @SUPPORTED_EAPIS: 5 6
31 +# @SUPPORTED_EAPIS: 5 6 7
32 # @BLURB: This eclass supports the deployment of the various SELinux modules in sec-policy
33 # @DESCRIPTION:
34 # The selinux-policy-2.eclass supports deployment of the various SELinux modules
35 @@ -76,7 +76,7 @@
36
37 case "${EAPI:-0}" in
38 0|1|2|3|4) die "EAPI<5 is not supported";;
39 - 5|6) : ;;
40 + 5|6|7) : ;;
41 *) die "unknown EAPI" ;;
42 esac
43
44 @@ -117,9 +117,15 @@ else
45 RDEPEND=">=sys-apps/policycoreutils-2.0.82
46 >=sec-policy/selinux-base-policy-${PV}"
47 fi
48 -DEPEND="${RDEPEND}
49 - sys-devel/m4
50 - >=sys-apps/checkpolicy-2.0.21"
51 +if [[ ${EAPI:-0} == [56] ]]; then
52 + DEPEND="${RDEPEND}
53 + sys-devel/m4
54 + >=sys-apps/checkpolicy-2.0.21"
55 +else
56 + DEPEND="${RDEPEND}"
57 + BDEPEND="sys-devel/m4
58 + >=sys-apps/checkpolicy-2.0.21"
59 +fi
60
61 EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm
62
63 --
64 2.26.2

Replies