gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-java
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
40 files changed, 410 insertions, 1899 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index fec72f0f60a3..b8d368412852 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index a0e6736645b8..ef143a7d4002 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,32 +1,17 @@
 AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
-DIST icedtea-bin-core-3.13.0-amd64.tar.xz 62068456 BLAKE2B cc0c35701d572b0c540a18060ccf9330504b54d6316898a28d306c3380e2f652c1c72ea256b5a11686852e0fc8e5918e80551ec03879d2522ec701bd99b4ff20 SHA512 ce506828492951ca6468d883ed2dcb3f05e6ccc697e6fc410d8147a2fff27ebcdb44c194debe017dab5145ed39b14a3acb85c62f1d003091a899cd74d495eef6
-DIST icedtea-bin-core-3.13.0-arm.tar.xz 58151480 BLAKE2B 0709c3797defd250777a4aaa859b6d13d2e877f3a85db9ae5c788caeb5834ef5f825e60b4fd912e72d1f5c191841c04ed6737ba3a2ff71bef4fb3e8d0bc258a4 SHA512 c89f5748e41a27a2f091be9b1d6911ce38ff63c1df3c1d8f686e930caac61c5598babd70054136f47acd6a789ea559b71d1811d3066a02b8e864bf289a55013a
-DIST icedtea-bin-core-3.13.0-arm64.tar.xz 61700464 BLAKE2B 333202f47b63ae050aa4375e38a33a649d898de5b1f95301ccfc38d5a3119e5371e944f6a1bec23b5e26f097a4888cffb199e279622b568989f0808b0478c54b SHA512 17d9e858d2677b1fecbdff7b07e296e797ac57f6692ebfaf2b1d38dc679fcf1bab0b86953529d60840b589a4fb5ce4c7cbde906f011842d22097a5bf02512155
-DIST icedtea-bin-core-3.13.0-ppc64.tar.xz 55002324 BLAKE2B b93312e3e82c75d2611f6907c57046fc4dc1498be989fde841a43162c381247fd934c4c3d83493455f4aecec338cb343e30cf26a313cd0d26dcca9e76ee2a2d3 SHA512 c04d0afe3b5b9a592bc9d9d26cc15e920edc6a6646337f969b889388d0ae08ddfdd84435076538b27106dc7dc1edc31d7dc84abd744de927d403e8fcde0fe742
-DIST icedtea-bin-core-3.13.0-ppc64le.tar.xz 55089960 BLAKE2B 915a80eefe41dc5cbfa7baa4db133fda0057a43e2c4d4e5c042d0ec2b8cd174fd4950cf66ec60e41f038036a09b309533ad4cf647cc9f1c6641ac040d38c6afc SHA512 a914559df5981cc88d54fed48c013632771b094b49198fc742718c549c0188846a399d1fb28710bdcf1b224df6e5588aeb2d29feebd523943759e3f3fff4b20e
-DIST icedtea-bin-core-3.13.0-x86.tar.xz 61579520 BLAKE2B 736941e5b41c4f0e13f5d60e4cefe716c7759fd4eb77e8cf7bb831c13525e8d007e5039dfb15c75ac0c9a18bd3d037564eca2bed4a6229c598f8ea8d92aa58e7 SHA512 d0f70ea72a55e5abfd459f4ce7eb4e4cee6779860c6bf95cea0bf682896cba2c2e836c613d80c5f90cf5bb14ae9abc9f0692aa4cea3bb0f6c245f8f21c842fe7
-DIST icedtea-bin-core-3.14.0-amd64.tar.xz 62155444 BLAKE2B cfa6a11778d159026151fffcfa7189fe45d23d22d810375f36f237afcdcd646be73788cb5cfa0a2e4822026ae58456b69f6f4baa03c7d143429f2ffe55d73e19 SHA512 2d29f7f61ef67d93b57318c34fbccf99077f40c6322bc774326e33ba11c8dc2a07d34c8e9d8b500feaeabe4aa45644d03140b57a3996261d13da9f9bf85ebf5c
-DIST icedtea-bin-core-3.14.0-arm.tar.xz 58158680 BLAKE2B 3899136ccb43550129a33996ec50f7b60b9b3d118f758e3d5c51a837f6222033a32677fca58f8c95de12abb4b1b8940190a442d9b1901808307634662af7aeb8 SHA512 8a56048439f50bd01ce4723f8f9b97f764f655370927dad0a92db9d678e8eb797ce3a6d813a247f60d4c38ae1a3de3ab9a3b78341d19977ef05d939e85194e67
-DIST icedtea-bin-core-3.14.0-arm64.tar.xz 61710384 BLAKE2B f02c68f71a057232f9a8ea7476b476a376c0bd508b53f1043dfc6a6f86b5701e50d0d6be7d627436c3cff931ebe3c56f0d634196d8e1b96058142421214d525d SHA512 853b7ef0d21d0d9645ef3bc4b5cb24ed43ca71687d2630a10d3087a4ea82855f98cc7c8190b0de62a746cfa214489c8ac3afdc17dfc13dbb61dd4c8a908da31b
-DIST icedtea-bin-core-3.14.0-ppc64.tar.xz 55154368 BLAKE2B 0a509f1ae6ef885c18cf15a7c4dbe984650e242ea820aa65602cfc1a001f0123151fb5c33f25546391c9a62cc735c5a6a6cb98ef97c61900d65154c5b44ab3d2 SHA512 f6b19b8e7dd80df8a162665d7c3dcc8f7d739fefcd1e6a1e8d588cbbf7de08240ef49c6542524bcd173f7150a1ff5d752a9c7532dc6a9b37954ea29928bf123c
-DIST icedtea-bin-core-3.14.0-ppc64le.tar.xz 55152852 BLAKE2B 198dffad2beefa5fed0fb0a9151ba68bf4f24e8dd1ff2a430983ecb72131d82119423eba6192365620731e030a58b60bb3492b34e2a87d19a58178c43e69853d SHA512 8ccfd5ba3ae3d0a7125b99c52db7ee37229f9071209e2011023398c3dd4746e7edda92f361427667739b298ee2d0de7777bab4346cffbe6572f2729e59971ef7
-DIST icedtea-bin-core-3.14.0-x86.tar.xz 61674516 BLAKE2B 9297b3192985e1925f732c38229854781ebc61a49b487d147380c0fcd088601908f59488f8795f2c9069d103613785082f0fe4e227659fe3916d807a6622c3bf SHA512 ca61c53a1a424a059b4a0b2b8fea8fa2a8ab9cf1e3dc8f5600b89b29f280f71841a7b853bfd1e88d756211816e733aef8fb232fcfdebca85978cf50c9026f0fb
-DIST icedtea-bin-doc-3.13.0.tar.xz 11641004 BLAKE2B de8fbfe42a214276e1cbb60d4567c0d06b03078ff3db50611cce5a7381c67d0219e74ff53a63b900f6353b72ef8ec943d80c4271769a058cc191ae06f9615840 SHA512 2b786ed12424494dd4e8018b5a41a558517f2614cd6dc6f59fbf4b9be5afd94e76e0c3d0e5a170d61c2212570b9d68ca9b88728e5eacd4baf2448052d782c0dd
-DIST icedtea-bin-doc-3.14.0.tar.xz 11406340 BLAKE2B 249832aaa0093f70c8bfff78bfcbe6fe32c3e6210789e1f7993d24098d467fc0b5dba505b58135da82a3e55a357891a90a03eb8032b4c4db9af15d3c16915db9 SHA512 3665b702f25e548061970a1078c4f6fb6b412bbcf59391ad04850d64cc3a664357990ad55ef1ba0a7e1fd214b23e408ca59314ad79ca0736e0f1dd94d6f92ab8
-DIST icedtea-bin-examples-3.13.0-amd64.tar.xz 1854064 BLAKE2B ca2b4fc55561843a081edd3de935f9f78f0ce072b22fa758caa6ff323182e1b295ed777d8550645c6f954f17dfbe8b932d008698b9767f2ac1cdee8b96c1a90f SHA512 906f9a83174898b47616428d797b2ea0c96c3f21a6b0c630895950292fe69ed6431aa3dd066e68e70bfd9f267e22620f1775505e0175b8ed43006c05715dbf76
-DIST icedtea-bin-examples-3.13.0-arm.tar.xz 1841164 BLAKE2B 4b5668055a3faab4ab25383c54111e5add5056e21fb84d0f3e360faaef102c94975c8991ff4548dcc41deec5ad6450177d3da8e0cd9eeea112bb9253cbc43b08 SHA512 d0ddc2f82a4bac79830a5b36264f666f33833b6bcfbdaf815936be469446274ac969c33ac975e82478598babe04025d0a68918e1933ff1c659d23608a3129c2a
-DIST icedtea-bin-examples-3.13.0-arm64.tar.xz 1852148 BLAKE2B 1126bc4a17b3224640160066a5dff4d3a47be7cd2f100f978d39f2003a08966adbf7fe4b3611205677fff351db174b4162da2260fd18797c7011af2b8a1d0b65 SHA512 5384f3e0410818ef0565bdef574c19b1927d74b5ce52a8441608cd4a56d598a65a28ef1df43469a2bc36f161c7c4920f71d09c0e0d0b828b4ccc1f9093c77bb8
-DIST icedtea-bin-examples-3.13.0-ppc64.tar.xz 1865612 BLAKE2B f24e19d55da3cc588c61b4671b3494e42e7864efe624199be5cf7a1687724bdb86adc1e29de6f1f240bb1d21dc31b4a78757632a28960f3d235aa69aaf286ea7 SHA512 e86385db7f0d81ca9b73e0ea86e55714632aff87cb6fe959ec15fb323c3981a4817e12a69ac7dd2a1d0aa3fe10630ad104ccf70aa84f3318274d43c8b09c16c6
-DIST icedtea-bin-examples-3.13.0-ppc64le.tar.xz 1866904 BLAKE2B 35d86c859010608c276fb7358bea8a7b66aeb423d7a8479a2ca919907c91e2709ce915a16d8d4c9cc6796c05fa12216b96ad59f67bf761d58b8f140878b89d49 SHA512 1e10bd09028cba7d19f1a9d96f8b835cd7fdd8059cfab443d769575f2a0aa77f39df75943a2a446fad9d52481c7bef45846b757d375848c6d0cde329609e8bed
-DIST icedtea-bin-examples-3.13.0-x86.tar.xz 1860412 BLAKE2B 8c4f729b19e2badf4dbbab3c434f9af50bbdf792950c1c6582a4931afb6d0058c40641d15873bb3539f630df1ee3f4d1474627ed22334c4a5543b32e6c7117e1 SHA512 6f665210039af9ef2d68d4e5bb61e7dd553d2894d6f46dd56d07b36c43c47d43c0574f0fe07f42d26946dc89897b062bb41a77e0c3a4937167daddcde0f5c164
-DIST icedtea-bin-examples-3.14.0-amd64.tar.xz 1855132 BLAKE2B 751c5ce41983960a0e08c7e544cf04379a591ef7077ce72aca33bfe5237a887e47ce00f2070d6bc2bfc0660ab0ac15dd1c408dd46f9bd66b2d70ad6d06235027 SHA512 96fd2459d61d5fafe798688f1b4e0c352975728255c779a91f640bbbda01149e3522025db0c1e01b9f14200be63f242eff73689c3c81ae8fb14930e460ab9c93
-DIST icedtea-bin-examples-3.14.0-arm.tar.xz 1840984 BLAKE2B 52c58563f24033203f95a4a4ece6a44e056aef145fae4221090c417c5cf091fdb79cf38d847c80f67c79711514173f99a2d62eeb39a4a7811b3fd1c8b46d235f SHA512 1b8c1738a485fa91e3a48835fa6ca8570bf4b428bd96837dd3c1f713c73de596ab874610a7d570fc54d31795168483912462ba2a8566b798265e351f8352fe5f
-DIST icedtea-bin-examples-3.14.0-arm64.tar.xz 1849808 BLAKE2B 2faa1faa65662ceb0ccf13142781ff01d2fa8601cbff0cdf30a8f53247012d3d68355780f77701804eb82e4b26082977996e10ab38181f372318165d3e08c624 SHA512 7b09e125ae6d65096ca3ee0165347336a36dc1cd016bf6fbfb3fadb0530681b5291a93429bf820533740306e75d09632bf3a1071609951e87d447d126ead2737
-DIST icedtea-bin-examples-3.14.0-ppc64.tar.xz 1864844 BLAKE2B 393f501701f6255692026fee6f6f03758828ae9771de2527ac00fb5378f4d7e8e8c15bd2f3a25d5f27dac0e57dbd19f9b93ca1b8bb453ee7460bfbb3ffa3eb74 SHA512 02c93ca019ffd281b54747c0dae47b5283d4f96b7a174dc2d433b803ae57afb04486ea6c8cf59bce34fefa64b0bb3b565c7e083fe606d161a5033bec06a25c5f
-DIST icedtea-bin-examples-3.14.0-ppc64le.tar.xz 1862512 BLAKE2B 2ebc865f23fd94c9065bf94d718ea2eea45f3c513d066f6513f190d83565378975491a66caff521e85e3f1307178979b0435487f46373615c1980c258e600c0c SHA512 9fff9c5b490010b06b695a864ec8ddc8ce44acfddde104fcb83742d9ecff70906669e02da36cef8e903ef1ef923cf9e92342daafde47e6fa35885865dd079eb7
-DIST icedtea-bin-examples-3.14.0-x86.tar.xz 1860288 BLAKE2B a2c8eb4cee690615f624fa97e0360cd25776beabbdd52089747fa48ab0f8b440a776e601455c87803f36889d1caeee6ffc44a43c9d366e2913bd07f877997a48 SHA512 862f6a23e9eef4b271491b19b9c4a98baa76fead458d6230424693151695b0a6e082a38ef4ad2cb05fbd80db4967840de718898cab25269a10bff3ea5f5acf01
-DIST icedtea-bin-src-3.13.0.tar.xz 45821508 BLAKE2B 9054dfbbf243170d42d27579d56caabbc714951f28bd3e93e4eb4f1060649f87f81ce19b6aa0925f70e436aa415e1a4be88e5eead03f146ec360d9737554590b SHA512 db50381d81f7b02a0b4f42eba505874aff0ce8bb30fc72377a8ad99b2b97dfab53382603fe96014780c9862a25436918a27389e538d21a634af6a26845fc30fd
-DIST icedtea-bin-src-3.14.0.tar.xz 45781864 BLAKE2B b4bef50c7c8ea17cb7e5c60ea17c31120181d0616869f2ca99676328cf1ba3eef95e5750301c1dc8d1b0024ccfa56088aa0ab4ca26bebf7253de7d75cab5d346 SHA512 00e0637e825073d33099665e2aff95c1a6555fda7177c0c0057298b5a74263acb35f98db946877ddd82c1d1bfb421a07da2801c8d3013ebb99e1a0229f9781ea
-EBUILD icedtea-bin-3.13.0.ebuild 4587 BLAKE2B 987d7429ab63c3fe5a4cf7cc9fab95524fe89fae5f82800a4c8cc9fa88104acfa38b988cfbe611acd24fb164a9147bc9bee9f426e76a64ca8f8525cfb935749d SHA512 6c6b1caa8fb657a7bee206c517afcbdeb6349c031131439ff29cb90aae92a14a931ce2149470dd9c26125902f6c8403c070fee4d182c03360e7318a91f03cb44
-EBUILD icedtea-bin-3.14.0.ebuild 4587 BLAKE2B 2941cc41beddcf13c2d7f9e6dca721b1f03af83582a3e3930efe445e92c33408f3fd6d4b50d1c04cf208e34992d6e0039e9b893d3cc58f2723d7ddd1d13b1068 SHA512 dc51e269929a17fbb230cf214fa0e7332181df664c57baef7ac2baeb4c76694e4c8ba6188f8a2c170356a54caacc57991b505b701d8699bf02c42836f9286c86
+DIST icedtea-bin-core-3.15.0-amd64.tar.xz 62196772 BLAKE2B 0da09f58d785c3a9d8acffbe1daeb1d944370a5256ff85f4a8b92d48f465ad19d1ae6eb91729807aa67a43a00e029e9d2978b7848f59bbcddbd40252da930426 SHA512 6d9415449b5c937357f1a1b7610658446d1ac9c07a0203e02f89f5ca2077712ca59157f35f02a106674aa17c6f3e0c9b54d983c3278ca0eb8c1d25d639293db5
+DIST icedtea-bin-core-3.15.0-arm.tar.xz 58228516 BLAKE2B cc975c461ad1246257c993434035e679e57193ee70b073a072a15ba9b1f3b00848138092ad427356822a216f1142685fcfb31f4e36551846f5298a2338abc215 SHA512 517f73b41ac93dead8896b6c0894464ae2d3cae5d249258fe7426817947d1332245de5be60f027e5fb92566e062ea1fb74bbcb2fed600238713202519d70f3b7
+DIST icedtea-bin-core-3.15.0-arm64.tar.xz 61788580 BLAKE2B f2c8d1d0ac823838881f07fc3aa47f07b048924c49ec7a0f8ce5b1f942ede8d2aab70d7fd25ea75b6fe7ea68dcd181d9f834ba4b075977470181cf10b6f26696 SHA512 f0c9d683048e0cc5ab44a9bdf31b5f2c2f8a2bc425dd1a78fe366791f8b2bae4e7b77f43d9553d95c388673ccac5c1e5a916dadecb9dac2059daa66af97927f2
+DIST icedtea-bin-core-3.15.0-ppc64.tar.xz 55179660 BLAKE2B 3404f1b4ddc6f1109d141e8a88ff1a913153660b318b84fee43ffe013164c578f9fcad6b75f8212cb11cc9ee89a8260d55b39c7f9516aa910d3838b0490fe923 SHA512 7d5e3c16e156f09610e915d3c9062b0f24f5d15045545009f48ba616e8f45184161018ed4136145ab9d15bab6d853052df7fabda43b9bcbcf99aabea8e52477d
+DIST icedtea-bin-core-3.15.0-ppc64le.tar.xz 55188860 BLAKE2B 732973320837e689b42942da80015109868d5772097111d5789a3bbee100a0b8d75cb581e1825a0c62bd582e93fe828b5575ac307efb73083d248c154cc28cd0 SHA512 887af69cc6c0a4227922da2500f228b108d9ac445e62c1836411d09a88df8579e0397d89b3f62b94f73e794a0014c67f4b1c8d2247ac1118967a63092e704078
+DIST icedtea-bin-core-3.15.0-x86.tar.xz 61650896 BLAKE2B ed5140790ac2946c4162ead15cd1d8aae812d41d4be3e4fff6669eedb438576e293385ec53405a2c67674c9fad9279497b2f334ef58040f6744b62059dc4882c SHA512 2efbacbcd77474d4a8506f9c4f7d66c3ad57f929644e4c541bb76139b6f1c6a776639a9708257a4ce5085660ddf2d50f54ef179a63746a9eeeba83384f810cc5
+DIST icedtea-bin-doc-3.15.0.tar.xz 11666068 BLAKE2B a4df6db09dfe47220cbfa07e12adaa03df490e81fcf38df490710502e78cfae741bf9d8f88ee81e8cf65465fa912b3139b239e858e5479e8af79a48c08444d5c SHA512 b990ceabf846b5be889ab706c3f259c23c335bf56aaa0e660206bedec4caef3d00fdd712d2eba5326e0b716010299b5b13e1089d91fd747cdf8cf58e4acce13b
+DIST icedtea-bin-examples-3.15.0-amd64.tar.xz 1854220 BLAKE2B 3572d1571da58c493402421db4163879aece2f3b2717f2769ef94cf9612b429a0156f278ef2ee5e114de8b171cdac787f46b7cdd0d533cf2a5568c987c836ee4 SHA512 8dd6017f4a9c90b56e5559277155afce2c37995cca3bb2a96bf62e0310a3eb9e259023faac51b5d4e5688dceaa33efad9372a5f7667b314685578c97fc937e43
+DIST icedtea-bin-examples-3.15.0-arm.tar.xz 1839548 BLAKE2B 1903f85534b49ef71a548ccf29065d301871e024402540038a81561d02ac988a9060b7c33307366dee55838c8f9a2cf277e86e152701f8e5312241e5cf499850 SHA512 de9eaf56ce6b10ea2d3d676b1896884a5a98f1def01175e3456487ebb10f0da618a5d238a7fc9fe25607e5fbf53dc6fa7c65d71d6858731c3540e270357a13c9
+DIST icedtea-bin-examples-3.15.0-arm64.tar.xz 1850912 BLAKE2B bf047a0d606bcb766e84ef90fcb169446e9bb97ada118c51762d58ed2f4fe5a9139549676fc731b2230a75c65e3a4f23b06b0f2a3224d85567f5601a1320e66c SHA512 2d5527d7daabb3cf5bcfb262bdd072af2e051cca3171aa3a973ac81b53f74b898d8c5045a0bcea28db18edca602d8ca9912cd90a157ef6026e535a0087b576a2
+DIST icedtea-bin-examples-3.15.0-ppc64.tar.xz 1865608 BLAKE2B 34afb142c6db332d399868783d2972f3d4a2a7de90120e88f70edae3d2b0ae8299dc1587c1431d810ff8d69f26f884a51d676d2b7738ee04089780f6a5719f8b SHA512 d23adb53d6df49b607ea4267570ffe8f16801d6bd9a570b1311b881cf02329804da17464ca284cd6f4b316856a3cb504ebb347e9e76fa37c8cf8c41dbc20366d
+DIST icedtea-bin-examples-3.15.0-ppc64le.tar.xz 1862752 BLAKE2B 03cf9411aef4c3797c5a542072ef7ea53f3565d7c90b2e9e2dfc9caac8ffe41cc4588b848e5c6cfc5c275245a625dbee66fa170aa38aeae3ee2110f1d4d08888 SHA512 0bacf0f9d2b7b396e5afe1962d54cd559bf777dc896dc9bf6d7581380bce1aaeff4156e4c2082ee1955f2d503a5c6b8537bf32da1d4846b264026229c22ef01a
+DIST icedtea-bin-examples-3.15.0-x86.tar.xz 1860232 BLAKE2B e0b9fa6d5c452ea8d258cc035e7d9913f9423ec972d3729b266cf03b686f3012ae16101a0d97db660ffabacd05e92e3ce47624346a7ea5fc5b42a2d89d69fb0c SHA512 2a7b7a1e45fc84d115ba09bb2617c298a8c0d8084e61ea274c16df0f36bc1e240d0a74a37ff9f0cf0dd6dfe4be8f6208f7c6c132bc5637be95b2d9e19c1fe5d7
+DIST icedtea-bin-src-3.15.0.tar.xz 45859888 BLAKE2B 39926cb75a2eb784bb29322724ff452bd6fd259e5dfd583436a980073bf4b82277676d10ce29e155a1122a424718be6277e307d781d825d93b3909f1e6f1da91 SHA512 9523180f27da1936593a41322013a3147e4bd8bfded0589e39775dcd856736b97160a356c717969eb0a26d27c05cfb1dce6f08f6c09193a722e581f22f7a1dc4
+EBUILD icedtea-bin-3.15.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.13.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.13.0.ebuild
deleted file mode 100644
index c594f4aa824a..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.13.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.58:2%
-	>=media-libs/fontconfig-2.13:1.0%
-	>=media-libs/freetype-2.9.1:2%
-	>=media-libs/lcms-2.9:2%
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/zlib-1.2.11-r1%
-	virtual/jpeg-compat:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.28.1%
-		>=x11-libs/cairo-1.16.0%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.42%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.10%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-8.3.0[multilib?]
-	>=sys-libs/glibc-2.29[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# use system-wide cacert store
-		rm "${ddest}"/jre/lib/security/cacerts || die
-		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
deleted file mode 100644
index c516938e3916..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86)"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-
-IUSE="+alsa big-endian cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.58:2%
-	>=media-libs/fontconfig-2.13:1.0%
-	>=media-libs/freetype-2.9.1:2%
-	>=media-libs/lcms-2.9:2%
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/zlib-1.2.11-r1%
-	virtual/jpeg-compat:62%
-	alsa? ( >=media-libs/alsa-lib-1.0% )
-	cups? ( >=net-print/cups-2.0% )
-	gtk? (
-		>=dev-libs/atk-2.28.1%
-		>=x11-libs/cairo-1.16.0%
-		x11-libs/gdk-pixbuf:2%
-		>=x11-libs/gtk+-2.24:2%
-		>=x11-libs/pango-1.42%
-	)
-	!headless-awt? (
-		media-libs/giflib:0/7%
-		=media-libs/libpng-1.6*%
-		>=x11-libs/libX11-1.6%
-		>=x11-libs/libXcomposite-0.4%
-		>=x11-libs/libXext-1.3%
-		>=x11-libs/libXi-1.7%
-		>=x11-libs/libXrender-0.9.10%
-		>=x11-libs/libXtst-1.2%
-	)"
-
-RDEPEND=">=sys-devel/gcc-9.2.0[multilib?]
-	>=sys-libs/glibc-2.29[multilib?]
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-java )
-	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
-	!multilib? ( ${RDEPEND//%/} )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-multilib_src_install() {
-	local dest="/opt/${P}-${ABI}"
-	dest="${dest/%-${DEFAULT_ABI}/}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	if multilib_is_native_abi; then
-		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-		use doc && dodoc -r ${P}/doc/html
-
-		# doins doesn't preserve executable bits.
-		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-		if use examples; then
-			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-		fi
-
-		if use source; then
-			cp ${P}/src.zip "${ddest}" || die
-		fi
-
-		# use system-wide cacert store
-		rm "${ddest}"/jre/lib/security/cacerts || die
-		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-		# Use default VMHANDLE.
-		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	else
-		local x native=$(get_system_arch ${DEFAULT_ABI})
-
-		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
-			dodir "${dest}"${x%/*}
-			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
-		done
-
-		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
-			[[ ${x##*/} = ${native} ]] && continue
-			[[ -e "${ddest}"/${x#*/} ]] && continue
-			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
-		done
-
-		# Use ABI-suffixed VMHANDLE.
-		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	# Each invocation appends to the config.
-	java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
-	if use multilib; then
-		multilib_foreach_abi multilib_src_install
-	else
-		multilib_src_install
-	fi
-
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild
new file mode 100644
index 000000000000..930f0f3ad547
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
+SRC_URI="
+	doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)
+"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
+IUSE="+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart"
+
+REQUIRED_USE="
+	gtk? ( !headless-awt )
+	nsplugin? ( !headless-awt )
+"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+DEPEND="app-arch/xz-utils"
+
+RDEPEND="
+	>=dev-libs/glib-2.60.7:2
+	>=media-libs/fontconfig-2.13:1.0
+	>=media-libs/freetype-2.9.1:2
+	>=media-libs/lcms-2.9:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/zlib-1.2.11-r2
+	virtual/jpeg-compat:62
+	alsa? ( >=media-libs/alsa-lib-1.2 )
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.32.0
+		>=x11-libs/cairo-1.16.0
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.42
+	)
+	selinux? ( sec-policy/selinux-java )
+	virtual/ttf-fonts
+	!headless-awt? (
+		media-libs/giflib:0/7
+		=media-libs/libpng-1.6*
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXcomposite-0.4
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.10
+		>=x11-libs/libXtst-1.2
+	)
+"
+
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )
+"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r ${P}/doc/html
+
+	# doins doesn't preserve executable bits.
+	cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+	if use examples; then
+		cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp ${P}/src.zip "${ddest}" || die
+	fi
+
+	# use system-wide cacert store
+	rm "${ddest}"/jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 4adc97c01eb5..949a13a89651 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,25 +1,13 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz 195417692 BLAKE2B 7834b8d29535eebbd62b6e7d1de71a8d49ab323d64d60c7e7a2d54247236e4ff1628907f1cae0807d19292a888894e060175673499cf802ec1af1881eaeda4a5 SHA512 ba26ccd26990888c6905a52c706ddd06584d61cffd2cd0c2d8fd030c9cf23d0ac5518e50aba3c1949fd9fcc73ca3736659cdb5315c13279950504ba25a77aa70
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz 183456230 BLAKE2B 0ec2ac6e59012e047f5191baf1b289215bcf898238efbb0c2aacc6f0147aa2013ee70fdd31f10a89533de74940c9de3133d0a1f9b7c9f583ed9422923aee6884 SHA512 fa0c2014fcf0e6d221e1c06fcdcc0020cc8547fded6f74a9d7f0b64ea3b277c123530390b01291a4d3e36169bc1af40b797d75f60fca7af58d1d6e658c762f81
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc80042702d6c77e35da5df0c1788709ddeaabb76fa940f4c705cf1801b27931bdd01558b4b4743b8e8acbebf62e1ebdcc7c81bbb286a288a816553ba2890531 SHA512 0392a68c90bd6cf7ed68a73d5420da0de207621f4203e38e24ebef8c52c8731d35b1ee2600636504ce12e553d059a590d40ad20184cfdd4dfe73fd2e2af3804e
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz 104544830 BLAKE2B 9ccf24a2409da8989e2bf9c9dbca9176036b179a25b0e21df3d4532b7144edbf57dc45b739c6d0891251d2e6caa00f8eab664670602b004549a5c13a1d7dd133 SHA512 3bf3272b19c73652b485df1293f27ce1daa32be690bef053ff7df164f9ac73aa197f4d4ee782aafe410e5e81b1d0db005c4f16d601668b777f49a7d524ab5ef2
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz 99367073 BLAKE2B af507e3c1877a4e895f65fb4f47f8559ac626c78477919f281ff9ce34dcc0c6394f4ca4336d406efed541c3190147188e772922c09d91ba0efaac37ed7214a90 SHA512 1b166e21de8889a1aa7e90591e635c22bf18ccfa1b9d774dd01cbc97f4c0a732ebdebac8f18aed649869e52512fce35ee9a8398e1526c2e06d6109994e3772f9
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz 99245777 BLAKE2B c8f2066cfa3f3fc9add7846ccf6c5d05031ff7adcfc41c9c6220615f80a1fb0168dd9b2faefeb58c9ee3fe2b31223d59c694b2b50635b13161c7f3c56bba7f78 SHA512 86490b52d27c6fb3031243e9f72284e5f77ce2362dce967cc7659263137818bedcaec147492e84bf9a88f066974fb257aecf36c59d91cd5789c57ab5e410ce57
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a783edcd00820e7db92c11d2707331e9aecd352802b8cd0fe565eb42620d179e2decc32452a94bff4951b9f1fe9e276b773135d316847c215f7f42e24a7c SHA512 691ff8e2f2b8d7d3004fd11470cc881a8a7d3b60eed6007986db7ee8561bc41c3508b3c9b8f4da4a298a84e3023fd9b874f9d8f20664d89ce63cdb760f554465
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u232b09.tar.gz 101775907 BLAKE2B e051da5a0bfddd1310ab74d728936755504f99a055b8e3af9d91affd1e781fd76eaa1a5bea297565d81e946e2f19e9bbbfe146b634bd9fc30fef4d936c97261f SHA512 bab1105cbce30d8fcf5f4c48d28a155ac4d8fa635d8d4f9d2d5ccd337fbc78db398e991b6c81b75e3dd76c695a63686c22193ccaeab97f0439f67ada56acb61c
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u242-b08.tar.gz 104602970 BLAKE2B f666c127369ae3edb79887fa8a4f58e60def6078c7e22e3df8e648b6e793eb8c3284204b1039c55a5eca86ad5d81b7d53de815df7a869315943a02ca182cc0a4 SHA512 a800057129aacac01090a108c795b7e5f84ec99b1a030fcda0baf2ab6362ac225ef408a1308138d4aa36d84bde80ba7cde9e27214522b6973546a27a3c11c902
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u242b08.tar.gz 99282910 BLAKE2B 83ac54a33f8f898423dece75d02e759a908ca68d9a4ec7719a51b5d40386404d162108c9ce157c9ef995678491588a6542777a13dd961dab46d2974d4613855c SHA512 bf754ad63c1be8cad20eff0e159fe5d90dd0b138d28e95509f7bb8fc37b9282295c105bbaa3822c48c12be32a698e9b30f29400aa2a2e2e44d0ad8cb018b6075
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86abc1708f23fd9e3809824fbe3084dddbf115a5b5d5fac7a4936e16f78033dafea0ee6e6113dc463e33f55907caefed4ae2cb85864ef1d59e7b45e2708a564 SHA512 c304aab812559a5da9b346759533ddb3e1bb6320e959e8dd01a0ae5cb3b85a6282492e7bdfafef40573c3970b79b8bac8e2abff021a43966a4b7e7edf80ae70a
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce
-EBUILD openjdk-bin-11.0.5_p10.ebuild 3121 BLAKE2B f42fc9c4af752a45e7eba91a60ae62524d98407b8bc706d34016dbde3c6001d04c96b9973946008709a6f592b3d7e9da821e0e815310198b2cf54525583e21c8 SHA512 1e3b4081757887329fb983334df87fff552e89e1cc4522890561ded45724331cb31136143743b79c46fdb8cdca6f1e7a0d35fe3dd177bcc4004d5d3cb22666a4
 EBUILD openjdk-bin-11.0.6_p10.ebuild 3154 BLAKE2B 616c366bac9464a7e76c7d0b765130576e2e4daa6c34d740981f586ac0f79d42e5fd08948cdeaba3519e52cebc9e3d1fa112a4d4911533287b803de94090afa9 SHA512 dcda83c2280ba3e03e0b7f398cc1e09e95813ff3b2309cb47b71041e523a99df0123240944b94147be9be8cbff2a7c29a5c57fae92660c4fc25a0d86331d6fd1
-EBUILD openjdk-bin-8.222_p10-r1.ebuild 2183 BLAKE2B f36710e5dd56938f76038d6da74e4f2517467ccfad68c85f3dd6eda2025bdcf4c4cdbbc6fa23572d6e4195c576ae2130e9bfe5424396fd7ee8467c5ba766e9c6 SHA512 2818794ed02d3c08d70217b98c79c9bebec1b4a55411124ff81292e1e0116a278604e41a1b1ae0476fa767ac35a22436c512810596446f0902d3c144c0fe6a71
-EBUILD openjdk-bin-8.232_p09.ebuild 2186 BLAKE2B 06c43bf0a9e88d9b2c3e1cce4aa8fee732f525c5b693638ed85956b4783db59e15826380fbcb2cd4eaaffd005e7dc2567432fff95aa636015f7e66325627d4e6 SHA512 5a17f4e42402bb1257ed5d4ace42533142eda1fd58bceb60cc5c1bc868bf725cbdeb3a8ae8a97748bf15ddb05f4ed0b7f5992374540e9a6db4927fa24df0f7c4
-EBUILD openjdk-bin-8.242_p08.ebuild 2104 BLAKE2B ecba03e8375d28e49089efbfff1cd43333cccf0673b7e968827edbb8f6ffabfef39500abcc0ac2549d13a38166beb4fb547637036efcc3c91d2e4b4fe289f9de SHA512 c008707c598e3ca9e155c41b225ef5de1177bbc14fcbaee5783ad4d22b26a3adf8174fccedeaa9f3b4e8aef846d6a2cd0389a0affde0382b09b9a39bc87ebbe0
+EBUILD openjdk-bin-8.242_p08.ebuild 2282 BLAKE2B 0ce7f74912c903a4c7a9520c27c9fb27b63a95da651d8a10a5eb834f88b7640157a7761f332c1c37897a6ad84d10b7da93a60d2ce7fed97663af57de25b62010 SHA512 ecefc384fef645bceef94a8a92f586c0dc42c0fcccc3612466501c0e2b004e9aa59f6101c7040bafa70826c75bbe03f9419ca66fdc6e456cb6f6e3f3cede0073
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
deleted file mode 100644
index ced0929e899c..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=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 )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-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_install() {
-	local dest="/opt/${P}"
-	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 examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-	dosym ../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && 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
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
deleted file mode 100644
index 49f6e257858b..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri aarch64 arm64)
-	$(abi_uri arm)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64"
-
-IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=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
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-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 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
-
-	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
-
-	use gentoo-vm && 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-bin/openjdk-bin-8.232_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
deleted file mode 100644
index f4558fbf91ef..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri arm)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=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
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-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 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
-
-	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
-
-	use gentoo-vm && 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-bin/openjdk-bin-8.242_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
index 01ed27ee1ac4..8ca8ff8c3fe4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
@@ -17,12 +17,14 @@ SLOT="$(ver_cut 1)"
 DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 SRC_URI="
+	arm64? ( https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk${MY_PV}.tar.gz )
+	$(abi_uri arm)
 	$(abi_uri ppc64le ppc64)
 	$(abi_uri x64 amd64)
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
 
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 160116694f47..aea04686648b 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,13 +1,7 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz 42055392 BLAKE2B d9634ee9a47a9be67ae7bcb4f8a938b3d15ea40859b47ae0b078102ac1924957ac04492a0c11e9144ddbcd333733a6e2b6f997818f4a6144f594167e1b04e05b SHA512 d2e38e0d7536bfa2f05135e229e3fa35e0c9860f03077da61d77d1b6551f099c957b9a9f8a25f922261b47360f7e4f7b64c1e3796557d478a90945ff2820515b
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz 42132415 BLAKE2B f857b9618f653ce3df1a1f6b3a3f3fd0ceaaa2d66b9d58872817fdbb7846195459b0fd1d79cddb444e0cd17faafc46bcea85fa22b810d2e93b95a9829da6dad5 SHA512 b13ee8af718c701195765eb6c36c8a6dfc32a5a39f8da4118db4e5ef8ab2012f8952cea73a964fcac079487b6372c0be727f0f2df43b948ccdd4663e6b327d1d
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz 40934975 BLAKE2B e03bfb1896e140b79474a4c9004a97aa07bc9fb29c608b2320c05625a56936555ff8ffda7c9656a2d3ff7628bac769e4d14694b2be6d08e4c90b0e6802a05afb SHA512 e1810c4115206cf78c69b971354474098e853c786b472c2140b9e16187efcd3e15bfff26e743e7a532a6f0619f4728482348583662c1eeccd1ebbb82b980f8af
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz 40963409 BLAKE2B 16f0cce76aad30ed27c84f5bf5e5469c947023d8ab07886013e50ce9af31c90df11dfdce6fa220ff5d59b511dcb7ef4df7dc73fa7a7648d2e92899a81eec6109 SHA512 5ce98215c36d2870ebf0112205dfae39c3d43528ebe175dd16ff54b16267b44ada5d5d26e7d7744db95c3c8faee2858fad59c92b065993397defa64cb58c294e
+DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz 42198347 BLAKE2B e0022f46f0f3de41d28baf19bcea2c7d6237e80586b7a1e3fb2b97aced18d564fe03a6706b8a3fe97375ff6be395aceafd1e0dba6adaddaa7285b0b8eb24310b SHA512 0d1366c68ad12fafc76edddc7d385f612751182b5492cff4309d542a0e12b13c9b17ca89a0a8218ad0f8182b24285189158c43759db54645758c7ea8dc4d6ce9
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09
-EBUILD openjdk-jre-bin-11.0.4_p11.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
-EBUILD openjdk-jre-bin-11.0.5_p10.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
-EBUILD openjdk-jre-bin-8.222_p10.ebuild 1966 BLAKE2B 79eeeca03c4287d8eb9b1030164629b4c960f2aac5e6fd8d69b838afdba76ee20754e3a09777b7d7a38aee49b3ee2e5bc87dc36a891a562b479679d266164566 SHA512 82b86291e524353691b2fffd99632c376b8cf8b68b0a35ba2ffaf6eab5a8cc91d8ea71918edc083df46c3835498ccab61d8016672598fc95ac89e195e02d292b
-EBUILD openjdk-jre-bin-8.232_p09.ebuild 1967 BLAKE2B fe8b7db2a315b659b0d623d76b7aaf226b2c30a97faa3fb0c12986f65d8e9d676ea9a018884038509c1bd69e734b7222b706cde7583a730c250ec7ec460a7d0d SHA512 5089b1cb793dbd9518a25e733285866a01851bd84e3372615fe90b19cf3e4c9477766ccfb7834502b2b27ca46db3be017ca203f36ff5d785e478ace6eea56405
-EBUILD openjdk-jre-bin-8.242_p08.ebuild 1939 BLAKE2B f2653487a8bef53e3a2facfec51a25f62159c9e2310c18e4c3c201308a3e6fe2e21fad09defb52756b8804c2786bc2b444b47c352620de7482c8de6da3a6291e SHA512 9f2eb93d8cc3ca221786336f06818d03ddb6af8136e6576e89a6a2e8a6dc5af20e9cc755af0dc4c3aed32e9ca5b2596bbdee91a328b741dc9cb4140cc918ea6c
+EBUILD openjdk-jre-bin-11.0.6_p10.ebuild 2726 BLAKE2B 147b9cb76e345b66a11641f25bc8619c6c375ed75bf252d4d5d1e41fb0b3de473647b34f89d1a7e90d742040aea9f8604cae1944469794cb8f80986c5dd7c688 SHA512 fb07d0c43999043f7e61eb4520965db912f956fa84d2476b8e228c690d6d5262f8a2db9b65c0af51b08249b74a5e5a0147bee20fe6d23bd86eeeda0d71f05e3f
+EBUILD openjdk-jre-bin-8.242_p08.ebuild 1938 BLAKE2B fca0e6d5d6a49dbb60e02a791e92dfde869944c12ded952fbdd8673afff32a60a3b53c751b0091686000ad149d29c1116fcec2b84ff22c326a674f8b36eed282 SHA512 57c3af2a942d122d717be2abf285aac117f27bc78bd6695af08bf414c09e2d86e0b2dd63b9a2f9843381685765a6f7f6edc0862dd14e7db4240722314674fb6e
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
deleted file mode 100644
index 33938cb19738..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${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 AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
-
-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
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	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 ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && 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
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild
index 33938cb19738..ec55ede52337 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
 
 RDEPEND="
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
deleted file mode 100644
index 7f255fa9c63f..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${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 AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
-
-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
-	)"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-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 ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && 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.232_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
deleted file mode 100644
index 9801e4fd0609..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${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 AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
-
-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
-	)"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-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 ../../../../../etc/ssl/certs/java/cacerts \
-		"${dest}"/jre/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && 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.242_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
index 64875594ac49..c01f117d1d4e 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="alsa cups headless-awt nsplugin selinux webstart"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index d9f68cd57013..d01db0888f96 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,35 +2,15 @@ AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3
 AUX openjdk-11-make43.patch 595 BLAKE2B b33a6e4979b8a37451ca2bcf09dc11bdc180d480a43ab4b3aa1f649bf1b90395cdb089fbcbc586f8b72127c9df8999f75a118e19444f7ed8c95990f8b7ed5410 SHA512 b4ca872d9f304c6f794a326d9cce387e08352e47923fcae7a9a8328d095d24822bbf6e2811a19c5e5c83d1981687eb7da1b11c791710350f396af0493f140318
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6
 DIST openjdk-11.0.6.tar.bz2 90755968 BLAKE2B 5bf23cc107ffae4cfc82be4f9b4b17de57575ee13e8fd461027e319a441c89c65fc852affb89f98a54307fa865ed5cdfb216809c6196866b31dfaa7011ad3d57 SHA512 d2296556c947c46883c16df3c1b7d809e6987dd6fd1a2667333e1245049560f3da744f6a51609a918cd9c509316b01160de2c080d5b9d3ed1af0b312dcbc575e
-DIST openjdk-8.222_p10.tar.bz2 452194 BLAKE2B aa5a19245e9b5f79da217ef4e8ff87acaf6b4c7b930a6cd1c7a00d2c6d50bb3168c41da1b18e8beb072a84bca7f3956e939edd9f5fd88899d2cc3fe754ff19f8 SHA512 08f92327732fb54df847fe0b3e49460bcdd25fe2aef7bc9545d75ab6504ab92452f8f5daede6040d28fd9b8347f49d658dc7bf88abc90235d6cf4a72cb44fbba
-DIST openjdk-8.232_p09.tar.bz2 453185 BLAKE2B 9f78dc3a482f42937c9f4ed30492cf8348c903c6a419a7f2644251f853f92e2e112f72c16848adcc7102f41e8f1249e35d7019bf0b5c5fd823e4f068650f36fd SHA512 31fbaf8334b3a40f491ae87aeec5698ebac334b8425147b8f8fa1a397e64f5bf7025d22dd5ecf7c7029c07ca40424f07ae139aa5d9737b20a6eeec2e9a1d835d
 DIST openjdk-8.242.tar.bz2 452896 BLAKE2B 73176533ad62942f9a9547378aa5547a5f064076d24be527d0fb8b13c30a48680957bca731ee54771cae66e78f8800995426431ec266f0c61330a573efaacc23 SHA512 2a98dcead63b8e5dc6db841416b16c12a84f557c8efa6272bc4dc125333de1e20ab83050d1ee441a77f78b47b2c52dbc7d29810ce562218129eff29a5c79daca
-DIST openjdk-corba-8.222_p10.tar.bz2 1033549 BLAKE2B c75f100dc22535068588afe0460618005c46542cbe078e4e35ad80741d61012422eb21826a6ddcfc3b59fdde3bc7e6107a57cfc654114255b1d880273f54a762 SHA512 377847ae044d1e4515c6c7afaf965e037e6688ab010a24d436a5b31c251f2c09a8e622863d533b8b71625284bb5db93f114ba12ec05c731f0dc75d9dce70ec17
-DIST openjdk-corba-8.232_p09.tar.bz2 1033216 BLAKE2B ed6416fd49aa6d00804d90a40a7a3435828dc92087695eebf3426c49e5ccbd2f1a2cf63ee879a9e9da82c8ad050d38618e384defc185d44279025e5cf4326ae9 SHA512 97401d01727090f29e90735095634149a59093374c19f0611237de105ff1c87d7f0712efd6627cae57d6415f336c5750a7777abd1b30068ec57f88f78e23fbbc
 DIST openjdk-corba-8.242.tar.bz2 1033721 BLAKE2B 5e0cee4d5b8faa0e940ed096f807ef231ce7c10b180ac89d5faf9ae276bab1044ca1ae6e826490e9d66f17ebd55026c17e7675a62dd4bf633cecfa3390944f97 SHA512 cf2cefcb590b7a1c637b709ce9f59c56a5354f90a3095726c3168962f4808ccb27a82909234343f510ad90dda56b83c934fa9ccb788ddf0f66e60c65b06d8e84
-DIST openjdk-hotspot-8.222_p10.tar.bz2 7937298 BLAKE2B 42a74946b0ff88f1d910751af7efbe86aefc92b9039a4629445ba08255e4a9159a592e778acb8dce557b58324ce023360d9ed892568486a11336e8a09f8e6664 SHA512 20395d55201f072fcb5a7674ee1a2e3fb7a922e03ed4630645d4f22a5ec94c945978f7dfa6d06c28d0f8e9e4025f50986e8eba573fd44bc675ff7978e25723b3
-DIST openjdk-hotspot-8.232_p09.tar.bz2 7951090 BLAKE2B 58f79b5612ae003fb3b7d89c4ce6243bf4a188c0d43ee60f56e77e3fc62b265571bbed7129aecb46c4c5f714f839f685fe2346bf239b8738c02afaeb129b3894 SHA512 26b0e5948dfa769c7f7974899d95ee372d836aab094ac13e12c904844ff414b6ac27ff1baa7f905b6c6bd4f3b4c3aad6952bcc08f85c9815b07375379d2100a5
 DIST openjdk-hotspot-8.242.tar.bz2 7953409 BLAKE2B 84ddc5bc00bca06c821219189ef19cd88cf0c5e9e43301b0fc654e1a31c68af0d7cab32d5ffedeb10b5593c3e8a846fc308076ffdc3292e0622a504650dfad56 SHA512 c67c7dd81e37b7e5ed43b0a720240ae55ebf7c31e58ebc1fc20cebb1bbecc91cda575a508ebe907d6ad21bad149596bcd913a24108c50fe2c26767910b5fe570
-DIST openjdk-jaxp-8.222_p10.tar.bz2 2735189 BLAKE2B c4ab593edfc914e30bebcfbf0d5c68b64711005a2a027f165eba8b1583e673d74d0cbec582e6d1d65de06ffcf189dbdb66f2b1eb224f127a1908cd6c154c418c SHA512 e45facbaabb803191d86b477f88eb8d8960ee224bc5d6bd4fc19688e097c9d5aafc00597ff38bdaae5403ff330c3188867bc94cd3fb7bf6394b770f1fb0711b7
-DIST openjdk-jaxp-8.232_p09.tar.bz2 2736383 BLAKE2B 13a62acfc577c66cfb975684794dda18a6e1b90a7a32167ea914f646592ee973e7d57c415cf23d5069748f03f2fedb0e14482ea070aca39dde31f01ff745e36c SHA512 725e9220da0f861cee61e81ee33ec7c1ca1edfded7c8bbe407c14d0e2e6a2c980ec1e28a578c825841f4622dab408e578412a39556642e2208f78c679b78f01e
 DIST openjdk-jaxp-8.242.tar.bz2 2735931 BLAKE2B b8106b903000ef0b920b3a1228eda06bfaeb073138a2d0a5193f8258f285d0f7044b93d2ef3c7e9c28bb9a39c964475f8dfcbe012d49d4c2b7a1a7c5d6fb4906 SHA512 2c2148aba457c7fe6f2cdba444ef730d7d6bb91604327bf6c465f549acb768a711e4482d79db1848f9495c84ac650f42c48989bee47537c1be065e3204115896
-DIST openjdk-jaxws-8.222_p10.tar.bz2 2542293 BLAKE2B 832cf1b98c2cfcc55591d004c7c9f3055412a71632c671cb7343af74ff25645f68d27b298d6ae74a346c0be97470e79c0aca152e3ef702b9e88385ddbfa324f7 SHA512 560bfea42b6e7981e19d974e71382f8ad74729a2fb76974adeb592accaf58c2715ec096f3347ce56a7403c38db4dbca8892eced67eb851f16eb4cc43a1152f1c
-DIST openjdk-jaxws-8.232_p09.tar.bz2 2542463 BLAKE2B 3424528dbe22904f0355806f201dd54f0a777a983c09fdc80834fc302f41f68c75df271b24c557208c5f945fd8d8882259d9dbff3fed0e98113ef980b982516d SHA512 85d9708e231ba18f37c9844b23a13c59a78daed0a92a42b8bc167059b1aa67c25e74e6a9d980050777d8f600fe07298e0ce15fdc9621f6a469ec0dd996157e4c
 DIST openjdk-jaxws-8.242.tar.bz2 2541712 BLAKE2B 020f47e5e9f9fed3d3dd506703ccc58bf04f696a093013e3e9eecf6e8a842ffe51d24188d204c9a84bc32157094e8ed2701beab8bfa2e6cad100ee093fa15107 SHA512 b0cce73a84887d35906a73006f36ef0913bcaf1fc27dc58e8873c95ee3b125b5bd977c23619f0a4f2489493776d4818d380ad1f126c62f325e2b155f6fc10dbf
-DIST openjdk-jdk-8.222_p10.tar.bz2 47175873 BLAKE2B 47b330aa1d78607b42df650629bd88dbde7a8caff2bf6938d75a9d8ec9726b5d32cc5852bb0d877eedeecccee8e2673328697bf104b7380c275e85b9a57a1274 SHA512 d6229f4e86ee0e5798b60143454f39e8de79edc596bf89f6dc7aaf2ec73fe22631f974c2d43e832a255ed2e51e32877926874d1911c3561f9077ea28093bf057
-DIST openjdk-jdk-8.232_p09.tar.bz2 47141486 BLAKE2B d0003de4b47cf397ad9c56f08f579752fa54c1e324b4382d92132af47439ad8052a7b8e80447736411e2d870da6eda15472c4ab34820fa49172f5d57974888f0 SHA512 dfa0f1e1eea73eb13adef212f8dd949f1b30d4d60f4977a595c50bdc5b5741a2d8a2550ca31a300aa632b4aa719d5c093bd36e23100b9ce7f446aebc2f9651ad
 DIST openjdk-jdk-8.242.tar.bz2 47256764 BLAKE2B b4fadc09640ce2267d461052bb8e42a7872022675fd8193b4f45ef23d69ab33b0ab95745d01e723a10bb4359055caa94d5113b3c77b97a8ff14191677c5c49c8 SHA512 3796599041134924bb673f06390c7c2fe9c76842ec799338dd02b183a3578f46c93095591f39f60a0c9e106659d6b0abba1ec1a647610b45a0f337f71afa28b8
-DIST openjdk-langtools-8.222_p10.tar.bz2 2394871 BLAKE2B 376dd5d5cd86704b7cf6d02e8a117ce0d36f43316cc9000bee3f3f1fc7568e080c039e9adc40b6fb78720e2aa8ac921c638e20be1766e2252b29329bd17d28b8 SHA512 79a1db1c8afd5d6834ae5e565929eeb7567bc4ff3fa823789f6f170fb21e0df71d965595f4fb53efb6c5af1c1b4c7c8e2edc91e60178b57a8957935968f480c9
-DIST openjdk-langtools-8.232_p09.tar.bz2 2397864 BLAKE2B 7351a50bf5d425bec9343787c463823f24115f62d1ec8cc7f98cd8c474708415a2b9f96ca5a8f8aee6350a0a0e208d3eee117bbb778b7f3a985e994dd97139a8 SHA512 f34035d1d892e686a11c1f88b84633cc2c68bb5924ea9b278eabd6dafc86e4b2695eeed854ee2c6c96082e16acf1ceb33b7f273e44a790fe8823564690335c43
 DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e80f3642e935a1d6259d11dd23d007e5d7022643a8ffabdf5e12c7c7915a33e7edb263704eb60653dc2253e10aee6ca183fc84e SHA512 820e5828ae74c868f4c548e23ea1e7625e74d3b52fe951afe5a583910405658cd14d3d40b7b5f4bbb87d71439cafb77590ee2fe111fb9ad2f7c8f972d0380e53
-DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4
-DIST openjdk-nashorn-8.232_p09.tar.bz2 2858464 BLAKE2B a75eb94f81c4d94bb5df6a0799ce447a5a382753a95579ff0dc20e171233a84737067edd120412b14ffc93e82290998a2e8c4de6407888e7bae1f4d226034c38 SHA512 6e5d12b75735b1c51048b0e90e7d977766ae4711bccf139714e19f773e2cf6532d36492168ef6ccf797f86cb11b22b0bbfbb53d9399265a58b08ece702e96a3b
 DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6
-EBUILD openjdk-11.0.5_p10.ebuild 7519 BLAKE2B 2e440bf6e85776df16f688365de8c9b5dbfed915cbea4b61b23e6f3823f13eef085a815972ec03eedb3ba5fa6bce7c86cf3cfefd73968c3869b9051015e14826 SHA512 85c53548989faabd60e748f4a42d0ee67f8b7b84cbd2806837c7a9b76a416809982d96dc85e4122e05edc4b258b7ed11fabcccf2056b2ea6ff26eb8ecce33d4e
-EBUILD openjdk-11.0.6.ebuild 7588 BLAKE2B 014021561468c01cd5bda8de4c45a4c03cd5bdd4b7bc731c44854b04e21e1992e941c10caf1889f515d10d963f93cf7dc1f29cd40237860dbc5944590fdc9548 SHA512 85226a6167005b6fa30f4fba8a792dff1242f3638f8117c6fb7a6105c5c9426aff2b7a638c1e0e1f6ac660384948bb2d7e31977b083e63c53309aca96d5fdb42
-EBUILD openjdk-8.222_p10.ebuild 6825 BLAKE2B ca12311854dd4891f8fb346df2b28df53f08e164e7aeb5c8e633009f16da962121b98f2758b9f5b735a1246d70648046fbe8eca40017cd05b42cc6f3c3c457f5 SHA512 856d7003325ba7647927f582d9c0d00977d2ac0c8233f729190e124ec3100c730c5cd99f1c7f65396efac8fc42377ac377e90801eb02138d865dbfd917241a72
-EBUILD openjdk-8.232_p09.ebuild 6821 BLAKE2B 36586bd65dae04e88d95276fa42449a577cb081e57709e42a1b36015f528978114825e1d1e4124df3f5df7e5a3f3ff0c7257ddfa0277085c19cf074943cfbce9 SHA512 1445e303d7573ea259adbba8e51dbe1e51668435638eec5bd2c941df415c56e286e5f4bbee5dfb8270fb2d2895089f0afcf75a6b06d64b94f10c8a0151266730
-EBUILD openjdk-8.242.ebuild 5795 BLAKE2B 7d4ac1f80227d866225bf45a3ebb293ffed1985ab945022692d83353db097da7fa4d2aee2409fcb4700d619c2855da33613b0e72cc12ae4bcad06ad95ad8220a SHA512 a54a68330b8c9b67c496d1c0e22c00f483ce9f3c22e51d4b9fefb3c4c85eb7c7c0d8259d32a399a892db4dd24a440466c14a70c0d92a545144e145fa40d8fa94
+EBUILD openjdk-11.0.6.ebuild 7589 BLAKE2B 0365c2bc2a5d6be6c392ff949132deb2fbcbee7b863f2d14c8766f0033a000c090982320e497e2bf63b4b9d6530f25c0a31ea457f1d32c0ad04032849441810c SHA512 f2bed942d39cdb53fc7b982672f00268cf129b489f175548a06b308abf6d7579f56d1ed6815e07f1824aacd4f4a3bce2df401a89690ab66d243db67e71b26d2d
+EBUILD openjdk-8.242.ebuild 5793 BLAKE2B e9a48c08b300431ab0d06e82bc9ca723c879e97360885205f4b568034abb86047bf76364095ba494cc1032cbc2e6e8379570141fc64a3d8187411f188c8e81b7 SHA512 a2b4e27fbfb38b175471e9e2b46658953b16a2484cea7b376502c1641bfc1abe0ec1a5be402a9821c160a023d0672284dbd75c6ec27935395ea411bac79c05e8
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
deleted file mode 100644
index e6429b524269..000000000000
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	media-libs/libpng:0=
-	media-libs/lcms:2=
-	sys-libs/zlib
-	virtual/jpeg:0=
-	systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT} )
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-
-	local myconf=(
-		--disable-ccache
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-giflib=system
-		--with-lcms=system
-		--with-libjpeg=system
-		--with-libpng=system
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-vendor-name="Gentoo"
-		--with-vendor-url="https://gentoo.org"
-		--with-vendor-bug-url="https://bugs.gentoo.org"
-		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-		--with-vendor-version-string="${PV}"
-		--with-version-pre=""
-		--with-version-string=${MY_PV%+*}
-		--with-version-build=${MY_PV#*+}
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-	)
-
-	if use javafx; then
-		local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
-		if [[ -r ${zip} ]]; then
-			myconf+=( --with-import-modules="${zip}" )
-		else
-			die "${zip} not found or not readable"
-		fi
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images product-images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	rm -v lib/security/cacerts || die
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
-	# must be done before running itself
-	java-vm_set-pax-markings "${ddest}"
-
-	einfo "Creating the Class Data Sharing archives and disabling usage tracking"
-	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break"
-		ewarn "many java ebuilds as they are not ready for openjdk-11"
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild
index f98807e652b0..0f8e793023de 100644
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.6.ebuild
@@ -59,7 +59,7 @@ DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXtst
-	javafx? ( dev-java/openjfx:${SLOT} )
+	javafx? ( dev-java/openjfx:${SLOT}= )
 	|| (
 		dev-java/openjdk-bin:${SLOT}
 		dev-java/openjdk:${SLOT}
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
deleted file mode 100644
index 1374a9be223f..000000000000
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-	${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-	${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-	${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-	${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-	${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-	${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ppc64 ~x86"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source webstart"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
-	done
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	local myconf=(
-			--disable-ccache
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-		)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED%/}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# stupid build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	use gentoo-vm && 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
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild
deleted file mode 100644
index b3cd4c5a8eac..000000000000
--- a/dev-java/openjdk/openjdk-8.232_p09.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-	${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-	${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-	${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-	${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-	${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-	${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source webstart"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
-	done
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	local myconf=(
-			--disable-ccache
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="b$(ver_cut 4)"
-			--with-milestone="fcs" # magic variable that means "release version"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-		)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	local myemakeargs=(
-		JOBS=$(makeopts_jobs)
-		LOG=debug
-		$(usex doc docs '')
-		$(usex jbootstrap bootcycle-images images)
-	)
-	emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED%/}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# stupid build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	use gentoo-vm && 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
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild
index b1a5c2322839..617bc845036a 100644
--- a/dev-java/openjdk/openjdk-8.242.ebuild
+++ b/dev-java/openjdk/openjdk-8.242.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
 
 COMMON_DEPEND="
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 590b1429ab97..01f8e73d4e55 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -1,10 +1,9 @@
 AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede
-AUX 11/fix-build-on-gradle-5x.patch 1214 BLAKE2B 2dd50897a5a83773c452afd57ef87e0cbd065e2f53ccf931c00f81a0521791f43e5933e5209f8f6133f855bb3327856ddae109b357da746da72128b60c228031 SHA512 e7c737d5329e872ac104ea229f74bc05447ff7d11bb88e1e3ab0ea5d108195b2af9139650566eb9b18dffedf9141123ee808c71ba01eabe1d1a2f47c2258358b
 AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981
 AUX 11/respect-user-cflags.patch 8604 BLAKE2B b4455f5580a9b310e013c0d58ba39a3d9ebe15e7ed30e75a954c1f6ba36107f1c1a5b6bbc88e5a0e0d21f21d275214ad66ed012088f8fbbf81a6384127c8edfe SHA512 3547c711515714ffdbfbeaf84e538fe0103bc8b38ebe2fc5493414af6eb95bb3a956a7e3fe28936019de4996a62f705e1e28e8ce7eb3a5dbbda6f93f058a5089
 AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f
+AUX 11/wno-error.patch 1894 BLAKE2B 8b4380c97942cc542164ab1673eb4e5701ae17aab7b6673c3b01518fdce91d2daac1e52dd5d7dad09b619093d0b4a153f0aadf060c32ffab19428ab2f307661c SHA512 0d808836b0f52e911ea6172b3c573cfea84035611ce797da7cf58b5eaa51d8c4ef536eb21d3a0c2139311e3c7ba702f13dc96b9e1d3b6cefaaca88188e409f3b
 DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
-DIST antlr-complete-3.5.2.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11
 DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882
 DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
@@ -13,8 +12,8 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60
 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
-DIST openjfx-11.0.3_p1.tar.bz2 63272033 BLAKE2B 574a622b2b2587fcdc64c91cfef0fbcc6d97baa7827e84a540bf1c8493b9fbc3629bd131e5c0972fb82687d194ceb527dfdedd6c2a00edc16d9a76850699f9b6 SHA512 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7
 DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c
-EBUILD openjfx-11.0.3_p1.ebuild 6369 BLAKE2B 09ac2ccbf548453a6758309fc258d01b1114f33bab2b9c1bc2629bd3c71d9754eae4c86d2997d96b7494fd12d2a4e39ba42f3f33103a45a09d369e99a6ea980f SHA512 972372de07d376d9d81ebf654bd860b060ac41b0c98f786c34f79a10d95700eb595f45eb6c65b7bc38836c2d739e151da97de7054acce2d8a36bec721118a004
-EBUILD openjfx-11.0.6_p2.ebuild 6313 BLAKE2B 2eaf87b2b59d29eab054c9063f377c9cbbbdd3c044fff02124c8f2213df1e1a3872ea61dd0347085610d1a44b7e898265d3d29985fc2b1da48431574c568159f SHA512 ea1190f4effd87dafea0738a0821c5c6f82a29ce697a018705e4c1c734c7d868f50e9ea5b69754ad7d588392cf17aa9e6c01560154bc1b77877f61b2bf192889
+DIST openjfx-11.0.7_p0.tar.bz2 63969275 BLAKE2B 50f30cf736ff8713f0be5c4404d6494a96bdaf23082eff8b83ecd704fb417d7e54502f0e0fff9a993d814d9ed9cec98f152487bc96bf929a67b74ec08615f053 SHA512 54b1b010800d3edfc9bb1319860fceab2083d77cbcb45ebe4baefbecf7e0ac2756cb24470cf4c9e7f53d44d7bf345c5f869f9d50748da6bb9d8be8bf1e325ec3
+EBUILD openjfx-11.0.6_p2.ebuild 6330 BLAKE2B 8317c71dc033af4f8d0933a0d16d736a76d48b0acc5858ee17ac42f85b7ddcaa8baa7a1536a290c2c379d2fc135da5b6592b95885158da19fe1b13785db9d32d SHA512 510d01fad9f3ae9669235d7ddbfbcdebd38b49d31585e4f1d254824b6ba4207344cb37ff6785b5d5c90cd3af1d3bd3e2067ac7aaeacea1ab35579b7982b6e91f
+EBUILD openjfx-11.0.7_p0.ebuild 6368 BLAKE2B 6126fddfec0ad94b6a1a2df962cbe30e29b2a89981dbe603179a06b75b060b866467a290587773f38e8760a84f9180e01a593d3a58b9f400a23d321124708da8 SHA512 519649070773da5ac3010654e4e79def45e97e2d5dc0e78304fa338ca6dc4b71026d6e5bb99557723b5ea28f54329b330575b60414d0c6ba52bfaf03eca9198a
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch b/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch
deleted file mode 100644
index 51fde6ad39a3..000000000000
--- a/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 2f74649395f0242d08b95572b7b30246457b1d6b Mon Sep 17 00:00:00 2001
-From: Ty Young <BlueGoliath@users.noreply.github.com>
-Date: Mon, 3 Dec 2018 20:34:07 -0600
-Subject: [PATCH] Remove final from HashSet instance
-
-Removes final from HashSet instance at about line 107 which causes build failure
----
- .../main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy  | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
-index 10a85d62d1..13d573fe6e 100644
---- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
-+++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy
-@@ -102,7 +102,7 @@ class NativeCompileTask extends DefaultTask {
-         updateFiles();
-         def source = project.files(allFiles);
-         boolean forceCompile = false;
--        final Set<File> files = new HashSet<File>();
-+        Set<File> files = new HashSet<File>();
-         source.each { File file ->
-             final Map fileData = dependencies.get(file.toString());
-             final boolean isModified = fileData == null ||
diff --git a/dev-java/openjfx/files/11/wno-error.patch b/dev-java/openjfx/files/11/wno-error.patch
new file mode 100644
index 000000000000..eb354c6f9fad
--- /dev/null
+++ b/dev-java/openjfx/files/11/wno-error.patch
@@ -0,0 +1,43 @@
+From 737acaff3658663de61813ba877379841e76631e Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 19 Mar 2020 09:50:22 -0700
+Subject: [PATCH] remove werror
+
+---
+ buildSrc/linux.gradle | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index 7a7cbc7..6955155 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g
+ LINUX.glass.glass = [:]
+ LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
+ LINUX.glass.glass.compiler = compiler
+-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags,  "-Werror"].flatten()
++LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten()
+ LINUX.glass.glass.linker = linker
+ LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
+ LINUX.glass.glass.lib = "glass"
+@@ -231,7 +231,7 @@ LINUX.glass.glass.lib = "glass"
+ LINUX.glass.glassgtk2 = [:]
+ LINUX.glass.glassgtk2.nativeSource =  ft_gtk.getFiles()
+ LINUX.glass.glassgtk2.compiler = compiler
+-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
++LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten()
+ LINUX.glass.glassgtk2.linker = linker
+ LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
+ LINUX.glass.glassgtk2.lib = "glassgtk2"
+@@ -239,7 +239,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2"
+ LINUX.glass.glassgtk3 = [:]
+ LINUX.glass.glassgtk3.nativeSource =  ft_gtk.getFiles()
+ LINUX.glass.glassgtk3.compiler = compiler
+-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
++LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten()
+ LINUX.glass.glassgtk3.linker = linker
+ LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
+ LINUX.glass.glassgtk3.lib = "glassgtk3"
+-- 
+2.24.1
+
diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 8132340592e9..23574d61505c 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -7,7 +7,7 @@ MY_PV=${PV/_p/+}
 SLOT=${MY_PV%%[.+]*}
 EGRADLE_VER="4.8"
 
-inherit java-pkg-2 multiprocessing
+inherit flag-o-matic java-pkg-2 multiprocessing
 
 DESCRIPTION="Java OpenJFX client application platform"
 HOMEPAGE="https://openjfx.io"
@@ -25,7 +25,6 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-SLOT="$(ver_cut 1)"
 KEYWORDS="-* ~amd64"
 
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
@@ -168,6 +167,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -Wno-error
+
 	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
 	#FIXME: should we enable webkit? doubt so
 
@@ -193,7 +194,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = "${T}"/jars
+		JFX_DEPS_URL = ${T}/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }
diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
index a41615a7a6ae..957104f45e10 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=6
 
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+MY_PV="${PV/_p/+}"
+SLOT="${MY_PV%%[.+]*}"
 EGRADLE_VER="4.8"
 
-inherit java-pkg-2 multiprocessing
+inherit flag-o-matic java-pkg-2 multiprocessing
 
 DESCRIPTION="Java OpenJFX client application platform"
 HOMEPAGE="https://openjfx.io"
 
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
 	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
 	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
 	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
@@ -20,12 +20,11 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}/rt/archive/${MY_PV}.tar.bz2 -
 	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
 	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
 	https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar
-	https://repo.maven.apache.org/maven2/org/antlr/antlr-complete/3.5.2/antlr-complete-3.5.2.jar
+	https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar
 	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-SLOT="$(ver_cut 1)"
 KEYWORDS="-* ~amd64"
 
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
@@ -58,7 +57,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	app-arch/zip
-	>=dev-java/ant-core-1.10.5-r2:0
+	>=dev-java/ant-core-1.10.7-r1:0
 	dev-java/antlr:0
 	dev-java/antlr:3.5
 	dev-java/hamcrest-core:0
@@ -74,7 +73,7 @@ PATCHES=(
 	"${FILESDIR}"/11/glibc-compatibility.patch
 	"${FILESDIR}"/11/respect-user-cflags.patch
 	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/fix-build-on-gradle-5x.patch
+	"${FILESDIR}"/11/wno-error.patch
 )
 
 S="${WORKDIR}/rt-${MY_PV}"
@@ -169,6 +168,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -Wno-error
+
 	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
 	#FIXME: should we enable webkit? doubt so
 
@@ -194,7 +195,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = "${T}"/jars
+		JFX_DEPS_URL = ${T}/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index f39136c3ad57..e9498ba92056 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,12 +1,8 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
-DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
-DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
-DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-java-3.10.1.ebuild 1410 BLAKE2B 1e07e6df3fc2bd9f3dd1e1496325141ef87da72ef74badbfda92bdff9a0bb4a22702d7d6839cc69bd49e82457c26e8ca91c5c62e25c9d9c8a1d473e427d7330b SHA512 bec4d51d62a0b0b7f3f712b87c9fa646420dfc28a093841f35d2a9e9c8f2e2e7b70f0395b18fe196f458eda6e2e86c6ecf00f92e3b0bc13eaff534cd0f87bc7c
-EBUILD protobuf-java-3.11.2.ebuild 1413 BLAKE2B 40aff7435541064e15315fd7cc691e72bfabfb0f45c632bb163332aedaa3f6c4f493be1c9aadd44478958dabf1f41d9139044c1d92796ce83e6de8fd2c05476b SHA512 efc9d95b66aded56576770a104209c319cd836acd3ff5decc5b0d0bc0d7dd93093265eea28f2a9e47ceaff631b2cb6bce662db2fee3236b78774127ec83938a1
-EBUILD protobuf-java-3.8.0.ebuild 1382 BLAKE2B ac6dd81e147854eeca83884b7462af2dbb71fd93c1cb805b59b705b76333c8e9a4d8532742c81930b5bfc6ef0e2d6734888fe45a78b811dd7c156b3d02efa008 SHA512 2eb33c0e82ef03a2c2ff5df6f3168310520f13838308a6ad1407b8c8506199c09305828abdb2c1bfa715fdacdb74fb7116ad6e9aa7de99e444e79d2c297acddf
-EBUILD protobuf-java-3.9.1.ebuild 1385 BLAKE2B 9996fafa5a726e30a34d171d1540ccbef12e8e493459ecea750ce6feb9a5294ce476198b9d163d811b8c52fa423d848b2b4451b0d301186113c4a37d8fa0e539 SHA512 d94ab861cb3adaee0a5562429ec5277eb26fdb43b937f139c1c02a21ee2e1f3a1ec4fccafd004135990f7edb909d5e92555f7564af3d386329cbb16206f18ab7
-EBUILD protobuf-java-3.9.2.ebuild 1413 BLAKE2B bb9f2aa01559aa681995d29d0046d5430f3e4202b72574c4168526ade346d9379dd9d763fae0e7c35b44184bf2a8d76988bb0844fe94c1d4415d0cf8f6a09ff7 SHA512 23acb84178e4f6169658090de437562da60e88ae3eb3f03eab013c9b6c667e753b3a355c306003429e5059332874f2174302be0993d0aeed970d91008f0d3c8e
+DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+EBUILD protobuf-java-3.10.1.ebuild 1406 BLAKE2B 2f8480fbaabbe978827ccc7ad5705dc0d84b7e399cb2e6bd8fc71ed913c1aeb8539de5d3dcecc2f0675090d9697fca3992002498e4600e0fc99ec277d29a0a77 SHA512 fcfdf674f13bf0ed963066b720c584a10f815e1c9f849448f7ab47b8530240036636f324598e8f9a2aed2076ff95312fca96da416a3a24b3a3ee4a537dfcb475
+EBUILD protobuf-java-3.11.2.ebuild 1409 BLAKE2B 79e3280a5cd5ee49ed455c7ecec24277620221795c8339cf70e408d32b279497812ba2208b0505c5a57f928426556eb9b9e4363ab4702311385fbffc524f1f1d SHA512 4b399812255b225eaf288daf36b60a4a7f1bd0f7743a812ed4c8add5ef308e83eb3932ea02685257e0fbfe0caf9252d1c1da51d80f845682f226a276a6b2af34
+EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-9999.ebuild 1333 BLAKE2B fb6b6a03d5c0b542d675ffbfce077e1af4ce209f41571f72fadfd102c885e5619f1efaff550f41140c122745d17e52fd5d6fd525b5b5d08122f83bb9a8f1f632 SHA512 5b82121c95ba38591ffde5fc6567752c8793e517a1e94ecd076c9394a01b9f01669b0853f8a6a391baa9ba08de74088468f2ff0b28f2d8779dbb93978112e451
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
index e24c58d532c4..1389952ec4be 100644
--- a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/21"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
index 2dd111153a0f..d7ecb43e8238 100644
--- a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/22"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.9.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
index 0a44500a6100..0d5d98cde220 100644
--- a/dev-java/protobuf-java/protobuf-java-3.9.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,8 +22,8 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/22"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
deleted file mode 100644
index 5943243e203e..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.8.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2008-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/19"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild
deleted file mode 100644
index e22dbfb5178a..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2008-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/20"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 49df05a66af0..7c301d801a49 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,14 +8,22 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.100-src.tar.gz 5265444 BLAKE2B 9c706e6a50e13cd8f542669e2d80f8940816976cfb84f62c3e17bbe6f0cc6d76d6fcdd18ec69e706ce27552aa66041833f6ae7bba8e671e187de3246e90a25c5 SHA512 53ef64c64263d0f25d72ed179bd7b7beed3f73cd63010988ba740ff7328b00a5ec09fe1d4575188ecacf258c891e022a0f1ae07d2957d9830a56881170bb1a57
-DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
+DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
 DIST apache-tomcat-8.5.51-src.tar.gz 5661227 BLAKE2B 711de5678903941a5261693972906f2d0fca2c9d3219e62d3186e5d71a2e3cb4da0a5028e62790a26dad2d244246c2f41c74f18e17d52ec0af070f0d5842ca3f SHA512 8529d2e7d83a863fe88ed4ee8ec29b673e5df4bea53231412c0d89e2384d3939b9d1f29350a4ca46966ab5d4a0d3178ed5d2caa50aa766092a3ab8f28dd27592
+DIST apache-tomcat-8.5.53-src.tar.gz 5676477 BLAKE2B 284ddc3b3d491a57aac31fc59a9c7d80bdb11efb410ab53eea5d3a0a754507203de287eff0a621d02bfea581b45b860598c8ab95d529ad18790fe381f5518cca SHA512 d78613042a9e4caa5b5eeebd2589383ef10312698e535e2c8f82e40c7b3d793ea6cac50f346316a84f4b47ad330f82c7a4f0e4a3d2f0d449f1d4dad9c6d5e267
+DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
 DIST apache-tomcat-9.0.31-src.tar.gz 5812430 BLAKE2B 7ef0f989860b046b4ddbacde50013284a623eb9d81e2c3465b0e04ec9c934a5319293677919ab758243a352fc60cb6691b51f946d8c5a36360b9108dafc5dfe3 SHA512 a0ba9e46a3d2a4cf708e6e29b4647c041495e45865ce5c679c9dcfee77181373a2d3034222701d0f15d5c7e71e6aa3cc7db236c66ba069b3e3660a948b44342f
+DIST apache-tomcat-9.0.33-src.tar.gz 5831264 BLAKE2B 7ef5b28dfc4f24003075012cfe6403060dfc908386577ea3dbab3d7a4eca1d22cdcaab3f821079a90d9407030bedf657f5abd9829d643f699ba875b7b702f0a3 SHA512 73ffb36dc7331bf9e455b599b128c51da8f90222bd3cb296e211d266c18964bf66004524725acd6d3e29099d2fdc3180892c228b2a00b06544455240bf05c9b0
+DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
 EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.100.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
-EBUILD tomcat-servlet-api-8.5.47.ebuild 1005 BLAKE2B 029fadc44ace7749ca1c4db4178f2c15cff949455e76510f31be9693266d9ddf08cd674922703045e462925ba413450b5bb61c3168796b0f21cfc498c3954cb4 SHA512 6e4e625564a15b37795c7f13277e0f3750a8ebd94d9b733867b28806f9dfa066baa88803840f6b26c1ec0a12b00c5b5440ef43a9bd77177161f7134aded2b5b6
-EBUILD tomcat-servlet-api-8.5.51.ebuild 1006 BLAKE2B 5e5f54bc4204bbc7d2543b89b551af46bc871dc5e7e1056f0bec42e525dadb35060626df00bfa71557cf463979e734d5eb3d7fa526257b200f77b63ce3c8b826 SHA512 0e33cb31632341a749c1d3aed42882b8789be0909eb2b2a5d9685148a16ce6f1a3fd2f669f23f2ce2caf2993c2745248a2adab5f879396fadb776f1e9e60866d
+EBUILD tomcat-servlet-api-7.0.103.ebuild 903 BLAKE2B f5342c001dfe97b439a9f65d8b3fd82d75a3694fa2b5ae5f5c3dcbacccde46e45d8888161eb0982dad879ae38dbd4c3709caa3f018e72bf3404a53d215d8bd90 SHA512 c586fef4373ffa73fe403216bd930cc9085216288ecf33937c4e30200f2bf2177768c6407d7750712628d3a8c712e8538c3e90e183b07c6c30707a811ed5e84d
+EBUILD tomcat-servlet-api-8.5.51.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
+EBUILD tomcat-servlet-api-8.5.53.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
+EBUILD tomcat-servlet-api-8.5.54.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
 EBUILD tomcat-servlet-api-9.0.31.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
+EBUILD tomcat-servlet-api-9.0.33.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
+EBUILD tomcat-servlet-api-9.0.34.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
new file mode 100644
index 000000000000..c65e1f064dd7
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.103.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.51.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.51.ebuild
index 4d0bf5c4de6e..085f83e7999e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.51.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.51.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
index 22fb494a8525..b6216e53c6b0 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild
new file mode 100644
index 000000000000..b6216e53c6b0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.33.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.33.ebuild
new file mode 100644
index 000000000000..9ddac4eebd99
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.33.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild
new file mode 100644
index 000000000000..9ddac4eebd99
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-java
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)