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.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 33 insertions, 19 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/Manifest b/app-emulation/qemu-kvm/Manifest
index 4035f93a66e8..0714a4af53c3 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -11,12 +11,13 @@ AUX qemu-kvm-1.0.1-freebsd-sysctl-header.patch 278 SHA256 af207d21f361d3eecdef65
 DIST qemu-kvm-0.15.1.tar.gz 5915998 SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e SHA512 d0f1a10c18157bfaed159f63dc954781c7051eda118652295dbb4203c7f2b8abf1b4b137d8c69d85f7662f145dad0a6a0243fc8029d15648439431b55e07fe8a WHIRLPOOL 42346ae1825d9f25925e179147c21625d1eca6cc35ecf4a2913e39ab72e938bc0497bf06fe749a094cf15ea81e21feb8c17da04cc7e94f39cd0f81fe62deb654
 DIST qemu-kvm-1.0.1.tar.gz 6214796 SHA256 57bcd26342af2303663028db9e9956a8b487babfcf2a432ac3351c88b8e2bf4f SHA512 31f0a8fc2d03a15b7a382a77b67183d792fb765b25241a6b80c14f64fbcd52064392f47bc21da48fc54bdc5b8da70542ddeb47394348304d9bfcf3421eb11b2f WHIRLPOOL febf169830f9c2631f5fcb5d97a9fdd6c138c3455e97243d086fd827776ece16cc70d8a1c787e55dd43ac0c01c2b07c01fc2ec2f74d09ca4efc3be52f7e804b0
 DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a
+DIST qemu-kvm-1.1.1-bp-2.tar.xz 5404 SHA256 2cfec58dbeea354664d98f9920d8c41f946f964367fabcaaa931ac3448e9a090 SHA512 5a9ef7b7c6c483cdf8a729ea93a292c6092c385959cab8b8a55e747d853607d6f5494acb7ccec7d9c95f81756e0c1b990f9006524d053e0916abd412068d71c7 WHIRLPOOL 7018baa9bc24d5b280f769d89b2f541ba6bd1fec81870b0c867a8531c5d011e4d4b14f48999dba58d1334afd7798a7675b6e3c3207a9ce6dc9613d1e67b69a3a
 DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
 EBUILD qemu-kvm-0.15.1-r1.ebuild 9562 SHA256 4cc8feb7ebd3bf188db3e445eb0fde6b9b54fec8d921dac18d2609d301cd93b2 SHA512 cd0e0fed0d7087bef1cb5b04ab53cffe6ae1fef9fa74772ccd6ee569e5dc2ccd9a26ad308b5e189a69dcd66a22e14dd98c5ec96fdce64724e2c3547075c5ce3a WHIRLPOOL f4ae05b7018ad7f9433a38be46bce84f5571527775e7d2259b83c57fcad4fef6a1ae8de1b1ae6e8204441d41ff7f3ba9073fd4f1bfb56801951beade24188df9
 EBUILD qemu-kvm-1.0.1-r1.ebuild 12217 SHA256 a5de4936ba34566a0e1f18bbe8e4e42c5ebd24c3c8178b3fc5060a956774f60f SHA512 f40f470facd48c17e8cf526428f7e69d25c119c8e5a124492be47f5096a62032b5d38ccea20603a5adecc220b74050583c86033bfe67a463197f996c32296a1c WHIRLPOOL 685f5b7883ca99783424dcb4f321f6d817523201a66a9bba7612435f8c8d29aeab444a37dcb822fefab986e41e9ae9454bb572d80333ede9d43ae0866cd4bd4f
 EBUILD qemu-kvm-1.0.1.ebuild 11494 SHA256 d0ddd2e3127b87ac1c35a34e88c6d2ba2266684198a64c36da8a0a1e2cb30ccf SHA512 46c20f22a55432df629a6558a013ec8d27afb877bb622b5dd46d8c545e8a65fba730346159ac0d5d5e71b6de5f3c8deb9d30b63b5dbb611f1b98a982777becb5 WHIRLPOOL d7d8f90da9614b497af75ddecf5e38768d9ee280610964fcff6c77cc095f94c59d5814c3821e068bb60764b653fedf2c6ea80b12e179a6fa6485702ee30c2baf
 EBUILD qemu-kvm-1.1.1-r1.ebuild 11611 SHA256 b5e134606e4278c61919f352172234a4b9c2def816737d440d5db7fe0964649b SHA512 fe36148787172e171142bb826eba8440a9ee8db2bef94b3e495cd4daf420c96c4e5a083057f9d6f438e1bcad63b46181d920a2f0e8036d4fcc0cc068ef8abd00 WHIRLPOOL d67d8c6b9ccb2c1ca1dab66b1487a2cddd4ba7c37cb38e2280b9a316af885ed54cf5c2410d2a856b55657aeb592b71895025a565908ba7ab713d15799801ee76
-EBUILD qemu-kvm-1.1.1-r2.ebuild 11614 SHA256 d9649a92d016e14bc24816851587572b352422eb4fb1668505c56346250e2e96 SHA512 2ed3495957d2fca81c981ea59023d7df15230a46087961c7bf178a123a6939697a8745fa8321471f63136646254add44faef05f2d13e46ee6786743ae82572ca WHIRLPOOL 52cc234de0a4bae7e72fac4af6f04564eca89a67e5a5a384c32e2f2910ec70f6cc64ac354f5c518b10054d60d461241c419e4da074404a289b513a2d2f17d82f
-EBUILD qemu-kvm-9999.ebuild 11630 SHA256 d9292e0984cb7bfbf50930759b96d0ecf9a50a7e2902c74278ae816b89c7aa13 SHA512 75ecb2b9ed92217b76dd595e86afaf377bc267474a2f564c37ff1bacae4f43ff3eed47b5fe8a9cf763c5d4660e9c20cb19761a43ba9fe97afda8a928dc04107f WHIRLPOOL 69a9dc11069ac6a53e4526b03ca4a87ebd4de427800cd71c802c0627eee5436187bd295ff2a6b7b1df6149afe2783a189748da45ba99c9ae9b7cb69f9bee2b4d
-MISC ChangeLog 29722 SHA256 ce074980398ac790769d9a05e449d29f73bb0ceeb45bafe5b225389281966423 SHA512 d05c7e20ca202dc47fd37fd95fb38c07f55294250f2da8cad96b343c64517c2be547081e5c9ee01617d02e98403203ad4a0a88dfad8372a3ac1635ae4a40e139 WHIRLPOOL fdc372a7dec03c16e40809608e812720a79861cbd0a4c06cc2bd636680dd17fa811dd3e6e698ad7c5497d5a63359af4d0fc929dbe236c7697d4c8d99b72ac696
+EBUILD qemu-kvm-1.1.1-r3.ebuild 11697 SHA256 ecd3cc654fd6fa78cecfc1c5ddf557d2d61290b2c304d146ca69bb9b8ede0197 SHA512 5f94ca9793cbfc3d652391d660ff238e0e2d8b5d3ed8acec53404fa898fd1978f380827742e3d913a02f18c49b886cc97048ab49668c38424589bf103e828116 WHIRLPOOL c7c5936f330ffeec0461da36960683933e56031f741300cb25f3e037c37418ce26efcd9eab47d312f542735faa0784477fa60f8ea65b0a6ca5cc35e66719bfe4
+EBUILD qemu-kvm-9999.ebuild 11713 SHA256 1c9ee155c57faef45c75bdf35267133f805993dee3a53b9b74773e0ef233e58a SHA512 c667a29d3d9a55ea0c1408ac95d169e3c497c1db5149d0a4bf00b161581f6822cfc61770e64066c891d29f44e08cb461e941811f7dca1430266addd07763a715 WHIRLPOOL 26a4c27de93ce2e2c450c7bf39baf7fa4db18f366c13febfa30636b20f57c3f7ce05e3a550a954417ff50d76a3b604dec6714034222d68ae1c66c6cd67805577
+MISC ChangeLog 30155 SHA256 2220f693e1b9858bd05e64a7ae9b01d255e02f7a27822915977f96284dd399aa SHA512 6e6c4f5932f509079b1cefe8b4aa984bc8bce27b79fc8641402c8e37efa71162bc19b31f918345153ff2aa2de3ca044db9231130f3831761db24d1570dcbe2c4 WHIRLPOOL 1bbe1c9f3fae9303072e3269dfd62d30801502ad7d4ab6a0d43077958376d3176b9a8d8ed3873d9c7fb035e986539d2b34f8128ac121a9e5fd066636770da4b8
 MISC metadata.xml 2673 SHA256 88f989681c5411635d2cdaaf912a683ccb248ce27574af096145bcab396ae2c9 SHA512 030f6b3ea35ed02a506f8ec80428254e3be93940637ca762479a61c482212d4da2a20021b8a0212b9844908ddab53781ef7ad5c0e72e5f8cf75f49ef2c10f55d WHIRLPOOL 245439b26e68e4193c2e0a4a4627ccbb750e888b7767655f89ddfb403b17759b99404313e1fe18bb422ebf9aae92fb7e570a1d301f0131b51e6022504b288b50
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)" \