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

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

7 files changed, 98 insertions, 70 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/Manifest b/app-emulation/spice-vdagent/Manifest
index 7e10205a6850..e89109a9c2df 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -1,9 +1,10 @@
-AUX spice-vdagent.confd 169 SHA256 089e0bc85f7d3bc6bbcbbb02aaf0c47a2053fe1867dba9d78a195eb775467dc2 SHA512 bdd1d2bea8a268fde44dfc708be699de9ae37803ed7b79a84e998f175d809f37bcf0623fb222fdb5505d3b3b549af0734a8962b48bec635a1089369eb043af42 WHIRLPOOL 82b32cae521811d71f9c991e0cf66784f503126fe9a9333e0466c5217959ddb9dbd51d18bede298da69c673105e762b46a944052c2563862b66ad02197c5a79c
-AUX spice-vdagent.initd 1322 SHA256 1415b76c8917930cd9acbbfb40cdf513314ec399aa7139ad478786111749a66e SHA512 0d48707dd3ca19a5c44a451b6a03475dd9a6ba5c2f3272ed822a56d29fafd2f816a6fcf43ca0d61df77365e52c240770c11405fcd9829845c03d62f309be25c2 WHIRLPOOL a1bdf466c8da94938d7eb0cf046135f7d8fa9aa48a62b2dff2121219c8f4f7559d07bd607b99af5a63c65012ea3adceeb09f978c303d95f7c14214288455b252
-DIST spice-vdagent-0.8.0.tar.bz2 97797 SHA256 3e0e33e8c0416520303a3d99cd14215956022bb2bddb6bc909c7bf2c854ee510 SHA512 444c5d8e02977793e0c1fcf9598c72d1bfffd05f9bbabdd7f6d309552692b2d76d8f45369a1537fe435d757cb20ee016f0cba6dda147d31f8023bf50718f3cd1 WHIRLPOOL fd72f8fd6e3579615fb70f215a7f37e9e0d796524a4b2d78dfdfc1be244d994df84101169fa91479475ca3efc966639ffe07c091408cd28a08543bd8a28216e4
+AUX spice-vdagent.confd 169 RMD160 66677e00f22bb75ebb7022d342df4462b18ac29d SHA1 f5163de83a3fbd3fb6a3adbfb17ee1b638a1b75a SHA256 089e0bc85f7d3bc6bbcbbb02aaf0c47a2053fe1867dba9d78a195eb775467dc2
+AUX spice-vdagent.confd-2 314 RMD160 7dc0da6b9c48cc72e0575f2052a52977d2f639f7 SHA1 0c082e33c877ba57008584b0e3091a393fdddd81 SHA256 50dc90de28c68dc95000b88c9e00d01dc9d3fc338c93dc9540e0b01d40b90ae6
+AUX spice-vdagent.initd 1322 RMD160 fe08a470e938ebd40f913ab6b9f956c8215ec847 SHA1 f7105b40868bd9d2303b0562b88c3d6b38530348 SHA256 1415b76c8917930cd9acbbfb40cdf513314ec399aa7139ad478786111749a66e
+AUX spice-vdagent.initd-2 1612 RMD160 9df06f386bc5086e180449901b9a5baef8fd81a7 SHA1 1c493e2700b8cdd5a1a9f6f0e43e69218326f282 SHA256 4e6e844ec6dbcb7a6616ccc9bdf331497a8deb0cd38da7dc2c8bf735c48d5034
+DIST spice-vdagent-0.10.1.tar.bz2 107250 RMD160 818b923c5f61aa1e0d0d5875dd33d3398dbea76b SHA1 237ecdd441ca8a977c88cf4b54942b5b9f5cfcf3 SHA256 cea0db6f2def79a96876d0921f2a6234875797c68a8143d24cf9af8cc01361db
 DIST spice-vdagent-0.8.1.tar.bz2 98437 SHA256 99ec232805a6201da78d409e6f874ff0aa6bb25e7ffe623aa77752539ae7d7ff SHA512 45c2b94dc66dd2061b57cfe90d7b900fd095fa067c6bca560ecc300979953e8c37b63e8cbdb4683275a1cc084512aa97e1125bbb17e39a6966387e4f1be2c178 WHIRLPOOL 1cfeabc97f4c1fd9e42a9ad849916f04d9f4f640a586158c3d8b2ab3b9449f6e1cf8acba196a9e684a1499404747971fa82ad922bd50e87c257526d67468a85f
-EBUILD spice-vdagent-0.8.0.ebuild 1273 SHA256 e414ba672c08ae246d2509d5031c5b93a7e54a6a4d41e981dfd368040396d244 SHA512 272456e0bac295ae9c8b5ed5605b54cbab97eab1ab06684b2306017ea586adebcd32809d6d18f11dfae74854c5e683615bc1bc028fec16bdafb46c851fb3a984 WHIRLPOOL a87beda98a61ef0610a246b6ac696badb9754dfdf22f60c91570ba8a4f431ff1a328ec3375923a52a662a06ad64859e003d7f80433aa25e8f14e96053f113edd
-EBUILD spice-vdagent-0.8.1-r1.ebuild 1276 SHA256 83c6f76d6811606a69f877e7480c05a4a849c9a51c748dda986b845fabff283e SHA512 7b1632a2ae3e9caf6abcb2c4cbb9fae5bdef251d405ad59730636369971eb3eb4e4f7d41fcac473f75cd9e842f49ac71f4335ead924f257a036e333910677adc WHIRLPOOL 66efeca9ee1474741304744e9e2edf7e2894fb32218dc3de5b0141c08dc5e5df68407cfa8fa7ab6fa387da2d9672d91ad5cb2f62c179abe387692a968aef7db7
-EBUILD spice-vdagent-0.8.1.ebuild 1273 SHA256 1e51d7278991d7526436ea9cf624c4c1aaf1f1eb32185af085d3beb1a44fbe97 SHA512 25b4af1bde2445660c2629884c12d671dea559fcb69afc36a6e0a3b3443354c8f843f50a94d538ea38090598e21156c3408928473b0d4b81939127c18fc2d57e WHIRLPOOL 2e478552aec21f42d17dd816ed78d1c88c9f2f84d5e23b8710e2726683dea4cf779ef621eb1ddbb9162b08ddb1bda41a4360290a0dd750f6a6466ab55a530670
-MISC ChangeLog 1330 SHA256 aaed51043a89173138011014f4c60813cca3a3bdadc42a990b5ef19de0ff4499 SHA512 51a1fa41a90612d522ecd0659444413288f19275efe750077b96ec098ee0a0acb86e808662694bb3e1023d88a6a5278b7ca7a1c0b37c891aaadc2dbdd8da00a7 WHIRLPOOL c3b72a76a9848b0a541f4b76fe00beebb9e4ff42b26ac6a5d8ecc38e0f504d130c111de5d7e6e44f4ef65c41cb2569dfe7f55b5ac002d139f196fb3ee4c7298e
-MISC metadata.xml 417 SHA256 467ad9342514845ee9cccba1f68e4117ed829d43ca3d1703c13e4e067cc3c6b3 SHA512 3af29b02c7f51334f9d9c1587634e38e6548dfe9b66fd462e1de9e5585f430a4d131065fb7baa15f3983a693cb9b500bb52c1ada343528b565eddced5164fe1c WHIRLPOOL 2d17cb7a8db0970a81cd97bb55d3536039e14bd104b931a024eb3786083c3da1833ca8409e805937479cf5775306d439bd9adf6ef917e1286254e599bd4dba5d
+EBUILD spice-vdagent-0.10.1.ebuild 1163 RMD160 d1dbf2f640d8b5f7790d0c088dc1ea45accc40c3 SHA1 a05c93ac7d7eee1a711ec86dcfd809494a9f6c70 SHA256 292e7193765bb3ffc100cad3a11e3f9fd8feda40f1177d3e2212ebf93b192cd0
+EBUILD spice-vdagent-0.8.1-r1.ebuild 1276 RMD160 506ee4bd80d43cb042447d067f4c14c1dc6e7164 SHA1 37ef0655a64e0131d38c470f13898dc40eb16554 SHA256 83c6f76d6811606a69f877e7480c05a4a849c9a51c748dda986b845fabff283e
+MISC ChangeLog 1721 RMD160 443f92f29032f51600aa73ba1dfdf672b9b6d6e6 SHA1 583c82f888340d2c7d7d9c63b23b51a9e558828b SHA256 53f7ae0668a4efcdc248445e73d6107dfd6cc34d8188a16e1366a5e242257fc6
+MISC metadata.xml 446 RMD160 5cc71b1bb99f2619440fc2109447a0c6c4a29e81 SHA1 90068aedf97889a8fb6b3e921b5a93d4867bf5f9 SHA256 20918dcf1516bbd1840cfc825dc2b402643bd6c39f0a6423f6839884e07e03a5
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."
-}