summaryrefslogtreecommitdiff
path: root/app-emulation/qemu/qemu-4.1.0.ebuild
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /app-emulation/qemu/qemu-4.1.0.ebuild
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'app-emulation/qemu/qemu-4.1.0.ebuild')
-rw-r--r--app-emulation/qemu/qemu-4.1.0.ebuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild
index f4991a5e13ad..36cddd2c6991 100644
--- a/app-emulation/qemu/qemu-4.1.0.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0.ebuild
@@ -684,7 +684,11 @@ src_install() {
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
+<<<<<<< HEAD
[[ -e check-report.html ]] && dohtml check-report.html
+=======
+ [[ -e check-report.html ]] && dodoc check-report.html
+>>>>>>> next
if use kernel_linux; then
udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules