Version bump. Remove old patches.

(Portage version: 2.2_rc44/cvs/Linux i686)

4 files changed, 27 insertions, 77 deletions

diff --git a/x11-drivers/xf86-input-keyboard/ChangeLog b/x11-drivers/xf86-input-keyboard/ChangeLog
index b5cdd1ad7b7f..4d54af961e79 100644
--- a/x11-drivers/xf86-input-keyboard/ChangeLog
+++ b/x11-drivers/xf86-input-keyboard/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-input-keyboard
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.65 2009/09/19 15:24:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.66 2009/10/10 07:53:11 scarabeus Exp $
+
+*xf86-input-keyboard-1.4.0 (10 Oct 2009)
+
+  10 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xf86-input-keyboard-1.4.0.ebuild,
+  -files/dont-release-keys-on-newer-servers.patch,
+  -files/fix-key-led-update.patch:
+  Version bump. Remove old patches.
 
   19 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -xf86-input-keyboard-1.1.1.ebuild, -xf86-input-keyboard-1.1.1-r1.ebuild,
diff --git a/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch b/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch
deleted file mode 100644
index 8f1a0261373e..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Fri, 8 Dec 2006 07:09:24 +0000 (+0200)
-Subject: don't release keys on newer servers
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-keyboard.git;a=commitdiff;h=caeb0f364c1a95a9ad3e64dd722c8ddc88077a86
-
-don't release keys on newer servers
-On newer servers, we take care of the key release over VT switch already,
-so don't do it twice; that will lead to hilarious results.
----
-
---- a/src/kbd.c
-+++ b/src/kbd.c
-@@ -419,6 +419,8 @@ InitKBD(InputInfoPtr pInfo, Bool init)
-   kevent.u.keyButtonPointer.rootX = 0;
-   kevent.u.keyButtonPointer.rootY = 0;
- 
-+/* The server does this for us with i-h. */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 1
-   /*
-    * Hmm... here is the biggest hack of every time !
-    * It may be possible that a switch-vt procedure has finished BEFORE
-@@ -448,6 +450,8 @@ InitKBD(InputInfoPtr pInfo, Bool init)
-           (* pKeyboard->public.processInputProc)(&kevent, pKeyboard, 1);
-         }
-       }
-+#endif
-+
-   pKbd->scanPrefix      = 0;
- 
-   if (init) {
diff --git a/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch b/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch
deleted file mode 100644
index 88c267160f46..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Date: Mon, 5 Feb 2007 22:29:54 +0000 (-0800)
-Subject: Fix key led update
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-input-keyboard.git;a=commitdiff;h=05dd89ef03cee6853e7c2db518b6b22785cc3e7c
-
-Fix key led update
-
-Cf: https://bugs.freedesktop.org/show_bug.cgi?id=313
-    https://bugs.freedesktop.org/attachment.cgi?id=8396&action=view
-
- ------- Comment  #8 From Samuel Thibault  2007-01-14 14:28:16  [reply] -------
-
-Created an attachment (id=8396) [details]
-fix key led update
-
-Ok, found the problem: when XKB is used (!pKbd->noXkb), pKbd->keyLeds is not
-updated, so that UpdateLeds(), even if it called at the right places, actually
-just clears all LEDs.  Here is a patch.
----
-
---- a/src/kbd.c
-+++ b/src/kbd.c
-@@ -383,7 +383,22 @@ KbdCtrl( DeviceIntPtr device, KeybdCtrl 
-    InputInfoPtr pInfo = (InputInfoPtr) device->public.devicePrivate;
-    KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
- 
--   if ( ctrl->leds & XCOMP ) {
-+   if ( ctrl->leds & XLED1) {
-+       pKbd->keyLeds |= CAPSFLAG;
-+   } else {
-+       pKbd->keyLeds &= ~CAPSFLAG;
-+   }
-+   if ( ctrl->leds & XLED2) {
-+       pKbd->keyLeds |= NUMFLAG;
-+   } else {
-+       pKbd->keyLeds &= ~NUMFLAG;
-+   }
-+   if ( ctrl->leds & XLED3) {
-+       pKbd->keyLeds |= SCROLLFLAG;
-+   } else {
-+       pKbd->keyLeds &= ~SCROLLFLAG;
-+   }
-+   if ( ctrl->leds & (XCOMP|XLED4) ) {
-        pKbd->keyLeds |= COMPOSEFLAG;
-    } else {
-        pKbd->keyLeds &= ~COMPOSEFLAG;
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.4.0.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.4.0.ebuild
new file mode 100644
index 000000000000..25208f2d297f
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.4.0.ebuild,v 1.1 2009/10/10 07:53:11 scarabeus Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER="4"
+
+inherit x-modular
+
+DESCRIPTION="Keyboard input driver"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.6.3"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"