More helpful FDI file comments by Bernard Cafarelli <voyageur@gentoo.org> so users can modify the FDI file easier. Removed the HAL USE-flag, upstream behaviour changes mean you need it now. Added messages to that effect. Revision bumped.

(Portage version: 2.1.6/cvs/Linux 2.6.28-rc7-00200-gf7a8db8-dirty x86_64)

3 files changed, 106 insertions, 1 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 7b6346d0f2a5..f50742e197f4 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.14 2008/12/04 19:22:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.15 2008/12/09 16:18:50 chainsaw Exp $
+
+*xf86-input-synaptics-0.99.2-r1 (09 Dec 2008)
+
+  09 Dec 2008; <chainsaw@gentoo.org> +files/0.99.2-fdi-comments.patch,
+  +xf86-input-synaptics-0.99.2-r1.ebuild:
+  More helpful FDI file comments by Bernard Cafarelli <voyageur@gentoo.org>
+  so users can modify the FDI file easier. Removed the HAL USE-flag,
+  upstream behaviour changes mean you need it now. Added messages to that
+  effect. Revision bumped.
 
 *xf86-input-synaptics-0.99.2 (04 Dec 2008)
 
diff --git a/x11-drivers/xf86-input-synaptics/files/0.99.2-fdi-comments.patch b/x11-drivers/xf86-input-synaptics/files/0.99.2-fdi-comments.patch
new file mode 100644
index 000000000000..e4ba67ef964a
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/files/0.99.2-fdi-comments.patch
@@ -0,0 +1,26 @@
+--- xf86-input-synaptics-0.99.2/fdi/11-x11-synaptics.fdi.orig	2008-12-09 16:02:09.000000000 +0000
++++ xf86-input-synaptics-0.99.2/fdi/11-x11-synaptics.fdi	2008-12-09 16:05:54.000000000 +0000
+@@ -5,9 +5,20 @@
+         <merge key="input.x11_driver" type="string">synaptics</merge>
+         <!-- Arbitrary options can be passed to the driver using
+              the input.x11_options property since xorg-server-1.5. -->
+-        <!-- EXAMPLE:
+-        <merge key="input.x11_options.LeftEdge" type="string">120</merge>
+-        -->
++        <!-- EXAMPLES: -->
++            <!-- Switch on shared memory, enables the driver to be configured at runtime -->
++        <!-- <merge key="input.x11_options.SHMConfig" type="string">true</merge> -->
++            <!-- Maximum movement of the finger for detecting a tap -->
++        <!-- <merge key="input.x11_options.MaxTapMove" type="string">2000</merge> -->
++            <!-- Enable vertical scrolling when dragging along the right edge -->
++        <!-- <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge> -->
++            <!-- Enable vertical scrolling when dragging with two fingers anywhere on the touchpad -->
++        <!-- <merge key="input.x11_options.VertTwoFingerScroll" type="string">true</merge> -->
++            <!-- Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad -->
++        <!-- <merge key="input.x11_options.HorizTwoFingerScroll" type="string">true</merge> -->
++            <!-- If on, circular scrolling is used -->
++        <!-- <merge key="input.x11_options.CircularScrolling" type="string">true</merge> -->
++            <!-- For other possible options, check CONFIGURATION DETAILS in synaptics man page -->
+     </match>
+   </device>
+ </deviceinfo>
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2-r1.ebuild
new file mode 100644
index 000000000000..ff4f96c01c24
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 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-0.99.2-r1.ebuild,v 1.1 2008/12/09 16:18:50 chainsaw Exp $
+
+inherit toolchain-funcs eutils linux-info x-modular
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+LICENSE="MIT"
+IUSE=""
+RDEPEND="x11-libs/libXext
+	 hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	!x11-drivers/synaptics
+	x11-base/xorg-server
+	x11-proto/inputproto
+	>=sys-apps/sed-4"
+
+evdev-input_check() {
+	# Check kernel config for required event interface support (either
+	# built-in or as a module. Bug #134309.
+
+	ebegin "Checking kernel config for event device support"
+	linux_chkconfig_present INPUT_EVDEV
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "Synaptics driver requires event interface support."
+		ewarn "Please enable the event interface in your kernel config."
+		ewarn "The option can be found at:"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Input device support"
+		ewarn "      -*- Generic input layer"
+		ewarn "        <*> Event interface"
+		ewarn
+		ewarn "Then rebuild the kernel or install the module."
+		epause 5
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	evdev-input_check
+}
+
+src_unpack() {
+	x-modular_unpack_source
+	epatch "${FILESDIR}/${PV}-fdi-comments.patch"
+}
+
+src_install() {
+	DOCS="INSTALL NEWS TODO README"
+	x-modular_src_install
+
+	# Stupid new daemon, didn't work for me because of shm issues
+	newinitd "${FILESDIR}"/rc.init syndaemon
+	newconfd "${FILESDIR}"/rc.conf syndaemon
+
+	# Have HAL assign this driver to supported touchpads.
+	insinto /usr/share/hal/fdi/policy/10osvendor
+	doins "${S}"/fdi/11-x11-synaptics.fdi
+}
+
+pkg_postinst() {
+	einfo "Synaptics settings are now stored in: "
+	einfo "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
+	ewarn "You need to migrate your settings and clear them from xorg.conf"
+}