Merge javer's portage overlay