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>.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5-00131-g5f17cfc-dirty x86_64

4 files changed, 26 insertions, 26 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/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 36ebac15083d..43936f961721 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 11-x11-synaptics.fdi 593 RMD160 5b2d387e22b2dfd340e6e5e508f5b07bd916f5fc SHA1 f8985d0324efceb86ca18418df16222b773bf798 SHA256 f904632ce695305ec6384a615c1ebb317ed40249a34c57149a06f9da0f775fdc
 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
-EBUILD xf86-input-synaptics-0.15.2-r1.ebuild 1725 RMD160 e60dae98a87cc46b3a572518c899ef5b986f5734 SHA1 56ee50177121bc04cb1996c15278b0c0b3fc89ad SHA256 af81d286569fa4da4057bc7955fd2d43dd28cc54f592c3ba62dbac08bdf6bae4
-MISC ChangeLog 3191 RMD160 c9d7057584d068111095dce920f9f7ad76108f5d SHA1 6315fc29de99432a101eae9bba6ea5a56d67bfb3 SHA256 8f9777fb367243c6a0fe806c83ab527ae1c6d42c4fd7d40152de1c0bfbc60515
+EBUILD xf86-input-synaptics-0.15.2-r2.ebuild 1919 RMD160 cc0aaa43290bed736a4fd5c0ec817fbd81c4c012 SHA1 f120151d50b6286d12f14776b9e05173fcc6d20a SHA256 e75a10ae03476b69715a2654ee4389411d3a2b7db038c66a6e9ab9999dfa5019
+MISC ChangeLog 3617 RMD160 afae94374421d04baed1b758efd69440cb102066 SHA1 3226f4d5d75b944a25aba46c9343ebe96839205e SHA256 e83abef320819ea810247ebc9a8f5809138adebb0d286d0e0a770d384ee2c98b
 MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjKPTUACgkQp5vW4rUFj5oa4ACfXxY8/P4VNM7cSSPmGSqD1mnP
-pQQAoL2Yc+Z8WrkroVew6rGsKKLrl71P
-=If+l
+iEYEARECAAYFAkjPjjcACgkQp5vW4rUFj5rDiwCeLziqlYDleEAan7aJ0NXZ/2bQ
+qlEAnjkJJ1FdF2QWkinaqi6rFNj7bxwX
+=V5lf
 -----END PGP SIGNATURE-----
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
 }