x11-base/xorg-server: drop unsupported drivers from INPUT_DEVICES (see bug #277521)

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

8 files changed, 20 insertions, 170 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 69eda50b85f1..7fcb9c2d94cc 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.427 2009/07/11 09:49:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.428 2009/07/13 10:53:18 remi Exp $
+
+  13 Jul 2009; Rémi Cardona <remi@gentoo.org>
+  xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild,
+  xorg-server-1.5.3-r6.ebuild, xorg-server-1.5.3-r7.ebuild,
+  xorg-server-1.6.2.ebuild, xorg-server-1.6.2-r1.ebuild:
+  drop unsupported drivers from INPUT_DEVICES (see bug #277521)
 
   11 Jul 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.6.2.ebuild,
   xorg-server-1.6.2-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a32fa0b5dd80..b78202f83a82 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -56,11 +56,11 @@ DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea449981002
 DIST xorg-server-1.6.2-gentoo-patches-02.tar.bz2 7126 RMD160 94e86e470586aa3ad5be959fb1def3b230081c6c SHA1 a19707c88fbca38096ea23111cf419406e6c47a7 SHA256 b6d6ad0eed7450500e7717932a324436419d33a3f46aaace1cbf3a35891cea98
 DIST xorg-server-1.6.2-gentoo-patches-03.tar.bz2 9299 RMD160 914123bc25ce08eff6f4a727f291960a5a546af8 SHA1 0d63288ea1dd7f795fab3f74faf26f62f24c8dac SHA256 4dc3305f65a705c215ec314bc26f3baf6bde861eb9beff86a07dc98c9653600c
 DIST xorg-server-1.6.2.tar.bz2 4647067 RMD160 37af2d733cdc7155de13cfdb21cc6367135bb440 SHA1 7eb0ae82762eecf5be031d63a77f0c1281569414 SHA256 893e92ad2ccd1bcd646bba9540dd9dfc53ccc95f8dc5fd69444afe54fae8c261
-EBUILD xorg-server-1.3.0.0-r6.ebuild 17164 RMD160 bef98d1c48882c0e72a20506bf0f1f636d0ee5c9 SHA1 5f28673354394dedd53e9019dc62b84d7583e3ac SHA256 63099fbc0624662ab267753bb423a46f636220ee303c09e9afbf0d74f4bd1fbe
-EBUILD xorg-server-1.4.2.ebuild 17051 RMD160 738a10147fd3cad02c38741c3121a3ebf0644fb4 SHA1 9dda0f9aedb0761edc7287b0f4810faca97e36f3 SHA256 dd5034d1e31a56257904734ee66827d5cb2de751d5ff6fd264bb2499e2345178
-EBUILD xorg-server-1.5.3-r6.ebuild 17011 RMD160 4cdaee330de3e02eeb44da6c2485a2b6e6f8fdcd SHA1 97b7f4db16ebef0e111e0177128ecf87eec85102 SHA256 fd519d3bf5f99d0f073ddc1135f1b2a2c853d9fdb0ca8f931c91b6d5392f7b1a
-EBUILD xorg-server-1.5.3-r7.ebuild 17035 RMD160 c5195ffee900178cf63d3632354a6e1bf7e6fe85 SHA1 01a2cccbd0fa14ea663982c609a5a4e108b023a8 SHA256 07fb7dcc5cb59946d3e6a5127e9e522219aa81129abbae8f23aa7d270cbe49ae
-EBUILD xorg-server-1.6.2-r1.ebuild 14255 RMD160 54c190296d991e04745ccb4e828a782741cb8e16 SHA1 c123da71c32329e570fee71cee7da4e119ce827d SHA256 06753ffb0fa2b8f6a0776625f3c6ffef1f44d0564fcec193a06fc75d81952f67
-EBUILD xorg-server-1.6.2.ebuild 14252 RMD160 84f51da2ebda2da829f8298f712ed725b03daa99 SHA1 f3d62d24b8efaffc7e2b7e40de51777c0b949e9e SHA256 d61c51226ea6b46cedf7bd7698568205b74a3ad57df119b7b64643e223f90936
-MISC ChangeLog 98192 RMD160 589e2ff5c23ad8e4289f606d15970c6dfb84a764 SHA1 2b8a5b7bc11f4632d639b0cc3a0f349710d4c30c SHA256 813b6e4225dfb54fe6be28a568eeccf7a554cf3e6f443e65571c51b57679fa6d
+EBUILD xorg-server-1.3.0.0-r6.ebuild 15978 RMD160 ed56f0dc502d36d5299a1f6935120404750f6c6f SHA1 d00e08179a957d655ccd05b367c08985c9ee0065 SHA256 dc29848b5603e07bc5212470cfc819201b9060b9b22cf0dcddbca5231bb8facf
+EBUILD xorg-server-1.4.2.ebuild 15865 RMD160 9eb7dfa4797fee8ef71619ca68efa2659a699058 SHA1 7100457bbc1b0995060d9a37f5af979ae4acf564 SHA256 7fb1cacd58b608f27c8b95984f26204c82706557cb3f7a2b7ebf71f4a31db5ff
+EBUILD xorg-server-1.5.3-r6.ebuild 15821 RMD160 e8d12ed466d1931d42bb3db031e5152f9c99dc44 SHA1 24fdfec544f54b48e359b731f48990934463096a SHA256 b74427adfbd77427c27b22f15bc52e1bc34a6a9e935d8e50139ae65cd21bb30e
+EBUILD xorg-server-1.5.3-r7.ebuild 15844 RMD160 e5aa688e0094227e81b61e59d2fb3d862485cb9a SHA1 93efcee3c42bd3e3b834ca7ac9bc179719045ba4 SHA256 184b1e1ba14b82afd23a372c8b33a76a8855b8f2a7dc7e9eb81cb16793d10cff
+EBUILD xorg-server-1.6.2-r1.ebuild 13069 RMD160 cd1c2e6b3d8e87bfdbc996199b0724548f3dfc15 SHA1 0217212605b9d07ab3736679efb05d61dfd755dd SHA256 f2a9639310f5b7f9800344003e26c92449f61ab3d300ee6f43c7d01a6ce5e2d0
+EBUILD xorg-server-1.6.2.ebuild 13066 RMD160 81dcf9db6d1959fdd1b7c633ebfdd5767786106f SHA1 ed1e3d397292b98055651f006f443661689d79a2 SHA256 dfe226c5ac115680cdeb6d0b45cfa8298a482d99797fef473825a7c7d066903e
+MISC ChangeLog 98480 RMD160 93db3eba55f749803c7aba3f2b223f6365afd7f5 SHA1 28412ccb5f98d545ed1c05114d7e3b60f3768e17 SHA256 b79ce081259333aac6e5c8ce9a8d2345e2cee5e5346284369624f3647ab64d84
 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
index fda29a6c4b64..b0724e415008 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild,v 1.10 2009/05/13 08:53:59 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0-r6.ebuild,v 1.11 2009/07/13 10:53:18 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -22,29 +22,16 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
-	input_devices_calcomp
 	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
 	input_devices_elographics
 	input_devices_evdev
 	input_devices_fpit
 	input_devices_hyperpen
-	input_devices_jamstudio
 	input_devices_joystick
 	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
 	input_devices_mouse
 	input_devices_mutouch
-	input_devices_palmax
 	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
-	input_devices_ur98
 	input_devices_vmmouse
 	input_devices_void
 
@@ -178,29 +165,16 @@ PDEPEND="
 	xorg? (
 		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
 		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.0 )
 		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.0 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.0 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.0 )
 		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
 		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
 		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
 		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
 		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
 		input_devices_keyboard? ( =x11-drivers/xf86-input-keyboard-1.1* )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.0 )
 		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
 		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
 		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.1.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.0 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.0 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.0 )
 
diff --git a/x11-base/xorg-server/xorg-server-1.4.2.ebuild b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
index 6de9e7bb24ce..f83bd12067d4 100644
--- a/x11-base/xorg-server/xorg-server-1.4.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.12 2009/05/13 08:53:59 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.2.ebuild,v 1.13 2009/07/13 10:53:18 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -22,30 +22,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
-	input_devices_calcomp
 	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
 	input_devices_elographics
 	input_devices_evdev
 	input_devices_fpit
 	input_devices_hyperpen
-	input_devices_jamstudio
 	input_devices_joystick
 	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
 	input_devices_mouse
 	input_devices_mutouch
-	input_devices_palmax
 	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
 	input_devices_tslib
-	input_devices_ur98
 	input_devices_vmmouse
 	input_devices_void
 
@@ -186,30 +173,17 @@ PDEPEND="
 	xorg? (
 		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
 		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.1 )
 		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.0 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.0 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.1 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.1 )
 		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.1.0 )
 		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.1.1 )
 		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.1.0 )
 		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.1.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.1.0 )
 		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.1.0 )
 		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.2.0 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.1.1 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.1.1 )
 		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.1.0 )
 		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.1.0 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.1.0 )
 		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.2.1 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.1.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.1.0 )
 		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.4.2 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
 
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
index 705ac37b7837..506ae13326b4 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.10 2009/06/23 20:15:20 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r6.ebuild,v 1.11 2009/07/13 10:53:18 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -17,30 +17,17 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
-	input_devices_calcomp
 	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
 	input_devices_elographics
 	input_devices_evdev
 	input_devices_fpit
 	input_devices_hyperpen
-	input_devices_jamstudio
 	input_devices_joystick
 	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
 	input_devices_mouse
 	input_devices_mutouch
-	input_devices_palmax
 	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
 	input_devices_tslib
-	input_devices_ur98
 	input_devices_virtualbox
 	input_devices_vmmouse
 	input_devices_void
@@ -182,30 +169,17 @@ PDEPEND="
 	xorg? (
 		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 )
 		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
 		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
 		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 )
 		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.0 )
 		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 )
 		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
 		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 )
 		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
 		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 )
 		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
 		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
 		input_devices_tslib? ( x11-drivers/xf86-input-tslib x11-libs/libXCalibrate )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
diff --git a/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild b/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
index c3b894560ecf..f42b93aa0953 100644
--- a/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild,v 1.1 2009/06/23 14:25:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.3-r7.ebuild,v 1.2 2009/07/13 10:53:18 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -17,30 +17,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
-	input_devices_calcomp
 	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
 	input_devices_elographics
 	input_devices_evdev
 	input_devices_fpit
 	input_devices_hyperpen
-	input_devices_jamstudio
 	input_devices_joystick
 	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
 	input_devices_mouse
 	input_devices_mutouch
-	input_devices_palmax
 	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
 	input_devices_tslib
-	input_devices_ur98
 	input_devices_virtualbox
 	input_devices_vmmouse
 	input_devices_void
@@ -182,30 +169,17 @@ PDEPEND="
 	xorg? (
 		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 )
 		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
 		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
 		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.2 )
 		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.0 )
 		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 )
 		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
 		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 )
 		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
 		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 )
 		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
 		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
 		input_devices_tslib? ( x11-drivers/xf86-input-tslib x11-libs/libXCalibrate )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 )
diff --git a/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild b/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild
index 05567af09b47..873ea3398e10 100644
--- a/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild,v 1.2 2009/07/11 09:49:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.2-r1.ebuild,v 1.3 2009/07/13 10:53:18 remi Exp $
 
 EAPI="2"
 
@@ -22,30 +22,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
-	input_devices_calcomp
 	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
 	input_devices_elographics
 	input_devices_evdev
 	input_devices_fpit
 	input_devices_hyperpen
-	input_devices_jamstudio
 	input_devices_joystick
 	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
 	input_devices_mouse
 	input_devices_mutouch
-	input_devices_palmax
 	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
 	input_devices_tslib
-	input_devices_ur98
 	input_devices_virtualbox
 	input_devices_vmmouse
 	input_devices_void
@@ -187,30 +174,17 @@ PDEPEND="
 	xorg? (
 		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
 		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
 		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
 		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
 		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
 		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
 		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
 		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
 		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
 		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
 		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
 		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
 		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )
diff --git a/x11-base/xorg-server/xorg-server-1.6.2.ebuild b/x11-base/xorg-server/xorg-server-1.6.2.ebuild
index bf7dd04816b5..7592c132f143 100644
--- a/x11-base/xorg-server/xorg-server-1.6.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.2.ebuild,v 1.3 2009/07/11 09:49:16 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.2.ebuild,v 1.4 2009/07/13 10:53:18 remi Exp $
 
 EAPI="2"
 
@@ -22,30 +22,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE_INPUT_DEVICES="
 	input_devices_acecad
 	input_devices_aiptek
-	input_devices_calcomp
 	input_devices_citron
-	input_devices_digitaledge
-	input_devices_dmc
-	input_devices_dynapro
-	input_devices_elo2300
 	input_devices_elographics
 	input_devices_evdev
 	input_devices_fpit
 	input_devices_hyperpen
-	input_devices_jamstudio
 	input_devices_joystick
 	input_devices_keyboard
-	input_devices_magellan
-	input_devices_microtouch
 	input_devices_mouse
 	input_devices_mutouch
-	input_devices_palmax
 	input_devices_penmount
-	input_devices_spaceorb
-	input_devices_summa
-	input_devices_tek4957
 	input_devices_tslib
-	input_devices_ur98
 	input_devices_virtualbox
 	input_devices_vmmouse
 	input_devices_void
@@ -187,30 +174,17 @@ PDEPEND="
 	xorg? (
 		input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.3.0 )
 		input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.2.0 )
-		input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 )
 		input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 )
-		input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 )
-		input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 )
-		input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 )
-		input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 )
 		input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.3 )
 		input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-2.1.3 )
 		input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.3.0 )
 		input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 )
-		input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 )
 		input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.4.0 )
 		input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.2 )
-		input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 )
-		input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 )
 		input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.4.0 )
 		input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.1 )
-		input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 )
 		input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.4.0 )
-		input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 )
-		input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 )
-		input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 )
 		input_devices_tslib? ( x11-drivers/xf86-input-tslib )
-		input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 )
 		input_devices_virtualbox? ( x11-drivers/xf86-input-virtualbox )
 		input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.6.3 )
 		input_devices_void? ( >=x11-drivers/xf86-input-void-1.2.0 )