additional fix for fake ebuilds & clean up