(#63732) Revbump for keyboard LED fixes.

Package-Manager: portage-2.1.3_rc9

8 files changed, 169 insertions, 15 deletions

diff --git a/x11-drivers/xf86-input-keyboard/ChangeLog b/x11-drivers/xf86-input-keyboard/ChangeLog
index 54a84dbc2520..e37c98fc08f8 100644
--- a/x11-drivers/xf86-input-keyboard/ChangeLog
+++ b/x11-drivers/xf86-input-keyboard/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-keyboard
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.41 2007/07/03 12:59:40 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/ChangeLog,v 1.42 2007/08/02 00:03:14 dberkholz Exp $
+
+*xf86-input-keyboard-1.2.0-r1 (02 Aug 2007)
+*xf86-input-keyboard-1.1.1-r1 (02 Aug 2007)
+
+  02 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/dont-release-keys-on-newer-servers.patch,
+  +files/fix-key-led-update.patch, +xf86-input-keyboard-1.1.1-r1.ebuild,
+  +xf86-input-keyboard-1.2.0-r1.ebuild:
+  (#63732) Revbump for keyboard LED fixes.
 
   03 Jul 2007; Lars Weiler <pylon@gentoo.org>
   xf86-input-keyboard-1.1.1.ebuild:
diff --git a/x11-drivers/xf86-input-keyboard/Manifest b/x11-drivers/xf86-input-keyboard/Manifest
index cd96ea8fc9d8..b221f19438ce 100644
--- a/x11-drivers/xf86-input-keyboard/Manifest
+++ b/x11-drivers/xf86-input-keyboard/Manifest
@@ -1,6 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dont-release-keys-on-newer-servers.patch 1046 RMD160 cac8bb14d1f3a8ec9973e3b81d2cc8ab5f7d722f SHA1 ce13687080161ed8966e797c451d89ce6b7efbee SHA256 463251c5923ba9f07b18538eca5ff7910fb50206074296ad6323478bc1007a91
+MD5 40da83f52fb612023ccf56d15359e43b files/dont-release-keys-on-newer-servers.patch 1046
+RMD160 cac8bb14d1f3a8ec9973e3b81d2cc8ab5f7d722f files/dont-release-keys-on-newer-servers.patch 1046
+SHA256 463251c5923ba9f07b18538eca5ff7910fb50206074296ad6323478bc1007a91 files/dont-release-keys-on-newer-servers.patch 1046
+AUX fix-key-led-update.patch 1491 RMD160 cb801528b86e244071f89454a55690b1c336dff5 SHA1 2263b22733c41ae67f910c22405dcafcacf6beed SHA256 5aaa20b6a318290b8d5d70997312652d9b852baa840b31b95bad0f7afac4f357
+MD5 30ca8f2695c9c42aa26c2e038d50baf2 files/fix-key-led-update.patch 1491
+RMD160 cb801528b86e244071f89454a55690b1c336dff5 files/fix-key-led-update.patch 1491
+SHA256 5aaa20b6a318290b8d5d70997312652d9b852baa840b31b95bad0f7afac4f357 files/fix-key-led-update.patch 1491
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
 DIST x11-driver-patches-4.tar.bz2 346 RMD160 fcbd405de080d07612d46f455b927035fd8123a8 SHA1 350d357d542699b5a1a612228931a60afda799db SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf
 DIST xf86-input-keyboard-1.1.0.tar.bz2 231831 RMD160 9b2d840d29535bf37a0deb2d3bb0f1eda0670fc4 SHA1 c2a8b2e3955b2f321576bb85cdf9622cbd5d41f0 SHA256 1f6a9208a922b627e67dd483dae6874809f18b0a8dfc8e08e67bb0f82bf14f77
@@ -10,18 +15,26 @@ EBUILD xf86-input-keyboard-1.1.0.ebuild 589 RMD160 1be4c3d02c1512cdfdec4fadce712
 MD5 9b7307197cddca4d9a3aeab59bbe6686 xf86-input-keyboard-1.1.0.ebuild 589
 RMD160 1be4c3d02c1512cdfdec4fadce71277877ab8d6b xf86-input-keyboard-1.1.0.ebuild 589
 SHA256 fa0e294472469a284400c90d76907ec7b8ce82fddc2a00f48c95311c133eb6a2 xf86-input-keyboard-1.1.0.ebuild 589
+EBUILD xf86-input-keyboard-1.1.1-r1.ebuild 714 RMD160 1f5662e146deb74ae1b6a6910ab4ab9d9b1ca45f SHA1 ebd48289c65c4fcf4483034b84cf3598cbe59b58 SHA256 e1ce12bcf3bbe58b803600f95988ebecd1e7270d36a97237426540b1aef7d6e1
+MD5 f55ca0acd385a0cbba86fdd042e7cb72 xf86-input-keyboard-1.1.1-r1.ebuild 714
+RMD160 1f5662e146deb74ae1b6a6910ab4ab9d9b1ca45f xf86-input-keyboard-1.1.1-r1.ebuild 714
+SHA256 e1ce12bcf3bbe58b803600f95988ebecd1e7270d36a97237426540b1aef7d6e1 xf86-input-keyboard-1.1.1-r1.ebuild 714
 EBUILD xf86-input-keyboard-1.1.1.ebuild 592 RMD160 659c0157a418e2a218564fa2eec216a2c582d736 SHA1 d26f3ecabed1330bfe3e22697b60f5353dc46f23 SHA256 ef134bce7e4867a97096659670503d38d91b442f7633366a1239ade3d1589296
 MD5 65865e9d7269991d99ef7222ae94b81e xf86-input-keyboard-1.1.1.ebuild 592
 RMD160 659c0157a418e2a218564fa2eec216a2c582d736 xf86-input-keyboard-1.1.1.ebuild 592
 SHA256 ef134bce7e4867a97096659670503d38d91b442f7633366a1239ade3d1589296 xf86-input-keyboard-1.1.1.ebuild 592
+EBUILD xf86-input-keyboard-1.2.0-r1.ebuild 631 RMD160 c11f61419b91bd62cc9ccf00a371d0221efb3893 SHA1 c8569a4f898f60c4c84714cc1b94088447156e3f SHA256 ed24b507e3ccf2e89305ba74e1cc68462d09694ad5f22750d7af2855ff976f75
+MD5 2b3c09c14a6b2dbfe062a6c60a4ce36a xf86-input-keyboard-1.2.0-r1.ebuild 631
+RMD160 c11f61419b91bd62cc9ccf00a371d0221efb3893 xf86-input-keyboard-1.2.0-r1.ebuild 631
+SHA256 ed24b507e3ccf2e89305ba74e1cc68462d09694ad5f22750d7af2855ff976f75 xf86-input-keyboard-1.2.0-r1.ebuild 631
 EBUILD xf86-input-keyboard-1.2.0.ebuild 518 RMD160 afd05ec24a6fba0abecbc1c5a9963d1810936c62 SHA1 f146d5a77fe020e856f1209f5166b293d3cdb20f SHA256 e82b3620cf4df04876899da082a32380ed5e79a586b4a03de01a10075f8f66b8
 MD5 2658da15a27aec2fe3e3203237011fa1 xf86-input-keyboard-1.2.0.ebuild 518
 RMD160 afd05ec24a6fba0abecbc1c5a9963d1810936c62 xf86-input-keyboard-1.2.0.ebuild 518
 SHA256 e82b3620cf4df04876899da082a32380ed5e79a586b4a03de01a10075f8f66b8 xf86-input-keyboard-1.2.0.ebuild 518
-MISC ChangeLog 5566 RMD160 439ec93dd83c7cef30c3832640b615ca81c732b3 SHA1 74c2e9adef110a5b0c9268904daf9d3c770125c3 SHA256 1a61507a651958776ef7a85c9d6433654d7172e3bace23a4d2363dec9f4a22cc
-MD5 11e2949cd2345b044fe69388d64470b7 ChangeLog 5566
-RMD160 439ec93dd83c7cef30c3832640b615ca81c732b3 ChangeLog 5566
-SHA256 1a61507a651958776ef7a85c9d6433654d7172e3bace23a4d2363dec9f4a22cc ChangeLog 5566
+MISC ChangeLog 5922 RMD160 b1fd47fb75ee16e017dec7c19ff8369276c4f2a0 SHA1 cdf94a6c3a9da65b7ce92c936ff629f4c24808cb SHA256 0c38d8c8196dbb3ff8f78560b24c26222e7790b823ea71e7a54d2f02d7680003
+MD5 3d899b3c146234ebe9ff668b4beed229 ChangeLog 5922
+RMD160 b1fd47fb75ee16e017dec7c19ff8369276c4f2a0 ChangeLog 5922
+SHA256 0c38d8c8196dbb3ff8f78560b24c26222e7790b823ea71e7a54d2f02d7680003 ChangeLog 5922
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -32,13 +45,12 @@ SHA256 cde8b9a4643dcb95695675f3daae1c75a407b4b6f79137c6a1b52add80623886 files/di
 MD5 202a70cdc07adba3711cc71d38811782 files/digest-xf86-input-keyboard-1.1.1 536
 RMD160 a60b3484d2f977421813646c185c02a140864c92 files/digest-xf86-input-keyboard-1.1.1 536
 SHA256 97814b0428a995f886a46d70cccfae85c735d605825659d7784149be313e217e files/digest-xf86-input-keyboard-1.1.1 536
+MD5 202a70cdc07adba3711cc71d38811782 files/digest-xf86-input-keyboard-1.1.1-r1 536
+RMD160 a60b3484d2f977421813646c185c02a140864c92 files/digest-xf86-input-keyboard-1.1.1-r1 536
+SHA256 97814b0428a995f886a46d70cccfae85c735d605825659d7784149be313e217e files/digest-xf86-input-keyboard-1.1.1-r1 536
 MD5 a9a3c5bd11986e20091195f4ef1b333f files/digest-xf86-input-keyboard-1.2.0 536
 RMD160 2cac7fea95e3f8ca4e3f71415933ee57cba84c19 files/digest-xf86-input-keyboard-1.2.0 536
 SHA256 50b84e3d0dd905662570fb3eec71964cc25b3ad0d2a334e3311d7da48b7a5b5a files/digest-xf86-input-keyboard-1.2.0 536
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGikg96IPkARlRZfQRAuq5AJ4z/Un2PFdbuOrXpAfWauCo+VuO6wCgj1d1
-SaYdzvkKLg+6hJx7Y5oQ2CU=
-=/ILJ
------END PGP SIGNATURE-----
+MD5 a9a3c5bd11986e20091195f4ef1b333f files/digest-xf86-input-keyboard-1.2.0-r1 536
+RMD160 2cac7fea95e3f8ca4e3f71415933ee57cba84c19 files/digest-xf86-input-keyboard-1.2.0-r1 536
+SHA256 50b84e3d0dd905662570fb3eec71964cc25b3ad0d2a334e3311d7da48b7a5b5a files/digest-xf86-input-keyboard-1.2.0-r1 536
diff --git a/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.1.1-r1 b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.1.1-r1
new file mode 100644
index 000000000000..d9d3b650ff2f
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.1.1-r1
@@ -0,0 +1,6 @@
+MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
+RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
+SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
+MD5 babf094e37bdfc08076d4adb4c69c1d9 xf86-input-keyboard-1.1.1.tar.bz2 235022
+RMD160 3587c2c6329ad5d218a4590b7d77cfde25d3cd7f xf86-input-keyboard-1.1.1.tar.bz2 235022
+SHA256 b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd xf86-input-keyboard-1.1.1.tar.bz2 235022
diff --git a/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.2.0-r1 b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.2.0-r1
new file mode 100644
index 000000000000..fb8255e782f3
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/digest-xf86-input-keyboard-1.2.0-r1
@@ -0,0 +1,6 @@
+MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
+RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
+SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
+MD5 06e14029e00b32ed085769775b398efd xf86-input-keyboard-1.2.0.tar.bz2 243204
+RMD160 2c6b8bd8340d2dcb583f6a7b181f267f45f00b76 xf86-input-keyboard-1.2.0.tar.bz2 243204
+SHA256 8c45fc324ea01377f9932250824ee1769bdf1eab6e4b661c22a39deb0b01580a xf86-input-keyboard-1.2.0.tar.bz2 243204
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
new file mode 100644
index 000000000000..8f1a0261373e
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/dont-release-keys-on-newer-servers.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..88c267160f46
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/files/fix-key-led-update.patch
@@ -0,0 +1,46 @@
+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.1.1-r1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..5152538a5ee4
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.1.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 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.1.1-r1.ebuild,v 1.1 2007/08/02 00:03:14 dberkholz 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.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="
+	${FILESDIR}/dont-release-keys-on-newer-servers.patch
+	${FILESDIR}/fix-key-led-update.patch
+	"
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..e24c799206f4
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.2.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 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.2.0-r1.ebuild,v 1.1 2007/08/02 00:03:14 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Keyboard input driver"
+KEYWORDS=""
+RDEPEND=">=x11-base/xorg-server-1.2.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES="
+	${FILESDIR}/dont-release-keys-on-newer-servers.patch
+	${FILESDIR}/fix-key-led-update.patch
+	"