[gentoo-commits] repo/gentoo:master commit in: eclass/

[Jason Zaman]

commit:     7f61a7ae3da5dee9ee7fdda19da1aa9763ccbb50
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 16:15:38 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 19:59:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f61a7ae

selinux-policy-2.eclass: support EAPI6

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

diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index fbca2ae..692a885 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -74,15 +74,22 @@
 # The default value is the 'master' branch.
 : ${SELINUX_GIT_BRANCH:="master"};
 
-extra_eclass=""
+case "${EAPI:-0}" in
+       0|1|2|3|4) die "EAPI<5 is not supported";;
+       5|6) : ;;
+       *) die "unknown EAPI" ;;
+esac
+
 case ${BASEPOL} in
-       9999)   extra_eclass="git-r3";
+       9999)   inherit git-r3
                        EGIT_REPO_URI="${SELINUX_GIT_REPO}";
                        EGIT_BRANCH="${SELINUX_GIT_BRANCH}";
                        EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy";;
 esac
 
-inherit eutils ${extra_eclass}
+if [[ ${EAPI:-0} == 5 ]]; then
+       inherit eutils
+fi
 
 IUSE=""
 
@@ -114,11 +121,6 @@ DEPEND="${RDEPEND}
        sys-devel/m4
        >=sys-apps/checkpolicy-2.0.21"
 
-case "${EAPI:-0}" in
-       0|1|2|3|4) die "EAPI<5 is not supported";;
-       *) : ;;
-esac
-
 EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install pkg_postinst 
pkg_postrm
 
 # @FUNCTION: selinux-policy-2_src_unpack