[gentoo-user] X keyboard model insists of being "pc104"

[meino . cramer]

Hi,

when doing a 

    setxkbmap -v -query

I get:

    Trying to build keymap using the following components:
    keycodes:   evdev+aliases(qwerty)
    types:      complete
    compat:     complete
    symbols:    pc+us(altgr-intl)+inet(evdev)+capslock(none)
    geometry:   pc(pc104)
    xkb_keymap {
        xkb_keycodes  { include "evdev+aliases(qwerty)" };
        xkb_types     { include "complete"      };
        xkb_compat    { include "complete"      };
        xkb_symbols   { include "pc+us(altgr-intl)+inet(evdev)+capslock(none)"  
};
        xkb_geometry  { include "pc(pc104)"     };
    };

beside other things, my keyboard is recognized as pc104 keyboard.
This is not true :) -- it is definetly a pc101 one (IBM Model M
US-Ansi).

I copied /etc/X11/xorg.conf.d/10-evdev.conf to 
/etc/X11/xorg-conf.d/99-evdev.conf and edited it
to this one:


    Section "InputClass"
            Identifier "evdev keyboard catchall"
            MatchIsKeyboard "on"
            MatchDevicePath "/dev/input/event*"
            Driver "evdev"
            Option  "XKbModel" "pc101"
            Option "xkb_layout" "us"
            Option  "XkbLayout" "us"
            Option  "XKbVariant" "altgr-intl"
    EndSection

The relevant part of xorg.conf says:

    Section "InputClass"
        Identifier "IBM MODEL M"
        Driver "evdev"
        Option "XkbModel" "evdev"
        Option "XkbLayout" "us"
        Option "XkbVariant" "altgr-intl"
        Option "XkbOptions" "caps:none"
        MatchIsKeyboard "on"
    EndSection

there is no ~/.xmodmap or ~/.Xmodmap at $HOME...

The keyboard works so far as I can tell, but xkeycaps 
reports wrong keys.

What part of my Linux box is thinking a Model M has
104 keys?
How can I get rid of those additional three keys? ;-)

Best regards,
mcc