Fix up udev rules, and bump linuxwacom to 0.8.3 with HAL support. Also, remove all the old ebuilds older than the latest stable.

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

9 files changed, 118 insertions, 382 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index 379589df75f4..8c1eb6f9cb0a 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.33 2009/04/16 06:08:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.34 2009/04/18 17:43:52 ikelos Exp $
+
+*linuxwacom-0.8.3_p2 (18 Apr 2009)
+
+  18 Apr 2009; Mike Auty <ikelos@gentoo.org>
+  -files/linuxwacom-0.7.8-pDev.patch,
+  -files/linuxwacom-0.8.0-xserver-xorg-input-wacom.udev,
+  files/linuxwacom-0.8.2-xserver-xorg-input-wacom.udev,
+  -files/xserver-xorg-input-wacom.udev, -linuxwacom-0.7.8_p3.ebuild,
+  -linuxwacom-0.7.8_p3-r2.ebuild, -linuxwacom-0.8.0_p3-r1.ebuild,
+  +linuxwacom-0.8.3_p2.ebuild:
+  Fix up udev rules, and bump linuxwacom to 0.8.3 with HAL support.
 
   16 Apr 2009; Jeroen Roovers <jer@gentoo.org> linuxwacom-0.8.2_p2.ebuild:
   Marked ~hppa too.
diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
index fb861ab2b6c4..1e53c6568a09 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -1,18 +1,22 @@
+-----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.8.0-xserver-xorg-input-wacom.udev 6662 RMD160 d6fc525412368c8a57165f0e938863fa85e8b331 SHA1 8c81b406d8bc2cbb818035d96d9563b49358e24f SHA256 d33255d15a991167ac21930606bb32e6818afbdf46de360e6a3fe0f52fbc70c0
 AUX linuxwacom-0.8.2-kernel-2.6.29.patch 450 RMD160 bee26069381eef22d4b5c01febe6c90f552ac826 SHA1 43fca4143f002a724bc64a09d45fd9bb589b29a1 SHA256 b695e990b72897a4f56e5f29c3e1a76022b69a99fddd00287d30bf488567f6e9
-AUX linuxwacom-0.8.2-xserver-xorg-input-wacom.udev 6662 RMD160 d6fc525412368c8a57165f0e938863fa85e8b331 SHA1 8c81b406d8bc2cbb818035d96d9563b49358e24f SHA256 d33255d15a991167ac21930606bb32e6818afbdf46de360e6a3fe0f52fbc70c0
-AUX xserver-xorg-input-wacom.udev 5716 RMD160 60d36d0bf0e4acf8d5caea34d76db74d8a946d8d SHA1 45f406b7c917a1e8af9994743d4b0626f5f6beb5 SHA256 226805c56b56e4141c33f105204c347b2b68eb6590dc9b5d59c043f49279feb1
-DIST linuxwacom-0.7.8-3.tar.bz2 1002452 RMD160 5b6b614dfd2b3de562457676013b4972de1bfa81 SHA1 6bd3d6aa0a4d43a9ea6d1da02c720aa7e694da6a SHA256 ac6a3ab94cf4b306e5823eca33fe84f9b4e8c743201e220a17a3ec4fe3bd3cac
-DIST linuxwacom-0.8.0-3.tar.bz2 977383 RMD160 af084f82d852ee8c94cb9fe7f5c67238d66698b1 SHA1 17a6e10fc7f8f220de03b63d18c65bc1f5a224d2 SHA256 1bb10ec8a8537859874e239c2b7fa07fbfe599b056678afd9dbcc0fd47c43396
+AUX linuxwacom-0.8.2-xserver-xorg-input-wacom.udev 7329 RMD160 70f9752e2e0bc162316923b105bf93e0e6c18bb7 SHA1 23712146a2906e69c07ec1fe64ba86124da6b064 SHA256 cf2a86d752a657f8213ba22f0064d2843b10ab1dac7cc94091d65b1165e9950a
 DIST linuxwacom-0.8.2-2.tar.bz2 1098067 RMD160 850ef22abf12e21d69e299b55a2114502fb20d49 SHA1 b1fd2bb816bc766cc52c36cf9e93607cd85e511c SHA256 1d3b8dc397510309b14239291781135af0c4fab99907d8e0b8aad95465390733
 DIST linuxwacom-0.8.2.tar.bz2 1092825 RMD160 2485eea1a3f0d5f50de6a3b7286d39b81ad553c4 SHA1 96ba8783b9756bc8ac418c62faafacf28841e212 SHA256 5f3096d7194940ca583be8b63b59bb75001d01f1a4a75c1807c8f01cf697dfb5
-EBUILD linuxwacom-0.7.8_p3-r2.ebuild 1799 RMD160 2504ff7b547beaa32f7fa15bfe33061d20bca050 SHA1 8ae2193abd24447d9616287f8575c023387d25fa SHA256 80d343c6c5267a0239e0afc57c60b151d815c24b2d8cee7ed265a2966b27f126
-EBUILD linuxwacom-0.7.8_p3.ebuild 1546 RMD160 b210736f0026e4512d767724dc74a062d45b017d SHA1 6eeee50fbe3e0f2b5158800f89ef4dc8337a87b5 SHA256 2e8746c1be31637d905332a0d06f70a0af472aa9f5052d7c23870420b837b23d
-EBUILD linuxwacom-0.8.0_p3-r1.ebuild 3128 RMD160 ba6178ad97c2bf954b2a0eabcfa4dcb811753c29 SHA1 136b76a890c2f957a481c92fd7079606185f967b SHA256 a8e0c66ba65687efc2744b7d104640c00a67b09939c06385151b5c6848b7d60e
+DIST linuxwacom-0.8.3-2.tar.bz2 1147631 RMD160 99b02579a75a129cd5003d95fe229f7c102ec498 SHA1 5b528f7d1d18ea73d8a4983c7778f3d6a5968e7e SHA256 c38300cb5bca30ecdaac829c7a27be94eedb5ab97cc8f56b34d1bb0e64537c04
 EBUILD linuxwacom-0.8.2.ebuild 3089 RMD160 f8cdc305da2317b7a618647e71e6c593522a16c1 SHA1 602e5cd220faea07e1b62d5d619c36088a44e400 SHA256 716ce1bf513a060baaee6b20ae35a08c515a8e612f4289ed2150dd272a93709f
 EBUILD linuxwacom-0.8.2_p2.ebuild 3154 RMD160 5ca36fa0315899e05b122a9fdfb405de45dab22a SHA1 06f85a8baee9875fe815153913ef78251112b104 SHA256 79bbfbd66ea38d0e434643ff7523691abed2cdb7c141bfa84b0664b2eca0bc38
-MISC ChangeLog 12725 RMD160 d7561cc2f024716af9a898f4a711c0ab8ffa3391 SHA1 d177f1de0509666ce11b7af8e9b7a6c10506839c SHA256 369e3a226a336a209cbf4259080d04906ee4a36b240f9bcb3035781d30f45410
+EBUILD linuxwacom-0.8.3_p2.ebuild 3112 RMD160 8d885e6ce4a9b22ba93fbf5d945f533d61ac16d1 SHA1 81be021517ecdc4968f63d37087532561951e803 SHA256 58a8c6bf95b9422a9e519c5ceae8c598abc6c52bbcddd9cb9156d7de24935a80
+MISC ChangeLog 13195 RMD160 e177a797abb706652edb0ed64cdca351cc12bc09 SHA1 dd2998943fbd4f8b8dc47cf927311c27673c94aa SHA256 3fc5fe247f5b43d111032d6ad780a4efe133b55243a250750b3965b0c11141ae
 MISC metadata.xml 532 RMD160 bbc7a2fba8df7eb8d52f35116f79eae6d25c5441 SHA1 e69eb5e71257a9147283e1403b7b43c5e46cc26f SHA256 bd6e67fdf43736a027a9d436ab98a36f5cc5a059bdd2f5f19538666ba389a7df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknqEWgACgkQu7rWomwgFXqfxgCghizK0gDQVjr6gdcdjYdwlKNG
+I7sAn2iZsGaewOyVNG8ZDeggN/YFu4S5
+=Gl/m
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.7.8-pDev.patch b/x11-drivers/linuxwacom/files/linuxwacom-0.7.8-pDev.patch
deleted file mode 100644
index 9591e4e48902..000000000000
--- a/x11-drivers/linuxwacom/files/linuxwacom-0.7.8-pDev.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tmp-old/src/xdrv/wcmCommon.c tmp-new/src/xdrv/wcmCommon.c
---- src/xdrv/wcmCommon.c	2007-09-16 19:57:42.000000000 +0000
-+++ src/xdrv/wcmCommon.c	2007-09-16 20:39:26.000000000 +0000
-@@ -1096,7 +1096,7 @@
- #if defined WCM_XFREE86 || GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- 	if (!miPointerCurrentScreen())
- #else
--	if (!miPointerGetScreen(pDev->dev))
-+	if (!miPointerGetScreen(common->wcmDevices->local->dev))
- #endif
- 	{
- 		DBG(1, common->debugLevel, ErrorF("xf86WcmEvent: "
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.8.0-xserver-xorg-input-wacom.udev b/x11-drivers/linuxwacom/files/linuxwacom-0.8.0-xserver-xorg-input-wacom.udev
deleted file mode 100644
index 5b58a7015a82..000000000000
--- a/x11-drivers/linuxwacom/files/linuxwacom-0.8.0-xserver-xorg-input-wacom.udev
+++ /dev/null
@@ -1,79 +0,0 @@
-# udev rules for wacom tablets.
-# These rules were compiled for the Debian GNU/Linux distribution,
-# but others may, and indeed are encouraged to, use them also.
-#
-# Should you do so, PLEASE CO-ORDINATE ANY CHANGES OR ADDITIONS
-# of new devices with Ron <ron@debian.org> so that we can try
-# to present users with with a standard set of device nodes
-# which they can rely on across the board.
-
-# Convenience link for the common case of a single tablet.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", SYMLINK+="input/wacom"
-
-# You probably won't need this IMPORT rule, since an earlier file is
-# likely to have already done it, but the rule that follows it does
-# depend on that having happened to set ID_PATH.
-# IMPORT{program}="path_id %p"
-
-# Port specific link for users of multiple tablets of the same type.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ENV{ID_PATH}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-wacom"
-
-# Type-named links for multiple tablets.  If you want to use multiple
-# tablets of the _same_ type, you will probably need to use the links
-# from /dev/input/by-path to identify which is plugged into what usb
-# port.  For different types though, just pick your links from the
-# list below.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0000", SYMLINK+="input/tablet-penpartner"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", SYMLINK+="input/tablet-graphire"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", SYMLINK+="input/tablet-graphire2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", SYMLINK+="input/tablet-graphire2-5x7"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", SYMLINK+="input/tablet-graphire3"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", SYMLINK+="input/tablet-graphire3-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", SYMLINK+="input/tablet-graphire4-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", SYMLINK+="input/tablet-graphire4-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0060", SYMLINK+="input/tablet-volito"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0061", SYMLINK+="input/tablet-penstation2"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0062", SYMLINK+="input/tablet-volito2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0063", SYMLINK+="input/tablet-volito2-2x3"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0064", SYMLINK+="input/tablet-penpartner2"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0020", SYMLINK+="input/tablet-intuos-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0021", SYMLINK+="input/tablet-intuos-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0022", SYMLINK+="input/tablet-intuos-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0023", SYMLINK+="input/tablet-intuos-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0024", SYMLINK+="input/tablet-intuos-12x18"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0030", SYMLINK+="input/tablet-pl400"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0031", SYMLINK+="input/tablet-pl500"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0032", SYMLINK+="input/tablet-pl600"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0033", SYMLINK+="input/tablet-pl600sx"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0034", SYMLINK+="input/tablet-pl550"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0035", SYMLINK+="input/tablet-pl800"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0037", SYMLINK+="input/tablet-pl700"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0038", SYMLINK+="input/tablet-pl510"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0039", SYMLINK+="input/tablet-dtu710"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c0", SYMLINK+="input/tablet-dtf521"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c4", SYMLINK+="input/tablet-dtf720"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0003", SYMLINK+="input/tablet-cintiq_partner"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0041", SYMLINK+="input/tablet-intuos2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0042", SYMLINK+="input/tablet-intuos2-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0043", SYMLINK+="input/tablet-intuos2-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0044", SYMLINK+="input/tablet-intuos2-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0045", SYMLINK+="input/tablet-intuos2-12x18"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b0", SYMLINK+="input/tablet-intuos3-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b1", SYMLINK+="input/tablet-intuos3-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b2", SYMLINK+="input/tablet-intuos3-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b3", SYMLINK+="input/tablet-intuos3-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b4", SYMLINK+="input/tablet-intuos3-12x19"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b5", SYMLINK+="input/tablet-intuos3-6x11"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="003f", SYMLINK+="input/tablet-cintiq21ux"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0047", SYMLINK+="input/tablet-intuos2-6x8a"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0065", SYMLINK+="input/tablet-bamboo"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c6", SYMLINK+="input/tablet-cintiq12wx"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", SYMLINK+="input/tablet-bamboofun-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", SYMLINK+="input/tablet-bamboofun-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0069", SYMLINK+="input/tablet-bamboo1"
-
-# Check and repossess the device if a module other than the wacom one
-# is already bound to it.
-
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
-
diff --git a/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-xserver-xorg-input-wacom.udev b/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-xserver-xorg-input-wacom.udev
index 5b58a7015a82..76289220ba00 100644
--- a/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-xserver-xorg-input-wacom.udev
+++ b/x11-drivers/linuxwacom/files/linuxwacom-0.8.2-xserver-xorg-input-wacom.udev
@@ -4,76 +4,102 @@
 #
 # Should you do so, PLEASE CO-ORDINATE ANY CHANGES OR ADDITIONS
 # of new devices with Ron <ron@debian.org> so that we can try
-# to present users with with a standard set of device nodes
+# to present users with a standard set of device nodes
 # which they can rely on across the board.
 
-# Convenience link for the common case of a single tablet.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", SYMLINK+="input/wacom"
-
-# You probably won't need this IMPORT rule, since an earlier file is
-# likely to have already done it, but the rule that follows it does
-# depend on that having happened to set ID_PATH.
-# IMPORT{program}="path_id %p"
+KERNEL!="event[0-9]*", GOTO="wacom_end"
 
 # Port specific link for users of multiple tablets of the same type.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ENV{ID_PATH}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-wacom"
+# The ID_PATH variable is set by the "path_id" script in an earlier rule file.
+ATTRS{idVendor}=="056a", ENV{ID_PATH}=="?*", SYMLINK="input/by-path/$env{ID_PATH}-wacom"
+
+# Multiple interface support for stylus and touch devices.
+DRIVERS=="wacom", ATTRS{bInterfaceNumber}=="00", ENV{WACOM_TYPE}="stylus"
+DRIVERS=="wacom", ATTRS{bInterfaceNumber}=="01", ENV{WACOM_TYPE}="touch"
+
+# Convenience link for the common case of a single tablet.
+ATTRS{idVendor}=="056a", ENV{WACOM_TYPE}!="touch", SYMLINK+="input/wacom"
+ATTRS{idVendor}=="056a", ENV{WACOM_TYPE}=="touch", SYMLINK+="input/wacom-touch"
 
 # Type-named links for multiple tablets.  If you want to use multiple
 # tablets of the _same_ type, you will probably need to use the links
 # from /dev/input/by-path to identify which is plugged into what usb
-# port.  For different types though, just pick your links from the
-# list below.
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0000", SYMLINK+="input/tablet-penpartner"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", SYMLINK+="input/tablet-graphire"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", SYMLINK+="input/tablet-graphire2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", SYMLINK+="input/tablet-graphire2-5x7"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", SYMLINK+="input/tablet-graphire3"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", SYMLINK+="input/tablet-graphire3-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", SYMLINK+="input/tablet-graphire4-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", SYMLINK+="input/tablet-graphire4-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0060", SYMLINK+="input/tablet-volito"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0061", SYMLINK+="input/tablet-penstation2"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0062", SYMLINK+="input/tablet-volito2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0063", SYMLINK+="input/tablet-volito2-2x3"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0064", SYMLINK+="input/tablet-penpartner2"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0020", SYMLINK+="input/tablet-intuos-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0021", SYMLINK+="input/tablet-intuos-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0022", SYMLINK+="input/tablet-intuos-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0023", SYMLINK+="input/tablet-intuos-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0024", SYMLINK+="input/tablet-intuos-12x18"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0030", SYMLINK+="input/tablet-pl400"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0031", SYMLINK+="input/tablet-pl500"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0032", SYMLINK+="input/tablet-pl600"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0033", SYMLINK+="input/tablet-pl600sx"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0034", SYMLINK+="input/tablet-pl550"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0035", SYMLINK+="input/tablet-pl800"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0037", SYMLINK+="input/tablet-pl700"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0038", SYMLINK+="input/tablet-pl510"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0039", SYMLINK+="input/tablet-dtu710"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c0", SYMLINK+="input/tablet-dtf521"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c4", SYMLINK+="input/tablet-dtf720"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0003", SYMLINK+="input/tablet-cintiq_partner"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0041", SYMLINK+="input/tablet-intuos2-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0042", SYMLINK+="input/tablet-intuos2-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0043", SYMLINK+="input/tablet-intuos2-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0044", SYMLINK+="input/tablet-intuos2-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0045", SYMLINK+="input/tablet-intuos2-12x18"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b0", SYMLINK+="input/tablet-intuos3-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b1", SYMLINK+="input/tablet-intuos3-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b2", SYMLINK+="input/tablet-intuos3-9x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b3", SYMLINK+="input/tablet-intuos3-12x12"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b4", SYMLINK+="input/tablet-intuos3-12x19"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b5", SYMLINK+="input/tablet-intuos3-6x11"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="003f", SYMLINK+="input/tablet-cintiq21ux"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0047", SYMLINK+="input/tablet-intuos2-6x8a"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0065", SYMLINK+="input/tablet-bamboo"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c6", SYMLINK+="input/tablet-cintiq12wx"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", SYMLINK+="input/tablet-bamboofun-4x5"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", SYMLINK+="input/tablet-bamboofun-6x8"
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0069", SYMLINK+="input/tablet-bamboo1"
+# port.  For different tablet types though, just pick your links from
+# the list below.
+#
+# We override SYMLINK for tabletpc devices because the by-path link
+# is not required with such devices, there will only ever be one.
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0000", SYMLINK+="input/tablet-penpartner"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0003", SYMLINK+="input/tablet-cintiq_partner"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0010", SYMLINK+="input/tablet-graphire"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0011", SYMLINK+="input/tablet-graphire2-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0012", SYMLINK+="input/tablet-graphire2-5x7"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0013", SYMLINK+="input/tablet-graphire3"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0014", SYMLINK+="input/tablet-graphire3-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0015", SYMLINK+="input/tablet-graphire4-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0016", SYMLINK+="input/tablet-graphire4-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0017", SYMLINK+="input/tablet-bamboofun-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0018", SYMLINK+="input/tablet-bamboofun-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0019", SYMLINK+="input/tablet-bamboo1-medium"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0020", SYMLINK+="input/tablet-intuos-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0021", SYMLINK+="input/tablet-intuos-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0022", SYMLINK+="input/tablet-intuos-9x12"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0023", SYMLINK+="input/tablet-intuos-12x12"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0024", SYMLINK+="input/tablet-intuos-12x18"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0030", SYMLINK+="input/tablet-pl400"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0031", SYMLINK+="input/tablet-pl500"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0032", SYMLINK+="input/tablet-pl600"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0033", SYMLINK+="input/tablet-pl600sx"
+
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0034", SYMLINK+="input/tablet-pl550"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0035", SYMLINK+="input/tablet-pl800"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0037", SYMLINK+="input/tablet-pl700"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0038", SYMLINK+="input/tablet-pl510"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0039", SYMLINK+="input/tablet-dtu710"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="003f", SYMLINK+="input/tablet-cintiq21ux"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0041", SYMLINK+="input/tablet-intuos2-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0042", SYMLINK+="input/tablet-intuos2-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0043", SYMLINK+="input/tablet-intuos2-9x12"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0044", SYMLINK+="input/tablet-intuos2-12x12"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0045", SYMLINK+="input/tablet-intuos2-12x18"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0047", SYMLINK+="input/tablet-intuos2-6x8a"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0060", SYMLINK+="input/tablet-volito"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0061", SYMLINK+="input/tablet-penstation2"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0062", SYMLINK+="input/tablet-volito2-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0063", SYMLINK+="input/tablet-volito2-2x3"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0064", SYMLINK+="input/tablet-penpartner2"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0065", SYMLINK+="input/tablet-bamboo"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0069", SYMLINK+="input/tablet-bamboo1"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0081", SYMLINK+="input/tablet-graphire_bt-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0090", SYMLINK="input/tablet-tpc90"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="0093", SYMLINK="input/tablet-tpc93-$env{WACOM_TYPE}"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="009a", SYMLINK="input/tablet-tpc9a-$env{WACOM_TYPE}"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b0", SYMLINK+="input/tablet-intuos3-4x5"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b1", SYMLINK+="input/tablet-intuos3-6x8"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b2", SYMLINK+="input/tablet-intuos3-9x12"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b3", SYMLINK+="input/tablet-intuos3-12x12"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b4", SYMLINK+="input/tablet-intuos3-12x19"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b5", SYMLINK+="input/tablet-intuos3-6x11"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b7", SYMLINK+="input/tablet-intuos3-4x6"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b8", SYMLINK+="input/tablet-intuos4-4x6"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00b9", SYMLINK+="input/tablet-intuos4-6x9"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00ba", SYMLINK+="input/tablet-intuos4-8x13"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00bb", SYMLINK+="input/tablet-intuos4-12x19"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c0", SYMLINK+="input/tablet-dtf521"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c4", SYMLINK+="input/tablet-dtf720"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c5", SYMLINK+="input/tablet-cintiq20wsx"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c6", SYMLINK+="input/tablet-cintiq12wx"
+ATTRS{idVendor}=="056a", ATTRS{idProduct}=="00c7", ENV{WACOM_TYPE}!="touch", SYMLINK+="input/tablet-dtu1931"
+
+# Convenience links for the common case of a single tablet.  We could do just this:
+#ATTRS{idVendor}=="056a", SYMLINK+="input/wacom-$env{WACOM_TYPE}"
+# but for legacy reasons, we keep the input/wacom link as the generic stylus device.
+ATTRS{idVendor}=="056a", ENV{WACOM_TYPE}!="touch", SYMLINK+="input/wacom"
+ATTRS{idVendor}=="056a", ENV{WACOM_TYPE}=="touch", SYMLINK+="input/wacom-touch"
 
 # Check and repossess the device if a module other than the wacom one
 # is already bound to it.
+ATTRS{idVendor}=="056a", ACTION=="add", RUN+="check_driver wacom $devpath $env{ID_BUS}"
 
-KERNEL=="event[0-9]*", ATTRS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
+LABEL="wacom_end"
 
diff --git a/x11-drivers/linuxwacom/files/xserver-xorg-input-wacom.udev b/x11-drivers/linuxwacom/files/xserver-xorg-input-wacom.udev
deleted file mode 100644
index 0d5ac0814d04..000000000000
--- a/x11-drivers/linuxwacom/files/xserver-xorg-input-wacom.udev
+++ /dev/null
@@ -1,66 +0,0 @@
-# udev rules for wacom tablets.
-# These rules were compiled for the Debian GNU/Linux distribution,
-# but others may, and indeed are encouraged to, use them also.
-#
-# Should you do so, PLEASE CO-ORDINATE ANY CHANGES OR ADDITIONS
-# of new devices with Ron <ron@debian.org> so that we can try
-# to present users with with a standard set of device nodes
-# which they can rely on across the board.
-
-# Convenience link for the common case of a single tablet.
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYMLINK="input/wacom"
-
-# Type-named links for multiple tablets.  If you want to use multiple
-# tablets of the _same_ type, you will probably need to use the links
-# from /dev/input/by-path to identify which is plugged into what usb
-# port.  For different types though, just pick your links from the
-# list below.
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0000", SYMLINK+="input/tablet-penpartner"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0010", SYMLINK+="input/tablet-graphire"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0011", SYMLINK+="input/tablet-graphire2-4x5"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0012", SYMLINK+="input/tablet-graphire2-5x7"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0013", SYMLINK+="input/tablet-graphire3"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0014", SYMLINK+="input/tablet-graphire3-6x8"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0015", SYMLINK+="input/tablet-graphire4-4x5"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0016", SYMLINK+="input/tablet-graphire4-6x8"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0060", SYMLINK+="input/tablet-volito"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0061", SYMLINK+="input/tablet-penstation2"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0062", SYMLINK+="input/tablet-volito2-4x5"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0063", SYMLINK+="input/tablet-volito2-2x3"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0064", SYMLINK+="input/tablet-penpartner2"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0020", SYMLINK+="input/tablet-intuos-4x5"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0021", SYMLINK+="input/tablet-intuos-6x8"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0022", SYMLINK+="input/tablet-intuos-9x12"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0023", SYMLINK+="input/tablet-intuos-12x12"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0024", SYMLINK+="input/tablet-intuos-12x18"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0030", SYMLINK+="input/tablet-pl400"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0031", SYMLINK+="input/tablet-pl500"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0032", SYMLINK+="input/tablet-pl600"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0033", SYMLINK+="input/tablet-pl600sx"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0034", SYMLINK+="input/tablet-pl550"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0035", SYMLINK+="input/tablet-pl800"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0037", SYMLINK+="input/tablet-pl700"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0038", SYMLINK+="input/tablet-pl510"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0039", SYMLINK+="input/tablet-dtu710"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00C0", SYMLINK+="input/tablet-dtf521"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00C4", SYMLINK+="input/tablet-dtf720"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0003", SYMLINK+="input/tablet-cintiq_partner"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0041", SYMLINK+="input/tablet-intuos2-4x5"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0042", SYMLINK+="input/tablet-intuos2-6x8"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0043", SYMLINK+="input/tablet-intuos2-9x12"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0044", SYMLINK+="input/tablet-intuos2-12x12"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0045", SYMLINK+="input/tablet-intuos2-12x18"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B0", SYMLINK+="input/tablet-intuos3-4x5"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B1", SYMLINK+="input/tablet-intuos3-6x8"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B2", SYMLINK+="input/tablet-intuos3-9x12"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B3", SYMLINK+="input/tablet-intuos3-12x12"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B4", SYMLINK+="input/tablet-intuos3-12x19"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="00B5", SYMLINK+="input/tablet-intuos3-6x11"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="003F", SYMLINK+="input/tablet-cintiq21ux"
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", SYSFS{idProduct}=="0047", SYMLINK+="input/tablet-intuos2-6x8a"
-
-# Check and repossess the device if a module other than the wacom one
-# is already bound to it.
-
-KERNEL=="event[0-9]*", SYSFS{idVendor}=="056a", ACTION=="add", RUN+="/lib/udev/check_driver wacom $devpath $env{ID_BUS}"
-
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r2.ebuild
deleted file mode 100644
index 7968bc3d475c..000000000000
--- a/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.8_p3-r2.ebuild,v 1.1 2008/06/16 08:12:51 rbu Exp $
-
-inherit eutils autotools toolchain-funcs
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
-	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/-}
-
-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*}-pDev.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	if use gtk; then
-		myconf="--with-gtk=2.0"
-	else
-		myconf="--with-gtk=no"
-	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."
-
-	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
-}
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3.ebuild
deleted file mode 100644
index eb3e69ca6b52..000000000000
--- a/x11-drivers/linuxwacom/linuxwacom-0.7.8_p3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.8_p3.ebuild,v 1.7 2008/02/21 12:57:38 rbu Exp $
-
-inherit eutils autotools
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
-	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/-}
-
-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
-
-	epatch "${FILESDIR}"/${P%_p*}-pDev.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	if use gtk; then
-		myconf="--with-gtk=2.0"
-	else
-		myconf="--with-gtk=no"
-	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."
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/xserver-xorg-input-wacom.udev 60-wacom.rules
-
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.0_p3-r1.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild
index f286a65e36a5..7930464509cf 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.0_p3-r1.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.0_p3-r1.ebuild,v 1.1 2008/06/16 08:12:51 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild,v 1.1 2009/04/18 17:43:52 ikelos Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -12,7 +12,7 @@ IUSE="gtk tcl tk usb module"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 RDEPEND="x11-proto/inputproto
 	x11-base/xorg-server
@@ -73,16 +73,12 @@ src_unpack() {
 		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
 	fi
 
+	epatch "${FILESDIR}/${PN}-0.8.2-kernel-2.6.29.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}"
@@ -108,7 +104,7 @@ src_install() {
 	fi
 
 	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/${P%_p*}-xserver-xorg-input-wacom.udev 60-wacom.rules
+	newins "${FILESDIR}"/${PN}-0.8.2-xserver-xorg-input-wacom.udev 60-wacom.rules
 
 	exeinto /lib/udev/
 	doexe "${FILESDIR}"/check_driver