gentoo auto-resync : 31:12:2022 - 02:18:46

17 files changed, 18 insertions, 317 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1667ddf55f12..52ec3cdd96fd 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 7ba1a22af48e..510c50305359 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,13 +1,9 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292
-DIST intel-gmmlib-22.1.8.tar.gz 818360 BLAKE2B 5a7dadaead925eddfe52770c73eea92b8f071b498a2ed8d23928c93ba3d0284d9046339b7eb641918b17bf13bbcffc071ba71ba47cc53760258b1bb39f175e17 SHA512 4520105c7ceaae30e592acce7bae65841ecdb5d74c888cf03a2308a94a63d998941665794933c8247dbae841d13386ee99b365de0c6a5676acc960386c19ca2c
-DIST intel-gmmlib-22.2.1.tar.gz 820241 BLAKE2B 64eed8c1863d85355f47b3bfdd2740d2472f256a679189520d284c635a1ad722ed090d503b9e224ac262498091872e686cb1732be135627d7ec8170c946a6f80 SHA512 d3a68de83946319d582ff2d7785adaf007ea744fba6b1e9e2c53023f0b01b506f500aae3c4305c01bb97ce9176d39ae884fa306b1a075b1f2758faad3a1e0462
 DIST intel-gmmlib-22.3.0.tar.gz 843176 BLAKE2B 8874012deec80f5639a4fd1e0f7d94f9b683ad02fb140a4bc365ba1369bf2996ed19e4ccd45832e513017aedaaf34e76d88fd46838a02e15cb93921f70d414f6 SHA512 461057be96ecb6b5e84bfa55e486ee898133305ee65d31006aaf4509500da5a3ca7bbd8a7fbb77dee934e0eee97bd0edfc66d7d8dafcb55cc114f3b4d0ccc583
-DIST intel-gmmlib-22.3.1.tar.gz 843148 BLAKE2B b4f2e316a849e4bad5ce50e3b5ba9ba4ea32f353273acfe3d6cb69bae0e030978bbfce1b99f2c11fbf39a3460d8625f5f753c767f5223a03be45bca556c6a750 SHA512 6c2bb55f9c8762a2f8f279d98d08f63a97cd4755186d10ad6ad1f364002eb913f80bc7ea5fb1f9c6eaf85b03c7c60c16c9e636c3827483c51e2914e6e6e18e94
-EBUILD gmmlib-22.1.8.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8
-EBUILD gmmlib-22.2.1.ebuild 795 BLAKE2B 88959d7c98aba9bf4e9d1ac3cd7ab4520b547be03b21d7d341522d6f4440f2693c2e4e1f2f42dd58162edf564d3f0727bcccfc720ec36f50ef3c152fe6ad6251 SHA512 c616582ac1a65fab06d8bb4ff8119a263b46d41887d06012ab84999da0d309c004170eb4f354b821b4d06be23e195beede809c1b0a5b6da61b2a812054aa30c2
-EBUILD gmmlib-22.3.0.ebuild 796 BLAKE2B f5c333307a819ae40fe15abc1db665f1553bdd5010739fc05a2cbcb6022eb1b7f722a26276476d75a4efcddee50de10c2f749e59d26aa8abbe22e60cb3d0a2a4 SHA512 a23619b88f583d312fbf316dde75d8a84ad2c9266566404a631159ad8b216d67488e093bd595101c96b81f755f7cb18b2151354ce298e4d74a56f225251881a4
-EBUILD gmmlib-22.3.1.ebuild 796 BLAKE2B f5c333307a819ae40fe15abc1db665f1553bdd5010739fc05a2cbcb6022eb1b7f722a26276476d75a4efcddee50de10c2f749e59d26aa8abbe22e60cb3d0a2a4 SHA512 a23619b88f583d312fbf316dde75d8a84ad2c9266566404a631159ad8b216d67488e093bd595101c96b81f755f7cb18b2151354ce298e4d74a56f225251881a4
+DIST intel-gmmlib-22.3.2.tar.gz 843310 BLAKE2B cef45ad2e4090c846f8272cda9d3741b5e5534bbc555bd4d9fe1dc63b6cc1653367caebad638133cc6a48e8ba84f63868bdeeb940fb1a40a214948727fc9ee68 SHA512 925648d3250cc95eb7f3df04aace2ab9c97c9feecc7424708d19b6c40f8f0b0c802d2da078fb47489e9ca6f0cfe522f76b13eeb101b3665026582411e995d242
+EBUILD gmmlib-22.3.0.ebuild 795 BLAKE2B aa072d7de2722997cb9b3b25e8fa6b3463c9550b77fffd4920af453083067105a53c85c8be3fedee817c345d971f26c3e710b9e0899b176231f3fb41dfcabd90 SHA512 033a1447890b49f48f44bb66a21b3a2be616bda44be8dc861421cc9cb9f77268273f871bce537159ae8b74751fb47bf6e1ff95e8382bef87685eb762f5a4c54d
+EBUILD gmmlib-22.3.2.ebuild 796 BLAKE2B f5c333307a819ae40fe15abc1db665f1553bdd5010739fc05a2cbcb6022eb1b7f722a26276476d75a4efcddee50de10c2f749e59d26aa8abbe22e60cb3d0a2a4 SHA512 a23619b88f583d312fbf316dde75d8a84ad2c9266566404a631159ad8b216d67488e093bd595101c96b81f755f7cb18b2151354ce298e4d74a56f225251881a4
 EBUILD gmmlib-9999.ebuild 875 BLAKE2B 7023f9e4f92483e48cd0f7ca9395739df74d4ccc104fb45a76cdcb5ca74ccf75445e14a87355d302cc290108a0bf4c0bdae4a7831f1bba30c40b3e7872767c4e SHA512 815c3eb892de44f887c66f33ea54e19634871b9e147e5c6ab75d73e46b3500935656c04a3c46305ae921afc3fb6bdfeabfecc87e27c5b573a906be693985c609
 MISC metadata.xml 401 BLAKE2B b8c3f2935afa450ec0eeedd745e91b14ed18386a87edc77d17894db4764b681cf1c1b80bac714662f506a9092813525f2365aad31d01b64dd8709da2df6c07f4 SHA512 ce6959033b6682ab01f830b869c972fcb774d241bca62faed86f6e1705eb2f6a7615f8781c7c75118ac5fd6bae096c08cf6a2e965429bbdcbe9f598ae67f91f7
diff --git a/media-libs/gmmlib/gmmlib-22.1.8.ebuild b/media-libs/gmmlib/gmmlib-22.1.8.ebuild
deleted file mode 100644
index 74db95043d2b..000000000000
--- a/media-libs/gmmlib/gmmlib-22.1.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-${P}"
-
-KEYWORDS="amd64"
-LICENSE="MIT"
-SLOT="0/12.1"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.2.1.ebuild b/media-libs/gmmlib/gmmlib-22.2.1.ebuild
deleted file mode 100644
index 5b4da8b5f957..000000000000
--- a/media-libs/gmmlib/gmmlib-22.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-
-inherit cmake
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-${P}"
-
-KEYWORDS="amd64"
-LICENSE="MIT"
-SLOT="0/12.2"
-IUSE="+custom-cflags test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
-	"${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-		-DBUILD_TYPE="Release"
-		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-22.3.0.ebuild b/media-libs/gmmlib/gmmlib-22.3.0.ebuild
index a09ea1013a10..9e6de374a22e 100644
--- a/media-libs/gmmlib/gmmlib-22.3.0.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0/12.3"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-22.3.1.ebuild b/media-libs/gmmlib/gmmlib-22.3.2.ebuild
index a09ea1013a10..a09ea1013a10 100644
--- a/media-libs/gmmlib/gmmlib-22.3.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.3.2.ebuild
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index 7235b893be79..5d630fbedb4d 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -1,19 +1,11 @@
 AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
 AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3303d8cf11e99fc08b01cb4a12b1500afba27920e52a47cdf2d3cacc0b2cbea72e417ca4c118793c1149659cf1e51b619c0a81ca5103505a25994d9a0fee00a SHA512 41cd3cefd7a6aa6482c4d06b912cf441879e6fd14cee93380b081021e344d6555791e80d0925f66f59178d1b2d5ee15ff1f2deb4835d72f7fb74673912fc6b9e
-DIST intel-media-22.4.4.tar.gz 27437439 BLAKE2B 63bee317ff12c34e7a2da9f5dce51ebb21708f8b5b3f3a58618f487e72f7826f0d4afa486bac08c2db8582d8a4774de716b5bb9a3dff93ff4fc266e56d434519 SHA512 e6ed669476e42396df7714732c628aa67d90fc8040c006605b754d70bdb7ecf476c5eb5c849a8647646dd3858c5fd469ba05f5c6b02b36d2211dc4f4cc7fa77f
-DIST intel-media-22.5.3.1.tar.gz 27492012 BLAKE2B e300eba764dde8f2d6c07f4768bca253a21ae5f3bcfd829257541fb26c8a997390011a8bfdfab964eafe37fcece5db4826700bccda672ef51b2f62de2ea94d17 SHA512 aab70004aa3bd91ced7b147e4cd4bd662fe0813b2deeaa90e61f4d692d43a302a1e18dad502bbedb5102593f21f9710a56e202f0ba70a58afed139df3bf2bb78
-DIST intel-media-22.5.3.tar.gz 27488655 BLAKE2B 90d79ac8e7ab8cb97941d37fe81ce4524cef45e49e4b64e57931f00927cb2065c0b6f8b4fff5aba58cb9ea64548337261e37df13a53ba07c8ab81db160990e6e SHA512 987ca85ed95272945fd8c23a388ca68481ff5fdf74737a04659304e58c6d131c00db03ee134fc3549225a9fc33b874632335f1182d1e0c6d90fbc5ea290b486d
 DIST intel-media-22.5.4.tar.gz 27493483 BLAKE2B ac6a93e06eec33edd823b1fd4310cd635f20229ce1ba1d52eb36a11b8fcaf484c836261cb5e8437889208e9b268f29f78a241867629eb517fbada28a314bb4dc SHA512 9e7e4d7f33d0248f3d2288239ca121cd8c748a98587384e69c92aeedf4b9ce7ff585cac06b260713f9cd95936d270c36e6981bc500c2a6bee7276d0e238f4b74
-DIST intel-media-22.6.1.tar.gz 27578189 BLAKE2B 733168dab6f218814564eaa7315c25e64305e7b8717364da74d1e4a3261e6a008aa325459b593c5df37e2b88d6ddc0dcff40359bbce2b2b920ec4afe04df5764 SHA512 068b3e928b69fc61c13bcba68c985aabc66f8cc4fa6373cbf00f6bef949822c297d2dd9014dc454a99322e0dd150210affdafbdf0e918776f78f3fdda6462ddb
-DIST intel-media-22.6.2.tar.gz 28608216 BLAKE2B bafa5701ea9ca155b616f855e9657ba22620138a8d5f822af5edcfa472530d5a3c6681ef42f6d8c70b395457e12b80625dd1a30564b9a8104b5c4e25f5d8b161 SHA512 2c54fef591fecedf98d64150844332ebeb0f473766747039cb0be8ab8e160f3a44ffce21c18991dcd10f917b0cf07f82a8578fc288c25322fa2f29c70083e323
 DIST intel-media-22.6.3.tar.gz 28848769 BLAKE2B 9bd86f119e5cc3cb3ec8f16cc77072146d7c1e520030c9047e877526e3edd2ed1fdc67c30726c6f23df4abe954c2e6a23babd96b63c12c8e8b3f1c60be13d464 SHA512 1158a8a158c44f3911b16524b6f1ff2dbf119d8c3108600ac89e904a0832209c940e90549e04e305f56308a6ac17eb905eef2e74f14db23760c7f91e5ef5a35d
-EBUILD libva-intel-media-driver-22.4.4.ebuild 1371 BLAKE2B f39c670b03e589f23277ff4c0416ecce09637ee0323e70a1d71c97ccb319b2fb1b47a218ae7f006c7cbace0085ed21d70d38e91e9f27e5fbee42bdbe0553f796 SHA512 b1217cfb4ba440520664d839bd5d5e0193c6b9107167a2dfd264015a0a38900a4e36e0326e459feb3a5ced5b10e54f9583f32bfe40540100eaec66c52412823b
-EBUILD libva-intel-media-driver-22.5.3.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
-EBUILD libva-intel-media-driver-22.5.3.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
+DIST intel-media-22.6.4.tar.gz 28940937 BLAKE2B c7583126b99545a22e8928cf0e26da0382d8778e005353511d3109c15cafaa96124e5136ab68025ed8153c4d769be0b9d135e22d5521123c1058fc4565f2c89c SHA512 430f4a1d1251edc89e1ba05a1815f6e6ff1e65a11b44f0030e6daf6aeb28260a25e6fc5bafb2a6f34a12698a8095204811e79dfff4c58349c04b9941fa0644a0
 EBUILD libva-intel-media-driver-22.5.4.ebuild 1348 BLAKE2B 06e45d9018fdfd720c9e2251d179cfb28db544595ef2daede5bce4c37e35c5e22b7a335fb19f7d239c5ed017362b91601144aa00efc836470c42ff88c21aef22 SHA512 5525f59567a4cba6ae9ed1d0db84c01445e349a2c9bb8040a08b503d98533a45559d7c128b895fdd9e6479ceb0ead7e71d95f9f899257166df59931d0ceacbdf
-EBUILD libva-intel-media-driver-22.6.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
-EBUILD libva-intel-media-driver-22.6.2-r1.ebuild 1349 BLAKE2B e5e57ea19168eeaf13bf11f61f1b4e708b3a0536b921d87531717ffd02303eb103374b0f3c4379ffea0fce10ca6edcdcde2b1301a4dc583dca722972909c0ae0 SHA512 761bc71fcac39829bb61822832f1f71bddaec9108aa2cdc1073edf75d3c9400096ba25ba045defcdad39ff1ae390960c1188f10ffc3cf2d8b136800520b14c4d
 EBUILD libva-intel-media-driver-22.6.3.ebuild 1349 BLAKE2B e5e57ea19168eeaf13bf11f61f1b4e708b3a0536b921d87531717ffd02303eb103374b0f3c4379ffea0fce10ca6edcdcde2b1301a4dc583dca722972909c0ae0 SHA512 761bc71fcac39829bb61822832f1f71bddaec9108aa2cdc1073edf75d3c9400096ba25ba045defcdad39ff1ae390960c1188f10ffc3cf2d8b136800520b14c4d
+EBUILD libva-intel-media-driver-22.6.4.ebuild 1349 BLAKE2B e5e57ea19168eeaf13bf11f61f1b4e708b3a0536b921d87531717ffd02303eb103374b0f3c4379ffea0fce10ca6edcdcde2b1301a4dc583dca722972909c0ae0 SHA512 761bc71fcac39829bb61822832f1f71bddaec9108aa2cdc1073edf75d3c9400096ba25ba045defcdad39ff1ae390960c1188f10ffc3cf2d8b136800520b14c4d
 EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B a48874cc6d1cff79803390c8f1ff2651ddb6464f21365d74a2f0b7bc97e392ad0eefa0002f659feda8db7b3424d66938db48be1a238c8bbd76eed220fd241507 SHA512 d6414971a1487d155214b8cfdc053b4657364e547aeafdc3d18d8f16bea241a2b775616f614a4c5320c6c52f119e20ae3ea208f23af684ee712f90bc006ef487
 MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.4.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.4.ebuild
deleted file mode 100644
index 24fb2ffb188a..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 VA-API (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-22.1.8:=
-	>=media-libs/libva-2.14.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/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.1.ebuild
deleted file mode 100644
index 92a6257bc1b1..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 VA-API (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-22.1.8:=
-	>=media-libs/libva-2.14.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${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
-		-DCMAKE_DISABLE_FIND_PACKAGE_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/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.ebuild
deleted file mode 100644
index 92a6257bc1b1..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.5.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 VA-API (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-22.1.8:=
-	>=media-libs/libva-2.14.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${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
-		-DCMAKE_DISABLE_FIND_PACKAGE_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/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild
deleted file mode 100644
index 92a6257bc1b1..000000000000
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 VA-API (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-22.1.8:=
-	>=media-libs/libva-2.14.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${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
-		-DCMAKE_DISABLE_FIND_PACKAGE_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/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.2-r1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.4.ebuild
index c330de59e4c2..c330de59e4c2 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.2-r1.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.4.ebuild
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index 3ce082c14903..fb749cbc2022 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,8 +1,8 @@
 DIST libva-2.14.0.tar.gz 266254 BLAKE2B 1ad504dc7f72b15bb35b486a5fcb327c14663b80068791aa983f2d46876b1504b8330888430b85d2fb309bd5aa2a11c4a34589b68fa140e10b27cb952e3eb5c7 SHA512 8d87b49c7242174d05dca709bd79e6e45cea6e6060d12f5cf7636433be587c2b3a6c3183f632fb0ff49b19f31f915a2a62818c26f57c3a8f40741aa1ab8270b4
 DIST libva-2.15.0.tar.gz 264429 BLAKE2B c1bd8c3de25a266b8cc35400db464ea8b0dc81f017951b2814874c93ebf6b1b9e09860749c9eb932fe54b012e6295ff7d9cf0895f5af5fe6963f7dc3cea809b2 SHA512 fd96da76db6e6a80bb83d74a6f736e168d3a27cd200e77553d8ca9a19b9766b101b2e550953ca50445e1874f7ad59bf6c3a166eee6c83fe66c924b5a3494be9d
 DIST libva-2.16.0.tar.gz 267735 BLAKE2B 59c5dc39e1c40c2f24455ec7b0588eb4898b3cab7c49ffbca997882c634ca7be6334fdb820afada8e2ebf39eb2166c95610df190d90c2a98c4fc25d25c733b32 SHA512 08a1481ac693ee9de639f2abd483e1fabfee87f9c04ead066dfce5c24cc7f1d1a29d8664707bb534ce4cc25e52086c5e4a0ecfe704ca59590ce41353fda31c2a
-EBUILD libva-2.14.0.ebuild 1656 BLAKE2B a65bcc2119e25a2a27e9324e83a2c9b11c6a646f09f6f592428d9ec445e08a63dfac192af1d7a4c8dc380c2e2172b1ee1bf0d399bf1384a5946c627efce047ca SHA512 31fba31b1464337f4b3a3f7005a6b3c2a1adee458e30c1e4ef55961c5494117bd084a7b0d71595d5bc07691dbe4a30b8b272c3aeef9fab8944695d410f95c83f
-EBUILD libva-2.15.0.ebuild 1656 BLAKE2B 170afb6271dc2b2ae47408ce47f2ab67ce800c0c5ab3f8444b85fc75aab49fe3ee07213f7b7a5bedb99fbaa3294d09cb80487ed63bacebb1711e568317faf2fe SHA512 c0dc31f442b0b81d066fb0e74cadcc2c763ac3b4706b680421d62dbc51689ead27282ecffebe08681429f84536470940df9afcef733fec66545ba223c7157ff1
-EBUILD libva-2.16.0.ebuild 1651 BLAKE2B e402a9fa3756117cbed143e4eb70b36aa8468e6cec0a563ab4f11b30dcadedfc9a4e6df3ff746598d0e789ced5d8e5b470d584688e78d41c14420344bb0d4504 SHA512 cbf2b83927d3e4ebfaacae70245d8c1521d8b32f2d89d86314f465ae98218690a0a233a00919be4e644061a7358d29c790c39fb0c3cc06d096823477103335ad
-EBUILD libva-9999.ebuild 1660 BLAKE2B e5a30d7b64db02bfa6b757adbbd673879ef7d790335459cc59755be541e002ebd827866dfd89a64d7aa7730456bf5516d5d8e1988c7c524b22a7aead81a189f8 SHA512 ec9d7e043fca8b048e4eeea549bec74c295fedd4f0cbda8f5f14674502a4715b89db81c66deb6454d1b4456f4410df7f0e0eb7beae79cc4af6943c47a0fce240
+EBUILD libva-2.14.0.ebuild 1678 BLAKE2B a4e334e8a81a469fe54065d60ab65199a05b55f35823cafc9b84a25d5d829ae255d0b58ec4a5409a1b769c32bce35987b41c86075b47dc183de8e1c78c83929e SHA512 73df2de1a998ce5b7ab88f49050b7cae945efcccfe69e23e478a9546a1cd61cc02dab02ed68d74596904a91a3da375a973cf8e5efff0226d6891e608b9b1d748
+EBUILD libva-2.15.0.ebuild 1678 BLAKE2B 25863afd6d6f8a1355ab3678792188deeaad3587dbd368bf6430d437cad9b0730759c535ed79758503672673eb0e654c5df0136b15af69e0ff3ebb57371825b2 SHA512 18f7683f1c3ea67fad6d825e1ee8e6066ecd0449c1ba3a2f2e79c2f4a0fbc01755e3588dd228b2b8332f81275b6335dea664ff7efce661a0a51452a17477547a
+EBUILD libva-2.16.0.ebuild 1673 BLAKE2B 70e3fc2d9fa99c691b6c1411b2d491ea586cf24fa13d0f2702ffaaa07cc4ab3c8555329244d65970e550233bfb5ecbeaa28533f87cc51261020f91c289785cce SHA512 0f11878765a5b5813282e7456c03d7072bb35591f512149917fe8203f74669419b24e34ac70260758e01e9c317c5239d5528b81bc9d091da57eb403f811b2852
+EBUILD libva-9999.ebuild 1682 BLAKE2B 92dabcc41a8f7993b992d58b9425ea402ce7b8ffcfaabd85882fc3b8c0b117e38fd642890b58f2ab95e97c6832f5b81e4dbc8a7bd000031c6fff8bec3c7506ba SHA512 05d0d898c7a8e5ee084b0a335f4c2bb5333fc719c5e596522b4f3e76e3e0d538376fd6c27a154b2ab537cb27f276a4357c3e1503575ccb807e31d74e8ab49d05
 MISC metadata.xml 405 BLAKE2B 02edd18ab96b6b2b45930e7c623275758bb763f2bd291459a587e020ec34f6a56d0152dcbaf662bff9573fc9e51c69def9ea1caf85f28dbfb6d2fe7be7a80879 SHA512 3ec8eeca943e313e32a5aaf77e5cb3ff277ab976ce2adc7a018d697ba1a45ee19b9555c29f304ade4132c70b2181ab67c04dedb8356d5a93a7a236b9221e3c8b
diff --git a/media-libs/libva/libva-2.14.0.ebuild b/media-libs/libva/libva-2.14.0.ebuild
index c156652d5ffb..5e0839e1e2e6 100644
--- a/media-libs/libva/libva-2.14.0.ebuild
+++ b/media-libs/libva/libva-2.14.0.ebuild
@@ -63,6 +63,6 @@ multilib_src_configure() {
 
 pkg_postinst() {
 	optfeature_header
-	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
-	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
 }
diff --git a/media-libs/libva/libva-2.15.0.ebuild b/media-libs/libva/libva-2.15.0.ebuild
index 72f219a1b687..327425619513 100644
--- a/media-libs/libva/libva-2.15.0.ebuild
+++ b/media-libs/libva/libva-2.15.0.ebuild
@@ -63,6 +63,6 @@ multilib_src_configure() {
 
 pkg_postinst() {
 	optfeature_header
-	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
-	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
 }
diff --git a/media-libs/libva/libva-2.16.0.ebuild b/media-libs/libva/libva-2.16.0.ebuild
index c23f64063cfd..db0d708f12bb 100644
--- a/media-libs/libva/libva-2.16.0.ebuild
+++ b/media-libs/libva/libva-2.16.0.ebuild
@@ -63,6 +63,6 @@ multilib_src_configure() {
 
 pkg_postinst() {
 	optfeature_header
-	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
-	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
 }
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index af519dfd205b..b1a63ba29423 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -63,6 +63,6 @@ multilib_src_configure() {
 
 pkg_postinst() {
 	optfeature_header
-	optfeature "Older Intel GPU support" media-libs/libva-intel-driver
-	optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
+	optfeature "Older Intel GPU support up to Gen8" media-libs/libva-intel-driver
+	optfeature "Newer Intel GPU support from Gen9+" media-libs/libva-intel-media-driver
 }