[gentoo-dev] [PATCH 1/2] selinux-policy-2.eclass: add EAPI 7

[gentoo-dev] [PATCH 1/2] selinux-policy-2.eclass: add EAPI 7

[David Michael]

Closes: https://bugs.gentoo.org/748483
Signed-off-by: David Michael <fedora.dm0@gmail.com>
---

Hi,

Please start allowing EAPI 7 SELinux policy ebuilds.

Thanks.

David

 eclass/selinux-policy-2.eclass | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index c1e21974021..3ba310e49de 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Eclass for installing SELinux policy, and optionally
@@ -7,7 +7,7 @@
 # @ECLASS: selinux-policy-2.eclass
 # @MAINTAINER:
 # selinux@gentoo.org
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: This eclass supports the deployment of the various SELinux modules in sec-policy
 # @DESCRIPTION:
 # The selinux-policy-2.eclass supports deployment of the various SELinux modules
@@ -76,7 +76,7 @@
 
 case "${EAPI:-0}" in
 	0|1|2|3|4) die "EAPI<5 is not supported";;
-	5|6) : ;;
+	5|6|7) : ;;
 	*) die "unknown EAPI" ;;
 esac
 
@@ -117,9 +117,15 @@ else
 	RDEPEND=">=sys-apps/policycoreutils-2.0.82
 		>=sec-policy/selinux-base-policy-${PV}"
 fi
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-2.0.21"
+if [[ ${EAPI:-0} == [56] ]]; then
+	DEPEND="${RDEPEND}
+		sys-devel/m4
+		>=sys-apps/checkpolicy-2.0.21"
+else
+	DEPEND="${RDEPEND}"
+	BDEPEND="sys-devel/m4
+		>=sys-apps/checkpolicy-2.0.21"
+fi
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm
 
-- 
2.26.2

Re: [gentoo-dev] [PATCH 1/2] selinux-policy-2.eclass: add EAPI 7

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]

>>>>> On Mon, 02 Nov 2020, David Michael wrote:

> +if [[ ${EAPI:-0} == [56] ]]; then

Substituting 0 is not necessary here.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: [gentoo-dev] [PATCH 1/2] selinux-policy-2.eclass: add EAPI 7

[David Michael]

On Tue, Nov 3, 2020 at 2:46 AM Ulrich Mueller <ulm@gentoo.org> wrote:
> >>>>> On Mon, 02 Nov 2020, David Michael wrote:
>
> > +if [[ ${EAPI:-0} == [56] ]]; then
>
> Substituting 0 is not necessary here.

I wrote it that way to match all other EAPI conditions in the file.
I'll remove it in the second patch where the other instances are
dropped as well so the commits are self-consistent atomic changes.

Thanks.

David