gentoo auto-resync : 26:04:2024 - 23:59:36

19 files changed, 30 insertions, 515 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6b5ea6c35ce9..fab74c3b2426 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest
index 765ded8e992e..dec3ff7bf6ab 100644
--- a/media-libs/amdgpu-pro-vulkan/Manifest
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -4,20 +4,11 @@ AUX vk_pro 121 BLAKE2B 833ed55d23b89a00641c3f685bfc06feec10ca352ec2ab4fc8ec6c78d
 AUX vk_radv 127 BLAKE2B 3fb35e8b89b0baec70eb302abf9c6ccf67b2a04dc8b1dd68e8db7abd870510c72a8b759a8dda6d93e893c50e14b1776335c7abe9705274f3486277ff54356aa5 SHA512 0b7db271d8db8e26d39372d47cf715be7933ceeb474897af56614aae8ce413057f9e80631f7a0bee057ea0e88c68271e105808670c9d117dab57b2b31f0e2244
 DIST amdgpu-pro-vulkan-21.50.2.1384496-amd64.deb 8320356 BLAKE2B 1a5997ee983bf4729c429dae7d333fd49f8bb24a5022238299fd87e4ad8a7579c0535a8198fc3869db3b8079634b1e06e9bb90ff761239486cb4ffb7ea6ead4a SHA512 16299cb567d9573080d6e3b83124e931692392c5282a3be5f39638682b2c8d4aa9395787382e0145d61dc5a5df3f3e143d9f01b1710ad11e940f3e8ea5137c7a
 DIST amdgpu-pro-vulkan-21.50.2.1384496-i386.deb 8124180 BLAKE2B 697899e40cedc584d8507c3c4c908c54db3676d47d720fb7b7fcab6e1f542e1d1e5efedb5b46231d4cd6974d3d03a19816d6ab4cc6d2f0279547058b5e4143e3 SHA512 8662efb65f14172f4261401115737f3c7eebbe071a9660f5146eaee9a1d4684c30174b18bea94d31686dbe679d66ab77f252192c1cda27ed57784cc9a57e5fdf
-DIST amdgpu-pro-vulkan-22.10.4.1452060-amd64.deb 8934992 BLAKE2B b44beedf1294ae0a63252133f8c55554a5993209a787c7391a192dc76cf18b11d5c059cb231c2bd3f04bc8697fcba2cbf091b84c5b4fba8989afa8c46f94e4fd SHA512 cb12a8c20d10b94d14bc43961474a8fee2a17d91012f18e532c6f9e4893224a74f076c892df2ea4838227b35cf2372fdfdc6734d792d7913de77fc3abb78e617
-DIST amdgpu-pro-vulkan-22.10.4.1452060-i386.deb 8727612 BLAKE2B 41ce1ca9739bfc8d75f9b84435e48605728d6daa593c118d8626457614f64d73e76a623f913764c3b7a799126e0160ffbf9f3bc7077d3bd2f73ccba8dd4c9158 SHA512 113d27d832e6457f1b1a3c409a15b5d4f1b6e67c0e79b45f6d554eb04f18f7628684ab38a83c9f682dc3e76a34a8d748054b20baf9d47c86515dbfd4c13f070c
-DIST amdgpu-pro-vulkan-22.20.5.1511376-amd64.deb 9224820 BLAKE2B 6c7d54bdca0015c3e1330f86e0c57b434f94ceb0b06f4714864598b432f2538d3f37e44c3d5203537dd89e7586caf8437d90fcb377cf758677388a785642d842 SHA512 aa788c4c687f732bd2dab001638c210a5c65e676f7eff37ea12a8404e4442bcdf403fee3bc4c3aba93f81d2b2a3d4a74949b5afdc986d1aa6e79346a0f04381a
-DIST amdgpu-pro-vulkan-22.20.5.1511376-i386.deb 8944844 BLAKE2B 05e7a649addedc5aa640767ca0c427d7c2972283d3fc26441c5a6f652d03837716020fbfe769e23b1b38b497bb62c7cfad1ff2998adf4c9c02e41e715ae266aa SHA512 9d904ae27cc4f7faa4c3a9b6c76c4ae53632162a58882f001934af19de8d9a00930febc3b5be0368cc204fe9d9d5993527028f8e94b29f4021f2867df26d7a4d
 DIST amdgpu-pro-vulkan-22.40.6.1580631-amd64.deb 26403020 BLAKE2B 9af314b75ec6af3ff1085f9eabf1f4d4c4c8e0bfdf2aea7ce64adf21fbc1e227784751861b1c42e7d66e458854be01e1b2f7da4bcd1c72cb5f74b12b02294de3 SHA512 2f097724b6063ef1a8e3dcb6a29884b580342e5a00ac59c2338f13f9162056dd4ab3e07d330805e48c81e7e8f42dc5cb927635c3c40f19bfe68c04ffbba41843
 DIST amdgpu-pro-vulkan-22.40.6.1580631-i386.deb 28131372 BLAKE2B 4f92814a1f1aa3cecec5321252990c87548b94c633be2080fb4be9c9ef72772e45943b62c55e1424b03671540b599f13666d49599c7ef8e2a93a51a66cc17e92 SHA512 7ffd0cebb630cbf2a3845c0e673c408f56a046bf68d1c73a02b2a1d3a245d5fdc3cb00b461fe52dbd74abd15cdd3e75007539de584750fce22176e6994007d94
-DIST amdgpu-pro-vulkan-23.10.3.1620044-amd64.deb 28230396 BLAKE2B f0c59e5c955640ff8b98d1fe5982593b8ccd450fd51b11de256e30388afd7ccf7f8cf236149556186fb5b2bbbc60ff4c31a33aaf8456391403adb899dd77fc10 SHA512 7d454178c3ee601ebd51cbfa0ce72e8a097014a65079d5955702de030dc4172a4fdb368d40c781a54891bc2b31966455802db497237177112e35aab2d94c717b
-DIST amdgpu-pro-vulkan-23.10.3.1620044-i386.deb 29943120 BLAKE2B cb15cd340854d2d023c1d5d700790d7ef37f3cddb6ec5e11a0642da8dd6c9bcf375bcc3793f4a6a1e379c78b518c68e6bb188b91cd815bca1abc1e09f6516c02 SHA512 2c251b68a4910e8873256316248d4c932483e928e38b9752fd919df0165e3db134e7d08c2c1f95cceda24e47cd5b419d482243ff7e42af3cb4bec8abb4162436
-DIST amdgpu-pro-vulkan-23.20.0.1654522-amd64.deb 24480404 BLAKE2B 10e2dea7e03bc6c24b40b8d8c4933897e17edb8e9b1fb1aebc7a6151c2bf051bbd5e994b771a045e747730f41996b2b3819edd8163daeb22a0487d5a96ea15f7 SHA512 4014a3f5cdbc3e977d5953719e8d0ea34a0ff1cc9b7292513df69e98d1c6556643392dd77edf10a682f049c689d69c92ba307d5af5b8e68003ccbba014f7aa9a
-DIST amdgpu-pro-vulkan-23.20.0.1654522-i386.deb 25453504 BLAKE2B 46940aecb2d6981846534f49b7f2d829924c03ba7fe8fe84c84408968a761683183524f4aa58ac9a2810bbc16975634cc6dcaaba3331604ab2bb74bd9949bb3b SHA512 ab8e7df7d093bc25dcdda942456ba54f3d21312435af025619b1f9531606ea5a18b975fe291e06154dabaaafb48cd5f58261d958c765058ed23e53517032b5fe
+DIST amdgpu-pro-vulkan-23.40.0.1718238-amd64.deb 23555536 BLAKE2B fc3aa3d0fe271bb9184999c6ba887cbd466ef41a61d1e35aaa0e94838322f8182e9c40393fa250fda7489ce5b04514b70f3b49274b6e58ce6db2a70223a11280 SHA512 6f6ca7cabc665fefbb8d2308cc3654baec726899ea1923885056bfa80e681c5f96eaba7e912bc73b7889dac322ffefec0cda061b7e0a1d099bca378e7afc5ae1
+DIST amdgpu-pro-vulkan-23.40.0.1718238-i386.deb 24907864 BLAKE2B 438cec19c1e96b872a81690b212b1693a048fab92cc67bab2aedaf917fa802760100631e408d70a5f3ff70bb88b8f888ee566926055770d318fbaa9a88a4490f SHA512 5f46fb6ab37ad596762f46fcd2ac2a0568a98023e97c92408d943e4a1033f4811450331f688da6f90a070d9cd0a56962284c71e645111c6c4f52e205fd41bf82
 EBUILD amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild 3270 BLAKE2B e36c39386c36d8f179a2a62b020ffac69a43a7cade3b2619b8ba6755e9c5a42e66c1bb5e560fca5b319eb5cc77d3d7ea489acd1aa2a71410e3efeec393101490 SHA512 77d275f8281bc2f73918879bcfa0f33f83c490188ad6bb11f05e21eaa9b3d00d9db6e00ac598723e247fdafdb32369b6f96838556c01e3863cf34a1ed688b9de
-EBUILD amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild 3792 BLAKE2B 991c484ef3461f0a5cc160be758695d63ae16151723458b8a9c33120bda1b9b3e90e7aef22f4d85f3bfc97ac9c92573d305fd88ee8ac9177129b5da59b8f7433 SHA512 8d056add08d788f9ea0ab59cb59644312b16a006b91d36eda8d2f4d3b87f79118fd72d501a3b28af7be08fbbaf39edaa7dee49ca16d093895c41257b80376cc1
-EBUILD amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild 3785 BLAKE2B 7d28cd25508acd28b846b32589bf054dc904b796786cfe672368d42681e7be116a12b4b10cf7e960a5ff99ce298c6cc9aa590f5b18a97c52ddc601823a6f60d4 SHA512 3d4ea8ca8d7007a381e9b4c956b0fbb14616a32290c0bffa3a76942ee04125b9de7e3e052ac129faecf4c807c97ad647e0144c3c56e972f20fe5ad026da41e81
 EBUILD amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild 3818 BLAKE2B e1f8338c6b4c0a7db5a3c8d512ea0c45b1af7fc7d5a6f62dc46a812dce123b6a70b68d89c3701a52bd63745ef7b90163d4e5eaa226976256f01fcc8e217bb44d SHA512 b361a9cd23f6b398fa0a45b3de6bd5d987ae74a721826c0f6a6275f215b52c0cb8b55c3c30f79cf1f6090a43ded0655bc6154d9aa6a2dbdbc991685ea4f3355b
-EBUILD amdgpu-pro-vulkan-23.10.3.1620044-r1.ebuild 3734 BLAKE2B 98542258b49e165398a46143d8d03e19f78a0bd2b5a5cb6390cb8d8ed6f4a28d60b5524ee9511ee4ed4ba439f017b7a5205247292b5d4ab74afbe31c6777e74b SHA512 4d2e40e3cd3b4f7cfe099e6ec5debd16dc00a6c54bf11d70d85b8b17513d8b03b594c4eed49505ac51a47c602a2eecde971a7bae69070fa452b63008a0b48976
-EBUILD amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild 3732 BLAKE2B c3bde4656e718ca91a2c851198c181d8adfeab96408a48d4f2c82932268e9cd2cf54189ec35fd884ef142454d491695ff6c63ab5b96e0c71b30e2417c465a410 SHA512 f4df1747caf3692c7891233eca9002b142450895910938b271c2038163b8d350949f0581de5e8b50eac525226671d69c985dd98979d699cae67087e640c69016
+EBUILD amdgpu-pro-vulkan-23.40.0.1718238.ebuild 3734 BLAKE2B c36d10a1a30797ce8dfd22db7b6c8a0cd99428baee5f0f1f159ad1e66e07a0e0218674fc3e3e1cfdbb1e48c72e16533ea8ebab801e7d04e825013771dd3bb7d6 SHA512 57ab0157e9ffe975ec56640a72103466ce7af6408123c0c07eaee8f463f639db3ac3832722f51f6c4c14ab2678cdb8ff28ea3f6b8c6270e4e1edf0626ff6e25e
 MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild
deleted file mode 100644
index 670a2f29aaf6..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-MY_PV_HIGH=$(ver_cut 1)
-MY_PV_MIDDLE=$(ver_cut 2)
-MY_PV_LOW=$(ver_cut 3)
-MY_PV_REV=$(ver_cut 4)
-
-MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
-[[ $MY_PV_LOW = "0" ]] && MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}"
-
-MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
-
-MY_PN="vulkan-amdgpu-pro"
-
-MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV}/ubuntu/pool/proprietary/v/${MY_PN}"
-
-DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
-HOMEPAGE="https://www.amd.com/en/support"
-SRC_URI="
-	abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}-amd64.deb )
-	abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}_i386.deb -> ${P}-i386.deb )
-"
-S="${WORKDIR}"
-
-RESTRICT="bindist mirror"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
-
-REQUIRED_USE="video_cards_amdgpu"
-
-BDEPEND="dev-util/patchelf"
-
-QA_PREBUILT="
-	usr/lib64/amdvlkpro64.so*
-	usr/lib/amdvlkpro32.so*
-"
-
-src_unpack() {
-	default
-
-	if use abi_x86_64 ; then
-		mkdir "${S}/${PN}-amd64" || die
-		cd "${S}/${PN}-amd64" || die
-		unpack_deb "${DISTDIR}/${P}-amd64.deb"
-	fi
-
-	if use abi_x86_32 ; then
-		mkdir "${S}/${PN}-i386" || die
-		cd "${S}/${PN}-i386" || die
-		unpack_deb "${DISTDIR}/${P}-i386.deb"
-	fi
-}
-
-src_prepare() {
-	if use abi_x86_64 ; then
-		cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
-
-		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
-		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/"
-
-		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1"
-		mv amdvlk64.so* amdvlkpro64.so || die
-
-		# same with the SONAME
-		patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die
-
-		cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
-		eapply "${FILESDIR}"/icd_amd64.patch
-		mv amd_icd64.json amd_pro_icd64.json || die
-	fi
-
-	if use abi_x86_32 ; then
-		cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
-
-		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
-		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/"
-
-		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1"
-		mv amdvlk32.so* amdvlkpro32.so || die
-
-		# same with the SONAME
-		patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die
-
-		cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
-		eapply "${FILESDIR}"/icd_x86.patch
-		mv amd_icd32.json amd_pro_icd32.json || die
-	fi
-
-	default
-}
-
-src_install() {
-	if use abi_x86_64 ; then
-		# Vulkan driver
-		insinto /usr/lib64
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
-	fi
-
-	if use abi_x86_32 ; then
-		# Vulkan driver
-		insinto /usr/lib
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
-	fi
-
-	# AMDGPU-PRO Vulkan prefix
-	dobin "${FILESDIR}/vk_pro"
-
-	# AMDGPU-PRO & RADV Vulkan prefix
-	dobin "${FILESDIR}/vk_pro"
-	dobin "${FILESDIR}/vk_radv"
-}
-
-pkg_postinst() {
-	elog "To execute programs with the amdgpu-pro-vulkan driver:"
-	elog "  - Use the `vk_pro` wrapper script: e.g. 'vk_pro vkcube'"
-	elog "  - Define the following environment variable: "
-	elog "    VK_DRIVER_FILES=/usr/share/vulkan/icd.d/amd_pro_icd64.json:/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-	elog
-}
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild
deleted file mode 100644
index 8152f796b69e..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-MY_PV_HIGH=$(ver_cut 1)
-MY_PV_MIDDLE=$(ver_cut 2)
-MY_PV_LOW=$(ver_cut 3)
-MY_PV_REV=$(ver_cut 4)
-
-MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}"
-
-MY_PV_LINK="$MY_PV"
-[[ $MY_PV_LOW != "0" ]] && MY_PV_LINK+=".$MY_PV_LOW"
-
-MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
-
-MY_PN="vulkan-amdgpu-pro"
-
-MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV_LINK}/ubuntu/pool/proprietary/v/${MY_PN}"
-
-UBUNTU_VER="22.04"
-
-DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
-HOMEPAGE="https://www.amd.com/en/support"
-SRC_URI="
-	abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}~${UBUNTU_VER}_amd64.deb -> ${P}-amd64.deb )
-	abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}~${UBUNTU_VER}_i386.deb -> ${P}-i386.deb )
-"
-S="${WORKDIR}"
-
-RESTRICT="bindist mirror"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
-
-REQUIRED_USE="video_cards_amdgpu"
-
-BDEPEND="dev-util/patchelf"
-
-QA_PREBUILT="
-	usr/lib64/amdvlkpro64.so*
-	usr/lib/amdvlkpro32.so*
-"
-
-src_unpack() {
-	default
-
-	if use abi_x86_64 ; then
-		mkdir "${S}/${PN}-amd64" || die
-		cd "${S}/${PN}-amd64" || die
-		unpack_deb "${DISTDIR}/${P}-amd64.deb"
-	fi
-
-	if use abi_x86_32 ; then
-		mkdir "${S}/${PN}-i386" || die
-		cd "${S}/${PN}-i386" || die
-		unpack_deb "${DISTDIR}/${P}-i386.deb"
-	fi
-}
-
-src_prepare() {
-	if use abi_x86_64 ; then
-		cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
-
-		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
-		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/"
-
-		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1"
-		mv amdvlk64.so* amdvlkpro64.so || die
-
-		# same with the SONAME
-		patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die
-
-		cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
-		eapply "${FILESDIR}"/icd_amd64.patch
-		mv amd_icd64.json amd_pro_icd64.json || die
-	fi
-
-	if use abi_x86_32 ; then
-		cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
-
-		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
-		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/"
-
-		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1"
-		mv amdvlk32.so* amdvlkpro32.so || die
-
-		# same with the SONAME
-		patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die
-
-		cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
-		eapply "${FILESDIR}"/icd_x86.patch
-		mv amd_icd32.json amd_pro_icd32.json || die
-	fi
-
-	default
-}
-
-src_install() {
-	if use abi_x86_64 ; then
-		# Vulkan driver
-		insinto /usr/lib64
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
-	fi
-
-	if use abi_x86_32 ; then
-		# Vulkan driver
-		insinto /usr/lib
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
-	fi
-
-	# AMDGPU-PRO & RADV Vulkan prefix
-	dobin "${FILESDIR}/vk_pro"
-	dobin "${FILESDIR}/vk_radv"
-}
-
-pkg_postinst() {
-	elog "To execute programs with the amdgpu-pro-vulkan driver:"
-	elog "  - Use the `vk_pro` wrapper script: e.g. 'vk_pro vkcube'"
-	elog "  - Define the following environment variable: "
-	elog "    VK_DRIVER_FILES=/usr/share/vulkan/icd.d/amd_pro_icd64.json:/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-	elog
-}
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild
deleted file mode 100644
index 21610a0f0b64..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-MY_PV_HIGH=$(ver_cut 1)
-MY_PV_MIDDLE=$(ver_cut 2)
-MY_PV_LOW=$(ver_cut 3)
-MY_PV_REV=$(ver_cut 4)
-
-MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}"
-
-INTERNAL_VER="5.7"
-
-MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
-
-MY_PN="vulkan-amdgpu-pro"
-MY_LINK="https://repo.radeon.com/amdgpu/${INTERNAL_VER}/ubuntu/pool/proprietary/v/${MY_PN}"
-
-UBUNTU_VER="22.04"
-
-DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
-HOMEPAGE="https://www.amd.com/en/support"
-SRC_URI="
-	abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_amd64.deb -> ${P}-amd64.deb )
-	abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}.${UBUNTU_VER}_i386.deb -> ${P}-i386.deb )
-"
-S="${WORKDIR}"
-
-RESTRICT="bindist mirror"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
-
-REQUIRED_USE="video_cards_amdgpu"
-
-BDEPEND="dev-util/patchelf"
-
-QA_PREBUILT="
-	usr/lib64/amdvlkpro64.so*
-	usr/lib/amdvlkpro32.so*
-"
-
-src_unpack() {
-	default
-
-	if use abi_x86_64 ; then
-		mkdir "${S}/${PN}-amd64" || die
-		cd "${S}/${PN}-amd64" || die
-		unpack_deb "${DISTDIR}/${P}-amd64.deb"
-	fi
-
-	if use abi_x86_32 ; then
-		mkdir "${S}/${PN}-i386" || die
-		cd "${S}/${PN}-i386" || die
-		unpack_deb "${DISTDIR}/${P}-i386.deb"
-	fi
-}
-
-src_prepare() {
-	if use abi_x86_64 ; then
-		cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
-
-		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
-		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/"
-
-		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1"
-		mv amdvlk64.so* amdvlkpro64.so || die
-
-		# same with the SONAME
-		patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die
-
-		cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
-		eapply "${FILESDIR}"/icd_amd64.patch
-		mv amd_icd64.json amd_pro_icd64.json || die
-	fi
-
-	if use abi_x86_32 ; then
-		cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
-
-		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
-		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/"
-
-		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1"
-		mv amdvlk32.so* amdvlkpro32.so || die
-
-		# same with the SONAME
-		patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die
-
-		cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
-		eapply "${FILESDIR}"/icd_x86.patch
-		mv amd_icd32.json amd_pro_icd32.json || die
-	fi
-
-	default
-}
-
-src_install() {
-	if use abi_x86_64 ; then
-		# Vulkan driver
-		insinto /usr/lib64
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
-	fi
-
-	if use abi_x86_32 ; then
-		# Vulkan driver
-		insinto /usr/lib
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
-	fi
-
-	# AMDGPU-PRO & RADV Vulkan prefix
-	dobin "${FILESDIR}/vk_pro"
-	dobin "${FILESDIR}/vk_radv"
-}
-
-pkg_postinst() {
-	elog "To execute programs with the amdgpu-pro-vulkan driver:"
-	elog "  - Use the `vk_pro` wrapper script: e.g. 'vk_pro vkcube'"
-	elog "  - Define the following environment variable: "
-	elog "    VK_DRIVER_FILES=/usr/share/vulkan/icd.d/amd_pro_icd64.json:/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-	elog
-}
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.40.0.1718238.ebuild
index c53292fd171a..a6e635176f5a 100644
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044-r1.ebuild
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.40.0.1718238.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ MY_PV_REV=$(ver_cut 4)
 
 MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}"
 
-INTERNAL_VER="5.5.3"
+INTERNAL_VER="6.0.2"
 
 MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
 
diff --git a/media-libs/amf-headers/Manifest b/media-libs/amf-headers/Manifest
index bb34f5f28da2..628c064deb2b 100644
--- a/media-libs/amf-headers/Manifest
+++ b/media-libs/amf-headers/Manifest
@@ -1,5 +1,3 @@
-DIST amf-headers-1.4.26.tar.gz 178442976 BLAKE2B a6ef9e69a2d8caab94e5d17d6bd777b3b01683e6bcdd6872df0148f742fb7bc5c4927143239320a01c3f74f033e9a3665bbcd3698949c6f66fcaf31e1edbe3f2 SHA512 2c931ef7d38ade88a96041e0012605a5d25ec484bb2134f58310cf1a2c7212a869797cef99e2e751c8a6b3c473ba1f8762d4a5d41466d38cb5e31bf664a25f55
-DIST amf-headers-1.4.30.tar.gz 147376939 BLAKE2B 5d2f6b3d2d2bed675896dc629baed117b986320bedd8a680c8aa19b3f46c0e6af4e51925573da95cb8c2032727f0f96806c3bffcb3130020b3ade608e467859e SHA512 b9412105ebafc578178259d06f6da25f6b21593d65aea389a34f980c6efe14820895122cc8dee5d2e505ba35cad0f7d4f2e6cd79071f32ccb0272ff804d53109
-EBUILD amf-headers-1.4.26.ebuild 694 BLAKE2B ba44b78cd69804530554bea8c710fb7f00789ad42d3612144d633d16930d9ba2aa09e77b0ed70a4d1ead0dfc04d02d4411f041633cd03ee521922a7c29f4d464 SHA512 f5fe23c9a18fc573b9b15da064f8c67a4339e3e6c8d9af7d2c3071c48f3b1b3240224009025ae5b8be5d68a7382ea57842b50392b45d6a143104e6757aa3d21d
-EBUILD amf-headers-1.4.30.ebuild 701 BLAKE2B 5263923a7ca1c0c6ac4b80a1dd90d9d27be1dc8d7884d3750bd742b21a15bc5abea2b8d28fe3a8f3231914de0959302a1fae1b30329d750f5e3849d1889ae7b8 SHA512 176fa53b3f4124e7c703a1a5e63763d36f834e8a911d46b2de0eac40c4c9b25223eea03da0847a3eed9feab0c7142b83bf02dff6ee2a8be40458a26b7b6dfe80
+DIST amf-headers-1.4.33.tar.gz 198142272 BLAKE2B 65e616012463e21bfa113ff62f76baaf186e18c6b3422bf5b2fdf8d208efe0ea7d07b74d6d292bc391202d2190c871dd0d6f997783b3ffa533d4086e395ae67f SHA512 e0c4f583996ff2d1d61c53b8ce7ef2eadb32d2a13930e59146b935840e31d032c5cec48baced70b0007fa5f33e30537d03ddf71140ff51213085aba20e16f5ca
+EBUILD amf-headers-1.4.33.ebuild 701 BLAKE2B 5263923a7ca1c0c6ac4b80a1dd90d9d27be1dc8d7884d3750bd742b21a15bc5abea2b8d28fe3a8f3231914de0959302a1fae1b30329d750f5e3849d1889ae7b8 SHA512 176fa53b3f4124e7c703a1a5e63763d36f834e8a911d46b2de0eac40c4c9b25223eea03da0847a3eed9feab0c7142b83bf02dff6ee2a8be40458a26b7b6dfe80
 MISC metadata.xml 571 BLAKE2B 921f83bae051789cf587663b4168174eab058dc2866b4d9e24dcb9f3ff5f3b64ea85c7e45282c2eeea42716f7f79a971171333ece1dd72d7d2e49e84efe2ef57 SHA512 ed0a057d7f1c738308eed226c562b5a83bf6ae421f1487f98a1c8361afa65276c5ea2f83f3d8187229d88fe0fe02a41178d37347d28ddc5b22695ae3f4740368
diff --git a/media-libs/amf-headers/amf-headers-1.4.26.ebuild b/media-libs/amf-headers/amf-headers-1.4.26.ebuild
deleted file mode 100644
index f96ac72bc0e6..000000000000
--- a/media-libs/amf-headers/amf-headers-1.4.26.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
-else
-	SRC_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Advanced Media Framework (AMF) SDK"
-HOMEPAGE="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/AMF-${PV}"
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_install() {
-	insinto "/usr/include/AMF"
-	doins -r "${S}/amf/public/include/"*
-}
diff --git a/media-libs/amf-headers/amf-headers-1.4.30.ebuild b/media-libs/amf-headers/amf-headers-1.4.33.ebuild
index 44e1d134e11d..44e1d134e11d 100644
--- a/media-libs/amf-headers/amf-headers-1.4.30.ebuild
+++ b/media-libs/amf-headers/amf-headers-1.4.33.ebuild
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index bd5e3f043c1d..61d34cbd0d99 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,4 +1,4 @@
 AUX avidemux-plugins-2.8.1-optional-pulse.patch 701 BLAKE2B f94196fa42fef5b343ba73e7d61bd34b0e0afcfc07b22fc5396796d009b955f99b09aabf84eb6e1e8cefdda805c77fd7854362e2485690f053bd270388f77902 SHA512 63a18c57242e5fcf91c99ea66a4879348a465f33f00d635a2ba18f176615173aaf9d93eb7748b336395dff87a2c69c46d867dd076951bdd3193486a7beb019e9
 DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
-EBUILD avidemux-plugins-2.8.1-r2.ebuild 4388 BLAKE2B 94bdc8b8695aa7bb7842f41e2d3e5aa8a17034d7373d2b1c298ddb03e1b6071cb8ee9ce347b054441e14c3e1c073fb0d42896e1fea2d67d721d951af26728017 SHA512 b495f5d88d9ec90956818992779d1d4c057caafdf3cc987dd024f4d7ab399bf3f4d1e0dda8044e9c72dea1a9a7e593079e56a4212db64c4c7951dd186b874409
+EBUILD avidemux-plugins-2.8.1-r2.ebuild 4575 BLAKE2B 69f83cca17adeb0f8c78e42e0799ef737ca0cbb2906b7affc206229fe68a7c9c58be55163a0ff1b1951647e694f4e83bd7db5f2ee14ea15bb0eb71344146a9c8 SHA512 3c9bd7f65907baebc1ebf26408211685eb1c3f2db7fef27389aac666f5780d89f27d47b7a7f6b633d84a1738956225d9a25794f9c3566058a99a36efa58ec0bd
 MISC metadata.xml 1247 BLAKE2B 111170a1b044ca6e0aa8fbdc83b38978ef426a3051362f5c7b80f0831dae10a7ebb90bff81b5ccaa6648aa562f098602d81d8a39510b4cc55d6c84b9846b5a66 SHA512 36a42668b022e5d3d0d8639d2b41eea103721b47e3e9cc1366a594a623b04a393d30dc212147ef744bce11d4a38af06bd4a2c3d23fe7455bd506aba760a0a1b1
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild
index 85c9fc0a1fe8..d2c692e7e5a1 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -101,6 +101,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/859829
+	#
+	# Upstream has abandoned sourceforge for github. And doesn't enable github issues.
+	# Message received, no bug reported.
+	filter-lto
+
 	# See bug 432322.
 	use x86 && replace-flags -O0 -O1
 
diff --git a/media-libs/libvpl/Manifest b/media-libs/libvpl/Manifest
index c735b16a2ad9..166812980541 100644
--- a/media-libs/libvpl/Manifest
+++ b/media-libs/libvpl/Manifest
@@ -1,3 +1,3 @@
 DIST libvpl-2.10.2.tar.gz 11872075 BLAKE2B 6d9b6ba66b1e1c191a309ff26ec54a5bb62fa542ca9eab042a437eca9a82cf9d7e3056247a8110b49e28388bdbd8e4c0793dda8dd84d229937524faa96b10f37 SHA512 e4f6e1656371a8edb54a3a67726439d97dd5e8225fa37fdfc309602dd83c51e4a2b4e72bdb18b81dc6691f666a8857b460c45392cf030a8309abd368037be49d
-EBUILD libvpl-2.10.2.ebuild 2299 BLAKE2B ca7cf9f1d22065cf790dfd7b988b2c84bc796ec5a139d4dbbe95ab657fe467192c91b7c7b6a84062e367be8a1ffcc0427cc699df5e832789fb88d9fb0e16aee4 SHA512 946db2638d56ec0bcb74691eb7d40b295888e41681d298d562dc1b48f6d3f98007162c3f976fa697edf3858614db02300bbc805cb4d4060648fa36490987151c
+EBUILD libvpl-2.10.2.ebuild 2380 BLAKE2B 6ec4c2f8810eff0bd37b9fd69bfd50e02fe7fda04dc91588e28c884e74306a280ddccfa29b4dc8e702ef634906a669a83eadc9a0f27ac6b024ca249317eb3d96 SHA512 d401d0529bd8eda7062f59b3222d82d88903ad3cdba06dba6926f4faa2c8d01c05f6f987640aa4320ad4050d8953e8b9bea56cdda69d44e03b5b663707075d25
 MISC metadata.xml 628 BLAKE2B 6e1cb517bc3732e69840258317fc6c02db8ecf5c7ef9961cdd501a16cd93eece14372976f207d15bf4b89d3afc076ff5f0e073b8710bbf18b45fa108001b4520 SHA512 89108483f9020309cc4ba350c5671fe01abd13fd64d0f6accbe5f049b3b60fc312489b62dd8e9c2eac6b2310907ae61929307beadc8508e0a534003bf18d7a4a
diff --git a/media-libs/libvpl/libvpl-2.10.2.ebuild b/media-libs/libvpl/libvpl-2.10.2.ebuild
index c9eddbfedb17..43d03b86a016 100644
--- a/media-libs/libvpl/libvpl-2.10.2.ebuild
+++ b/media-libs/libvpl/libvpl-2.10.2.ebuild
@@ -21,6 +21,7 @@ REQUIRED_USE="
 	dri? ( X drm )
 	X? ( vaapi )
 	wayland? ( drm )
+	tools? ( vaapi )
 "
 
 RDEPEND="
@@ -57,6 +58,7 @@ multilib_src_configure() {
 		-DBUILD_TESTS="$(usex test)"
 		# Tools fails to compile for 32 bit
 		-DBUILD_TOOLS="$(multilib_native_usex tools)"
+		-DTOOLS_ENABLE_X11="$(multilib_native_usex tools $(usex X))"
 		-DENABLE_WAYLAND="$(usex wayland)"
 		-DENABLE_X11="$(usex X)"
 		-DENABLE_DRI3="$(usex dri)"
diff --git a/media-libs/oneVPL-intel-gpu/Manifest b/media-libs/oneVPL-intel-gpu/Manifest
index 9203fb7e92bd..6d7ff2074d0d 100644
--- a/media-libs/oneVPL-intel-gpu/Manifest
+++ b/media-libs/oneVPL-intel-gpu/Manifest
@@ -1,7 +1,5 @@
-DIST oneVPL-intel-gpu-24.1.3.tar.gz 9055096 BLAKE2B 63f4b14660ef897f9b67675f7b54bd0f48097570d69cc9206e7cc21476854537df5e0c925de413dc6267ab08ca59a3b72a08070b0a0652baa9a7c02f1976a98c SHA512 d885e1076fafa82da5433d38c729b3a5016a8b39f30511c8eff2f695d53ef6d7835b366db8c9cb6d1bd5f30ce47ea84e1a31fb85a536daef0a0c4cd6a874c37d
-DIST oneVPL-intel-gpu-24.1.4.tar.gz 9055058 BLAKE2B 28c4b05dcaa2f2ce460b6a0d058c48253b891e1a1893cb7b0b883e01638c44c9987357e2671e7077155863b7a3763e18f46039f908abcd19aff859c3bc2fc2a4 SHA512 20e26a89965181fff89a4722a0fe069ff8356cbe719c753ac32864d046234b601b22fc8df28b0575f147d173888d3218baf218f1a0bab89e1fe7d8a0e2c1e0b4
 DIST oneVPL-intel-gpu-24.2.0.tar.gz 9057738 BLAKE2B a878ff81f30ce9278b249fb7c3fc19b8c3165a6255413c0844d1cc01947f0cd53c87227a885103a9a7ce218d531d2a8f5d3987b40ebd005088b48545aa67d6cf SHA512 a5c7bd65a4c4c2625448bab4a7ee96ff550ee7f5f1e8f00a84177022a6b806ab6f224c6295f8f3cc7548769ae75b03fea7713c757718424548f1ad365f1df6b7
-EBUILD oneVPL-intel-gpu-24.1.3.ebuild 1189 BLAKE2B 9d8f90ff7e11b89245ee41c90552c4022038835b3bf4f90985f24f7c7a5faae368dd959bbc6a7c35224f6b222ed63c8370d1d475920520157d9ed0ccfc44e415 SHA512 f98a9cdd91d98ebaa53e13a9db5c3838367b19fa38f6fb47de505cdf36ba4c0f7c09aaebb715a54a2c7c1d944833f015ce504de01025b29c2c93e5e9c6a3899e
-EBUILD oneVPL-intel-gpu-24.1.4.ebuild 1189 BLAKE2B 9d8f90ff7e11b89245ee41c90552c4022038835b3bf4f90985f24f7c7a5faae368dd959bbc6a7c35224f6b222ed63c8370d1d475920520157d9ed0ccfc44e415 SHA512 f98a9cdd91d98ebaa53e13a9db5c3838367b19fa38f6fb47de505cdf36ba4c0f7c09aaebb715a54a2c7c1d944833f015ce504de01025b29c2c93e5e9c6a3899e
+DIST oneVPL-intel-gpu-24.2.1.tar.gz 9059246 BLAKE2B aea28ac95b9ae9634a97e27c94f6628e6a2dcce455a438851e29e7f9e5674f4ba22782773d3aeae34f315c5a95e6e07ef54d89951cfee0ec316e7a578ff56de9 SHA512 ace3abf923a89720520005d4b3cf90180e2d35713012ea223f6d35a0e9dc8b442bf80915bf2d3d86f5f95b426362df79d57d6da1f4962b31547d50b9e6d80a91
 EBUILD oneVPL-intel-gpu-24.2.0.ebuild 1189 BLAKE2B 3b1a15a1a9796e422ef1547a7805a1c8c81831f9f774d9bb620293e3fca2faa02643c11e49516c544e44036a837a5ba087a4fe4b42dd9727c1f76391268e1547 SHA512 ba54c5d636ebc9dd4b57bd884438fd8b4105dc4bd0fac40e4bb4a189a774eefbaaf55ec2c7798348df08008cc1aac9dbb562f638e419196a4075b9878d2f9dfc
+EBUILD oneVPL-intel-gpu-24.2.1.ebuild 1194 BLAKE2B b24ea0795e10a62ffe1f2a058919bf4c26ab0374f4cbc460c55f621dd3904618ed2068c078780bc3168595ac0c8796c4e89bd161b8768e3601535a355e914bf5 SHA512 a904dbdb840067cf5e2f85b382261a8271832bebd65f5b9219f3b2556a3e1f51c1ea0749a7b9f008170bf7fb104d5a04589a635e902fae53941c4030298fd95d
 MISC metadata.xml 434 BLAKE2B f5f6ea2e0ebac9ba06ebdb2a8469e99171f25ad08d8e992695e7d189f5c3f8fb3e966d710fe02cbd1f590f2137e265d9bf5014f0d9e7a492574b526360d70133 SHA512 713bf6044fd4d5606568af248dc0adf1a93c5917fb7d6d79c7a033a5b52a0164769b02086caa0a4492979c586511b5a4d7b85fe603ffe80d4884786e05dc520e
diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.1.4.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.1.4.ebuild
deleted file mode 100644
index 9df902c406a2..000000000000
--- a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation"
-HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu"
-SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	media-libs/libva
-	x11-libs/libdrm[video_cards_intel]
-"
-# At runtime we need a dispatcher, oneVPL is preferred but mediasdk also works
-RDEPEND="${DEPEND}
-	>=media-libs/libva-intel-media-driver-${PV}
-	|| (
-		media-libs/libvpl[drm,vaapi]
-		media-libs/intel-mediasdk
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_RUNTIME=ON
-		# To build the kernels we need to package the cm-compiler, use pre-built instead
-		-DBUILD_KERNELS=OFF
-		-DBUILD_TESTS="$(usex test)"
-		# This only seems to do something if we BUILD_KERNELS=ON
-		#-DBUILD_TOOLS="$(usex tools)"
-		# OpenCL only has an effect if we build kernels
-		-DENABLE_OPENCL=OFF
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.1.3.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.2.1.ebuild
index 9df902c406a2..68b91598a5a8 100644
--- a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.1.3.ebuild
+++ b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-24.2.1.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation"
 HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu"
 SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
+S="${WORKDIR}/vpl-gpu-rt-intel-onevpl-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -21,7 +21,7 @@ DEPEND="
 	media-libs/libva
 	x11-libs/libdrm[video_cards_intel]
 "
-# At runtime we need a dispatcher, oneVPL is preferred but mediasdk also works
+# At runtime we need a dispatcher, libvpl is preferred but mediasdk also works
 RDEPEND="${DEPEND}
 	>=media-libs/libva-intel-media-driver-${PV}
 	|| (
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 11f11e0e8b21..36a6c2dd910c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -16,10 +16,10 @@ AUX opencv-4.8.1-use-system-flatbuffers.patch 1522 BLAKE2B a9000e3269266cf9e85b6
 AUX opencv-4.8.1-use-system-opencl.patch 933 BLAKE2B 557448d74771f6b9fc8b2fa5af79e6287c1dbad9a6c5dabe520080c7481d033002164cbfdd5a767d3b4cc54ec1344423ea8a0bbbd13a873ca955d95787924d10 SHA512 1602b74e829cd8842efbe6535e91a426a88c9ae08280d863bc4150cbe2a9d3ebef02b2abe98ee470f26412bb6fca653529492bf54b87f4d53fe20f242ef03771
 AUX opencv-4.9.0-ade-0.1.2d.tar.gz.patch 652 BLAKE2B 80b3d810e31a16413b67a0c0d64991c7fe699240ae67a50ecc7d926af33359eccb6aef52facbba1bea56723698e775f293c8cae57b504e76ec1e287d2c21b810 SHA512 dc88386c96ea882848a18d9336541e525a926d9c9d75c3e9d4dc667e03ea8fe85109f360a310c8ea602c643fcc4e4317b3af81c0f4e50f9057ee0588d433b020
 AUX opencv-4.9.0-cmake-cleanup.patch 1298 BLAKE2B 22dd3a47a26bab6545956d24c685792fa2071678db5090377348bdfb6e70dde003db0354fdc6d0dd32f30d5db0cd5df3270080678257590ec7f84f309cd09f95 SHA512 14bea3b5711f66b08b34b9dc1246744ae6385b7ecaadab057e5702769049e8fb318cbed11390517899933c760c42a2f4b25d90d6eeafe11977274a1fef4bf62e
-AUX opencv-4.9.0-cuda-12.4.patch 2397 BLAKE2B 7333533f0818b04f5ec89b593f9bf7710aba496a2ba7a1688043818d4249d4a3d3e3f17c42456d2e5e0aaae728f0b9726f3943ce732f7307b0126adc68147da0 SHA512 442c97b3fbf48f0b5c1176a10b1bbcf7fccad369070b6be2a0e3e6dd2ccba88f0a7662360b108fc4d55b766d0563d5f7eef5a2fb7afa5212aac8cab73e9ad43c
 AUX opencv-4.9.0-drop-python2-detection.patch 3270 BLAKE2B bbb4021592e61d1ca99b7c6182d89e7d1adfff7e3ebdb1e810ce7b957001111559968d244416deca4baca44463cef86148d0d0d48b1fd44d91dc9c17b40f5692 SHA512 2386169151d8b8242245f66e4aeb6445bc4dcfc0ff31768417dbc32c8dee0b94e935d1d00d0b40acaad448ef816643b5df563e0a01016913be90a2a0c8b4e7c0
 AUX opencv_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch 1158 BLAKE2B c4b139198ac5c33974d6c4fac8ebcf288f15d9edf09e55b30e47071931abdf8924dc51c2d8cb27103edb3b815ba9f7e5ea334cfb1849be7b59ff4cd076f6771a SHA512 03d4442af9b98115126473cca0a9f581bd0c0e983b8d5b7f34fdd0ea7455d4a73163f853c80438f4390c5da4c7cc419c59c24643529df9eb4222915c80e654fe
 AUX opencv_contrib-4.8.1-rgbd.patch 477 BLAKE2B 0120e631199d7099bae437d459f0c950c3cbd11e5f0a900d687ca5aedf1d7602f7faa3be5ba1a9b3e0758f3fd70574450f97bd7429e447df7440d58326ceb99b SHA512 6fe2ef40bf26d40e4f52d84b17183f6e536b2fe51bf65266be6a59865def0b9c074aa5eff58a60d673afec776a7ba03acaba667c917b78751950b77f68759d96
+AUX opencv_contrib-4.9.0-cuda-12.4.patch 2397 BLAKE2B 7333533f0818b04f5ec89b593f9bf7710aba496a2ba7a1688043818d4249d4a3d3e3f17c42456d2e5e0aaae728f0b9726f3943ce732f7307b0126adc68147da0 SHA512 442c97b3fbf48f0b5c1176a10b1bbcf7fccad369070b6be2a0e3e6dd2ccba88f0a7662360b108fc4d55b766d0563d5f7eef5a2fb7afa5212aac8cab73e9ad43c
 DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 BLAKE2B f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533 SHA512 85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655
 DIST ade-0.1.2a.tar.gz 116737 BLAKE2B 9ac2af2f21aab8cb5d599e0b653bb6126642588e508f55e5fbfe5ce9607267f25e5187fd31ed69349064551c06e15b2ba548319708ed5f70e7761470775cc6e0 SHA512 d3ed210ff25f4c05393b0039cb4a73a6ceb8b42ba3d776e0469da2362899d3f76564cc6a06965b7de91f38517e1cd4ff4b18c00185d2b1a0af5a34ecf0d9dd44
 DIST ade-0.1.2d.tar.gz 117027 BLAKE2B c544b769c7b289342a469950ed047fa13719bafba29aa41167b588cf4f24ed6e596159ec19b65e61e09519a461a5e82ac07d63e2ea493279ee182fe658810abb SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348
@@ -34,5 +34,5 @@ DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLA
 DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043
 DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa
 EBUILD opencv-4.8.1-r1.ebuild 29150 BLAKE2B 815e967e98202eb3a761fb0eaec89fdf3bf5a8e40c91e9f5597cad140653003a5c0ddc785673983863cc48a1f94ccff6696b9c4d14c0791abc519927307df353 SHA512 4d58d097eb26455f4fd6e4fa86aa3df7ab2836aa08661b60323f0c0dad45b7e9c3893f9c3888ab3ae3ec9ea9ce653dcd0eb51159c50c0d5d83cbcf4285177f99
-EBUILD opencv-4.9.0.ebuild 34444 BLAKE2B a4481c9d323ad2ded87104c7728b29dfe9079a5343bfab093c08551a407583176424368f54b24550fc7096d72b03d435449ea392acdb44399eba08d84b1023fd SHA512 29547659e9d4341018efe00480a1606c7765b248a51e1b3e64f2eb55941b60879df45a7777bdfbfe73516b2ba5b07b7d029e836b98d222fcb97c829bda12ef7d
+EBUILD opencv-4.9.0.ebuild 34640 BLAKE2B ac1c9e65505000ad057f6d1750402b9264fa4d23504d34d25667c0025c5e34387b03c533809d499e9e394bdeef32d51f7c99aa4eba3a8c2311615ae5c8f87c65 SHA512 daa1f32158b1dd97a46b964eba8ece7ffcb08e8eb39257f9e8833a914fd10a5c70c54da97536c371732a5f7e274bbfae78b3d8a1c867421752e7555a22c08316
 MISC metadata.xml 3718 BLAKE2B 44b00ff4bc94a19f6a1b68cfefb29ce9f1a4ee21ee999b72a258268893ede5274d863d3a6faa325e6f0522c078c6afae53c6de4c46d6ed5a083888e195f34276 SHA512 b6c2f0a27b84afcb576209a3bdc641e81323c01bcac9617086d79821e723ea3c9698e8f3c5db837d46da68e48b6d9d08bdd05977e22d58d6c7ad30fa7b965b52
diff --git a/media-libs/opencv/files/opencv-4.9.0-cuda-12.4.patch b/media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch
index f3b5c7b36b50..f3b5c7b36b50 100644
--- a/media-libs/opencv/files/opencv-4.9.0-cuda-12.4.patch
+++ b/media-libs/opencv/files/opencv_contrib-4.9.0-cuda-12.4.patch
diff --git a/media-libs/opencv/opencv-4.9.0.ebuild b/media-libs/opencv/opencv-4.9.0.ebuild
index 36bf72aa8718..dbf8b20165fd 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -145,7 +145,7 @@ RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	cuda? ( <dev-util/nvidia-cuda-toolkit-12.4:0= )
 	cudnn? ( dev-libs/cudnn:= )
 	contribdnn? ( dev-libs/flatbuffers:= )
 	contribhdf? ( sci-libs/hdf5:= )
@@ -341,6 +341,10 @@ src_prepare() {
 		cd "${WORKDIR}/${PN}_contrib-${PV}" || die
 		eapply "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
 		eapply "${FILESDIR}/${PN}_contrib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch"
+		if has_version ">=dev-util/nvidia-cuda-toolkit-12.4" && use cuda; then
+			# TODO https://github.com/NVIDIA/cccl/pull/1522
+			eapply "${FILESDIR}/${PN}_contrib-4.9.0-cuda-12.4.patch"
+		fi
 		cd "${S}" || die
 
 		! use contribcvv && { rm -R "${WORKDIR}/${PN}_contrib-${PV}/modules/cvv" || die; }