summaryrefslogtreecommitdiff
path: root/app-emulation/qemu/qemu-4.1.0.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/qemu/qemu-4.1.0.ebuild')
-rw-r--r--app-emulation/qemu/qemu-4.1.0.ebuild6
1 files changed, 1 insertions, 5 deletions
diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild
index 36cddd2c6991..d0bec4380dbc 100644
--- a/app-emulation/qemu/qemu-4.1.0.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -684,11 +684,7 @@ 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