Add HAL policy to report correct driver for touchpads. Suggested by dberkholz.

Package-Manager: portage-2.1.4.4

4 files changed, 32 insertions, 6 deletions

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index 343966ffe1e8..1ca17299a27e 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.33 2008/04/01 23:57:31 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.34 2008/04/02 03:52:01 battousai Exp $
+
+  02 Apr 2008; Bryan Stine <battousai@gentoo.org> +files/10-synaptics.fdi,
+  synaptics-0.14.6-r2.ebuild:
+  Add HAL policy to report input driver as synaptics for supported
+  touchpads. Suggested by dberkholz.
 
 *synaptics-0.14.6-r2 (01 Apr 2008)
 
diff --git a/x11-drivers/synaptics/Manifest b/x11-drivers/synaptics/Manifest
index d257ec2f2ea1..6168994a225a 100644
--- a/x11-drivers/synaptics/Manifest
+++ b/x11-drivers/synaptics/Manifest
@@ -1,3 +1,4 @@
+AUX 10-synaptics.fdi 460 RMD160 973e332bd506d0160e573a028115bf3c0924e334 SHA1 77cc42785faecc3fb9b33ffac0b433ba9ba03808 SHA256 51c0da7a8e7048a753afa83d2d81e62fa8b61e0a1718083a2cc110767a76a8a3
 AUX rc.conf 330 RMD160 75825d70b749ae4e8b59b4066428d73815b19d70 SHA1 639736e2b424fcd3d6a78d0e6a3f90bed49ee6f4 SHA256 1776915a739c2f1432ab1602717cac1ff2464160a9d33d20124853a93605f6a5
 AUX rc.init 440 RMD160 82c30d248ef010cdd41600e3b19878b9f2ea6ff0 SHA1 cfb299682f9ec85340950917cbfebe5387080b32 SHA256 314d7d7c7d20608a398b439427e9c74cfaf2521996abc50af8a7963f1e7f22b8
 AUX synaptics-0.14.4-r2-makefile-fpic.patch 681 RMD160 492189b170c19043e35e28d9d347d61d718eef0a SHA1 d784c87ef1d144bb863f5fb05f69b511c528bf8f SHA256 c8cbd624521f7490a04df72d8a2738c5bb586b57c560af0bb60b860f286658bc
@@ -13,7 +14,7 @@ DIST synaptics-0.14.5.tar.bz2 126743 RMD160 815e95e3ae2ef2e60b55b7023e27619ca8c1
 DIST synaptics-0.14.6.tar.bz2 126833 RMD160 7a8b103aa314eb13dc512c663c501108cc24a574 SHA1 41443e253e73546657b40435c8c9bfa0a91662bc SHA256 f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
 EBUILD synaptics-0.14.5-r1.ebuild 1353 RMD160 d3071d9aae10467cef885a291afe2d53bda4ed48 SHA1 c49b2b5d9053d8ea415d3cf27cf58927d9a8c87f SHA256 d51a03799fe941502ac0431976c543462e19983e9b8eb5d601b1d51131361929
 EBUILD synaptics-0.14.6-r1.ebuild 1477 RMD160 b0ec6a3b6ce2f875240d25a447796a84e2bb3487 SHA1 cbaf6ff70d38156bbadeed1bf8b8f350bda881a1 SHA256 8bc6e347be42a113074933c7010f7d32cd2bd75e9a42758c811faa9c9ac54d0e
-EBUILD synaptics-0.14.6-r2.ebuild 2452 RMD160 4c6d512ef09ed348a4c45d814d5ddcb1fe63718e SHA1 7c8d482a76618f977887c85a4b893b630220710e SHA256 96d36d00b716eb3412d86feb3daf620a72ae006821f43061e7010290321c73d8
+EBUILD synaptics-0.14.6-r2.ebuild 2645 RMD160 445060f8c438ce49e00f30c49915e23a772a4885 SHA1 8a5ca93de1da502a4718e0fed032a99c4727cf14 SHA256 4888e59ab608d4be2bb630ac0b45291d04b9ac53039f1521f8dcbfab109fd735
 EBUILD synaptics-0.14.6.ebuild 1266 RMD160 d9bc93d3b1370119950e7b7f70d8273a192441fb SHA1 efd0935366b14afb5f5d2d7913fa03b1dbaccb3e SHA256 146a0ad8a1b0801c2bfad34d315525972094dc828d93359e6937a086b70d2b2a
-MISC ChangeLog 16165 RMD160 7e264eb771a34160a8eafc3078df6fedefc94554 SHA1 e46046ab185819637c22147484785263d9623446 SHA256 d64238d572294ab117e452e5d26357cdf25b0e158bc00bb55379501bf57ce2b2
+MISC ChangeLog 16375 RMD160 c84ac81222f6f02dca317c92df6d56721b581a8f SHA1 3d7b110c55f0143ab8f5d9d4886e819e2e8d8803 SHA256 932791ea42866f129a7f3649edb55a3147daf2f946e1adae2cdd1a3d97f30ed1
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
diff --git a/x11-drivers/synaptics/files/10-synaptics.fdi b/x11-drivers/synaptics/files/10-synaptics.fdi
new file mode 100644
index 000000000000..05c84286da42
--- /dev/null
+++ b/x11-drivers/synaptics/files/10-synaptics.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.touchpad">
+      <match key="info.product" contains="Synaptics TouchPad">
+	<merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
+      <match key="info.product" contains="AlpsPS/2 ALPS">
+	<merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
index 318860ca3587..5f25879a88e6 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.1 2008/04/01 23:57:31 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.2 2008/04/02 03:52:01 battousai Exp $
 
 inherit toolchain-funcs eutils linux-info
 
-IUSE=""
+IUSE="hal"
 
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/"
@@ -14,7 +14,8 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="x11-libs/libXext"
+RDEPEND="x11-libs/libXext
+	 hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}
 	x11-base/xorg-server
 	>=sys-apps/sed-4"
@@ -86,4 +87,10 @@ src_install() {
 	# Stupid new daemon, didn't work for me because of shm issues
 	newinitd "${FILESDIR}"/rc.init syndaemon
 	newconfd "${FILESDIR}"/rc.conf syndaemon
+
+	if use hal ; then
+		# Have HAL assign this driver to supported touchpads.
+		insinto /usr/share/hal/fdi/policy/10osvendor
+		doins "${FILESDIR}"/10-synaptics.fdi
+	fi
 }