x11-drivers/xf86-input-synaptics: complete overhaul, sync with x11 overlay

Package-Manager: portage-2.2_rc45/cvs/Linux i686

3 files changed, 29 insertions, 16 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 1cfe2f98523f..8a327f2a43dc 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2009/10/11 11:23:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.33 2009/10/12 17:00:03 remi Exp $
+
+  12 Oct 2009; Rémi Cardona <remi@gentoo.org>
+  xf86-input-synaptics-1.2.0.ebuild:
+  complete overhaul, sync with x11 overlay
 
   11 Oct 2009; nixnut <nixnut@gentoo.org> xf86-input-synaptics-1.1.3.ebuild:
   ppc stable #282290
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index f78ea1106371..c13b7ce041fe 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -3,6 +3,6 @@ DIST xf86-input-synaptics-1.1.3.tar.bz2 295652 RMD160 fb87ca23961f0cca8ebea33190
 DIST xf86-input-synaptics-1.2.0.tar.bz2 294712 RMD160 0d940487311237a7c0ad7c6bcf1f1bb68bbcbbbe SHA1 bca5433285290f67cca42eb37abfd5292b83c991 SHA256 ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c
 EBUILD xf86-input-synaptics-1.0.0.ebuild 1183 RMD160 5e546293ebc6bb27f5fdb24adbb9482857d6c247 SHA1 d5506cd38dd1bfd0d8c1b5367281d8c1e611603b SHA256 d7440a5a2d21cdc9def41838d859405a1c64a80a6da599047420f7dbb28b80f2
 EBUILD xf86-input-synaptics-1.1.3.ebuild 1290 RMD160 e9299e70d56f888a767ae713f9e6fc816f70dee7 SHA1 537c102d4d538f7e067c5f9dac5bdc828d3c65eb SHA256 add0ac2827f4f974654bb18a77bf17840179bcf0470b7ab21574a9d8e9901914
-EBUILD xf86-input-synaptics-1.2.0.ebuild 1237 RMD160 674058ec51d5bc760a00b35de2a55db2e2374f1c SHA1 7475ab1208e6c1b4548ddb13359ef9bfb3b8e8dc SHA256 7d6a29d7426875a635173d1a07ed85973654979278f640831552071351d1468a
-MISC ChangeLog 8095 RMD160 804928929835c8363d0f7015b8fda9fcccceadcf SHA1 49384e2f9ac02093ee79f1d159361d5ec2db0c40 SHA256 9e3590f798766d299c4cc423b7104478bd1f86444cea0068ea8f3b36444c8636
+EBUILD xf86-input-synaptics-1.2.0.ebuild 1408 RMD160 e4bbef4caebfe5343823f6f9e89f1738e1ab5cec SHA1 a8341fd322ad1d0ba76bbc558cca1954cc3da8f4 SHA256 f4a0e951a953d4b32babac5531b99bfd4138d371d9c508acf1978d32a3bfef8e
+MISC ChangeLog 8221 RMD160 4ae8ac55f0dad64bc27737ed57bf92959a7981e7 SHA1 f1e7a0a013753132236a1d8db8dc13f1e3d39fcf SHA256 f28d7291a8ee03bed9a3ea92c9ad9f40e2d026f47bc84691e2fe99895231b52c
 MISC metadata.xml 489 RMD160 6d00dcafdbb2cd378f03a601b2a1a9385ac6c583 SHA1 ebedcff00b817d050181a0b00121ada982be6f91 SHA256 303367040ca55bd42fed1d185fae0e30af683f020e363b57eb0dede4f68e7bef
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.0.ebuild
index 2f299651e246..3420fcf2a7a0 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.0.ebuild
@@ -1,26 +1,26 @@
 # 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.2.0.ebuild,v 1.1 2009/10/10 08:04:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.2.0.ebuild,v 1.2 2009/10/12 17:00:03 remi Exp $
 
-inherit toolchain-funcs eutils x-modular
+inherit 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-base/xorg-server-1.7.0
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXtst-1.1
+	>=x11-base/xorg-server-1.6
+	>=x11-libs/libXi-1.2
+	x11-libs/libXtst
 	hal? ( sys-apps/hal )"
 DEPEND="${RDEPEND}
-	!x11-drivers/synaptics
-	>=x11-proto/inputproto-2.0
+	x11-proto/inputproto
 	>=sys-apps/sed-4"
 
 src_install() {
-	DOCS="INSTALL NEWS TODO README"
+	DOCS="INSTALL TODO README"
 	x-modular_src_install
 
 	if use hal ; then
@@ -30,12 +30,21 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "This driver requires event interface support in your kernel: INPUT_EVDEV"
+	x-modular_pkg_postinst
+	if ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
 	if use hal ; then
-		elog "Synaptics settings are now stored in:"
-		elog "/etc/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
+		elog "If you want to modify Synaptics settings, please create an fdi file in:"
+		elog "/etc/hal/fdi/policy/"
 		echo
-		ewarn "Please see the examples here for inspiration, but not edit:"
+		ewarn "The current default are set by :"
 		ewarn "/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi"
+		ewarn "You can use this file for inspiration, but DO NOT EDIT IT directly."
 	fi
 }