gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-java
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
42 files changed, 748 insertions, 1823 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 08db08a4482d..68c2689acb53 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 8060cea113ff..60cbed197a9d 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,7 +1,9 @@
 DIST gradle-3.3-all.zip 91388147 BLAKE2B 15539ec06cadcdaee9d54928381d5626bf06bae3251eb304fee095e6d0362f23759e99e3841dac2b9a1eed50b6057ecce78230dafb45711bfe764bf107b1f704 SHA512 4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3
 DIST gradle-3.4.1-all.zip 91604607 BLAKE2B 1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f SHA512 bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c
 DIST gradle-bin-5.2.1.zip 132549774 BLAKE2B c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d SHA512 e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b
+DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
 EBUILD gradle-bin-3.3.ebuild 1009 BLAKE2B 52be8dfd2f4c90aee207631115a7af3fe564889a4cd76b6358637b367ccbd8db19d4a3b8568b60e50da12b5f6d68d1a14b1e130569deebf467c07b0c17587e74 SHA512 6d390f7527be2fd68da1fb7a2152b8863988b63e94558b0bc2e4fd6aaefa7c417dbfcf43871e2c7c7acc406762f9854a3e796198e2532d4dc1dc889f02c5f684
 EBUILD gradle-bin-3.4.1.ebuild 1017 BLAKE2B 381faa269feaa7900aef4b4983e5dfde0711334da1b5b3e28f942a503bb582b3ec674b48b96036e0d8fa110e9dbc0c1d38a9ded98539fc061f6a05319238588e SHA512 6d64be5e536b33257e8cba0adc076bc7d1b1208fce5fe80306c8ad92c8712de040cf75bb79d50d005c282cea7b48fa74c739d3f73fcc3a4d5dbb527785466840
 EBUILD gradle-bin-5.2.1.ebuild 1052 BLAKE2B 6abb286cfd8165ada2c79e7be5527390ee4e0c7538230a738e406dc53eda5f45d8601681eeec2b9838837e527f581a0a3d0c02c8a73cdd1e6131d3b68e4eb90c SHA512 d6fbf5b75afbef0aa997217dcc9dc2f9862d35e50b7d83a103ed76d5cefd0f7570223ba03bc988481863c995acda04cb1aa499bdbfb90b32326dec58716c14cd
+EBUILD gradle-bin-6.3.ebuild 997 BLAKE2B 14539daf17d39d17d539561cb6d6d4ab586f3e8a6a084d3684b8b1f8bdfb160bdd3f7c3091ce0f362c93c3ba5b3c0d3641aa3e6fab1ea58338f3973c7fb0270a SHA512 7bedadebec8b2df5bc94cd2b674965edd5529fb4cf9eca8328c117cde83bcfa2baf96eda3ea8ec4b75ccbdec3e504b84d54d1861dec69586f781a6508e121a5b
 MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
new file mode 100644
index 000000000000..93eb5b8f352f
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jre-1.8"
+RDEPEND=">=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+	insinto "${gradle_dir}"
+	doins -r lib/
+
+	exeinto "${gradle_dir}"/bin
+	doexe bin/${MY_PN}
+	dosym "../${gradle_dir##*/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+
+	docinto html
+	dodoc -r docs/release-notes.html
+
+	if use doc ; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index ef143a7d4002..f190aa11f55d 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -5,13 +5,28 @@ DIST icedtea-bin-core-3.15.0-arm64.tar.xz 61788580 BLAKE2B f2c8d1d0ac823838881f0
 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-core-3.16.0-amd64.tar.xz 62350972 BLAKE2B 0980787ee1f619907e958fcbf6c75674115adc325abe4d428e46842eab9a26fc2666f3b0498e79de0451a63d01c83302501fc5f861c4ffc7f5914dd7adbb4cf8 SHA512 0f79408811fa5b3ab60e72b3fcb8510234a22d698c66f0d5a8f06b67bead0f4a215b771065d6d189fddd25f762b64732a28fd69ad402ef57aa5cedeca745552b
+DIST icedtea-bin-core-3.16.0-arm.tar.xz 58351704 BLAKE2B a1fbd5744d3155861e7de5a85a508f8199295568d92efd840a7fc81b9eaed755366fa3212d3039d87c77215168fc6ab9baaa5c92531fc11c1099e6ea486fce48 SHA512 84624b80bfb0035b714c38f92a9982c11bae3137fe70d030111c6b2c253472c0c857edfea1a16d646a5e9c4d3215fc66d7f9bf96e8184ae1b5c75a5c3c844549
+DIST icedtea-bin-core-3.16.0-arm64.tar.xz 61918380 BLAKE2B 8f6778bd63fe037f19115d094ae32294f84a57782b63f32997c80ff580a5a13ff3beec37bae809e45fa4dc174c10335c9040119207a9489b33df590f79398b1d SHA512 dc0bbcb15c897a8f3e83e56877c5a3b7f29740a122597fc26b7f6c43eeb07c32407db060954a262ab1db92cfa6cafc44c7fad131c53c4a811938da5e76c89fe2
+DIST icedtea-bin-core-3.16.0-ppc64.tar.xz 55356056 BLAKE2B 265635ef70f244696dc09baa6cfef628d794ff851edeebb2d4b531aff4a25dafb902c4f3cbe527540ba65d76da2f3d4234b14cca16d5439d2e92f551a5aaf478 SHA512 840b0faed3882324392ad1f7ce8123d9d2f53f33576bb5eec37357d2aab292c21d947867d8b20a34de6fc25c8e1d5dc5c7f541cebe5b008b79bc9daf9250910d
+DIST icedtea-bin-core-3.16.0-ppc64le.tar.xz 55356384 BLAKE2B ffa6c0e381b20a3a9d78a61519a0d47715dbd82f9472c5335fb9e2b4dff6948486cf85f6f4f416462158a3476b9a228fdb9c0725294a58bcdc91058d60811bd9 SHA512 d9902159044135e1ff5d3b200f5fe283249a2be1da6705b9fdc94eb88c2d199ed3a5c80e70ae89aa870a05110e649e93d4710605c85db15dca360bc66d2c60da
+DIST icedtea-bin-core-3.16.0-x86.tar.xz 61745436 BLAKE2B efb37cb8ac00c6fe2a45bed9b829fc5410062105b373ba77012ec2d8f8deff03dcb88288025dcc8a8300d28139068ef202d2c709fe5aad4b8ed2ab1edd54c412 SHA512 3df52ec949d8d5ba6cd046841160fab1637666e506f536664506c1de0e74f1b2620836706cca8e194ded575761299ecb3b3f83e295e6dfed8222de1949a73077
 DIST icedtea-bin-doc-3.15.0.tar.xz 11666068 BLAKE2B a4df6db09dfe47220cbfa07e12adaa03df490e81fcf38df490710502e78cfae741bf9d8f88ee81e8cf65465fa912b3139b239e858e5479e8af79a48c08444d5c SHA512 b990ceabf846b5be889ab706c3f259c23c335bf56aaa0e660206bedec4caef3d00fdd712d2eba5326e0b716010299b5b13e1089d91fd747cdf8cf58e4acce13b
+DIST icedtea-bin-doc-3.16.0.tar.xz 11613128 BLAKE2B de8224c7e3a62178c6cc5a4c883c3c90a2712049f9e6687bf0a0d93a8dc9bd3abc562486c483c7b72bd17fa5c376495b0739babf10b1282acbd3e41beb3d1cd4 SHA512 dd3bb69de2d0f720f18700a97a549c21b67569d12a982d2fbe39eef8bf876e0f02af673e70d53ac59891377e4d48f3cc05f60d1b1dac0c7d9969a4a07e346fc6
 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-examples-3.16.0-amd64.tar.xz 1855056 BLAKE2B 678e887ac613df96e7b255bdd6de4a9644f1b5940fbd036d88dfc1b74154d8e1e4032a380586965d727c5d9ebd2d1c4ba7d7d62a88d8994e5400eacc3f83d6dd SHA512 afea08925258e6e9d7bdabdf3078d6b580680fa43fb44589b6e0faa07ab78fea0d25e30bd22ae92317a77007ab0b30c9b3e16decf0e78bc1ff88ffa780b9d25b
+DIST icedtea-bin-examples-3.16.0-arm.tar.xz 1839892 BLAKE2B c5824fbf698f4861baa32f973f2040ae72f5a92f889309bb1aeed03c652114c89f38394559c2619c36dccc075205b91fbd6ae97d9de7554c9144fe059fc9a9db SHA512 6fb4ac90bac679cb2d1827ead49fcd1b2acac27aca3af77c7aa7c771317281d7ffe477f2c1365ee78a21ab9694c9beba38516f053ad954e78f6f5b8bfb991151
+DIST icedtea-bin-examples-3.16.0-arm64.tar.xz 1850400 BLAKE2B 577206b3b15f5eb7dfcbccbb02e209354f99e780c5989eba8f21fdca3630f7188c1b4a0c845a556ccd93916a7f6182ec9932983ee22fa37cfcb47b28fac62e41 SHA512 ff80389720947f781f48b8f39bd49a7b096eea03f48bc70d588bc326256676b568a743b70e5d13ccf161da81fd4fceef5e8a1913991a5805391de7e93e913662
+DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1ae75954a8ab4dcb9d7f2e6a00b9cf0343716ef18943d66e46834859fb90c50d7553dcda3502f4f3b73c060e2cbfaec883aa98ef7c874807 SHA512 9bd762776178d117c20fabb90558f80d97d4392a4015a26729437e50f82e7bcd55a6c1e12df45726ae484d20df3bc4867e392242588062d926ae4d3b14b8b679
+DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e
+DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637
 DIST icedtea-bin-src-3.15.0.tar.xz 45859888 BLAKE2B 39926cb75a2eb784bb29322724ff452bd6fd259e5dfd583436a980073bf4b82277676d10ce29e155a1122a424718be6277e307d781d825d93b3909f1e6f1da91 SHA512 9523180f27da1936593a41322013a3147e4bd8bfded0589e39775dcd856736b97160a356c717969eb0a26d27c05cfb1dce6f08f6c09193a722e581f22f7a1dc4
+DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548
 EBUILD icedtea-bin-3.15.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
+EBUILD icedtea-bin-3.16.0.ebuild 3521 BLAKE2B da3770dea0ff7f8c561fa49521fde590c51ef7d6f563f845a49d1464401cd619b6aad2c57014aa1d5127c9aef1b931afafa52eba19c3b9aee820538941e5b9f7 SHA512 f76b92fbe75482ea4e8e4a8a3c29b30154c99123362e4160cc3b7aeff86f801be74b11e24d0e72284172bfe10496823695e52e2be71beedebfe0dca31c2353de
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
new file mode 100644
index 000000000000..573d36309406
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.16.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/icedtea/Manifest b/dev-java/icedtea/Manifest
index 3b9dd4dabb97..60a198e56a25 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -10,7 +10,19 @@ DIST icedtea-3.15-nashorn-04210bbb67cd.tar.xz 2319568 BLAKE2B 1078f8847eefffffbd
 DIST icedtea-3.15-openjdk-c0ec72b715dd.tar.xz 362300 BLAKE2B e5bd5766bd9f436f09fb5146ab1c0ee3e82f9d32526fc41e2c9320c2e330a4603883206e0ebcfd076ffeff8ccdd3c289a5018f718223b68852e08bf4822167e0 SHA512 d7dca834fc65b67b1888c4cfbd50e263e58604b70560b4dd4e8e7ca518fcd54a70eaf9e5cff89fa1954beaa3071f5b55ef36fffb36589f5008e4be39e5a1aa38
 DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e12683577e0a8fdc18be5b4db6c2ee59d64424200940c18889e6c39567f9471b44f4d7199bc1816ed2f5d2a16bfe06e0b1b1c0d93bc0722202c272115 SHA512 0c229ab3c1a2de6c24715d9713250e35c415f919ee3c4e99b0b101bc3f51fea54814f235da345d0d4954d4f3283c7757091076a7128847c879399fd1c8a6c15d
 DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
+DIST icedtea-3.16-aarch32-ecc1eb1dc760.tar.xz 6854900 BLAKE2B a4b0a4fec267f0dd64618aa83a2cf487e83bfa133e03914a079d451abb6be573e4d157f12372d6d2eaa66f834d4a1ec0bad8f1a65d2619468bb3de8567863036 SHA512 20ba1980a4f4161c632e8ec02330c3b0c971a5eff19456a568b2df4622fcfedb18594c7e350318a15a31a5395c0544899160d71805f0a3d3886ae7a16019c010
+DIST icedtea-3.16-corba-ea3169880d70.tar.xz 947604 BLAKE2B 22e7fdab5168b01501791c9537b72f884cdd008ec912e1e7afb05c410e47ab9fffc37aeeab78400a39b6216612927eb63bdc6ba2169fc7e74fe8d6c60b1af978 SHA512 bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56
+DIST icedtea-3.16-hotspot-eeb08cfebded.tar.xz 6906968 BLAKE2B 78bd9ecef9801a190ce2993d1023d6eb3db8276cc7fc726cccbf406e630a4bc62401299885de42df85f92611da10c732ae50600af9e337dcf3014472777ba38a SHA512 19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d
+DIST icedtea-3.16-jaxp-883803235596.tar.xz 2293880 BLAKE2B c749477661d9e492ab15e0b773d641f68865196c8d2897eceeafd341cacf143e73c6b55face57d528ca5d1a648798db4533e7b924daa918c2ce62d26b407bf5b SHA512 86e8c18741c1f4baca27d784b068765e404a5c2ee6ecb172c826fc1d6192b5776133f103b749839c39154fcaec87a0df95e8fd5bcb56b1e9b811711b296a4836
+DIST icedtea-3.16-jaxws-e5d96dc9988a.tar.xz 2276192 BLAKE2B 79c33b530f95ab098297d0cdb5844660df4330555195c366611cadde8478711cc4a0fef3b68a23bbd710d4213298cd4293cdec3d12a07c0682f6e264489e9d11 SHA512 824ef15aa70ec629406fd9b98a69e5699fe8f6a8ab06be00ac546bcda1daf485b20de6ea0310064e000efbaf35b1cebee25bf69033634fdce8434efb3bb16f1d
+DIST icedtea-3.16-jdk-bb9b9a0ad162.tar.xz 39849832 BLAKE2B 2b9b3ca3988955015760c82481a86af73c13b37b0c26714fbdac33de73b70ecf2fb3abcd908406dfe7dc202b02c70d66ba6b64f838b8e0b2ecb55a46944998c3 SHA512 9202f88b360637ad474920d8a6f85740e6a425679617ef713efd67778b4c7ca0b3eba7e4fc9d33de0bbd5dacda4862c8a9b63a13880204388b01af29d5fb6a55
+DIST icedtea-3.16-langtools-e47d37e5fe0b.tar.xz 2078808 BLAKE2B 2f7286c15c90607e67eea8b8ca560cc83a21e4a3ebbb5846afeb79ccfefe0713fe27ebe56a505f263276476e0a99c470171030cbaa406fbbc7cdef13acbf89b1 SHA512 1858bb3b7dd37edd817a52c67a878b48bc9b790623e77d9a6107f54b141638cb101ae3b8df560e3352c9ca2925aa5d493b4924e36a238be5a9628c714cc23642
+DIST icedtea-3.16-nashorn-1d70dcb4ab53.tar.xz 2319492 BLAKE2B c328c3a99fbd49be1efbecbb12e46be57d4cb78c65ca778f95644e2d193a4390ed1ad1ce3cddc6f737241d5e02b18b50adbc37748907db3eabe406a4880a6afb SHA512 4bf87e7441ac747f133612e1fba5c06946c6731bae76132ffc614b41fcb689fda9d9ceb1e1fee3765765c6109894c85cf0f6e6fa9eb301f9a2d640ea6cd1c16c
+DIST icedtea-3.16-openjdk-bca1f7228ce8.tar.xz 363112 BLAKE2B aff804d5b5d58dcb25f9a576aa0a23355d2229f89d5dc69142580d5fab3bdd688225d2e33090714a3d292d9d98758867feaef9c179a4c77b5cab37c21c5f0610 SHA512 76b32457958c2cdbb0006629bb41652286a1a9bfbda862665eddf822d4653d4858f9f2565e849b0e49f031b7667be73be8fe8c71abc65e1795eb570a96d1fd1e
+DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb34a3c3497c62eeb1336d554f7396b952b94ad8f573295c1537e9c3416fc2d2881efef6d6a1750bd069da0fac37a0d556eeb55a0ace9b7b385 SHA512 adbb279d59d4978403b222caf9f0823b3ae2a0d6e27911a38243fe6ef9b1a7f0d8640d71b67fa510c341dc175031e52b4b6aa6187a37ac467372a55946ae37d3
+DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
 EBUILD icedtea-3.15.0.ebuild 12150 BLAKE2B 5624d8b5003a46b9882d7d9ef5d71db4f136738c1c0764482ed5c0f57a9914d30c3d0099c514597285a2978f57cbc80842478eca01ec9c51fc807160691131ed SHA512 de17c10b87744b38c2a22b6b0010696d16830f155ed88bdb53e042ad0a99ea102bd778b4a76371dc95001806b89694c06f395cf1625d7d26cc534d69f377d699
+EBUILD icedtea-3.16.0.ebuild 12204 BLAKE2B 1cc6ba72322d962c5636f022d6fc7e60808a4305bff333f520ad5834ea6cfb608f9aabb510fdc62b4d4d00c81bd459f3bf1ecc2434fd212fc2008a5330e35fdb SHA512 64a96f379c844a4530bdaab3cfa78897dd7e814f513639d8235d338c71b8997cd0ab3fd05e20f7b04ea1a8c756f054ec428c53d87f743fdd1ae83bd0721d3a03
 MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild
new file mode 100644
index 000000000000..de38d49e5933
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="ea3169880d70.tar.xz"
+JAXP_TARBALL="883803235596.tar.xz"
+JAXWS_TARBALL="e5d96dc9988a.tar.xz"
+JDK_TARBALL="bb9b9a0ad162.tar.xz"
+LANGTOOLS_TARBALL="e47d37e5fe0b.tar.xz"
+OPENJDK_TARBALL="bca1f7228ce8.tar.xz"
+NASHORN_TARBALL="1d70dcb4ab53.tar.xz"
+HOTSPOT_TARBALL="eeb08cfebded.tar.xz"
+SHENANDOAH_TARBALL="e4e81ae21643.tar.xz"
+AARCH32_TARBALL="ecc1eb1dc760.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="https://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="https://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	https://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:0=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXcomposite"
+X_DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2=
+	>=dev-util/systemtap-1
+	media-libs/fontconfig:1.0=
+	>=media-libs/freetype-2.5.3:2=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:0=
+	kerberos? ( virtual/krb5 )
+	sctp? ( net-misc/lksctp-tools )
+	smartcard? ( sys-apps/pcsc-lite )
+	system-lcms? ( >=media-libs/lcms-2.9:2= )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	virtual/ttf-fonts
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2
+		>=x11-libs/pango-1.24.5
+	)
+	!headless-awt? ( ${X_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		dev-java/icedtea-bin:8
+		dev-java/icedtea:8
+		dev-java/openjdk:8
+		dev-java/openjdk-bin:8
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	dev-lang/perl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )
+	sys-apps/attr
+	sys-apps/lsb-release
+	x11-libs/libXt
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+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}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-8 icedtea-bin-8
+		openjdk-8 openjdk-bin-8"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+src_configure() {
+	# GCC10/-fno-common handling
+	append-flags -fcommon
+
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter #nowarn
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+		# Work around stack alignment issue, bug #647954.
+		use x86 && append-flags -mincoming-stack-boundary=2
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-ccache \
+		--disable-downloading --disable-Werror --disable-tests \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
+		$(use_enable headless-awt headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable system-lcms) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	java-vm-2_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index d85622ecb444..02ea3ae42011 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,5 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
+AUX java-config-2.2.0-py38.patch 1685 BLAKE2B 3fe59a1839a9fe1f954e6c96bdf42bd28f795881601b0e53353864ee4cdec57d891a5c1fee7e7f7060aba521da23934be8b5ea2717339e16f291671937df1af7 SHA512 9fa254fd108ec05d69d39260841fb8f946d6405b3fa37223af3b53117383bad94243c7a20f3f53de1a5d0609f433a14deb50fb7b9f857c56b41d1f3e8d5c4ef0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1028 BLAKE2B 99e452ca184464030da20dd27963826bf71e6bc01794dbe57f32efbf72e44c803d107989da0a8378b8a087c4e64f1d71ca301247a3f60f4e9803f6a32828c7e5 SHA512 f467ac490be55e4dcd51bda7d339a8988e65d0d2b82f2a6c5a7db01de48ca1d96291bd7c0bacb9eea4fdb048a021646102bdc50553a9c8152a4fa837c92bb9b6
+EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/files/java-config-2.2.0-py38.patch b/dev-java/java-config/files/java-config-2.2.0-py38.patch
new file mode 100644
index 000000000000..cb59e1f36be1
--- /dev/null
+++ b/dev-java/java-config/files/java-config-2.2.0-py38.patch
@@ -0,0 +1,52 @@
+From 5e7cc49184e657bd446998f4b08e9106e5215ce5 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Thu, 7 May 2020 02:45:57 -0700
+Subject: [PATCH] replace is with ==
+
+---
+ src/java-config-2 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/java-config-2 b/src/java-config-2
+index 8ad2539..84ecd30 100755
+--- a/src/java-config-2
++++ b/src/java-config-2
+@@ -199,7 +199,7 @@ def set_user_vm(option, opt, value, parser):
+     if not vm:
+         fatalError("Could not find a vm matching: %s" % value)
+     else:
+-        if os.getuid() is 0:
++        if os.getuid() == 0:
+             fatalError("The user 'root' should always use the System VM")
+         else:
+             try:
+@@ -227,7 +227,7 @@ def user_classpath_target():
+ # Deprecated
+ def set_system_classpath(option, opt, value, parser):
+     deprecation_notice()
+-    if os.getuid() is 0:
++    if os.getuid() == 0:
+         pkgs = value.split(',')
+         manager.set_classpath(system_classpath_target(), pkgs)
+         
+@@ -252,7 +252,7 @@ def set_user_classpath(option, opt, value, parser):
+ # Deprecated
+ def append_system_classpath(option, opt, value, parser):
+     deprecation_notice()
+-    if os.getuid() is 0:
++    if os.getuid() == 0:
+         pkgs = value.split(',')
+         manager.append_classpath(system_classpath_target(), pkgs)
+ 
+@@ -277,7 +277,7 @@ def append_user_classpath(option, opt, value, parser):
+ # Deprecated
+ def clean_system_classpath(option, opt, value, parser):
+     deprecation_notice()
+-    if os.getuid() is 0:
++    if os.getuid() == 0:
+         manager.clean_classpath(system_classpath_target())
+         update_env()
+     else:
+-- 
+2.26.2
+
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 725ac6dc0e56..8f03a425121d 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -27,7 +27,10 @@ RDEPEND="
 	sys-apps/baselayout-java
 	sys-apps/portage[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2.0-prefix.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-prefix.patch
+	"${FILESDIR}"/${PN}-2.2.0-py38.patch
+)
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 145e4ddbd99a..304ee707b99f 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -4,7 +4,7 @@ DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced904
 DIST javatoolkit-0.6.1.tar.bz2 26036 BLAKE2B 1e63a848ff5941e34fe5c4d449b5494cb9cc3e7a42c4654af94e602f3557775f2cfe1d2db7f96e1352c891e2c20822be973ee1246f879bccf611c4db724ca028 SHA512 ddf61c23f9a31007afc672cb762fd7a655c168d73616bc703a9a8a8c27d8a836b0340dd109af0c2a311e0237a57967785d85b09f8059187ba9b4a6ca6f2a52f3
 DIST javatoolkit-0.6.2.tar.bz2 26046 BLAKE2B 9e6eec5e055fe63191cdb67b7103c4f27df4569256da0e6231eece55f1d0c32f754b9b4784c2a7f79224404dea41d9583eace8aebab6e1e10bf0cfc875d74591 SHA512 70eede9a700fa8db48fef62116eff2cc89b637991c0691e5385a66ed1830788dff355c6f6d343533e58bd89bf1fbf017d5bcc6867f6d4cf23bd56d5ee857d145
 EBUILD javatoolkit-0.3.0-r9.ebuild 888 BLAKE2B 046e65b74a8cf478d6c3bcda668c47be15818c63b95fd32b357b9c4a24d458d8be24a48937d4f4fab6326fe5ac4f649e5571049de74602b7d4a620f82b90c04a SHA512 73692e960858bc62c61aca95f224021552f74298a11667f1e48e0ba514fea47bc2e4118adcbb590b5e5425fda7b20a17d33e4e0ca1c931375a05a3b9fdc46f92
-EBUILD javatoolkit-0.6.1.ebuild 832 BLAKE2B fbbed1237f71b64ed6ed442edefa491e31d34fae19292f9e29a662e7939fb727231ca569d72177fcc5bade4edad183cc096b14348ae4326bdcb3188c98a21513 SHA512 5641500b4b98b519d26b4980e4fe3305b6f361fbbb7524073ba16c9862193c33bb9202d82b1f4f1794f90ef53479db57b2ab78fd845dcd2b123d43bbfdd82b29
-EBUILD javatoolkit-0.6.2-r1.ebuild 843 BLAKE2B fc6a4b5780c944fc22f602c20552681db32e55c6d5cef37a617b0d4bef1af7cb50c4dc2db05156bc78ef35a94678e5bd0ad179f5e76f1426eb5a420ca14bbeba SHA512 74ecc79967e9d786ae044c7159653af00109a609fb25cc1a795f7808c47371174611a0ec47710f6530ebea0f14962ac18cf8b0e0349d5cebf64dd44d356d44c3
+EBUILD javatoolkit-0.6.1.ebuild 822 BLAKE2B 1b1908a5dc168629a445b7bfbf40ee96c36bceecebae3300423b52f240d14bb6990ae104e1df4fa185dc1ac397767823ca8bf0ab4a9f065642f1d3bcc976f023 SHA512 b4e4663a7f64f3c45a63f80385d71d8d094042c7e960323a8453d623fe360bd024bb0fcde639d1b27eb294fb5db00edf049060145e43e24dcd648ad78ccaf872
+EBUILD javatoolkit-0.6.2-r1.ebuild 833 BLAKE2B d9393adbe3a3ee7a6e48c2d8b4520b10a8da54da6bc0ba4b9a41f079417f85b9f1a41b63a37c46a7d4d31e3c20f5756db97b4b1bd0389ebeb9877cd19465fbac SHA512 dc16286fbb22fe7e85437f5accbffed3d909977ba77df8494dd6dcab584a3deb5f41de72f0a90b9f53766dec849ee48b9f9c3b61292f26b6e26cbdecf79fe3f3
 EBUILD javatoolkit-9999.ebuild 699 BLAKE2B 77a591ed4a4cae93afac3e9737d272766bf0fa4ed67f89febfed2ab831889a5b9006b4fb7b40bc7c79cf21ba35cdd76e9e888bf1e12a958e648293de4f613a46 SHA512 dda2ad7c044a672e1d3d01cee943cc7c6ada410c7bb4efc9648371bc982e78abf7e28c0b6b06ccbbd6d61dd81756ea942b15b8ff6dde48361c80f1e83bf32802
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
index 3dcdc2d8ae46..f1231d0905e5 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 multilib prefix
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
index d9cb43c17f6d..e43396d777cf 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 323c8b554e9a..23de2fc06167 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -6,4 +6,4 @@ EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab
 EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
 EBUILD lucene-3.5.0-r2.ebuild 3512 BLAKE2B 9f30115ea1ce8570213517a3e841675c761654e23d81cdb5c30a0111dad97b2ed41bcd3fbb316bc8716836f82fc14f4dc6c30012ec7fb41e8fd5bcca3637af9d SHA512 f7bc1e244f8f4f19d2c8674a17382fc425ef34cb2957489e8216d4ddc009ebce77b191ee1357f60719158020d098a8d0fe7239648f96014126e68111a22f10e8
 EBUILD lucene-3.6.2-r2.ebuild 5553 BLAKE2B 4602e1ddf43e0fc5b71093bbc88069fe7f016187e78b61fd7a1fbd7ed03f1ce54b1dcf42e918f128c3bb58cc7eadfdd4fcb3ba455d5567788a9866834c805db4 SHA512 92d2a8aa60347ae964ed8d99e50c57addb4b3621fee34262a865565c6280f381dfc9f14792ddb330d89a1b7fbaaf07d4031bf6cbbd2ddfffa62634fd84779b49
-MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
+MISC metadata.xml 319 BLAKE2B 5849f61f420a09c73072e0890994385a5934d1ade144e107c85e1bda6a2348c79942a4a38ab8a138e19759a11870f47c563404fc34d5b95764fae42f968af7cf SHA512 785aafb20d068f923fe86429caa45c645940b956988461b331fb6d41fba8dcaebbb25ee37511d11f8184ec15a20f59453fb0b8aeeaa112188de2d289a528d946
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index 27faa4347b91..524a5553a331 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-  <description>Maintainer for actual Lucene issues.</description>
-</maintainer>
 <maintainer type="project">
   <email>java@gentoo.org</email>
   <name>Java</name>
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 4c63646b731f..992eec99323f 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,23 +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_aarch64_linux_hotspot_11.0.7_10.tar.gz 190134743 BLAKE2B 294ff3be6e68f14e9c53df04e7c4092a73fc27bfb5e1c35ab686ce6a30c69d0f7e9133815ddfdc0217098af287e1cd50353aaa204d3a813052d7c4375a8b8f1b SHA512 71054ff5c996a2ab4409d06d84900525ddd66e6b68bb2c558f0054343fb5fdc92efb4727ef6d9b91b1359e2b9c719ff3eb224eb1a9c5096753e723f12604535b
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz 178497327 BLAKE2B 59d84c0c09368e4bae499469efb0bc2f1f9c6f518fbcfbf75190e6e06eb4592b9da021b9101c769e6e6bd4c83e88217f177b489103f36f0ba92ba757df216989 SHA512 1ecc0b25295708af3011a5428f811a5c6c14f7edf17f853c7ed286687a3b2f982d4f8b0a45d9c7c24b476ccc60143f5e71c75464fab4d2d8be16c186f1e48341
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz 176497292 BLAKE2B 2bf45400c5d201cb6530d01b234da28078cf3a8e8bb23470a3c698b982ca700828baf653d00cf4aa1933193742474fc81b5df9054f33706545c46733a1ccc79d SHA512 adc40402de81f49fd691c7c07e805f6ee3a4298353417c5e92dd14d791253f4eaafcdb68837d614d7850f82006701b048df04cd6a1d25a16d125a2a38bc277d5
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz 193346198 BLAKE2B 506fc32c3c1ea729e79a044f31bafad995aaf7ac23bda47b21926493aa8d473195067a2d7989b0eafb91d7054222ebd5d924567b1d4b6935be7cff9fd25b1e90 SHA512 fa19880289ce8fa4a72fddd5633cf86a33d9f81346a5a7e51c06d7fc48f1953da01f020d15151d74a624ecc22a9f8f2c8ee4f996a4b3ac2ec79f0fb5207a40f8
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0aec56e4f6fe03cab88e0423e5b1ee24ccbe9eb0bd37d37449c596095d69e7fcb9044c0846a750d3d1a842c2f719d18a28510bd226a8aa9b383e4ae29993b SHA512 a6ef9864cde15e96abcb94f2e72db77f473e609fd162934fc3d35225223a20e20c464e44ce0c022dbf15f6d68d25bf2187271d8643e5cff2894f1839929050ae
-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_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86abc1708f23fd9e3809824fbe3084dddbf115a5b5d5fac7a4936e16f78033dafea0ee6e6113dc463e33f55907caefed4ae2cb85864ef1d59e7b45e2708a564 SHA512 c304aab812559a5da9b346759533ddb3e1bb6320e959e8dd01a0ae5cb3b85a6282492e7bdfafef40573c3970b79b8bac8e2abff021a43966a4b7e7edf80ae70a
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
-EBUILD openjdk-bin-11.0.6_p10.ebuild 3154 BLAKE2B 616c366bac9464a7e76c7d0b765130576e2e4daa6c34d740981f586ac0f79d42e5fd08948cdeaba3519e52cebc9e3d1fa112a4d4911533287b803de94090afa9 SHA512 dcda83c2280ba3e03e0b7f398cc1e09e95813ff3b2309cb47b71041e523a99df0123240944b94147be9be8cbff2a7c29a5c57fae92660c4fc25a0d86331d6fd1
 EBUILD openjdk-bin-11.0.7_p10.ebuild 3092 BLAKE2B 408614638686de5d29145d3e30665f99d6d7a46594363f7ca8973b560eebc214d57c0e7ecdb3944dae23ffba95283e4050945c6d73960b40ea08598b348e8aaa SHA512 619777afe9911ac1d15079ff4947ba8cb90c1bee3aa8cf837de203100a754bb8f19d4a022759661ba3962f9ff49e0ee18e80228b76604e467416b83f53a0ae46
-EBUILD openjdk-bin-8.242_p08.ebuild 2282 BLAKE2B 0ce7f74912c903a4c7a9520c27c9fb27b63a95da651d8a10a5eb834f88b7640157a7761f332c1c37897a6ad84d10b7da93a60d2ce7fed97663af57de25b62010 SHA512 ecefc384fef645bceef94a8a92f586c0dc42c0fcccc3612466501c0e2b004e9aa59f6101c7040bafa70826c75bbe03f9419ca66fdc6e456cb6f6e3f3cede0073
-EBUILD openjdk-bin-8.252_p09.ebuild 2158 BLAKE2B 72d726e6744d8e6b82f7d2a669773b3f0cc42ef6f2c3043082d122081782af8da46162b79570a55fe51f0cc657669a9273d762427315725ac8576e0afad0e135 SHA512 0758357d241b7e36b611bed1e4c7c0c908941bddcf930f267b92c7f96bfa03d84626bb93ae02d1d8713aa8a841777fe0c41c50a80de6e5706cad35a318ef0e12
+EBUILD openjdk-bin-8.252_p09.ebuild 2155 BLAKE2B d5832197b20177c54ea2fff0f636695f9755ebac665fb7eb72e2c010bda94d71aef30152ef41ffa6970292a56c73999587c3edee859cea7378da44a4c19417a8 SHA512 798bdc975d8b4073da3ee575b0a17ba929da4da9ccbbcdbbae0ec6fb32aed37f894707a3c16ab51ed3f61a6126d84a03b38ae6f6f988c9dc52e1cf619fc76e66
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
deleted file mode 100644
index bde265d1c316..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
+++ /dev/null
@@ -1,116 +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 aarch64 arm64)
-	$(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 ~arm64 ~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.242_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
deleted file mode 100644
index 8ca8ff8c3fe4..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.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="
-	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 ~arm arm64 ppc64"
-
-IUSE="alsa cups examples 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
-
-	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.252_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
index e44afe145d63..31d2a22f51d4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~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 5b4ac954ce9d..3e25d1ec74cf 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,11 +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.6_10.tar.gz 42198347 BLAKE2B e0022f46f0f3de41d28baf19bcea2c7d6237e80586b7a1e3fb2b97aced18d564fe03a6706b8a3fe97375ff6be395aceafd1e0dba6adaddaa7285b0b8eb24310b SHA512 0d1366c68ad12fafc76edddc7d385f612751182b5492cff4309d542a0e12b13c9b17ca89a0a8218ad0f8182b24285189158c43759db54645758c7ea8dc4d6ce9
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
-EBUILD openjdk-jre-bin-11.0.6_p10.ebuild 2726 BLAKE2B 147b9cb76e345b66a11641f25bc8619c6c375ed75bf252d4d5d1e41fb0b3de473647b34f89d1a7e90d742040aea9f8604cae1944469794cb8f80986c5dd7c688 SHA512 fb07d0c43999043f7e61eb4520965db912f956fa84d2476b8e228c690d6d5262f8a2db9b65c0af51b08249b74a5e5a0147bee20fe6d23bd86eeeda0d71f05e3f
 EBUILD openjdk-jre-bin-11.0.7_p10.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
-EBUILD openjdk-jre-bin-8.242_p08-r1.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
-EBUILD openjdk-jre-bin-8.252_p09.ebuild 1935 BLAKE2B 820f2a92594f10becc0214e63bb9ab33599c80692bbd3528c64e864f4de284f108b8e7644b0061016d0501f124b887be3e037fc927fede74ab6316f74fcc9c81 SHA512 834f46981819d4c5aac9689e1437333cdd55914608a04a98a4047d144f5b9b417c8a17a4c5aff03a297073f2a3e4eaf4b639abcbed7ac87ef4d3e7c89796bed0
+EBUILD openjdk-jre-bin-8.252_p09.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild
deleted file mode 100644
index ec55ede52337..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.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-8.242_p08-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08-r1.ebuild
deleted file mode 100644
index 512f8678a758..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08-r1.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 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}"/lib/security/cacerts
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	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.252_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
index a38a136210d8..512f8678a758 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.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 427554fa4c03..d35676d71fc2 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,28 +1,16 @@
-AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX openjdk-11-make43.patch 595 BLAKE2B b33a6e4979b8a37451ca2bcf09dc11bdc180d480a43ab4b3aa1f649bf1b90395cdb089fbcbc586f8b72127c9df8999f75a118e19444f7ed8c95990f8b7ed5410 SHA512 b4ca872d9f304c6f794a326d9cce387e08352e47923fcae7a9a8328d095d24822bbf6e2811a19c5e5c83d1981687eb7da1b11c791710350f396af0493f140318
 AUX openjdk-11.0.7_p10-sigsegv.patch 2639 BLAKE2B 70750a312fbacabc7e7131d135347864fc1807f397278e614427d1ef7c401c8020aa762bfea996307f24137fab09b44c6d2478e8e4bd548401bc9856a2e74859 SHA512 94babc6fd566f366ad3531b18512c06b6d79003d3692490158f9c2a3f9ed83dfe2ffd472999a3a4f00044ce1c4fa0c950bfb147ede7b9edce758c013820835bc
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST openjdk-11.0.6.tar.bz2 90755968 BLAKE2B 5bf23cc107ffae4cfc82be4f9b4b17de57575ee13e8fd461027e319a441c89c65fc852affb89f98a54307fa865ed5cdfb216809c6196866b31dfaa7011ad3d57 SHA512 d2296556c947c46883c16df3c1b7d809e6987dd6fd1a2667333e1245049560f3da744f6a51609a918cd9c509316b01160de2c080d5b9d3ed1af0b312dcbc575e
 DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12
-DIST openjdk-8.242.tar.bz2 452896 BLAKE2B 73176533ad62942f9a9547378aa5547a5f064076d24be527d0fb8b13c30a48680957bca731ee54771cae66e78f8800995426431ec266f0c61330a573efaacc23 SHA512 2a98dcead63b8e5dc6db841416b16c12a84f557c8efa6272bc4dc125333de1e20ab83050d1ee441a77f78b47b2c52dbc7d29810ce562218129eff29a5c79daca
 DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06
-DIST openjdk-corba-8.242.tar.bz2 1033721 BLAKE2B 5e0cee4d5b8faa0e940ed096f807ef231ce7c10b180ac89d5faf9ae276bab1044ca1ae6e826490e9d66f17ebd55026c17e7675a62dd4bf633cecfa3390944f97 SHA512 cf2cefcb590b7a1c637b709ce9f59c56a5354f90a3095726c3168962f4808ccb27a82909234343f510ad90dda56b83c934fa9ccb788ddf0f66e60c65b06d8e84
 DIST openjdk-corba-8.252_p09.tar.bz2 1034367 BLAKE2B d281a0b2e092c637adae4a206ac4b3f7beeb65f0fce5862f996ac71a814c5c3ee3261dd1145660cb50fde0398e42ca1e8c86d6aad07e43b44aa1f903c204b21c SHA512 08f348849eeadefee3dce9658b519091a14b9f972a1ee1dc51c37a3cd766e5265faed1931b967410ebff2132dd18cedf8840277d804b402ee43a862e37575ab1
-DIST openjdk-hotspot-8.242.tar.bz2 7953409 BLAKE2B 84ddc5bc00bca06c821219189ef19cd88cf0c5e9e43301b0fc654e1a31c68af0d7cab32d5ffedeb10b5593c3e8a846fc308076ffdc3292e0622a504650dfad56 SHA512 c67c7dd81e37b7e5ed43b0a720240ae55ebf7c31e58ebc1fc20cebb1bbecc91cda575a508ebe907d6ad21bad149596bcd913a24108c50fe2c26767910b5fe570
 DIST openjdk-hotspot-8.252_p09.tar.bz2 7954548 BLAKE2B a791d3c3385be3c8543bea1fc8d5bee9b3de873122ec850c3ad0082430083ec9dff2aa7c0cae33e628047a18a76fca8146b68aa52f32845cf7a61a45fdc8d9eb SHA512 53079cc255f75f246a67937bdf2b7715882f9baf8bcbc46ab2963c259359b1008642aeeae7ba7705c39f7a04e69ba286421a83b90294e81071f8e630db48ba7c
-DIST openjdk-jaxp-8.242.tar.bz2 2735931 BLAKE2B b8106b903000ef0b920b3a1228eda06bfaeb073138a2d0a5193f8258f285d0f7044b93d2ef3c7e9c28bb9a39c964475f8dfcbe012d49d4c2b7a1a7c5d6fb4906 SHA512 2c2148aba457c7fe6f2cdba444ef730d7d6bb91604327bf6c465f549acb768a711e4482d79db1848f9495c84ac650f42c48989bee47537c1be065e3204115896
 DIST openjdk-jaxp-8.252_p09.tar.bz2 2736174 BLAKE2B c198f144be7d0e7439e2184768db8649973f9e6869e67d3a950abd4872584160f4aaec1f4bec727f0d38830d34a4be7bd2f3e897b8ca10c758212262fa1672c3 SHA512 8027676e2928087a7d396c4f1edd3366336aaf8e3f201e2006cb7ddf91e518c9258d7ab6cc1c4fcc27e3e87bcecd96c55b2550d49f28b98beabf7553ea54ba3f
-DIST openjdk-jaxws-8.242.tar.bz2 2541712 BLAKE2B 020f47e5e9f9fed3d3dd506703ccc58bf04f696a093013e3e9eecf6e8a842ffe51d24188d204c9a84bc32157094e8ed2701beab8bfa2e6cad100ee093fa15107 SHA512 b0cce73a84887d35906a73006f36ef0913bcaf1fc27dc58e8873c95ee3b125b5bd977c23619f0a4f2489493776d4818d380ad1f126c62f325e2b155f6fc10dbf
 DIST openjdk-jaxws-8.252_p09.tar.bz2 2542417 BLAKE2B cf898e0c56269ea1f468c6b9e6cfbdf552caea562f833ade234d207f05be6f39f86d9d6794cc8b365ed3fde4bac5df41949e76cbaef61553f5557ec86dd593e6 SHA512 cadeec8825073db1fea13f1d83903ba2799324cfa8e25012c5dc98ec31976bd91b22526f98fc871d0ee01156943f4fc4ec115f7a81feb10e9f7d96f3f39a9313
-DIST openjdk-jdk-8.242.tar.bz2 47256764 BLAKE2B b4fadc09640ce2267d461052bb8e42a7872022675fd8193b4f45ef23d69ab33b0ab95745d01e723a10bb4359055caa94d5113b3c77b97a8ff14191677c5c49c8 SHA512 3796599041134924bb673f06390c7c2fe9c76842ec799338dd02b183a3578f46c93095591f39f60a0c9e106659d6b0abba1ec1a647610b45a0f337f71afa28b8
 DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65b284cb2a1e3a3c45f32ae69a807ae4bd9b9ce3cf9f464a9b8a87d07c49f2d7c48c8516b43d9d4372f578ad1cd4dfa17abb80 SHA512 96188acc8078c312c7118abfbc39874429f71e63c2e282fef2da9df29731ee13396bda28a8a1041b17b50da4bb00b1fe88404d682b0a850e5db10e59e39994f2
-DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e80f3642e935a1d6259d11dd23d007e5d7022643a8ffabdf5e12c7c7915a33e7edb263704eb60653dc2253e10aee6ca183fc84e SHA512 820e5828ae74c868f4c548e23ea1e7625e74d3b52fe951afe5a583910405658cd14d3d40b7b5f4bbb87d71439cafb77590ee2fe111fb9ad2f7c8f972d0380e53
 DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864
-DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6
 DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91
-EBUILD openjdk-11.0.6.ebuild 7589 BLAKE2B 0365c2bc2a5d6be6c392ff949132deb2fbcbee7b863f2d14c8766f0033a000c090982320e497e2bf63b4b9d6530f25c0a31ea457f1d32c0ad04032849441810c SHA512 f2bed942d39cdb53fc7b982672f00268cf129b489f175548a06b308abf6d7579f56d1ed6815e07f1824aacd4f4a3bce2df401a89690ab66d243db67e71b26d2d
-EBUILD openjdk-11.0.7_p10.ebuild 7787 BLAKE2B 00dddb1c19882b4c8a26313f8ac68691bceb74acc4b004c6e76d3303a92bbc3caf8d61631696162f574ea0d29557b9fa60e123cc81d3158bb9e52d9824e83a2a SHA512 372d046eda1b883fe581ff0cb65763fb31c2b9fea62cdfa609d2375ceff402827f521fbf51835e487bd2d809955572af190866bf9f58da46e300a1d8c27bd9d6
-EBUILD openjdk-8.242.ebuild 5793 BLAKE2B e9a48c08b300431ab0d06e82bc9ca723c879e97360885205f4b568034abb86047bf76364095ba494cc1032cbc2e6e8379570141fc64a3d8187411f188c8e81b7 SHA512 a2b4e27fbfb38b175471e9e2b46658953b16a2484cea7b376502c1641bfc1abe0ec1a5be402a9821c160a023d0672284dbd75c6ec27935395ea411bac79c05e8
-EBUILD openjdk-8.252_p09.ebuild 6002 BLAKE2B 15eace8ca5ebd03f01d32074a4530eefa70f00010d1fb8064a153246962e701a4d183ee52db11257d1562e47a2ec02fffe416b98fe42da3e4a19f2b1521f93ee SHA512 853adc5de00ff484cddabcfa52ab7381b513f0472b597041b336bb3b4dca3e165915e0acde6a2b76e64bbedb55cd87a48e366e281c9c2990d9a6f20ed5c46d89
+EBUILD openjdk-11.0.7_p10.ebuild 7832 BLAKE2B 6dd4fe2d18646f941320729eb2e013e4607b838f86a5d944e238064ad69e7b5417e7c523baeb3d786d20b76d93ab6c42f129f55aba29d0121cd866bf79369b15 SHA512 1e64f61d8623de658e52c861ba2c663155cb4f8ad6c1f8505ed7b3820f16db533f4ffa5f0d2124ca9d2c1c60e458aaad9ea7234843667f177e0f69fd9563a61f
+EBUILD openjdk-8.252_p09.ebuild 6045 BLAKE2B 2309b78f625316abc2e38864c03033b344df753b5865806fe336b203a4f56e998a5c74e1716e4ac4b55e971e2eadabd407991cfeeacb50432cd6a29fbf83bd23 SHA512 f510d8af93e004e607ceaa294e5bd333bbde83c46e934ceccff98e683c8c8c82326f647d834d82df4141068a480b6423031fa9d451d0d0556aff0c0f5f45bc0f
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/files/generate-cacerts.pl b/dev-java/openjdk/files/generate-cacerts.pl
deleted file mode 100644
index 17d29b36676d..000000000000
--- a/dev-java/openjdk/files/generate-cacerts.pl
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
-    if ($cert =~ /Issuer: /)
-    {
-        $_ = $cert;
-        if ($cert =~ /personal-freemail/)
-        {
-            $cert_alias = "thawtepersonalfreemailca";
-        }
-        elsif ($cert =~ /personal-basic/)
-        {
-            $cert_alias = "thawtepersonalbasicca";
-        }
-        elsif ($cert =~ /personal-premium/)
-        {
-            $cert_alias = "thawtepersonalpremiumca";
-        }
-        elsif ($cert =~ /server-certs/)
-        {
-            $cert_alias = "thawteserverca";
-        }
-        elsif ($cert =~ /premium-server/)
-        {
-            $cert_alias = "thawtepremiumserverca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass1ca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass1g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 1 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass1g3ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass2ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass2g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 2 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass2g3ca";
-        }
-        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass3ca";
-        }
-        # Version 1 of Class 3 Public Primary Certification Authority
-        # - G2 is added.  Version 3 is excluded.  See below.
-        elsif ($cert =~
-               /VeriSign Class 3 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass3g3ca";
-        }
-        elsif ($cert =~
-               /RSA Data Security.*Secure Server Certification Authority/)
-        {
-            $cert_alias = "verisignserverca";
-        }
-        elsif ($cert =~ /GTE CyberTrust Global Root/)
-        {
-            $cert_alias = "gtecybertrustglobalca";
-        }
-        elsif ($cert =~ /Baltimore CyberTrust Root/)
-        {
-            $cert_alias = "baltimorecybertrustca";
-        }
-        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
-        {
-            $cert_alias = "entrustclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
-        {
-            $cert_alias = "entrustglobalclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
-        {
-            $cert_alias = "entrust2048ca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS /)
-        {
-            $cert_alias = "entrustsslca";
-        }
-        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
-        {
-            $cert_alias = "entrustgsslca";
-        }
-        elsif ($cert =~ /The Go Daddy Group/)
-        {
-            $cert_alias = "godaddyclass2ca";
-        }
-        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
-        {
-            $cert_alias = "starfieldclass2ca";
-        }
-        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
-        {
-            $cert_alias = "valicertclass2ca";
-        }
-        elsif ($cert =~ /GeoTrust Global CA$/)
-        {
-            $cert_alias = "geotrustglobalca";
-        }
-        elsif ($cert =~ /Equifax Secure Certificate Authority/)
-        {
-            $cert_alias = "equifaxsecureca";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureebusinessca1";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
-        {
-            $cert_alias = "equifaxsecureebusinessca2";
-        }
-        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureglobalebusinessca1";
-        }
-        elsif ($cert =~ /Sonera Class1 CA/)
-        {
-            $cert_alias = "soneraclass1ca";
-        }
-        elsif ($cert =~ /Sonera Class2 CA/)
-        {
-            $cert_alias = "soneraclass2ca";
-        }
-        elsif ($cert =~ /AAA Certificate Services/)
-        {
-            $cert_alias = "comodoaaaca";
-        }
-        elsif ($cert =~ /AddTrust Class 1 CA Root/)
-        {
-            $cert_alias = "addtrustclass1ca";
-        }
-        elsif ($cert =~ /AddTrust External CA Root/)
-        {
-            $cert_alias = "addtrustexternalca";
-        }
-        elsif ($cert =~ /AddTrust Qualified CA Root/)
-        {
-            $cert_alias = "addtrustqualifiedca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Hardware/)
-        {
-            $cert_alias = "utnuserfirsthardwareca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
-        {
-            $cert_alias = "utnuserfirstclientauthemailca";
-        }
-        elsif ($cert =~ /UTN - DATACorp SGC/)
-        {
-            $cert_alias = "utndatacorpsgcca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Object/)
-        {
-            $cert_alias = "utnuserfirstobjectca";
-        }
-        elsif ($cert =~ /America Online Root Certification Authority 1/)
-        {
-            $cert_alias = "aolrootca1";
-        }
-        elsif ($cert =~ /DigiCert Assured ID Root CA/)
-        {
-            $cert_alias = "digicertassuredidrootca";
-        }
-        elsif ($cert =~ /DigiCert Global Root CA/)
-        {
-            $cert_alias = "digicertglobalrootca";
-        }
-        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
-        {
-            $cert_alias = "digicerthighassuranceevrootca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA$/)
-        {
-            $cert_alias = "globalsignca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA - R2/)
-        {
-            $cert_alias = "globalsignr2ca";
-        }
-        elsif ($cert =~ /Elektronik.*Kas.*2005/)
-        {
-            $cert_alias = "extra-elektronikkas2005";
-        }
-        elsif ($cert =~ /Elektronik/)
-        {
-            $cert_alias = "extra-elektronik2005";
-        }
-        # Mozilla does not provide these certificates:
-        #   baltimorecodesigningca
-        #   gtecybertrust5ca
-        #   trustcenterclass2caii
-        #   trustcenterclass4caii
-        #   trustcenteruniversalcai
-        else
-        {
-            # Generate an alias using the OU and CN attributes of the
-            # Issuer field if both are present, otherwise use only the
-            # CN attribute.  The Issuer field must have either the OU
-            # or the CN attribute.
-            $_ = $cert;
-            if ($cert =~ /OU=/)
-            {
-                s/Issuer:.*?OU=//;
-                # Remove other occurrences of OU=.
-                s/OU=.*CN=//;
-                # Remove CN= if there were not other occurrences of OU=.
-                s/CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            elsif ($cert =~ /CN=/)
-            {
-                s/Issuer:.*CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            s/\W//g;
-            tr/A-Z/a-z/;
-            $cert_alias = "extra-$_";
-
-        }
-        while (-e "$cert_alias.pem")
-        {
-            $cert_alias = "$cert_alias" . "_";
-        }
-    }
-    # When it attempts to parse:
-    #
-    # Class 3 Public Primary Certification Authority - G2, Version 3
-    #
-    # keytool says:
-    #
-    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
-    # Unparseable AuthorityInfoAccess extension due to
-    # java.io.IOException: Invalid encoding of URI
-    #
-    # If we do not exclude this file
-    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
-    # on this cert, printing:
-    #
-    # Couldn't verify: java.security.SignatureException: Signature
-    # does not match.
-    #
-    elsif ($cert =~
-           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
-    {
-        $write_current_cert = 0;
-        $pem_file_count--;
-    }
-    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
-    {
-        if ($in_cert_block != 0)
-        {
-            die "$file is malformed.";
-        }
-        $in_cert_block = 1;
-        if ($write_current_cert == 1)
-        {
-            $pem_file_count++;
-            if (-e "$cert_alias.pem")
-            {
-                print "$cert_alias";
-                die "already exists"
-            }
-            open(PEM, ">$cert_alias.pem");
-            print PEM $cert;
-        }
-    }
-    elsif ($cert eq "-----END CERTIFICATE-----\n")
-    {
-        $in_cert_block = 0;
-        if ($write_current_cert == 1)
-        {
-            print PEM $cert;
-            close(PEM);
-        }
-        $write_current_cert = 1
-    }
-    else
-    {
-        if ($in_cert_block == 1 && $write_current_cert == 1)
-        {
-            print PEM $cert;
-        }
-    }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
-    print "$pem_file_count";
-    die "Number of .pem files produced does not match".
-        " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
-    system "$ARGV[0] -noprompt -import".
-        " -alias `basename $pem_file .pem`".
-        " -keystore cacerts -storepass 'changeit' -file $pem_file";
-    unlink($pem_file);
-    $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
-    die "Number of certs added to keystore does not match".
-        " number of certs read from $file.";
-}
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild
deleted file mode 100644
index 0f8e793023de..000000000000
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild
+++ /dev/null
@@ -1,271 +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}-ga"
-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 -> ${P}.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 )"
-
-PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" )
-
-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.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
index 76d41a4eb082..b5d448dd9e84 100644
--- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
@@ -96,7 +96,9 @@ openjdk_check_requirements() {
 
 pkg_pretend() {
 	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+	fi
 }
 
 pkg_setup() {
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild
deleted file mode 100644
index 617bc845036a..000000000000
--- a/dev-java/openjdk/openjdk-8.242.ebuild
+++ /dev/null
@@ -1,218 +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}-ga)
-
-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 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_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-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
-
-	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.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild
index 1651145e6c0b..1b3576eacaf4 100644
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild
@@ -27,7 +27,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="
@@ -95,7 +95,9 @@ openjdk_check_requirements() {
 
 pkg_pretend() {
 	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+	fi
 }
 
 pkg_setup() {
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index b1483bf81586..9c7bda6bae97 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -12,10 +12,6 @@ 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.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c
-DIST openjfx-11.0.7_p0.tar.bz2 63969275 BLAKE2B 50f30cf736ff8713f0be5c4404d6494a96bdaf23082eff8b83ecd704fb417d7e54502f0e0fff9a993d814d9ed9cec98f152487bc96bf929a67b74ec08615f053 SHA512 54b1b010800d3edfc9bb1319860fceab2083d77cbcb45ebe4baefbecf7e0ac2756cb24470cf4c9e7f53d44d7bf345c5f869f9d50748da6bb9d8be8bf1e325ec3
 DIST openjfx-11.0.7_p1.tar.bz2 64302415 BLAKE2B 1a0705b5a668025dd73cc92af35b9e33d698adb1130dace1c079e20f6f6a848517102fe28f7e5e62a141fdfbd6f8086e9a2bb96573a597245d935e5d80918c4c SHA512 ff2b0af1d4b18963bd8ce26c20ab1def268fec8e6030732336edec3aedf58f8bdc25b61b3cd1d70c7d814a3ee96413965f26fba2426c083338c62d8483e93564
-EBUILD openjfx-11.0.6_p2.ebuild 6330 BLAKE2B 8317c71dc033af4f8d0933a0d16d736a76d48b0acc5858ee17ac42f85b7ddcaa8baa7a1536a290c2c379d2fc135da5b6592b95885158da19fe1b13785db9d32d SHA512 510d01fad9f3ae9669235d7ddbfbcdebd38b49d31585e4f1d254824b6ba4207344cb37ff6785b5d5c90cd3af1d3bd3e2067ac7aaeacea1ab35579b7982b6e91f
-EBUILD openjfx-11.0.7_p0.ebuild 6368 BLAKE2B 6126fddfec0ad94b6a1a2df962cbe30e29b2a89981dbe603179a06b75b060b866467a290587773f38e8760a84f9180e01a593d3a58b9f400a23d321124708da8 SHA512 519649070773da5ac3010654e4e79def45e97e2d5dc0e78304fa338ca6dc4b71026d6e5bb99557723b5ea28f54329b330575b60414d0c6ba52bfaf03eca9198a
-EBUILD openjfx-11.0.7_p1.ebuild 6368 BLAKE2B 6126fddfec0ad94b6a1a2df962cbe30e29b2a89981dbe603179a06b75b060b866467a290587773f38e8760a84f9180e01a593d3a58b9f400a23d321124708da8 SHA512 519649070773da5ac3010654e4e79def45e97e2d5dc0e78304fa338ca6dc4b71026d6e5bb99557723b5ea28f54329b330575b60414d0c6ba52bfaf03eca9198a
+EBUILD openjfx-11.0.7_p1.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
deleted file mode 100644
index 23574d61505c..000000000000
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-EGRADLE_VER="4.8"
-
-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}-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
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	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://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"
-KEYWORDS="-* ~amd64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-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 JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
-
-	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
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-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
-
-	# build is very sensetive to doc presense, take extra steps
-	if use doc; then
-		local jdk_doc
-		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
deleted file mode 100644
index 957104f45e10..000000000000
--- a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.8"
-
-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}-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
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	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://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"
-KEYWORDS="-* ~amd64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-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 JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
-
-	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
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-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
-
-	# build is very sensetive to doc presense, take extra steps
-	if use doc; then
-		local jdk_doc
-		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}
diff --git a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
index 957104f45e10..5f211eba215c 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
@@ -97,7 +97,8 @@ egradle() {
 	unset ANT_HOME
 
 	einfo "gradle "${gradle_args[@]}" ${@}"
-	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+	# TERM needed, otherwise gradle may fail on terms it does not know about
+	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
 }
 
 pkg_setup() {
@@ -168,7 +169,7 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -Wno-error
+	append-flags -Wno-error -fcommon
 
 	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
 	#FIXME: should we enable webkit? doubt so
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index e969e596661e..4734891b0aa7 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,3 +1,5 @@
 DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52 SHA512 89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+DIST tomcat-native-1.2.24-src.tar.gz 419572 BLAKE2B 572f6d64b8f4c22ed1ab68efcec5cd1c57fe01e7b0830dea979039cb702a2930458e7bb31abdeddcacc6d673513c896ca46d28ece681c6c42938498351962b36 SHA512 5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
 EBUILD tomcat-native-1.2.23.ebuild 1178 BLAKE2B 10749abb4552c7f7411f65b225afb1c8f42095912077b1f8783de3f597152c5783ed0d986e644ebac986d9a59e835ff888e4ac0d0461eb31d2202b6fd01e6ece SHA512 b62fc8cc5d355898530a7a7dc9db642ce3074d5d72a6da7a2ee25a211c55120d29b631a61b1d3ac5cb4aa7c1341333a18929c0d6c1fb8cd2223ea5a9b12f64a2
+EBUILD tomcat-native-1.2.24.ebuild 1179 BLAKE2B 6f6768247218c3f40ea7b89d03468e1bded2962b354f9d14cb4956a3d0656ad84017a2d9b717d12b0bb4c65c7e5587f21ed014974ca86e7c84911261ae81a0b1 SHA512 25aff507afd4a8b1e4f0a485b643caa31b234079ba368a6a8d524f2cc70d9c32de19a967f176c8a59dd276eb3504a01bb684ae6b438fbcd102f1e416b1e863ad
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
new file mode 100644
index 000000000000..2dd1db52c691
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8"
+
+DEPEND=">=virtual/jdk-1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 3384ff3d73f4..677e351579f6 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -7,21 +7,17 @@ AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 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-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.33-src.tar.gz 5831264 BLAKE2B 7ef5b28dfc4f24003075012cfe6403060dfc908386577ea3dbab3d7a4eca1d22cdcaab3f821079a90d9407030bedf657f5abd9829d643f699ba875b7b702f0a3 SHA512 73ffb36dc7331bf9e455b599b128c51da8f90222bd3cb296e211d266c18964bf66004524725acd6d3e29099d2fdc3180892c228b2a00b06544455240bf05c9b0
+DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
 DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
+DIST apache-tomcat-9.0.35-src.tar.gz 5887816 BLAKE2B 8103a50a62aa527861fdc35ce8256d9ff0b7185bfa647e25c30c226f9850e88632e0c1e3575bac3a07513fe9c9777b4ef230275e685f48b0bbc733bc68ff7dad SHA512 8931c0f7c30f50d352879f8dfddc02fa59d7128813399e4eca3994be7cf2448e32e726a3cb8b387a5470ccbfa3fb74d0192c825b5f68bbb9fb6b43a9353cb24a
 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-7.0.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
-EBUILD tomcat-servlet-api-8.5.51.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
-EBUILD tomcat-servlet-api-8.5.53.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
-EBUILD tomcat-servlet-api-8.5.54.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
-EBUILD tomcat-servlet-api-9.0.33.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
-EBUILD tomcat-servlet-api-9.0.34.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
+EBUILD tomcat-servlet-api-8.5.54.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
+EBUILD tomcat-servlet-api-8.5.55.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
+EBUILD tomcat-servlet-api-9.0.34.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
+EBUILD tomcat-servlet-api-9.0.35.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.100.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.100.ebuild
deleted file mode 100644
index 0bd7295e539b..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.100.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
deleted file mode 100644
index 085f83e7999e..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.53.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-8.5.54.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.54.ebuild
index b6216e53c6b0..085f83e7999e 100644
--- 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
@@ -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.51.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
index 085f83e7999e..b6216e53c6b0 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.55.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-9.0.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.34.ebuild
index 9ddac4eebd99..146f9bc7ea9f 100644
--- 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
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~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-9.0.33.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.35.ebuild
index 146f9bc7ea9f..9ddac4eebd99 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.33.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.35.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-java
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)