From 1e1e7636b59380beebd325e8d256875e4f824230 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 8 Jan 2024 18:59:30 +0000
Subject: gentoo auto-resync : 08:01:2024 - 18:59:30

---
 media-libs/amdgpu-pro-vulkan/Manifest              |  14 ++-
 .../amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild    | 122 ++++++++++++++++++
 .../amdgpu-pro-vulkan-21.50.2.1384496.ebuild       | 108 ----------------
 .../amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild    | 135 ++++++++++++++++++++
 .../amdgpu-pro-vulkan-22.10.4.1452060.ebuild       | 134 --------------------
 .../amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild    | 136 ++++++++++++++++++++
 .../amdgpu-pro-vulkan-22.20.5.1511376.ebuild       | 138 ---------------------
 .../amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild    | 135 ++++++++++++++++++++
 .../amdgpu-pro-vulkan-22.40.6.1580631.ebuild       | 137 --------------------
 .../amdgpu-pro-vulkan-23.10.3.1620044-r1.ebuild    | 134 ++++++++++++++++++++
 .../amdgpu-pro-vulkan-23.10.3.1620044.ebuild       | 136 --------------------
 .../amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild    | 134 ++++++++++++++++++++
 .../amdgpu-pro-vulkan-23.20.0.1654522.ebuild       | 136 --------------------
 media-libs/amdgpu-pro-vulkan/files/vk_pro          |   2 +
 media-libs/amdgpu-pro-vulkan/files/vk_radv         |   2 +
 15 files changed, 808 insertions(+), 795 deletions(-)
 create mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild
 delete mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
 create mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild
 delete mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060.ebuild
 create mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild
 delete mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376.ebuild
 create mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild
 delete mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631.ebuild
 create mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044-r1.ebuild
 delete mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044.ebuild
 create mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild
 delete mode 100644 media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522.ebuild
 create mode 100644 media-libs/amdgpu-pro-vulkan/files/vk_pro
 create mode 100644 media-libs/amdgpu-pro-vulkan/files/vk_radv

(limited to 'media-libs/amdgpu-pro-vulkan')

diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest
index d1f1bba73398..765ded8e992e 100644
--- a/media-libs/amdgpu-pro-vulkan/Manifest
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -1,5 +1,7 @@
 AUX icd_amd64.patch 330 BLAKE2B 6911c451ee96d68e91f5ca8a8536b758f8ecf81bcc1b19681a3eb960c1c0e06808560bd339b9d44395b58eb0794355670dddaa55eaddcc55b301f2c0c3090ea5 SHA512 3d1e4401be88302d4d5058082eada58f5ac8bbd9fc875c494d30407d1e2ab28319968f7fca96b7afb6d82ecf19c9a6a408bd06f9fa1d755d1e1fe7b906a76257
 AUX icd_x86.patch 322 BLAKE2B 823d90dadb6f4791937ebcd28cc2ce5045a1a713cc4b5b58201e9ee6b57be8568a1ff63724e1fc16c29446e85e8dd1d533248ccf41acbd1355fccbff62239285 SHA512 c39fa60fa116ee92bf613dd8cab08b464cd35b9e63cb0ccc568cc0024b93652ce556b8823edf987498d72309ba841085434481fffa4cabd5de1494851cbcd4d3
+AUX vk_pro 121 BLAKE2B 833ed55d23b89a00641c3f685bfc06feec10ca352ec2ab4fc8ec6c78d977185cc92d22f8948998e8b00f7ba07fe97cfb2c39f6c6f5da8d484c43cc87768f35f8 SHA512 61ecc20ec40e0b72914399c77d793f5ca8739ac49addd851b0fd3af0490358a17b9ade8da183631e11c63a0ef061ec42a553af6b496167041d5fe0251b2be43e
+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
@@ -12,10 +14,10 @@ DIST amdgpu-pro-vulkan-23.10.3.1620044-amd64.deb 28230396 BLAKE2B f0c59e5c955640
 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
-EBUILD amdgpu-pro-vulkan-21.50.2.1384496.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
-EBUILD amdgpu-pro-vulkan-22.10.4.1452060.ebuild 3792 BLAKE2B 2d09ae3c28e6cec3f648c8e4ea1eee0101e66e79aa82277f84508810437ce239776cf9818bbee8e89333e61f2e94de557c7b2e3d620ec808140088b4f61f73f1 SHA512 28d54066de38baa0466fd295bd11e9e708d96777972136bc492c790bf78558257a663975fcf8f8154e9d03ee9aabf30f5646e0fd99c6c8f6b5ec941ed48adeb8
-EBUILD amdgpu-pro-vulkan-22.20.5.1511376.ebuild 3842 BLAKE2B b5a5181c15908963a180db20490d6b5e5bf7788ec8bc08901e5146a24c0f080d37a1ae479bcd8786132cc573315dca8f79bacb0150e1ecba8e8065a7953b070b SHA512 50a86b13a2ef2131073e4a06d38408534a9b4081b94a6089c4470d9007e4da49b4a27368e206e37ed61ef9070cd1f0a6e252e22bd7bffd71cea4d9225b1db3ff
-EBUILD amdgpu-pro-vulkan-22.40.6.1580631.ebuild 3875 BLAKE2B 48c6a1b23308a447ce2975154fb3afd54fd851d227ccd9633decb7b643d1711c35ed5b7d80782a10aadc7d0db22412cdb6e52092855b877e315ad932036111f7 SHA512 e9c45999838fd091837ceab40ff03bf635c97d78e7c155451d80e4e82ee1095b3d3e0cbd730c8fdf07d2c283384d108dcf473aaf3e03c5a65aab771412e0ab8f
-EBUILD amdgpu-pro-vulkan-23.10.3.1620044.ebuild 3791 BLAKE2B 4b7741c1bf586b703aa34a401e22f8ddc35d95ecf8ee8994c07d4f9a6b7f81dcf9b74bc6fbe80ec5b0e150a5e7f8ebbee30d33a5c9932cf1f6e74a31aa91fc8c SHA512 f5e3f145d9058914d166cd7ea945a37d27a3c424938afaf5280bf158213b0299c3c88bd5dc659ca8797eba7511bbdefdcb123a8770a60ad1a2472074d0e5b951
-EBUILD amdgpu-pro-vulkan-23.20.0.1654522.ebuild 3789 BLAKE2B dceba5c87972c321b714b1f0b57a6e9847aed775fcf6f92ffc447e8f3d3dbf08b98b5f1805909f7e9a4e08ed0990dbdba969dd53d297c1a007cf50e62186a525 SHA512 517e814661bf640c0a950b8483f7863d3663b96caf754b65ae85e9ae13074e524c6e5c71264ec7828397ec4231fe8c4661cec31ae62d3f19193a3d2013cc87a1
+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
 MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild
new file mode 100644
index 000000000000..10cd494f94c5
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496-r1.ebuild
@@ -0,0 +1,122 @@
+# 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_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
+		mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die
+		patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || 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
+		mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die
+		patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || 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
+		insinto /usr/lib64
+
+		# Vulkan
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0
+		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so
+		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1
+
+		# 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
+		insinto /usr/lib
+
+		# Vulkan
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0
+		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so
+		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1
+
+		# 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-21.50.2.1384496.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
deleted file mode 100644
index b391b5756ff5..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-21.50.2.1384496.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 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_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() {
-	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
-		mv amdvlk64.so.1.0 amdvlkpro64.so.1.0 || die
-		patchelf --set-soname amdvlkpro64.so.1.0 "${PWD}"/amdvlkpro64.so.1.0 || 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
-		mv amdvlk32.so.1.0 amdvlkpro32.so.1.0 || die
-		patchelf --set-soname amdvlkpro32.so.1.0 "${PWD}"/amdvlkpro32.so.1.0 || 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
-		insinto /usr/lib64
-
-		# Vulkan
-		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so.1.0
-		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so
-		dosym amdvlkpro64.so.1.0 /usr/lib64/amdvlkpro64.so.1
-
-		# 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
-		insinto /usr/lib
-
-		# Vulkan
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so.1.0
-		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so
-		dosym amdvlkpro32.so.1.0 /usr/lib/amdvlkpro32.so.1
-
-		# ICD loader
-		insinto /usr/share/vulkan/icd.d
-		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
-	fi
-}
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
new file mode 100644
index 000000000000..670a2f29aaf6
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060-r1.ebuild
@@ -0,0 +1,135 @@
+# 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.10.4.1452060.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060.ebuild
deleted file mode 100644
index dabe6936012a..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.10.4.1452060.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 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() {
-	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
-}
-
-pkg_postinst() {
-
-	if use abi_x86_32; then
-		elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-		elog "must be set beforehand"
-		elog
-	fi
-
-	if use abi_x86_64; then
-		elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
-		elog "must be set beforehand"
-	fi
-}
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
new file mode 100644
index 000000000000..8152f796b69e
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376-r1.ebuild
@@ -0,0 +1,136 @@
+# 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-22.20.5.1511376.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376.ebuild
deleted file mode 100644
index 7545f1b4d580..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.5.1511376.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 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() {
-	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
-}
-
-pkg_postinst() {
-
-	if use abi_x86_32; then
-		elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-		elog "must be set beforehand"
-		elog
-	fi
-
-	if use abi_x86_64; then
-		elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
-		elog "must be set beforehand"
-	fi
-}
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild
new file mode 100644
index 000000000000..72aa4ff4dcaf
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631-r1.ebuild
@@ -0,0 +1,135 @@
+# 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.4.6"
+
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="vulkan-amdgpu-pro"
+# https://repo.radeon.com/amdgpu/5.4.6/ubuntu/pool/proprietary/v/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-22.40.6.1580631.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631.ebuild
deleted file mode 100644
index ef77796e708e..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.40.6.1580631.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 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.4.6"
-
-MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
-
-MY_PN="vulkan-amdgpu-pro"
-# https://repo.radeon.com/amdgpu/5.4.6/ubuntu/pool/proprietary/v/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() {
-	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
-}
-
-pkg_postinst() {
-
-	if use abi_x86_32; then
-		elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-		elog "must be set beforehand"
-		elog
-	fi
-
-	if use abi_x86_64; then
-		elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
-		elog "must be set beforehand"
-	fi
-}
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.10.3.1620044-r1.ebuild
new file mode 100644
index 000000000000..c53292fd171a
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044-r1.ebuild
@@ -0,0 +1,134 @@
+# 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.5.3"
+
+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.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044.ebuild
deleted file mode 100644
index a64dd02a653f..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.10.3.1620044.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 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.5.3"
-
-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() {
-	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
-}
-
-pkg_postinst() {
-
-	if use abi_x86_32; then
-		elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-		elog "must be set beforehand"
-		elog
-	fi
-
-	if use abi_x86_64; then
-		elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
-		elog "must be set beforehand"
-	fi
-}
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
new file mode 100644
index 000000000000..21610a0f0b64
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522-r1.ebuild
@@ -0,0 +1,134 @@
+# 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.20.0.1654522.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522.ebuild
deleted file mode 100644
index 4b94367c04b7..000000000000
--- a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-23.20.0.1654522.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 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() {
-	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
-}
-
-pkg_postinst() {
-
-	if use abi_x86_32; then
-		elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
-		elog "must be set beforehand"
-		elog
-	fi
-
-	if use abi_x86_64; then
-		elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
-		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
-		elog "must be set beforehand"
-	fi
-}
diff --git a/media-libs/amdgpu-pro-vulkan/files/vk_pro b/media-libs/amdgpu-pro-vulkan/files/vk_pro
new file mode 100644
index 000000000000..111626f68bcc
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/files/vk_pro
@@ -0,0 +1,2 @@
+#!/bin/bash
+VK_DRIVER_FILES="/usr/share/vulkan/icd.d/amd_pro_icd32.json:/usr/share/vulkan/icd.d/amd_pro_icd64.json" "$@"
diff --git a/media-libs/amdgpu-pro-vulkan/files/vk_radv b/media-libs/amdgpu-pro-vulkan/files/vk_radv
new file mode 100644
index 000000000000..43b5e451d074
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/files/vk_radv
@@ -0,0 +1,2 @@
+#!/bin/bash
+VK_DRIVER_FILES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" "$@"
-- 
cgit v1.2.3