FL-926: fix atom stage building
Merge branch 'master' of https://github.com/funtoo/metro
Merge branch 'master' into fiordland