Upstreamed fixes for the following: issues with --disable-kvm, glibc 2.16 support, USB redir babble, ECHI assert when using isoc transfers. Ebuild fixes for potential issues with audio output selection, mixemu can only be enabled, systemtap can only be enabled.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 29 insertions, 16 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index e1830221bf0b..7870111aca46 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.150 2012/08/12 23:42:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.151 2012/08/13 00:00:38 cardoe Exp $
+
+*qemu-kvm-1.1.1-r3 (12 Aug 2012)
+
+  12 Aug 2012; Doug Goldstein <cardoe@gentoo.org> -qemu-kvm-1.1.1-r2.ebuild,
+  +qemu-kvm-1.1.1-r3.ebuild, qemu-kvm-9999.ebuild:
+  Upstreamed fixes for the following: issues with --disable-kvm, glibc 2.16
+  support, USB redir babble, ECHI assert when using isoc transfers. Ebuild
+  fixes for potential issues with audio output selection, mixemu can only be
+  enabled, systemtap can only be enabled.
 
   12 Aug 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
   Live ebuild doesn't use BACKPORTS.
diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r3.ebuild
index f5af9cab8807..64d7b7bf2029 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r2.ebuild,v 1.1 2012/08/12 23:03:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.1-r3.ebuild,v 1.1 2012/08/13 00:00:38 cardoe Exp $
 
 EAPI="4"
 
 PYTHON_DEPEND="2"
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
-BACKPORTS=1
+BACKPORTS=2
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
@@ -214,6 +214,9 @@ src_configure() {
 		conf_opts="${conf_opts} --disable-linux-user"
 	fi
 
+	# Add support for SystemTAP
+	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
+
 	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
 	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
@@ -229,9 +232,10 @@ src_configure() {
 
 	# 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}"
+	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"
 
 	# conditionally making UUID work on Linux only is wrong
 	# but the Gentoo/FreeBSD guys need to figure out what
@@ -263,7 +267,6 @@ src_configure() {
 		$(use_enable kernel_linux kvm-device-assignment) \
 		$(use_enable kernel_linux nptl) \
 		$(use_enable kernel_linux uuid) \
-		$(use_enable mixemu) \
 		$(use_enable ncurses curses) \
 		$(use_enable opengl) \
 		$(use_enable rbd) \
@@ -272,7 +275,6 @@ src_configure() {
 		$(use_enable smartcard smartcard) \
 		$(use_enable smartcard smartcard-nss) \
 		$(use_enable spice) \
-		$(use_enable systemtap trace-backend=dtrace) \
 		$(use_enable tci tcg-interpreter) \
 		$(use_enable tls vnc-tls) \
 		$(use_enable usbredir usb-redir) \
@@ -282,7 +284,7 @@ src_configure() {
 		$(use_enable xattr attr) \
 		$(use_enable xen) \
 		$(use_enable xfs xfsctl) \
-		--audio-drv-list="${audio_opts}" \
+		--audio-drv-list=${audio_opts} \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc="$(tc-getCC)" \
 		--host-cc="$(tc-getBUILD_CC)" \
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index ac79df7fa79e..3c92f2ccb842 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.53 2012/08/12 23:42:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.54 2012/08/13 00:00:38 cardoe Exp $
 
 EAPI="4"
 
@@ -214,6 +214,9 @@ src_configure() {
 		conf_opts="${conf_opts} --disable-linux-user"
 	fi
 
+	# Add support for SystemTAP
+	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
+
 	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
 	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
@@ -229,9 +232,10 @@ src_configure() {
 
 	# 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}"
+	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"
 
 	# conditionally making UUID work on Linux only is wrong
 	# but the Gentoo/FreeBSD guys need to figure out what
@@ -262,7 +266,6 @@ src_configure() {
 		$(use_enable kernel_linux kvm-device-assignment) \
 		$(use_enable kernel_linux nptl) \
 		$(use_enable kernel_linux uuid) \
-		$(use_enable mixemu) \
 		$(use_enable ncurses curses) \
 		$(use_enable opengl) \
 		$(use_enable rbd) \
@@ -271,7 +274,6 @@ src_configure() {
 		$(use_enable smartcard smartcard) \
 		$(use_enable smartcard smartcard-nss) \
 		$(use_enable spice) \
-		$(use_enable systemtap trace-backend=dtrace) \
 		$(use_enable tci tcg-interpreter) \
 		$(use_enable tls vnc-tls) \
 		$(use_enable usbredir usb-redir) \
@@ -282,7 +284,7 @@ src_configure() {
 		$(use_enable xen) \
 		$(use_enable xen xen-pci-passthrough) \
 		$(use_enable xfs xfsctl) \
-		--audio-drv-list="${audio_opts}" \
+		--audio-drv-list=${audio_opts} \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc="$(tc-getCC)" \
 		--host-cc="$(tc-getBUILD_CC)" \