Fix init.d script thanks to Chris Mayo (bug #378833).

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 66 insertions, 9 deletions

diff --git a/app-emulation/spice-vdagent/ChangeLog b/app-emulation/spice-vdagent/ChangeLog
index 2b03163229a8..20d1e351234c 100644
--- a/app-emulation/spice-vdagent/ChangeLog
+++ b/app-emulation/spice-vdagent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/spice-vdagent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/ChangeLog,v 1.2 2011/07/25 09:24:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/ChangeLog,v 1.3 2011/08/15 00:42:13 jer Exp $
+
+*spice-vdagent-0.8.1-r1 (15 Aug 2011)
+
+  15 Aug 2011; Jeroen Roovers <jer@gentoo.org> +spice-vdagent-0.8.1-r1.ebuild,
+  files/spice-vdagent.initd:
+  Fix init.d script thanks to Chris Mayo (bug #378833).
 
 *spice-vdagent-0.8.1 (25 Jul 2011)
 
diff --git a/app-emulation/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 3aafab5575cd..04076a6bf27a 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA1
 
 AUX spice-vdagent.confd 169 RMD160 66677e00f22bb75ebb7022d342df4462b18ac29d SHA1 f5163de83a3fbd3fb6a3adbfb17ee1b638a1b75a SHA256 089e0bc85f7d3bc6bbcbbb02aaf0c47a2053fe1867dba9d78a195eb775467dc2
-AUX spice-vdagent.initd 1323 RMD160 49e612703beded0ecfa19c262007a87152f0af2f SHA1 eddd9de2b994b8622bb8d073fc8d6f98c3ee4a8f SHA256 01f67751d2efe02b593b0b7c3a4d5de8b609b48efe9929bcde3e45672e5875d5
+AUX spice-vdagent.initd 1322 RMD160 fe08a470e938ebd40f913ab6b9f956c8215ec847 SHA1 f7105b40868bd9d2303b0562b88c3d6b38530348 SHA256 1415b76c8917930cd9acbbfb40cdf513314ec399aa7139ad478786111749a66e
 DIST spice-vdagent-0.8.0.tar.bz2 97797 RMD160 316dae6a3cbbe0041207f51fca9a153e430020e0 SHA1 a8c17fcfd3e8a61f2bd54182f9e5d2cd0e8f05d5 SHA256 3e0e33e8c0416520303a3d99cd14215956022bb2bddb6bc909c7bf2c854ee510
 DIST spice-vdagent-0.8.1.tar.bz2 98437 RMD160 c528ecb82e3b3a87e88723c013a06cdbeca70c9d SHA1 4af28f5b3bf9033bd5fdc39dfff796a7ed1bb8f0 SHA256 99ec232805a6201da78d409e6f874ff0aa6bb25e7ffe623aa77752539ae7d7ff
 EBUILD spice-vdagent-0.8.0.ebuild 1275 RMD160 a305643fca4318087cf4292c33d9643a6d5378f2 SHA1 ed6bcd6137bae6ddfeac9b932b502d9a29b97d86 SHA256 49300274be13c979b1fc7d59da30f9a438be8ee278580a7d2b04e13f62400ff6
+EBUILD spice-vdagent-0.8.1-r1.ebuild 1273 RMD160 1c6a069ae7a47b46a70929f01ab56a0bf6aa3ac7 SHA1 afe14e1b3ae8a2bde292f95d42af670102101829 SHA256 655d016cad250ed6e2fb5324bd07508fdd689edb93b1b76ee69903b830bac833
 EBUILD spice-vdagent-0.8.1.ebuild 1275 RMD160 1c36427a6d7077e5154fe888a07262ef14295b45 SHA1 15145e175c7c9e0708b13db58e33c1c5964a412c SHA256 d30bee86e21fdfda3d0a786a1dc3b3cb531b0c3505e02854eafe051d470607ce
-MISC ChangeLog 641 RMD160 e2d13baf3e45359682bad1100902c0d07d609182 SHA1 b897422a36e32ff5c3c87402a7398dd6f7a3fe8e SHA256 df6584c354177769c0ffdb9c89ade34c40d373e9dda2153be11e43c67a34fed2
+MISC ChangeLog 840 RMD160 c60643538b87f49cbcb8443cae05c1789d94a6e1 SHA1 0bb41231dfcf75045d2299ec5bdd6229817fa03b SHA256 51dc78dd334d405d83ae5212f26b4b593957bb3bbe6ae4c6d1672371f4fb90d4
 MISC metadata.xml 439 RMD160 56204bdea7b6459f321c7ce109ee1daef5a9cbd0 SHA1 9897c686268a6014336229cb3caf8bff0f07c491 SHA256 7995046c5515b240d4df8bda0824fc34e51cb9306ed60b96c6eb4db578e0a7f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4tNgkACgkQGwVqY66cHjCd2ACghlBPWttfYoLn934a4nkNWfu5
-/04An3TbThpTYGPd6HgaToPQ8Ct3GDQS
-=myS1
+iEYEARECAAYFAk5Ia28ACgkQVWmRsqeSphOWBQCfWbQbywdY2azAV6z7KfkJPxxn
+iIIAn0FNovo38nvRC4wno3rFZaTfTuI0
+=d0pv
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/spice-vdagent/files/spice-vdagent.initd b/app-emulation/spice-vdagent/files/spice-vdagent.initd
index 08b685c98251..fb5bd89ff0cd 100644
--- a/app-emulation/spice-vdagent/files/spice-vdagent.initd
+++ b/app-emulation/spice-vdagent/files/spice-vdagent.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 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,v 1.2 2011/07/25 09:24:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/files/spice-vdagent.initd,v 1.3 2011/08/15 00:42:13 jer Exp $
 
 depend() {
     after dbus
@@ -33,7 +33,7 @@ start() {
     rm -f /var/run/spice-vdagentd/spice-vdagent-sock
 
     ebegin "Starting spice VD agent daemon"
-    start-stop-daemon
+    start-stop-daemon \
         --start \
         --pidfile "${PIDFILE}" \
         --exec /usr/sbin/spice-vdagentd \
@@ -43,7 +43,7 @@ start() {
 
 stop() {
     ebegin "Stopping spice VD agent daemon"
-    start-stop-daemon
+    start-stop-daemon \
         --stop \
         --pidfile "${PIDFILE}"
     eend $?
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.8.1-r1.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..87b9811a7136
--- /dev/null
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.8.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/08/15 00:42:13 jer 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="dev-util/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."
+}