merge ABI changes from upstream

in system portage you can now decide to build X libraries for 64 bit or 32/64 bit on multilib systems.

This will fix an issue, where portage is trying to pull versions from the x11 overlay