[app-emulation/qemu-kvm-9999] Updated ebuild to reflect changes in upstream's build system.

Added use flags to enable jpeg and png compression on vnc.
Replaced gnu-tls with ssl use flag - bug 311627.
Added use flag to make accessbility support optional - bug 326491.
Currently it seems qemu-kvm won't build with -sasl - will check and updated ebuild soon.

Package-Manager: portage-2.2_rc73/cvs/Linux x86_64

3 files changed, 37 insertions, 20 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 340b77d86c48..e9376d51965a 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.38 2010/09/06 01:16:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.39 2010/09/06 03:06:27 jmbsvicetto Exp $
+
+  06 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-9999.ebuild:
+  [app-emulation/qemu-kvm-9999] Updated ebuild to reflect changes in
+  upstream's build system.
+  Added use flags to enable jpeg and png compression on vnc.
+  Replaced gnu-tls with ssl use flag - bug 311627.
+  Added use flag to make accessbility support optional - bug 326491.
+  Currently it seems qemu-kvm won't build with -sasl - will check and
+  updated ebuild soon.
 
   06 Sep 2010; Luca Barbato <lu_zero@gentoo.org> qemu-kvm-0.12.5-r1.ebuild,
   qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 411e0b21b65e..42e5607d0581 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -15,6 +15,6 @@ EBUILD qemu-kvm-0.12.3-r1.ebuild 7490 RMD160 6e1372313a61822b6aa8aecd2adbb96acec
 EBUILD qemu-kvm-0.12.4-r1.ebuild 7502 RMD160 c16a2e641bd879b8eabf27c2e317d250f3554d5f SHA1 e2bc0954389e96d01ef8ecc5f0e32797477f37eb SHA256 33c99cb7f99a73c9845ddfc0565c0d1a1c0b6ba3a2d25d3239c21912a2fbcb25
 EBUILD qemu-kvm-0.12.5-r1.ebuild 7732 RMD160 391df0fb4c65832161d37dcf017c9db73d76c82d SHA1 5d94f3605e007650b3f72da8e52ea93c09c9e887 SHA256 5db99a5681e07bdd9b99a3d166ea88cfaafd60d699cd2e824644765f994ac672
 EBUILD qemu-kvm-0.12.5.ebuild 7639 RMD160 f9ddc850b4f35539834de213f6063875ea1a7233 SHA1 702e1638d36b27c2571e08551268da087ca168ca SHA256 fa61415340a418deee2f100e245b674922e1e7816749ac8c26912bb2497b5ea8
-EBUILD qemu-kvm-9999.ebuild 7702 RMD160 07e03c264f869b41afb981882b473959bbf4de6c SHA1 adc4624cf00674113002f4a0ab421edc634c5c0e SHA256 b2c7ccf1ba071bb29ee9eda46ae691efbcc0555a2b1f1f40a0a25928a1d70d8e
-MISC ChangeLog 8300 RMD160 58466b7f6d6fd93bb6dec7685a50b4cb2aaa3918 SHA1 a4c319b1b2de6d5f48c372cd95a077ca1ad61562 SHA256 07581f5ff3b0f3701dd48361e853b3c4954310399ffeb464b5916d06e9f15257
+EBUILD qemu-kvm-9999.ebuild 7886 RMD160 751f6f5f7ecbc572a11b232619f9272e0f702bee SHA1 1615298cf8f69d483038cac7aeecf6d7f39a9c26 SHA256 2f31524b3a35fad265ac7fcb13059ed4a5797d95f277d8695f8496fb2d813688
+MISC ChangeLog 8766 RMD160 ad1f5843af7d67087e46b38da3604f33ee7b412c SHA1 f1e047aefe1d10efe5db89332506f777953f918d SHA256 9b771f5e417e6e9a32a9d4118395b69b2665742a1ff55b230bac2a666f6da32a
 MISC metadata.xml 1054 RMD160 140b715fe8ae43c71baa5570e4b16aa729831fbc SHA1 34e0fcd3042c7656a0f3e4deb9d045b71ef0321d SHA256 fba3a461323be4f7ca6fe949e893eca1609d088decadbf037dc5d263771e3de0
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 7b084a1efb85..fecd2cda6075 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-2010 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.10 2010/09/06 01:16:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.11 2010/09/06 03:06:27 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -25,8 +25,8 @@ HOMEPAGE="http://www.linux-kvm.org"
 LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl esd gnutls fdt hardened kvm-trace \
-ncurses pulseaudio qemu-ifup sasl sdl static vde"
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup ssl sasl sdl static vde xen"
 
 # Updated targets to use the only supported upstream target - x86_64-softmmu
 COMMON_TARGETS=""
@@ -58,23 +58,27 @@ RDEPEND="
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
 	curl? ( net-misc/curl )
 	esd? ( media-sound/esound )
 	fdt? ( sys-apps/dtc )
-	gnutls? ( net-libs/gnutls )
+	jpeg? ( media-libs/jpeg )
 	ncurses? ( sys-libs/ncurses )
+	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
-	brltty? ( app-accessibility/brltty )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	ssl? ( net-libs/gnutls )
 	vde? ( net-misc/vde )
+	xen? ( app-emulation/xen )
 "
 
 DEPEND="${RDEPEND}
 	app-text/texi2html
 	>=sys-kernel/linux-headers-2.6.29
-	gnutls? ( dev-util/pkgconfig )"
+	ssl? ( dev-util/pkgconfig )
+"
 
 kvm_kern_warn() {
 	eerror "Please enable KVM support in your kernel, found at:"
@@ -159,19 +163,20 @@ src_configure() {
 
 	#config options
 	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
+	conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
 	conf_opts="${conf_opts} $(use_enable curl)"
-	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
 	conf_opts="${conf_opts} $(use_enable fdt)"
-	use hardened && conf_opts="${conf_opts} --enable-user-pie"
-	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
-	use ncurses || conf_opts="${conf_opts} --disable-curses"
-	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
-	use sdl || conf_opts="${conf_opts} --disable-sdl"
-	use vde || conf_opts="${conf_opts} --disable-vde"
-	conf_opts="${conf_opts} $(use_enable brltty)"
-#	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} --disable-xen"
+	conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+	conf_opts="${conf_opts} $(use_enable ncurses curses)"
+	conf_opts="${conf_opts} $(use_enable png vnc-png)"
+	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+	conf_opts="${conf_opts} $(use_enable sdl)"
+	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+	conf_opts="${conf_opts} $(use_enable vde)"
+	conf_opts="${conf_opts} $(use_enable xen)"
+#	conf_opts="${conf_opts} --disable-xen"
 	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
 
 	# audio options
@@ -240,5 +245,7 @@ pkg_postinst() {
 	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 "kvm-ifup script from /etc/kvm."
+	elog
+	elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
 	echo
 }