Fix sound configuration broken in 71, and add pulseaudio

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64)

3 files changed, 41 insertions, 6 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index cacfe74cea3d..7de8b99b21fa 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.5 2008/07/15 18:13:12 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.6 2008/07/15 20:16:20 dang Exp $
+
+*kvm-71-r1 (15 Jul 2008)
+
+  15 Jul 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/kvm-71-qemu-configure.patch, -kvm-71.ebuild, +kvm-71-r1.ebuild:
+  Fix sound configuration broken in 71, and add pulseaudio
 
   15 Jul 2008; Daniel Gryniewicz <dang@gentoo.org> -files/kvm-48-kvm.patch,
   +files/kvm-71-qemu-kvm-doc.patch, kvm-70.ebuild, kvm-70-r1.ebuild,
diff --git a/app-emulation/kvm/files/kvm-71-qemu-configure.patch b/app-emulation/kvm/files/kvm-71-qemu-configure.patch
new file mode 100644
index 000000000000..2a07ea85db98
--- /dev/null
+++ b/app-emulation/kvm/files/kvm-71-qemu-configure.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN kvm-71.orig/configure kvm-71/configure
+--- kvm-71.orig/configure	2008-07-10 09:20:48.000000000 -0400
++++ kvm-71/configure	2008-07-15 16:01:09.000000000 -0400
+@@ -38,7 +38,8 @@ EOF
+ }
+ 
+ while [[ "$1" = -* ]]; do
+-    opt="$1"; shift
++    optorig="$1"; shift
++    opt=$opt
+     arg=
+     if [[ "$opt" = *=* ]]; then
+ 	arg="${opt#*=}"
+@@ -70,7 +71,7 @@ while [[ "$1" = -* ]]; do
+ 	    usage
+ 	    ;;
+ 	*)
+-	    qemu_opts="$qemu_opts $opt"
++	    qemu_opts="$qemu_opts $optorig"
+ 	    ;;
+     esac
+ done
diff --git a/app-emulation/kvm/kvm-71.ebuild b/app-emulation/kvm/kvm-71-r1.ebuild
index fe93bf2f39bb..1b44ff4cb5f2 100644
--- a/app-emulation/kvm/kvm-71.ebuild
+++ b/app-emulation/kvm/kvm-71-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-71.ebuild,v 1.1 2008/07/15 18:13:12 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-71-r1.ebuild,v 1.1 2008/07/15 20:16:20 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -13,11 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 # Add bios back when it builds again
-IUSE="gnutls havekernel ncurses sdl test"
+IUSE="alsa esd gnutls havekernel ncurses pulseaudio sdl test"
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
-	>=media-libs/alsa-lib-1.0.13
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	esd? ( media-sound/esound )
+	pulseaudio? ( media-sound/pulseaudio )
 	gnutls? ( net-libs/gnutls )
 	ncurses? ( sys-libs/ncurses )
 	sdl? ( >=media-libs/libsdl-1.2.11 )"
@@ -84,17 +86,22 @@ src_unpack() {
 		"${FILESDIR}"/kvm-69-qemu-no-blobs.patch \
 		"${FILESDIR}"/kvm-69-qemu-ifup_ifdown.patch \
 		"${FILESDIR}"/kvm-70-block-rw-range-check.patch \
-		"${FILESDIR}"/kvm-71-qemu-kvm-doc.patch
+		"${FILESDIR}"/kvm-71-qemu-kvm-doc.patch \
+		"${FILESDIR}"/kvm-71-qemu-configure.patch
 }
 
 src_compile() {
-	local mycc conf_opts
+	local mycc conf_opts audio_opts
 
 	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
 	use ncurses || conf_opts="$conf_opts --disable-curses"
 	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
+	use alsa && audio_opts="alsa $audio_opts"
+	use esd && audio_opts="esd $audio_opts"
+	use pulseaudio && audio_opts="pa $audio_opts"
 	conf_opts="$conf_opts --disable-gcc-check"
 	conf_opts="$conf_opts --prefix=/usr"
+	conf_opts="$conf_opts --audio-drv-list=$audio_opts"
 
 	./configure ${conf_opts} || die "econf failed"