gentoo resync : 20.03.2022

10 files changed, 4 insertions, 511 deletions

diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 2dcfc7ed31d8..9a42581af7aa 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,19 +1,7 @@
 AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070
-AUX libva-intel-media-driver-20.4.5_custom_cflags.patch 4078 BLAKE2B 59c525f39ce9ab5546c384641fe8aba017a5cdfe0a4f48dd5acd5d48dc7c6469731c81bb8781ae3be77baaf673e3bee1787fa6623e1ded8b2c3578ff41ba1292 SHA512 0b53bc5a809b305eae939b4ee3a173d59eb433ecb66f67f8c168f4c098689f972fab807e9ee227ca9eac2f80855ad048d45ed262063f031d85ff79813500c643
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
-AUX libva-intel-media-driver-21.2.2_custom_cflags.patch 1557 BLAKE2B 81286ec21894db132ae406b67f11678540d663cc74163b6dbbba3e888b54fbc4678041322d34bab61ce418f6050718a209c78c7121aa2f9d430dca27699becb9 SHA512 d790162f5a327b237e472a404ba761f24db62d08f23b669839a5793bc19e96868522484bc30460a8c0d7d575983d9c488855766834c828775b59273ad24da8bb
 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
-DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
-DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
-DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
-DIST intel-media-21.4.2.tar.gz 23185132 BLAKE2B 257f1a8a65928aee897d84ed8df69a129958bcf5fd6ea263283e1f2341a845651a86367cff7988c0d4b04accf48664dbd4d1e0bd106883e92feff095e5f88225 SHA512 1b906ce75ef70395e36296de1e1e4b39d4a82c8b8532497faf47bcb101cf2103bba67a125da7ea1be9f901699288520f704b43fef01339a1f1b7691040d7618e
-DIST intel-media-21.4.3.tar.gz 23192939 BLAKE2B d013b60c330df97dc29e51a95a78bd91a38c789c4690fde12c304e1bf0695024e5488d0485b60fa603e8490b932210163aec590bcfca031c1f19d7b16161b420 SHA512 d2e2db1ddc2cbdc022273f53d873f2156e992420d382285de0b9559340d912e847a4780ed2adfe67f06a7c4bcac83aadca1104cf051b9a3d43b3ffd931a3db22
 DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
-EBUILD libva-intel-media-driver-20.4.5-r2.ebuild 1491 BLAKE2B 9c1c9e9d4c753fd6e840fe9aec5db9e994e427440c31335c2e3e579abb1e29b66261a03b1cb77cf2d863d99b2fadb24954450a9c8016ea7a18626a86f50155c5 SHA512 ed9b086e5dc379953a629f227aa9561accba7dfc3422242603df06872d00c571fd1a544d999595dc17b4ce6f80748e2c959c79199161278fdfab5cc9868ffa70
-EBUILD libva-intel-media-driver-21.3.5-r2.ebuild 1518 BLAKE2B 5c2a4591ce1a3b6af4827f0c2eec03767d80f825704abd2e6c589b97ec55d6e76d0e8516bb2993cbae492eceddd4071cb07b605b28fa17c8b5acdba4e3e5c115 SHA512 fe936016b71e4203bcea37a1deb8c5812469b9d6fb756b76aa844a959a0883710dec2775a43f2f07b80c02b9254d5fdc17f5424cd0cf3bb625fe42acf7258406
-EBUILD libva-intel-media-driver-21.4.0-r2.ebuild 1519 BLAKE2B b6fa5f05746270f6c458022c914d08edda6fcb5edb5e28612df4543561e3cf5df6ebd7a71a76b9504d1bd94f8b8cc1391e08481a69fff54b7a3129712b8cff28 SHA512 fd08f731552148367c900c030c8731388e8a273de8823f38c630b08731ce4e53f7d8826f83c2b9ea1bf574bd4d27d9b43eece32f24c0cb891b5f809b235a772e
-EBUILD libva-intel-media-driver-21.4.2-r2.ebuild 1392 BLAKE2B 7412f822b7459314494014cd5d2ad795ad4ce0564e19ff53bc2a2f00701b082ef20ef3ff6253192fca802e1b805fef2bac2554591e879125baa5b0a7f89bc484 SHA512 68e29ddab24decacf5e21377f11e1b404e449cdf76b78037f46c340654b22b35098253941957c75a13466856a3db6b851919b40847e89116df62bb85ec5a7bc3
-EBUILD libva-intel-media-driver-21.4.3.ebuild 1391 BLAKE2B c0dbde34b716e8b1573a1caac3c0f68226ca5e046a92ce53e0476ae01dbf2dacec9444aa7321249fe91fc5830734499b56f76aac8119dc59d6b0c27ea2b934c6 SHA512 28d3538a2e32bf65042c81ccfcce092bceb4437527fd579412934e85fe2c98fda2c940fb741ddd57fc5d0b90944c5c05fb3df1cd05a150845c34f20383fbfb6f
-EBUILD libva-intel-media-driver-22.1.0.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
+EBUILD libva-intel-media-driver-22.1.0-r1.ebuild 1368 BLAKE2B 5f58f95f23416c6dfa77cd61e311c59448a5b1dadd3280115d17176bb392607320d3b4b00324cf80c7bfd953cf8365edeaed562edc7117ecf3a3f94c7577a00b SHA512 b24aa898bb3c48126c0e85f886cc564eee38f611d8ffb21ecc163b070814e526262892b7dc6d99fbec302345d2788b98c335734f82258d68a0357c0de9c8ca38
 EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B 6629037820176d3beaf10be676db7d705d2b3b4329bd2682b3ff11e5ef47369585b3de1d246c4fec4589224068ac9146a1d6df86a4d2b9eff6dd74a995229bb1 SHA512 8abc05bd597ed110fd115f203d05f8847a7b25bc5f7764d6a6d46f5d27e4836b061a4c45dbb33fadf3d9d2a043369ffa1b9fa3a4314a8fca7328e44688ceb0de
-MISC metadata.xml 770 BLAKE2B 6ab4ad71025ad0e2130613c3c4a06c0d337be0388f994f9e02042214228e105dfde10943efe80aef0d3e0656038a35c9bab01ad907f05826059a809f76add8e3 SHA512 c4cfbacc4218176b4a18bb3afe428a46a09d2fc7f7b13e6a12fa5f028e8d9d498c29e0e654ee51591eb62eff2e4d4addaa2a3a63c45706dba46f447c3b013027
+MISC metadata.xml 506 BLAKE2B 22e3db4e87af8f032b2f02d18937c894524ede02e6a408cee8f8fddf492cfd2ebc8de6ebe8e2e1786ec81f119a09d3abb50dd2617c7651ff2082986d66421760 SHA512 5f7ebdec168766dc148294d92b1a6f6a355293a78ff8c879d1de94dca283ecfb9136bb0f124f41af15256f31832c2b034452a2b4d0ea0616a36b2576b7d8da58
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
deleted file mode 100644
index 436e2fe892e6..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-    Prevent overriding of user-define CFLAGS, including -march flag.
-
-    The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON)
- 
- option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF)
- 
-+option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON)
-+
- include(GNUInstallDirs)
- 
- if (BUILD_CMRTLIB)
-
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -33,15 +33,19 @@ endif()
- 
- # Set up compile options that will be used for the Linux build
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror")
-+if (OVERRIDE_COMPILER_FLAGS)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1")
- endif()
-+endif()
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2")
- set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0")
- 
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -Werror=format-security
-     -Werror=non-virtual-dtor
-     -Werror=return-type
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # General optimization options
-     -march=${UFO_MARCH}
-     -mpopcnt
-@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -msse2
-     -msse3
-     -mssse3
--    -msse4.1
-     -msse4.2
-     -msse4
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
-+
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-+    -msse4.1	# SSE4.1 support is required to build the library
-     -mfpmath=sse
-     -finline-functions
-     -funswitch-loops
-     -fno-short-enums
-     -Wa,--noexecstack
-     -fno-strict-aliasing
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Common defines
-     -DUSE_MMX
-     -DUSE_SSE
-     -DUSE_SSE2
-     -DUSE_SSE3
-     -DUSE_SSSE3
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Other common flags
-     -fmessage-length=0
-     -fvisibility=hidden
-@@ -68,16 +81,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -fdata-sections
-     -ffunction-sections
-     -Wl,--gc-sections
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # -m32 or -m64
-     -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Global defines
-     -DLINUX=1
-     -DLINUX
-     -DNO_RTTI
-     -DNO_EXCEPTION_HANDLING
-     -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     -g
- )
- 
-@@ -90,6 +113,7 @@ if(${UFO_MARCH} STREQUAL "slm")
-         -mtune=atom
-     )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
- if(${ARCH} STREQUAL "64")
-     set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -206,9 +230,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
-     #set predefined compiler flags set
-     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
-     add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
-     add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
-     add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
-         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-
-
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
deleted file mode 100644
index c0f598ce6cd0..000000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.2.2_custom_cflags.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-    Prevent overriding of user-defined CFLAGS.
-
-
---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
-+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
-@@ -51,16 +51,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON
-     -fdata-sections
-     -ffunction-sections
-     -Wl,--gc-sections
-+)
- 
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # -m32 or -m64
-     -m${ARCH}
-+)
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-+list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     # Global defines
-     -DLINUX=1
-     -DLINUX
-     -DNO_RTTI
-     -DNO_EXCEPTION_HANDLING
-     -DINTEL_NOT_PUBLIC
-+)
-+
-+if (OVERRIDE_COMPILER_FLAGS)
-+    list (APPEND MEDIA_COMPILER_FLAGS_COMMON
-     -g
- )
- 
-@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
-         -mtune=atom
-     )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
- if(${ARCH} STREQUAL "64")
-     set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -189,9 +200,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA
- if(${PLATFORM} STREQUAL "linux")
-     #set predefined compiler flags set
-     add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}")
-+if (OVERRIDE_COMPILER_FLAGS)
-     add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>")
-     add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>")
-     add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>")
-+endif(OVERRIDE_COMPILER_FLAGS)
- 
-     foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
-         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
deleted file mode 100644
index 00f2befa1f19..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-20.4.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.10.0[X?]
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
deleted file mode 100644
index 05829c3b4ed6..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
deleted file mode 100644
index 5573b2b96933..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use set-as-default ; then
-		echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die
-		doenvd "${T}/55libva-intel-media-driver"
-	fi
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
deleted file mode 100644
index 5ce014edf7eb..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
deleted file mode 100644
index 8da9f2236e58..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	MY_PV="${PV%_pre}"
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="amd64"
-	fi
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD redistributable? ( no-source-code )"
-SLOT="0"
-IUSE="+redistributable test X"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=media-libs/gmmlib-21.3.1:=
-	media-libs/gmmlib:0/0
-	>=x11-libs/libva-2.13.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
-	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
-	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=$(usex test)
-		-DBUILD_TYPE=Release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
-		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
-	)
-	local CMAKE_BUILD_TYPE="Release"
-	cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0-r1.ebuild
index b0004515b354..d35edb899163 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
 	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~amd64"
+		KEYWORDS="amd64"
 	fi
 fi
 
diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml
index 706003d80004..df5d13fb7264 100644
--- a/x11-libs/libva-intel-media-driver/metadata.xml
+++ b/x11-libs/libva-intel-media-driver/metadata.xml
@@ -10,7 +10,5 @@
 	</maintainer>
 	<use>
 		<flag name="redistributable">Install redistributable media kernel binaries (no source code) files (primarily needed for video encoding support)</flag>
-		<flag name="set-as-default">Override libva automatic driver selection and set this (iHD) driver as default one.</flag>
-		<flag name="custom-cflags">Do not override user CFLAGS like -02, -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
 	</use>
 </pkgmetadata>