Fix up wheel mouse bug with xf86-input-wacom-0.10.2.

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

4 files changed, 84 insertions, 5 deletions

diff --git a/x11-drivers/xf86-input-wacom/ChangeLog b/x11-drivers/xf86-input-wacom/ChangeLog
index e3ec80804317..d4cecfb1735e 100644
--- a/x11-drivers/xf86-input-wacom/ChangeLog
+++ b/x11-drivers/xf86-input-wacom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-input-wacom
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.5 2009/12/01 09:40:44 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.6 2009/12/02 20:52:21 ikelos Exp $
+
+*xf86-input-wacom-0.10.2-r1 (02 Dec 2009)
+
+  02 Dec 2009; Mike Auty <ikelos@gentoo.org>
+  +files/0.10.2-wheel-buttons.patch, +xf86-input-wacom-0.10.2-r1.ebuild:
+  Fix up wheel mouse bug with xf86-input-wacom-0.10.2.
 
 *xf86-input-wacom-0.10.2 (01 Dec 2009)
 
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index ba56f34f2989..1279b69d4681 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.10.2-wheel-buttons.patch 457 RMD160 bb4130d27878da4954996ffac46126aa8e4a5c2b SHA1 8c2481e65948d9319ffe17236fd8ce101cf61165 SHA256 34fcd33195b13c72d67c95350b561847b8da3de0a99131b3066ff70ee5a52138
 DIST xf86-input-wacom-0.10.0.tar.bz2 314449 RMD160 26e7d7cfbd91170cca22d7a5a8369cf449d15938 SHA1 e05f53485ebaad51be9784fbc022ce819362271f SHA256 8f7f5af2ce6350a3b8f54368dd67b78e303881f738d3169f67869e297d431018
 DIST xf86-input-wacom-0.10.1.tar.bz2 328350 RMD160 525b702bda0868e169fbdd43dfbbc5f7c81c946a SHA1 106f7fcf9e4255b5b3efa29bccc8ed94d42cfb2d SHA256 51f45328f3b2973afba28b495b61fd04c8560aa1337588b9034e80147e891aac
 DIST xf86-input-wacom-0.10.2.tar.bz2 331661 RMD160 b39adeedba8b0eb77afaf1679e45f5107d40932c SHA1 38301644c37ad6e99638615390c443420fdac70b SHA256 96b8ef6810ce19ed9d993eef4a84e0545f270ec6c1bddd147ee1ec1fb252fd93
 EBUILD xf86-input-wacom-0.10.0.ebuild 700 RMD160 7b1ef6e6cc176d47b8904fd5a3e6fb59bc196bb3 SHA1 16c0fe8176f5c528e0cf47d051ab04ebea6acdb5 SHA256 66f644a0ac2a1b3bf86eb8ca2f6b573af3d57c7ca4fb51548bb06d2734bc5f14
 EBUILD xf86-input-wacom-0.10.1.ebuild 1388 RMD160 ac1a0853cc60810e6c30e9401d69b6c6cbb1421e SHA1 f3df94018a27adddf31b182f2c44bee78e0eba2e SHA256 ba80fc513e8624963b951535bebf925981c085fdfdc4f2499a1b82720fbff957
+EBUILD xf86-input-wacom-0.10.2-r1.ebuild 1489 RMD160 a5bba1a45e4e4cb60e27afd5191eab3e42b96fbe SHA1 9880c44b028a0ced2fc1fa21f0d120c69a0dee69 SHA256 93481d7c1960653bdd9ff51c453eb207cbef4d2691b17f2e5f4d14bc3b531fcd
 EBUILD xf86-input-wacom-0.10.2.ebuild 1388 RMD160 dcb487e5b52e2b11c81cb17621f9b30e375df7cb SHA1 040c901c8ecee6b32ba303d1c4c4cc59cf4524bd SHA256 edb3d2652abc12c3a2fb3f78a05177b113d8991aabd1876ed9adcc31e915ee74
-MISC ChangeLog 1164 RMD160 9baa7bd9791347ac3f5576741453f661bc29b246 SHA1 3d29953414bf4a84b7b54b4bca62a68d87c6d0eb SHA256 15226c844f2e42f14afe9f05a2539a97253c7d371948960a93f186f9abda7356
+MISC ChangeLog 1381 RMD160 bff5a2835f4d156334c182715118739e44df0105 SHA1 241bb7a1b5cb00e3fa18ea3857ddba9e124f52af SHA256 1e8f05d73af4b6c1698b85a46a039dfb73c37785648a54e831a5aa25d05f3084
 MISC metadata.xml 463 RMD160 ea957ebc67ed3a8f547fe3d7b107f9701774d10d SHA1 caad3bca0f0ce0e4268f54afe46d92844e649521 SHA256 58f9dfab03bab19b4e72dc6aff968a1fe881c04cefce077c19469cf7a9390a5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksU5KsACgkQu7rWomwgFXoSDACfacmxI2b1JS+1D75UEkqrx+7d
-T1IAoI3bmFpOH7yRrrD1U0gls1Aid24r
-=dxnL
+iEYEARECAAYFAksW05YACgkQu7rWomwgFXp/4QCgs71qe6kUMIa737KCiUiW5vEU
+UIwAoKRZ7xCwxeX8qQIB4ltyxMEJ8Znf
+=XLtI
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-wacom/files/0.10.2-wheel-buttons.patch b/x11-drivers/xf86-input-wacom/files/0.10.2-wheel-buttons.patch
new file mode 100644
index 000000000000..2e9dba6a0b81
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/files/0.10.2-wheel-buttons.patch
@@ -0,0 +1,13 @@
+diff --git a/src/wcmCommon.c b/src/wcmCommon.c
+index e197973..ea3c937 100644
+--- a/src/wcmCommon.c
++++ b/src/wcmCommon.c
+@@ -616,6 +616,7 @@ static void sendWheelStripEvents(LocalDevicePtr local, const WacomDeviceState* d
+ 
+ 	switch (fakeButton & AC_TYPE)
+ 	{
++	    case 0: /* no spec. action defined */
+ 	    case AC_BUTTON:
+ 		/* send both button on/off in the same event for pad */	
+ 		xf86PostButtonEvent(local->dev, is_absolute, fakeButton & AC_CODE,
+
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..4fce17382fb6
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.2-r1.ebuild
@@ -0,0 +1,58 @@
+# 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-wacom/xf86-input-wacom-0.10.2-r1.ebuild,v 1.1 2009/12/02 20:52:21 ikelos Exp $
+
+EAPI="2"
+
+inherit linux-info x-modular eutils
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://anongit.freedesktop.org/~whot/xf86-input-wacom"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="http://people.freedesktop.org/~whot/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="hal debug"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable debug)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/0.10.2-wheel-buttons.patch"
+	x-modular_src_prepare
+}
+
+src_install() {
+	x-modular_src_install
+
+	if use hal; then
+		insinto /usr/share/hal/fdi/policy/10osvendor
+		newins "${S}"/fdi/wacom.fdi 11-x11-wacom.fdi
+	fi
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	if ! linux_chkconfig_present TABLET_USB_WACOM \
+	|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}