[Gentoo] XKB changes in xorg 7

I finally figured out why my XKB stopped working. It’s because of the xkeyboard-config files that were merged in around RC1/RC2 — some of the symbols files were deleted, including mine.

I was using en_US, a very convenient setup that allowed me to have accented/umlauted characters by hitting ralt+:, then the letter, or ralt+[, then the letter. I’ve looked around but I can’t find any alternative that works the same. Both the intl and alt-intl variants in the us symbols file basically suck for being usable, imho, because of the weird symbols they stick on the right side by default.

Any ideas for getting my en_US functionality back?