gentoo auto-resync : 24:01:2023 - 06:56:43

8 files changed, 17 insertions, 445 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 289f2bf82b91..a48f4fca03e5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3190799364fc..a3d99b961c16 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -3,6 +3,7 @@ AUX openjdk-bin.env.sh 398 BLAKE2B b83d85e2a4e0dbeb24b8c21fb442a8964e55eaf01125c
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz 189998414 BLAKE2B 6cf30a34a8a3e040895763fbf740e370469ecb9f71ab0d10d7b3c313f922981dfdf2eddaa64badac92d45db1a9945ed1389f1794a434b366034d43af263bf57c SHA512 51a2fc7ddff7d64eadfb7e2f496c33176dbfceea2cdcd479528195ce00454d3d9bb5ad82714e59bdae8cf2cf7f75ce9f1dcb9c5d62aeffda9d1ec9ff0262e04a
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.16.1_1.tar.gz 190493431 BLAKE2B 22e11711048b1e3e45eabd298c4ad25b2162e794561a4aa704ca2cf9612282b40203a6f16337416d16e065ec4764051a199af5b20803aab1c29c3aea6c2e39c3 SHA512 e61529d6782adcb9ccb78b0f3996bd2927b41a199210e6abec969880763e1b2234ddf04fe254110cc332df499616d67156a3b8376012cd3e6640f37e52ef132d
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz 190830566 BLAKE2B fe5581f048cb76c9baa2ab3e4b4ad7b941decbd3d66d370a3c1f152e1337d59944dc3f1739e429725c3f9482839f305a367ab491592e0b694a59c2f8c3eaf9f4 SHA512 ba738a83057029282da0f5d02aa1bb89ffb7ee5040f72a25b0211222a7b6de64939efbf4d96128c92149260a56127e1c9179313627eb5c7a43b78a526f6e3a6f
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz 190875193 BLAKE2B 117f56583c1a7f4aee8df9117c683ad205fa424a53a46fedad21bddd5c36ffcbd7031db468da09bdc840de65a19f5420d12a79612be48142181b8e691c959686 SHA512 e3fbcb65feda7bc59a2054deaaa255d5e4af479d4105ba8d1089fc00c1d80989d3f7a2ee1bb93a68fd98257cc98d6a1800e6de4539232a7110743264da033f0e
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.15_10.tar.gz 181012868 BLAKE2B b52d2330291ae8f8d74ba98b4679414e86c9018ad364bb27f09b5f192369c0b934654e5b4d8a07027e001da96fb89bd62a18ab5c1acea3c2cea2cc31e20a1481 SHA512 abe8469f5fa4f46f71e35785c6972b2901f003e311086352df6eff6911393c31c01ff965c74772656e2255e0bbb15eee6b761db472c886b60a8cda046fb46764
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.16.1_1.tar.gz 181437038 BLAKE2B d87e38a9600e2f4289637f9b54044bb25777cd7a434eae89800945515ecb3965eae8f4660d18e96f1fb95e2401133e6630d98b3b23d826425bff5bd88e5b99b8 SHA512 72e2846718fc2e2a85a23cb97f49acf9314b7da78a79d3fe9cd0a91d34867bb2a3b6ace359b366caf564bb5d026f19400564e31064691016e9827a450b5e1a6a
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.17_8.tar.gz 181771684 BLAKE2B 17999bd2e1599b1a129f50f4139bcb12fbd4ad0fdd30f2e8024a17a24912820aaa24fab747938f802c1f30d3dea9c696cf8ca858c1438b944ab1c45c1ee21fbf SHA512 8adab075049b52b7b80bb4bd48a8cac0633c7bd6e6b05932464753e03883f33665cd9609038519f048e2cc73e0d78b51ab2d7ca0716ca12ecf6883522c7448d1
@@ -13,6 +14,7 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz 176227429 BLAKE2B 7b8
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.15_10.tar.gz 193336087 BLAKE2B 0f61aba6b76b019ef7271dd92cd4b6db432318d629b5485e2f85a9ca586f1ce6b6d3e2c48486a4f3d90f8730e3fc7dd4f0975849f7c0f820812625556331db87 SHA512 360a349b34f2194498d0800145b54e5532b8a2137d7526a692a855a036d1cb6ef185bdeffaff63bb8cce71c7a0b10fee6acfb1024db8d2ec0cd485baa0683304
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz 192644240 BLAKE2B c7e77e1b620f6df33d63656a09203bd3d700579a8730141ea4a20424f844c6afc09f4c6681fa66c3fabab0cc9505293cdeed04fa16b0accc49209e0ea4877ba6 SHA512 457df026841f11a424e8f8fe789ba4968d60b0a06deef01a69911ec2084fd4f14ae5dfae543bb646881ce8e4e34665c65670943a43cb2a83c6923122801de468
 DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz 192983282 BLAKE2B 3b19eb7bd47f30bcdcd9e2c5745cc034913150aac28cbe4573854e1d4a7a1eeb6ec1a95c1d082fc44fc097ddd0f0ee6b8c41ffc9c70239fd4fe723e22aa11b2f SHA512 26ec3b483f24e70c4d75f43debe91ef78dc721cdbafe38513feaae66e54c538a240d93d354443114550392644fa5faddf06dc61c87abb1bee80bf324767b143b
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.18_10.tar.gz 193025321 BLAKE2B 7302e0be8681b34d65b7dc83fd7e4dc720710edfd5dc536cf94da61853cb8a9e65ca2d9fb0057129aaa18bce70dcaf41dd802a650ab9acb9e4f939c403c3c5f4 SHA512 ed3f06f35b046d811fcee5eaff196a035b706ba29f585748585bace1e9ffdb13f16fd1f23c44319760229c4fb1c3a2feb3ed540632f8da8541914c135f06eb74
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz 193245074 BLAKE2B 0a559bd0513984c2bc93e31ab7afcb8f5fc152c9984d957359bf1901e46b25b25ddee81c4c8fc0f560e65b343f74e39c55a1af61526fceec0eb530309eb65383 SHA512 85b21da3ff777b6239df5534ee3539b256a1de5d02abf4f537bca38d2cbf8006b4130d8bde2e24835a8da7a651fc8852df2c5060d26b9d594927f4d609912554
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.16.1_1.tar.gz 193754645 BLAKE2B 5ab76378de497da3e59b5c33025322aacfa67edfa9766fbee346399f8dca71309aa9e6c6ad43a59c2bc7033fc01806b045832ee6b57f08956a2d696e760c247d SHA512 38aa02b8ab14b678b226891ffb2d2ab1248202d595e8c37ded3479d3d0a210355df75cabb62b03ccfae5369965e80ab4872cf7f530d0ddbc4cbf4c9a0f922e37
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.17_8.tar.gz 194082362 BLAKE2B 14dc6f09cadc774b7f69914c468daafb00686fca376f22acb5b7777d8d767e22baa58201aa062c4ab229d77f4311116dbc1b02c49c56439612c4c5e0df5ccecf SHA512 f74b704581f3cfb66d4df79f9583ce0e3e94ff0b4930188485c57594af507359dcd579d22aeb9dede3c2d7bc2e8a51212c615f9a367ddcc180fe8a318efaf95b
@@ -21,30 +23,13 @@ DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.16.1_1.tar.gz 186335152 BLAKE2B ce97404fe164c89cc43d053e14a4abd596c104a6dfa355cc011de274aa5e1b9d2d5cb881299fad7877fd0b49bf1f738672eb565d4c543720d059663b34fd5da6 SHA512 6ccbbf271e23d6d2315ac62e5ea574991e728a4298cbf217aa7fffb3717c6a13cd82a467d15a0be9699e7b9e9a062ed0f10772165a40604f2f3c8e02729a6eaa
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.17_8.tar.gz 186594836 BLAKE2B 00d52b8e2f750335e87358df56bd94082370832b2ae01cc200c1fb96c8401e7dc941cd1eeb6a8f9c33319440a82d2f98d243a1c14a0c15620e0226280e159c96 SHA512 342a68be1779680161174cc24a8111e72bb9bd2ff5a92a67d4b901538a81dd694fb90eee1f890ea6d8e2a89727a31ea2dc8b97091cc8e43c9f842b114530f485
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.18_10.tar.gz 187254949 BLAKE2B 063f437ae64b3b6e30dacca5c01b02118ec7752cc91ece1ddaef16994629a6f5e8912fc4c11fdb44d521929a620803f1c3906911a45f5cec67a705b62bb279a3 SHA512 d9ed4bc73965672752392fd2741372a92dff4d2262c45dff31d95e13970afd31f513bc3ad93071e568c3e9e8afbf9af89f758d80f4922dc364ff332df08e762c
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz 190142132 BLAKE2B e6b0fb199ba788a31b6238d3bc458216baf37f1517a449be63668c412dfe7662d644ffdb312194533d4af089ac2753c164059978d65eddd951bb98bfc108da87 SHA512 f406ae289659e902dd3314d40485c1f3b04915451794c2bebfb1eeda7c83dbf051c26461aec7fe07c1a43f5319f80044aefc99c9177e2a9ca0a31a9c9f06c157
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.4.1_1.tar.gz 189797923 BLAKE2B 8732ba8ce23d8ebdcac7fbb2c6035c3cafd11eda4853b948327c6c9839a88294d5c89a03006d542c8ab797b3d4d570aefc6289ff97338d68089387d0ed742d3c SHA512 d2bcf2b766e3135320f28de1df47c3d3f9012281501390ffb6a4c01f59c72fccd348139f4eeb0a9bcce747ed8cfb04f2c8d78161dda2f2f6e0728993f8953061
-DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.5_8.tar.gz 190100891 BLAKE2B dcf1aca6db5af78d39a0e27422c3c9d17b7e459dad73fa74a475881a221a235f8ffbba1633a1d4858efa4e38d11a5f6e15a2eeb5a580edb0ce3ba7eebb559967 SHA512 7d16ee70f6f8a17cd22adfddd29d23e8cc74c24cae7a33cced6f73e16767da217c9959e82033cadf9c20d887f521a6807304ec80a23a033040b179b348312034
 DIST OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz 190151132 BLAKE2B f602ebc908f111d6c3aceb5cf6fabdc0940bd3aafb840b78fdda64e98a247f0dfa7fc648827cc62cb46c16ce084ca1cf51274c9629b28580d028a9ac4b2be8a0 SHA512 f8a46cbc32160ebeee9c2047e6ac7837fbdc73549257c61d197486675fcb9420def98400779a0ec40a73652dc919daa5a9442bafe4f9129891527e24a109bb99
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.3_7.tar.gz 177467402 BLAKE2B 38b8508e81bcbaf90a1db9bfe3f804da9838cc43b6043c328d19523c83dc5d953465a1018a9054979163140a28f5e213815634005cf096f6932407e8f7ccf9a6 SHA512 0433dc839a98b810cad9fe0d98c46cabccec5ceb44fd5bc67fff0c27962f183a3814b9aab521768b578d8f11bda97934629bf9fce5c010cdc93c685b842566e7
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.4.1_1.tar.gz 177121101 BLAKE2B bfbbdfdf77e5f52bdef3bc9ab387590f2d02ed7f039ab49b15127b9a09430b0a9cfadde04cdb70668812d68ed4279dce3fceee6183d469e0ff4b37f43bff60cb SHA512 36403f81c06c4d7bb76058bae6a4e5c94d3c134f9b6ff9ec4b9f8ab9437195f0e2e2c2770cea4d765a182a0b2fdfc4b7fc4343fa5170af5720343d3fe0302e02
-DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.5_8.tar.gz 177335828 BLAKE2B 9c4748b4099f2d6d3bcdd709c294f1d1f7fe8731a389362d30e2717acf79d79279f1c8d6d05bb6a11a8d3fad0cabcc166ce7db44a4a31dee9f3b45f4565c7c18 SHA512 858dd4ebb5844acd40a517dd849d284521375286d5e025558c50fc406306d1aa6160af07ecfa43f35f7e30c2bd3845c63814edbe2e6c85f611aacb8da2e2019d
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.3_7.tar.gz 188309462 BLAKE2B e47b98ebcb661631732e3238ce3cd1630a0a2103d7e32beabb49d1a0ff216c34c0c39fac11a848474a36dd2c98f6724c58900e3026d04cb7e4f7f00adbe1fe18 SHA512 9158821b22633177866ac0a5c4ffd774d2d750adea2de2adce661060ab7d28cf67fc703eb9e0e200149fa03eb040a05dc45ac944dacd140e0d0fa06515584795
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.4.1_1.tar.gz 187944772 BLAKE2B 6e04360ff4abec1bb76d5e73bc21716a935224ccd799ab4ee09f989a996ba4684677cd28545f90ef9a5d53e1ecb46a0e1d641c6c41aa93f74992b53cc19ece5e SHA512 850a0241ee1c67b5f8c2350432de82d3d264015cad7455f98d392b5bf32bc0b44aeaf1fc9b42035a2a13f157f57e833667329970e61f4626b88bbb4fcfd39482
-DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.5_8.tar.gz 188272844 BLAKE2B 7a86c2c4f27322ffe9e2296ab8a0042b0f3e900c11605a06c64bb5817dc9d9e0235e55e27d08ebd53ecbc7b85cc0ce6f3421b8f87e3779e5585104533a371bfb SHA512 dfbddc376da65abf7cf73fc4a9bd5e85488f996035c7b9d1d8e5624e999b688c76ffb53030d09d8e482c91c79771bfb10e7536a081537eee3bac8ba54b624690
+DIST OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.6_10.tar.gz 177369180 BLAKE2B c45592830d2a9d87871b324d6ee331013c7ac5c1a968edede6ebb639c611422c4d2ee507c8cac7b154abf2031c71f7248b5ab4795bf4e56fc89e75469cdce1a2 SHA512 3e63a9c5457ca82cae15058f86c06bafb9172f95669d24b43bb371d19eedb7afec8725fabe1104fb0f575c2bd7e7ac8f41c103d6f967f7b910663b1e51d05a4a
 DIST OpenJDK17U-jdk_arm_linux_hotspot_17.0.6_10.tar.gz 188314167 BLAKE2B 71d8de8745dc5777cbec614f7ea254919b485d225e1eda0d43dde6c21bda20e5cb19c751af851471e5aa0d7399737df769758f7962932b63a85e00dabe746675 SHA512 7bd7a1a638088cf12b5722320c90504a661ab684dfd3f13fd87e24f12b94f5f2abcc98570d8939da9fe89d8f62e0de939db883b4d1e4f1262dae1e63610b4b6b
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.3_7.tar.gz 190898839 BLAKE2B b5188190ab30393ff789724ca99ce89232d8a4d81c22205111da4cc60cc258fe5bee47a5550cf032937542d7fb677af0de9aebbe39fe20b4af223a6d7d3211e5 SHA512 e1f1ade72f12c21eef9d34d05e2a4a8228320138d0c626c4eb31431ac9d5e5123ec8ef24c168005e3bb3508537c826399122461a0ce8de1310ccab40d8d21145
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.4.1_1.tar.gz 190474121 BLAKE2B ac8b741cf29816960de615999d5030f03677fc3a370c0c430d408802535cbbb2b304aa18d036529d29c1939c2d43ff84bdddeb15dde5a22bbda7c807ddc900db SHA512 04c9182fc503369b7dcf53729e3c5e7f16828477e168d279806c7968482588ee5a04b1c31407c2baa1c1d24468592e1e416a9ea2115391113b83e792457e31b1
-DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.5_8.tar.gz 190798083 BLAKE2B 5750a7a908f2b679edf337b7f6795ea598a57bc2298ab9ef2ccaf7e6b2d6f81802eae120c8f971ed79ea8f8b6ee9607f28a2113e37005bb6528b37a33f6dd670 SHA512 636ad7c5363c1173655ca734f4184ad2ffaeac49ec20520fa75d337c52bf3517ac86d9f7552e0158adb73def293372eaa14625cdec927f09062596586b861b1a
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.3_7.tar.gz 191298712 BLAKE2B abcb97374d38cb7457139865617d7570627d390c0db47ed572048dbb9f35b7cf6cf1a7d973684607ce3f7477f9b03b85ba43b8b4447b04f9fe1bfe419a18d190 SHA512 4e69597c134f37db83b44fd86e13c25ded20d8a1b2d8e959b6ddee29e5cc8c2a7bfd449636399f2d7bf030d93b2a29236e614a1578f9bbd37ca7e12249dc80bc
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz 190514211 BLAKE2B 07f802438dffcd54b07ea5342ee78fcfecaf51bac90666aadce34c871f25df6e21a30565e17952dd13fc5da9f032eaa931b66a725f416c98bcbcad0a1d584ad0 SHA512 927a83458e89ff8acd82a443cfe08d6cd93e73bec3311661d2bd4e09eba151088e0d1f40206f50c681586d6629a02c4549fc97df043edacb255e841ea17c83f4
-DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz 190792800 BLAKE2B 6406f30e88b409a23f9fe96fcf833290c0fce00b0b7951bbf104d93149a9a5571655143502dde101d6ffd559eaf48f34840e08d38d87e129a1b0dfc0250d4602 SHA512 2312d538e697161c1378793fdd8f63dd46db76041be22d3243b7f9bea964b422a0fc7daf18f7dec228bedb49602dd104908915d6f4ea3c7b893fb52630d57980
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz 191514138 BLAKE2B 3e2d64cdf15c63f2f50148576bc8ed085ec808a28a07113910f7b04c5729a1a56840751da627d8012751a7b533f6730c3a9bb99914382caf82f63e5a65dad40a SHA512 144f1e1c0f9558bd0be0536b48b89081579d1232d75c00fcfb7be2460475a4eaf3a6ae89007e683fd6148b4ebf33c2d9492419db96090e07f4ae52afc71df861
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.4.1_1.tar.gz 191174859 BLAKE2B e6552e71279ca4a6d04a6e6d5a1707720fa7900c03fb31e312dfacf44d4dd699f657fe2f672881783a1918bac1598a99b4c56d90bb42b2c28a75762ea647f2c3 SHA512 db61842d4482da4fd5b86aee5b1c7f7c28218a58d73850513f272153a1ab09374462cd0d6f631b69f30204e5cfaca44357fa481dc4ebc67a50eda5b71a761082
-DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.5_8.tar.gz 191466567 BLAKE2B 688a939a48f39ae112c415ec4523a65f6bb311250142fdb66efc4a986744306b44704450aa0abc5ad5608293b6300c82956131d832d8e8577772a4e9b71e96d9 SHA512 c77a59ef59690108c90677125f6ad93959f1618096334d28cf9c9d22db96a728576bd25e6ac2df62cc0f8656cf4b9f6b9a72743f31fb40ba74c794a2a8226380
+DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.6_10.tar.gz 190834846 BLAKE2B 9a14c48bc58221e510ca95ac6e24d5016114a40b4c7881ddf5138647f8d1b486ceb179a757145f713d252e5df3d4df71c36ac6129b6cea9ff2c6d38d91c005a6 SHA512 84cedd98b622c953e89d81a7e39a38e1aeb1d86d582a328e5cbd7c94eac9c39c01874327bd75ca0aa0c32aa0dc6a748f94d2f3252e84e042a0875b1f34f4d43a
+DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.6_10.tar.gz 190844751 BLAKE2B 7dfe7dc8abb09cb32c626f75e668cbc9c40eb83ae3b8155cdd5656f3fbfd6bf971bb8142fb7749050d2f120385a35c99d70016f5afafc36cbbee12e0899f8056 SHA512 e26e653196ad7bbdff0551ff23581c23936e98f3b89fc6bcc4592edcc29eb59aae294ed043ac3febd60bbd268322d143e83a487ba73e530977fd4061ac67008c
 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz 191502157 BLAKE2B 7de684d2529e63e6e28f726c57c139c4890caa7f2f753199eb1a5ac623d2f554c22f43b4b32fd1030c29c0cb6b9ad74ca27b1c7c4bb422bb889d48ba597726ef SHA512 71f0f14647d672ceff9a53db7bd6a158c787a3fb3196498a57ccd94c7da46af2550c04ab7ba95a549fe4f3d6482ecd7c77c4b20057ec2b32beb9a2a46c9ad0a5
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.3_7.tar.gz 187277835 BLAKE2B 2a6766ae47281222a570485bbb67b10b78b2d17399a2fd76e254be3d30808a09002fe6fcf5814be044c4a95c3f791af4b45df9320cea5ec212f9db38329b1630 SHA512 00cb5c5628ef2fcbc44ffcb2f81b8cae8c57107df8c456b4f3bf6897269daebdbd9ce0fe78af686cebedbd2426fa85095b198d47578828404a1b046eb0cbca60
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.4.1_1.tar.gz 186906753 BLAKE2B e86da7cb28aa43fde9ab947fbe886ed2ce4985d15a3aabf846f5bfc647203fe330f5333c9a7bf30936b2b566424c695c83b246baeda10b32de1b59a118414fb4 SHA512 b4911f006af320acf7ce18ae981a3a29d72d6fc1190bf4a0cd47f389d415de4980f65a0007a7cdcd8f15b7434b2e0e772acf4dcb3b76daa32841c7b4016e9458
-DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.5_8.tar.gz 187174050 BLAKE2B df8a7369f7beb49f57bdba9e291471f805d427bdd019528cfc7874b49335b8598e614cacf82b64c0f6a3dfca055c174eaa30a0a3723effc958c40f826d1c10cc SHA512 29f848434cee5345d23434fae28e20fb722ae181cfbd0ec966aa730e05937015586a31d694cba4556fcbccb96752373fc8c13c2748f9ee5a30a243f3ce239989
+DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.6_10.tar.gz 187219587 BLAKE2B dd8f19c7498bec3afcf464e38583ea769c14575d4fb2b4bc3102ded6731db934d85353863d46201e92dbf93b19ad8c2237f5e3c62cb1360da05cf56df8618362 SHA512 1e17bce0ae272dff9e788bc4d83e7a3a518aaab589448eb3139dba89e52e63ecaad9c991db99839ed7b22f1fd47820579a570271a5df01d37f595b72de89055e
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz 102003248 BLAKE2B 75eb1dc4e09f868ca1a5f0ccc275e36992414e250c2815ab2a6e879942dfdd57a069d6d2cc79aee967c8d2077cecef6d65285cf870e70d22aebef607e906dbec SHA512 cf716f9a614932ccffeb8a7a2ee3a2f10543b31b8f6953933ba4785f386873fe00fee69061c70c26b55a6db13f26ba529f9953d7f3fce9b42172fe3b4e0eee52
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u345b01.tar.gz 102022940 BLAKE2B 40b14e0399de76c6dd2bdc9cd6b3aba7d62cddbb636a2b11a905dc432b0aa91ad62d415203f3f83c0ba82c3667f83a485ec57e71077c26c8eaf35c0f08edd713 SHA512 d932f0a0101fdce350e48a4a79754477478b6c345bdd66bd63be53a10fe6e613b89028d4ebb03d48e85284d5a1caca7f128690765e91968e01420f5fbc08ce48
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u352b08.tar.gz 102045265 BLAKE2B f75bafbde083abfd606f1a916d6bb0245dd8087260fde954611db79de55e95a5c7feb4d5ed50c9e23de4b698d2a9aa180f73d73c52d5f3956b17681edff98d01 SHA512 a37c05e14bbd9c419a62fdaa9a9cb3ec4f1a1135424beb093c91d55873bd79fa3ef63a8fdf05695d709c9c3fc406386a16b1bfc898dc2690361d97df8c3fe1b5
@@ -66,13 +51,10 @@ DIST OpenJDK8U-jdk_x64_mac_hotspot_8u362b09.tar.gz 107290360 BLAKE2B 03f4ef48266
 EBUILD openjdk-bin-11.0.15_p10.ebuild 3174 BLAKE2B 0b8853c57d4526e116d72e690c0d6e0e9187a8230a64ab03f3e6c4a92b629bae8072bee50f78fd2061d7e49624e140fd3ff1c3230486c5e510dc2ae7203d2f39 SHA512 2558eb3aba44ee55dc3594352ef9236b4c2d31ffd06e6202551a3ab012481a5277bdf5c3dbea9069a2cbc57bfc415c3200f7855c74533b98d93ac1ff105bec23
 EBUILD openjdk-bin-11.0.16.1_p1.ebuild 3177 BLAKE2B a990f8e900b381650c86991efc235ccb0348b05f79615449e1c2f60490ac62eac381d24721a35428844a9636196e62befba3c88362aefe381fe847a2f80b298f SHA512 2701854ab8ca343ada8011b7eab57adaa913c147f503bdc89cea247c259d42acc98f5a68cabaa0cf25eb905dcc36919e215a68a498b155292739ff1cb23319e9
 EBUILD openjdk-bin-11.0.17_p8.ebuild 3177 BLAKE2B a990f8e900b381650c86991efc235ccb0348b05f79615449e1c2f60490ac62eac381d24721a35428844a9636196e62befba3c88362aefe381fe847a2f80b298f SHA512 2701854ab8ca343ada8011b7eab57adaa913c147f503bdc89cea247c259d42acc98f5a68cabaa0cf25eb905dcc36919e215a68a498b155292739ff1cb23319e9
-EBUILD openjdk-bin-11.0.18_p10.ebuild 3214 BLAKE2B 31c34d303ac7600f67cc71c2c2e834be406a0ea096fcb4a7a5b841f0203a4b12ccd5a19f7afcd2a0c77eabfb2c0f6827b25bcff82296a88bc6bca89bd8742f3a SHA512 fad392917096eda31f35ab1dbc51d08671edac66d698106f8b3fdca6944c32e18d1121444a712a7a51530826be1f62027c0d3bfefdb2d68f71375bf0c80b3054
-EBUILD openjdk-bin-17.0.3_p7.ebuild 3234 BLAKE2B 33af600b0c89a48e6d230ac33f8638592b21884f1fe43084c5accb962846d7e8fde3d726892a7316521c96777563008f4247996053afd72148c0f1b50ecd4d82 SHA512 9bfb031cb553df1ec7d685c427c45d41c0370da05523a969f2e37f4f9ef015aec144361e3e1a7f9d05e82d32ffd66fdd9d7b4033c85fa2698fe61851ed0b76ba
-EBUILD openjdk-bin-17.0.4.1_p1.ebuild 3209 BLAKE2B 21ffb6b32e87406df846f23ed4542851c5850e09741b7311b20ff0321c097dd2e3618c978d9e55fa94a88a72766bf54fedb121a9bfc08cf4b2f677f8beb83e04 SHA512 9d1f22bd3c40d526e14c4622a5cc2e7a51a44edfa7b500425a4a438bd7889244239afbbb018e380778f775a03263e6e156bac56c555efa171232abdce48ac535
-EBUILD openjdk-bin-17.0.5_p8.ebuild 3209 BLAKE2B 21ffb6b32e87406df846f23ed4542851c5850e09741b7311b20ff0321c097dd2e3618c978d9e55fa94a88a72766bf54fedb121a9bfc08cf4b2f677f8beb83e04 SHA512 9d1f22bd3c40d526e14c4622a5cc2e7a51a44edfa7b500425a4a438bd7889244239afbbb018e380778f775a03263e6e156bac56c555efa171232abdce48ac535
-EBUILD openjdk-bin-17.0.6_p10.ebuild 3242 BLAKE2B 0dc0c61baef66c276e09556cc3d8168303a72b8dfeb0ea5e1eb95e87d473e4d7cd0b085e17456274750e6362d3e4b7304528885acbeba0ac87c03d18a4468147 SHA512 44e427246d4d73ccba27f46d9bcdceef801a954e68c6ffaaf58c293fdb50455dbf7de6a829befae3adea1df960bda58d7bd416e8fde903dc57afcb72ec6a3884
+EBUILD openjdk-bin-11.0.18_p10.ebuild 3219 BLAKE2B a2c66fc66941ea8bfe036658f09f72b97951615fe31374a005e12397df722bb38b7023407b7ff384f6a1f1d388b1e32fd4f3889298d17a079a4e3a604b3fd4ec SHA512 8c2b58d66c8f16dfb2b54401c1190e0a347095a012711b5ad045627fa0746fe6339ee22dba516361d0dafaaa04359ea018f905faf6d0149f1e4d9eb962007859
+EBUILD openjdk-bin-17.0.6_p10.ebuild 3206 BLAKE2B 55cca941ed6c55790fa186d22fa669a62d4842dd120e27687688b5995fd194fbe910625ae9dfde57c3e1b3dd475f35441cc758212ba1454b099df94b2a9308cb SHA512 7398f62569332ba0e683b7df8f8bcd11bc7a45d4c56ff7164204451dcf7b494a11bc8fbe95cba2b4f8a04d250485b09c14fe2d1cf1b7ec3cbcabc2462352baac
 EBUILD openjdk-bin-8.332_p09.ebuild 3033 BLAKE2B 80676ac6890b24143dd2cdd49f0f308921dcfaed61b4ac89fad69125aa7e3c51b73400bd32411d62805a170ab494511e35e444e30608cc726ac602a4404010b1 SHA512 6555e6b3dd707622012f14bf96576d493e150ea8a2f9c0eb75bd90d1f4d4319e8d9e4ebde6b0f785be538c1fac85a76fd11d24dd9b3debbb353e8decfffd5636
 EBUILD openjdk-bin-8.345_p01.ebuild 3036 BLAKE2B ba10729eea66777aa72eaadc366f72caf4a34e435f559279d6d5b48761e75f51d4145701853152e95b7d68a3293734ee97f0945e7b19fde82a47fbf67fa3221e SHA512 5dde101ef57ad6d632bd6475c447be193e07b7bc60b4a4fb42b567b3b9b98f894e8744027db7b3ba9d4eb624e945b7122946659562c87c62cbfefa4727f28bdc
 EBUILD openjdk-bin-8.352_p08.ebuild 2930 BLAKE2B 5c6366a024f3097f7768b7988b6fe8cfc3c44f7790e8bd8e749ee22286962a0d8a5a91d721f082ef5a5bebcd2e08ede5b6690cc40de66d3b372c8983807bd994 SHA512 74ca8fd5a7e2a564979622539328770edccdd56cee5a8021cf115a05ad49d10ce5431b6a1d4c19ca29f5c683e17115f377ba22d2c2cdd7ebf5befc5bf38ecf29
 EBUILD openjdk-bin-8.362_p09.ebuild 3049 BLAKE2B 24a8241bb9027a998087f6bf517c2a3ff050bba7862df18ef8a60c2a42a2b33ca8e8b86f046cef19b17bd66d09ba13529924bb968a91f3171a641c8993c86de3 SHA512 ea05d1033e512ec11ceedcc4c52c7ba616e2e56036205bf5bcf6ad3b444b140636bfd5a7432bd0aff3e388fd69d1ad55247c775b461674dec9daaecafcc76dfa
-MISC metadata.xml 941 BLAKE2B 16002011c075cd453721b20649521e7370b0835939bf228e3a66cb6994b98d11ee2b0074bd9ead474c8787301d2be44a2c05d2d49c09b3f2767995153c37a69a SHA512 37681cf8ecc00361d9bc3ab5b26defae227a1d95aec0a5f51b39d412e1d4f62bc3c9db0c1296b394c02f81f0b8eb052ea85212eed0319991f372525c0bf26b09
+MISC metadata.xml 812 BLAKE2B 2e299474388a3b17de1552e0b8c75d8d490e272306508f58da0fe03280785caecb07b9605b0ee6789071e88be724329d4096d84cc3f7ce4e12b706cbebaa18fd SHA512 fd007c4cecf046ce3c0910a41b87170cfa5ca5bd3498a319677547667e7da6ff0aa8846139817dfa4bf88f8367f4b42eb0dc8f5580fb0a93cae018465538355b
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 37e5947f7cf2..c09a0d4ca3e7 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -16,7 +16,6 @@
 	</longdescription>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
-		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
 		<flag name="source">Install JVM sources</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild
index 202ef94b957e..a93947256b3c 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild
@@ -30,18 +30,18 @@ MY_PV=${PV/_p/+}
 SLOT=$(ver_cut 1)
 
 SRC_URI="
+	$(abi_uri aarch64 arm64)
 	$(abi_uri arm)
 	$(abi_uri x64 amd64)
 	$(abi_uri x64 x64-macos)
+	$(abi_uri x64 amd64 musl)
 "
-#	$(abi_uri aarch64 arm64)
 #	$(abi_uri ppc64le ppc64)
-#	$(abi_uri x64 amd64 musl)
 
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x64-macos"
 #KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
deleted file mode 100644
index bba49ad388a3..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.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 java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
-	local musl=
-	local os=linux
-
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-
-	if [[ ${3} == musl ]]; then
-		os=alpine-linux
-		musl=true
-	fi
-
-	echo "${2-$1}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri aarch64 arm64-macos)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 x64-macos)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
-IUSE="alsa cups +gentoo-vm headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# Not sure why they bundle this as it's commonly available and they
-		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-		# also has an explicit dependency while Oracle seemingly dlopens it.
-		rm -vf lib/libfreetype.so || die
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.so || die
-
-		# Oracle and IcedTea have libjsoundalsa.so depending on
-		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-		if ! use alsa ; then
-			rm -v lib/libjsound.* || die
-		fi
-
-		if use headless-awt ; then
-			rm -v lib/lib*{[jx]awt,splashscreen}* || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.ebuild
deleted file mode 100644
index 10cf917bc189..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.4.1_p1.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 java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
-	local musl=
-	local os=linux
-
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-
-	if [[ ${3} == musl ]]; then
-		os=alpine-linux
-		musl=true
-	fi
-
-	echo "${2-$1}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri aarch64 arm64-macos)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 x64-macos)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
-IUSE="alsa cups headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# Not sure why they bundle this as it's commonly available and they
-		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-		# also has an explicit dependency while Oracle seemingly dlopens it.
-		rm -vf lib/libfreetype.so || die
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.so || die
-
-		# Oracle and IcedTea have libjsoundalsa.so depending on
-		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-		if ! use alsa ; then
-			rm -v lib/libjsound.* || die
-		fi
-
-		if use headless-awt ; then
-			rm -v lib/lib*{[jx]awt,splashscreen}* || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.ebuild
deleted file mode 100644
index 10cf917bc189..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.5_p8.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 java-vm-2 toolchain-funcs
-
-abi_uri() {
-	local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/"
-	local musl=
-	local os=linux
-
-	case ${2} in
-		*-macos)    os=mac      ;;
-		*-solaris)  os=solaris  ;;
-	esac
-
-	if [[ ${3} == musl ]]; then
-		os=alpine-linux
-		musl=true
-	fi
-
-	echo "${2-$1}? (
-		${musl:+ elibc_musl? ( }
-			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-		${musl:+ ) } )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri x64 amd64)
-	$(abi_uri x64 amd64 musl)
-	$(abi_uri aarch64 arm64-macos)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 x64-macos)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
-IUSE="alsa cups headless-awt selinux source"
-
-RDEPEND="
-	>=sys-apps/baselayout-java-0.1.0-r1
-	kernel_linux? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/harfbuzz
-		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
-		elibc_musl? ( sys-libs/musl )
-		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
-		cups? ( net-print/cups )
-		selinux? ( sec-policy/selinux-java )
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-	)"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_unpack() {
-	default
-	if [[ ${A} == *_mac_* ]] ; then
-		mv -v "${S}/Contents/Home/"* "${S}" || die
-		rm -Rf "${S}/Contents"  # drop macOS executable
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	# on macOS if they would exist they would be called .dylib, but most
-	# importantly, there are no different providers, so everything
-	# that's shipped works.
-	if [[ ${A} != *_mac_* ]] ; then
-		# Not sure why they bundle this as it's commonly available and they
-		# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-		# also has an explicit dependency while Oracle seemingly dlopens it.
-		rm -vf lib/libfreetype.so || die
-
-		# prefer system copy # https://bugs.gentoo.org/776676
-		rm -vf lib/libharfbuzz.so || die
-
-		# Oracle and IcedTea have libjsoundalsa.so depending on
-		# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-		if ! use alsa ; then
-			rm -v lib/libjsound.* || die
-		fi
-
-		if use headless-awt ; then
-			rm -v lib/lib*{[jx]awt,splashscreen}* || die
-		fi
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	# provide stable symlink
-	dosym "${P}" "/opt/${PN}-${SLOT}"
-
-	java-vm_install-env "${FILESDIR}"/${PN}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild
index 0cf393c68643..b0024619e0fe 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild
@@ -31,19 +31,18 @@ SLOT=$(ver_cut 1)
 
 SRC_URI="
 	$(abi_uri aarch64 arm64)
+	$(abi_uri aarch64 arm64-macos)
 	$(abi_uri arm)
+	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
+	$(abi_uri x64 x64-macos)
 "
-#	$(abi_uri ppc64le ppc64)
-#	$(abi_uri x64 amd64 musl)
-#	$(abi_uri aarch64 arm64-macos)
-#	$(abi_uri x64 x64-macos)
 
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64"
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="