keyworded ~sparc, imported keymap workaround

5 files changed, 228 insertions, 5 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index d22b87964856..acb8e593ffd2 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.3 2004/03/22 09:10:18 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.4 2004/03/23 18:40:32 gustavoz Exp $
+
+  23 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> libxklavier-1.00.ebuild,
+  files/sun-keymaps.patch, files/sun.xml:
+  keyworded ~sparc, imported keymap workaround
 
   19 Mar 2004; David Holm <dholm@gentoo.org> libxklavier-1.00.ebuild:
   Added to ~ppc.
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 9ad4863f5df4..7e7a6358ba9e 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,4 +1,6 @@
-MD5 dfcb7911ef611d06fa3c7a198f61d8d0 libxklavier-1.00.ebuild 728
-MD5 de0aa8cae20fd126e8d6114dc7de72dd ChangeLog 515
+MD5 ec9ff7205f2f0e1542753415e6973553 ChangeLog 688
+MD5 07813578d8d8207e6a63f3eb27769098 libxklavier-1.00.ebuild 915
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
 MD5 42251f44e8d527c6d0e52153529841a2 files/digest-libxklavier-1.00 68
+MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
diff --git a/x11-libs/libxklavier/files/sun-keymaps.patch b/x11-libs/libxklavier/files/sun-keymaps.patch
new file mode 100644
index 000000000000..80e19d38eece
--- /dev/null
+++ b/x11-libs/libxklavier/files/sun-keymaps.patch
@@ -0,0 +1,24 @@
+diff -Nura libxklavier-1.00/libxklavier/xklavier_config_xkb.c libxklavier-1.00.sun/libxklavier/xklavier_config_xkb.c
+--- libxklavier-1.00/libxklavier/xklavier_config_xkb.c	2004-01-20 20:28:22.000000000 -0300
++++ libxklavier-1.00.sun/libxklavier/xklavier_config_xkb.c	2004-03-23 11:56:10.000000000 -0300
+@@ -16,16 +16,16 @@
+ #include <X11/extensions/XKM.h>
+ #endif
+ 
+-#define RULES_FILE "xfree86"
++#define RULES_FILE "sun"
+ 
+ #define RULES_PATH ( XKB_BASE "/rules/" RULES_FILE )
+ 
+-#define XML_CFG_PATH ( XKB_BASE "/rules/xfree86.xml" )
++#define XML_CFG_PATH ( XKB_BASE "/rules/sun.xml" )
+ 
+ // For "bad" X servers we hold our own copy
+-#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" )
++#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/sun.xml" )
+ 
+-#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/pc/en_US" )
++#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/sun/us" )
+ 
+ #define XK_XKB_KEYS
+ #include <X11/keysymdef.h>
diff --git a/x11-libs/libxklavier/files/sun.xml b/x11-libs/libxklavier/files/sun.xml
new file mode 100644
index 000000000000..bb7c9220abe5
--- /dev/null
+++ b/x11-libs/libxklavier/files/sun.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList>
+    <model>
+      <configItem>
+        <name>type4</name>
+        <description>Sun type4</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>type5</name>
+	<description>Sun type5</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>type5_euro</name>
+	<description>Sun type5 with euro symbol</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>type5_unix</name>
+	<description>Sun type5 unix</description>
+      </configItem>
+    </model>
+  </modelList>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>us</name>
+        <description>U.S. English</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>en_US</name>
+	<description>U.S. English w/ ISO8859-3</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>de</name>
+	<description>German</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>es</name>
+	<description>Spanish</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fi</name>
+	<description>Finnish</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fr</name>
+	<description>French</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>no</name>
+	<description>Norweigan</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pl</name>
+	<description>Polish</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ru</name>
+	<description>Russian</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>se</name>
+	<description>Swedish</description>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>uk</name>
+	<description>U.K. English</description>
+      </configItem>
+      <variantList/>
+    </layout>
+  </layoutList>
+  <optionList>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>grp</name>
+        <description>Group Shift/Lock behavior</description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp:switch</name>
+          <description>R-Alt switches group while pressed</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:toggle</name>
+          <description>Right Alt key changes group</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_toggle</name>
+          <description>Caps Lock key changes group</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_toggle</name>
+          <description>Both Shift keys together change group</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_shift_toggle</name>
+          <description>Control+Shift changes group</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_alt_toggle</name>
+          <description>Alt+Control changes group</description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <configItem>
+        <name>ctrl</name>
+        <description>Control Key Position</description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>ctrl:nocaps</name>
+          <description>Make CapsLock an additional Control</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swapcaps</name>
+          <description>Swap Control and Caps Lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ac</name>
+          <description>Control key at left of 'A'</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_aa</name>
+          <description>Control key at bottom left</description>
+        </configItem>
+      </option>
+    </group>
+  </optionList>
+</xkbConfigRegistry>
diff --git a/x11-libs/libxklavier/libxklavier-1.00.ebuild b/x11-libs/libxklavier/libxklavier-1.00.ebuild
index a85309e99a1d..930ec7115e40 100644
--- a/x11-libs/libxklavier/libxklavier-1.00.ebuild
+++ b/x11-libs/libxklavier/libxklavier-1.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.00.ebuild,v 1.2 2004/03/19 07:21:31 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.00.ebuild,v 1.3 2004/03/23 18:40:32 gustavoz Exp $
 
 DESCRIPTION="High level XKB library"
 HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="doc"
 
 RDEPEND="virtual/x11
@@ -18,6 +18,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	[ `use sparc` ] && epatch ${FILESDIR}/sun-keymaps.patch
+}
+
 src_compile() {
 
 	econf `use_enable doc doxygen` || die
@@ -29,6 +36,9 @@ src_install() {
 
 	einstall || die
 
+	insinto /usr/share/libxklavier
+	[ `use sparc` ] && doins ${FILESDIR}/sun.xml
+
 	dodoc "AUTHORS COPYING* CREDITS ChangeLog INSTALL NEWS README"
 
 }