From: Nick Bowler <nbowler@draconx.ca>
Date: Fri, 15 Apr 2011 01:50:25 +0000 (-0400)
Subject: xkeyboard-config: Remove ebuild.
X-Git-Url: https://git.draconx.ca/gitweb/gentoo-draconx.git/commitdiff_plain/5431aa4c7d5000d185814cc81a1ae30bc1a58688

xkeyboard-config: Remove ebuild.

Version 2.2.1 has the caps:ctrl_modifier option.
---

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
deleted file mode 100644
index eb9337c..0000000
--- a/x11-misc/xkeyboard-config/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX 0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch 2250 RMD160 91034ea84605f13963b59917f77b8adcb5327763 SHA1 8b43f9b054a075494d1aabe8dabc5a324e9cfc35 SHA256 0177159eeff7779f5b0721b035ebd6da51b58e852282ce25549a63b4e09d6624
-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
deleted file mode 100644
index ea55e76..0000000
--- a/x11-misc/xkeyboard-config/files/0001-Add-option-to-bind-Control-modifier-to-CAPS-key-whil.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
-
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
deleted file mode 100644
index e00c03f..0000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-}