Include masked linuxwacom for testing to work with 2.6.24.

Package-Manager: portage-2.1.4.3

6 files changed, 605 insertions, 5 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index ec9a5c2e491a..73fdafe943c6 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.18 2008/02/08 21:49:01 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.19 2008/02/12 22:29:19 ikelos Exp $
+
+*linuxwacom-0.7.9_p7 (12 Feb 2008)
+
+  12 Feb 2008; Mike Auty <ikelos@gentoo.org>
+  +files/linuxwacom-0.7.9-2.6.24.patch,
+  +files/linuxwacom-0.7.9-no-tcl.patch, +linuxwacom-0.7.9_p7.ebuild:
+  Include masked linuxwacom for testing to work with 2.6.24.
 
 *linuxwacom-0.7.8_p3-r1 (08 Feb 2008)
 
diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
index a610527ec6d7..219a383e05f2 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX check_driver 499 RMD160 298507626fa8bb20df0d5d1404002133ef1e4c41 SHA1 12ae37807a03f36be2c5cc47e444475677b41693 SHA256 45331d948e1d37141a56258510d6ff708092f70181e83348eb66eef005878069
 AUX check_driver.1 750 RMD160 9ebe8e30ce2cb83ca3245ba29d19b06e81181651 SHA1 4d6fba491df26709b821184f9e011568eaaaebde SHA256 67bf1469f122830d9e99cbd8762e61f682c9a831577fde29af8ef1ab0440d024
 AUX linuxwacom-0.7.8-pDev.patch 483 RMD160 baae89684fe5abe060ffa358dc21fb48e18c7ab3 SHA1 d2e548febac0cfef42d5021f77bb51cb44842e6a SHA256 207516fdce407efc8d635b143a2774dd9ebbe53565e32e55af6e4a2f22f810dd
+AUX linuxwacom-0.7.9-2.6.24.patch 13654 RMD160 e7eb54c5b41c5b27ba6a3660ea4ea425ea505282 SHA1 4732928f6b053b5fec3a73da6d1bb5b640abb4df SHA256 54390023d9d40fc3702f4a9fc663d078bdf9c03d83a48a547cc5ff32f6a84a34
+AUX linuxwacom-0.7.9-no-tcl.patch 806 RMD160 9c2383f29efbede7cb03f6184acb9f2af4c99988 SHA1 9d30585feaf32d5219cc1d8dfb7dffa13b4c7b97 SHA256 37845a98a9898b8b21287bdf0d4f858fbcb865e1a08ca785bebba38a3c1c2e53
 AUX linuxwacom-xorg71.diff 274 RMD160 8c319899ac3f1d9a93d411eb8916bc01da9053ef SHA1 4c3551801e15875efc5d683889fb2323a49b5ec6 SHA256 616deaca0510ffa181b8f6bdf2a8f2d9704a53d9a1c14c5807bcf71836dc4f1c
 AUX xserver-xorg-input-wacom.udev 5716 RMD160 60d36d0bf0e4acf8d5caea34d76db74d8a946d8d SHA1 45f406b7c917a1e8af9994743d4b0626f5f6beb5 SHA256 226805c56b56e4141c33f105204c347b2b68eb6590dc9b5d59c043f49279feb1
 DIST linuxwacom-0.7.4-3.tar.bz2 866312 RMD160 789789803a31eb5b9ff1d35ef760d7d11b5c24dc SHA1 c346485cdaf2bde7ee9d965aca231a4dd55f303e SHA256 0f99153ba1669255e08dd7a730cf33d9766dde43f5b56ec97e6bc8ec63b60260
 DIST linuxwacom-0.7.8-3.tar.bz2 1002452 RMD160 5b6b614dfd2b3de562457676013b4972de1bfa81 SHA1 6bd3d6aa0a4d43a9ea6d1da02c720aa7e694da6a SHA256 ac6a3ab94cf4b306e5823eca33fe84f9b4e8c743201e220a17a3ec4fe3bd3cac
-EBUILD linuxwacom-0.7.4_p3.ebuild 1392 RMD160 321a509fcabb52f220bd584372b7d3cea4594164 SHA1 da76d496bcbd721d71aac40eb03e3c82eff61a6d SHA256 758483d58ad3cfbbb4def09bd30ac0317b4dd7844b2d2edea95f4086b77d99e6
+DIST linuxwacom-0.7.9-7.tar.bz2 1018969 RMD160 9cf202d1ed8f515b5da1c4a16d371775e479bad2 SHA1 a5f7f15e721e9fc327737bcd24b84e3883a9146f SHA256 556b3dca70cbfd2ddf3811532114cb79cb803a952f6f485eea2e83752a9d46e3
+EBUILD linuxwacom-0.7.4_p3.ebuild 1395 RMD160 5b9cb183832cb3f54f9e8695a788be3cd3e9da31 SHA1 2d8d5861c8fc6b44f383986455fe3dd85be8e984 SHA256 28d6ded52fd4ac677095496fa8e029f2b211ccbaff183138a329a3739b28462c
 EBUILD linuxwacom-0.7.8_p3-r1.ebuild 1849 RMD160 fd2131733188e1cb409111dfc29540c03ad4172a SHA1 89b78f981ec829e6845135acab4878e48f1fda1f SHA256 d0d71f0e7fc430e770787ba85620b27554cd24c8c98ffe2adab125232d5b4052
 EBUILD linuxwacom-0.7.8_p3.ebuild 1578 RMD160 f25408e9b94c4951300540b82a596049c68b51a2 SHA1 8a67254c9d432e34a80a02d0631fd2274a5c5def SHA256 c2432c827538a2314987806a3ee4fc796e1aea745991df72b4a353c54e792646
-MISC ChangeLog 10052 RMD160 7826cf62e6bd6ab7c6337949f601b8d7fbe83209 SHA1 f5ff345c61ce13a5298e861f0deda1fba31db5ba SHA256 709643cd07cdbb3fbaf96c88effe0b4705103c2047a634afcf336b940b426e1f
+EBUILD linuxwacom-0.7.9_p7.ebuild 3141 RMD160 c7777caee95d5ab234fd0bdfe515e83f0c10fc3c SHA1 5d80003954efcb014b39a99e584617d7f44b33e2 SHA256 fde84fc23a8df37074072399492b48158e63e2361393e31e3bd756621d04acaa
+MISC ChangeLog 10307 RMD160 9725c44ca3c3ef16da3e145636c69711c0b8f501 SHA1 8e15013f1a5e284137e0b86131276eddbf3508d0 SHA256 3ad2d17b723187cacf0663e3faee8a432427be2ac68a2ed97ea328b2cf08a3e3
 MISC metadata.xml 465 RMD160 0ae8d1818fe7ed1efc78dc18ffd5717aecaebb30 SHA1 328430eab5579d773f8f59a61ce4b7a1b4ad2e73 SHA256 18e26262c4dc919d217a3bedd296dc6d1d2ac2a90338368fa3131c27464f439e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHsh3Mu7rWomwgFXoRArV7AKCOqsIHsy1HXOpD/Zmcqfpp5Lqk1QCeItyC
+Yrn5+qVvC9Ubi3mHPzqtcPU=
+=kQj+
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.7.9-2.6.24.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.7.9-2.6.24.patch
new file mode 100644
index 000000000000..001f6c43b717
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/linuxwacom-0.7.9-2.6.24.patch
@@ -0,0 +1,439 @@
+From: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
+Date: Sat, 26 Jan 2008 21:40:43 +0000 (+0100)
+Subject: Support for 2.6.24 linux kernel
+X-Git-Url: http://git.debian.org/?p=collab-maint%2Flinux-wacom.git;a=commitdiff_plain;h=840c30dbf4207c1d702b9e8dfbce56eb1406e483;hp=4276619580732a8a9d51386af612920bd7ba19bc
+
+Support for 2.6.24 linux kernel
+---
+
+diff --git a/configure.in b/configure.in
+index 51ea19e..c3edcd2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -175,7 +175,8 @@ else
+ 						16|17) WCM_KERNEL_VER="2.6.16";;
+ 						18) WCM_KERNEL_VER="2.6.18";;
+ 						19|20|21) WCM_KERNEL_VER="2.6.19";;
+-						*) WCM_KERNEL_VER="2.6.22";;
++						22|23) WCM_KERNEL_VER="2.6.22";;
++						*) WCM_KERNEL_VER="2.6.24";;
+ 					esac
+ 				else
+ 					AC_MSG_WARN([support for kernels older than 2.6.8 has been dropped after 0.7.4])
+@@ -858,6 +859,7 @@ AC_OUTPUT(Makefile
+ 	src/2.6.18/Makefile
+ 	src/2.6.19/Makefile
+ 	src/2.6.22/Makefile
++	src/2.6.24/Makefile
+ 	src/wacomxi/Makefile
+ 	src/wacomxi/wacomcpl)
+ 
+diff --git a/src/2.6.24/.gitignore b/src/2.6.24/.gitignore
+new file mode 100644
+index 0000000..a2409d1
+--- /dev/null
++++ b/src/2.6.24/.gitignore
+@@ -0,0 +1,4 @@
++# Lines starting with '#' are considered comments.
++# Ignore files that are copied from other directories
++/wacom_wac.[ch]
++/wacom.h
+diff --git a/src/2.6.24/Makefile.in b/src/2.6.24/Makefile.in
+new file mode 100644
+index 0000000..7dbd0c3
+--- /dev/null
++++ b/src/2.6.24/Makefile.in
+@@ -0,0 +1,45 @@
++############################ 2.6 kernel compile ###############################
++ifneq ($(KERNELRELEASE),)
++# We were called by kbuild
++# Do NOT indent stuff in this part! It has to be like this to make the
++# $(error ... ) stuff work
++
++ifeq ($(WCM_OPTION_WACOM),yes)
++ifneq ($(CONFIG_USB_WACOM),y)
++wacom-objs := wacom_wac.o wacom_sys.o
++obj-m += wacom.o
++else
++$(error You requested to build wacom with configure, but wacom is configured as built-in in your kernel config)
++endif # CONFIG_USB_WACOM
++endif # WCM_OPTION_WACOM
++
++else  # We were called from command line
++PWD  := $(shell pwd)
++
++WCM_KERNEL_DIR := @WCM_KERNEL_DIR@
++WCM_OPTION_WACOM := @WCM_OPTION_WACOM@
++
++export WCM_OPTION_WACOM 
++
++all:
++# Copy Wacom specific code which is common to all kernel releases
++ifeq ($(WCM_OPTION_WACOM),yes)
++	cp -f ../2.6.19/wacom_wac.c .
++	cp -f ../2.6.19/wacom.h .
++	cp -f ../2.6.22/wacom_wac.h .
++endif 
++	@echo '    Building linuxwacom drivers for 2.6 kernel.'
++	@echo '***Note: Drivers not enabled as modules in your kernel config but requested through configure are NOT built'
++	$(MAKE) -C $(WCM_KERNEL_DIR) M=$(PWD)
++
++endif  # End kbuild check
++
++######################### Version independent targets ##########################
++
++clean:
++	rm -rf *.o *.ko *.mod.* .[a-z]* core *.i
++
++EMPTY_AUTOMAKE_TARGETS = distdir install install-data install-exec uninstall install-info
++EMPTY_AUTOMAKE_TARGETS += installdirs check dvi pdf ps info html tags ctags mostlyclean distclean maintainer-clean
++.PHONY: $(EMPTY_AUTOMAKE_TARGETS)
++	$(EMPTY_AUTOMAKE_TARGETS):
+diff --git a/src/2.6.24/wacom_sys.c b/src/2.6.24/wacom_sys.c
+new file mode 100644
+index 0000000..41caaef
+--- /dev/null
++++ b/src/2.6.24/wacom_sys.c
+@@ -0,0 +1,342 @@
++/*
++ * drivers/input/tablet/wacom_sys.c
++ *
++ *  USB Wacom Graphire and Wacom Intuos tablet support - system specific code
++ */
++
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include "wacom.h"
++#include "wacom_wac.h"
++
++#define USB_REQ_GET_REPORT	0x01
++#define USB_REQ_SET_REPORT	0x09
++
++static int usb_get_report(struct usb_interface *intf, unsigned char type,
++				unsigned char id, void *buf, int size)
++{
++	return usb_control_msg(interface_to_usbdev(intf),
++		usb_rcvctrlpipe(interface_to_usbdev(intf), 0),
++		USB_REQ_GET_REPORT, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
++		(type << 8) + id, intf->altsetting[0].desc.bInterfaceNumber,
++		buf, size, 100);
++}
++
++static int usb_set_report(struct usb_interface *intf, unsigned char type,
++				unsigned char id, void *buf, int size)
++{
++	return usb_control_msg(interface_to_usbdev(intf),
++		usb_sndctrlpipe(interface_to_usbdev(intf), 0),
++                USB_REQ_SET_REPORT, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
++                (type << 8) + id, intf->altsetting[0].desc.bInterfaceNumber,
++		buf, size, 1000);
++}
++
++static struct input_dev * get_input_dev(struct wacom_combo *wcombo)
++{
++	return wcombo->wacom->dev;
++}
++
++static void wacom_sys_irq(struct urb *urb)
++{
++	struct wacom *wacom = urb->context;
++	struct wacom_combo wcombo;
++	int retval;
++
++	switch (urb->status) {
++	case 0:
++		/* success */
++		break;
++	case -ECONNRESET:
++	case -ENOENT:
++	case -ESHUTDOWN:
++		/* this urb is terminated, clean up */
++		dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
++		return;
++	default:
++		dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
++		goto exit;
++	}
++
++	wcombo.wacom = wacom;
++	wcombo.urb = urb;
++
++	if (wacom_wac_irq(wacom->wacom_wac, (void *)&wcombo))
++		input_sync(get_input_dev(&wcombo));
++
++ exit:
++	retval = usb_submit_urb (urb, GFP_ATOMIC);
++	if (retval)
++		err ("%s - usb_submit_urb failed with result %d",
++		     __FUNCTION__, retval);
++}
++
++void wacom_report_key(void *wcombo, unsigned int key_type, int key_data)
++{
++	input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data);
++	return;
++}
++
++void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data)
++{
++	input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data);
++	return;
++}
++
++void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data)
++{
++	input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data);
++	return;
++}
++
++void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value)
++{
++	input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value);
++	return;
++}
++
++__u16 wacom_be16_to_cpu(unsigned char *data)
++{
++	__u16 value;
++	value = be16_to_cpu(*(__be16 *) data);
++	return value;
++}
++
++__u16 wacom_le16_to_cpu(unsigned char *data)
++{
++	__u16 value;
++	value = le16_to_cpu(*(__le16 *) data);
++	return value;
++}
++
++void wacom_input_sync(void *wcombo)
++{
++	input_sync(get_input_dev((struct wacom_combo *)wcombo));
++	return;
++}
++
++static int wacom_open(struct input_dev *dev)
++{
++	struct wacom *wacom = input_get_drvdata(dev);
++
++	wacom->irq->dev = wacom->usbdev;
++	if (usb_submit_urb(wacom->irq, GFP_KERNEL))
++		return -EIO;
++
++	return 0;
++}
++
++static void wacom_close(struct input_dev *dev)
++{
++	struct wacom *wacom = input_get_drvdata(dev);
++
++	usb_kill_urb(wacom->irq);
++}
++
++void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_1) |
++		BIT_MASK(BTN_5);
++	input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
++}
++
++void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->evbit[0] |= BIT_MASK(EV_MSC);
++	input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
++		BIT_MASK(BTN_4);
++}
++
++void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->evbit[0] |= BIT_MASK(EV_REL);
++	input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
++		BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
++		BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);
++	input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
++}
++
++void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
++		BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
++	input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
++	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
++}
++
++void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_4) |
++		BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7);
++	input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
++}
++
++void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
++}
++
++void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);
++	input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);
++	input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);
++	input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_LEFT) |
++		BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |
++		BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |
++		BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) |
++		BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) |
++		BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2);
++	input_set_abs_params(input_dev, ABS_DISTANCE, 0, wacom_wac->features->distance_max, 0, 0);
++	input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0);
++	input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0);
++	input_set_abs_params(input_dev, ABS_TILT_Y, 0, 127, 0, 0);
++	input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);
++	input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0, 0);
++}
++
++void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_STYLUS2) |
++		BIT_MASK(BTN_TOOL_RUBBER);
++}
++
++void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
++{
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER);
++}
++
++static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *id)
++{
++	struct usb_device *dev = interface_to_usbdev(intf);
++	struct usb_endpoint_descriptor *endpoint;
++	struct wacom *wacom;
++	struct wacom_wac *wacom_wac;
++	struct input_dev *input_dev;
++	int error = -ENOMEM;
++	char rep_data[2], limit = 0;
++
++	wacom = kzalloc(sizeof(struct wacom), GFP_KERNEL);
++	wacom_wac = kzalloc(sizeof(struct wacom_wac), GFP_KERNEL);
++	input_dev = input_allocate_device();
++	if (!wacom || !input_dev || !wacom_wac)
++		goto fail1;
++
++	wacom_wac->data = usb_buffer_alloc(dev, 10, GFP_KERNEL, &wacom->data_dma);
++	if (!wacom_wac->data)
++		goto fail1;
++
++	wacom->irq = usb_alloc_urb(0, GFP_KERNEL);
++	if (!wacom->irq)
++		goto fail2;
++
++	wacom->usbdev = dev;
++	wacom->dev = input_dev;
++	usb_make_path(dev, wacom->phys, sizeof(wacom->phys));
++	strlcat(wacom->phys, "/input0", sizeof(wacom->phys));
++
++	wacom_wac->features = get_wacom_feature(id);
++	BUG_ON(wacom_wac->features->pktlen > 10);
++
++	input_dev->name = wacom_wac->features->name;
++	wacom->wacom_wac = wacom_wac;
++	usb_to_input_id(dev, &input_dev->id);
++
++	input_dev->dev.parent = &intf->dev;
++
++	input_set_drvdata(input_dev, wacom);
++
++	input_dev->open = wacom_open;
++	input_dev->close = wacom_close;
++
++	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
++	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |
++		BIT_MASK(BTN_TOUCH) | BIT_MASK(BTN_STYLUS);
++	input_set_abs_params(input_dev, ABS_X, 0, wacom_wac->features->x_max, 4, 0);
++	input_set_abs_params(input_dev, ABS_Y, 0, wacom_wac->features->y_max, 4, 0);
++	input_set_abs_params(input_dev, ABS_PRESSURE, 0, wacom_wac->features->pressure_max, 0, 0);
++	input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
++
++	wacom_init_input_dev(input_dev, wacom_wac);
++
++	endpoint = &intf->cur_altsetting->endpoint[0].desc;
++
++	usb_fill_int_urb(wacom->irq, dev,
++			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),
++			 wacom_wac->data, wacom_wac->features->pktlen,
++			 wacom_sys_irq, wacom, endpoint->bInterval);
++	wacom->irq->transfer_dma = wacom->data_dma;
++	wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
++
++	error = input_register_device(wacom->dev);
++	if (error)
++		goto fail3;
++
++	/* Ask the tablet to report tablet data. Repeat until it succeeds */
++	do {
++		rep_data[0] = 2;
++		rep_data[1] = 2;
++		usb_set_report(intf, 3, 2, rep_data, 2);
++		usb_get_report(intf, 3, 2, rep_data, 2);
++	} while (rep_data[1] != 2 && limit++ < 5);
++
++	usb_set_intfdata(intf, wacom);
++	return 0;
++
++ fail3:	usb_free_urb(wacom->irq);
++ fail2:	usb_buffer_free(dev, 10, wacom_wac->data, wacom->data_dma);
++ fail1:	input_free_device(input_dev);
++	kfree(wacom);
++	kfree(wacom_wac);
++	return error;
++}
++
++static void wacom_disconnect(struct usb_interface *intf)
++{
++	struct wacom *wacom = usb_get_intfdata (intf);
++
++	usb_set_intfdata(intf, NULL);
++	if (wacom) {
++		usb_kill_urb(wacom->irq);
++		input_unregister_device(wacom->dev);
++		usb_free_urb(wacom->irq);
++		usb_buffer_free(interface_to_usbdev(intf), 10, wacom->wacom_wac->data, wacom->data_dma);
++		kfree(wacom->wacom_wac);
++		kfree(wacom);
++	}
++}
++
++static struct usb_driver wacom_driver = {
++	.name =		"wacom",
++	.probe =	wacom_probe,
++	.disconnect =	wacom_disconnect,
++};
++
++static int __init wacom_init(void)
++{
++	int result;
++	wacom_driver.id_table = get_device_table();
++	result = usb_register(&wacom_driver);
++	if (result == 0)
++		info(DRIVER_VERSION ":" DRIVER_DESC);
++	return result;
++}
++
++static void __exit wacom_exit(void)
++{
++	usb_deregister(&wacom_driver);
++}
++
++module_init(wacom_init);
++module_exit(wacom_exit);
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.7.9-no-tcl.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.7.9-no-tcl.patch
new file mode 100644
index 000000000000..c338a8af5f64
--- /dev/null
+++ b/x11-drivers/linuxwacom/files/linuxwacom-0.7.9-no-tcl.patch
@@ -0,0 +1,19 @@
+X-Git-Url: http://git.debian.org/?p=collab-maint%2Flinux-wacom.git;a=blobdiff_plain;f=configure.in;fp=configure.in;h=51ea19e45bf614cfb754864b28419fd551941ad4;hp=1534c84559d045a9e026fa23391995f59c4bcef6;hb=4276619580732a8a9d51386af612920bd7ba19bc;hpb=ad6caef3a2c498ca993e1e36719748f0a54cac40
+
+diff --git a/configure.in b/configure.in
+index 1534c84..51ea19e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -619,11 +619,10 @@ if test "$enable_libwacomxi" != no; then
+ 		WCM_TCLLIBS="libwacomxi.la"
+ 		WCM_TCLPKGS="pkgIndex.tcl"
+ 	fi
+-	AM_CONDITIONAL(WACOMXI_INSTALL, true)
+ else
+ 	AC_MSG_RESULT(no)
+-	AM_CONDITIONAL(WACOMXI_INSTALL, false)
+ fi
++AM_CONDITIONAL(WACOMXI_INSTALL, [test "$WCM_OPTION_LIBWACOMXI" = yes] )
+ 
+ dnl =======================================================
+ dnl Check for wacdump build
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
index a4891b0e2472..c68fdc794e98 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.10 2007/12/30 16:09:28 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.11 2008/02/12 22:29:19 ikelos Exp $
 
 IUSE="gtk tcl tk usb"
 
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild
new file mode 100644
index 000000000000..bd5745cea23f
--- /dev/null
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.9_p7.ebuild,v 1.1 2008/02/12 22:29:19 ikelos Exp $
+
+inherit eutils autotools toolchain-funcs linux-mod
+
+DESCRIPTION="Input driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2"
+
+IUSE="gtk tcl tk usb module"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="|| ( ( x11-proto/inputproto
+		x11-base/xorg-server )
+		  virtual/x11 )
+	media-libs/libpixman
+	gtk? ( >=x11-libs/gtk+-2 )
+	tcl? ( dev-lang/tcl )
+	tk?  ( dev-lang/tk )
+	sys-fs/udev
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
+S=${WORKDIR}/${P/_p/-}
+
+MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
+
+wacom_check() {
+	if use module ; then
+		ebegin "Checking for wacom module"
+		linux_chkconfig_module TABLET_USB_WACOM
+		eend $?
+
+		if [[ $? -ne 0 ]] || ! [ -f "/lib/modules/${KV}/kernel/drivers/input/tablet/wacom.ko" ]; then
+			eerror "You need to have your kernel compiled with wacom as a module"
+			eerror "to let linuxwacom overwrite it."
+			eerror "Enable it in the kernel, found at:"
+			eerror
+			eerror " Device Drivers"
+			eerror "     USB support"
+			eerror "           <M> Wacom Intuos/Graphire tablet support"
+			eerror
+			eerror "(in the same page is suggested to include as modules also:"
+			eerror "EHCI , OHCI , USB Human Interface Device+HID input layer)"
+			eerror
+			eerror "Then recompile kernel. Otherwise, remove the module USE flag."
+			die "Wacom not compiled in kernel as a module!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	# echo "kernel version is ${KV} , name is ${KV%%-*}"
+	wacom_check
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix multilib-strict error for Tcl/Tk library install
+	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
+
+	# Remove warning parameters for gcc < 4, bug 205139
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
+	fi
+
+	epatch "${FILESDIR}"/${P%_p*}-no-tcl.patch
+	epatch "${FILESDIR}"/${P%_p*}-2.6.24.patch
+	eautoreconf
+}
+
+src_compile() {
+	if use gtk; then
+		myconf="--with-gtk=2.0"
+	else
+		myconf="--with-gtk=no"
+	fi
+
+	if use module; then
+		myconf="${myconf} --enable-wacom"
+		myconf="${myconf} --with-kernel=${KV_OUT_DIR}"
+	fi
+
+	econf ${myconf} \
+		$(use_with tcl tcl) \
+		$(use_with tk tk) \
+		--enable-wacomdrv --enable-wacdump \
+		--enable-xsetwacom --enable-dlloader || die "econf failed"
+
+	unset ARCH
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+
+	# Inelegant attempt to work around a nasty build system
+	if use module; then
+		cp "${S}"/src/*/wacom.{o,ko} "${S}"/src/
+		linux-mod_src_install
+	fi
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/xserver-xorg-input-wacom.udev 60-wacom.rules
+
+	exeinto /lib/udev/
+	doexe "${FILESDIR}"/check_driver
+	doman "${FILESDIR}"/check_driver.1
+
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}