Instructions for the CHROOT: 

sync layman 

rm -rf /usr/portage/x11-drivers 
copy over /usr/portage/x11-drivers 
rm -rf /usr/portage/x11-libs/lib* 
copy over /usr/portage/x11-libs/lib* 
rm -rf /usr/portage/x11-proto 
copy over /usr/portage/x11-proto 
rm -rf /usr/portage/x11-base/xorg-* 
copy over /usr/portage/x11-base/xorg-* 
rm -rf /usr/portage/media-libs/mesa 
copy over /usr/portage/media-libs/mesa 
rm -rf /usr/portage/x11-apps/mesa-progs 
copy over /usr/portage/x11-apps/mesa-progs 
rm -rf /usr/portage/x11-apps/x* 
copy over /usr/portage/x11-apps/x* 

add to /etc/portage/package.unmask: 
>=x11-base/xorg-server-1.1.99 
>=media-libs/mesa-6.5.2 
>=x11-apps/mesa-progs-6.5.2 

emerge proto ebuilds: 
emerge xf86dgaproto \ 
kbproto \ 
damageproto \ 
trapproto \ 
randrproto \ 
xproxymanagementprotocol \ 
xf86rushproto \ 
fontcacheproto \ 
fontsproto \ 
evieext \ 
renderproto \ 
recordproto \ 
resourceproto \ 
glproto \ 
xcb-proto \ 
scrnsaverproto \ 
xcmiscproto \ 
xf86bigfontproto \ 
compositeproto \ 
xf86driproto \ 
xproto \ 
videoproto \ 
fixesproto \ 
printproto \ 
xineramaproto \ 
dmxproto \ 
xextproto \ 
xf86miscproto \ 
xf86vidmodeproto \ 
inputproto \ 
bigreqsproto 

now: 
emerge -auv xorg-server xorg-x11 (should upgrade all libX and mesa) 

then (drivers - OSS): 

emerge xf86-video-via \ 
xf86-input-evdev \ 
xf86-input-magellan \ 
xf86-input-digitaledge \ 
xf86-input-citron \ 
xf86-input-joystick \ 
xf86-input-keyboard \ 
xf86-video-savage \ 
xf86-video-nv \ 
xf86-video-s3virge \ 
xf86-video-fbdev \ 
xf86-input-acecad \ 
xf86-video-i810 \ 
xf86-input-palmax \ 
xf86-input-spaceorb \ 
xf86-video-v4l \ 
xf86-input-tek4957 \ 
xf86-video-tga \ 
xf86-video-tdfx \ 
xf86-video-nsc \ 
xf86-video-vesa \ 
xf86-video-glint \ 
xf86-video-sis \ 
xf86-input-penmount \ 
xf86-input-dynapro \ 
xf86-input-calcomp \ 
xf86-video-ati \ 
xf86-video-vga \ 
xf86-video-tseng \ 
xf86-video-i740 \ 
xf86-input-elo2300 \ 
xf86-video-s3 \ 
xf86-video-ark \ 
xf86-video-cyrix \ 
xf86-video-imstt \ 
xf86-input-fpit \ 
xf86-input-dmc \ 
xf86-video-chips \ 
xf86-input-summa \ 
xf86-input-jamstudio \ 
xf86-video-trident \ 
xf86-video-sisusb \ 
xf86-input-void \ 
xf86-input-mouse \ 
xf86-video-apm \ 
xf86-input-aiptek \ 
xf86-video-vmware \ 
xf86-input-magictouch \ 
xf86-input-mutouch \ 
xf86-input-microtouch \ 
xf86-video-mga \ 
xf86-video-neomagic \ 
xf86-video-rendition \ 
xf86-input-ur98 \ 
xf86-video-siliconmotion \ 
xf86-video-dummy \ 
xf86-video-voodoo \ 
xf86-input-vmmouse \ 
xf86-input-elographics \ 
xf86-video-i128 \ 
xf86-input-hyperpen \ 
xf86-video-cirrus 

in the end (drivers - proprietary): 
emerge -av ati-drivers nvidia-drivers 
emerge xgl # for those that require that