5 files changed, 50 insertions, 21 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/Manifest b/x11-misc/xkeyboard-config/Manifest
index ec111ed31262..67ec00a1b799 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b556177293690ceef23185234a2e5550 ChangeLog 1663
-RMD160 9383a9c2814b39882f34eb57bdd03c287b332a10 ChangeLog 1663
-SHA256 12482af09fe51b158521e0242e29b19138c8b6355e52a5f3a2224ca747723bd2 ChangeLog 1663
-MD5 4f001336d3586f17a77a5573aa9c0e04 files/digest-xkeyboard-config-0.7-r1 265
-RMD160 6b0855607630af9b09be007db4c6f190dd527a4a files/digest-xkeyboard-config-0.7-r1 265
-SHA256 255a2147fb168a17ca6a92818b46de8853577886e617b42e2df4fc8d1f64c53f files/digest-xkeyboard-config-0.7-r1 265
+MD5 fbb347289bd62e1ffcd05a7a845bedae ChangeLog 1921
+RMD160 675d9e6c264b1259c24b2ae9f59ba03bd4659d79 ChangeLog 1921
+SHA256 cecf3b2b3d921ce83187738143d336784bd434deaeb713e802719b73b331704c ChangeLog 1921
+MD5 9556c7c19ebd95071e3ea0002966918a files/0.7-fix-scroll-lock.patch 910
+RMD160 819048e5bab37bc7ea34c85188d902a5d9763e35 files/0.7-fix-scroll-lock.patch 910
+SHA256 2d553282be87b76adbd91ea31684810e3263f1b31eb7ca5a9da07bb8fe2e3c6a files/0.7-fix-scroll-lock.patch 910
+MD5 4f001336d3586f17a77a5573aa9c0e04 files/digest-xkeyboard-config-0.7-r2 265
+RMD160 6b0855607630af9b09be007db4c6f190dd527a4a files/digest-xkeyboard-config-0.7-r2 265
+SHA256 255a2147fb168a17ca6a92818b46de8853577886e617b42e2df4fc8d1f64c53f files/digest-xkeyboard-config-0.7-r2 265
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 419f1b7d1d42b7460243a893f40967e9 xkeyboard-config-0.7-r1.ebuild 992
-RMD160 21d450719da4f32c798931c7b0a44a2724aedf9b xkeyboard-config-0.7-r1.ebuild 992
-SHA256 4d9615617898ea75fb7e69c437c72f24f504f77b23b88cd5687fbcb6000373cc xkeyboard-config-0.7-r1.ebuild 992
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFEEDsHJrHF4yAQTrARAsoHAJ94stSlteuo6BOdNb5UNoGXThsz9wCgkIUv
-JoYEPUd+4oqdm4qx77VtRqI=
-=EQUg
------END PGP SIGNATURE-----
+MD5 6c2848316a324db32ccf7f047b6980a2 xkeyboard-config-0.7-r2.ebuild 1097
+RMD160 6af015359355864e20a124de51b731d54763ff13 xkeyboard-config-0.7-r2.ebuild 1097
+SHA256 50177070ad1c1e79018674f5326e5513690c6a24b79d076a6e15b6a672b4ee78 xkeyboard-config-0.7-r2.ebuild 1097
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 \