merge funtoo changes with live ebuild