Purge the old macs from our rules

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

11 files changed, 0 insertions, 449 deletions

diff --git a/geometry/macintosh b/geometry/macintosh
index eb356440..baab1d66 100644
--- a/geometry/macintosh
+++ b/geometry/macintosh
@@ -1,182 +1,3 @@
-//
-// Some modifications (<eqdar@castalie.org>) :
-// - Added a <LSGT> key
-// - Fixed the shape of the <RTRN> key
-// - Moved <BKSL> to the 'AC' row
-// - Added a special Macintosh sysctl key
-// - Minor changes (Function keys shape, LED position...)
-
-// Minor changes
-// - Mail address above is no longer valid
-// - Changed {L,R}MTA to {L,R}WIN, which are defined
-// 2005/10 -- Simon Vallet <svallet@gmail.com>
-
-default xkb_geometry "macintosh" {
-
-    description= "Apple Extended Keyboard II";
-    width = 475;
-    height = 194;
-
-    shape.cornerRadius= 1;
-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
-    shape "TLDE" { { [ 23,18] }, { [2,1], [ 21,17] } };
-    shape "BKSP" { { [ 33,18] }, { [2,1], [ 31,17] } };
-    shape "TAB"  { { [ 33,18] }, { [2,1], [ 31,17] } };
-    shape "RTRN" {
-        { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] },
-        { [2,1],[21,1],[21,36],[6,36],[6,17],[2,17] } };
-    shape "CAPS" { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "LCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "LALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
-    shape "LMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
-    shape "RMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
-    shape "RTSH" { { [ 47,18] }, { [2,1], [ 45,17] } };
-    shape "SPCE" { { [123,18] }, { [2,1], [121,17] } };
-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
-    // Macintosh keyboards have a special sysctl key at the top right
-    shape "AAPL" {
-        { [ 0,0], [ 18,0], [ 18,18], [ 0,18] },
-        { [ 1,1], [ 17,1], [ 17,17], [ 1,17] },
-        { [ 8,5], [ 8,12], [  2,9] } };
-
-    shape "LEDS" { cornerRadius = 0, { [ 55,19] } };
-    shape "LED"  { cornerRadius = 0, { [  8, 2] } };
-
-    solid "LedPanel" {
-	shape= "LEDS";
-        top = 48;
-        left = 378;
-    };
-
-    indicator.onColor= "green";
-    indicator.offColor= "green30";
-    indicator.top = 50;
-    indicator.shape= "LED";
-    indicator "NumLock"    { left = 381; };
-    indicator "CapsLock"   { left = 398; };
-    indicator "ScrollLock" { left = 415; };
-    text.top= 55;
-    text.color= "black";
-    text "NumLockLabel"    { left = 381; text = "Num\nLock";    };
-    text "CapsLockLabel"   { left = 398; text = "Caps\nLock";   };
-    text "ScrollLockLabel" { left = 415; text = "Scroll\nLock"; };
-
-    section.left= 19;
-    row.left= 1;
-    key.shape= "NORM";
-    key.gap=  1;
-
-    section "Function" {
-        top = 48;
-	row {
-	    top= 1;
-            keys { <ESC>,
-                   { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
-                   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
-                   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
-                   { <PRSC>, 10 }, <SCLK>, <PAUS>,
-                   // This is the sysctl key on macintosh keyboards
-                   // keycode is 222 with a 4.21 kernel, which is <I5E>
-                   { <I5E>, "AAPL", 67 }
-	    };
-	};
-    }; // End of "Function" section
-
-    section "Alpha" {
-        top = 87;
-	row {
-	    top= 1;
-            keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>,
-                   <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
-		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
-	    };
-	};
-	row {
-	    top= 20;
-	    keys { { <TAB>, "TAB" },  <AD01>, <AD02>, <AD03>,
-                   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
-                   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
-	    };
-	};
-	row {
-	    top= 39;
-	    keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
-                   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
-                   <AC10>, <AC11>, <BKSL>
-	    };
-	};
-	row {
-	    top= 58;
-            keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
-                   <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
-                   <AB09>, <AB10>, { <RTSH>, "RTSH" }
-	    };
-	};
-	row {
-	    top= 77;
-	    keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
-                   { <LWIN>, "LMTA" },
-                   { <SPCE>, "SPCE" },
-                   { <RWIN>, "RMTA" },
-	           { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
-	    };
-	};
-    }; // End of "Alpha" section
-
-    section "Editing" {
-        top = 87;
-        left = 314;
-	row {
-	    top= 1;
-	    keys { <INS>, <HOME>, <PGUP> };
-	};
-        row {
-	    top= 20;
-	    keys { <DELE>, <END>, <PGDN> };
-	};
-	row {
-	    top= 58;
-	    left= 20;
-	    keys { <UP> };
-	};
-	row {
-	    top= 77;
-	    keys { <LEFT>, <DOWN>, <RGHT> };
-	};
-    }; // End of "Editing" section
-
-    section "Keypad" {
-        top = 87;
-        left = 380;
-	row {
-	    top= 1;
-            keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
-	};
-	row {
-	    top= 20;
-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
-	};
-	row {
-	    top= 39;
-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
-	};
-	row {
-	    top= 58;
-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
-	};
-	row {
-	    top= 77;
-	    keys { { <KP0>, "KP0" },  <KPDL> };
-	};
-    }; // End of "Keypad" section
-
-}; // End of "default" geometry
-
-
 // This section describes the geometry of the "Apple Pro" keyboard
 // included with NewWorld desktop machines
 //
diff --git a/keycodes/macintosh b/keycodes/macintosh
index 12d0e866..ed4ce5ed 100644
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -26,162 +26,6 @@
 //from the X Consortium.
 //
 //
-default xkb_keycodes "macintosh" {
-   include "xfree86"
-
-   <FK13> = 182;
-   <FK14> = 183;
-   <FK15> = 184;
-   <KPEQ> = 157;
-
-};
-
-xkb_keycodes "old" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 61;
-    <TLDE> = 58;
-    <AE01> = 26;
-    <AE02> = 27;
-    <AE03> = 28;
-    <AE04> = 29;
-    <AE05> = 31;
-    <AE06> = 30;
-    <AE07> = 34;
-    <AE08> = 36;
-    <AE09> = 33;
-    <AE10> = 37;
-    <AE11> = 35;
-    <AE12> = 32;
-    <BKSP> = 59;
-
-    <TAB>  = 56;
-    <AD01> = 20;
-    <AD02> = 21;
-    <AD03> = 22;
-    <AD04> = 23;
-    <AD05> = 25;
-    <AD06> = 24;
-    <AD07> = 40;
-    <AD08> = 42;
-    <AD09> = 39;
-    <AD10> = 43;
-    <AD11> = 41;
-    <AD12> = 38;
-    <BKSL> = 50;
-
-    <CAPS> = 65;
-    <AC01> = 8;
-    <AC02> = 9;
-    <AC03> = 10;
-    <AC04> = 11;
-    <AC05> = 13;
-    <AC06> = 12;
-    <AC07> = 46;
-    <AC08> = 48;
-    <AC09> = 45;
-    <AC10> = 49;
-    <AC11> = 47;
-    <RTRN> = 44;
-
-    <LSGT> = 18;
-    <AB01> = 14;
-    <AB02> = 15;
-    <AB03> = 16;
-    <AB04> = 17;
-    <AB05> = 19;
-    <AB06> = 53;
-    <AB07> = 54;
-    <AB08> = 51;
-    <AB09> = 55;
-    <AB10> = 52;
-
-    <SPCE> = 57;
-
-    <LCTL> = 62;  // Left Control
-    <LALT> = 63;  // Left Option
-    <LFSH> = 64;  // Left Shift
-    <RALT> = 66;  // Left Command
-//    <RTSH> = 131; // Right Shift
-//    <RALT> = 132; // Right Command
-//    <RCTL> = 133; // Right Control
-//    <RMTA> = 134; // Right Option
-
-    <FK01> = 130;
-    <FK02> = 128;
-    <FK03> = 107;
-    <FK04> = 126;
-    <FK05> = 104;
-    <FK06> = 105;
-    <FK07> = 106;
-    <FK08> = 108;
-    <FK09> = 109;
-    <FK10> = 117;
-    <FK11> = 111;
-    <FK12> = 119;
-
-    <PRSC> = 113;
-    <SCLK> = 115;
-    <PAUS> = 121;
-
-    <INS>  = 122;
-    <HOME> = 123;
-    <PGUP> = 124;
-    <DELE> = 125;
-    <END>  = 127;
-    <PGDN> = 129;
-
-    <UP>   = 70;
-    <LEFT> = 67;
-    <DOWN> = 69;
-    <RGHT> = 68;
-
-    <NMLK> = 79;
-    <KPEQ> = 89;
-    <KPDV> = 83;
-    <KPMU> = 75;
-
-    <KP7>  = 97;
-    <KP8>  = 99;
-    <KP9>  = 100;
-    <KPSU> = 86;
-
-    <KP4>  = 94;
-    <KP5>  = 95;
-    <KP6>  = 96;
-    <KPAD> = 77;
-
-    <KP1>  = 91;
-    <KP2>  = 92;
-    <KP3>  = 93;
-    <KPEN> = 84;
-
-    <KP0>  = 90;
-    <KPDL> = 73;
-
-    indicator 3 = "Scroll Lock";
-    indicator 2 = "Num Lock";
-    indicator 1 = "Caps Lock";
-
-    alias <ALGR> = <RALT>;
-};
-
-xkb_keycodes "hhk" {
-   include "macintosh"
-
-    <AC12> = 51;
-
-    <LWIN> = 49;
-    <HJCV> = 131;
-    <HNGL> = 129;
-    <RWIN> = 208;
-
-    <FK13> = 111;
-    <FK14> = 78;
-    <FK15> = 110;
-};
 
 // Aluminium Keyboards
 xkb_keycodes "alukbd" {
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>
diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us
index 2cf938d1..ccd008e6 100644
--- a/symbols/macintosh_vndr/us
+++ b/symbols/macintosh_vndr/us
@@ -64,76 +64,3 @@ default xkb_symbols "extended" {
 
     key <KPEQ> {	[  equal			]	};
 };
-
-hidden
-xkb_symbols "oldmac" {
-
-    include "macintosh_vndr/us(extended)"
-
-    key <FK01> {	[  F1		]	};
-    key <FK02> {	[  F2		]	};
-    key <FK03> {	[  F3		]	};
-    key <FK04> {	[  F4		]	};
-    key <FK05> {	[  F5		]	};
-    key <FK06> {	[  F6		]	};
-    key <FK07> {	[  F7		]	};
-    key <FK08> {	[  F8		]	};
-    key <FK09> {	[  F9		]	};
-    key <FK10> {	[  F10		]	};
-    key <FK11> {	[  F11		]	};
-    key <FK12> {	[  F12		]	};
-    key <FK13> {	[  Print	]	};
-    key <FK14> {	[  Scroll_Lock	]	};
-    key <FK15> {	[  Pause	]	};
-
-    key  <INS> {	[  Insert	]	};
-    key <HOME> {	[  Home		]	};
-    key <PGUP> {	[  Prior	]	};
-    key <DELE> {	[  Delete	]	};
-    key  <END> {	[  End		]	};
-    key <PGDN> {	[  Next		]	};
-
-    key   <UP> {	[  Up		]	};
-    key <LEFT> {	[  Left		]	};
-    key <DOWN> {	[  Down		]	};
-    key <RGHT> {	[  Right	]	};
-
-    key <BKSP> {	[ BackSpace	]	};
-    key  <TAB> {	[ Tab,	ISO_Left_Tab ]	};
-    key <RTRN> {	[ Return	]	};
-    key <CAPS> {	[ Caps_Lock	]	};
-    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys ] };
-
-    key <LFSH> {	[  Shift_L	]	};
-    key <RTSH> {	[  Shift_R	]	};
-    key <LCTL> {	[  Control_L	]	};
-    key <RCTL> {	[  Control_R	]	};
-    key <LALT> {	[  Alt_L, Meta_L ]	};
-    key <RALT> {	[  Alt_R, Meta_R ]	};
-    key <LWIN> {	[  Super_L	]	};
-    key <RWIN> {	[  Super_R	]	};
-
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod2   { Num_Lock };
-
-    //  Fake keys for virtual<->real modifier mappings:
-    key <LVL3> {	[ ISO_Level3_Shift	]	};
-    modifier_map Mod5   { <LVL3> };
-
-    key <LVL5> {	[ ISO_Level5_Shift	]	};
-    modifier_map Mod3   { <LVL5> };
-
-    key <ALT>  {	[ NoSymbol, Alt_L	]	};
-    modifier_map Mod1   { <ALT>, <LALT> };
-
-    key <META> {	[ NoSymbol, Meta_L	]	};
-    modifier_map Mod1   { <META> };
-
-    key <SUPR> {	[ NoSymbol, Super_L	]	};
-    modifier_map Mod4   { <SUPR> };
-
-    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
-    modifier_map Mod4   { <HYPR> };
-};