Fix conflicting types for 'BarrierEventID' from libXi by adding Ubuntu patched libXi ebuild
Merge remote-tracking branch 'shiznix/master'