Corrected issues introduced by recent pull merges.

Specifically, adding fish support to Powerline requires we remove keyword
support for architectures unsupported by fish (i.e., "~arm", "~ppc64) as well as
describe the corresponding USE flag in "metadata.xml". Since the prior pull
request failed to bump Powerline, this commit also rectifies that.