(#124657) Fix scroll lock randomly turning on and off.

(Portage version: 2.1_pre6-r3)

4 files changed, 38 insertions, 2 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 77450f53ba62..c8da558dab70 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.8 2006/03/09 14:26:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.9 2006/03/23 08:21:56 spyderous Exp $
+
+*xkeyboard-config-0.7-r2 (23 Mar 2006)
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/0.7-fix-scroll-lock.patch, -xkeyboard-config-0.7-r1.ebuild,
+  +xkeyboard-config-0.7-r2.ebuild:
+  (#124657) Fix scroll lock randomly turning on and off.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org>
   xkeyboard-config-0.7-r1.ebuild:
diff --git a/x11-misc/xkeyboard-config/files/0.7-fix-scroll-lock.patch b/x11-misc/xkeyboard-config/files/0.7-fix-scroll-lock.patch
new file mode 100644
index 000000000000..1c764879b086
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/0.7-fix-scroll-lock.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/show_bug.cgi?id=124657
+https://bugs.freedesktop.org/show_bug.cgi?id=5635
+
+===================================================================
+RCS file: /srv/anoncvs.freedesktop.org/cvs/xlibs/xkbdesc/types/level5,v
+rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xlibs/xkbdesc/types/level5,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- xkbdesc.orig/types/level5	2005/10/17 00:40:47	1.2
++++ xkbdesc/types/level5	2006/01/22 17:49:45	1.3
+@@ -6,8 +6,7 @@
+     // Defines style a with four level shift. It is similar to three_level
+     // type used for iso9995 but it lets the shift key behave "normally".
+ 
+-    virtual_modifiers LevelThree;
+-    virtual_modifiers LevelFive;
++    virtual_modifiers LevelThree,ScrollLock,LevelFive;
+ 
+     type "EIGHT_LEVEL" {
+         modifiers = Shift+LevelThree+LevelFive;
diff --git a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.7-r1 b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.7-r2
index 8b2d47035668..8b2d47035668 100644
--- a/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.7-r1
+++ b/x11-misc/xkeyboard-config/files/digest-xkeyboard-config-0.7-r2
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-0.7-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-0.7-r2.ebuild
index c9645b77887f..21a341d316c5 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-0.7-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-0.7-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.7-r1.ebuild,v 1.4 2006/03/09 14:26:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-0.7-r2.ebuild,v 1.1 2006/03/23 08:21:56 spyderous Exp $
+
+inherit eutils
 
 DESCRIPTION="X keyboard configuration database"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
@@ -13,6 +15,12 @@ RDEPEND="x11-apps/xkbcomp
 DEPEND="${RDEPEND}
 	dev-perl/XML-Parser"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-fix-scroll-lock.patch
+}
+
 src_compile() {
 	econf \
 		--with-xkb-base=/usr/share/X11/xkb \