From 13e26acd7989514cea780b71afa805ee43baea41 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 30 Jan 2013 10:58:16 +0200
Subject: [PATCH] setxkbmap: prepare for new settings addon integration

---
 packages/x11/app/setxkbmap/scripts/xkb-setup | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/packages/x11/app/setxkbmap/scripts/xkb-setup b/packages/x11/app/setxkbmap/scripts/xkb-setup
index a2498b336a..04a8c4017e 100755
--- a/packages/x11/app/setxkbmap/scripts/xkb-setup
+++ b/packages/x11/app/setxkbmap/scripts/xkb-setup
@@ -20,21 +20,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. /etc/profile
-. /var/config/settings.conf
-
-if [ -z $X11_KEYMAP ]; then
-  X11_KEYMAP="us"
+if [ -f /storage/.cache/xkb/layout ] ; then
+  cat /storage/.cache/xkb/layout
 fi
-
-if [ ! "$X11_KEYMAP2" == "-none-" ]; then
-  XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2"
-  XKBOPTIONS="grp:alt_shift_toggle"
-else
-  XKBLAYOUT="$X11_KEYMAP"
-fi
-
-echo "XKBMODEL=\"pc105\""
-echo "XKBVARIANT=\"\""
-echo "XKBLAYOUT=\"$XKBLAYOUT\""
-echo "XKBOPTIONS=\"$XKBOPTIONS\""