From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2BC01395E4 for ; Sun, 11 Dec 2016 20:01:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C5A2E0BF7; Sun, 11 Dec 2016 20:01:32 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 593ECE0BF7 for ; Sun, 11 Dec 2016 20:01:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 86119341026 for ; Sun, 11 Dec 2016 20:01:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A15F24BE for ; Sun, 11 Dec 2016 20:01:29 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1481486378.7f61a7ae3da5dee9ee7fdda19da1aa9763ccbb50.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/selinux-policy-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 7f61a7ae3da5dee9ee7fdda19da1aa9763ccbb50 X-VCS-Branch: master Date: Sun, 11 Dec 2016 20:01:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7c8773a4-f6a3-4d64-80c0-bdd2929aed0b X-Archives-Hash: 5f2b1d5e14c677ce9eae7e6fe90ac24d commit: 7f61a7ae3da5dee9ee7fdda19da1aa9763ccbb50 Author: Jason Zaman gentoo org> AuthorDate: Sun Dec 11 16:15:38 2016 +0000 Commit: Jason Zaman gentoo 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