Version bump. Check for CONFIG_VIRTIO_CONSOLE since its necessary. Check if we should use /dev/uinput or /dev/input/uinput on startup. bug #378833

(Portage version: 2.1.10.65/cvs/Linux x86_64)

6 files changed, 89 insertions, 62 deletions

diff --git a/app-emulation/spice-vdagent/ChangeLog b/app-emulation/spice-vdagent/ChangeLog
index 4642ba030c66..950bbf65846d 100644
--- a/app-emulation/spice-vdagent/ChangeLog
+++ b/app-emulation/spice-vdagent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/spice-vdagent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/ChangeLog,v 1.5 2012/05/03 18:49:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/ChangeLog,v 1.6 2012/07/08 03:20:31 cardoe Exp $
+
+*spice-vdagent-0.10.1 (07 Jul 2012)
+
+  07 Jul 2012; Doug Goldstein <cardoe@gentoo.org> -spice-vdagent-0.8.0.ebuild,
+  -spice-vdagent-0.8.1.ebuild, +spice-vdagent-0.10.1.ebuild,
+  +files/spice-vdagent.confd-2, +files/spice-vdagent.initd-2:
+  Version bump. Check for CONFIG_VIRTIO_CONSOLE since its necessary. Check if
+  we should use /dev/uinput or /dev/input/uinput on startup. bug #378833
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> spice-vdagent-0.8.0.ebuild,
   spice-vdagent-0.8.1.ebuild, spice-vdagent-0.8.1-r1.ebuild:
diff --git a/app-emulation/spice-vdagent/files/spice-vdagent.confd-2 b/app-emulation/spice-vdagent/files/spice-vdagent.confd-2
new file mode 100644
index 000000000000..763fdaf886d0
--- /dev/null
+++ b/app-emulation/spice-vdagent/files/spice-vdagent.confd-2
@@ -0,0 +1,11 @@
+# The virtual communication port provided by the hypervisor/vm
+# Default: /dev/virtio-ports/com.redhat.spice.0
+#PORT="/dev/virtio-ports/com.redhat.spice.0"
+
+# Userspace Input Device
+# Default: /dev/uinput or /dev/input/uinput
+#DEVICE=""
+
+# Extra arguments for spice-vdagentd
+# Default: none
+#SPICE_VDAGENT_ARGS=""
diff --git a/app-emulation/spice-vdagent/files/spice-vdagent.initd-2 b/app-emulation/spice-vdagent/files/spice-vdagent.initd-2
new file mode 100644
index 000000000000..acb4e8cb987d
--- /dev/null
+++ b/app-emulation/spice-vdagent/files/spice-vdagent.initd-2
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/files/spice-vdagent.initd-2,v 1.1 2012/07/08 03:20:31 cardoe Exp $
+
+depend() {
+    after dbus
+}
+
+PIDFILE="/var/run/spice-vdagentd/spice-vdagentd.pid"
+
+start() {
+    PORT="${PORT:-/dev/virtio-ports/com.redhat.spice.0}"
+    DEVICE="${DEVICE:-/dev/uinput}"
+
+    ebegin "Checking for required modules and devices"
+
+    if [[ ! -d /sys/module/uinput ]]; then
+        modprobe -q uinput
+    fi
+
+    if [[ ! -d /sys/module/uinput ]]; then
+        eerror "Module 'uinput' not loaded or not enabled in the kernel"
+        eend 1
+        return 1
+    fi
+
+    if [[ ! -c "${PORT}" ]] ; then
+        eerror "Required virtio port does not exist. Make sure you"
+        eerror "started the virtual machine with appropriate parameters."
+        eend 1
+        return 1
+    fi
+    eend 0
+
+    if [[ ! -c ${DEVICE} && -c /dev/input/uinput ]]; then
+        DEVICE=/dev/input/uinput
+    fi
+
+    # recreate the directory since /var/run may reside on a ramdisk
+    mkdir -p /var/run/spice-vdagentd
+
+    # cleanup stalled socket
+    rm -f /var/run/spice-vdagentd/spice-vdagent-sock
+
+    ebegin "Starting spice VD agent daemon"
+    start-stop-daemon \
+        --start \
+        --pidfile "${PIDFILE}" \
+        --exec /usr/sbin/spice-vdagentd \
+        -- -u "${DEVICE}" ${SPICE_VDAGENT_ARGS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping spice VD agent daemon"
+    start-stop-daemon \
+        --stop \
+        --pidfile "${PIDFILE}"
+    eend $?
+}
diff --git a/app-emulation/spice-vdagent/metadata.xml b/app-emulation/spice-vdagent/metadata.xml
index 5eac00f8ea24..7b4cb96eca68 100644
--- a/app-emulation/spice-vdagent/metadata.xml
+++ b/app-emulation/spice-vdagent/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>virtualization</herd>
 	<maintainer>
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.8.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild
index b30f2a103bbe..0c5338857ffb 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.8.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.10.1.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/spice-vdagent/spice-vdagent-0.8.0.ebuild,v 1.3 2012/05/03 18:49:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild,v 1.1 2012/07/08 03:20:31 cardoe Exp $
 
 EAPI=4
 
@@ -18,13 +18,14 @@ IUSE="+consolekit"
 RDEPEND="x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
-	>=app-emulation/spice-protocol-0.8.0
+	>=app-emulation/spice-protocol-0.10.1
 	consolekit? ( sys-auth/consolekit sys-apps/dbus )"
 DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
-CONFIG_CHECK="~INPUT_UINPUT"
-ERROR_INPUT_UINPUT="User level driver support is required to run the spice-vdagent daemon"
+CONFIG_CHECK="~INPUT_UINPUT ~VIRTIO_CONSOLE"
+ERROR_INPUT_UINPUT="User level input support is required"
+ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support is required"
 
 src_configure() {
 	econf \
@@ -40,11 +41,6 @@ src_install() {
 	keepdir /var/run/spice-vdagentd
 	keepdir /var/log/spice-vdagentd
 
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
-
-pkg_postinst() {
-	elog "Make sure that the User level driver support kernel module 'uinput' is loaded"
-	elog "if built as a module before starting the vdagent daemon."
+	newinitd "${FILESDIR}/${PN}.initd-2" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd-2" "${PN}"
 }
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild
deleted file mode 100644
index d5dbd5badb79..000000000000
--- a/app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.8.1.ebuild,v 1.3 2012/05/03 18:49:05 jdhore Exp $
-
-EAPI=4
-
-inherit linux-info
-
-DESCRIPTION="SPICE VD Linux Guest Agent."
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+consolekit"
-
-RDEPEND="x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	>=app-emulation/spice-protocol-0.8.1
-	consolekit? ( sys-auth/consolekit sys-apps/dbus )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-CONFIG_CHECK="~INPUT_UINPUT"
-ERROR_INPUT_UINPUT="User level driver support is required to run the spice-vdagent daemon"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable consolekit console-kit)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}"/etc/{rc,tmpfiles}.d
-
-	keepdir /var/run/spice-vdagentd
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
-
-pkg_postinst() {
-	elog "Make sure that the User level driver support kernel module 'uinput' is loaded"
-	elog "if built as a module before starting the vdagent daemon."
-}