app-emulation/grub-xen-host: Replace STRIP_MASK with RESTRICT=strip

While at it, replace QA* with RESTRICT=binchecks and add missing ||die.

Closes: https://bugs.gentoo.org/651420
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
index 8fe09f145e0f804cb2a1178506d714f0aab8ae6b..9150a04e8c80218f5147231ec7f928fc47467970 100644 (file)
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,22 +18,18 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
-STRIP_MASK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_EXECSTACK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_WX_LOAD="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_PRESTRIPPED="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-RESTRICT="test"
+RESTRICT="binchecks strip test"
 
 src_configure() {
        :
 }
 
 src_compile() {
-       cat > "${S}/grub-bootstrap.cfg" <<- EOF
+       cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
                normal (memdisk)/grub.cfg
        EOF
 
-       cat > "${S}/grub.cfg" <<- EOF
+       cat > "${S}/grub.cfg" <<- EOF || die
                if search -s -f /boot/xen/pvboot-x86_64.elf ; then
                        echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
                        multiboot "/boot/xen/pvboot-x86_64.elf"