+++ /dev/null
-From 2bcfa978e94562f798886a12f86141c9e4a15458 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 Caps_Lock 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 #30898 for usecases and arguments.
----
- rules/base.o_s.part | 1 +
- rules/base.xml.in | 6 ++++++
- symbols/capslock | 11 +++++++++++
- 3 files changed, 18 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/rules/base.xml.in b/rules/base.xml.in
-index 15581b7..86aab3e 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -5272,6 +5272,12 @@
- <_description>Caps Lock is disabled</_description>
- </configItem>
- </option>
-+ <option>
-+ <configItem>
-+ <name>caps:ctrl_modifier</name>
-+ <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>
-+ </configItem>
-+ </option>
- </group>
- <group allowMultipleSelection="false">
- <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
-diff --git a/symbols/capslock b/symbols/capslock
-index 415e4db..18a4045 100644
---- a/symbols/capslock
-+++ b/symbols/capslock
-@@ -63,3 +63,14 @@ xkb_symbols "numlock" {
- key <CAPS> { [ Num_Lock ] };
- };
-
-+// This changes the modifier behavior of the <CAPS> key.
-+// The keysym will be reset to Caps_Lock
-+partial hidden modifier_keys
-+xkb_symbols "ctrl_modifier" {
-+ replace key <CAPS> {
-+ type[Group1] = "ONE_LEVEL",
-+ symbols[Group1] = [ Caps_Lock ],
-+ actions[Group1] = [ SetMods(modifiers=Control) ]
-+ };
-+ modifier_map Control { <CAPS> };
-+};
---
-1.7.4.1
-
+++ /dev/null
-# 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
-}