Fix keyboard driver dep because it doesn't work with 1.2 or newer.

(Portage version: 2.1.3.8)

5 files changed, 14 insertions, 9 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 35c73ae168d2..cd95e5d9ca85 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.259 2007/09/08 21:53:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.260 2007/09/09 07:37:23 dberkholz Exp $
+
+  09 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.1.1-r1.ebuild, xorg-server-1.1.1-r5.ebuild,
+  xorg-server-1.2.0-r3.ebuild, xorg-server-1.3.0.0.ebuild:
+  Fix keyboard driver dep because it doesn't work with 1.2 or newer.
 
   08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xorg-server-1.3.0.0.ebuild:
   Marked ppc/ppc64 stable for bug #191615.
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
index 4ba449cd5628..4ab33a49fa7c 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.1-r1.ebuild,v 1.23 2007/07/31 18:52:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.24 2007/09/09 07:37:23 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -195,7 +195,7 @@ PDEPEND="
 		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.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 )
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild
index c440ed847052..6b0ea86bff56 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.1-r5.ebuild,v 1.3 2007/07/31 18:52:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r5.ebuild,v 1.4 2007/09/09 07:37:23 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -195,7 +195,7 @@ PDEPEND="
 		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.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 )
diff --git a/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild b/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
index a3949ddf0681..ff7b876fba9b 100644
--- a/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.2.0-r3.ebuild,v 1.12 2007/07/31 18:52:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.2.0-r3.ebuild,v 1.13 2007/09/09 07:37:23 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -194,7 +194,7 @@ PDEPEND="
 		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.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 )
diff --git a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
index 5f65ee4aceb8..2bf82b1e37cc 100644
--- a/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.22 2007/09/08 21:53:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.23 2007/09/09 07:37:23 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -194,7 +194,7 @@ PDEPEND="
 		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.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 )