merged to gentoo repo