public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/ikelos:master commit in: x11-misc/xkeyboard-config/, x11-misc/xkeyboard-config/files/
@ 2012-01-20 11:40 Mike Auty
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2012-01-20 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     2664dcfe92c0e60607eb98626ccb98ff1eece928
Author:     Mike Auty <mike.auty <AT> gmail <DOT> com>
AuthorDate: Thu Jan 19 10:56:41 2012 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 10:56:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=2664dcfe

Add in xkeyboard-config.

---
 x11-misc/xkeyboard-config/ChangeLog                |  632 ++++++++++++++++++++
 x11-misc/xkeyboard-config/Manifest                 |    7 +
 ...board-config-2.4.1-extended-function-keys.patch |  216 +++++++
 .../xkeyboard-config-2.4.1-shift-backspace.patch   |   35 ++
 .../files/xkeyboard-config-2.4.1-ungrab.patch      |   17 +
 x11-misc/xkeyboard-config/metadata.xml             |    5 +
 .../xkeyboard-config-2.4.1-r2.ebuild               |   55 ++
 7 files changed, 967 insertions(+), 0 deletions(-)

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
new file mode 100644
index 0000000..03be3ff
--- /dev/null
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -0,0 +1,632 @@
+# ChangeLog for x11-misc/xkeyboard-config
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.149 2011/12/27 21:12:16 maekke Exp $
+
+  27 Dec 2011; Markus Meier <maekke@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  x86 stable, bug #394393
+
+  21 Dec 2011; Markus Meier <maekke@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  arm stable, bug #394393
+
+  20 Dec 2011; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  Stable for HPPA (bug #394393).
+
+  20 Dec 2011; Agostino Sarubbo <ago@gentoo.org>
+  xkeyboard-config-2.4.1-r2.ebuild:
+  Stable for AMD64, wrt bug #394393
+
+*xkeyboard-config-2.4.1-r2 (20 Nov 2011)
+
+  20 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.1-r1.ebuild, +xkeyboard-config-2.4.1-r2.ebuild,
+  +files/xkeyboard-config-2.4.1-shift-backspace.patch:
+  Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
+
+*xkeyboard-config-2.4.1-r1 (14 Oct 2011)
+
+  14 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.1.ebuild, +xkeyboard-config-2.4.1-r1.ebuild,
+  +files/xkeyboard-config-2.4.1-extended-function-keys.patch:
+  Add upstream patch to unbreak extended function keys, bug #386561.
+
+*xkeyboard-config-2.4.1 (04 Oct 2011)
+
+  04 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xkeyboard-config-2.4.ebuild, +xkeyboard-config-2.4.1.ebuild:
+  Version bump to fix bug #385673. Drop broken release.
+
+  03 Oct 2011; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-2.3.ebuild:
+  Marked ppc ppc64 stable for bug #380421.
+
+  02 Oct 2011; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.3.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #380421
+
+*xkeyboard-config-2.4 (02 Oct 2011)
+
+  02 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.4.ebuild:
+  Version bump.
+
+  21 Sep 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.3.ebuild:
+  Stable for HPPA (bug #380421).
+
+  05 Sep 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.3.ebuild:
+  arm stable, bug #380421
+
+  04 Sep 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.3.ebuild:
+  x86 stable, bug #380421
+
+  30 Aug 2011; Tony Vroon <chainsaw@gentoo.org> xkeyboard-config-2.3.ebuild:
+  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in bug
+  #380421 filed by Chí-Thanh Christopher Nguyễn.
+
+  30 Jul 2011; Matt Turner <mattst88@gentoo.org> xkeyboard-config-2.1.ebuild,
+  xkeyboard-config-2.2.1-r1.ebuild, xkeyboard-config-2.3.ebuild:
+  Update xkbcomp dependency to >=1.2.1. Bug 375547.
+
+  15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  ppc64 stable wrt #363965
+
+  28 Jun 2011; Brent Baude <ranger@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  Marking xkeyboard-config-2.2.1-r1 ppc for bug 363965
+
+  14 Jun 2011; Markus Duft <mduft@gentoo.org> xkeyboard-config-2.3.ebuild:
+  added ~x86-interix prefix keyword
+
+*xkeyboard-config-2.3 (06 Jun 2011)
+
+  06 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.3.ebuild:
+  Version bump.
+
+  15 May 2011; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #363965
+
+  13 May 2011; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  Stable for HPPA (bug #363965).
+
+  13 May 2011; Markus Meier <maekke@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  arm stable, bug #363965
+
+  09 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  x86 stable wrt bug #363965
+
+  28 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
+  xkeyboard-config-2.2.1-r1.ebuild:
+  Stable on amd64 wrt bug #363965
+
+*xkeyboard-config-2.2.1-r1 (20 Apr 2011)
+
+  20 Apr 2011; Michał Górny <mgorny@gentoo.org>
+  -xkeyboard-config-2.2.1.ebuild, +xkeyboard-config-2.2.1-r1.ebuild:
+  Migrate to XORG_CONFIGURE_OPTIONS array. This fixes bug #358637.
+
+*xkeyboard-config-2.2.1 (06 Apr 2011)
+
+  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-2.2.ebuild, +xkeyboard-config-2.2.1.ebuild:
+  Version bump. Drop older.
+
+*xkeyboard-config-2.2 (04 Apr 2011)
+
+  04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.9.ebuild, -xkeyboard-config-2.0-r1.ebuild,
+  +xkeyboard-config-2.2.ebuild:
+  Version bump. Drop older.
+
+  18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.9.ebuild, xkeyboard-config-2.0-r1.ebuild:
+  Fix URI calculation in ALL ebuilds. Thx to Mr_bones.
+
+  17 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  Fix src_uri calculation.
+
+  05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  ppc64 stable wrt #354237
+
+  05 Mar 2011; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.1.ebuild:
+  alpha/arm/ia64/s390/sh/sparc stable wrt #354237
+
+  01 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild, xkeyboard-config-2.1.ebuild:
+  Fix building with new xorg-2 eclass
+
+  23 Feb 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.1.ebuild:
+  Stable for HPPA (bug #354237).
+
+  14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  ppc stable wrt #344827, #354237
+
+  13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.7.ebuild:
+  old
+
+  12 Feb 2011; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #344827
+
+  12 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  stable x86, bug 354237
+
+  12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  Stable on amd64 wrt bug #354237
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  OOps only testing keywords it should have :)
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-2.1.ebuild:
+  Sync with live version.
+
+*xkeyboard-config-2.1 (26 Jan 2011)
+
+  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xkeyboard-config-2.1.ebuild:
+  Version bump
+
+  31 Dec 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.0-r1.ebuild:
+  Stable for HPPA (bug #344827).
+
+  29 Dec 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.0-r1.ebuild:
+  arm stable, bug #344827
+
+  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  x86 stable, bug 344827
+
+  23 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  amd64 stable wrt #344827
+
+  19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-2.0-r1.ebuild:
+  ppc64 stable wrt #344827
+
+*xkeyboard-config-2.0-r1 (01 Nov 2010)
+
+  01 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-2.0.ebuild, +xkeyboard-config-2.0-r1.ebuild:
+  Revision bump to fix bug #328455 c#26. Thanks to Oldrich Jedlicka for the
+  solution.
+
+  21 Oct 2010; Brent Baude <ranger@gentoo.org> ChangeLog:
+  Marking xkeyboard-config-1.9 ppc stable for bug 239063
+
+*xkeyboard-config-2.0 (28 Sep 2010)
+
+  28 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xkeyboard-config-2.0.ebuild:
+  Version bump.
+
+  28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  ppc64 stable wrt #327777
+
+  19 Sep 2010; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  ia64/s390/sh/sparc stable wrt #327777
+
+  12 Sep 2010; Tobias Klausmann <klausman@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Stable on alpha, bug #327777
+
+  22 Jul 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.9.ebuild:
+  arm stable, bug #327777
+
+  14 Jul 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.9.ebuild:
+  Stable for HPPA (bug #327777).
+
+  13 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  x86 stable, bug 327777
+
+  12 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Stable on amd64 wrt bug #327777
+
+  11 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.9.ebuild:
+  Migrate to xorg-2 eclass.
+
+*xkeyboard-config-1.9 (20 Jun 2010)
+
+  20 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +xkeyboard-config-1.9.ebuild:
+  Version bump.
+
+  18 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  Bump to EAPI=3, add prefix keywords
+
+  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkeyboard-config-1.5.ebuild, -xkeyboard-config-1.6.ebuild:
+  rm
+
+  19 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  s390 stable wrt #294958
+
+  18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  alpha/ia64/sh/sparc stable wrt #294958
+
+  14 Jan 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.7.ebuild:
+  arm stable, bug #294958
+
+  14 Jan 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.7.ebuild:
+  Stable for HPPA (bug #294958).
+
+  27 Dec 2009; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-1.7.ebuild:
+  Marked ppc stable for bug #294958.
+
+  15 Dec 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.7.ebuild:
+  Marking xkeyboard-config-1.7 ppc64 stable for bug 294958
+
+  10 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  x86 stable, bug 294958
+
+  10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  amd64 stable wrt #294958
+
+  03 Dec 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.6.ebuild:
+  Marking xkeyboard-config-1.6 ppc64 stable for bug 281427
+
+  21 Nov 2009; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  alpha/ia64/m68k/s390/sh/sparc stable
+
+  26 Oct 2009; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.6.ebuild:
+  Stable for HPPA (bug #282290).
+
+  11 Oct 2009; nixnut <nixnut@gentoo.org> xkeyboard-config-1.6.ebuild:
+  ppc stable #282290
+
+  09 Oct 2009; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.6.ebuild:
+  arm stable, bug #282290
+
+  08 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  xkeyboard-config-1.7.ebuild:
+  Depend on intltool not gettext as required in configure. Per bug #287964.
+
+  08 Oct 2009; Olivier Crête <tester@gentoo.org> ChangeLog:
+  Stable on amd64, bug #281427
+
+  06 Oct 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.7.ebuild:
+  make the ebuild more EAPI=2-like
+
+*xkeyboard-config-1.7 (06 Oct 2009)
+
+  06 Oct 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.7.ebuild:
+  bump to 1.7, sync with x11 overlay
+
+  06 Oct 2009; Rémi Cardona <remi@gentoo.org> -xkeyboard-config-1.1.ebuild:
+  drop old ebuilds
+
+  05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  x86 stable, bug 282290
+
+  30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  amd64 stable wrt #282290
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.1.ebuild,
+  xkeyboard-config-1.5.ebuild, xkeyboard-config-1.6.ebuild:
+  add missing build-time gettext dep (fixes bug #221127)
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org>
+  -xkeyboard-config-0.8-r1.ebuild, -xkeyboard-config-0.9.ebuild,
+  -xkeyboard-config-1.2.ebuild, -xkeyboard-config-1.3.ebuild,
+  -xkeyboard-config-1.4.ebuild, -files/add_missing_lsgt.patch:
+  drop old ebuilds (will drop 1.1 later)
+
+  23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.6.ebuild:
+  drop accidental stable alpha keyword on 1.6
+
+  23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Stable on alpha. It's needed for xorg-server-1.5/xorg-x11-7.4
+
+  23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
+  xkeyboard-config-1.6.ebuild:
+  Stable on alpha for xorg-server-1.5/xorg-x11-7.4
+
+*xkeyboard-config-1.6 (13 Jun 2009)
+
+  13 Jun 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.6.ebuild:
+  bump to 1.6
+
+  15 May 2009; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  arm/m68k/s390 stable
+
+  16 Apr 2009; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.5.ebuild:
+  Stable for HPPA (bug #251832).
+
+  15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  ia64/sh stable wrt #251832
+
+  06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Stable on sparc, bug #251832
+
+  05 Apr 2009; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.5.ebuild:
+  x86 stable, bug #251832
+
+  05 Apr 2009; Olivier Crête <tester@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Stable on amd64, bug #251832
+
+  03 Apr 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.5.ebuild:
+  Marking xkeyboard-config-1.5 ppc64 stable for bug 251832
+
+  03 Apr 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.5.ebuild:
+  Marking xkeyboard-config-1.5 ppc stable for bug 251832
+
+  31 Mar 2009; Justin Bronder <jsbronder@gentoo.org>
+  xkeyboard-config-1.5.ebuild:
+  Update license, #263535
+
+*xkeyboard-config-1.5 (28 Jan 2009)
+
+  28 Jan 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.5.ebuild:
+  bump to 1.5
+
+  23 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild, xkeyboard-config-0.9.ebuild,
+  xkeyboard-config-1.1.ebuild, xkeyboard-config-1.2.ebuild,
+  xkeyboard-config-1.3.ebuild, xkeyboard-config-1.4.ebuild:
+  add missing dep on dev-util/intltool (fixes bug #243226)
+
+  16 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  xkeyboard-config-1.4.ebuild:
+  Move x11-apps/xkbcomp to DEPEND from RDEPEND. This helps prepare for
+  possible use of XKB files on the console in addition to within X by
+  removing runtime X-related dependencies. The console-setup package in
+  other distros contains tools for handling this called ckb (ckbcomp, etc.).
+  I'd like to look into using this in Gentoo instead of sys-apps/kbd.
+
+*xkeyboard-config-1.4 (14 Oct 2008)
+
+  14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.4.ebuild:
+  Version bump.
+
+*xkeyboard-config-1.3 (10 Jun 2008)
+
+  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.3.ebuild:
+  Bump. Around 40 bugs from freedesktop.org bugzilla were fixed. Dropped old
+  rulesets sgi and sun. Added a lot of metadata, related to countries and
+  languages.
+
+  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  xkeyboard-config-1.2.ebuild:
+  Revert stable keyword for amd64 because of Comment #1 in bug 213933.
+
+  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  xkeyboard-config-1.1.ebuild, xkeyboard-config-1.2.ebuild:
+  amd64 stable
+
+  05 Feb 2008; Markus Rothe <corsair@gentoo.org>
+  xkeyboard-config-1.1.ebuild:
+  Stable on ppc64
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xkeyboard-config-0.8.ebuild:
+  Clean up.
+
+*xkeyboard-config-1.2 (30 Jan 2008)
+
+  30 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.2.ebuild:
+  Bump.
+
+  27 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-1.1.ebuild:
+  alpha/ia64/sparc stable
+
+  19 Dec 2007; Dawid Węgliński <cla@gentoo.org>
+  xkeyboard-config-1.1.ebuild:
+  Stable on x86 (bug #202087)
+
+  02 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xkeyboard-config-0.9.ebuild:
+  Stable on amd64/x86 wrt bug #191615.
+
+  29 Sep 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.9.ebuild:
+  sparc stable wrt #191615
+
+  28 Sep 2007; Joshua Kinard <kumba@gentoo.org> xkeyboard-config-0.9.ebuild:
+  Stable on mips, per #191615.
+
+  26 Sep 2007; Samuli Suominen <drac@gentoo.org>
+  files/digest-xkeyboard-config-1.1, Manifest:
+  Fix digest wrt #193868.
+
+  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xkeyboard-config-1.1.ebuild:
+  Use emake on install. Stop adding /usr/share/X11/xkb to CONFIG_PROTECT
+  because of popular demand. If users require protection for this directory,
+  they must create their own file in /etc/env.d/ to do it.
+
+*xkeyboard-config-1.1 (26 Sep 2007)
+
+  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xkeyboard-config-1.1.ebuild:
+  Bugfixes, some new layouts.
+
+  10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-0.9.ebuild:
+  Stable for HPPA (bug #191615).
+
+  09 Sep 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.9.ebuild:
+  alpha/ia64 stable wrt #191615
+
+  08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-0.9.ebuild:
+  Marked ppc/ppc64 stable for bug #191615.
+
+  07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on sparc wrt #175465
+
+  03 Jul 2007; Lars Weiler <pylon@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on ppc; bug #175465.
+
+  02 Jul 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  alpha stable wrt #175465
+
+  24 Jun 2007; Joshua Kinard <kumba@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on mips, per #175465.
+
+  20 May 2007; Jeroen Roovers <jer@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable for HPPA (bug #175465).
+
+  05 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Marked stable on amd64 for bug #175465
+
+  29 Apr 2007; Andrej Kacian <ticho@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  Stable on x86, bug #175465.
+
+  25 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  xkeyboard-config-0.8-r1.ebuild:
+  0.8-r1 ebuild was broken, fixing and stabilizing on ppc64 and ia64
+
+  25 Apr 2007; Markus Rothe <corsair@gentoo.org> ChangeLog:
+  Stable on ppc64; bug #175465
+
+*xkeyboard-config-0.9 (14 Nov 2006)
+
+  14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkeyboard-config-0.9.ebuild:
+  Version bump.  Thanks to Camille Huot for the poke (bug #155124).
+
+*xkeyboard-config-0.8-r1 (03 Sep 2006)
+
+  03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/add_missing_lsgt.patch, +xkeyboard-config-0.8-r1.ebuild:
+  Add missing LSGT symbol to evdev symbols.  (Dennis Schridde, Bug #145097)
+  This should fix the availability of <, > and | for users of this symbol list.
+
+  16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
+  Keywording ppc64 stable per MrBones request
+
+  16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
+  Marking ~ppc64 per MrBones request
+
+  19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xkeyboard-config-0.8.ebuild:
+  Stable on hppa.
+
+  10 Jul 2006; Aron Griffis <agriffis@gentoo.org>
+  xkeyboard-config-0.8.ebuild:
+  Mark 0.8 stable on ia64
+
+  04 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  Some old XKB thing (xkbdata?) installed /usr/share/X11/xkb/symbols/pc as a
+  directory. Now we install it as a file, but portage won't let a file replace
+  a directory so it doesn't get installed. This breaks XKB setups, with
+  numerous reports. Check for the directory in pkg_setup().
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  ppc/sparc/mips/alpha/arm/sh stable
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/0.7-fix-scroll-lock.patch, -xkeyboard-config-0.7-r2.ebuild:
+  Pull old version.
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xkeyboard-config-0.8.ebuild:
+  Stable on amd64.
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  x86 stable.
+
+  21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.8.ebuild:
+  (#130590) Ensure that the old XKB directory gets out of the way (Patrick
+  Allaert).
+
+*xkeyboard-config-0.8 (16 Apr 2006)
+
+  16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkeyboard-config-0.8.ebuild:
+  Bump.
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xkeyboard-config-0.7-r2.ebuild:
+  Add ~x86-fbsd keyword.
+
+*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:
+  Mark 0.7-r1 ~ia64
+
+  23 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7-r1.ebuild:
+  dev-perl/XML-Parser is DEPEND, not RDEPEND.
+
+  21 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7-r1.ebuild:
+  Let xkbcomp take care of creating /var/lib/xkb, as suggested in fd.o bug #5906.
+
+*xkeyboard-config-0.7-r1 (13 Feb 2006)
+
+  13 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -xkeyboard-config-0.7.ebuild, +xkeyboard-config-0.7-r1.ebuild:
+  (#122214) Create /var/lib/xkb so xorg-server doesn't fail later when trying
+  to write to /usr/share/X11/xkb/compiled.
+
+  07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7.ebuild:
+  (#122010) Fix deps, thanks to Caio <errado@gmail.com>.
+
+  07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7.ebuild:
+  Also make the xorg rules symlink.
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xkeyboard-config-0.7.ebuild:
+  Meaningless whitespace change to re-commit and fix manifest.
+
+*xkeyboard-config-0.7 (06 Feb 2006)
+
+  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml,
+  +xkeyboard-config-0.7.ebuild:
+  New, restructured, maintained package for XKB configuration data, expected
+  to supercede xkbdata. Since it's the same collection of data files,
+  keyworded ~arch for the same arches.
+

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
new file mode 100644
index 0000000..7950f33
--- /dev/null
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -0,0 +1,7 @@
+AUX xkeyboard-config-2.4.1-extended-function-keys.patch 8001 RMD160 d9ce813b423462167112f17b04f8105eb9c67682 SHA1 9edcc0013c89d8e439dcdc49569f5522ddd5b35d SHA256 04c46922f2b495016230dbe8f4b85e4e5f520eb0dc649ab170039fda85120497
+AUX xkeyboard-config-2.4.1-shift-backspace.patch 1397 RMD160 99df457599d66c9886241ab573b8cf451082ef3c SHA1 d8a5a2ec6fd63c33415d50dc1640027ab09d90a5 SHA256 b789e3fab3c4581f0b87a26ad4b38248cc6c69db48bd8a074b3289157f6b055e
+AUX xkeyboard-config-2.4.1-ungrab.patch 524 RMD160 05ed440f032c70ec41926e257cfba1c001e2f111 SHA1 e7afa339f3aff1bcc514ab3a29e785a9cc8b1618 SHA256 a004a32aab818070faf9d89ed0c5e02f71b6c255ba0b645e18e4ab6e42211890
+DIST xkeyboard-config-2.4.1.tar.bz2 813373 RMD160 942692b54f0c9e06d95063bd90ce0fedfad5f108 SHA1 0596017597a6ead04ada1dda7e0b2de2ce597adb SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a
+EBUILD xkeyboard-config-2.4.1-r2.ebuild 1483 RMD160 cedf62555b0527bb3abe0189cd183cde1aef34d8 SHA1 cee2caf8095bf7778f0eebbd4dc1e8c4449e3ce7 SHA256 d40b9a9352b445f16a993a53529b41eb39f919c0c8b1129557103cfaa92e9cc9
+MISC ChangeLog 21302 RMD160 b4cc49a535e5874a38a8147dd37d38cae31d0fe3 SHA1 33ace5a81f5e4d2e9d0ff9f106163893c0be1b3c SHA256 1d2f289223a625c835f42f5426bf67d8906813064be5542b21bbcf9170befc7a
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
new file mode 100644
index 0000000..dbf0431
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
@@ -0,0 +1,216 @@
+From 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Wed, 05 Oct 2011 21:26:26 +0000
+Subject: Levels 2-4 for CTRL+ALT are propagated from level 1
+
+---
+diff --git a/symbols/keypad b/symbols/keypad
+index e85aaac..1bab391 100644
+--- a/symbols/keypad
++++ b/symbols/keypad
+@@ -84,19 +84,19 @@ xkb_symbols "x11" {
+ // Ungrab cancels server/keyboard/pointer grabs
+     key <KPDV> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
++        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
+     };
+ 
+ // ClsGrb kills whichever client has a grab in effect
+     key <KPMU> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Multiply,	VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
++        symbols[Group1]= [ KP_Multiply,	KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
+     };
+ 
+ // -VMode switches to the previous video mode
+     key <KPSU> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
++        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
+     };
+ 
+     key  <KP7> {	[  KP_Home,	KP_7	]	};
+@@ -106,7 +106,7 @@ xkb_symbols "x11" {
+ // +VMode switches to the next video mode
+     key <KPAD> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
++        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
+     };
+ 
+     key  <KP4> {	[  KP_Left,	KP_4	]	};
+@@ -242,11 +242,11 @@ xkb_symbols "legacymath" {
+ 
+     key.type[Group1]="CTRL+ALT" ;
+ 
+-    key <KPDV> { [   KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / <XF86_Ungrab>
+-    key <KPMU> { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
+-    key <KPSU> { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
++    key <KPDV> { [   KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / <XF86_Ungrab>
++    key <KPMU> { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
++    key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
+ 
+-    key <KPAD> { [      KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
++    key <KPAD> { [      KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
+ 
+ };
+ 
+@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" {
+ // ClsGrb kills whichever client has a grab in effect
+     key <KOMU> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
++        symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
+     };
+ 
+     key  <KO4> {	[  KP_4	]	};
+@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" {
+ // -VMode switches to the previous video mode
+     key <KOSU> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
++        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
+     };
+ 
+     key  <KO1> {	[  KP_1	]	};
+@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" {
+ // +VMode switches to the next video mode
+     key <KOAD> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
++        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
+     };
+ 
+     key  <KO0> {	[  KP_0	]	};
+@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" {
+ // Ungrab cancels server/keyboard/pointer grabs
+     key <KODV> {
+         type="CTRL+ALT",
+-        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
++        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
+     };
+ };
+diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
+index 7d47d66..73b5af2 100644
+--- a/symbols/srvr_ctrl
++++ b/symbols/srvr_ctrl
+@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" {
+ // Ungrab cancels server/keyboard/pointer grabs
+     key <KPDV> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
++	symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
+     };
+ 
+ // ClsGrb kills whichever client has a grab in effect
+     key <KPMU> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
++	symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
+     };
+ 
+ // -VMode switches to the previous video mode
+     key <KPSU> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
++	symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
+     };
+ 
+ // +VMode switches to the next video mode
+     key <KPAD> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode]
++	symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode]
+     };
+ 
+ };
+@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
+ 
+     key <FK01> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
++	symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ]
+     };
+ 
+     key <FK02> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
++	symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ]
+     };
+ 
+     key <FK03> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
++	symbols[Group1]= [ F3, F3, F3, F3, XF86_Switch_VT_3 ]
+     };
+ 
+     key <FK04> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
++	symbols[Group1]= [ F4, F4, F4, F4, XF86_Switch_VT_4 ]
+     };
+ 
+     key <FK05> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
++	symbols[Group1]= [ F5, F5, F5, F5, XF86_Switch_VT_5 ]
+     };
+ 
+     key <FK06> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
++	symbols[Group1]= [ F6, F6, F6, F6, XF86_Switch_VT_6 ]
+     };
+ 
+     key <FK07> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
++	symbols[Group1]= [ F7, F7, F7, F7, XF86_Switch_VT_7 ]
+     };
+ 
+     key <FK08> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
++	symbols[Group1]= [ F8, F8, F8, F8, XF86_Switch_VT_8 ]
+     };
+ 
+     key <FK09> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
++	symbols[Group1]= [ F9, F9, F9, F9, XF86_Switch_VT_9 ]
+     };
+ 
+     key <FK10> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
++	symbols[Group1]= [ F10, F10, F10, F10, XF86_Switch_VT_10 ]
+     };
+ 
+     key <FK11> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
++	symbols[Group1]= [ F11, F11, F11, F11, XF86_Switch_VT_11 ]
+     };
+ 
+     key <FK12> {
+ 	type="CTRL+ALT",
+-	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
++	symbols[Group1]= [ F12, F12, F12, F12, XF86_Switch_VT_12 ]
+     };
+ 
+ };
+diff --git a/symbols/terminate b/symbols/terminate
+index 96dd6e8..c74220b 100644
+--- a/symbols/terminate
++++ b/symbols/terminate
+@@ -2,6 +2,6 @@ partial default modifier_keys
+ xkb_symbols "ctrl_alt_bksp" {
+     key <BKSP> {
+         type="CTRL+ALT",
+-        symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ]
++        symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ]
+     };
+ };
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
new file mode 100644
index 0000000..cfc5c3a
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
@@ -0,0 +1,35 @@
+From 81fc86a911b55481b9597bb9284b3beca460104c Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Sun, 20 Nov 2011 20:03:26 +0000
+Subject: Extend BackSpace to the 2nd group
+
+https://bugs.freedesktop.org/show_bug.cgi?id=43098
+---
+diff --git a/symbols/pc b/symbols/pc
+index e1965ce..7e13ecb 100644
+--- a/symbols/pc
++++ b/symbols/pc
+@@ -14,7 +14,7 @@ xkb_symbols "pc105" {
+     include "pc(editing)"
+     include "keypad(x11)"
+ 
+-    key <BKSP> {	[ BackSpace	]	};
++    key <BKSP> {	[ BackSpace, BackSpace	]	};
+ 
+     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+     key <RTRN> {	[ Return	]	};
+diff --git a/symbols/us b/symbols/us
+index 1d8bdd0..7c3ee24 100644
+--- a/symbols/us
++++ b/symbols/us
+@@ -573,7 +573,7 @@ xkb_symbols "dvp" {
+     key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+     key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
+     key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
+-    key <BKSP> { [ BackSpace                                                    ] };
++    key <BKSP> { [ BackSpace,       BackSpace                                   ] };
+ 
+     // upper row, left side
+     key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-ungrab.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-ungrab.patch
new file mode 100644
index 0000000..0f5d5f9
--- /dev/null
+++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-ungrab.patch
@@ -0,0 +1,17 @@
+diff --git a/compat/xfree86 b/compat/xfree86
+index cf4a8b2..caa9dce 100644
+--- a/compat/xfree86
++++ b/compat/xfree86
+@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic"  {
+         action = SwitchScreen(Screen=12, !SameServer);
+     };
+ 
+-    interpret XF86_Ungrab {
+-        action = Private(type=0x86, data="Ungrab");
+-    };
+-    interpret XF86_ClearGrab {
+-        action = Private(type=0x86, data="ClsGrb");
+-    };
+     interpret XF86LogGrabInfo {
+         action = Private(type=0x86, data="PrGrbs");
+     };

diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
new file mode 100644
index 0000000..01c4c00
--- /dev/null
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
new file mode 100644
index 0000000..0375ce7
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
@@ -0,0 +1,55 @@
+# 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.4.1-r2.ebuild,v 1.5 2011/12/27 21:12:16 maekke Exp $
+
+EAPI=4
+
+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="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=x11-apps/xkbcomp-1.2.1
+	>=x11-libs/libX11-1.4.2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	>=dev-util/intltool-0.30
+	dev-perl/XML-Parser"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+	--enable-compat-rules
+	# do not check for runtime deps
+	--disable-runtime-deps
+	--with-xkb-rules-symlink=xorg
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-extended-function-keys.patch
+	"${FILESDIR}"/${P}-shift-backspace.patch
+	"${FILESDIR}"/${P}-ungrab.patch
+)
+
+src_prepare() {
+	xorg-2_src_prepare
+	if [[ ${XORG_EAUTORECONF} != no ]]; then
+		intltoolize --copy --automake || die
+	fi
+}
+
+src_compile() {
+	# cleanup to make sure .dir files are regenerated
+	# bug #328455 c#26
+	xorg-2_src_compile clean
+	xorg-2_src_compile
+}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/ikelos:master commit in: x11-misc/xkeyboard-config/, x11-misc/xkeyboard-config/files/
@ 2012-01-20 11:40 Mike Auty
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2012-01-20 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     468b394f53cd38e5e311ffdd7eb7db9c590ba210
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 11:40:08 2012 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 11:40:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=468b394f

Remove xkeyboard-config now an official fix is in the tree.

---
 x11-misc/xkeyboard-config/ChangeLog                |  632 --------------------
 x11-misc/xkeyboard-config/Manifest                 |    7 -
 ...board-config-2.4.1-extended-function-keys.patch |  216 -------
 .../xkeyboard-config-2.4.1-shift-backspace.patch   |   35 --
 .../files/xkeyboard-config-2.4.1-ungrab.patch      |   17 -
 x11-misc/xkeyboard-config/metadata.xml             |    5 -
 .../xkeyboard-config-2.4.1-r2.ebuild               |   55 --
 7 files changed, 0 insertions(+), 967 deletions(-)

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
deleted file mode 100644
index 03be3ff..0000000
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ /dev/null
@@ -1,632 +0,0 @@
-# ChangeLog for x11-misc/xkeyboard-config
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.149 2011/12/27 21:12:16 maekke Exp $
-
-  27 Dec 2011; Markus Meier <maekke@gentoo.org>
-  xkeyboard-config-2.4.1-r2.ebuild:
-  x86 stable, bug #394393
-
-  21 Dec 2011; Markus Meier <maekke@gentoo.org>
-  xkeyboard-config-2.4.1-r2.ebuild:
-  arm stable, bug #394393
-
-  20 Dec 2011; Jeroen Roovers <jer@gentoo.org>
-  xkeyboard-config-2.4.1-r2.ebuild:
-  Stable for HPPA (bug #394393).
-
-  20 Dec 2011; Agostino Sarubbo <ago@gentoo.org>
-  xkeyboard-config-2.4.1-r2.ebuild:
-  Stable for AMD64, wrt bug #394393
-
-*xkeyboard-config-2.4.1-r2 (20 Nov 2011)
-
-  20 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  -xkeyboard-config-2.4.1-r1.ebuild, +xkeyboard-config-2.4.1-r2.ebuild,
-  +files/xkeyboard-config-2.4.1-shift-backspace.patch:
-  Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
-
-*xkeyboard-config-2.4.1-r1 (14 Oct 2011)
-
-  14 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  -xkeyboard-config-2.4.1.ebuild, +xkeyboard-config-2.4.1-r1.ebuild,
-  +files/xkeyboard-config-2.4.1-extended-function-keys.patch:
-  Add upstream patch to unbreak extended function keys, bug #386561.
-
-*xkeyboard-config-2.4.1 (04 Oct 2011)
-
-  04 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  -xkeyboard-config-2.4.ebuild, +xkeyboard-config-2.4.1.ebuild:
-  Version bump to fix bug #385673. Drop broken release.
-
-  03 Oct 2011; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-2.3.ebuild:
-  Marked ppc ppc64 stable for bug #380421.
-
-  02 Oct 2011; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.3.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #380421
-
-*xkeyboard-config-2.4 (02 Oct 2011)
-
-  02 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  +xkeyboard-config-2.4.ebuild:
-  Version bump.
-
-  21 Sep 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.3.ebuild:
-  Stable for HPPA (bug #380421).
-
-  05 Sep 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.3.ebuild:
-  arm stable, bug #380421
-
-  04 Sep 2011; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.3.ebuild:
-  x86 stable, bug #380421
-
-  30 Aug 2011; Tony Vroon <chainsaw@gentoo.org> xkeyboard-config-2.3.ebuild:
-  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in bug
-  #380421 filed by Chí-Thanh Christopher Nguyễn.
-
-  30 Jul 2011; Matt Turner <mattst88@gentoo.org> xkeyboard-config-2.1.ebuild,
-  xkeyboard-config-2.2.1-r1.ebuild, xkeyboard-config-2.3.ebuild:
-  Update xkbcomp dependency to >=1.2.1. Bug 375547.
-
-  15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  ppc64 stable wrt #363965
-
-  28 Jun 2011; Brent Baude <ranger@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  Marking xkeyboard-config-2.2.1-r1 ppc for bug 363965
-
-  14 Jun 2011; Markus Duft <mduft@gentoo.org> xkeyboard-config-2.3.ebuild:
-  added ~x86-interix prefix keyword
-
-*xkeyboard-config-2.3 (06 Jun 2011)
-
-  06 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  +xkeyboard-config-2.3.ebuild:
-  Version bump.
-
-  15 May 2011; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #363965
-
-  13 May 2011; Jeroen Roovers <jer@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  Stable for HPPA (bug #363965).
-
-  13 May 2011; Markus Meier <maekke@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  arm stable, bug #363965
-
-  09 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  x86 stable wrt bug #363965
-
-  28 Apr 2011; Markos Chandras <hwoarang@gentoo.org>
-  xkeyboard-config-2.2.1-r1.ebuild:
-  Stable on amd64 wrt bug #363965
-
-*xkeyboard-config-2.2.1-r1 (20 Apr 2011)
-
-  20 Apr 2011; Michał Górny <mgorny@gentoo.org>
-  -xkeyboard-config-2.2.1.ebuild, +xkeyboard-config-2.2.1-r1.ebuild:
-  Migrate to XORG_CONFIGURE_OPTIONS array. This fixes bug #358637.
-
-*xkeyboard-config-2.2.1 (06 Apr 2011)
-
-  06 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  -xkeyboard-config-2.2.ebuild, +xkeyboard-config-2.2.1.ebuild:
-  Version bump. Drop older.
-
-*xkeyboard-config-2.2 (04 Apr 2011)
-
-  04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  -xkeyboard-config-1.9.ebuild, -xkeyboard-config-2.0-r1.ebuild,
-  +xkeyboard-config-2.2.ebuild:
-  Version bump. Drop older.
-
-  18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  xkeyboard-config-1.9.ebuild, xkeyboard-config-2.0-r1.ebuild:
-  Fix URI calculation in ALL ebuilds. Thx to Mr_bones.
-
-  17 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  Fix src_uri calculation.
-
-  05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  ppc64 stable wrt #354237
-
-  05 Mar 2011; Raúl Porcel <armin76@gentoo.org> xkeyboard-config-2.1.ebuild:
-  alpha/arm/ia64/s390/sh/sparc stable wrt #354237
-
-  01 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
-  xkeyboard-config-2.0-r1.ebuild, xkeyboard-config-2.1.ebuild:
-  Fix building with new xorg-2 eclass
-
-  23 Feb 2011; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.1.ebuild:
-  Stable for HPPA (bug #354237).
-
-  14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  ppc stable wrt #344827, #354237
-
-  13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  -xkeyboard-config-1.7.ebuild:
-  old
-
-  12 Feb 2011; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-2.0-r1.ebuild:
-  alpha/ia64/s390/sh/sparc stable wrt #344827
-
-  12 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  stable x86, bug 354237
-
-  12 Feb 2011; Markos Chandras <hwoarang@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  Stable on amd64 wrt bug #354237
-
-  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  OOps only testing keywords it should have :)
-
-  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  xkeyboard-config-2.1.ebuild:
-  Sync with live version.
-
-*xkeyboard-config-2.1 (26 Jan 2011)
-
-  26 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-  +xkeyboard-config-2.1.ebuild:
-  Version bump
-
-  31 Dec 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.0-r1.ebuild:
-  Stable for HPPA (bug #344827).
-
-  29 Dec 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-2.0-r1.ebuild:
-  arm stable, bug #344827
-
-  25 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
-  xkeyboard-config-2.0-r1.ebuild:
-  x86 stable, bug 344827
-
-  23 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
-  xkeyboard-config-2.0-r1.ebuild:
-  amd64 stable wrt #344827
-
-  19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
-  xkeyboard-config-2.0-r1.ebuild:
-  ppc64 stable wrt #344827
-
-*xkeyboard-config-2.0-r1 (01 Nov 2010)
-
-  01 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  -xkeyboard-config-2.0.ebuild, +xkeyboard-config-2.0-r1.ebuild:
-  Revision bump to fix bug #328455 c#26. Thanks to Oldrich Jedlicka for the
-  solution.
-
-  21 Oct 2010; Brent Baude <ranger@gentoo.org> ChangeLog:
-  Marking xkeyboard-config-1.9 ppc stable for bug 239063
-
-*xkeyboard-config-2.0 (28 Sep 2010)
-
-  28 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  +xkeyboard-config-2.0.ebuild:
-  Version bump.
-
-  28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
-  xkeyboard-config-1.9.ebuild:
-  ppc64 stable wrt #327777
-
-  19 Sep 2010; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.9.ebuild:
-  ia64/s390/sh/sparc stable wrt #327777
-
-  12 Sep 2010; Tobias Klausmann <klausman@gentoo.org>
-  xkeyboard-config-1.9.ebuild:
-  Stable on alpha, bug #327777
-
-  22 Jul 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.9.ebuild:
-  arm stable, bug #327777
-
-  14 Jul 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.9.ebuild:
-  Stable for HPPA (bug #327777).
-
-  13 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
-  xkeyboard-config-1.9.ebuild:
-  x86 stable, bug 327777
-
-  12 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
-  xkeyboard-config-1.9.ebuild:
-  Stable on amd64 wrt bug #327777
-
-  11 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  xkeyboard-config-1.9.ebuild:
-  Migrate to xorg-2 eclass.
-
-*xkeyboard-config-1.9 (20 Jun 2010)
-
-  20 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  +xkeyboard-config-1.9.ebuild:
-  Version bump.
-
-  18 Apr 2010; Jonathan Callen <abcd@gentoo.org>
-  xkeyboard-config-1.7.ebuild:
-  Bump to EAPI=3, add prefix keywords
-
-  23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
-  -xkeyboard-config-1.5.ebuild, -xkeyboard-config-1.6.ebuild:
-  rm
-
-  19 Jan 2010; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.7.ebuild:
-  s390 stable wrt #294958
-
-  18 Jan 2010; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.7.ebuild:
-  alpha/ia64/sh/sparc stable wrt #294958
-
-  14 Jan 2010; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.7.ebuild:
-  arm stable, bug #294958
-
-  14 Jan 2010; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.7.ebuild:
-  Stable for HPPA (bug #294958).
-
-  27 Dec 2009; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-1.7.ebuild:
-  Marked ppc stable for bug #294958.
-
-  15 Dec 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.7.ebuild:
-  Marking xkeyboard-config-1.7 ppc64 stable for bug 294958
-
-  10 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
-  xkeyboard-config-1.7.ebuild:
-  x86 stable, bug 294958
-
-  10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
-  xkeyboard-config-1.7.ebuild:
-  amd64 stable wrt #294958
-
-  03 Dec 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.6.ebuild:
-  Marking xkeyboard-config-1.6 ppc64 stable for bug 281427
-
-  21 Nov 2009; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.6.ebuild:
-  alpha/ia64/m68k/s390/sh/sparc stable
-
-  26 Oct 2009; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.6.ebuild:
-  Stable for HPPA (bug #282290).
-
-  11 Oct 2009; nixnut <nixnut@gentoo.org> xkeyboard-config-1.6.ebuild:
-  ppc stable #282290
-
-  09 Oct 2009; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.6.ebuild:
-  arm stable, bug #282290
-
-  08 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-  xkeyboard-config-1.7.ebuild:
-  Depend on intltool not gettext as required in configure. Per bug #287964.
-
-  08 Oct 2009; Olivier Crête <tester@gentoo.org> ChangeLog:
-  Stable on amd64, bug #281427
-
-  06 Oct 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.7.ebuild:
-  make the ebuild more EAPI=2-like
-
-*xkeyboard-config-1.7 (06 Oct 2009)
-
-  06 Oct 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.7.ebuild:
-  bump to 1.7, sync with x11 overlay
-
-  06 Oct 2009; Rémi Cardona <remi@gentoo.org> -xkeyboard-config-1.1.ebuild:
-  drop old ebuilds
-
-  05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
-  xkeyboard-config-1.6.ebuild:
-  x86 stable, bug 282290
-
-  30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
-  xkeyboard-config-1.6.ebuild:
-  amd64 stable wrt #282290
-
-  23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.1.ebuild,
-  xkeyboard-config-1.5.ebuild, xkeyboard-config-1.6.ebuild:
-  add missing build-time gettext dep (fixes bug #221127)
-
-  23 Jun 2009; Rémi Cardona <remi@gentoo.org>
-  -xkeyboard-config-0.8-r1.ebuild, -xkeyboard-config-0.9.ebuild,
-  -xkeyboard-config-1.2.ebuild, -xkeyboard-config-1.3.ebuild,
-  -xkeyboard-config-1.4.ebuild, -files/add_missing_lsgt.patch:
-  drop old ebuilds (will drop 1.1 later)
-
-  23 Jun 2009; Rémi Cardona <remi@gentoo.org> xkeyboard-config-1.6.ebuild:
-  drop accidental stable alpha keyword on 1.6
-
-  23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
-  xkeyboard-config-1.5.ebuild:
-  Stable on alpha. It's needed for xorg-server-1.5/xorg-x11-7.4
-
-  23 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
-  xkeyboard-config-1.6.ebuild:
-  Stable on alpha for xorg-server-1.5/xorg-x11-7.4
-
-*xkeyboard-config-1.6 (13 Jun 2009)
-
-  13 Jun 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.6.ebuild:
-  bump to 1.6
-
-  15 May 2009; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.5.ebuild:
-  arm/m68k/s390 stable
-
-  16 Apr 2009; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-1.5.ebuild:
-  Stable for HPPA (bug #251832).
-
-  15 Apr 2009; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.5.ebuild:
-  ia64/sh stable wrt #251832
-
-  06 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
-  xkeyboard-config-1.5.ebuild:
-  Stable on sparc, bug #251832
-
-  05 Apr 2009; Markus Meier <maekke@gentoo.org> xkeyboard-config-1.5.ebuild:
-  x86 stable, bug #251832
-
-  05 Apr 2009; Olivier Crête <tester@gentoo.org>
-  xkeyboard-config-1.5.ebuild:
-  Stable on amd64, bug #251832
-
-  03 Apr 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.5.ebuild:
-  Marking xkeyboard-config-1.5 ppc64 stable for bug 251832
-
-  03 Apr 2009; Brent Baude <ranger@gentoo.org> xkeyboard-config-1.5.ebuild:
-  Marking xkeyboard-config-1.5 ppc stable for bug 251832
-
-  31 Mar 2009; Justin Bronder <jsbronder@gentoo.org>
-  xkeyboard-config-1.5.ebuild:
-  Update license, #263535
-
-*xkeyboard-config-1.5 (28 Jan 2009)
-
-  28 Jan 2009; Rémi Cardona <remi@gentoo.org> +xkeyboard-config-1.5.ebuild:
-  bump to 1.5
-
-  23 Oct 2008; Rémi Cardona <remi@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild, xkeyboard-config-0.9.ebuild,
-  xkeyboard-config-1.1.ebuild, xkeyboard-config-1.2.ebuild,
-  xkeyboard-config-1.3.ebuild, xkeyboard-config-1.4.ebuild:
-  add missing dep on dev-util/intltool (fixes bug #243226)
-
-  16 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  xkeyboard-config-1.4.ebuild:
-  Move x11-apps/xkbcomp to DEPEND from RDEPEND. This helps prepare for
-  possible use of XKB files on the console in addition to within X by
-  removing runtime X-related dependencies. The console-setup package in
-  other distros contains tools for handling this called ckb (ckbcomp, etc.).
-  I'd like to look into using this in Gentoo instead of sys-apps/kbd.
-
-*xkeyboard-config-1.4 (14 Oct 2008)
-
-  14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  +xkeyboard-config-1.4.ebuild:
-  Version bump.
-
-*xkeyboard-config-1.3 (10 Jun 2008)
-
-  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  +xkeyboard-config-1.3.ebuild:
-  Bump. Around 40 bugs from freedesktop.org bugzilla were fixed. Dropped old
-  rulesets sgi and sun. Added a lot of metadata, related to countries and
-  languages.
-
-  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
-  xkeyboard-config-1.2.ebuild:
-  Revert stable keyword for amd64 because of Comment #1 in bug 213933.
-
-  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
-  xkeyboard-config-1.1.ebuild, xkeyboard-config-1.2.ebuild:
-  amd64 stable
-
-  05 Feb 2008; Markus Rothe <corsair@gentoo.org>
-  xkeyboard-config-1.1.ebuild:
-  Stable on ppc64
-
-  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  -xkeyboard-config-0.8.ebuild:
-  Clean up.
-
-*xkeyboard-config-1.2 (30 Jan 2008)
-
-  30 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
-  +xkeyboard-config-1.2.ebuild:
-  Bump.
-
-  27 Jan 2008; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-1.1.ebuild:
-  alpha/ia64/sparc stable
-
-  19 Dec 2007; Dawid Węgliński <cla@gentoo.org>
-  xkeyboard-config-1.1.ebuild:
-  Stable on x86 (bug #202087)
-
-  02 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  xkeyboard-config-0.9.ebuild:
-  Stable on amd64/x86 wrt bug #191615.
-
-  29 Sep 2007; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-0.9.ebuild:
-  sparc stable wrt #191615
-
-  28 Sep 2007; Joshua Kinard <kumba@gentoo.org> xkeyboard-config-0.9.ebuild:
-  Stable on mips, per #191615.
-
-  26 Sep 2007; Samuli Suominen <drac@gentoo.org>
-  files/digest-xkeyboard-config-1.1, Manifest:
-  Fix digest wrt #193868.
-
-  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  xkeyboard-config-1.1.ebuild:
-  Use emake on install. Stop adding /usr/share/X11/xkb to CONFIG_PROTECT
-  because of popular demand. If users require protection for this directory,
-  they must create their own file in /etc/env.d/ to do it.
-
-*xkeyboard-config-1.1 (26 Sep 2007)
-
-  26 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  +xkeyboard-config-1.1.ebuild:
-  Bugfixes, some new layouts.
-
-  10 Sep 2007; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-0.9.ebuild:
-  Stable for HPPA (bug #191615).
-
-  09 Sep 2007; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-0.9.ebuild:
-  alpha/ia64 stable wrt #191615
-
-  08 Sep 2007; Joseph Jezak <josejx@gentoo.org> xkeyboard-config-0.9.ebuild:
-  Marked ppc/ppc64 stable for bug #191615.
-
-  07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  Stable on sparc wrt #175465
-
-  03 Jul 2007; Lars Weiler <pylon@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  Stable on ppc; bug #175465.
-
-  02 Jul 2007; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  alpha stable wrt #175465
-
-  24 Jun 2007; Joshua Kinard <kumba@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  Stable on mips, per #175465.
-
-  20 May 2007; Jeroen Roovers <jer@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  Stable for HPPA (bug #175465).
-
-  05 May 2007; Daniel Gryniewicz <dang@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  Marked stable on amd64 for bug #175465
-
-  29 Apr 2007; Andrej Kacian <ticho@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  Stable on x86, bug #175465.
-
-  25 Apr 2007; Raúl Porcel <armin76@gentoo.org>
-  xkeyboard-config-0.8-r1.ebuild:
-  0.8-r1 ebuild was broken, fixing and stabilizing on ppc64 and ia64
-
-  25 Apr 2007; Markus Rothe <corsair@gentoo.org> ChangeLog:
-  Stable on ppc64; bug #175465
-
-*xkeyboard-config-0.9 (14 Nov 2006)
-
-  14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xkeyboard-config-0.9.ebuild:
-  Version bump.  Thanks to Camille Huot for the poke (bug #155124).
-
-*xkeyboard-config-0.8-r1 (03 Sep 2006)
-
-  03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +files/add_missing_lsgt.patch, +xkeyboard-config-0.8-r1.ebuild:
-  Add missing LSGT symbol to evdev symbols.  (Dennis Schridde, Bug #145097)
-  This should fix the availability of <, > and | for users of this symbol list.
-
-  16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
-  Keywording ppc64 stable per MrBones request
-
-  16 Aug 2006; Brent Baude <ranger@gentoo.org> xkeyboard-config-0.8.ebuild:
-  Marking ~ppc64 per MrBones request
-
-  19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xkeyboard-config-0.8.ebuild:
-  Stable on hppa.
-
-  10 Jul 2006; Aron Griffis <agriffis@gentoo.org>
-  xkeyboard-config-0.8.ebuild:
-  Mark 0.8 stable on ia64
-
-  04 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.8.ebuild:
-  Some old XKB thing (xkbdata?) installed /usr/share/X11/xkb/symbols/pc as a
-  directory. Now we install it as a file, but portage won't let a file replace
-  a directory so it doesn't get installed. This breaks XKB setups, with
-  numerous reports. Check for the directory in pkg_setup().
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.8.ebuild:
-  ppc/sparc/mips/alpha/arm/sh stable
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  -files/0.7-fix-scroll-lock.patch, -xkeyboard-config-0.7-r2.ebuild:
-  Pull old version.
-
-  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  xkeyboard-config-0.8.ebuild:
-  Stable on amd64.
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.8.ebuild:
-  x86 stable.
-
-  21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.8.ebuild:
-  (#130590) Ensure that the old XKB directory gets out of the way (Patrick
-  Allaert).
-
-*xkeyboard-config-0.8 (16 Apr 2006)
-
-  16 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  +xkeyboard-config-0.8.ebuild:
-  Bump.
-
-  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
-  xkeyboard-config-0.7-r2.ebuild:
-  Add ~x86-fbsd keyword.
-
-*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:
-  Mark 0.7-r1 ~ia64
-
-  23 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.7-r1.ebuild:
-  dev-perl/XML-Parser is DEPEND, not RDEPEND.
-
-  21 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.7-r1.ebuild:
-  Let xkbcomp take care of creating /var/lib/xkb, as suggested in fd.o bug #5906.
-
-*xkeyboard-config-0.7-r1 (13 Feb 2006)
-
-  13 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  -xkeyboard-config-0.7.ebuild, +xkeyboard-config-0.7-r1.ebuild:
-  (#122214) Create /var/lib/xkb so xorg-server doesn't fail later when trying
-  to write to /usr/share/X11/xkb/compiled.
-
-  07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.7.ebuild:
-  (#122010) Fix deps, thanks to Caio <errado@gmail.com>.
-
-  07 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.7.ebuild:
-  Also make the xorg rules symlink.
-
-  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xkeyboard-config-0.7.ebuild:
-  Meaningless whitespace change to re-commit and fix manifest.
-
-*xkeyboard-config-0.7 (06 Feb 2006)
-
-  06 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml,
-  +xkeyboard-config-0.7.ebuild:
-  New, restructured, maintained package for XKB configuration data, expected
-  to supercede xkbdata. Since it's the same collection of data files,
-  keyworded ~arch for the same arches.
-

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
deleted file mode 100644
index 7950f33..0000000
--- a/x11-misc/xkeyboard-config/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xkeyboard-config-2.4.1-extended-function-keys.patch 8001 RMD160 d9ce813b423462167112f17b04f8105eb9c67682 SHA1 9edcc0013c89d8e439dcdc49569f5522ddd5b35d SHA256 04c46922f2b495016230dbe8f4b85e4e5f520eb0dc649ab170039fda85120497
-AUX xkeyboard-config-2.4.1-shift-backspace.patch 1397 RMD160 99df457599d66c9886241ab573b8cf451082ef3c SHA1 d8a5a2ec6fd63c33415d50dc1640027ab09d90a5 SHA256 b789e3fab3c4581f0b87a26ad4b38248cc6c69db48bd8a074b3289157f6b055e
-AUX xkeyboard-config-2.4.1-ungrab.patch 524 RMD160 05ed440f032c70ec41926e257cfba1c001e2f111 SHA1 e7afa339f3aff1bcc514ab3a29e785a9cc8b1618 SHA256 a004a32aab818070faf9d89ed0c5e02f71b6c255ba0b645e18e4ab6e42211890
-DIST xkeyboard-config-2.4.1.tar.bz2 813373 RMD160 942692b54f0c9e06d95063bd90ce0fedfad5f108 SHA1 0596017597a6ead04ada1dda7e0b2de2ce597adb SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a
-EBUILD xkeyboard-config-2.4.1-r2.ebuild 1483 RMD160 cedf62555b0527bb3abe0189cd183cde1aef34d8 SHA1 cee2caf8095bf7778f0eebbd4dc1e8c4449e3ce7 SHA256 d40b9a9352b445f16a993a53529b41eb39f919c0c8b1129557103cfaa92e9cc9
-MISC ChangeLog 21302 RMD160 b4cc49a535e5874a38a8147dd37d38cae31d0fe3 SHA1 33ace5a81f5e4d2e9d0ff9f106163893c0be1b3c SHA256 1d2f289223a625c835f42f5426bf67d8906813064be5542b21bbcf9170befc7a
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
deleted file mode 100644
index dbf0431..0000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Wed, 05 Oct 2011 21:26:26 +0000
-Subject: Levels 2-4 for CTRL+ALT are propagated from level 1
-
----
-diff --git a/symbols/keypad b/symbols/keypad
-index e85aaac..1bab391 100644
---- a/symbols/keypad
-+++ b/symbols/keypad
-@@ -84,19 +84,19 @@ xkb_symbols "x11" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KPDV> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- 
- // ClsGrb kills whichever client has a grab in effect
-     key <KPMU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Multiply,	VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+        symbols[Group1]= [ KP_Multiply,	KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
- // -VMode switches to the previous video mode
-     key <KPSU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
-     key  <KP7> {	[  KP_Home,	KP_7	]	};
-@@ -106,7 +106,7 @@ xkb_symbols "x11" {
- // +VMode switches to the next video mode
-     key <KPAD> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
-+        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
-     };
- 
-     key  <KP4> {	[  KP_Left,	KP_4	]	};
-@@ -242,11 +242,11 @@ xkb_symbols "legacymath" {
- 
-     key.type[Group1]="CTRL+ALT" ;
- 
--    key <KPDV> { [   KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / <XF86_Ungrab>
--    key <KPMU> { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
--    key <KPSU> { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
-+    key <KPDV> { [   KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / <XF86_Ungrab>
-+    key <KPMU> { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
-+    key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
- 
--    key <KPAD> { [      KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
-+    key <KPAD> { [      KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
- 
- };
- 
-@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" {
- // ClsGrb kills whichever client has a grab in effect
-     key <KOMU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+        symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
-     key  <KO4> {	[  KP_4	]	};
-@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" {
- // -VMode switches to the previous video mode
-     key <KOSU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
-     key  <KO1> {	[  KP_1	]	};
-@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" {
- // +VMode switches to the next video mode
-     key <KOAD> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
-+        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
-     };
- 
-     key  <KO0> {	[  KP_0	]	};
-@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KODV> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- };
-diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
-index 7d47d66..73b5af2 100644
---- a/symbols/srvr_ctrl
-+++ b/symbols/srvr_ctrl
-@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KPDV> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+	symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- 
- // ClsGrb kills whichever client has a grab in effect
-     key <KPMU> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+	symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
- // -VMode switches to the previous video mode
-     key <KPSU> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+	symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
- // +VMode switches to the next video mode
-     key <KPAD> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode]
-+	symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode]
-     };
- 
- };
-@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
- 
-     key <FK01> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
-+	symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ]
-     };
- 
-     key <FK02> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
-+	symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ]
-     };
- 
-     key <FK03> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
-+	symbols[Group1]= [ F3, F3, F3, F3, XF86_Switch_VT_3 ]
-     };
- 
-     key <FK04> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
-+	symbols[Group1]= [ F4, F4, F4, F4, XF86_Switch_VT_4 ]
-     };
- 
-     key <FK05> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
-+	symbols[Group1]= [ F5, F5, F5, F5, XF86_Switch_VT_5 ]
-     };
- 
-     key <FK06> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
-+	symbols[Group1]= [ F6, F6, F6, F6, XF86_Switch_VT_6 ]
-     };
- 
-     key <FK07> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
-+	symbols[Group1]= [ F7, F7, F7, F7, XF86_Switch_VT_7 ]
-     };
- 
-     key <FK08> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
-+	symbols[Group1]= [ F8, F8, F8, F8, XF86_Switch_VT_8 ]
-     };
- 
-     key <FK09> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
-+	symbols[Group1]= [ F9, F9, F9, F9, XF86_Switch_VT_9 ]
-     };
- 
-     key <FK10> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
-+	symbols[Group1]= [ F10, F10, F10, F10, XF86_Switch_VT_10 ]
-     };
- 
-     key <FK11> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
-+	symbols[Group1]= [ F11, F11, F11, F11, XF86_Switch_VT_11 ]
-     };
- 
-     key <FK12> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
-+	symbols[Group1]= [ F12, F12, F12, F12, XF86_Switch_VT_12 ]
-     };
- 
- };
-diff --git a/symbols/terminate b/symbols/terminate
-index 96dd6e8..c74220b 100644
---- a/symbols/terminate
-+++ b/symbols/terminate
-@@ -2,6 +2,6 @@ partial default modifier_keys
- xkb_symbols "ctrl_alt_bksp" {
-     key <BKSP> {
-         type="CTRL+ALT",
--        symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ]
-+        symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ]
-     };
- };
---
-cgit v0.9.0.2-2-gbebe

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
deleted file mode 100644
index cfc5c3a..0000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 81fc86a911b55481b9597bb9284b3beca460104c Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sun, 20 Nov 2011 20:03:26 +0000
-Subject: Extend BackSpace to the 2nd group
-
-https://bugs.freedesktop.org/show_bug.cgi?id=43098
----
-diff --git a/symbols/pc b/symbols/pc
-index e1965ce..7e13ecb 100644
---- a/symbols/pc
-+++ b/symbols/pc
-@@ -14,7 +14,7 @@ xkb_symbols "pc105" {
-     include "pc(editing)"
-     include "keypad(x11)"
- 
--    key <BKSP> {	[ BackSpace	]	};
-+    key <BKSP> {	[ BackSpace, BackSpace	]	};
- 
-     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
-     key <RTRN> {	[ Return	]	};
-diff --git a/symbols/us b/symbols/us
-index 1d8bdd0..7c3ee24 100644
---- a/symbols/us
-+++ b/symbols/us
-@@ -573,7 +573,7 @@ xkb_symbols "dvp" {
-     key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
-     key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
-     key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
--    key <BKSP> { [ BackSpace                                                    ] };
-+    key <BKSP> { [ BackSpace,       BackSpace                                   ] };
- 
-     // upper row, left side
-     key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
---
-cgit v0.9.0.2-2-gbebe

diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-ungrab.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-ungrab.patch
deleted file mode 100644
index 0f5d5f9..0000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-ungrab.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/compat/xfree86 b/compat/xfree86
-index cf4a8b2..caa9dce 100644
---- a/compat/xfree86
-+++ b/compat/xfree86
-@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic"  {
-         action = SwitchScreen(Screen=12, !SameServer);
-     };
- 
--    interpret XF86_Ungrab {
--        action = Private(type=0x86, data="Ungrab");
--    };
--    interpret XF86_ClearGrab {
--        action = Private(type=0x86, data="ClsGrb");
--    };
-     interpret XF86LogGrabInfo {
-         action = Private(type=0x86, data="PrGrbs");
-     };

diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
deleted file mode 100644
index 0375ce7..0000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,55 +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.4.1-r2.ebuild,v 1.5 2011/12/27 21:12:16 maekke Exp $
-
-EAPI=4
-
-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="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
-	>=x11-libs/libX11-1.4.2"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-extended-function-keys.patch
-	"${FILESDIR}"/${P}-shift-backspace.patch
-	"${FILESDIR}"/${P}-ungrab.patch
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-01-20 11:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-20 11:40 [gentoo-commits] dev/ikelos:master commit in: x11-misc/xkeyboard-config/, x11-misc/xkeyboard-config/files/ Mike Auty
  -- strict thread matches above, loose matches on Subject: below --
2012-01-20 11:40 Mike Auty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox