Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 48 insertions, 4 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 283827d96194..03475b9219b8 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.144 2011/10/14 22:07:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.145 2011/11/21 00:00:00 chithanh Exp $
+
+*xkeyboard-config-2.4.1-r2 (20 Nov 2011)
+
+  20 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.1-r1.ebuild, +xkeyboard-config-2.4.1-r2.ebuild,
+  +files/xkeyboard-config-2.4.1-shift-backspace.patch:
+  Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
 
 *xkeyboard-config-2.4.1-r1 (14 Oct 2011)
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index b1cb1c97ab8f..8d420b89078e 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,5 @@
 AUX xkeyboard-config-2.4.1-extended-function-keys.patch 8001 RMD160 d9ce813b423462167112f17b04f8105eb9c67682 SHA1 9edcc0013c89d8e439dcdc49569f5522ddd5b35d SHA256 04c46922f2b495016230dbe8f4b85e4e5f520eb0dc649ab170039fda85120497
+AUX xkeyboard-config-2.4.1-shift-backspace.patch 1397 RMD160 99df457599d66c9886241ab573b8cf451082ef3c SHA1 d8a5a2ec6fd63c33415d50dc1640027ab09d90a5 SHA256 b789e3fab3c4581f0b87a26ad4b38248cc6c69db48bd8a074b3289157f6b055e
 DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
 DIST xkeyboard-config-2.2.1.tar.bz2 739766 RMD160 f9e6147e664a8834b49ddb36eb553c49c81ffd65 SHA1 3962f1e92e9defb0382ce46ec0cc86cc30ff897f SHA256 642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0
 DIST xkeyboard-config-2.3.tar.bz2 771953 RMD160 a89d10bfbab88c8c1f1330bcfe82cb38f32918f8 SHA1 a49c4cce9cfb7003aa04a32114f369c6bd7a9077 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80
@@ -6,6 +7,6 @@ DIST xkeyboard-config-2.4.1.tar.bz2 813373 RMD160 942692b54f0c9e06d95063bd90ce0f
 EBUILD xkeyboard-config-2.1.ebuild 1103 RMD160 155ae87d8c1f97ff4d1f32b842a5421ae7fc0e0c SHA1 ef50975ed8e526f9fead4d47b6ffa22714da5023 SHA256 e73a3bfd0f395673a779fd2dcb59379221eebb91d2451798d74865a27fc90020
 EBUILD xkeyboard-config-2.2.1-r1.ebuild 1334 RMD160 c7d1b60830c370e7d81b4ac1c20f925cbfb25d48 SHA1 e223aa5b78589a17df2499e08828792bdb0689a2 SHA256 5b62d2bc959ee5098cb1bc98a70cdb511b98e13997d4d0ff81dca609f81ab08d
 EBUILD xkeyboard-config-2.3.ebuild 1340 RMD160 1e43ea3af05c70acbf4aae1ad78e23fdb53107f9 SHA1 7d511eed3fed65869859579d8d81820aa44a7339 SHA256 57a04ac5d1a22c5e93bd93ffe1f91186969cd407039bab55145d5d86214b103d
-EBUILD xkeyboard-config-2.4.1-r1.ebuild 1414 RMD160 ee10ab53d01785e49375a96f72fe9400aea9ecf2 SHA1 d0d06af4a3e73d3a069bfbfc921491a5f8cb1d13 SHA256 680efbf7bd128b27756142730b2124bbcf9c9ef3aa6a9a61f7d65d5679142d30
-MISC ChangeLog 20529 RMD160 3a6717129235ed0a1aa93f1f1227c3020cdfb4cf SHA1 bc73ce7cf9e61176fbb7529c67f407f4a628fb4a SHA256 d8f9454622d06f094164ed49a57bb2da339ab898ee75f45d5a871674cd342854
+EBUILD xkeyboard-config-2.4.1-r2.ebuild 1456 RMD160 ff648c00fb4e5a2672324a8f0a2989a6e424309c SHA1 e65c3cd14a0eae69993e471592d25fbc8889aeec SHA256 6a0fb9ddd97a627a7ce73945352e5500f89e31892a680474dcd479bbcd90377b
+MISC ChangeLog 20843 RMD160 00cbb0d70f52cd691080c9d12f74420079d9cc5f SHA1 c90296e1b6e60e778e790bf9d6bf43d8740300f2 SHA256 39d509bb8e18cd7253f4b536965ad999ef1d03fa0dbbfbdb0223c22ef3041175
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
new file mode 100644
index 000000000000..cfc5c3a6fcc8
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
@@ -0,0 +1,35 @@
+From 81fc86a911b55481b9597bb9284b3beca460104c Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Sun, 20 Nov 2011 20:03:26 +0000
+Subject: Extend BackSpace to the 2nd group
+
+https://bugs.freedesktop.org/show_bug.cgi?id=43098
+---
+diff --git a/symbols/pc b/symbols/pc
+index e1965ce..7e13ecb 100644
+--- a/symbols/pc
++++ b/symbols/pc
+@@ -14,7 +14,7 @@ xkb_symbols "pc105" {
+     include "pc(editing)"
+     include "keypad(x11)"
+ 
+-    key <BKSP> {	[ BackSpace	]	};
++    key <BKSP> {	[ BackSpace, BackSpace	]	};
+ 
+     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+     key <RTRN> {	[ Return	]	};
+diff --git a/symbols/us b/symbols/us
+index 1d8bdd0..7c3ee24 100644
+--- a/symbols/us
++++ b/symbols/us
+@@ -573,7 +573,7 @@ xkb_symbols "dvp" {
+     key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+     key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+     key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
+-    key <BKSP> { [ BackSpace                                                    ] };
++    key <BKSP> { [ BackSpace,       BackSpace                                   ] };
+ 
+     // upper row, left side
+     key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
index 9de060ef9b02..033638e91174 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild,v 1.1 2011/10/14 22:07:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild,v 1.1 2011/11/21 00:00:00 chithanh Exp $
 
 EAPI=4
 
@@ -36,6 +36,7 @@ XORG_CONFIGURE_OPTIONS=(
 
 PATCHES=(
 	"${FILESDIR}"/${P}-extended-function-keys.patch
+	"${FILESDIR}"/${P}-shift-backspace.patch
 )
 
 src_prepare() {