Add initial qemu-kvm 1.2.0 that is unkeyworded. It is missing the Gentoo patchset and we really are waiting for 1.2.1 but its slowly dragging its feet out the door and once it does that will be keyworded.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

2 files changed, 288 insertions, 152 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 77ac232d2392..486f99ae6d06 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.128 2012/10/20 16:23:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.129 2012/10/20 16:27:36 cardoe Exp $
+
+  20 Oct 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.0.ebuild:
+  Add initial qemu-kvm 1.2.0 that is unkeyworded. It is missing the Gentoo
+  patchset and we really are waiting for 1.2.1 but its slowly dragging its feet
+  out the door and once it does that will be keyworded.
 
 *qemu-1.1.2-r1 (20 Oct 2012)
 
diff --git a/app-emulation/qemu/qemu-1.2.0.ebuild b/app-emulation/qemu/qemu-1.2.0.ebuild
index b5432be416a6..bbb9fac11a5f 100644
--- a/app-emulation/qemu/qemu-1.2.0.ebuild
+++ b/app-emulation/qemu/qemu-1.2.0.ebuild
@@ -1,112 +1,132 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.1 2012/09/22 22:01:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.0.ebuild,v 1.2 2012/10/20 16:27:36 cardoe Exp $
 
-EAPI=4
+EAPI="4"
 
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git
-		http://git.qemu.org/git/qemu.git"
-	GIT_ECLASS="git-2"
-fi
+MY_PN="qemu-kvm"
+MY_P=${MY_PN}-${PV}
 
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
+#BACKPORTS=1
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
-	# Pending review
-	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS=""
 fi
 
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static usbredir vde
-+vhost-net xattr xen xfs"
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
+kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl sdl \
+smartcard spice static systemtap tci tls usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
 
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+	if [ "x${target}" = "xx86_64" ]; then
+		continue
+	fi
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
 done
+REQUIRED_USE="${REQUIRED_USE} )"
 
 for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} +qemu_user_targets_${target}"
+	IUSE="${IUSE} qemu_user_targets_${target}"
 done
 
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/qemu-kvm
-	!app-emulation/qemu-user
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
+REQUIRED_USE="${REQUIRED_USE}
+	static? ( !alsa !pulseaudio )
+	amd64? ( qemu_softmmu_targets_x86_64 )
+	x86? ( qemu_softmmu_targets_x86_64 )
+	virtfs? ( xattr )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-apps/pciutils[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
+	jpeg? ( virtual/jpeg[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	png? ( media-libs/libpng[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!app-emulation/kqemu
+	!app-emulation/qemu
+	!<app-emulation/qemu-1.0
+	sys-firmware/ipxe
+	>=sys-firmware/seabios-1.7.0
+	sys-firmware/sgabios
+	sys-firmware/vgabios
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
-	curl? ( net-misc/curl )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	opengl? (
-		virtual/opengl
-		x11-libs/libX11
-	)
-	png? ( media-libs/libpng )
+	opengl? ( virtual/opengl )
 	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? (
-		sys-apps/iproute2
-		net-misc/bridge-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? (
-		>=app-emulation/spice-0.9.0
-		>=app-emulation/spice-protocol-0.8.1
-	)
-	ssl? ( net-libs/gnutls )
+	python? ( =dev-lang/python-2*[ncurses] )
+	sdl? ( media-libs/libsdl[X] )
+	smartcard? ( dev-libs/nss )
+	spice? ( >=app-emulation/spice-protocol-0.8.1 )
+	systemtap? ( dev-util/systemtap )
 	usbredir? ( sys-apps/usbredir )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-	xfs? ( sys-fs/xfsprogs )
-"
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools )"
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
 	virtual/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35
-"
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static? ( ${LIB_DEPEND} )"
 
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
 
-QA_PRESTRIPPED="
+QA_PREBUILT="
 	usr/share/qemu/openbios-ppc
 	usr/share/qemu/openbios-sparc64
 	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-"
-# keep sorted
+	usr/share/qemu/palcode-clipper"
+
 QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
 	usr/bin/qemu-alpha
 	usr/bin/qemu-arm
-	usr/bin/qemu-armeb
 	usr/bin/qemu-cris
-	usr/bin/qemu-i386
 	usr/bin/qemu-m68k
 	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
 	usr/bin/qemu-mips
 	usr/bin/qemu-mipsel
 	usr/bin/qemu-ppc
@@ -115,30 +135,73 @@ QA_WX_LOAD="${QA_PRESTRIPPED}
 	usr/bin/qemu-sh4
 	usr/bin/qemu-sh4eb
 	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc32plus
 	usr/bin/qemu-sparc64
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32
-	usr/bin/qemu-x86_64
-"
-
-pkg_setup() {
-	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
 
-	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+	if use static; then
+		ewarn "USE=static is very much a moving target because of the packages"
+		ewarn "we depend on will have their static libs ripped out or wrapped"
+		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
+		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
+		ewarn "result what worked today may not work tomorrow."
+	fi
+}
 
+pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
+
+	enewgroup kvm 78
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cflags.patch
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
 
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+	epatch "${FILESDIR}"/${P}-fix-mipsen.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
 
-	# Fix underlinking.
-	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
-	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+	epatch_user
 }
 
 src_configure() {
@@ -154,11 +217,7 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done
 
-	if [[ -z ${softmmu_targets} ]]; then
-		conf_opts="${conf_opts} --disable-system"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
+	einfo "Building the following softmmu targets: ${softmmu_targets}"
 
 	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
@@ -167,88 +226,160 @@ src_configure() {
 		conf_opts="${conf_opts} --disable-linux-user"
 	fi
 
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+	# Add support for SystemTAP
+	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
 
-	# drop '-g' by default as it tends to eat
-	# A LOT (~2GB) of ram for each job #355861
-	conf_opts="${conf_opts} --disable-debug-info"
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
-
-	#config options
-	conf_opts="${conf_opts}
-		$(use_enable aio linux-aio)
-		$(use_enable bluetooth bluez)
-		$(use_enable brltty brlapi)
-		$(use_enable curl)
-		$(use_enable fdt)
-		$(use_enable hardened pie)
-		$(use_enable jpeg vnc-jpeg)
-		$(use_enable ncurses curses)
-		$(use_enable nss smartcard-nss)
-		$(use_enable opengl)
-		$(use_enable png vnc-png)
-		$(use_enable rbd)
-		$(use_enable sasl vnc-sasl)
-		$(use_enable sdl)
-		$(use_enable spice)
-		$(use_enable ssl vnc-tls)
-		$(use_enable vde)
-		$(use_enable vhost-net)
-		$(use_enable xen)
-		$(use_enable xattr attr)
-		$(use_enable xfs xfsctl)
-		--disable-bsd-user
-	"
+	use static && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use static && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
 
 	# audio options
 	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-
-	set -- --prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
+	use alsa && audio_opts="alsa,${audio_opts}"
+	use sdl && audio_opts="sdl,${audio_opts}"
+	use pulseaudio && audio_opts="pa,${audio_opts}"
+	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
+
+	# $(use_enable xen xen-pci-passthrough) for 1.2
+	# $(use_enable debug debug-mon) goes away for 1.2
+	# --disable-seccomp as in-tree seccomp is API incompatible (in-tree
+	# version is ancient)
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-bsd-user \
+		--disable-guest-agent \
+		--disable-libiscsi \
 		--disable-strip \
 		--disable-werror \
-		$(use_enable kvm) \
-		--disable-libiscsi \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
-		--audio-drv-list="${audio_opts}" \
+		--python=python2 \
+		--disable-seccomp \
+		$(use_enable aio linux-aio) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable brltty brlapi) \
+		$(use_enable caps cap-ng) \
+		$(use_enable curl) \
+		$(use_enable debug debug-info) \
+		$(use_enable debug debug-tcg) \
+		$(use_enable doc docs) \
+		$(use_enable fdt) \
+		$(use_enable jpeg vnc-jpeg) \
+		$(use_enable kernel_linux kvm) \
+		$(use_enable kernel_linux nptl) \
+		$(use_enable ncurses curses) \
+		$(use_enable opengl) \
+		$(use_enable png vnc-png) \
+		$(use_enable rbd) \
+		$(use_enable sasl vnc-sasl) \
+		$(use_enable sdl) \
+		$(use_enable smartcard smartcard) \
+		$(use_enable smartcard smartcard-nss) \
+		$(use_enable spice) \
+		$(use_enable tci tcg-interpreter) \
+		$(use_enable tls vnc-tls) \
+		$(use_enable usbredir usb-redir) \
+		$(use_enable uuid) \
+		$(use_enable vde) \
+		$(use_enable vhost-net) \
+		$(use_enable virtfs) \
+		$(use_enable vnc) \
+		$(use_enable xattr attr) \
+		$(use_enable xen) \
+		$(use_enable xen xen-pci-passthrough) \
+		$(use_enable xfs xfsctl) \
+		--audio-drv-list=${audio_opts} \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)"
+		--host-cc="$(tc-getBUILD_CC)" \
+		${conf_opts} \
+		|| die "configure failed"
 
-	echo ./configure "$@" # show actual options
-	./configure "$@" || die "configure failed"
+		# FreeBSD's kernel does not support QEMU assigning/grabbing
+		# host USB devices yet
+		use kernel_FreeBSD && \
+			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${ED}" install
 
 	if [[ -n ${softmmu_targets} ]]; then
-		if use qemu-ifup; then
-			exeinto /etc/qemu
-			doexe "${FILESDIR}"/qemu-if{up,down}
+		if use kernel_linux; then
+			insinto /lib/udev/rules.d/
+			doins "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use qemu_softmmu_targets_x86_64 ; then
+			dobin /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
+			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
+		else
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of the /usr/bin/qemu-kvm symlink."
 		fi
 	fi
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt
 	newdoc pc-bios/README README.pc-bios
-	dohtml qemu-doc.html qemu-tech.html
+
+	if use doc; then
+		dohtml qemu-doc.html qemu-tech.html || die
+	fi
+
+	use python & dobin scripts/kvm/kvm_stat
+
+	# Remove SeaBIOS since we're using the SeaBIOS packaged one
+	rm "${ED}/usr/share/qemu/bios.bin"
+	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+	# Remove vgabios since we're using the vgabios packaged one
+	rm "${ED}/usr/share/qemu/vgabios.bin"
+	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+
+	# Remove sgabios since we're using the sgabios packaged one
+	rm "${ED}/usr/share/qemu/sgabios.bin"
+	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+
+	# Remove iPXE since we're using the iPXE packaged one
+	rm "${ED}/usr/share/qemu/pxe-*.rom"
+	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
+	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
 }
 
 pkg_postinst() {
-	use qemu-ifup || return
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "qemu-ifup script from /etc/qemu."
-	echo
+	if [[ -n ${softmmu_targets} ]]; then
+		elog "If you don't have kvm compiled into the kernel, make sure you have"
+		elog "the kernel module loaded before running kvm. The easiest way to"
+		elog "ensure that the kernel module is loaded is to load it on boot."
+		elog "For AMD CPUs the module is called 'kvm-amd'"
+		elog "For Intel CPUs the module is called 'kvm-intel'"
+		elog "Please review /etc/conf.d/modules for how to load these"
+		elog
+		elog "Make sure your user is in the 'kvm' group"
+		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+		elog
+		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
+	fi
 }