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.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

10 files changed, 24 insertions, 484 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/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
 }