Load keyboard layouts with uppercase letters, #121444.

(Portage version: 2.0.54)

5 files changed, 54 insertions, 2 deletions

diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 17c9586ab23a..28940f1bb102 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.40 2006/01/22 22:53:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.41 2006/02/03 17:39:42 carlo Exp $
+
+*kxkb-3.5.1-r1 (03 Feb 2006)
+
+  03 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kxkb3.5.1.xx_XX_layouts.patch, +kxkb-3.5.1-r1.ebuild:
+  Load keyboard layouts with uppercase letters, #121444.
 
 *kxkb-3.5.1 (23 Jan 2006)
 
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index 6ad1a41c55d2..6107237f32d8 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,12 +1,15 @@
-MD5 22d9174e6f16d186286044a18cce4eb1 ChangeLog 5102
+MD5 e3b98e17ee48e7189f4ff16cf7a39ae8 ChangeLog 5302
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kxkb-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kxkb-3.4.3 68
 MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kxkb-3.5.0 142
 MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kxkb-3.5.1 68
+MD5 358c22d072b322d89bd54d98403c5eb6 files/digest-kxkb-3.5.1-r1 68
+MD5 42226b3baf60c509e74036e7bb7a7b4e files/kxkb3.5.1.xx_XX_layouts.patch 806
 MD5 421bfb1b3a38ff0fa7428dca89981ff3 kxkb-3.4.1.ebuild 399
 MD5 fba2ac6062d3c7e87e6c3762ee19c245 kxkb-3.4.2.ebuild 412
 MD5 6bb9bb872499703635e47ca53c1b4981 kxkb-3.4.3.ebuild 406
 MD5 d0864f4c15353d727b87e1a21ca3e077 kxkb-3.5.0.ebuild 707
+MD5 58124479721e10dbac69abd7c08b81d2 kxkb-3.5.1-r1.ebuild 555
 MD5 201d512ececea0b9c91100a1f3390a00 kxkb-3.5.1.ebuild 502
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kxkb/files/digest-kxkb-3.5.1-r1 b/kde-base/kxkb/files/digest-kxkb-3.5.1-r1
new file mode 100644
index 000000000000..a74001cfd2ff
--- /dev/null
+++ b/kde-base/kxkb/files/digest-kxkb-3.5.1-r1
@@ -0,0 +1 @@
+MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch b/kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch
new file mode 100644
index 000000000000..741c0d348ffa
--- /dev/null
+++ b/kde-base/kxkb/files/kxkb3.5.1.xx_XX_layouts.patch
@@ -0,0 +1,22 @@
+Index: rules.cpp
+===================================================================
+--- kxkb/rules.cpp	(revision 504758)
++++ kxkb/rules.cpp	(working copy)
+@@ -300,7 +300,7 @@
+  */
+ const QString KeyRules::getLayout(const QString &layvar) const
+ {
+-  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
++  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
+   QString varLine = layvar.stripWhiteSpace();
+   QRegExp rx(LAYOUT_PATTERN);
+   int pos = rx.search(varLine, 0);
+@@ -318,7 +318,7 @@
+  */
+ const QString KeyRules::getVariant(const QString &layvar) const
+ {
+-  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
++  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
+   QString varLine = layvar.stripWhiteSpace();
+   QRegExp rx(VARIANT_PATTERN);
+   int pos = rx.search(varLine, 0);
diff --git a/kde-base/kxkb/kxkb-3.5.1-r1.ebuild b/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..e98ca33a8631
--- /dev/null
+++ b/kde-base/kxkb/kxkb-3.5.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:39:42 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="Kicker applet for management of X keymaps"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	|| ( (
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )"
+
+PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch"