From 39d78477e62a93a278cbebae1b7bf6485d2d3769 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Fri, 25 Feb 2011 15:45:45 -0500
Subject: [PATCH] xkeyboard-config: Add new ebuild with capslock-as-control
 fix.

---
 x11-misc/xkeyboard-config/Manifest            |  3 ++
 ...nd-Control-modifier-to-CAPS-key-whil.patch | 44 +++++++++++++++++++
 .../xkeyboard-config-2.1.ebuild               | 42 ++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 x11-misc/xkeyboard-config/Manifest
 create mode 100644 x11-misc/xkeyboard-config/files/0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch
 create mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
new file mode 100644
index 0000000..b6b312a
--- /dev/null
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -0,0 +1,3 @@
+AUX 0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch 1503 RMD160 2b6e509a313f10cf7b44d4fbdade391d0e4624cd SHA1 a62d824b9635343d7d09ecaf69c3ddecef06bb84 SHA256 0433b284065ad6653014bec19a151ededecfd058eec7f2c56014334275033152
+DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
+EBUILD xkeyboard-config-2.1.ebuild 1190 RMD160 868c60590b08a265950abc4743f7a1f89aa965bc SHA1 26edb54f228186d923b5a6de5bf44bd5d707b721 SHA256 a35fff84659a4abd536ba322760761b0492fc7194d368121aa6f9af0d352f078
diff --git a/x11-misc/xkeyboard-config/files/0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch b/x11-misc/xkeyboard-config/files/0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch
new file mode 100644
index 0000000..d12185e
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch
@@ -0,0 +1,44 @@
+From d9963dd166d6e4687864261e0ca31de2a2c7ffa8 Mon Sep 17 00:00:00 2001
+From: Stephan Hilb <stephan@ecshi.net>
+Date: Sat, 19 Feb 2011 14:06:28 +0100
+Subject: [PATCH] Add option to bind Control modifier to <CAPS> key while preserving the keysym
+
+Allows the <CAPS> key to act as a Control modifier while still being
+recognized as the caps lock key through its keysym (CapsLock).  See
+---
+ rules/base.o_s.part |    1 +
+ symbols/capslock    |    9 +++++++++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/rules/base.o_s.part b/rules/base.o_s.part
+index 6ce87e3..5ac467a 100644
+--- a/rules/base.o_s.part
++++ b/rules/base.o_s.part
+@@ -59,6 +59,7 @@
+   caps:super		=	+capslock(super)
+   caps:hyper		=	+capslock(hyper)
+   caps:none		=	+capslock(none)
++  caps:ctrl_modifier	=	+capslock(ctrl_modifier)
+   ctrl:nocaps		=	+ctrl(nocaps)
+   ctrl:lctrl_meta	=	+ctrl(lctrl_meta)
+   ctrl:swapcaps		=	+ctrl(swapcaps)
+diff --git a/symbols/capslock b/symbols/capslock
+index 415e4db..9f58c79 100644
+--- a/symbols/capslock
++++ b/symbols/capslock
+@@ -63,3 +63,12 @@ xkb_symbols "numlock" {
+     key <CAPS> {        [       Num_Lock  ]       };
+ };
+ 
++// This just changes the modifier behavior of the <CAPS> key.
++// The keysym will be preserved (in most cases Caps_Lock)
++partial modifier_keys xkb_symbols "ctrl_modifier" {
++    replace key <CAPS> {
++        type[Group1] = "ONE_LEVEL",
++        actions[Group1] = [ SetMods(modifiers=Control) ]
++    };
++    modifier_map Control { <CAPS> };
++};
+-- 
+1.7.3.4
+
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
new file mode 100644
index 0000000..e00c03f
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
@@ -0,0 +1,42 @@
+# 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.1.ebuild,v 1.7 2011/02/23 16:37:53 jer Exp $
+
+EAPI=3
+
+XORG_STATIC=no
+
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="${BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="x11-apps/xkbcomp"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	dev-perl/XML-Parser"
+
+CONFIGURE_OPTIONS="
+	--with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\"
+	--enable-compat-rules
+	--with-xkb-rules-symlink=xorg"
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch
+}
+
+src_compile() {
+	# cleanup to make sure .dir files are regenerated
+	# bug #328455 c#26
+	emake clean || die
+	xorg-2_src_compile
+}
-- 
2.43.2