Version bump. Remove old patches.

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

5 files changed, 33 insertions, 83 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/Manifest b/x11-drivers/xf86-input-keyboard/Manifest
index ce3fd6a2f335..f06eeba5fdec 100644
--- a/x11-drivers/xf86-input-keyboard/Manifest
+++ b/x11-drivers/xf86-input-keyboard/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX dont-release-keys-on-newer-servers.patch 1046 RMD160 cac8bb14d1f3a8ec9973e3b81d2cc8ab5f7d722f SHA1 ce13687080161ed8966e797c451d89ce6b7efbee SHA256 463251c5923ba9f07b18538eca5ff7910fb50206074296ad6323478bc1007a91
-AUX fix-key-led-update.patch 1491 RMD160 cb801528b86e244071f89454a55690b1c336dff5 SHA1 2263b22733c41ae67f910c22405dcafcacf6beed SHA256 5aaa20b6a318290b8d5d70997312652d9b852baa840b31b95bad0f7afac4f357
 DIST xf86-input-keyboard-1.3.2.tar.bz2 269634 RMD160 21bb5f58115ae5ffdf87b15e0d8c1105724c6e38 SHA1 81d35fedef7b809b35297935330ddc8743005512 SHA256 33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
+DIST xf86-input-keyboard-1.4.0.tar.bz2 287234 RMD160 d8f76b990707802a98e83ac8b82c9f653b4be96e SHA1 5061fdaff8b7ddcbcca82f065c4abbfff255a1da SHA256 842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
 EBUILD xf86-input-keyboard-1.3.2.ebuild 597 RMD160 a46f64d1a141a2337e1d90318549451a378924c5 SHA1 9a3fbfc63e5429ca0002c4a562246b9bd6ba0f5d SHA256 927df4b9e3a98686c0f2888fc513b220b9b9486f1092a77d5d98bbb28cfe4fb0
-MISC ChangeLog 9060 RMD160 2b33fa9d65b7006389108d962a938005bc92dad3 SHA1 e8ba388fa0fbbe96a861085cb3b31e0b325011b4 SHA256 a4db2a527727bd406ad3e085013d3144480e598aaae7fa62c0ba6a954928ddfe
+EBUILD xf86-input-keyboard-1.4.0.ebuild 606 RMD160 83f6486025b8115b80164f6b1d8b845302c9c816 SHA1 48c62269786b478cab384663de51f767d207b43a SHA256 e88a1601cb3007561752d0e661fbec2c54b1d0018f4fb9fe24317eae7b30937f
+MISC ChangeLog 9317 RMD160 47555017811af26515a07506559c49f86dc2e557 SHA1 dd4215d63429030798584595d513ec882edf3ccd SHA256 91203b38c288854170ba43412d9a9bb719dfc363bef2b07e27a10fe31d115dd0
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq09+YACgkQHB6c3gNBRYeW2gCgvibIM5lZQkZ8VEKOIWilP/pB
-4tQAn0D1wJo88qj5KCPNQ3pClmaFDjW8
-=VaVC
+iEYEARECAAYFAkrQPXEACgkQHB6c3gNBRYeoxQCfdcuH6OwXggIwRuB7EpREc/4t
+mToAn1msu1V0k9NjOIqJrqXiGDd6ezVp
+=vTzb
 -----END PGP SIGNATURE-----
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"