xorg-server: A few fixups

Add the CVE patch from portage for 1.13.4-r1 and also fix the append-cflags line
from mr_science to append cflags correctly now.