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 356051395E2 for ; Sun, 11 Dec 2016 20:01:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82D97E0C0A; Sun, 11 Dec 2016 20:01:38 +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 545CAE0C0A for ; Sun, 11 Dec 2016 20:01:33 +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 60B2E340EDA for ; Sun, 11 Dec 2016 20:01:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5087524C2 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: <1481486388.8f56c2eff72a065f43181f002e1601b0865ee3a1.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/ X-VCS-Repository: repo/gentoo X-VCS-Files: sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild X-VCS-Directories: sec-policy/selinux-base-policy/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 8f56c2eff72a065f43181f002e1601b0865ee3a1 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: ab994a28-c2a3-420a-8c90-4efdd7b84f9f X-Archives-Hash: 94fe4c92c1b61e5a0720de91d5fceee8 commit: 8f56c2eff72a065f43181f002e1601b0865ee3a1 Author: Jason Zaman gentoo org> AuthorDate: Sun Dec 11 16:31:25 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Dec 11 19:59:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f56c2ef sec-policy/selinux-base-policy: update to EAPI6 Package-Manager: portage-2.3.0 .../selinux-base-policy-9999.ebuild | 52 ++++++---------------- 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild index 0a47b94..b7ba9e2 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" - -inherit eutils +EAPI="6" if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}" @@ -52,37 +50,11 @@ src_prepare() { local modfiles if [[ ${PV} != 9999* ]]; then - # Patch the source with the base patchbundle - cd "${S}" - EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \ - EPATCH_SUFFIX="patch" \ - EPATCH_SOURCE="${WORKDIR}" \ - EPATCH_FORCE="yes" \ - epatch + einfo "Applying SELinux policy updates ... " + eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch" fi - # Apply the additional patches refered to by the module ebuild. - # But first some magic to differentiate between bash arrays and strings - if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]]; - then - cd "${S}/refpolicy/policy/modules" - for POLPATCH in "${POLICY_PATCH[@]}"; - do - epatch "${POLPATCH}" - done - else - if [[ -n ${POLICY_PATCH} ]]; - then - cd "${S}/refpolicy/policy/modules" - for POLPATCH in ${POLICY_PATCH}; - do - epatch "${POLPATCH}" - done - fi - fi - - # Calling user patches - epatch_user + eapply_user # Collect only those files needed for this particular module for i in ${MODS}; do @@ -120,9 +92,13 @@ src_install() { pkg_postinst() { # Override the command from the eclass, we need to load in base as well here - local COMMAND + local COMMAND="-i base.pp" + if has_version "