Refix the whole thing...

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

2 files changed, 14 insertions, 13 deletions

diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index ef040b681c50..4b1a5fce3e4c 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -8,17 +8,17 @@ AUX spacenavd-0.5-no-x11.patch 388 SHA256 1c4a16f41176da31e61cb4a0984d4d3b158d33
 AUX spnavd 579 SHA256 2ad811c9c2de7ffa054e22a3d1a8c597b0a1cdc9fda719a7cc94a4fd8ca7ad42 SHA512 9088928719172ac114d86cfdde0bd3c435fec51538334b8f8beaa7945848fcb89373577b1daaa446f43c01f3f9e3d6e03cdea53d153530a8f8508552e14b8fa9 WHIRLPOOL 45e40c8a59013a6f24e466ebaac60126113e85dee89c719a4df496c9da0f45ecc2d4aa17ce828618fb043e8d5b1bb1007043cade553e98ce08741c8beafc53dd
 DIST spacenavd-0.5.tar.gz 41746 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf3fede3f77e59f4795b592e3 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2 WHIRLPOOL e2cf70c7e9cc4b8e32b15ab79dae565c8c2a4bc32a6485a0a1857ea4d4667859ac0bb82e32cd54b722d51c34b9ea094fe8bcb1459a9f60077bde8a01207ab910
 EBUILD spacenavd-0.5-r2.ebuild 2271 SHA256 ba4c25bc9837f073603625e8b829af7f15df9ecda7c3fdf760de6c5d130adf6e SHA512 b2c6c5af19f8b26c5b899347a887877bcc478c4e65e9fc948f254daec5dd0a83bf6e578148281b2a1ac49156f003201e1e10b3d6de4939b052d216ea7accd696 WHIRLPOOL 835dbaa59a0a93fa9de0a56aee9090dc3da1fa35bb241b1f2a980cbb1a5592a6e17673ea982c5f21cf3ab56002da459e76d15762689c023ff833151d0065cf6c
-EBUILD spacenavd-0.5-r4.ebuild 2161 SHA256 a20dda50f091eee52a0e79cab1ccb07efe80c6099455e20673cfe774e3e70677 SHA512 1e76695b7f985cc99a6bff23ec111141459e81d76982bb49d0f261ec8af5c38bc047db5bbedaca5f434b45346604e9d3bca4966d601523504ae2636149dcf34f WHIRLPOOL 43f786887855a74302e0390574fee4f7557503a2420b0f05a0ed16de7e939459cbc040a1f0a5e1ceb047de27b9ad8a717d8ac6db0e415e4fd61c57bc51319492
+EBUILD spacenavd-0.5-r4.ebuild 2267 SHA256 2b80e3366b9e21c116d309a6e799b79395a8d7bf085e37092d390047acac482f SHA512 94efc9428ea37c888042f6a05f62ba521fe67179b72a85240f3b61d796f0b0cf5c7dd13efa1aae35d89219b5efccd7a1ae1b8393e79fec752bbee92bead3a117 WHIRLPOOL ef8a257930e6b26ea75457f4d3d8efd4675292a70883db3ab190e5e99095e1b629583c4abec3cfb78adca858f4f65fd95f8f27d081a9db67d665c460d0296dc2
 MISC ChangeLog 2021 SHA256 ef5f96a77480cdf3890a28993c0f62d6c1e5acc3db3af5577ce0f3ebd194144f SHA512 241f54b3057159cfa4dda2cae4101f221776bd8dd2a5cb702c6ef6fb43341a44162276cd57c1dca4bfde77ae7595f216088ab079e3358fc244b574bd9aeb2d22 WHIRLPOOL 9c8a71c18fe06ada9c71690c4bc8ca0cc8cc0bc93b298b9a551aeacf7d410a5f327ed64c9dbf7b38e87e8f30bbd6c817e4baf48e9ee3e7c7324d47f00856a906
 MISC metadata.xml 821 SHA256 5f91f3fad50f9442505f53a8ffa638f6a76622010405214d3071db8360863ba1 SHA512 37df9e0ffad98476d2857de001ec14ec1601df8c57298f2ab3ce85dd89e378518d211c6b9260156cb7a338f282694769d94cde17b73a1c9d7e5ec06724735bff WHIRLPOOL 03482e79a96e0fa5de3771cdd21ce485cbd9242d49dbc7bb38d6302921d1dd2455d773f3f3a757c13f966a8f1dcd4c95c1928a8bca2d6daf577f97dbefccf4ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQphQaAAoJEEdUh39IaPFNXK8H/28A84euIyYd9sEQsquqeUwJ
-rag+vDANK1goOdZPERi/v8gP9SIgARIv1szI/gQvHx4z7RBsvhlTPOtoRK03LYkn
-+n0owzza8QM1KCIMdF9VbsFUShip3jj4kNvJgB5u0VgcYKxOOYKgFSti6D6PjxxL
-2y1zPk8HNnVzpPV/Dz8SfwJq+srqCAnHHMkZ7y5FhAX52tYexEsWF4Q2KFndOGk4
-Fc3kVHDPGYquVZsr3qn2plldIkwQ7AZYDhaAn7dpfBtgnOxVvtURDxl0iV4W3ftL
-lwk3/tytBeYWcYr5sf1XuN8q+PGupDp/KisRiX6UEmXPKNWQ2/FdE2kWkCOWffk=
-=LUaM
+iQEcBAEBCAAGBQJQphT5AAoJEEdUh39IaPFNbbMH/jcrpOu6NEDoLOZBBDEuxnVP
+R4n2epSKSmCJ+qPWQ+jfbqypgnp9leq6QehdduSGHo3mBdomj0ecQsDQoDT/BWYb
+ijZXoiYbgpAW/cLoNVZSgVw2u5kBIszJRiVIJDp+TjuSb+RltopuxlXvWXNQ/7Xs
+57EqVvqyU6lZqnI1ouZq310M0w7b4t6mjeo4zIpxkMvX8eP8zgspcUeBNUG2IaWE
+yZZfefWYa6GSqN1LuUuV/nkXUTDLCae6CHcF09xX/zT8kbbqX2gynuIXLVtArh/0
+ONN4lhye6WaRSTgRuiun7ASZUIAG/u3gcQV7sLVpugEVNUN3ghSCZYka5wguvik=
+=19cy
 -----END PGP SIGNATURE-----
diff --git a/app-misc/spacenavd/spacenavd-0.5-r4.ebuild b/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
index 64d04215eb23..ef933772d85c 100644
--- a/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r4.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-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.2 2012/11/16 10:29:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.3 2012/11/16 10:33:05 ssuominen Exp $
 
 EAPI="4"
 
@@ -50,11 +50,8 @@ src_install() {
 
 	# Install udev rule but leave activiation to the user
 	# since Xorg may be configured to grab the device already
-	# ^ Above statement doesn't seem to be correct as rules from
-	# udevdir are loaded normally. /etc/udev/rules.d is when you
-	# do changes to the rules. - ssuominen
 	insinto "$(udev_get_udevdir)"
-	doins "${FILESDIR}"/99-space-navigator.rules
+	newins "${FILESDIR}"/99-space-navigator.rules 99-space-navigator.rules.ignored
 
 	# Daemon
 	dobin "${S}/spacenavd"
@@ -73,6 +70,10 @@ pkg_postinst() {
 		elog "\`spnavd_ctl x11 start\`"
 		elog
 	fi
+	elog
+	elog "If you want to auto-start the daemon when you plug in"
+	elog "a SpaceNavigator device, activate the related udev rule :"
+	elog "\`sudo ln -s $(udev_get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
 	ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
 	ewarn "the new version of the daemon."
 }