dev-java/*openjdk*, virtual/{jdk,jre}: bump, rm old

18 files changed, 30 insertions, 666 deletions

diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index 0203305..c9b3495 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,16 +1,16 @@
-DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 76400429 SHA256 b557224d11e20a8d85993e628aa3be9184855add8da932c91eb8e3237e68c365
-DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 76272820 SHA256 266cd27015e67abfe85dabb584657135bf7954e6c1fcd1155c5d5b9d36f0f1e9
-DIST OpenJDK11U-debugimage_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 74779109 SHA256 df30b58c8d7e7604f4d52692b089b5eed8adefc75437d2508c3e247fb2ae232d
-DIST OpenJDK11U-debugimage_x64_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 74846215 SHA256 4bbd02da12db8e70feea2859a9585585ce49e6496f7706146179ea7b5143e703
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 196415558 SHA256 5bcaa2075ce5bf634b542c04ea79b9ca505407b6f94d2d8350c712da387120d9
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 196402945 SHA256 ef3e3bb44efc6151a2cf8d894b771d8739c742423856c8e0916fa17013824c93
-DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 195566437 SHA256 9ab79436180d41809f4fca8afe43e778ae2d82c7b50f3653c62d7a2728150836
-DIST OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 195553141 SHA256 ef91324c2d5b0d9660150164f4e2b0fcc890ffacf4154447fb8bfc1596f1a8a3
-DIST OpenJDK14U-debugimage_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 75658399 SHA256 c2fbd9bb2b320f0a87af49c3c29391859ea8751c13427bb73dd10ffd3806573d
-DIST OpenJDK14U-debugimage_ppc64le_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 75782142 SHA256 784aed26441c7460c82c22f65848a967d17aa5c63a17b8b692794c510ba4ccfe
-DIST OpenJDK14U-debugimage_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 74251342 SHA256 f1dc1dfab7f3ce301e459d92d48c8f266c8f623412a8df5c40ad3c0844d2b45c
-DIST OpenJDK14U-debugimage_x64_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 74306582 SHA256 54bdca8dca799ea40271f338e4fcf446fc0bba065dee37967fde71ede34d2f0c
-DIST OpenJDK14U-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 203990535 SHA256 177fd161ae14df92203d70cd618559daf889ec0c172d6ee615859352f68a2371
-DIST OpenJDK14U-jdk_ppc64le_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 202921752 SHA256 d758ea2d0916ce8fbcf07af65509701c97f20324cd3632ef1c1ca10568dbede4
-DIST OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 202955761 SHA256 306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be
-DIST OpenJDK14U-jdk_x64_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 202942292 SHA256 ccfc3ad03d168fc8c097f8e3947d865e6f7f1acfc63c0ded67eac091c83699c5
+DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 274330919 SHA256 ce49978d6a43d7386b5446a7d89e417bdd3b59d1fa9373ee3be82ade5cf7bf73
+DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 275050948 SHA256 950e49597c3eda231a842290faebc804ba3b12f78be2e72945101b4a525aa993
+DIST OpenJDK11U-debugimage_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 283655449 SHA256 b3ff0ffa6261552344d1f0e9a70764fc364c8a86f4363d02215483953f28da41
+DIST OpenJDK11U-debugimage_x64_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 283696856 SHA256 f9d6f4b5e1a980cc18cf2134ed97a64125576a952f9f974ca6401f0df17a402f
+DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 198038055 SHA256 acef470ed75f6938168c39b4397fc80ef0d4e12adf1b73e359c84233c08d30e3
+DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 198026528 SHA256 15aa2aed41894145bbfa75c902167506245b9e1e4d8137001e5c05f3cd5bbeae
+DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 196214601 SHA256 812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091
+DIST OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 196194229 SHA256 65242e4aeb0162fb92c1d3903eda0fdd4b1b05277dbd2c4c9910cfeb48a79063
+DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 78543674 SHA256 b5c362e6fcfe80030dd7092872f3d33d4c1ab72f3ec832294a8815fab7190ad4
+DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 78477900 SHA256 bde5846162ba53a347e434b9f83708eda22377b44e8e331be5deac07e5add7f8
+DIST OpenJDK15U-debugimage_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 76894599 SHA256 7182fa71785a774762310fe2ac3d23de1860902001f153d70dc167709e4ec51a
+DIST OpenJDK15U-debugimage_x64_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 76953451 SHA256 26aaf1c7d02417a9b1f0b033468b68526d79dc391124d8d43a56d9cd1f2028f8
+DIST OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 197776302 SHA256 26b083d7b1bcb31040210c02ce33b4fb28ed5ad92de72a3e681e51e04d6beb5c
+DIST OpenJDK15U-jdk_ppc64le_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 196711663 SHA256 6bd3af790febbf1080dd3bbc4ae985d6bf7b4b47dc59fd649cca0b384d0eddd4
+DIST OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 196800767 SHA256 b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d
+DIST OpenJDK15U-jdk_x64_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 196771540 SHA256 2dd1dac8526a07440fc890a3269b4bd9250e1c01c5120c3f36381204541eca23
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.8.10.0.21.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild
index be69cfd..be69cfd 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.8.10.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.9.11.0.23.0.ebuild
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-14.0.2.12.0.21.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild
index c3b8f55..c3b8f55 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-14.0.2.12.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.1.9.0.23.0.ebuild
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index 1717b02..94db01f 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,8 +1,8 @@
-DIST OpenJDK11U-jre_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 42189120 BLAKE2B de720db5ce4d40d5e9cf71a31f8979d190b72cf5510ff31fc755e24702174ccb59988b8e746b3ccb11cfdbc67039aa179f55a9864f139927e250b9edd8917267 SHA512 89e301db5d185d48614a4135349ee92e647e566bf222dd54ca3479226be645d29354d5ccbed1e9ea3b7ef73ba64b24b650fe814e20881292b6348a9aa25df1af
-DIST OpenJDK11U-jre_ppc64le_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 42082361 BLAKE2B e7dbc5a1deef3996a82c7207fe682e830d94bb143c16bb057f6609fe7b6b56d56569668751d3333af836dd3b45f5eef207916bf17eaecdeaa27b9fa359cbbe1e SHA512 7baa12613f3f4b4ef7a0301b5c1e262c3446e097cea763a7adfe2602785ad3ab3cb74cc542a17c6b7c717c0eb9f0304cde9a48b13f2864fff31bffdee5750dbd
-DIST OpenJDK11U-jre_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 41781638 BLAKE2B 16be8630e7781c3f35072bbac254640a4d41f9b27799b56d7f78b63940e51d9f28a4168cbeaabd885562520d227e9efb4c9d80690c9ad02f8e0b7911023cb51e SHA512 51578fd2722c22cb50c678f74612409d34666ac8804c0efa705ed0d695c32ce3f5829f5fbe9be6d3336f39935b7eedad192621977c5e13f365b51e1fb03fd6df
-DIST OpenJDK11U-jre_x64_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 41774880 BLAKE2B 7e6d75ee457be194ae4c478cd9c4c8c64607b4ed19bf59d313d3ad643d57b1fa0c161ce74e0ae9d2d667a3016a977a6e6de3cd794429e69972010d472493d3fc SHA512 ac2111079c72e349122356275ab6d7b38b13188aec58ee97c7ced2daf3c98900c76abaf33bad5dd8f43321d6786bd71d0cc02836a5820eb0ce20b24b78262293
-DIST OpenJDK14U-jre_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 50706170 BLAKE2B 3898aa34e9a5775c1b7ac343d73a105a996f1288b853e4dc80a66816c548b4ced435d77152f89cc8828cbd8b5c959a34c8c762753e52a3ff880840a7cb334885 SHA512 00400a14d35e722170e09d8a2d9357747244e3e2815fb7fd04769d4656b2847196b1c680215ba9e5ff0a849c778145cc7cea39878446c1f7404baa055b562603
-DIST OpenJDK14U-jre_ppc64le_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 50281280 BLAKE2B c00c786fa760ddab538a17cb356638e25bf62930b86426956790be4a7c1c58bb94ca30f27a11587c757f628ef6a012dfbbcbbbf9878ee5899358bf590489b173 SHA512 abfb2df61390e288169e8fa75f3abb754358daa1da9ec904795a1bbcd11c5642bd24300763a84574d3567f6e697a3c347ec15c1740cc5fff4f2b5819abba631f
-DIST OpenJDK14U-jre_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 50282552 BLAKE2B 099d9cea63981c13d0f545cb22aed7acb0686d77feda38af838e37a2c41d8918ea9261c6ae3195ad0c9e56cbfcbc18b8d69c8240afda5c89417d9eda5c38a863 SHA512 1071806ed9bc1aaf5f18cec271d32993e92cb9dc3fe21c42028bd9f25e7b1e2c362d00518ee2dd53000712fe74091379731669078eaaa7f33c440f4b95df061f
-DIST OpenJDK14U-jre_x64_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 50277370 BLAKE2B e450d4ca0cfbb556f4e19341da723605629161a17f18b192343e1413c81e61cc36517df3851231fe3845e4a29a2e7eb23dae26ae0055a02528e0516d9187aa54 SHA512 037a37ecb2e97c94ed752fb0e17278facd9e76d8ea729428491d709d6297e70d12161dd8392f32dfc0ac660ec960feb7aeea01521d770c01b6192b1bf0caa299
+DIST OpenJDK11U-jre_ppc64le_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 42833384 SHA256 256a01e045867dcbbc541a6dd95ed315599f737b278319c4b936ce5a8a464424
+DIST OpenJDK11U-jre_ppc64le_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 42907228 SHA256 24bebd921510f1af6d2a87949943b3df70a180021bad2db868368a5e7d1bf6bb
+DIST OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz 42056640 SHA256 54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111
+DIST OpenJDK11U-jre_x64_linux_openj9_linuxXL_11.0.9_11_openj9-0.23.0.tar.gz 42048354 SHA256 f596606e248b2937da5ac919c6911a1b24e113eab1d822c04d6a2e2590f226a0
+DIST OpenJDK15U-jre_ppc64le_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 49751865 SHA256 ea9e8225edb9fee7c425983fd8bb370327867dd06f4c9763834bde9977bfa81f
+DIST OpenJDK15U-jre_ppc64le_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 49209503 SHA256 627b7ffaa3855bc49129117efaf92a66d9abb5a78df1d965d2470400d357cabd
+DIST OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz 49260702 SHA256 e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b
+DIST OpenJDK15U-jre_x64_linux_openj9_linuxXL_15.0.1_9_openj9-0.23.0.tar.gz 49248960 SHA256 72b8a98f3dce4b126b7d6a7d1d90ca910846ccd18d42d71a8366f5b35ba90c67
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.8.10.0.21.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild
index 08c841c..08c841c 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.8.10.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.9.11.0.23.0.ebuild
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-14.0.2.12.0.21.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild
index 08c841c..08c841c 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-14.0.2.12.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.1.9.0.23.0.ebuild
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild
index b58f4d3..b58f4d3 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.21.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.23.0.ebuild
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
deleted file mode 100644
index 36ba00a..0000000
--- a/dev-java/openj9-openjdk/openj9-openjdk-14.0.21.0.ebuild
+++ /dev/null
@@ -1,304 +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 versionator
-
-SLOT="$(get_major_version)"
-OPENJ9_PV="$(get_version_component_range 2-4)"
-OPENJ9_P=openj9-${OPENJ9_PV}
-FREEMARKER_PV=2.3.30
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-if [[ ${OPENJ9_PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git"
-	OPENJ9_EGIT_REPO_URI="https://github.com/eclipse/openj9.git"
-	OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
-else
-	SRC_URI="
-		https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
-		https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
-		https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
-	"
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap"
-
-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 )
-
-	dev-libs/elfutils
-	dev-libs/libdwarf
-	sys-process/numactl
-"
-
-# 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
-	dev-lang/nasm
-	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}= )
-	|| (
-		virtual/jdk:${SLOT}
-		virtual/jdk:$((SLOT-1))
-	)
-	|| (
-		dev-java/freemarker-bin
-		dev-java/freemarker
-	)
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-if [[ ${OPENJ9_PV} == 9999 ]]; then
-	S="${WORKDIR}/openj9-openjdk-jdk${SLOT}"
-else
-	S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}"
-fi
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 3GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=3192
-	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
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${OPENJ9_PV} == 9999 ]]; then
-		EGIT_CHECKOUT_DIR=openj9 EGIT_REPO_URI=${OPENJ9_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_CHECKOUT_DIR=openj9-omr EGIT_REPO_URI=${OPENJ9_OMR_EGIT_REPO_URI} git-r3_src_unpack
-		# unpack openjdk last to save correct EGIT_VERSION
-		EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if [[ ${OPENJ9_PV} == 9999 ]]; then
-		ln -s ../openj9 openj9 || die
-		ln -s ../openj9-omr omr || die
-	else
-		ln -s ../openj9-${OPENJ9_P} openj9 || die
-		ln -s ../openj9-omr-${OPENJ9_P} omr || die
-	fi
-
-	default
-
-	eapply -d openj9 -- "${FILESDIR}/openj9-make-jvmti-test-variables-static.patch"
-	eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
-	eapply -d omr -- "${FILESDIR}/omr-fam.patch"
-
-	if [[ ${OPENJ9_PV} != 9999 ]]; then
-		sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
-			   -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
-			   -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
-			   closed/OpenJ9.gmk
-	fi
-
-	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
-
-	# https://bugs.openjdk.java.net/browse/JDK-8249792
-	# not backported to 14?
-	append-flags -fcommon
-
-	if has_version dev-java/freemarker; then
-		local freemarker=freemarker
-	else
-		local freemarker=freemarker-bin
-	fi
-
-	# 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-stdc++lib=dynamic
-		--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="${PVR}"
-		--with-version-pre=""
-		--with-version-opt=""
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-
-		--with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar)
-		--disable-warnings-as-errors{,-omr,-openj9}
-		$(use_enable ddr)
-		$(use_with large-heap noncompressedrefs)
-	)
-
-	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)
-		# https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72
-		#LOG=debug
-		$(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}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.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/openj9-openjdk/openj9-openjdk-14.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild
deleted file mode 100644
index 43c0fef..0000000
--- a/dev-java/openj9-openjdk/openj9-openjdk-14.9999.ebuild
+++ /dev/null
@@ -1,303 +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 versionator
-
-SLOT="$(get_major_version)"
-OPENJ9_PV="$(get_version_component_range 2-4)"
-OPENJ9_P=openj9-${OPENJ9_PV}
-FREEMARKER_PV=2.3.30
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-if [[ ${OPENJ9_PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git"
-	OPENJ9_EGIT_REPO_URI="https://github.com/eclipse/openj9.git"
-	OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
-else
-	SRC_URI="
-		https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
-		https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
-		https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
-	"
-fi
-
-LICENSE="GPL-2"
-KEYWORDS=""
-
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap"
-
-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 )
-
-	dev-libs/elfutils
-	dev-libs/libdwarf
-	sys-process/numactl
-"
-
-# 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
-	dev-lang/nasm
-	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}= )
-	|| (
-		virtual/jdk:${SLOT}
-		virtual/jdk:$((SLOT-1))
-	)
-	|| (
-		dev-java/freemarker-bin
-		dev-java/freemarker
-	)
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-if [[ ${OPENJ9_PV} == 9999 ]]; then
-	S="${WORKDIR}/openj9-openjdk-jdk${SLOT}"
-else
-	S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}"
-fi
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 3GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=3192
-	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
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-	fi
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${OPENJ9_PV} == 9999 ]]; then
-		EGIT_CHECKOUT_DIR=openj9 EGIT_REPO_URI=${OPENJ9_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_CHECKOUT_DIR=openj9-omr EGIT_REPO_URI=${OPENJ9_OMR_EGIT_REPO_URI} git-r3_src_unpack
-		# unpack openjdk last to save correct EGIT_VERSION
-		EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	if [[ ${OPENJ9_PV} == 9999 ]]; then
-		ln -s ../openj9 openj9 || die
-		ln -s ../openj9-omr omr || die
-	else
-		ln -s ../openj9-${OPENJ9_P} openj9 || die
-		ln -s ../openj9-omr-${OPENJ9_P} omr || die
-	fi
-
-	default
-
-	eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
-	eapply -d omr -- "${FILESDIR}/omr-fam.patch"
-
-	if [[ ${OPENJ9_PV} != 9999 ]]; then
-		sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
-			   -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
-			   -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
-			   closed/OpenJ9.gmk
-	fi
-
-	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
-
-	# https://bugs.openjdk.java.net/browse/JDK-8249792
-	# not backported to 14
-	append-flags -fcommon
-
-	if has_version dev-java/freemarker; then
-		local freemarker=freemarker
-	else
-		local freemarker=freemarker-bin
-	fi
-
-	# 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-stdc++lib=dynamic
-		--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="${PVR}"
-		--with-version-pre=""
-		--with-version-opt=""
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-
-		--with-freemarker-jar=$(java-pkg_getjar --build-only $freemarker freemarker.jar)
-		--disable-warnings-as-errors{,-omr,-openj9}
-		$(use_enable ddr)
-		$(use_with large-heap noncompressedrefs)
-	)
-
-	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)
-		# https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72
-		#LOG=debug
-		$(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}"
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.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/openj9-openjdk/openj9-openjdk-15.0.22.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild
index 350e2f3..350e2f3 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-15.0.22.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-15.0.23.0.ebuild
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 35c8b2d..797c24b 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,4 +1,4 @@
-DIST OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.2_12.tar.gz 208174601 BLAKE2B b721417687095109ff6eebdf366df5fb6f3f36393bd9681aa8246213363459c54ef2e7a2ff9b1555ce84572eb29c9c1bb671cd7705fe85f3b2822942138a7957 SHA512 dde5b262092abce8da1aff63cda75c9e47cd9d11597d3ccf8595f8c24a2299da9a161bf827e47480ce74daa60625a30502f894497b03217c7724f6ff19603b95
-DIST OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz 196776784 BLAKE2B 36d43f63ea0a1b30a62fffe72c542110cc9f3f0824a09c03a2c481b8d43d8459554e6585bf5a80f6e35f1d01e423038f40a0352812c167c9892242bd3cca7af1 SHA512 52a38a7a95e7ed7a385ecef33c6667ddec4e2b49652c1ca482c314fc528edb0c4322326f3839da22454058f950058433ad1465bc75da7e516d6b159ead45e55d
-DIST OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.2_12.tar.gz 192668722 BLAKE2B e883354d400169b2252c35f1af63ce90413b0bfff686ef5e0222a5f22cb7443627035ee52b93cb63cebc66f4f4d670eacfbee896ee2431c26cfd9822435f58a3 SHA512 4115be505b0a2ebde43385bea53b119edae2ece62db87ca0c256040e4c2051163f5c307867edd145d617fc4776988777322034830328c8977bffa281620bfa8e
-DIST OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz 210764986 BLAKE2B 6a9613aa109197dd0e9b23097238da49dbb649cb5c5eac032534be80b4bbcd972548a84b4fb31e8a0dd3011268733d23d5c6b6660da7282d94a6a19cc128f0e4 SHA512 2701f7e08bc1f03f13bbea2b3567c12d96b23a27e5a7420addd696397f1fbee7e84283df64976c647218f1b321cda8ae0ca3b2eda057f5ebe335a17aae71917a
+DIST OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz 204293353 SHA256 84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e
+DIST OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz 190092254 SHA256 bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2
+DIST OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.1_9.tar.gz 188859845 SHA256 bc5347c011025f9830a420f943f52b97ebf0fc642ebff9a25bf465d0a6f3f3b9
+DIST OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz 206689671 SHA256 61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e
diff --git a/dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild
index 3f169a3..3f169a3 100644
--- a/dev-java/openjdk-bin/openjdk-bin-14.0.2_p12.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-15.0.1_p9.ebuild
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index cfee5f6..8b471de 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1 +1 @@
-DIST OpenJDK14U-jre_x64_linux_hotspot_14.0.2_12.tar.gz 56839756 BLAKE2B 1e4c9b2f9a3daed50748cf53b74373ff9ef0c70b3a7d30c65efdcbc4e5c8b1cdfe55546d316aefe3019e66ef35d771d14bde39143ebb74bd4c7db467cdf90064 SHA512 283a79257728523b6e75e7632929c350ffd6c77bc9ff5c1a13a6c5d26ea941795ffce46bf3eec6fccd7320a6c36fef13348a5373973e13b613ded6b73219ee97
+DIST OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz 57983975 SHA256 e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-14.0.2_p12.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.1_p9.ebuild
index 2540719..2540719 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-14.0.2_p12.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.1_p9.ebuild
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 6e45ba1..0028d21 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1 +1 @@
-DIST openjdk-14.0.2_p12.tar.bz2 83827689 BLAKE2B acd8a61156800941781a2f4c2d3acc61d7124254ec573b6e4eb45e0e031b4b4403475bec617c4130715b5764982a0d2bf990c07e8593817524093ed7fc86a2c8 SHA512 fb129d2e0f3b007d249073c6a0f20fe9c2917eafbae1c4a6c51126180a70e5debb348c3770a785b54576f2a338cb10fdfbd1fca5879e49f80a4fa5c190338fa9
+DIST openjdk-15.0.1_p9.tar.bz2 77426210 BLAKE2B 4334d43cdd51c7899c9746a728cf6855c1c05cb78c0543d966c6b1150b67540aac504777f4756d4abf05a1b229bdb2bb36ca17b8ca14f9d2c81be023775bf472 SHA512 41b947cc0be1635e2de330c5289ed436f79bf23221f1a00350f8f80f5b4c27610658930e86bcdc35dd8a6babd860ad8d5792e414340e82e4f44da148b22b4b40
diff --git a/dev-java/openjdk/openjdk-14.0.2_p12.ebuild b/dev-java/openjdk/openjdk-15.0.1_p9.ebuild
index d9e002e..d9e002e 100644
--- a/dev-java/openjdk/openjdk-14.0.2_p12.ebuild
+++ b/dev-java/openjdk/openjdk-15.0.1_p9.ebuild
diff --git a/virtual/jdk/jdk-14.ebuild b/virtual/jdk/jdk-14.ebuild
deleted file mode 100644
index a18c1a8..0000000
--- a/virtual/jdk/jdk-14.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openjdk:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)]
-)"
diff --git a/virtual/jre/jre-14.ebuild b/virtual/jre/jre-14.ebuild
deleted file mode 100644
index faeb554..0000000
--- a/virtual/jre/jre-14.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-RDEPEND="|| (
-		dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
-		virtual/jdk:${SLOT}
-	)"