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 351741396D9 for ; Tue, 5 Dec 2017 02:24:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39E1AE0F4F; Tue, 5 Dec 2017 02:24:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05E51E0F4F for ; Tue, 5 Dec 2017 02:24:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7CC433D4A6 for ; Tue, 5 Dec 2017 02:24:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F7DBAE79 for ; Tue, 5 Dec 2017 02:24:35 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1512440670.f4fa9a8c31cb116b01a7f608af7fe3d68c829894.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen/xen-4.8.2-r3.ebuild app-emulation/xen/xen-4.9.1.ebuild X-VCS-Directories: app-emulation/xen/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: f4fa9a8c31cb116b01a7f608af7fe3d68c829894 X-VCS-Branch: master Date: Tue, 5 Dec 2017 02:24:35 +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: 4a776962-ee2b-4e77-8cff-7aff45a4e55c X-Archives-Hash: 37cef8247d908cf440c9d7f6bd8f39ac commit: f4fa9a8c31cb116b01a7f608af7fe3d68c829894 Author: Yixun Lan gentoo org> AuthorDate: Tue Dec 5 02:14:11 2017 +0000 Commit: Yixun Lan gentoo org> CommitDate: Tue Dec 5 02:24:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4fa9a8c app-emulation/xen: obsolete epatch if EAPI=6 Package-Manager: Portage-2.3.16, Repoman-2.3.6 app-emulation/xen/xen-4.8.2-r3.ebuild | 17 ++++------------- app-emulation/xen/xen-4.9.1.ebuild | 20 ++++---------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/app-emulation/xen/xen-4.8.2-r3.ebuild b/app-emulation/xen/xen-4.8.2-r3.ebuild index 947c50c9224..d011e92de0c 100644 --- a/app-emulation/xen/xen-4.8.2-r3.ebuild +++ b/app-emulation/xen/xen-4.8.2-r3.ebuild @@ -80,12 +80,7 @@ pkg_setup() { src_prepare() { # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream # Security patchset if [[ -n ${SECURITY_VER} ]]; then @@ -100,18 +95,14 @@ src_prepare() { local i for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i + eapply "${WORKDIR}"/patches-security/xen/$i done fi # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo - epatch "${FILESDIR}"/${PN}-4.6-efi.patch + eapply "${FILESDIR}"/${PN}-4.6-efi.patch # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" diff --git a/app-emulation/xen/xen-4.9.1.ebuild b/app-emulation/xen/xen-4.9.1.ebuild index b9ad6439bc4..cc0aedeffbc 100644 --- a/app-emulation/xen/xen-4.9.1.ebuild +++ b/app-emulation/xen/xen-4.9.1.ebuild @@ -79,12 +79,7 @@ pkg_setup() { src_prepare() { # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream - fi + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream # Security patchset if [[ -n ${SECURITY_VER} ]]; then @@ -92,25 +87,18 @@ src_prepare() { # apply main xen patches # Two parallel systems, both work side by side # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - source "${WORKDIR}"/patches-security/${PV}.conf local i for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i + eapply "${WORKDIR}"/patches-security/xen/$i done fi # Gentoo's patchset - if [[ -n ${GENTOO_VER} ]]; then - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo - fi + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo - epatch "${FILESDIR}"/${PN}-4.6-efi.patch + eapply "${FILESDIR}"/${PN}-4.6-efi.patch # Drop .config sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"