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 4DC1D139083 for ; Tue, 5 Dec 2017 02:24:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F0EEE0F5D; Tue, 5 Dec 2017 02:24:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 3CDD2E0F5D for ; Tue, 5 Dec 2017 02:24:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3479B33BF24 for ; Tue, 5 Dec 2017 02:24:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22B08AE7A 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: <1512440671.111558ba21f63d5782a5509c0ed0d0a29bdbffd4.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild app-emulation/xen-tools/xen-tools-4.9.1.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 111558ba21f63d5782a5509c0ed0d0a29bdbffd4 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: a070b2f8-b8ea-4ec8-97a5-153d9bdb7f9a X-Archives-Hash: accd8e6077b50cfcd2ab03cd07a71cba commit: 111558ba21f63d5782a5509c0ed0d0a29bdbffd4 Author: Yixun Lan gentoo org> AuthorDate: Tue Dec 5 02:21:10 2017 +0000 Commit: Yixun Lan gentoo org> CommitDate: Tue Dec 5 02:24:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111558ba app-emulation/xen-tools: obsolete epatch in EAPI=6 replace epatch with eapply Package-Manager: Portage-2.3.16, Repoman-2.3.6 app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild | 20 ++++++-------------- app-emulation/xen-tools/xen-tools-4.9.1.ebuild | 20 ++++++-------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild index c8bbd81561c..211478319ae 100644 --- a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild @@ -179,10 +179,7 @@ src_prepare() { # Upstream's patchset if [[ -n ${UPSTREAM_VER} ]]; then einfo "Try to apply Xen Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream + eapply "${WORKDIR}"/patches-upstream fi # Security patchset @@ -197,20 +194,20 @@ src_prepare() { source "${WORKDIR}"/patches-security/${PV}.conf || die for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i + eapply "${WORKDIR}"/patches-security/xen/$i done # apply qemu-xen/upstream patches pushd "${S}"/tools/qemu-xen/ > /dev/null for i in ${XEN_SECURITY_QEMUU}; do - epatch "${WORKDIR}"/patches-security/qemuu/$i + eapply "${WORKDIR}"/patches-security/qemuu/$i done popd > /dev/null # apply qemu-traditional patches pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null for i in ${XEN_SECURITY_QEMUT}; do - epatch "${WORKDIR}"/patches-security/qemut/$i + eapply "${WORKDIR}"/patches-security/qemut/$i done popd > /dev/null fi @@ -227,9 +224,7 @@ src_prepare() { source "${FILESDIR}"/gentoo-patches.conf || die _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i + eapply "${WORKDIR}"/patches-gentoo/$i done fi @@ -238,10 +233,7 @@ src_prepare() { if [[ -n ${OVMF_VER} ]];then einfo "Try to apply Ovmf patch set" pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf + eapply "${WORKDIR}"/patches-ovmf popd > /dev/null fi mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die diff --git a/app-emulation/xen-tools/xen-tools-4.9.1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1.ebuild index e15cda8916a..665372875fa 100644 --- a/app-emulation/xen-tools/xen-tools-4.9.1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.9.1.ebuild @@ -180,10 +180,7 @@ src_prepare() { # Upstream's patchset if [[ -n ${UPSTREAM_VER} ]]; then einfo "Try to apply Xen Upstream patch set" - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-upstream + eapply "${WORKDIR}"/patches-upstream fi # Security patchset @@ -198,20 +195,20 @@ src_prepare() { source "${WORKDIR}"/patches-security/${PV}.conf || die for i in ${XEN_SECURITY_MAIN}; do - epatch "${WORKDIR}"/patches-security/xen/$i + eapply "${WORKDIR}"/patches-security/xen/$i done # apply qemu-xen/upstream patches pushd "${S}"/tools/qemu-xen/ > /dev/null for i in ${XEN_SECURITY_QEMUU}; do - epatch "${WORKDIR}"/patches-security/qemuu/$i + eapply "${WORKDIR}"/patches-security/qemuu/$i done popd > /dev/null # apply qemu-traditional patches pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null for i in ${XEN_SECURITY_QEMUT}; do - epatch "${WORKDIR}"/patches-security/qemut/$i + eapply "${WORKDIR}"/patches-security/qemut/$i done popd > /dev/null fi @@ -228,9 +225,7 @@ src_prepare() { source "${FILESDIR}"/gentoo-patches.conf || die _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} for i in ${!_gpv}; do - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/patches-gentoo/$i + eapply "${WORKDIR}"/patches-gentoo/$i done fi @@ -239,10 +234,7 @@ src_prepare() { if [[ -n ${OVMF_VER} ]];then einfo "Try to apply Ovmf patch set" pushd "${WORKDIR}"/ovmf-*/ > /dev/null - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_OPTS="-p1" \ - epatch "${WORKDIR}"/patches-ovmf + eapply "${WORKDIR}"/patches-ovmf popd > /dev/null fi mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die