Reintroduce hal USE-flag by request of Ryan Tandy <tarpman@gmail.com>. This makes sense now that ABI=0 X servers are supported. Closes bug #253872.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-05716-gfe0bdec-dirty x86_64

3 files changed, 84 insertions, 5 deletions

diff --git a/x11-drivers/xf86-input-synaptics/ChangeLog b/x11-drivers/xf86-input-synaptics/ChangeLog
index 6a7b5dcf97e3..3d92f4a621bf 100644
--- a/x11-drivers/xf86-input-synaptics/ChangeLog
+++ b/x11-drivers/xf86-input-synaptics/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2009/01/04 05:23:34 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/ChangeLog,v 1.18 2009/01/05 17:45:48 chainsaw Exp $
+
+*xf86-input-synaptics-0.99.3-r1 (05 Jan 2009)
+
+  05 Jan 2009; <chainsaw@gentoo.org> +xf86-input-synaptics-0.99.3-r1.ebuild:
+  Reintroduce hal USE-flag by request of Ryan Tandy <tarpman@gmail.com>.
+  This makes sense now that ABI=0 X servers are supported. Closes bug
+  #253872.
 
   04 Jan 2009; <chainsaw@gentoo.org> xf86-input-synaptics-0.99.3.ebuild:
   Remove the HAL USE-flag more thoroughly, as requested by Mr_Bones.
diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index b2bcf3f8f862..4e202806955d 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -13,13 +13,14 @@ EBUILD xf86-input-synaptics-0.15.2-r2.ebuild 1919 RMD160 cc0aaa43290bed736a4fd5c
 EBUILD xf86-input-synaptics-0.99.1.ebuild 1791 RMD160 8f8a3d6b0856b36bc0b7addb52124aaf8df4a3d7 SHA1 4fb017f864c0e63763e79db0dd631ad90d0a2ad8 SHA256 9065909429d0fed5f59297f94f1a3e33878db80a72d747e00e6b9d6783dbb3ea
 EBUILD xf86-input-synaptics-0.99.2-r1.ebuild 2020 RMD160 d618a3fd70011f047275a1685c7d55c2e616397b SHA1 da12420ba157d83547e7e721537f9013d6fdbfb9 SHA256 7362ab0f2aea0c09ffeda98cfdfcdacd8aecca25fb9168515673915f3046abf2
 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
-MISC ChangeLog 5182 RMD160 c195b7a242ae07fd9c7325b773a923763b3f3765 SHA1 52b9ee623f5ef7d0ca97c515f9e68a115bc5a3ad SHA256 cc29486e87b0d504008cc3b68996d40d660c9a02fb9ad8365c3279de6ae6dcd4
+MISC ChangeLog 5461 RMD160 9f9fc0ead81679b0beb27b0f38c44533e8a5d9e7 SHA1 a19ebaa95cd95938080efc7a57b3987093edc13f SHA256 033b2378166458bbd6838a5a531b7feafec6060aa924d41b3927834bd9408236
 MISC metadata.xml 254 RMD160 c1c6e70dd9088c05d91c8188791534dae7ffa665 SHA1 2dcdc428213d896d7b0d00f46edfa49799a0f0a8 SHA256 326a5b3b205fe4d2e8822e5a595c500d19bf3d6c527ab1305a24ef476bd1c08b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklgR4gACgkQp5vW4rUFj5o1xQCfUp28mED28+LIc6G4VzF+gseV
-+vcAnAhV/fYiugcUZhxVflJBsJ7EENMu
-=xNZu
+iEYEARECAAYFAkliRvgACgkQp5vW4rUFj5oJowCfQgT0QS+ZFIbbjNPduU0wTIOH
+j7IAnibUH7KFPEvuekR/sdyJzugeoBsc
+=ziO5
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..10e2aa10ab33
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-0.99.3-r1.ebuild
@@ -0,0 +1,71 @@
+# 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"
+}