Fix ${S} for net-im/friends-app. Add x11-libs/libXfixes dep. to x11-libs/libXi
Merge remote-tracking branch 'origin/master'