gentoo auto-resync : 19:12:2022 - 19:49:08

17 files changed, 0 insertions, 1110 deletions

diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index 51aa893c6411..1784abdf0663 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -1,14 +1,6 @@
 AUX 0001-SWDEV-316128-HIP-surface-API-support.patch 1156 BLAKE2B 52ff9a2389533ac213055ff8c1d4359cbd490f64699233a6c97dbb54ea8216d94039b016b9dcdde7a304662b9ca5c444ac889a6491e847b0a701e0b0cc0e4b59 SHA512 0c210ac60929a951ce1210b1f76e2e6966cc411834a350e6d01d1eb20cb862056cec881a00978cdbe5bfc61e53128c1cd09c6138cca9469213a6bbf425b8686d
-AUX hip-3.5.1-config-cmake-in.patch 1227 BLAKE2B 5b85ff489232590aa9ddbf8bbf1d5730c8152626e221ce735afcc8b92c3a62e1b2805ed9f3709b3e97b67f787886fd36d685101ea5d3bb76f023dd668b0ebd3d SHA512 0a190ab213ec5ee626843b584c684913ff5cfe0864e443616da7f8f1cf848bc29e46cd7c2d2df6929058acf696f25420267ded69f03862a20b443d107867af74
-AUX hip-3.5.1-detect_offload-arch_for_clang-roc.patch 782 BLAKE2B f851798324799d53271db8149ce7538709435a12a607a352989f5ea816d183573cb21ba2c54d507ec8aad242ccbdb06f79113b48ac8d26f51f402066a124ca6a SHA512 bc60f252e5c1df1c453717f2565a41e05014fc259195a7d25db83bc37a52c33eea261a3afbf37b0afaf80d7b1ffbbe02d8f97967556667238929ea6e6df0108d
-AUX hip-3.5.1-hip_vector_types.patch 247 BLAKE2B 05d17292a61b8ecd6c6cc8bb8075d909885896f6183ffe84882e98066ef9d44d33431a2b12fcbc36db3f0b94713313d5b85918fe041b1102256ac523ac7f8782 SHA512 d02610b59336f332e9025d860977ad27c6d82c35577ecae9b89b253fc911aafc14553ccaa4b667befe4ea7dbe8c55298643dea5e163941c702d35a4f8a594c9d
-AUX hip-3.9.0-DisableTest.patch 4560 BLAKE2B ef1bf5fcd19d8c1db722206afaf5bf8197ef80ae84518197cabf56ffc8d8146315f174e118a300270d2e47da90140a6bc3e2544c13d100b9b62f043ad506039d SHA512 2d8da41e5c5a3f4f3a7acf91d180c931f456a04805526c82cfe7a1ec08faaea661a69dae88aaa026a10eba7fc099c22a49ff812b816541c33c418181ec53cbf7
-AUX hip-3.9.0-add-include-directories.patch 468 BLAKE2B 4c787a6ffe0beada2ab431b2262edc51b814e57d599f783b884da84a6f1b919ceeab561ee09eccd54338ae55118e2d45133b248fd20b5163eba548d49f79d1ca SHA512 1fe35858c526c891e5efd9ecf7a166c3a67d7a4874ab6f7eb34c6ed6652d0e21a7290829a3a5063682a7229af3ef63c180e198172c3bc69be6550547806249e3
-AUX hip-3.9.0-lpl_ca-add-include.patch 418 BLAKE2B 7d1439e51b1c5e20fcb1768c5f33b22d1d6bec5cf36242cbaf030a9a83bd404cb02c95d6ddba2ada6740bb2c1006da3c1507927ab561e29cd47f1a7e64aed1a4 SHA512 511684b5f0f70f67371e34674933dd4cf1992d11406a77a1aa695b68880a031812b8ba7e399abb61a84e8e07d8f814c93c412c51952d4c27443a01c3a62ce276
-AUX hip-4.1.0-DisableTest.patch 2201 BLAKE2B 2e3ba78fe748312edad994d063c2a41e75ec988d8c04ca97bcec15b33cc8328e384b64e3be7bd43bbcb21b947db40a0e153b249921dab0f9e1ecc0926a16fd6d SHA512 8d98b0a53b7b10f7ce3e30ca969181aa01325da6f6627ab7e190e32fbfc6fc659ea07a0a7afe6f20732e7009b9a2da66d8788814d942dbbcdae3d5384c21b8da
 AUX hip-4.2.0-cancel-hcc-header-removal.patch 820 BLAKE2B 544f93864fafe38a0ac2456f6301f8076ea24061bd4fe9a5501a366cca6d46edbb50eaac6c71acb3534579cdd9fa5518a687ac7e6d265926db53f0820fdec0f2 SHA512 3e37b761148cc31f78d6beb6bdff4b472fe4171a496b8f76ecbe82900f1483df690f846e0473ae700127482bcc3787af16bcd6217506e1e9dd1ad019408725a5
 AUX hip-4.2.0-config-cmake-in.patch 588 BLAKE2B 98081d4caa593756c966b8eff9e3a306ba4d9799abaaccb9bdab40db3e32dd769b07b3c428a22787231e8819e62cd50a33f549f2d1de32f9528036f1abf400cb SHA512 803aae515ee8e2694e5ba1cf6b5d66c98a9e0abf422479c7f599e8bfa38b027062a40e3e9806fa0057fa89a00d019c93d22f1c1ad78f68f1ac3f9bea5ebd93be
-AUX hip-4.3.0-hip_vector_types.patch 304 BLAKE2B 2821fb3bc7aa093a2f17fbb8baff8c5d68080f61a8636163d0c69463390f0ff553a0b67aa0a5879edbfd54a6afdae81325a8eaf58fb89cb6168cf6ccc5cc9208 SHA512 6d32cc886229d94b18b9779f30e81bb2e9cf51bd47385dc692ae49dd308de16e229a2fc560e5c40dad15f1c9c75038f13960754e0dbc57b3f281e5dfa6701f6c
 AUX hip-5.0.1-DisableTest.patch 1689 BLAKE2B dd25393370a594abd3cb6fe8abab6481c2c544edb3f84c7b6481501fd5c2cd33970245cb38d148c5218915a67a8c1d24fde14a5a5c47ed809c613ec78b6d25c7 SHA512 6932af7662b067766b6566f858dba9606818757070b642778d559b83052097ee2ecedb1ae0184ab000c7b068b5413201bb5521e0aa3bf090df369139f292306e
 AUX hip-5.0.1-hip_vector_types.patch 312 BLAKE2B fb5a61a73e741e2456c031adc9c2e96fdccb5b88a3d99e6b4d31a9b53897f6ccbb41c9535296b55512055f0581a394289bae31036d3b7c07a8081e88708b9a19 SHA512 2ab41b46baf0f8adcb82f55b7ebfcfa3097159b7317d2609b490c0406ba47728c37531c03b0a4e474d760776cf7b614e32ccab45c769ce2fb8e54fcdffa61f5a
 AUX hip-5.0.2-correct-ldflag.patch 1117 BLAKE2B 8d11bc278660fb7e14585822a462de96ebca78bf5cec026c8097fa2b9eef87f3d4fd21641d0cfe77f217067bc161b6ece94eb55de71611f106243c8bd41b157c SHA512 1d4b46f941f5b3115705a416822b2a7c034ca6611a7706bc126902e5130239dcf84624f35624f9c7b952314c1d76fcba3f17e40ceb2574b4b37bddada073f808
@@ -26,27 +18,14 @@ DIST 5.0.2-update-header.patch.gz 5136 BLAKE2B 290b9e250e3004a1147ad28606d7d2050
 DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a
 DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73
 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
-DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
-DIST rocm-hip-4.1.0.tar.gz 954215 BLAKE2B c4b75ab2158e6921be1c34820ab5d1a5e2eb36112834b0143c50023caa27de384e0497f4837947cc7fe05554c6c95201340b1979eb916b31ebb4ffec8c923735 SHA512 420ffd7b79e2b4506873cbfc56e96395f8ed9d9375ce28df51626601199d4d8dca6920528e255d39a48ad66ee11f4b653f3b9f659df489d32b21886fb86c64b5
-DIST rocm-hip-4.2.0.tar.gz 918281 BLAKE2B 45c28289c8ff9e600bfd9daff8af162c897fcfdf41ce65d91d1761d58253d87a6385fd4a15e818619ca39d3413479bf043ab2758fead349a243105e979b64f7c SHA512 e620507321c949ded2eab6159099eef0eab267eb686b6ee0ed86022fffaa51fb8714a7f344b79acf76c876c55919360905d1bb3a7c00a87f40174774d6682ce8
-DIST rocm-hip-4.3.0.tar.gz 967550 BLAKE2B 263e8bbaa86198d3cb6a29f5597b56a3fe1e9338a8c485935070e6253816ccdba9671f33d8142c260aa3c36f43a71de7f2c1b7a15e1227f97aaf03ed10ce10dd SHA512 bc2d9597200405397387cc8f626f0cc734ee450c462bd7c7a0c655e3dfe2d1e09780328cbfa1c0d1e0db836e561fc450c5d514a6ad1a5828cb913c4c3c535ef1
 DIST rocm-hip-5.0.2.tar.gz 958496 BLAKE2B 9c8bb1eacd982203e3bd6c24560672c4a9aaf5606608635d7da5a60f613d9be50998f990c1ea3e0e6f5581e0efcba09af736a77bbc9469b2898e0974d063e8d6 SHA512 4a99e86a4594c15509a1bbfec0678cd05469eb14dcf35ce650e1eb7c2415f57f59071b1b8add2f8566ccf06242bead77abd275987fe79fe6031dea90d5693805
 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24
 DIST rocm-hipamd-5.0.2.tar.gz 319973 BLAKE2B ca19938eeca66f0d2614ff933e1d0e75b6b8dbc8d996fd4369e5649897b9948271ac88f2a66f0a40ef586d6185b30d01132decac95d1615c1ee419996050ed07 SHA512 056acab082b5073e81f9e5de00ae12c85021d1c297cdcfc45b85f191dcc68603f64fe5d0e75f9523120657947eb125beaa9c3ce26234968c43b200e638f9afa3
 DIST rocm-hipamd-5.1.3.tar.gz 331996 BLAKE2B 176121fe199d53c02a0fc407015681c2f08c8a72104738b457581fd81b37d16efb8170a46d687fb85a45242ba8564246cdd5746e78d9b73dd0bdc9b24eb8378c SHA512 daa6f4da97f71a5fd1f79d8c9e5fc43324743aec91362a05fa62e08966397a637d794abc7e14230eccf5f1271f9fac58d1336aaad1f2cded6cd10792845a494b
-DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
 DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
 DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
-EBUILD hip-4.0.0-r1.ebuild 3817 BLAKE2B c01eb20493f27e9650d1cad3413b7fa14ef799d67e8b02de235d1e37a4f6633c8f0f6ea73fa8f075d0a10ffb2dbe0ccba4a65c4a505e665be7d657d5c773641a SHA512 2b5b58f13d832572f547f5ba4e67daf62b180523424e1e4605e96d1b7d834b700f8aebc95b047ab08ba36e16098aa07ddf7f9c91654672b00edc863bb5c25d68
-EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d8bd4b29e1babceb3572afb5f859288c395952befd8520fdf2875703566a4dd7280045f98f309af8c3756b SHA512 d7b82a954d9dfde559e48dcad266aa7d3cb204442045ea2c3eaeafa7513f0f549ca3a656d5d823e636600e3b9112fd276fbfb9e9ebac74f01024327de76276dd
-EBUILD hip-4.1.0-r1.ebuild 3366 BLAKE2B c8663bbba532bca211de1a8b8253e2df9544cc656ae47a0d8e651161f7e4186227b9cdc11e3b3b010bbb1d8a18ff36ece37d5a9ad4092ed496f3c9d1e7dc7791 SHA512 fc2145fad2fe1e5a28331a91959c591693cec497504344e6ae2587276d7b20e7895d94780273a0f83307efbb0e6099e0bdc1874bcefa2595590a736092502891
-EBUILD hip-4.1.0.ebuild 3476 BLAKE2B 101bb84d3083388e6dc761dca7ccf0ef5393a44be7666831e83303d1dfbd50e81e3fa09d572f9c5cdf30c6fb738e0587bb9ddd0ccb0627bef543bd64648b66f0 SHA512 3af9dc2a5ab5735dfb0cd5341cfe1e99961858d40409ffb065231bea793b8faa3de3b305d28f2dce90e4535e0406f90a3f933b4cbab06933d83b04dd3e433023
-EBUILD hip-4.2.0.ebuild 3634 BLAKE2B 6ab4a5d74b08a2dd765bae85bb91fa7174cb0fbe411c7f4b741db6e49b47d42277e5bbba7e86637b8481a24d2eb0f53b7cb096d4dea09f0a6fc31538a4250fbe SHA512 ad8e4ba2df35b36f96047bdf40e0f7420256eedaa9432249d3d6d184ccfb2d0acbec7d679dfbef8fd278dd6d748334de927a50e7c00f35ce4823af2297d14b5b
-EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f66e9a4306035875eaed8f507badca6c357bf4fa82e93e76eefdbdf7923de5f56a9eeee762c7ba364abff2b1e7 SHA512 97f34852764c8810eb093ee2aa09f3484382f5a0af5f21543020138bcd8cc40838480a03b1ea88be8044bca71500bf746ed768749e6c71e939b8438f569bd8cb
-EBUILD hip-4.3.0-r2.ebuild 3978 BLAKE2B 16ffbeddfdd5c6d0338e5be1fd609272bb4d00e1a5d1530a00a75d82a5882f52fc0bfd97b14bf9042affa4af4617507a5cd1b8d8f90a1f4c8744028ab63b7f38 SHA512 e664a11e69cc4a7629a8f088992d2e26517635d1f4e685d8dac69e74e6f94e8c1f782f09d0f54308b73c134021579a624bfa2ba8ecac3c470ab81cb317dcb67a
-EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
 EBUILD hip-5.0.2-r3.ebuild 4915 BLAKE2B fb73c3d4c911b33f9790aff42a71698e0e37828a6ae18874d627df2032971ff23f58d1c0a33cabd7ffa910e29e49b1bd958f5cae4c5fc31d2cdbb3d0f96ea4e9 SHA512 a5380504fb55e43fb6b9588d1f326293770836d824a789d85e2a6110cac5a252e2c089098755c64cfe6642af909a5ad87be71140a626f4e8f7f919a11fdf56d4
 EBUILD hip-5.1.3-r2.ebuild 6418 BLAKE2B 33b992783bdae4f93a3fb7a6b0692d64ed89ea98a2ed016b39bb5a3056bf78788ceef2dae295bc22fbbe84f07cf168033d3283dddf7683b090d31b4fa8be323b SHA512 fe661d237ca26ddb16002d95eba6436247d1e82bf0e3bad5c125da93cb16926f0de4094cc6d2a7d86f74d61e26ffb7380ed3d6315378da50e045525599d95e9b
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch b/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch
deleted file mode 100644
index f3b5ac9c19ef..000000000000
--- a/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/hip-config.cmake.in	2020-06-21 21:17:35.576297760 +0200
-+++ b/hip-config.cmake.in	2020-06-21 21:17:59.861296628 +0200
-@@ -123,8 +123,10 @@
-   )
-   set_target_properties(hip::device PROPERTIES
-     INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1"
--    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
--    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
-+    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-+    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-+#    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
-+#    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
-   )
- else()
-   set_target_properties(hip::hip_hcc_static PROPERTIES
-@@ -156,9 +158,9 @@
-     INTERFACE_LINK_LIBRARIES --hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib --hip-link
-   )
- 
--  set_property(TARGET hip::device APPEND PROPERTY
--    INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
--  )
-+#  set_property(TARGET hip::device APPEND PROPERTY
-+#    INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
-+#  )
- 
-   set_property(TARGET hip::device APPEND PROPERTY
-     INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
diff --git a/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch b/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch
deleted file mode 100644
index 7997e2929666..000000000000
--- a/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uprN HIP-rocm-3.5.1/bin/hipcc patched/bin/hipcc
---- HIP-rocm-3.5.1/bin/hipcc	2020-07-21 14:29:11.625878447 +0800
-+++ patched/bin/hipcc	2020-07-21 14:34:11.454395203 +0800
-@@ -675,7 +675,7 @@ foreach $arg (@ARGV)
-     $prevArg = $arg;
- }
- 
--if($HIP_PLATFORM eq "hcc"){
-+if($HIP_PLATFORM eq "hcc" || $HIP_PLATFORM eq "rocclr"){
-     # No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET
-     if($default_amdgpu_target eq 1) {
-         if (defined $ENV{HCC_AMDGPU_TARGET}) {
-@@ -694,6 +694,8 @@ if($HIP_PLATFORM eq "hcc"){
- 
-     if($HIP_COMPILER eq "hcc") {
-         $GPU_ARCH_OPT = " --amdgpu-target=";
-+    } elsif($HIP_COMPILER eq "clang") {
-+        $GPU_ARCH_OPT = " --offload-arch=";
-     } else {
-         $GPU_ARCH_OPT = " --cuda-gpu-arch=";
-     }
diff --git a/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch b/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch
deleted file mode 100644
index 382ed52f6923..000000000000
--- a/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/hip/hcc_detail/hip_vector_types.h
-+++ b/include/hip/hcc_detail/hip_vector_types.h
-@@ -42,6 +42,7 @@
-     #endif
- 
- #if defined(__cplusplus)
-+    #include <new>
-     #include <array>
-     #include <iosfwd>
-     #include <type_traits>
diff --git a/dev-util/hip/files/hip-3.9.0-DisableTest.patch b/dev-util/hip/files/hip-3.9.0-DisableTest.patch
deleted file mode 100644
index 3fc787a7354e..000000000000
--- a/dev-util/hip/files/hip-3.9.0-DisableTest.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/CMakeLists.txt	2020-11-15 11:26:09.747793881 +0100
-+++ b/CMakeLists.txt	2020-11-15 11:28:45.289793287 +0100
-@@ -676,45 +676,45 @@
- # Target: test
- set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
--if(HIP_PLATFORM STREQUAL "nvcc")
--	execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
--endif()
--execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
--if(${RUN_HIT} EQUAL 0)
--    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
--endif()
--if(${RUN_HIT} EQUAL 0)
--    set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
--    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
--
--    # Add tests
--    include_directories(${HIP_SRC_PATH}/tests/src)
--    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
--
--    # Add unit tests
--    include_directories(${HIP_SRC_PATH}/tests/unit)
--    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
--
--    # Add performance tests
--    include_directories(${HIP_SRC_PATH}/tests/performance)
--    hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
--
--    # Add top-level tests to build_tests
--    add_custom_target(build_tests DEPENDS directed_tests unit_tests)
--
--    # Add top-level tests to build performance_tests.
--    # To build performance tests, just run "make build_perf"
--    add_custom_target(build_perf DEPENDS performance_tests)
--
--    # Add custom target: perf.
--    # To run performance tests, just run "make perf"
--    add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
--
--    # Add custom target: check
--    add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
--else()
--    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
--endif()
-+#if(HIP_PLATFORM STREQUAL "nvcc")
-+#	execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
-+#endif()
-+#execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
-+#if(${RUN_HIT} EQUAL 0)
-+#    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
-+#endif()
-+#if(${RUN_HIT} EQUAL 0)
-+#    set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
-+#    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
-+#
-+#   # Add tests
-+#    include_directories(${HIP_SRC_PATH}/tests/src)
-+#    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
-+#
-+#    # Add unit tests
-+#    include_directories(${HIP_SRC_PATH}/tests/unit)
-+#    hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
-+#
-+#    # Add performance tests
-+#    include_directories(${HIP_SRC_PATH}/tests/performance)
-+#    hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
-+#
-+#    # Add top-level tests to build_tests
-+#    add_custom_target(build_tests DEPENDS directed_tests unit_tests)
-+#
-+#    # Add top-level tests to build performance_tests.
-+#    # To build performance tests, just run "make build_perf"
-+#    add_custom_target(build_perf DEPENDS performance_tests)
-+#
-+#    # Add custom target: perf.
-+#    # To run performance tests, just run "make perf"
-+#    add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
-+#
-+#    # Add custom target: check
-+#    add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
-+#else()
-+#    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
-+#endif()
- 
- #############################
- # Code analysis
diff --git a/dev-util/hip/files/hip-3.9.0-add-include-directories.patch b/dev-util/hip/files/hip-3.9.0-add-include-directories.patch
deleted file mode 100644
index 42bd9736ee2c..000000000000
--- a/dev-util/hip/files/hip-3.9.0-add-include-directories.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/rocclr/CMakeLists.txt	2020-08-23 11:45:13.148817894 +0200
-+++ b/rocclr/CMakeLists.txt	2020-08-23 11:50:12.409816752 +0200
-@@ -139,6 +139,10 @@
-   target_compile_definitions(hip64
-     PRIVATE
-       $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_COMPILE_DEFINITIONS>)
-+
-+  include_directories(/usr/include/rocclr)
-+  include_directories(/usr/include/rocclr/elf)
-+  include_directories(/usr/include/rocclr/compiler/lib/include/)
- endif()
- 
-  # Enable profiling API
diff --git a/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch b/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch
deleted file mode 100644
index bebe6f0f4ecc..000000000000
--- a/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lpl_ca/CMakeLists.txt	2020-11-15 11:47:55.091788901 +0100
-+++ b/lpl_ca/CMakeLists.txt	2020-11-15 11:49:14.881788597 +0100
-@@ -17,6 +17,7 @@
-     ${PROJECT_SOURCE_DIR}/src
-   PRIVATE
-     $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_INCLUDE_DIRECTORIES>)
-+target_include_directories(lpl SYSTEM PUBLIC /usr/include/rocclr/elf)
- 
- target_compile_options(lpl PUBLIC -Wall)
- target_link_libraries(lpl PUBLIC pthread)
diff --git a/dev-util/hip/files/hip-4.1.0-DisableTest.patch b/dev-util/hip/files/hip-4.1.0-DisableTest.patch
deleted file mode 100644
index 49e7171b2f0d..000000000000
--- a/dev-util/hip/files/hip-4.1.0-DisableTest.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/CMakeLists.txt	2021-03-28 18:02:34.755857717 +0200
-+++ b/CMakeLists.txt	2021-03-28 18:04:54.217854203 +0200
-@@ -474,20 +474,20 @@
- #############################
- set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
--if(HIP_PLATFORM STREQUAL "nvidia")
--    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
--endif()
--execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
--if(${RUN_HIT} EQUAL 0)
--    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
--endif()
--if(${RUN_HIT} EQUAL 0)
--    set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
--    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
--    include(${HIP_SRC_PATH}/tests/Tests.cmake)
--else()
--    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
--endif()
-+#if(HIP_PLATFORM STREQUAL "nvidia")
-+#    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
-+#endif()
-+#execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
-+#if(${RUN_HIT} EQUAL 0)
-+#    execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
-+#endif()
-+#if(${RUN_HIT} EQUAL 0)
-+#    set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
-+#    include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
-+#    include(${HIP_SRC_PATH}/tests/Tests.cmake)
-+#else()
-+#    message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
-+#endif()
- 
- #############################
- # Code analysis
diff --git a/dev-util/hip/files/hip-4.3.0-hip_vector_types.patch b/dev-util/hip/files/hip-4.3.0-hip_vector_types.patch
deleted file mode 100644
index faad9629740f..000000000000
--- a/dev-util/hip/files/hip-4.3.0-hip_vector_types.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-mitigate compilation error
---- a/include/hip/amd_detail/hip_vector_types.h
-+++ b/include/hip/amd_detail/hip_vector_types.h
-@@ -45,6 +45,7 @@ THE SOFTWARE.
-
- #if defined(__cplusplus)
- #if !defined(__HIPCC_RTC__)
-+    #include <new>
-     #include <array>
-     #include <iosfwd>
-     #include <type_traits>
diff --git a/dev-util/hip/hip-4.0.0-r1.ebuild b/dev-util/hip/hip-4.0.0-r1.ebuild
deleted file mode 100644
index 9252cfffc779..000000000000
--- a/dev-util/hip/hip-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-# Don't strip to prevent some tests from failing.
-RESTRICT="strip"
-
-DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2)
-	>=dev-util/rocminfo-$(ver_cut 1-2)
-	=sys-devel/llvm-roc-${PV}*[runtime]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch"
-	"${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch"
-	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# Use Gentoo version number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/HIP_PLATFORM.*HIP_COMPILER.*clang/s:hcc:rocclr:" \
-		-e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-i bin/hipcc || die
-
-	# replace hcc remnants with modern rocclr.
-	sed -e "/HIP_PLATFORM.*STREQUAL/s:hcc:rocclr:" -i cmake/FindHIP/run_hipcc.cmake || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-}
-
-src_configure() {
-	strip-flags
-	if ! use debug; then
-		append-cflags "-DNDEBUG"
-		append-cxxflags "-DNDEBUG"
-		buildtype="Release"
-	else
-		buildtype="Debug"
-	fi
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_RUNTIME=ROCclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die
-	echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die
-	echo "HIP_PLATFORM=rocclr" >> 99hip || die
-	echo "HIP_RUNTIME=ROCclr" >> 99hip || die
-	echo "HIP_COMPILER=clang" >> 99hip || die
-	echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die
-
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-}
diff --git a/dev-util/hip/hip-4.0.0.ebuild b/dev-util/hip/hip-4.0.0.ebuild
deleted file mode 100644
index ae96dbdc84e7..000000000000
--- a/dev-util/hip/hip-4.0.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-# Don't strip to prevent some tests from failing.
-RESTRICT="strip"
-
-DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2)
-	>=dev-util/rocminfo-$(ver_cut 1-2)
-	=sys-devel/llvm-roc-${PV}*[runtime]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.9.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch"
-	"${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch"
-	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Due to setting HAS_PATH to "/usr", this results in setting "-isystem /usr/include"
-	# which results in a e.g. "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "s:\$HIP_PLATFORM eq \"hcc\" and \$HIP_COMPILER eq \"clang\":\$HIP_PLATFORM eq \"rocclr\" and \$HIP_COMPILER eq \"clang\":" \
-		-e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-i bin/hipcc || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-}
-
-src_configure() {
-	strip-flags
-	if ! use debug; then
-		append-cflags "-DNDEBUG"
-		append-cxxflags "-DNDEBUG"
-		buildtype="Release"
-	else
-		buildtype="Debug"
-	fi
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_RUNTIME=ROCclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die
-	echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die
-	echo "HIP_PLATFORM=rocclr" >> 99hip || die
-	echo "HIP_RUNTIME=ROCclr" >> 99hip || die
-	echo "HIP_COMPILER=clang" >> 99hip || die
-	echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die
-
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-}
diff --git a/dev-util/hip/hip-4.1.0-r1.ebuild b/dev-util/hip/hip-4.1.0-r1.ebuild
deleted file mode 100644
index 15d5bfcd3e35..000000000000
--- a/dev-util/hip/hip-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-# Don't strip to prevent some tests from failing.
-RESTRICT="strip"
-
-DEPEND="dev-libs/rocclr:${SLOT}
-	dev-util/rocminfo:${SLOT}
-	=sys-devel/llvm-roc-${PV}*[runtime]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# Use Gentoo slot number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-i bin/hipcc || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-
-	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
-	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
-		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
-}
-
-src_configure() {
-	strip-flags
-	if ! use debug; then
-		append-cflags "-DNDEBUG"
-		append-cxxflags "-DNDEBUG"
-		buildtype="Release"
-	else
-		buildtype="Debug"
-	fi
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-}
diff --git a/dev-util/hip/hip-4.1.0.ebuild b/dev-util/hip/hip-4.1.0.ebuild
deleted file mode 100644
index c5b5027b241c..000000000000
--- a/dev-util/hip/hip-4.1.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-# Don't strip to prevent some tests from failing.
-RESTRICT="strip"
-
-DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2)
-	>=dev-util/rocminfo-$(ver_cut 1-2)
-	=sys-devel/llvm-roc-${PV}*[runtime]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# Use Gentoo version number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-i bin/hipcc || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-}
-
-src_configure() {
-	strip-flags
-	if ! use debug; then
-		append-cflags "-DNDEBUG"
-		append-cxxflags "-DNDEBUG"
-		buildtype="Release"
-	else
-		buildtype="Debug"
-	fi
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die
-	echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die
-	echo "HIP_PLATFORM=amd" >> 99hip || die
-	echo "HIP_RUNTIME=rocclr" >> 99hip || die
-	echo "HIP_COMPILER=clang" >> 99hip || die
-	echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die
-
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-}
diff --git a/dev-util/hip/hip-4.2.0.ebuild b/dev-util/hip/hip-4.2.0.ebuild
deleted file mode 100644
index 20017c515343..000000000000
--- a/dev-util/hip/hip-4.2.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-# Don't strip to prevent some tests from failing.
-RESTRICT="strip"
-
-DEPEND="dev-libs/rocclr:${SLOT}
-	dev-util/rocminfo:${SLOT}
-	=sys-devel/llvm-roc-${PV}*[runtime]
-	profile? ( dev-util/roctracer:${SLOT} )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch"
-	"${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# Use Gentoo slot number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
-
-	# remove forcing set USE_PROF_API to 1
-	sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-e "/rpath/s,--rpath=[^ ]*,," \
-		-i bin/hipcc || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-
-	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
-	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
-		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
-}
-
-src_configure() {
-	strip-flags
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-
-	rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die
-}
diff --git a/dev-util/hip/hip-4.3.0-r1.ebuild b/dev-util/hip/hip-4.3.0-r1.ebuild
deleted file mode 100644
index 59e92546583b..000000000000
--- a/dev-util/hip/hip-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-DEPEND="dev-libs/rocclr:${SLOT}
-	dev-util/rocminfo:${SLOT}
-	=sys-devel/llvm-roc-${PV}*[runtime]
-	profile? ( dev-util/roctracer:${SLOT} )"
-RDEPEND="${DEPEND}
-	dev-perl/URI-Encode"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch"
-	"${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# Use Gentoo slot number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
-
-	# remove forcing set USE_PROF_API to 1
-	sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-e "/rpath/s,--rpath=[^ ]*,," \
-		-i bin/hipcc || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-
-	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
-	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
-		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
-
-	cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-
-	rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die
-}
diff --git a/dev-util/hip/hip-4.3.0-r2.ebuild b/dev-util/hip/hip-4.3.0-r2.ebuild
deleted file mode 100644
index 9547abd69ae1..000000000000
--- a/dev-util/hip/hip-4.3.0-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-DEPEND="
-	dev-libs/rocclr:${SLOT}
-	dev-util/rocminfo:${SLOT}
-	dev-libs/roct-thunk-interface:${SLOT}
-	=sys-devel/llvm-roc-${PV}*[runtime]
-	profile? ( dev-util/roctracer:${SLOT} )"
-RDEPEND="${DEPEND}
-	dev-perl/URI-Encode"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch"
-	"${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Use Gentoo slot number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
-
-	# remove forcing set USE_PROF_API to 1
-	sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-e "/rpath/s,--rpath=[^ ]*,," \
-		-i bin/hipcc || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-
-	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
-	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
-		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
-
-	cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die
-
-	# Bug 790164
-	rm amdocl/CL/cl{,_icd,_gl,_gl_ext,_platform}.h || die
-	sed -i 's/CL_EXT_SUFFIX/CL_API_SUFFIX/' amdocl/cl_icd_amd.h amdocl/CL/cl_ext.h rocclr/cl_lqdflash_amd.h || die
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-
-	rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die
-}
diff --git a/dev-util/hip/hip-4.3.0.ebuild b/dev-util/hip/hip-4.3.0.ebuild
deleted file mode 100644
index 7e522e9fb0e5..000000000000
--- a/dev-util/hip/hip-4.3.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake flag-o-matic prefix
-
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
-SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-IUSE="debug profile"
-
-DEPEND="dev-libs/rocclr:${SLOT}
-	dev-util/rocminfo:${SLOT}
-	=sys-devel/llvm-roc-${PV}*[runtime]
-	profile? ( dev-util/roctracer:${SLOT} )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
-	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
-	"${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch"
-	"${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch"
-	"${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch"
-)
-
-S="${WORKDIR}/HIP-rocm-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	# Use Gentoo slot number, otherwise git hash is attempted in vain.
-	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
-
-	# disable PCH, because it results in a build error in ROCm 4.0.0
-	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
-
-	# remove forcing set USE_PROF_API to 1
-	sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die
-
-	# "hcc" is deprecated and not installed, new platform is "rocclr";
-	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
-	# which makes "stdlib.h" not found when using "#include_next" in header files;
-	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
-		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
-		-e "/rpath/s,--rpath=[^ ]*,," \
-		-i bin/hipcc || die
-
-	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
-	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
-
-	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
-	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
-		-i "${S}/hip-config.cmake.in" || die
-
-	einfo "prefixing hipcc and its utils..."
-	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
-
-	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
-	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
-		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
-
-	cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
-	# TODO: Currently a GENTOO configuration is build,
-	# this is also used in the cmake configuration files
-	# which will be installed to find HIP;
-	# Other ROCm packages expect a "RELEASE" configuration,
-	# see "hipBLAS"
-	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
-		-DCMAKE_BUILD_TYPE=${buildtype}
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
-		-DBUILD_HIPIFY_CLANG=OFF
-		-DHIP_PLATFORM=rocclr
-		-DHIP_COMPILER=clang
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DHSA_PATH="${EPREFIX}/usr"
-		-DUSE_PROF_API=$(usex profile 1 0)
-		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
-		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
-	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
-
-	doenvd 99hip
-
-	cmake_src_install
-
-	rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die
-}