This one is for you pheand: Install an X.Org 1.8 InputClass policy control file to actually use the driver we installed. With thanks to Hanno Boeck & Stephen "steve" Klimaszewski, closes bug #314989.

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

4 files changed, 77 insertions, 6 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 5f215f7759fd..6b8a304e7ac5 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.48 2010/04/10 09:46:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.49 2010/04/21 16:03:46 chainsaw Exp $
+
+*xf86-input-synaptics-1.2.2-r1 (21 Apr 2010)
+
+  21 Apr 2010; <chainsaw@gentoo.org> +files/1.2.2-xorg-inputclass,
+  +xf86-input-synaptics-1.2.2-r1.ebuild:
+  Install an X.Org 1.8 InputClass policy control file to actually use the
+  driver we installed. With thanks to Hanno Boeck & Stephen "steve"
+  Klimaszewski, closes bug #314989.
 
   10 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   xf86-input-synaptics-1.2.2.ebuild:
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 8576d68e2cde..0ac3b540075c 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.2.2-xorg-inputclass 139 RMD160 18ebdecb1ab952fa50e82ac7383413940f635a66 SHA1 e700d1ce31d892de07de867d7e0bae6c5947ad8f SHA256 0c1e2342a7fd2582d2bf0e200cbe00d4a64c9ec886a703835893de3962fb8618
 DIST xf86-input-synaptics-1.2.1.tar.bz2 295524 RMD160 301f767cc3ae3cbc5984dbdf6111069c80de435b SHA1 ffdad38384f3dcbf650d1db7e3d75ed46935a2c6 SHA256 a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
 DIST xf86-input-synaptics-1.2.2.tar.bz2 297380 RMD160 1024d55057163ae39d68ff16e6f6cf5ffbf3afc4 SHA1 20ee874ef3dd391dbcfb03285b1b352c0234a00f SHA256 d20b4e7254ba62216acdbe4b1cfe346efc153cb5795837329ccfa11758db2da8
 EBUILD xf86-input-synaptics-1.2.1.ebuild 1466 RMD160 f4c33e13d1e4e1a1514b15ca34ca747648f01e79 SHA1 5f1745c832084e382da4ff8312e6206c150521ff SHA256 fd8075fbaa8d7e85eda8dd1fd2e72bcd19da9b8652836692eed8e00958337e3e
+EBUILD xf86-input-synaptics-1.2.2-r1.ebuild 1620 RMD160 be8b4876f2ae6b4b656f43be0da57d5f6bfc989b SHA1 e4be86fb5d462c1b07be4bb539aa1eaebf382441 SHA256 4ab6e279ad035478cf68dbf7d704ee61db13a5d0eadcc24fadacbb2473d68396
 EBUILD xf86-input-synaptics-1.2.2.ebuild 1470 RMD160 5fe8788e54e775c37d770ee322d2b3ac8f2b6a29 SHA1 cf670ef0e1a81e813f3b3a8f8c287ea5334aa7f6 SHA256 9098a92d2ff19cdf2a34580410c4d76191728ad6d080e9acc41c76a401d0d596
-MISC ChangeLog 10245 RMD160 8a467e3e896de9b723d663c0a45e869dbf982e4b SHA1 5c59feef2e69607be8685d1ba625fe9bd7500d46 SHA256 fb0e358f40d7497c4f55f5fab45934e061bff6146e4b469ecfda09c090e9e9d9
+MISC ChangeLog 10577 RMD160 fe95437afc6388e4d938f5da3f77e4cbae56fbae SHA1 5c2f880f0e537bd8ef1c357db8e9bceb1d919323 SHA256 27edb6b234de727c5def7813f9cd3795ce5a4931db7c61b56246a2e1eb553e24
 MISC metadata.xml 489 RMD160 6d00dcafdbb2cd378f03a601b2a1a9385ac6c583 SHA1 ebedcff00b817d050181a0b00121ada982be6f91 SHA256 303367040ca55bd42fed1d185fae0e30af683f020e363b57eb0dede4f68e7bef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvASRsACgkQHB6c3gNBRYeZnwCeI2/6UbG20YMLtZJLBfv2XQ6z
-kRMAnAsLcuZNSK73mpHzPLDbE/fLhCnP
-=lnad
+iEYEARECAAYFAkvPIekACgkQp5vW4rUFj5rMzgCfWZ2+lFLQM3SGlLcbqPwMcleE
+mg4AoLZ/HTxrRUptKfuNlILxGFoW68AI
+=jhnT
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-synaptics/files/1.2.2-xorg-inputclass b/x11-drivers/xf86-input-synaptics/files/1.2.2-xorg-inputclass
new file mode 100644
index 000000000000..1d82a674a0df
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/1.2.2-xorg-inputclass
@@ -0,0 +1,6 @@
+Section "InputClass"
+Identifier "touchpad catchall"
+MatchIsTouchpad "on"
+MatchDevicePath "/dev/input/event*"
+Driver "synaptics"
+EndSection
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..4359829bea28
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.2-r1.ebuild,v 1.1 2010/04/21 16:03:46 chainsaw Exp $
+
+inherit linux-info x-modular
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="hal"
+
+RDEPEND="
+	>=x11-base/xorg-server-1.8
+	>=x11-libs/libXi-1.2
+	x11-libs/libXtst
+	hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	>=sys-apps/sed-4"
+
+src_install() {
+	DOCS="INSTALL TODO README"
+	x-modular_src_install
+
+	if use hal ; then
+		insinto /usr/share/hal/fdi/policy/10osvendor
+		doins "${S}"/fdi/11-x11-synaptics.fdi
+	fi
+
+	insinto /etc/X11/xorg.conf.d
+	newins "${FILESDIR}/${PV}-xorg-inputclass" 04-synaptics.conf || die "Unable to install xorg inputclass policy file"
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+	if use hal ; then
+		elog "If you want to modify Synaptics settings, please create an fdi file in:"
+		elog "/etc/hal/fdi/policy/"
+		echo
+		ewarn "The current default are set by :"
+		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
+		ewarn "You can use this file for inspiration, but DO NOT EDIT IT directly."
+	fi
+}