From e84e88c3fe5a80c464bdb094c807b9eb420d78f3 Mon Sep 17 00:00:00 2001
From: Brian Harring <ferringb@chromium.org>
Date: Wed, 17 Oct 2012 22:07:58 -0700
Subject: Fix -display vnc=blah passing

---
 app-emulation/qemu-init-scripts/ChangeLog             | 11 +++++++++++
 .../qemu-init-scripts/files/qemu-init-script          |  5 ++---
 .../qemu-init-scripts/qemu-init-scripts-0.2.1.ebuild  | 19 +++++++++++++++++++
 .../qemu-init-scripts/qemu-init-scripts-0.2.ebuild    | 19 -------------------
 4 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 app-emulation/qemu-init-scripts/ChangeLog
 create mode 100644 app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.1.ebuild
 delete mode 100644 app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild

(limited to 'app-emulation/qemu-init-scripts')

diff --git a/app-emulation/qemu-init-scripts/ChangeLog b/app-emulation/qemu-init-scripts/ChangeLog
new file mode 100644
index 0000000..166f1c7
--- /dev/null
+++ b/app-emulation/qemu-init-scripts/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for app-emulation/qemu-init-scripts
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*qemu-init-scripts-0.2.1 (18 Oct 2012)
+
+  18 Oct 2012; Brian Harring <ferringb@gentoo.org>
+  -qemu-init-scripts-0.2.ebuild, +qemu-init-scripts-0.2.1.ebuild,
+  files/qemu-init-script:
+  Fix -display vnc=:1 passing.
+
diff --git a/app-emulation/qemu-init-scripts/files/qemu-init-script b/app-emulation/qemu-init-scripts/files/qemu-init-script
index 63c662c..eb66149 100644
--- a/app-emulation/qemu-init-scripts/files/qemu-init-script
+++ b/app-emulation/qemu-init-scripts/files/qemu-init-script
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 2009 Gentoo Foundation
+# Copyright 2009-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # To use this, symlink a target kvm instance to this script.
@@ -153,8 +153,7 @@ start() {
 		vm_args[${#vm_args[@]}]=sdl
 	elif [ -n "$VNC" ]; then
 		vm_args[${#vm_args[@]}]=-display
-		vm_args[${#vm_args[@]}]=vnc
-		vm_args[${#vm_args[@]}]="${VNC}"
+		vm_args[${#vm_args[@]}]="vnc=${VNC}"
 	else
 		vm_args[${#vm_args[@]}]=-display
 		vm_args[${#vm_args[@]}]=none
diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.1.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.1.ebuild
new file mode 100644
index 0000000..f26eb63
--- /dev/null
+++ b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Kvm and qemu init scripts"
+SRC_URI=''
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	|| ( app-emulation/qemu-kvm app-emulation/qemu )
+	|| ( net-misc/socat net-analyzer/netcat6 )"
+
+src_install() {
+	newinitd "${FILESDIR}"/qemu-init-script qemu
+	newconfd "${FILESDIR}"/qemu-conf.example qemu.conf.example
+	newsbin "${FILESDIR}"/qtap-manipulate qtap-manipulate
+	dosym qemu /etc/init.d/kvm
+}
diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild
deleted file mode 100644
index f26eb63..0000000
--- a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Kvm and qemu init scripts"
-SRC_URI=''
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	|| ( app-emulation/qemu-kvm app-emulation/qemu )
-	|| ( net-misc/socat net-analyzer/netcat6 )"
-
-src_install() {
-	newinitd "${FILESDIR}"/qemu-init-script qemu
-	newconfd "${FILESDIR}"/qemu-conf.example qemu.conf.example
-	newsbin "${FILESDIR}"/qtap-manipulate qtap-manipulate
-	dosym qemu /etc/init.d/kvm
-}
-- 
cgit v1.2.3-18-g5258