dev-java/*openjdk*: bump

17 files changed, 49 insertions, 99 deletions

diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index acf123f..60596bf 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,24 +1,12 @@
-DIST OpenJDK11U-debugimage_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 225447217 SHA256 78b4a686078de9430afd87150ceb67b7cfab860785879828fbfa3fe8aa4f37af
-DIST OpenJDK11U-debugimage_aarch64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 225507764 SHA256 84cc44c6b375d0a43098b56cdd52d62eee3f9a95fa545d4fa6f3ea6330c0d87f
-DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 275321533 SHA256 95f6d118d3d1dc935f5b38e129ad72c77af687f041577926f629ddf5e7b0fce3
-DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 274781433 SHA256 dba2c391708c04b42fd17f9cd6ef33096aea17c8a4d420560e9ce69f96e88091
-DIST OpenJDK11U-debugimage_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 284307056 SHA256 cd7febf1e729dc0f100f582d43e4107d85a98309f6cad80da9630f1ead597051
-DIST OpenJDK11U-debugimage_x64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 284367698 SHA256 cb62d12a4a026875cd5c6d6232682e516cf89a10ae9609afbc17a34802bd4e37
-DIST OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 192322461 SHA256 0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41
-DIST OpenJDK11U-jdk_aarch64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 192280518 SHA256 b7e91059b608d91bb90a6dcf228189bbae83af40fbc498ce6859aef03e61268a
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 197354935 SHA256 858f54946df9281a7410fffd3be82f7718d549088ea35c444f0887ac3fa2d3ed
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 197335380 SHA256 761828b59cf1626bb8b466f3ae241aa9c0f66799d8871145a789f45b646da73b
-DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 195601773 SHA256 941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f
-DIST OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 195586375 SHA256 d43052b83965d966db8d308e3b2043a17134255dbcd4837c312fe9dcc10dccf9
-DIST OpenJDK15U-debugimage_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 72517210 SHA256 5a9526e6fdc2ba1e1d549bd8bb27425769cc8e6b236e091a2e8e99e08e8c0c40
-DIST OpenJDK15U-debugimage_aarch64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 72577472 SHA256 5c6c1dce95ffc07d6259bd40f832b0b73fb0d712990461c4ff12d6fbdaba8550
-DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 78084770 SHA256 775faa914c682d3f948260d7542c0fabf5f133ebbc5dcc0207c49c6c2874a3ef
-DIST OpenJDK15U-debugimage_ppc64le_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 77821851 SHA256 bcacd5a3c7b9ae60ebe2d2861dacc9df959b2320a529d1aa3629e809883852b9
-DIST OpenJDK15U-debugimage_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 76427443 SHA256 2a28a900213dc773d801d416d5bf2c3da37fb2754791e3c728421e830e308506
-DIST OpenJDK15U-debugimage_x64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 76476865 SHA256 fddce9de2ce1314fa3f7a80f89cc5de6a2394717cbfe679531ad7b931da30536
-DIST OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 192179566 SHA256 b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314
-DIST OpenJDK15U-jdk_aarch64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 192160332 SHA256 0ad9c9938764b82e4b449689335d53b3e1f34268465d73b2596b4ca4dadb10a2
-DIST OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 197145939 SHA256 5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4
-DIST OpenJDK15U-jdk_ppc64le_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 196100186 SHA256 6e4134862273400f00a6512c09888f513be570cd18f728aadb857ae086326694
-DIST OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 196165917 SHA256 5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816
-DIST OpenJDK15U-jdk_x64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 196145159 SHA256 216246eed35a53486601d0fbf8c085ac4916f7c8fd270ca5cdeb3ec47882a2df
+DIST OpenJDK11U-debugimage_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 257491968 SHA256 f5344f5eaa8e9ffde284809fb5e2c3e3579248532329d1159b2290923235fb25
+DIST OpenJDK11U-debugimage_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 310099475 SHA256 a4997ab06853f51fc4cf211c00d8cdeec71777e381b4bb5ff58d43f9ec8a53f1
+DIST OpenJDK11U-debugimage_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 319594653 SHA256 f219a2c924f2320a63eb831a0321e0dae667852b9bc38a2d2490ed56b428a2dd
+DIST OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 198136840 SHA256 31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f
+DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 203509815 SHA256 691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224
+DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 202022817 SHA256 a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22
+DIST OpenJDK16U-debugimage_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 260763825 SHA256 2b0249b7a49754b12fd366074ea0c0fa5a1652d3287dc3d61688cc3ca814ace4
+DIST OpenJDK16U-debugimage_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 313369047 SHA256 13676fa7586269f051934dcbaa16d9427c824771f7a868521a9b1d4c2e0f16e8
+DIST OpenJDK16U-debugimage_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 323027152 SHA256 39e469f9824e3bd814866abdb9e04c80a9e4ba7e671cfd1cea705f5b3940707a
+DIST OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 201412875 SHA256 abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd
+DIST OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 206914557 SHA256 9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83
+DIST OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 205241701 SHA256 7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild
index 2f0299a..bd6296d 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-15.0.2.7.0.24.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.11.9.0.26.0.ebuild
@@ -7,18 +7,10 @@ inherit java-vm-2 toolchain-funcs versionator
 
 abi_uri() {
 	echo "${2-$1}? (
-		large-heap? (
-			debug? (
-				https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz
-			)
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz
-		)
-		!large-heap? (
-			debug? (
-				https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
-			)
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
+		debug? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV//+/_}.tar.gz
 		)
+		https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_${DL_PV//+/_}.tar.gz
 	)"
 }
 
@@ -36,7 +28,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups debug +gentoo-vm headless-awt large-heap selinux source"
+IUSE="alsa cups debug +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild
index 757cfbb..b75020d 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.10.9.0.24.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.1.9.0.26.0.ebuild
@@ -7,18 +7,10 @@ inherit java-vm-2 toolchain-funcs versionator
 
 abi_uri() {
 	echo "${2-$1}? (
-		large-heap? (
-			debug? (
-				https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_linuxXL_${DL_PV//+/_}.tar.gz
-			)
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${DL_PV//+/_}.tar.gz
-		)
-		!large-heap? (
-			debug? (
-				https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV//+/_}.tar.gz
-			)
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV//+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_${DL_PV//+/_}.tar.gz
+		debug? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-debugimage_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
 		)
+		https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
 	)"
 }
 
@@ -36,7 +28,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups debug +gentoo-vm headless-awt large-heap selinux source"
+IUSE="alsa cups debug +gentoo-vm headless-awt selinux source"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index b767126..9e7de86 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,12 +1,6 @@
-DIST OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 40168672 SHA256 c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2
-DIST OpenJDK11U-jre_aarch64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 40143382 SHA256 45a01fe6f43cc64f852558701410910ef2318c392275a3e73309f950528753ce
-DIST OpenJDK11U-jre_ppc64le_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 42563320 SHA256 5d2b2939637f999a1910d5cc0fb3d96756125941e5f8b9e3003635aa863664b5
-DIST OpenJDK11U-jre_ppc64le_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 42447062 SHA256 8f1c5f0edb3d627098908515821f74f0815a6b6c493dfd98bb8b3f266aac0de0
-DIST OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz 41736680 SHA256 7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a
-DIST OpenJDK11U-jre_x64_linux_openj9_linuxXL_11.0.10_9_openj9-0.24.0.tar.gz 41724028 SHA256 f7395e402a56a3da3c9ecf192d72ccbfb57e259c399f58e9ed99a98f323b5850
-DIST OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 47020339 SHA256 37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6
-DIST OpenJDK15U-jre_aarch64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 47010950 SHA256 7ed27117dd6f9f35685d91882f139f2d037cc5064270291bef1309a767eeebc5
-DIST OpenJDK15U-jre_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 49409848 SHA256 79f657141f1cd0e4a70d041b9215b8b00140d479ce73ed71bc4f3dd015157958
-DIST OpenJDK15U-jre_ppc64le_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 48747428 SHA256 425d79db40c0671edd21c78d9fce17be3f6d011b0b5ca4a35226194c6832d682
-DIST OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz 48905528 SHA256 a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084
-DIST OpenJDK15U-jre_x64_linux_openj9_linuxXL_15.0.2_7_openj9-0.24.0.tar.gz 48896972 SHA256 e345e3896a312607235723816e53181383d6d9032240fa41079f3140e4d7c51e
+DIST OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 41794638 SHA256 434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f
+DIST OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 44241602 SHA256 f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0
+DIST OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz 43611878 SHA256 152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715
+DIST OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 41556034 SHA256 01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454
+DIST OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 43963611 SHA256 f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9
+DIST OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz 43355843 SHA256 fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.11.9.0.26.0.ebuild
index 76ecdb8..7dac1e1 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.10.9.0.24.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.11.9.0.26.0.ebuild
@@ -7,12 +7,7 @@ inherit java-vm-2 toolchain-funcs versionator
 
 abi_uri() {
 	echo "${2-$1}? (
-		large-heap? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz
-		)
-		!large-heap? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
-		)
+		https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
 	)"
 }
 
@@ -30,7 +25,7 @@ DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups +gentoo-vm large-heap headless-awt selinux"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.1.9.0.26.0.ebuild
index 76ecdb8..7dac1e1 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-15.0.2.7.0.24.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.1.9.0.26.0.ebuild
@@ -7,12 +7,7 @@ inherit java-vm-2 toolchain-funcs versionator
 
 abi_uri() {
 	echo "${2-$1}? (
-		large-heap? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz
-		)
-		!large-heap? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
-		)
+		https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
 	)"
 }
 
@@ -30,7 +25,7 @@ DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups +gentoo-vm large-heap headless-awt selinux"
+IUSE="alsa cups +gentoo-vm headless-awt selinux"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index a8a431a..fb63c42 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,6 +1,4 @@
-DIST openj9-0.24.0.tar.gz 16399910 BLAKE2B e2f5e03abe0c87fb175bdbdfd4b1b4b7167460eab1d41f4afe9ede962dfb68c60314262c4cb4dc90360787d67c97e8b9a99cf4b167e249038cd6c4dc0392284e SHA512 c42faa4d10a509d20e14fc915c352f52423cf6f2ec0930a43feb12e910bbbd672bd3a8674851252410c80eb8a7a649198167364e5053bdf4649bf6927189bbd0
-DIST openj9-0.25.0.tar.gz 16536893 BLAKE2B f2b00c1267f8736d9c612c3e5a32344d5818ef5320c43853f6a1bb1e4e5a8253256624aefcb8e6c752a8b1668903472b418a5784a6dbadf4ef34f66aa9afac96 SHA512 83610712b8ffe78d8b44efc2dc78254b61dbf0fceabc206022b7269b6731228eed8291e2d56c179eca432c72f5476da5d690eac1e9b7495929efaddef33a74d0
-DIST openj9-omr-0.24.0.tar.gz 7799995 BLAKE2B b1937e579d4611dc7bd6d9f747f7e443b5ebbdc108ae3346c7dd494023fa998f9c6d2c0cd5f65dd1fb38d6c3212d4a22fca7b05973135f83b29e26babbb5c959 SHA512 c1cf0366fd1f14436bb66b4c928792a1485330940a6d8fc97be9b7a31bc5c5f28c48d06d7600263d203665ad4882955bb66da2af00ee4e59e57d97c811242be0
-DIST openj9-omr-0.25.0.tar.gz 7823893 BLAKE2B d435e963a39273d6914b8d026747e3df372ee77c95c8d865196768dc4b2d7ad9b65fe0b171cd7e7a0d0eca9563e43308d7fd89fe37394b9a91a5f9efc20f279f SHA512 c6b10ce00604305072eaae9c20e0beddff0f54d236d84e862369b8b4a23540233d5da3f0c5684d26229f28f857aed7fb7ca147be8c220ddac53a0e98dd9414a1
-DIST openj9-openjdk-jdk11-openj9-0.24.0.tar.gz 108666016 BLAKE2B 683265b1f26ef2d568cd1df8fae7d20e5e612668f5bdbd624d916a8a0017a71102568e222967a63d88796ca574a21a2c1c3d69dc8e29ab207de74a65290b8ba2 SHA512 e75cd99d20fd672695475d53a42e2843fb90d178744e1fd65fc1b52a0f30b13ab9a2bf7c413a01bea9e45136283039095cc108fe7ead9dca7ade7608dea06e7c
-DIST openj9-openjdk-jdk16-openj9-0.25.0.tar.gz 90897833 BLAKE2B 6c6dea46588c9f8d53d3cca82282df9a54d55269cff6be60f4dc03dbc0a302a4a66c0e29c6173d0b43def728b26daca48baabc2a2f19dd1e5f92a0af8e75d71d SHA512 3b70e7d599b8e056c9ad91f1f0d270acbdefecfacfa9e0d0f379184216e61d8b30ddae707a4c62ae8e92ef9a987b5c22373e723dff84a05a0c9457b08d68d68c
+DIST openj9-0.26.0.tar.gz 16611918 BLAKE2B c81dd7114bbd88891ddc44ee06612dafd927f2acc6b60d2ed1e0edc08a50d293fcae3202df7aa92f65ac06b6ab70619b92652364426b9a2b5bb84e9a3ee1f258 SHA512 593e33b62dcc012c4127ea3889bfb50cc950392174e85df585eeab004c425e937a7d804c479f17b7b65d36ecb6ce6903acd0f6b70d1256d78c5c74d5ca899f09
+DIST openj9-omr-0.26.0.tar.gz 7821851 BLAKE2B 4b9c8cf489829480e0807bfc94b3178801389735df0d02702a84763a3beb2fbe24893bd373f1fd7d85fca7672d5aa54a36023f50a8d38dc41cc5f1a64ce06b3b SHA512 fb272bb8d1afc231fe23182d717141c9529ff8e48256160de2b16f5b13f5f4971445a6ad7e7566894d19663e463d1369c9b3cccc3b6459969de7f4bc37c6d788
+DIST openj9-openjdk-jdk11-openj9-0.26.0.tar.gz 108770367 BLAKE2B 419b12e84495944bffd1ad55ffad33286baacb9d45aa2e3e3c62ef1c000a6b3a0152b4932c566822ebe5a70d2dde44037ff64a63d48f304c47f8964067b1a798 SHA512 4d5e34cc16d350162e1504ec54026ad8919ce45b101267ebd32560654f0f2d36b913ba4408455fbac26fe64c6ef48aeff6579053f30aabd33ea87d910e0fcde0
+DIST openj9-openjdk-jdk16-openj9-0.26.0.tar.gz 90946765 BLAKE2B fde78de4bc8d5cd389a3fef6ca2ae426b0c0218377156dc0dc04b5da42d14c3b2914af45d0efc27751929cb4ac37ed5e2d3a4c4a19205e2a1f77edb4a098b58e SHA512 1ace81fb573fdae5ff31b6a21ea2b6772e1f1df7e00b16cf1cba44f1a418083cdcb0e72cbf9ed66161de8a7b8e131ec5da82dcc24f93bcfb18f2a3a607e7d52a
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild
index e8060d6..63b091f 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.24.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.26.0.ebuild
@@ -28,7 +28,7 @@ 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"
+IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -241,7 +241,6 @@ src_configure() {
 		--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
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
index 8cdc57c..3d7eacb 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.9999.ebuild
@@ -28,7 +28,7 @@ fi
 LICENSE="GPL-2"
 KEYWORDS=""
 
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap"
+IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -241,7 +241,6 @@ src_configure() {
 		--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
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.25.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild
index 227230c..b7b09be 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.25.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-16.0.26.0.ebuild
@@ -28,7 +28,7 @@ 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"
+IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -199,7 +199,6 @@ src_configure() {
 		--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
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild
index 75c13b2..05f21ae 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-16.9999.ebuild
@@ -28,7 +28,7 @@ fi
 LICENSE="GPL-2"
 KEYWORDS=""
 
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap large-heap +pch selinux source systemtap"
+IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -199,7 +199,6 @@ src_configure() {
 		--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
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 371f99b..ddd22ed 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,5 +1,5 @@
-DIST OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz 203662871 SHA256 6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4
-DIST OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz 189527214 SHA256 ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368
-DIST OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz 188162894 SHA256 486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9
-DIST OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz 179870692 SHA256 7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a
-DIST OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz 206039221 SHA256 94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d
+DIST OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz 203066417 SHA256 3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85
+DIST OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz 187587741 SHA256 20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df
+DIST OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz 186081896 SHA256 8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6
+DIST OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz 178964996 SHA256 421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f
+DIST OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz 205449187 SHA256 7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f
diff --git a/dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild
index 6a82f20..6a82f20 100644
--- a/dev-java/openjdk-bin/openjdk-bin-15.0.2_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-16.0.1_p9.ebuild
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 3a090fd..8fc1426 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,4 +1,4 @@
-DIST OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz 56464691 SHA256 1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2
-DIST OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz 52841906 SHA256 304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e
-DIST OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz 53505440 SHA256 dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67
-DIST OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz 57646869 SHA256 31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c
+DIST OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz 47622188 SHA256 4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5
+DIST OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz 43628046 SHA256 c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7
+DIST OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz 44094924 SHA256 495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930
+DIST OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz 48818276 SHA256 5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.2_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild
index b157010..b157010 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-15.0.2_p7.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index e2fe888..b74e1e9 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1 +1 @@
-DIST openjdk-15.0.2_p7.tar.bz2 77419602 BLAKE2B 43d7a286e38677b3b53a76b7306bc0881795ea65ef40c7513adbd3f96a095e6196c3a4d3bee77a4047acd427e6490d2150b8f2570850ec5c80a670dcb411f34a SHA512 65692c8018247e6589325836213dc5a09df8b3d8fb91a67b1c3e3ccd1a34c7235f0b3af557ead840fdd0fb998f0558fce32ee5a26598115cae6601ad5e60eb7e
+DIST openjdk-16.0.1_p9.tar.bz2 104397639 BLAKE2B e1f026560e856b931defce2f1956c4d9e01840621645d69bbbd2cd47d3216c21cd4b9e5d7bcd611cfd0c9029bd941f822b19ad339341ccfa7cd97746dba9c0dd SHA512 372c55cd7897539dcfb4e3098271417da16eafceb05c316a425fc46ffe01c3b66c49cff43e59bb7e045fd2de5a68b28f0e3d256a16b28bf528d2fa635fa65062
diff --git a/dev-java/openjdk/openjdk-15.0.2_p7.ebuild b/dev-java/openjdk/openjdk-16.0.1_p9.ebuild
index 9868aa9..02e4a9e 100644
--- a/dev-java/openjdk/openjdk-15.0.2_p7.ebuild
+++ b/dev-java/openjdk/openjdk-16.0.1_p9.ebuild
@@ -12,7 +12,7 @@ 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"
+SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"