Purge the old macs from our rules

See the previous commits, none of these machines need the latest
xkeyboard-config.

8 files changed, 0 insertions, 41 deletions

diff --git a/rules/0001-lists.part b/rules/0001-lists.part
index 4f22eaee..e3f4baef 100644
--- a/rules/0001-lists.part
+++ b/rules/0001-lists.part
@@ -20,9 +20,7 @@
 // Country files that provide specializations for the OLPC:
 ! $olpclayouts = af am ara br ca es et fr in it kh kz mn ng np pk ru th tr us
 
-! $maclaptop = ibook powerbook macbook78 macbook79
 ! $applealu = applealu_ansi applealu_iso applealu_jis
-! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
 
 ! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
 
diff --git a/rules/0004-base.m_k.part b/rules/0004-base.m_k.part
index e779701b..81fb3e11 100644
--- a/rules/0004-base.m_k.part
+++ b/rules/0004-base.m_k.part
@@ -6,8 +6,5 @@
  $sun		=	sun(type6_usb)
   pc98		=	xfree98(pc98)
  $applealu	=	macintosh(alukbd)
-  macintosh_hhk	=	macintosh(hhk)
-  macintosh_old	=	macintosh(old)
- $macs		=	macintosh
   thinkpadz60	=	xfree86(thinkpadz60)
   *		=	xfree86
diff --git a/rules/0009-m_g.part b/rules/0009-m_g.part
index a2172e95..00cb87ac 100644
--- a/rules/0009-m_g.part
+++ b/rules/0009-m_g.part
@@ -20,7 +20,6 @@
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
  $applealu	=	macintosh(%m)
- $macs		=	macintosh(macintosh)
   hhk		=	hhk(basic)
   kinesis	=	kinesis(model100)
   sun_type6_jp          =   sun(type6jp)
diff --git a/rules/0013-ml_s.part b/rules/0013-ml_s.part
index baefa8a7..e576d101 100644
--- a/rules/0013-ml_s.part
+++ b/rules/0013-ml_s.part
@@ -9,17 +9,10 @@
   jollasbj	*			=	jolla_vndr/sbj(common)+%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)
-  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
-  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
-  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
   applealu_jis	jp			=	macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)+macintosh_vndr/jp(mac):2
   applealu_jis	*			=	macintosh_vndr/apple(alukbd)+%l%(v)+macintosh_vndr/jp(mac):2
  $applealu	$macvendorlayouts	=	macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v)
  $applealu	*			=	macintosh_vndr/apple(alukbd)+%l%(v)
- $macs		en_US			=	pc+macintosh_vndr/us(extended)
- $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
   olpcm		$olpclayouts		=	olpc+%l%(m)
diff --git a/rules/0015-ml1_s.part b/rules/0015-ml1_s.part
index ab3b59e8..db5b62de 100644
--- a/rules/0015-ml1_s.part
+++ b/rules/0015-ml1_s.part
@@ -3,12 +3,8 @@
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
   jollasbj	*			=	jolla_vndr/sbj(common)+%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])
   applealu_jis	us			=	macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)
  $applealu	$macvendorlayouts	=	macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1])
  $applealu	*			=	macintosh_vndr/apple(alukbd)+%l[1]%(v[1])
- $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
  $thinkpads	br			=	pc+%l[1](thinkpad)
   *		*			=	pc+%l[1]%(v[1])
diff --git a/rules/0026-base.m_s.part b/rules/0026-base.m_s.part
index 9749814b..c8e481a2 100644
--- a/rules/0026-base.m_s.part
+++ b/rules/0026-base.m_s.part
@@ -45,8 +45,6 @@
   trust_slimline =      +inet(media_nav_acpi_common)
   vsonku306     =       +inet(microsoftprooem)
   $inetkbds     =       +inet(%m)
-  $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/0035-m_t.part b/rules/0035-m_t.part
index 2d4aeb49..f1f97ec4 100644
--- a/rules/0035-m_t.part
+++ b/rules/0035-m_t.part
@@ -1,4 +1,3 @@
 ! model		=	types
-  $macs		=	complete+numpad(mac)
   $applealu	=	complete+numpad(mac)
   *		=	complete
diff --git a/rules/base.xml b/rules/base.xml
index 848a3433..3785e412 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -544,13 +544,6 @@
     </model>
     <model>
       <configItem>
-        <name>macintosh_hhk</name>
-        <description>Happy Hacking for Mac</description>
-        <vendor>Fujitsu</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>hpi6</name>
         <description>Hewlett-Packard Internet</description>
         <vendor>Hewlett-Packard</vendor>
@@ -853,20 +846,6 @@
     </model>
     <model>
       <configItem>
-        <name>macintosh</name>
-        <description>Macintosh</description>
-        <vendor>Apple</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>macintosh_old</name>
-        <description>Macintosh Old</description>
-        <vendor>Apple</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>mx1998</name>
         <description>Memorex MX1998</description>
         <vendor>Memorex</vendor>