[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/

[Yixun Lan]

commit:     b0a219ea59f69af680e1c5e80010686bc60be351
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 01:27:01 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 01:27:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a219ea

app-emulation/xen-tools: correct patching ovmf logic

while bumping ovmf, I found current logic not
handling USE=ovmf enabled && ${OVMF_VER} is unset case

Package-Manager: portage-2.2.27

 app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild | 18 ++++++++++--------
 app-emulation/xen-tools/xen-tools-4.6.1.ebuild    | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild 
b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
index d2be7c5..94994ca 100644
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild
@@ -233,14 +233,16 @@ src_prepare() {
        fi
 
        # Ovmf's patchset
-       if [[ -n ${OVMF_VER} ]] && use ovmf; 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
-               popd > /dev/null
+       if use ovmf; then
+               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
+                       popd > /dev/null
+               fi
                mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
        fi
 

diff --git a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild 
b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
index 9f9d763..c380955 100644
--- a/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.1.ebuild
@@ -240,14 +240,16 @@ src_prepare() {
        fi
 
        # Ovmf's patchset
-       if [[ -n ${OVMF_VER} ]] && use ovmf; 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
-               popd > /dev/null
+       if use ovmf; then
+               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
+                       popd > /dev/null
+               fi
                mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
        fi