gentoo auto-resync : 22:01:2023 - 12:52:10

19 files changed, 452 insertions, 449 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index cfc6f366f499..d765249c2d22 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 d9930a86c09d..3190799364fc 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -6,6 +6,7 @@ DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.17_8.tar.gz 190830566 BLAKE2B fe5
 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
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.18_10.tar.gz 181837466 BLAKE2B df9935b4a2b8255439a0691b06636c4c40cd6d15dbcdf6b722eb57219cf67f1a7e44bf1eee3d7f8b65ca854c83d61a942d8384add454384f5b0f0113767173c2 SHA512 0b8a7e7a856d310ead1fbae214473a11ce41fef00b19b4e5a9553d076d4d6f692852983ea6afc3fb06800c8478e79c510e60d7157e7b13a710663ee01939bfad
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz 175250283 BLAKE2B 4b4fe6a5018cfa40ac71cfcf41c261887890e339d9e5f57aac55f494abb7a4e99263db151d85698690513caf670acfef29a83616e49d6f845e02cef024624fd6 SHA512 98adf9689782aa78d61f485e671c434cfdfae7ba92a7ce0c2401164250b7def2f881e201835e1ca2ab56a3ae4967c0923f4856171c2a4918f7190adf4b5e0bca
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.16.1_1.tar.gz 175833123 BLAKE2B c027ac3c128ee8cc6e62e375c66a642931a9344bd7d06cad6025094a8569d135a2982ead3057da7841ebcc5a02fc8c8db653f8aa09bcc8179122e1c1e6018be0 SHA512 f3af5dc335d0573ed89037a6227e96e75ec2031af6653f3a034b2d5e0737f1edc875aa883050783c6d556ce5a55ce4f9cd7859b574915b994b58fb26d906fbfd
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.17_8.tar.gz 176227429 BLAKE2B 7b8dd16eabec342d606d4a342d25f669d879a7ab259f9b88a2fc95fd11bc0883ad2d21d69881c6e25d71ef500be9326eda4c17c79aa00c075c50bb69b0cf94e7 SHA512 bfedee850260e7d9dcd441832859de59f572626ca7c48eb52ab2122a31f6de3857cd766a582159508a2782dbd63abfa175f32a4963ef72d7070e2749164d7824
@@ -15,18 +16,22 @@ DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.17_8.tar.gz 192983282 BLAKE2B
 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
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz 194100197 BLAKE2B 751034d006335d3c48f5394d797d963b13a1eb4f30688dbae2be29cdc4c21855a8dd5f1faac895e17c0a56c43bd64b0a73bad61b845dd1cc1b0ce0d62019bcb9 SHA512 8d3e285b850b6f5d81481d7d2ffa1951a28ad383eda6ecbede3f2653437bd7d978a4b8613d870613a0b97e76325ee03e97b3b89e0cd124ffdf3c9bd2e16426d2
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.15_10.tar.gz 186328533 BLAKE2B 72f662e4aed529de853e47b848b46c15fade1a8c120f83b3409492801084114724f1d3875fedf1607133192ef5a612dbab828e578bff98adf1605fd990a24b21 SHA512 af69ea99e3d3b7ae84405190a12f788348162fd235aa5df8ce7ea3127d961e015b51cf70277aefa0e29a434ba10876812e997a063c5aaedafa460fc5451783c7
 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_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
@@ -36,6 +41,7 @@ DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz 190792800 BLAKE2B 6
 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_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
@@ -48,19 +54,25 @@ DIST OpenJDK8U-jdk_arm_linux_hotspot_8u352b08.tar.gz 98283632 BLAKE2B 936091ac36
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640 SHA512 adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u345b01.tar.gz 100474631 BLAKE2B 32c98c9b0c97b427b880589c26002fa67f90980b099090a8b43a0c4b3d71319617126b55da7102abe9d15b0b3569fdd7f4288936607258a278fe805e875d469e SHA512 37501b2c3ebe224404c34a847ed643a95ebf85aa6b8412bc3405ff3afdbecb9a69b2324b774d96d9cb5ba44170d84f6ac0026ea66c1074c13ef06c330952c9fb
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz 100508249 BLAKE2B 0fe530829d3205904b2ae239598c6c5d158e1be5c87ee3616b15f23088b40f5d800fc5f2fd5ad0aa9342508297eb8b3b33d0c2d4149e12b6a261be7d57764628 SHA512 9592e64484b62bef89071862eb5a6e4fde412a99a43c0eaf3f412964016ead60b73fde844b4f1909dd4e839cc7509f65184f9f9445a06642365104f642758a9b
+DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u352b08.tar.gz 100852175 BLAKE2B 7732a508bfa18a42f9e476aebcac6c2f0477d5fae1eeea6e0f7a3e48b503de0fd05d306d4c5255194eae8cf47703779e3a3bb99bc731d90a3c1bb171baac87a3 SHA512 bcabd24baad890f3520d0713d12da0327b19a733e89484edade02b9a12b2e4295fcd34c8ebf914920be04abca6213c0973153898c7c1d09a331db59b84700b1c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf SHA512 9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz 102925260 BLAKE2B ce4e79c98f5f3b2119fafd0ad43ca64bc823ff9adf20cd76e4e8c0de34ddc11cce7311d0ffc1cdcaab70632b3c18dca5b57c916a01230b22fcc74c4e8e08e3c9 SHA512 92bafba262a269ec3be7d83d8ca36468ad69d850d44b373c04c92a14c74a9aa89314f2aa68a6565c41b302c60fb8d19f1cf0f3075924a497e8be05e8a08ce95d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz 102942531 BLAKE2B 3e59f7495e7c79e93b39e596f445738b6c809388367b1f41b5925b6f63bd81feff05dc6587d8bbca6c56187f22c048bf108032a45373096ef95389cc1fba7ebb SHA512 a6dfbc34a95f91749db11fed76e918288f2eb64234bc63f1e39db73cce918de419df6dd7a69fc4aaffac559d0b35c9ed2c782ef061e026096183028ffe24ae95
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u362b09.tar.gz 102949829 BLAKE2B 039d35113c156e929ca9b49a2a63ab326b9ed036f4cfe4facfcb88d4cd2984005e81a20c842f2abbd5dce8f9da864908de5379e68b72ef1e0f6f5ccfc241db1b SHA512 20bb587023cd5a6148ad06337cd5fc182275c3ebcaac95f65937e66b2bc75879a225e2fd2ef945ea45ba7886c983df3d24c2f01a1c1f9fce38f265dabed47ee9
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u332b09.tar.gz 107924497 BLAKE2B f1f283b33f2e81a15f6ba01b7c2c63093b8a12dd0c9853ff9a2cea8d5352b6994266e8653135574f59a24da7294e602c5dd2fb3524065aa53e21b8313d3b0d33 SHA512 c7474e6a81d9e44e7c48388917de87733bfcb13c99a6d253ba180ac8b826ec79f1871d57dcc3e2edb4929f2687541156770c7568162a95389cdf1606d8e65397
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u345b01.tar.gz 107934646 BLAKE2B 766fc30b428283a5c4bebad76043e0d6fbdc31c747a09ce4f9440ef1493b4127dd7c0a9d0bf04ca0a6fe9215556224d157355b7cf14e685ed3791b6ca5d226fc SHA512 3a70f6587c858b675adce10063197fa97683157b4e3506dcae2649edeffe32ff8914bddee63a6856c3390c91f97fb79a11ed799f95a73526f48fb96cb92be26b
 DIST OpenJDK8U-jdk_x64_mac_hotspot_8u352b08.tar.gz 107947323 BLAKE2B d1d725cb13ffac50a044a78daf02062aefd421b46c5205069b770b310b2c1403cd36e557ea37de9ad8591ce5f2c5b5eccfba32314987524a4de62b6d16a3b7f1 SHA512 2831a84e1da3f6f979a3b76670676f176b700dbae3cdd5e634056c5f0239b4fdebc6a0ec5cdf11bd930ea10708a6f7ef9c58b46888009c52217c2e0fb324a4af
+DIST OpenJDK8U-jdk_x64_mac_hotspot_8u362b09.tar.gz 107290360 BLAKE2B 03f4ef48266779a9117bc6164b50298a2f23dc66b1d90370da64cd6bff7670cae09340f08e3358d43a5c051bff831020b568994cf59b3ba5a1b6c7938f5db12c SHA512 9923fda6021d5bacd598b13460f4b0668d156e92d0b3972e3746b996e3ee6275269e2deab14f7fd9ce8183670648df936efa9133cbe9b908f67e38b7e907387d
 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-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 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
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
new file mode 100644
index 000000000000..202ef94b957e
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.18_p10.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 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 arm)
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+"
+#	$(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 ~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
new file mode 100644
index 000000000000..0cf393c68643
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.6_p10.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2023 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 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"
+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-8.352_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
index 7834a4a17075..5e6c7728022f 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,20 +6,26 @@ EAPI=8
 inherit java-vm-2
 
 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}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
-		)"
+		${musl:+ elibc_musl? ( }
+			${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz
+		${musl:+ ) } )"
 }
 
-# they have different tarball names for different arches...
-# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
-# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
-
 MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
 SLOT=$(ver_cut 1)
 
@@ -30,6 +36,7 @@ SRC_URI="
 	$(abi_uri aarch64 arm64)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
+	$(abi_uri x64 amd64 musl)
 	$(abi_uri x64 x64-macos)
 "
 
@@ -43,7 +50,8 @@ RDEPEND="
 	kernel_linux? (
 		media-libs/fontconfig:1.0
 		media-libs/freetype:2
-		>=sys-libs/glibc-2.2.5:*
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
 		sys-libs/zlib
 		alsa? ( media-libs/alsa-lib )
 		arm? ( dev-libs/libffi-compat:6 )
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.362_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.362_p09.ebuild
new file mode 100644
index 000000000000..e0bcd77e360f
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.362_p09.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-vm-2
+
+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=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT=$(ver_cut 1)
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
+HOMEPAGE="https://adoptium.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+	$(abi_uri x64 x64-macos)
+"
+# uncomment after tarballs appear at https://adoptium.net/temurin/releases/?version=8
+#	$(abi_uri arm)
+#	$(abi_uri aarch64 arm64)
+#	$(abi_uri ppc64le ppc64)
+#	$(abi_uri x64 amd64 musl)
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="amd64 ~x64-macos"
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+
+IUSE="alsa cups examples headless-awt selinux source"
+
+RDEPEND="
+	>=sys-apps/baselayout-java-0.1.0-r1
+	kernel_linux? (
+		media-libs/fontconfig:1.0
+		media-libs/freetype:2
+		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+		elibc_musl? ( sys-libs/musl )
+		sys-libs/zlib
+		alsa? ( media-libs/alsa-lib )
+		arm? ( dev-libs/libffi-compat:6 )
+		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 strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_unpack() {
+	default
+	# 753575
+	if use arm; then
+		mv -v "${S}"* "${S}" || die
+	elif [[ ${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#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# 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
+		# this does not exist on arm64 hence -f
+		rm -fv jre/lib/*/libfreetype.so* || die
+
+		if ! use alsa ; then
+			rm -v jre/lib/*/libjsoundalsa.so* || die
+		fi
+
+		if ! use examples ; then
+			rm -vr sample || die
+		fi
+
+		if use headless-awt ; then
+			rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+				{,jre/}bin/policytool bin/appletviewer || die
+		fi
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	# provide stable symlink
+	dosym "${P}" "/opt/${PN}-${SLOT}"
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 0a48797c8036..695e50387a5f 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,25 +1,15 @@
 AUX openjdk-jre-bin-8.env.sh 573 BLAKE2B 02f032b60578e95a5f370afce4bec7aef12262b5f87c854a4ffc3844a4db5e88abcfb6e7539152b05e447eedb99c58e0a5944ffc2af82c10b5b0f04e447ea1ef SHA512 79bf447ffb50782348396ed1a64737f0a4adacfc21ef70d5f652db782e9492cde89f2ba740c28b6465eb4a6c32a483b2f50daaee784a03ff3d371e843f712fe5
 AUX openjdk-jre-bin.env.sh 342 BLAKE2B 194a81416378ac4729fc333f40c210bb33dea66cfc2b6a5341aab048c63f2c7c9a7bf9c45f10f5d23e2d7dd99cde80b03e79a79c30d08b6be90d6d8d6e850ec2 SHA512 6690285c5fa3866731ef28e0ff2153395e94a3e37837bf334ebea8fb132915a37002d70457810dbddbcaff78d5404f14818735ab6a722456780add4ad9efdafd
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.14_9.tar.gz 42435138 BLAKE2B 0f972a78221b74be4b8c87845f52d331eb6caf84eef06d291d0cd25ce4357b7072f938fd0390a9c54647d4ddcfe4c0184ddf84583e017e1bf78338b7939437bc SHA512 9ee64498d83d16cefc5a155393d9477bb78338d43a3b4b1699f4358644415a6be5601f7b2a87a82f2a95cafd6485b6db7b30bd0d21096110211b942e95deed64
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.15_10.tar.gz 42471028 BLAKE2B a88fa041ffdcedabbcdadbb1eb4a0052456666ba779eb0f82bc27ea7f2923a1b2e538d14d5f615869e456b1bce48859211134c6bd9d31c2c082068686b68fd59 SHA512 a8a8a9c9f243aaf9b051bd0c35009ec96a28dcf47b53139dd59891a5ff2ced590e56961edb093cf67b8239d92a4b407f631b389fdff986fdb746316f420abf34
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.16.1_1.tar.gz 42705612 BLAKE2B 02b0239a613f0738c7980105cd8595c0bbf456ba13f669dd11071313260d1fdbe1bc0c91e9fc9252cb04078ec7da36fdb4cf8a3408d1afdb7298f88bb75a75d8 SHA512 21af841b9e14ea32e13dd45fb2e693c0dfcbf65e99ebaaee44f14188c8b30c2cd76de816dc184b7bc9f376b26ab6bb9741be84f37bb99bec4dc381aa7ce9ada9
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.17_8.tar.gz 42827817 BLAKE2B b904eb70da1ef73def0475c379bc91790e348cad830783cbd492c386498a5d09bdf8f117614b53c6a708c0aaa5881dd300b144e2d71e99cfa14fe99a05059d11 SHA512 4866c5f06b92e7e82e4427ec012a6e1421ba5e5aaf8624cb683ff86f950eb15f5d32962b585047d571f8a54e6a5df31f222eec15d530bcc4713c63d612d20d7f
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz 42824761 BLAKE2B 481317f316bac10e098d706a04e94b57bad4388c94168da27403e18489f66d322177f7f9b59c5ebdfc6f3e70080550f6f5e5fc922e9b21a9a59dcc60116243be SHA512 07a0483b4536129974706ee79864e9fd737810b396a605170e68c74dacdb3c65e10ccde9073e8ec0c907709172dd2e08e7c454a5bd88cf0e92f879ace1eedbd0
 DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.3_7.tar.gz 45971131 BLAKE2B dc8a358b10b0d3a6fac60f340ee5224c348aa4b2683e5f7b3396eaca180a12212260d45b8347b472f80671ef86a91f764727897146e4d36bc08b24c7920635fa SHA512 27da884a807c980386b7295f7ea5e253c03b497eff6e21e0cb35ea050552eaf9a3f71060cbd1a2f0cd6069a55ae00b43e46edcf09ab36c142587ea2ab781ad14
-DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.4.1_1.tar.gz 45941557 BLAKE2B 877a194672bfb950203d466191c1c220fffcca86559c0179c573e85152b9e63d253891989ed825181f3e034dd9d6f5cfba10986cf1c019e7faf73ad9a89bee48 SHA512 0bea14d42df99771e8e02f705f9233fc666904667607ca66e47be57fb09131b0a9d70b7bd4cc5b322805cc09cb14ad711db60348e9d17f9714884006185a928c
-DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.5_8.tar.gz 46080826 BLAKE2B b6c92f8bad0f8806f7138da0cbb79876b32d0abd0be8fc25c016e555a7c8a9297d63b85ee4c778a812e5fa3bce7b48e320285f4dec93a6176498ab52d111632a SHA512 6d228cadc7ecf46deb571124870a6d37604759024de1e4e1df9f45c86d988326a91799e3ede866a1fa564b5d73ccf859888f640bf6a9c8c0596f6ac75c4a8241
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz 41317897 BLAKE2B b96b39d4b3f7fe54f9b04698d4f24879ce617e61ade298b7de1472cb85fbf7d5f297f009c0e881a17bcdaf9baaf3187acef531b0ace97a1f2ab099811995c815 SHA512 4a3acc1330056011f0097aaca77858779e2c89d214598ef66736956984204b8de804549e42c51f8392806753f3d534d34ad93ef6df9f2f45a369e04f6a0694ac
+DIST OpenJDK17U-jre_x64_linux_hotspot_17.0.6_10.tar.gz 46078462 BLAKE2B 2d0bc958f64da82e82b3a8a9d6bc686ecd2a09943e851f0f1a8efcec7cf0135b76a65abfa7f1175d09bc42583d151a4161d891a9861050751ae0c8aa4b1bbdc2 SHA512 253a030ab87e949091b24bacd638a91c673d775e76f3a83e8ab0c1824f697516405fe8fcf7d3b460bd25ddbb441685fa396b390e7ab8bc802294ea36b4700fac
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u332b09.tar.gz 41336220 BLAKE2B 52eb9aa2623335bca7be71d1aca6b4292a029554ef9f9e0e1209a7fa0892931c37b670f9f90586d4ff3cd35540a3a7cb230f20789481836d20f04d4cfcc56596 SHA512 c62002aa1a28547b0b0cefea3f83af2cf6507002bf296b1b83bd04406f4c362f4c74940209ebbd3803513395bec7503882aac7f8d35dcbf6a6e02e9155a53cdd
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u345b01.tar.gz 41336188 BLAKE2B 05c1ff3f0561410dafb88f1ce1486decbe56f528cebde4f5d05d589e5a7c706e84bf23f89cda68b19212dbd9b109546a7b78b407a8453c9f040b9e95f5f9c35f SHA512 15cb0be04c9a516476405107fc472470b4576b3893aca8f926b8f007fcb21b6eba1d87a52a806ec698cb3a8b17bae8f557445e9201be2f2d7246a67e28df0be4
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u352b08.tar.gz 41349408 BLAKE2B 98b4b57f6839b09bff112894360587f5bc745506830795d9329e1db26cf676a77cf7d06813e850c44619b1b03d86926b98bdc4f3672d2bb73c1dbb081ad47bae SHA512 36f76d74d69afc488e3d992f5f97d522c22736999904a6045205da9d514bd02d5f00e21e8e5344632d80fd85d50a8496c9950bea368b9a6b332cd5062134d2b5
-EBUILD openjdk-jre-bin-11.0.14_p9-r1.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u362b09.tar.gz 41359704 BLAKE2B ae4238725544b03abdc32f82fcb1e13fe2aba460c13a48ccc8ccd608f1e8b0f5ac6036b06e941e89b936f01250a4fc3f6fb0f9d7eb5ae9129b8cd5de6c1da33a SHA512 6cb0bdc28596e23807f3e7f31c40f095d20395492bf30dae26a735686f82d9d216110403d59c769700a23dd3187a2603832bd84204051800d474af24c68c8cbc
 EBUILD openjdk-jre-bin-11.0.15_p10.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
-EBUILD openjdk-jre-bin-11.0.16.1_p1.ebuild 2002 BLAKE2B 143d1ded658c5d98145ef185d859152e60f648f79c22803d5c0c6d9250892ee3964f9fe3cc99553aef1e863cd9068b19b290162b63d0ebef8fdf15f001f1cbbc SHA512 a89e0a80bfe0f7142d4167a88f7331075d202253bde9fbb294c9173f39ab3b3492e3094679d545339eb6ac221fc1ede3299104871a127b7e16eb90a73f020cfe
-EBUILD openjdk-jre-bin-11.0.17_p8.ebuild 2002 BLAKE2B 143d1ded658c5d98145ef185d859152e60f648f79c22803d5c0c6d9250892ee3964f9fe3cc99553aef1e863cd9068b19b290162b63d0ebef8fdf15f001f1cbbc SHA512 a89e0a80bfe0f7142d4167a88f7331075d202253bde9fbb294c9173f39ab3b3492e3094679d545339eb6ac221fc1ede3299104871a127b7e16eb90a73f020cfe
+EBUILD openjdk-jre-bin-11.0.18_p10.ebuild 2001 BLAKE2B 98d53b34c852c12d05d91388863aeef3a6976a57624a6218a07224b3d04334a8970027bfb2b3dec37cada90489fab5b55007f93caccedf4b65b72901d3d3a96a SHA512 be1ceaf5466a9dd574925386d6bfd3e5f82c32dc4d069be22c650c4027ee3749115d7a5940d770e7ed26941a2ac45fb851b0a0d83c352efcb5b6252f12b344e1
 EBUILD openjdk-jre-bin-17.0.3_p7.ebuild 2012 BLAKE2B 9fe6d8bad9d14ff1c5a559fa4d0f1b5f59548058049f4886eb6a94ddc5708218c6fa7dd3c23454999d8acc5b2fa13dacb0ac6682c4ae630c2bb743066551034d SHA512 6cb229e2488081126a870842bd7d2fc4bea0a894746db28dc883f210e2c3bc76bdd073ac539617daec12553d98ce2b64a4b9cae343052609f5690c6f2c76224b
-EBUILD openjdk-jre-bin-17.0.4.1_p1.ebuild 2002 BLAKE2B 143d1ded658c5d98145ef185d859152e60f648f79c22803d5c0c6d9250892ee3964f9fe3cc99553aef1e863cd9068b19b290162b63d0ebef8fdf15f001f1cbbc SHA512 a89e0a80bfe0f7142d4167a88f7331075d202253bde9fbb294c9173f39ab3b3492e3094679d545339eb6ac221fc1ede3299104871a127b7e16eb90a73f020cfe
-EBUILD openjdk-jre-bin-17.0.5_p8.ebuild 2002 BLAKE2B 143d1ded658c5d98145ef185d859152e60f648f79c22803d5c0c6d9250892ee3964f9fe3cc99553aef1e863cd9068b19b290162b63d0ebef8fdf15f001f1cbbc SHA512 a89e0a80bfe0f7142d4167a88f7331075d202253bde9fbb294c9173f39ab3b3492e3094679d545339eb6ac221fc1ede3299104871a127b7e16eb90a73f020cfe
-EBUILD openjdk-jre-bin-8.322_p06.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
+EBUILD openjdk-jre-bin-17.0.6_p10.ebuild 2001 BLAKE2B 98d53b34c852c12d05d91388863aeef3a6976a57624a6218a07224b3d04334a8970027bfb2b3dec37cada90489fab5b55007f93caccedf4b65b72901d3d3a96a SHA512 be1ceaf5466a9dd574925386d6bfd3e5f82c32dc4d069be22c650c4027ee3749115d7a5940d770e7ed26941a2ac45fb851b0a0d83c352efcb5b6252f12b344e1
 EBUILD openjdk-jre-bin-8.332_p09.ebuild 1832 BLAKE2B 31dd2783dad44148857303b74c82b556d1360338b80747f36fc19052c5091ba7106837777b6bfffb088b5c31fc4072529cdea994cfc35b4f56bc032d5830a000 SHA512 df9a819e9673d952422d9dcee7d1f901cde3982dae1e64ce4ddce39b28ae7eae96d1598718c311412d9727a977ad4ed1233e43c933564ef0e9afd7fc97817d56
-EBUILD openjdk-jre-bin-8.345_p01.ebuild 1833 BLAKE2B 3a7cf0e521421f430068e35e9e5817b7f50ea8036c8b2ef5f7708096f40baeed4d6eb9df93538c8eb3d949d477c553e8ce886409ee4581513c4e935fb672d29c SHA512 06250bf0e366cece0d0782a9f66b129990699819a7e6a1bdd4b6ca7fc8e1268ed26d4015f1c925ffb899d87226f8c7ae22787e08851e00a9e3050836ec44e70c
-EBUILD openjdk-jre-bin-8.352_p08.ebuild 1833 BLAKE2B 3a7cf0e521421f430068e35e9e5817b7f50ea8036c8b2ef5f7708096f40baeed4d6eb9df93538c8eb3d949d477c553e8ce886409ee4581513c4e935fb672d29c SHA512 06250bf0e366cece0d0782a9f66b129990699819a7e6a1bdd4b6ca7fc8e1268ed26d4015f1c925ffb899d87226f8c7ae22787e08851e00a9e3050836ec44e70c
+EBUILD openjdk-jre-bin-8.362_p09.ebuild 1832 BLAKE2B ad07e15885ed32db182bcf7207dca702fc99ad4b1f106dd985e6916e2fbf837f0cb2291ee70ad13e0a84aafd614a5cb60b0d870f2aad98e376638ba0f0511a0c SHA512 6410d06da667332e2374f03f18cc62001d8194b5a9cd7619aebcc332698514e76981c3419f1aa78b1dedaa58b9907a52469c06864a214a82f5d50df1083d4ed7
 MISC metadata.xml 896 BLAKE2B db8489d7738bb5444ee789ae0dc516941ece1b814ce4c4d0e12284e4027315aa20b141027ca6db8aae7ab6580d881e79bcb1b4dffa8a890f75da6d7177c7c279 SHA512 8833e637b8b935247972eaf7afbf3787cc17013080d9747defad4784ea89c2b147d0f2284327e9ade30100594a0d1e638f0ecd01f0375101372028dbfd0b31a3
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
deleted file mode 100644
index ae3ecf2e8fe9..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.14_p9-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	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}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# 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
-
-	# 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
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	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-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild
deleted file mode 100644
index 43ec32db6c4d..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.17_p8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	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}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# 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
-
-	# 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
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	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-jre-bin/openjdk-jre-bin-17.0.5_p8.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.18_p10.ebuild
index 43ec32db6c4d..7e2efc602026 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.5_p8.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.18_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild
deleted file mode 100644
index 43ec32db6c4d..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.4.1_p1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	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}-jre"
-
-src_install() {
-	local dest="/opt/${PN}-${SLOT}"
-	local ddest="${ED}/${dest#/}"
-
-	# 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
-
-	# 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
-
-	rm -v lib/security/cacerts || die
-	dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	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-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.6_p10.ebuild
index 43ec32db6c4d..7e2efc602026 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.16.1_p1.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-17.0.6_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups headless-awt selinux"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild
deleted file mode 100644
index d4b6279fcfac..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.345_p01.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	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}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || 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}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.352_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.352_p08.ebuild
deleted file mode 100644
index d4b6279fcfac..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.352_p08.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by Eclipse Temurin"
-HOMEPAGE="https://adoptium.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups headless-awt selinux"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/glibc-2.2.5:*
-	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}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}/${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || 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}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.362_p09.ebuild
index f337effa4a4f..1071fa2afe06 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.362_p09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 5fac4728a518..f8a237ce10f0 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -27,13 +27,13 @@ DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf18
 EBUILD openjdk-11.0.15_p10-r1.ebuild 8425 BLAKE2B 71dd261987e7a0690b685211b645b9ac53f3b8e01cba388f82893b4bb4afc2ba69c7c4a8fd2095d097f0f0cce613d7ef9b9f080a010e30a72746990a11745747 SHA512 e1d242e838f10210c9bfaef0b2ec70f59f38bafca7c1d22c2bdc7df46c22fcc3d48f27468a02488f415fe765e5c418279cee320e55fe6eb13cbcfddaa92ae098
 EBUILD openjdk-11.0.16.1_p1.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e46283b29c17853f40c08f81939cef0e5f1aa7e2c99535d776be13f37df6e9e5f51762a861c48d2bec9c6bda6d6a99e0cfed SHA512 f4598d99b1e26d1f08cc7c9aa5a8f93424665e18bbc913562460a080738b5ca9d990618dd47206b161f81908efdfcb3cc6444341753c1b5dec83645156a58b60
 EBUILD openjdk-11.0.17_p8.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e46283b29c17853f40c08f81939cef0e5f1aa7e2c99535d776be13f37df6e9e5f51762a861c48d2bec9c6bda6d6a99e0cfed SHA512 f4598d99b1e26d1f08cc7c9aa5a8f93424665e18bbc913562460a080738b5ca9d990618dd47206b161f81908efdfcb3cc6444341753c1b5dec83645156a58b60
-EBUILD openjdk-11.0.18_p10.ebuild 8429 BLAKE2B 42349a655c8d26d28cd1ccb53b483ac181698d6d27d2369dbc06046333d47c1db94046100d6a5806009cae23b6b890663860d6c2f4755ebf77dfa08f37bb94f9 SHA512 2d638aa6bd7d58685392b339495a52aa0b73c818f3b702e3d9bc6f78b9bd9de8b5fbd50d31f1888e20c31aae63fc789bc182a9c596d2d5b44a5fc2c2497c87e5
+EBUILD openjdk-11.0.18_p10.ebuild 8425 BLAKE2B 77168c2472fcf6d1cb2a1971362c6c326f42336a6894724f72960ce5ec086afe2f366c1023d17620b8430ec451b3f8023e25f57684167b621961fb7a2d9d0289 SHA512 9f7e5b35f199623f70948dd0f8e1176f284a24c0e3d742ccb39d0aafb11fb8b7aae131b301f12e78ab2f9a55ff8c0330d66fee2c8b76355111be629d5b1faeb1
 EBUILD openjdk-17.0.3_p7-r1.ebuild 9182 BLAKE2B b398b29f7dc72d8e5afcfd76552879699de72e748a288ea44cfdcea86703f764bcabf3e4dcd585d62186bdabb47ff7b3f3fc529b1beff3ad19f1bf0ec223e5a8 SHA512 6498f31530c69a7b2129748d2056cac6f4a0420566af27ef1a8f5918a4c2973eac9c162acb646314f7599cbcf9d825acfdba06af39ee2fc6db578d62c2353ebf
 EBUILD openjdk-17.0.4.1_p1.ebuild 9147 BLAKE2B 82f18b43d61b3333e064dfb31044fc6cb7d1ad3ef7694df275dcf3bc4e004a76c067d1652dc45c7f11306e14e5904944d84dd377a964c0908b9cb1f3edb09ef0 SHA512 3e14c36d05a6a37ede1faceb5dfb1a5799910004c627634864f7b0a769a54b2798d697f75c84bf03ded4d61c028ce274a8eb9ab495e1c480fc4dc24a476165f6
 EBUILD openjdk-17.0.5_p8.ebuild 9209 BLAKE2B 9e9bc4c14e053300df1ab19cde9c84ec81b44baf84c08f49e83618c0dbe8df4e70e3d0750c034f4d51eb9eb7455afafa365b819cf30537bb8c2bd91f9e1e0049 SHA512 e509473f27d6be8ae0796935d15abe62fc7a48b4899dcd264d93dbfd4a0784d11c4483c52ba7b4b5cfd9263cf73a4e87512795c966951d53aed63196ba7142a2
-EBUILD openjdk-17.0.6_p10.ebuild 9209 BLAKE2B bc5acfae827462466d0951d93fccc552f15038bc2c72215e6f79d97061ad76b861d16e335747b3e1c45511e0208ea3810d882e9bbbc408e5c4582e90d40ea0ef SHA512 b9452a80901ade42b16c9a9a19aa8d8e4415aa776d02af8accb885422ee9747b0d0782b59458c85eaa6304c6ac70d64d79177418652f05d0288039841780d2ba
+EBUILD openjdk-17.0.6_p10.ebuild 9205 BLAKE2B ab0ccdce211278268b3c8b2389c03e6cc8a3b50488915058852f924734198e2d491b57e0da671f1b03c7cc2307c9e6386f953cd46b5be6ef8d3652713745d7a2 SHA512 0279d731b194436f64821da2b36aac5cb3810cde49db15048aca20452a5cc770eb58fd4e5b84d530474b18145bbf55568916107b8cf27851bd9b959133f9ef91
 EBUILD openjdk-8.332_p09.ebuild 6183 BLAKE2B e1519d397a5bbb99c91485181af982d1ef6ed674a51e0dff54426eaf1a1222cf38d2a4b30990f33cb868a6385ce4d433fa6b18e9b41db381259d2bfc5e421db8 SHA512 ca2653a9f7f74bb057f8c0023fa7a7b7ab9b367d8571bf5db7f2532939a0bcf7500c062628cc5055d1ee58e28a666999e0df5da5351c2a1c609509a0a74c272a
 EBUILD openjdk-8.345_p01.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc
 EBUILD openjdk-8.352_p08.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc
-EBUILD openjdk-8.362_p09.ebuild 6187 BLAKE2B f2ecf3c98b16099a6760383f9961eb15b6974919bf04d4b80c2e59a8a90d2ec2d0956387c4fed31dab8215fcd96a38ade1afc97565f1413d67af8d6d3d0a9241 SHA512 1b816f922fd955ca1bdd9763c892dcc6eda76e443bf6371e318a9c6284171a5f95dc2977a62066d58168479ff023044315c61909c25d087797030bcedb9214bc
+EBUILD openjdk-8.362_p09.ebuild 6183 BLAKE2B 8ef098742c8f8e6b40fd93d715747dd17227829e804b0061510d9c6ba31cade00bb84c929395de8f49ec57b52a028bea583cc820d8cc9110e49d4a2798218d2b SHA512 5e973ebdd2f750aa8600a435c5dba52d0c9e5c555c3215311d6dc07268bda3c29fbcfd36039374aa1fd7957872d52e6b97c38f3aa782b84b116e2f5a544a6b05
 MISC metadata.xml 1736 BLAKE2B 5911a98287022f27f1e0247e33b483981aa4d7a21c387305661039b5d195c458ff603c1c50e54dfb1116bcb932f4bdf09e191130ed6ea3c7c19fc698e4c70730 SHA512 e120118ace1e053d7e3899343dbf82ac54d7758caaa354f4e29c68f3a705ba61cfe545334441b46eac425bf2b81d2b1c107890c3ca6bfe96c3b783fbecc7bbee
diff --git a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild b/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
index 94093f0f4a24..3abe384bf09f 100644
--- a/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.18_p10.ebuild
@@ -49,7 +49,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
index 4ba8d2956eb3..d021fc38d7a1 100644
--- a/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.6_p10.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 # riscv patch origin: https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.362_p09.ebuild b/dev-java/openjdk/openjdk-8.362_p09.ebuild
index 95b16bb09f4d..8445e80ea54e 100644
--- a/dev-java/openjdk/openjdk-8.362_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.362_p09.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://openjdk.org"
 SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source"
 
 COMMON_DEPEND="