Apparently using autotools correctly is hard. Reinstate the previous install hack as regenerating the configure script would take longer than the compile itself. Closes bug #237620 by Alexey Charkov <alchark@gmail.com>.

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5-00131-g5f17cfc-dirty x86_64)

3 files changed, 21 insertions, 20 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 517ac1fbe738..e2a06f6ce9aa 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,16 @@
 # 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.11 2008/09/12 09:58:06 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.12 2008/09/16 10:45:01 chainsaw Exp $
+
+*xf86-input-synaptics-0.15.2-r2 (16 Sep 2008)
+
+  16 Sep 2008; <chainsaw@gentoo.org> -files/11-x11-synaptics.fdi,
+  -xf86-input-synaptics-0.15.2-r1.ebuild,
+  +xf86-input-synaptics-0.15.2-r2.ebuild:
+  Apparently using autotools correctly is hard. Reinstate the previous
+  install hack as regenerating the configure script would take longer than
+  the compile itself. Closes bug #237620 by Alexey Charkov
+  <alchark@gmail.com>.
 
 *xf86-input-synaptics-0.15.2-r1 (12 Sep 2008)
 
diff --git a/x11-drivers/xf86-input-synaptics/files/11-x11-synaptics.fdi b/x11-drivers/xf86-input-synaptics/files/11-x11-synaptics.fdi
deleted file mode 100644
index c918b549267a..000000000000
--- a/x11-drivers/xf86-input-synaptics/files/11-x11-synaptics.fdi
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.capabilities" contains="input.touchpad">
-      <match key="info.product" contains="Synaptics TouchPad">
-	<merge key="input.x11_driver" type="string">synaptics</merge>
-      </match>
-      <match key="info.product" contains="AlpsPS/2 ALPS">
-	<merge key="input.x11_driver" type="string">synaptics</merge>
-      </match>
-      <match key="info.product" contains="appletouch">
-	<merge key="input.x11_driver" type="string">synaptics</merge>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r2.ebuild
index bc960a5ee5fa..b621f43d20ce 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r1.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.15.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2008/09/12 09:58:06 chainsaw Exp $
+# $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
 
@@ -8,8 +8,9 @@ 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"
+IUSE="hal"
+RDEPEND="x11-libs/libXext
+	 hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}
 	!x11-drivers/synaptics
 	x11-base/xorg-server
@@ -57,4 +58,10 @@ 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
 }