everything seems to be working OK for me now. there is one caveat i will add to UPDATING: xorg/tools/makekeys needs to be cleaned by hand it seems, in some cases. if you have problems with xkbcomp or libX11 builds failing, try this. .mrg.