Phrasing of the HAL FDI instructions was awkward, now clarified so user changes are not lost. Closes bug #258293 by Scott Stubbs. Remove overelaborate INPUT_EVDEV kernel check and just add an elog instead, closes bug #262000 by cyrillic <cyrilmaley@hotmail.com>. Removed old ebuilds.

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

11 files changed, 30 insertions, 502 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 71461ca1968f..93a56c49c68a 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-drivers/xf86-input-synaptics
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.19 2009/02/03 13:04:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.20 2009/03/20 14:47:19 chainsaw Exp $
+
+  20 Mar 2009; <chainsaw@gentoo.org> -files/0.99.2-fdi-comments.patch,
+  -files/synaptics-fix-xinerama.patch,
+  -xf86-input-synaptics-0.15.2-r2.ebuild,
+  -xf86-input-synaptics-0.99.1.ebuild, -xf86-input-synaptics-0.99.2.ebuild,
+  -xf86-input-synaptics-0.99.2-r1.ebuild,
+  -xf86-input-synaptics-0.99.3.ebuild,
+  -xf86-input-synaptics-0.99.3-r1.ebuild, xf86-input-synaptics-1.0.0.ebuild:
+  Phrasing of the HAL FDI instructions was awkward, now clarified so user
+  changes are not lost. Closes bug #258293 by Scott Stubbs. Remove
+  overelaborate INPUT_EVDEV kernel check and just add an elog instead,
+  closes bug #262000 by cyrillic <cyrilmaley@hotmail.com>. Removed old
+  ebuilds.
 
 *xf86-input-synaptics-1.0.0 (03 Feb 2009)
 
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 89b6c0cc6d4a..f03e2a1cb7c1 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,28 +1,16 @@
 -----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
-DIST xf86-input-synaptics-0.15.2.tar.bz2 288531 RMD160 621cd40df0d22173bb7c4896fbff0ec9338c7853 SHA1 35c29129cfd529d185b28a8137b0541cabc00ed4 SHA256 d61f13acc20063665b79a639bf761f8efafde30598a9c400da877548d1a6e7bb
-DIST xf86-input-synaptics-0.99.1.tar.bz2 285299 RMD160 c84176676293d677870db84a2def41dfb55454a2 SHA1 df84534b79be21445ee74d0adfcb83c227e49e4b SHA256 e12772eab479b4b40ab46065402a5d1c093a9fee7952bb56b85d62f34ccc83cc
-DIST xf86-input-synaptics-0.99.2.tar.bz2 284901 RMD160 f708fec80cc41a1ff21c3d9c4eae28bab783fbcb SHA1 cfb63550a72c9053fea1db0683fd5bc95efa9ba1 SHA256 0bd2a062112be4f642a317e6fdffe07becd1d3af8489d73f77943ddfafe3ec57
-DIST xf86-input-synaptics-0.99.3.tar.bz2 284946 RMD160 8de35d07ae216b1bbd789f3dbd10f5a17544c7fc SHA1 e05636ab3d0a0e4867fd4e90eddbf1d91bec8245 SHA256 1a31962e05ff8480e1d97e0cd33b071fdc9a128cf71c5ad05428e5761be4f4b2
 DIST xf86-input-synaptics-1.0.0.tar.bz2 286129 RMD160 be54a13f44fd766a6acbcaac55a300d3733f4b8c SHA1 1cce9121f25e5ceab573dc93ad4630350f568b6a SHA256 b07fdffbc7d518ed24c2253fb4c62ebf460b388aa799de3d3cc20da3ce727ad8
-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 2023 RMD160 2625c94e4a65d9933e30460960d147ac14e1dc07 SHA1 baf577589238a15d70ceafc7930c5a7bd7fddd43 SHA256 fb5a6cae5759d25278e168ebe1f8e270114ee8e259836bbd76634401f8acf204
-EBUILD xf86-input-synaptics-0.99.2.ebuild 1791 RMD160 7ce65096b255345efa7837578f7069924e1d1b49 SHA1 f01cc54a70d40af6aadfaa4619cf1af1e59e5543 SHA256 91b9eec992a17e3ba6bf28535d0a3ce00965309e7b43158ba287d2f368ed8c5e
-EBUILD xf86-input-synaptics-0.99.3-r1.ebuild 1994 RMD160 f8ce765589b4a0e77f9a41c7a22f58227ee06524 SHA1 f0d85f4758d6087ee3ae695f76425a7e910d7937 SHA256 dd1d8a3060d2936aa45089bcea7b7b2afaf08517fbbe686cf4b5aaa7eb7d4a15
-EBUILD xf86-input-synaptics-0.99.3.ebuild 2009 RMD160 9521733a1144f53fdc1bba0c34ed2a2d55279c4a SHA1 1f5d96a6e233bc8615c8547b99b445615b14e278 SHA256 7849dffdef7c44c8a3ef3e46d2b00fc62dbcd67f6007880f251fa2a2c49d6956
-EBUILD xf86-input-synaptics-1.0.0.ebuild 1899 RMD160 33ab87ba66fd8ab0e50a619eea159e12c1b5e5aa SHA1 c699e4c5d5beb8402e47227f2204d9918c23ff95 SHA256 15087ed2577c2c587be6badf5969d0b5ad5d0b107c9a85088446dda3eea91651
-MISC ChangeLog 5727 RMD160 3a41d66be06a225342226a679555cbfa52d4357f SHA1 89b82eb5fc67423c6b56e3933f5fd78e7e40ff49 SHA256 6085d81aa1de91956d2cea1418280ae3f0f8ac0c8b799bd438617d8660796fe9
+EBUILD xf86-input-synaptics-1.0.0.ebuild 1339 RMD160 7d706224a88acc4479b68b85a9ecd12a380f80dc SHA1 8421271ddc0763357c185ada74a61ebe515d5354 SHA256 852a01e333b3821bae88c982f1a256380bd52d25f694dfee6c43e5ef7da01d4a
+MISC ChangeLog 6408 RMD160 e746992467718b2175ef83afa7d793d677a5caf0 SHA1 182773d264819cd093ba2b839b58b0ea383b38ce SHA256 66ab3172525501b66fe5af74cdbdadb7fd3ec5702cee963245c9d94a79d3d08d
 MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmIQOUACgkQp5vW4rUFj5pDMACdFhJkRuaAFtUvUmPOXSFamuKt
-cCcAni7wC94i+aDBTs7tmOr77ZqhjkUK
-=zoP1
+iEYEARECAAYFAknDrAwACgkQp5vW4rUFj5pRzgCgrB/CZ50hmRGj2mCSzmYWOklv
+R8YAoL8Sws3WWO5hx2U2YQusxMoLp2+W
+=gZ/C
 -----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
deleted file mode 100644
index e4ba67ef964a..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/0.99.2-fdi-comments.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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/files/synaptics-fix-xinerama.patch b/x11-drivers/xf86-input-synaptics/files/synaptics-fix-xinerama.patch
deleted file mode 100644
index 943340394e9b..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/synaptics-fix-xinerama.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c xf86-input-synaptics-0.15.0/src/synaptics.c
---- xf86-input-synaptics-0.15.0.ORIG/src/synaptics.c	2008-08-22 17:34:20.000000000 +0100
-+++ xf86-input-synaptics-0.15.0/src/synaptics.c	2008-08-22 17:34:45.000000000 +0100
-@@ -648,10 +648,10 @@
- #endif
- 			    );
-     /* X valuator */
--    xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
-+    xf86InitValuatorAxisStruct(dev, 0, -1, -1, 1, 0, 1);
-     xf86InitValuatorDefaults(dev, 0);
-     /* Y valuator */
--    xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
-+    xf86InitValuatorAxisStruct(dev, 1, -1, -1, 1, 0, 1);
-     xf86InitValuatorDefaults(dev, 1);
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-     xf86MotionHistoryAllocate(local);
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r2.ebuild
deleted file mode 100644
index b621f43d20ce..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.15.2-r2.ebuild,v 1.1 2008/09/16 10:45:02 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="hal"
-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
-	# Fix to handle multiple screens through Xinerama properly. Bug #206614.
-	epatch "${FILESDIR}"/synaptics-fix-xinerama.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
-
-	if use hal ; then
-		# Have HAL assign this driver to supported touchpads.
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.1.ebuild
deleted file mode 100644
index 6e1646ddc72f..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.1.ebuild,v 1.1 2008/11/15 01:09: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="hal"
-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
-}
-
-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
-
-	if use hal ; then
-		# Have HAL assign this driver to supported touchpads.
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-}
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
deleted file mode 100644
index 40ce196b3866..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 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.3 2009/02/03 13:04:54 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="hal"
-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"
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2.ebuild
deleted file mode 100644
index c3ae940b41d0..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.ebuild,v 1.1 2008/12/04 19:22:12 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="hal"
-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
-}
-
-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
-
-	if use hal ; then
-		# Have HAL assign this driver to supported touchpads.
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3-r1.ebuild
deleted file mode 100644
index 10e2aa10ab33..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 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.3-r1.ebuild,v 1.1 2009/01/05 17:45:48 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="hal"
-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}/0.99.2-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
-
-	if use hal ; then
-		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${S}"/fdi/11-x11-synaptics.fdi
-	fi
-}
-
-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"
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3.ebuild
deleted file mode 100644
index 2cc741bdba12..000000000000
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 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.3.ebuild,v 1.2 2009/01/04 05:23:34 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
-	 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}/0.99.2-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"
-}
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
index bfc357cbdee5..cd0f5733625c 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 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.0.0.ebuild,v 1.1 2009/02/03 13:04:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.0.0.ebuild,v 1.2 2009/03/20 14:47:19 chainsaw Exp $
 
-inherit toolchain-funcs eutils linux-info x-modular
+inherit toolchain-funcs eutils x-modular
 
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
@@ -17,34 +17,6 @@ DEPEND="${RDEPEND}
 	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_install() {
 	DOCS="INSTALL NEWS TODO README"
 	x-modular_src_install
@@ -60,7 +32,12 @@ src_install() {
 }
 
 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"
+	elog "This driver requires event interface support in your kernel: INPUT_EVDEV"
+	if use hal ; then
+		elog "Synaptics settings are now stored in:"
+		elog "/etc/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
+		echo
+		ewarn "Please see the examples here for inspiration, but not edit:"
+		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
+	fi
 }