Test Gentoo PM + fix
Test Emerge PM + fixes