[gentoo-commits] gentoo-x86 commit in app-emulation/qemu: metadata.xml ChangeLog qemu-1.4.0.ebuild

[Doug Goldstein (cardoe)]

cardoe      13/02/25 05:52:50

  Modified:             metadata.xml ChangeLog qemu-1.4.0.ebuild
  Log:
  Fix up depends. Disable building of tools for the user emulation targets to remove some necessary depends. Fix automagical depend on GnuTLS when VNC WebSockets are enabled.
  
  (Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)

Revision  Changes    Path
1.20                 app-emulation/qemu/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/metadata.xml?r1=1.19&r2=1.20

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/metadata.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- metadata.xml	21 Jan 2013 05:40:24 -0000	1.19
+++ metadata.xml	25 Feb 2013 05:52:50 -0000	1.20
@@ -24,7 +24,8 @@
 	<flag name='static'>Enables both 'static-softmmu' and 'static-user'</flag>
 	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
 	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
-    <flag name='tls'>Enable TLS support for the VNC console server</flag>
+    <flag name='tls'>Enable TLS support for the VNC console server.
+		For 1.4 and newer this also enables WebSocket support.</flag>
     <flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
     <flag name='png'>Enable png image support for the VNC console server</flag>
     <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB



1.190                app-emulation/qemu/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.190&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.190&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.189&r2=1.190

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ChangeLog	25 Feb 2013 05:27:17 -0000	1.189
+++ ChangeLog	25 Feb 2013 05:52:50 -0000	1.190
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.189 2013/02/25 05:27:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.190 2013/02/25 05:52:50 cardoe Exp $
+
+  25 Feb 2013; Doug Goldstein <cardoe@g.o> qemu-1.4.0.ebuild,
+  metadata.xml:
+  Fix up depends. Disable building of tools for the user emulation targets to
+  remove some necessary depends. Fix automagical depend on GnuTLS when VNC
+  WebSockets are enabled.
 
   25 Feb 2013; Doug Goldstein <cardoe@g.o> +files/qemu-kvm-1.4,
   qemu-1.4.0.ebuild:



1.4                  app-emulation/qemu/qemu-1.4.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild?r1=1.3&r2=1.4

Index: qemu-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qemu-1.4.0.ebuild	25 Feb 2013 05:27:17 -0000	1.3
+++ qemu-1.4.0.ebuild	25 Feb 2013 05:52:50 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.3 2013/02/25 05:27:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.4 2013/02/25 05:52:50 cardoe Exp $
 
 EAPI=5
 
@@ -101,7 +101,7 @@
 	sdl? ( media-libs/libsdl[X] )
 	selinux? ( sec-policy/selinux-qemu )
 	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.12.2 )
+	spice? ( >=app-emulation/spice-protocol-0.12.3 )
 	systemtap? ( dev-util/systemtap )
 	usbredir? ( >=sys-apps/usbredir-0.5.3 )
 	virtfs? ( sys-libs/libcap )
@@ -252,11 +252,13 @@
 		conf_opts+=" --target-list=${user_targets}"
 		conf_opts+=" --disable-bluez"
 		conf_opts+=" --disable-sdl"
+		conf_opts+=" --disable-tools"
 	fi
 
 	if [[ ${buildtype} == "softmmu" ]]; then
 		conf_opts+=" --disable-linux-user"
 		conf_opts+=" --enable-system"
+		conf_opts+=" --with-system-pixman"
 		conf_opts+=" --target-list=${softmmu_targets}"
 		conf_opts+=" $(use_enable bluetooth bluez)"
 		conf_opts+=" $(use_enable sdl)"
@@ -277,6 +279,7 @@
 		conf_opts+=" $(use_enable smartcard smartcard-nss)"
 		conf_opts+=" $(use_enable spice)"
 		conf_opts+=" $(use_enable tls vnc-tls)"
+		conf_opts+=" $(use_enable tls vnc-ws)"
 		conf_opts+=" $(use_enable usbredir usb-redir)"
 		conf_opts+=" $(use_enable uuid)"
 		conf_opts+=" $(use_enable vde)"