When emerging the GIT version of the libva-intel-media-driver, at least one of the included patches no longer fits to the source, making the Prepare phase to error out: >>> Preparing source in /tmp/portage/media-libs/libva-intel-media-driver-9999/work/libva-intel-media-driver-9999 ... * Source directory (CMAKE_USE_DIR): "/tmp/portage/media-libs/libva-intel-media-driver-9999/work/libva-intel-media-driver-9999" * Build directory (BUILD_DIR): "/tmp/portage/media-libs/libva-intel-media-driver-9999/work/libva-intel-media-driver-9999_build" * Applying libva-intel-media-driver-20.2.0_x11_optional.patch ... patching file media_driver/media_top_cmake.cmake Hunk #1 FAILED at 21. 1 out of 1 hunk FAILED -- saving rejects to file media_driver/media_top_cmake.cmake.rej [ !! ] * ERROR: media-libs/libva-intel-media-driver-9999::gentoo failed (prepare phase): * patch -p1 failed with /tmp/portage/media-libs/libva-intel-media-driver-9999/files/libva-intel-media-driver-20.2.0_x11_optional.patch * * Call stack: * ebuild.sh, line 136: Called src_prepare * environment, line 3083: Called cmake_src_prepare * environment, line 1244: Called default_src_prepare * phase-functions.sh, line 948: Called __eapi8_src_prepare * environment, line 338: Called eapply '--' '/tmp/portage/media-libs/libva-intel-media-driver-9999/files/libva-intel-media-driver-20.2.0_x11_opti onal.patch' '/tmp/portage/media-libs/libva-intel-media-driver-9999/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch' '/tmp/portage/media-libs/ libva-intel-media-driver-9999/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch' * environment, line 1400: Called _eapply_patch '/tmp/portage/media-libs/libva-intel-media-driver-9999/files/libva-intel-media-driver-20.2.0_x11_op tional.patch' * environment, line 1338: Called __helpers_die 'patch -p1 failed with /tmp/portage/media-libs/libva-intel-media-driver-9999/files/libva-intel-med ia-driver-20.2.0_x11_optional.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" Reproducible: Always Steps to Reproduce: Configure with allow keywords, so that -9999 version is emerged, and no special use flags are required: # emerge -pv media-libs/libva-intel-media-driver [ebuild U *] media-libs/libva-intel-media-driver-9999::gentoo [23.2.3::gentoo] USE="X redistributable -test" 0 KiB Actual Results: Prepare phase fails.