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.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.28-rc7-00200-gf7a8db8-dirty x86_64

4 files changed, 112 insertions, 5 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/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index dcffb2100c4e..f2b70c4cdc61 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.99.2-fdi-comments.patch 1765 RMD160 c1ac0ee5dcfe86f02c42a0469a1d2c201486b8ed SHA1 04fd423413de8e9df0548a308ceb9ef47d6d7d6c SHA256 f233742d4f5dd86702079f14f4ee2bb943b2a155c603ff1babce2450d7681c03
 AUX rc.conf 342 RMD160 65e507598001c497dec7b05ab5bb8e06ff1aac7a SHA1 cc76b983b33f8eb5c3624ba78db206781eab81bb SHA256 3334b80cd39226fafd948e16114ab094fffe9455625f608c80f8287a006d0716
 AUX rc.init 452 RMD160 202287feac6c79276fac32987cb1d75158bacfee SHA1 db38171e0c8e1d777ae8af2ce81e43950137892f SHA256 0d735340a0adb2e5e6c902253d4ef68fd80c3001b0ed31ea70d2a2690d738a1a
 AUX synaptics-fix-xinerama.patch 752 RMD160 5017471df5c4f47382938ccff9bbd66033c06a6f SHA1 14b53a0c4090739ddc4cff9e9ad94cb9e2499c87 SHA256 7bdec4ef00a520d52e00b8a1d0b6d61e89fde910e28baa306b8be23dd7aadd64
@@ -9,13 +10,14 @@ DIST xf86-input-synaptics-0.99.1.tar.bz2 285299 RMD160 c84176676293d677870db84a2
 DIST xf86-input-synaptics-0.99.2.tar.bz2 284901 RMD160 f708fec80cc41a1ff21c3d9c4eae28bab783fbcb SHA1 cfb63550a72c9053fea1db0683fd5bc95efa9ba1 SHA256 0bd2a062112be4f642a317e6fdffe07becd1d3af8489d73f77943ddfafe3ec57
 EBUILD xf86-input-synaptics-0.15.2-r2.ebuild 1919 RMD160 cc0aaa43290bed736a4fd5c0ec817fbd81c4c012 SHA1 f120151d50b6286d12f14776b9e05173fcc6d20a SHA256 e75a10ae03476b69715a2654ee4389411d3a2b7db038c66a6e9ab9999dfa5019
 EBUILD xf86-input-synaptics-0.99.1.ebuild 1791 RMD160 8f8a3d6b0856b36bc0b7addb52124aaf8df4a3d7 SHA1 4fb017f864c0e63763e79db0dd631ad90d0a2ad8 SHA256 9065909429d0fed5f59297f94f1a3e33878db80a72d747e00e6b9d6783dbb3ea
+EBUILD xf86-input-synaptics-0.99.2-r1.ebuild 2020 RMD160 d618a3fd70011f047275a1685c7d55c2e616397b SHA1 da12420ba157d83547e7e721537f9013d6fdbfb9 SHA256 7362ab0f2aea0c09ffeda98cfdfcdacd8aecca25fb9168515673915f3046abf2
 EBUILD xf86-input-synaptics-0.99.2.ebuild 1791 RMD160 7ce65096b255345efa7837578f7069924e1d1b49 SHA1 f01cc54a70d40af6aadfaa4619cf1af1e59e5543 SHA256 91b9eec992a17e3ba6bf28535d0a3ce00965309e7b43158ba287d2f368ed8c5e
-MISC ChangeLog 4253 RMD160 dda96908c34bf46f16a4056d7cdaaff35194234c SHA1 8dc9ef164f2554e2954dd463fb0e9d15b85d9f85 SHA256 e44f86f5f95204895367244e1425cd282503885fd1fba4ce6ddf6e839f39c203
+MISC ChangeLog 4660 RMD160 6f84cbb4da2c3c23e769c82aceef8468bd32ea69 SHA1 8d480dcf043e35a350039cb82b02ec9c46f24fc1 SHA256 d114eb218918c54659482e948e05679553b882cac1e78768decf48550c64b26b
 MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk4LdUACgkQp5vW4rUFj5rb8ACgwKjy6XCG7YB+2xIz1m8vPZeF
-sDkAmwRrBvbDoVIS5ihw/F7UxqR0p3IV
-=IdkX
+iEYEARECAAYFAkk+mk8ACgkQp5vW4rUFj5o39wCdEFgFJKxeAxvDgU5upbe8UeJu
+22kAn1I4LDku4NIOEEQDl02e0XXU0zG6
+=q1qr
 -----END PGP SIGNATURE-----
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"
+}