l10n: drop variable XKB_LED, XKB_VARIANTS

features.in/l10n/config.mk

@@ -14,19 +14,14 @@ use/l10n:
 	@$(call xport,LOCALE)
 	@$(call xport,LOCALES)
 	@$(call xport,XKB_KEYMAPS)
-	@$(call xport,XKB_VARIANTS)
 	@$(call xport,XKB_SWITCH)
-	@$(call xport,XKB_LED)
 
 # see also alterator-sysconfig backend
 use/l10n/xkb/switch/ctrl_shift: use/l10n
 	@$(call set,XKB_SWITCH,grp:ctrl_shift_toggle)
 
-use/l10n/xkb/led/scroll: use/l10n
-	@$(call set,XKB_LED,grp_led:scroll)
-
 # FIXME: derive from locale by default if possible
-use/l10n/ru_RU: use/l10n/xkb/switch/ctrl_shift use/l10n/xkb/led/scroll
+use/l10n/ru_RU: use/l10n/xkb/switch/ctrl_shift
 	@$(call add,LOCALES,ru_RU)
 	@$(call set,LOCALE,ru_RU)
 	@$(call add,XKB_KEYMAPS,ru)

features.in/l10n/rootfs/image-scripts.d/50-l10n-xkb

@@ -9,8 +9,8 @@ if [ ! -d "$PREFIX" ]; then
 	exit 0
 fi
 
-if [ -z "$GLOBAL_XKB_VARIANTS" -o -z "$GLOBAL_XKB_KEYMAPS" ]; then
-	echo "** l10n-xkb: empty GLOBAL_XKB_VARIANTS/GLOBAL_XKB_KEYMAPS" >&2
+if [ -z "$GLOBAL_XKB_KEYMAPS" ]; then
+	echo "** l10n-xkb: empty GLOBAL_XKB_KEYMAPS" >&2
 	exit 0
 fi
 
@@ -19,7 +19,6 @@ Section "InputClass"
 Identifier "system-keyboard"
 MatchIsKeyboard "on"
 	Option "XkbLayout" "$GLOBAL_XKB_KEYMAPS"
-	Option "XkbOptions" "$GLOBAL_XKB_SWITCH${GLOBAL_XKB_LED:+,$GLOBAL_XKB_LED} \
-${GLOBAL_XKB_VARIANTS:+-variant $GLOBAL_XKB_VARIANTS}"
+	Option "XkbOptions" "$GLOBAL_XKB_SWITCH"
 EndSection
 EOF

features.in/l10n/rootfs/lib/50-l10n.mk

@@ -2,14 +2,7 @@
 
 XKB_KEYMAPS := $(subst $(SPACE),$(COMMA),$(XKB_KEYMAPS))
 
-# handle the layouts with a specific variant in the wild
-XKB_VARIANTS := $(subst ru,winkeys, \
-		$(subst ua,winkeys, \
-		$(subst be,winkeys, \
-		$(subst us,,$(XKB_KEYMAPS)))))
-
 debug::
 	@echo "** live: LOCALES: $(LOCALES)"
 	@echo "** live: LOCALE: $(LOCALE)"
 	@echo "** live: XKB_KEYMAPS: $(XKB_KEYMAPS)"
-	@echo "** live: XKB_VARIANTS: $(XKB_VARIANTS)"