Update XKB rules specific for Sun Keyboards

Remove support for old Sun Type_4/5 keyboards and update data for Sun
Type_6/7 Keyboards as described in Bug 57450 - XKB data specific for Sun
Keyboards is outdated

11 files changed, 36 insertions, 22 deletions

diff --git a/rules/base.lists.part b/rules/base.lists.part
index c7983df..97b3b90 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -99,9 +99,21 @@
 
 ! $thinkpads = thinkpad thinkpad60 thinkpadz60
 
-! $sun_t6_custom = ara be br ca ch cz de dk \
-                   ee es fi fr gb gr it kr \
-                   lt lv nl no pl pt ro ru \
-                   se sk tr tw ua
+! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
+         sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \
+         sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+
+! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
+
+// Sun Type_6_7 keyboards with custom layouts
+! $sun_custom = ara be br ca ch cz de dk \
+                ee es fi fr gb gr it jp \
+                kr lt lv nl no pl pt ro \
+                ru se sk tr tw ua us
+
+! $sun_var =  sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \
+              sun_type7 sun_type7_suncompat suncompat
+
+! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
 
 ! $htcdreamlayouts = us it de
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index 753f2ed..eb0512d 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -24,4 +24,13 @@
   hhk		=	hhk(basic)
   kinesis	=	kinesis(model100)
  $nokiamodels	=	nokia(%m)
+  sun_type6_jp          =   sun(type6jp)
+  sun_type6_usb         =   sun(type6)
+  sun_type6_euro_usb    =   sun(type6tuv)
+  sun_type6_jp_usb      =   sun(type6jp)
+  sun_type6_unix_usb    =   sun(type6unix)
+  sun_type7_jp_usb      =   sun(type6jp)
+  sun_type7_usb         =   sun(type7)
+  sun_type7_euro_usb    =   sun(type7tuv)
+  sun_type7_unix_usb    =   sun(type7unix)
   *		=       pc(pc104)
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index 2c62120..ebccd3e 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -1,10 +1,8 @@
   amiga		=	amiga(de)
   ataritt	=	ataritt(de)
   empty         =       empty
-  sun4		=	sun(type4_euro)
-  sun5		=	sun(type5_euro)
-  sun6		=	sun(type6_usb)
-  sun6euro	=	sun(type6tuv_usb)
+ $sun_jp	=	sun(type6_jp_usb)
+ $sun		=	sun(type6_usb)
   pc98		=	xfree98(pc98)
  $applealu	=	macintosh(alukbd)
   macintosh_hhk	=	macintosh(hhk)
diff --git a/rules/base.m_s.part b/rules/base.m_s.part
index 4bbbcce..e5d32a2 100644
--- a/rules/base.m_s.part
+++ b/rules/base.m_s.part
@@ -49,3 +49,5 @@
   $maclaptop    =       +inet(apple)+level3(enter_switch)
   $applealu     =       +inet(apple)
   $macs	        =       +inet(apple)
+  sun_type7_jp_usb	=	+sun_vndr/solaris(defaults_type7jp)
+  $sun			=		+sun_vndr/solaris(defaults)
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index 20b4276..1a990b0 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -1,7 +1,6 @@
   ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
-  sun4		*			=	latin+sun_vndr/us(type4)+%l[1]%(v[1])
-  sun5		*			=	latin+sun_vndr/us(type5)+%l[1]%(v[1])
+ $sun		$sun_custom	=	pc+sun_vndr/%l[1]%(v[1])
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
diff --git a/rules/base.ml2_s.part b/rules/base.ml2_s.part
index 27f9975..e80d7cf 100644
--- a/rules/base.ml2_s.part
+++ b/rules/base.ml2_s.part
@@ -1,3 +1,4 @@
   nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):2
   nokiarx51	*		=	+nokia_vndr/rx-51(%l[2]%_v[2]):2
+ $sun	$sun_custom	=	+sun_vndr/%l[2]%(v[2]):2
   *		*		=	+%l[2]%(v[2]):2
diff --git a/rules/base.ml3_s.part b/rules/base.ml3_s.part
index 6077525..efe7cf1 100644
--- a/rules/base.ml3_s.part
+++ b/rules/base.ml3_s.part
@@ -1,3 +1,4 @@
   nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):3
   nokiarx51	*		=	+nokia_vndr/rx-51(%l[3]%_v[3]):3
+ $sun	$sun_custom	=	+sun_vndr/%l[3]%(v[3]):3
   *		*		=	+%l[3]%(v[3]):3
diff --git a/rules/base.ml4_s.part b/rules/base.ml4_s.part
index 8d92f39..00ba445 100644
--- a/rules/base.ml4_s.part
+++ b/rules/base.ml4_s.part
@@ -1,3 +1,4 @@
   nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):4
   nokiarx51	*		=	+nokia_vndr/rx-51(%l[4]%_v[4]):4
+ $sun	$sun_custom	=	+sun_vndr/%l[4]%(v[4]):4
   *		*		=	+%l[4]%(v[4]):4
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 7e01486..552693d 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -5,18 +5,7 @@
   classmate	us			=	pc+%l(classmate)
   empty         *                       =       empty(basic)
   *             empty                   =       empty(basic)
-  sun4		$nonlatin		=	latin+sun_vndr/us(type4)+%l%(v):2
-  sun4		*			=	latin+sun_vndr/us(type4)+%l%(v)
-  sun5		$nonlatin		=	latin+sun_vndr/us(type5)+%l%(v):2
-  sun5		*			=	latin+sun_vndr/us(type5)+%l%(v)
-  sun6		us			=	pc+sun_vndr/us(type6)
-  sun6		en_US			=	pc+sun_vndr/us(type6)+iso9995-3(basic)
-  sun6		$sun_t6_custom		=	pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
-  sun6		*			=	pc+sun_vndr/us(type6)+%l%(v)
-  sun6euro	us			=	pc+sun_vndr/us(type6)
-  sun6euro	en_US			=	pc+sun_vndr/us(type6)+iso9995-3(basic)
-  sun6euro	$sun_t6_custom		=	pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
-  sun6euro	*			=	pc+sun_vndr/us(type6)+%l%(v)
+ $sun		$sun_custom		=	pc+sun_vndr/%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
diff --git a/rules/base.mlv_s.part b/rules/base.mlv_s.part
index 1eecc55..1ae1171 100644
--- a/rules/base.mlv_s.part
+++ b/rules/base.mlv_s.part
@@ -2,3 +2,4 @@
   classmate	us		alt-intl	=	pc+us(classmate-alt-intl)
   classmate	us		altgr-intl	=	pc+us(classmate-altgr-intl)
   nokiarx51	cz		qwerty		=	nokia_vndr/rx-51(cz_qwerty)
+  *			$sun_custom	$sun_var	=	pc+sun_vndr/%l%(v)
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 7d880f4..253effd 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -134,6 +134,7 @@
   shift:both_shiftlock               =       +shift(both_shiftlock)
   shift:lshift_both_shiftlock        =       +shift(lshift_both_shiftlock)
   shift:rshift_both_shiftlock        =       +shift(rshift_both_shiftlock)
+  solaris:sun_compat				 =		 +sun_vndr/solaris(sun_compat)
   lv3:caps_switch                    =       +level3(caps_switch)
   lv3:bksl_switch                    =       +level3(bksl_switch)
   lv3:lsgt_switch                    =       +level3(lsgt_switch)