dev-java/openj9-openjdk-bin: add 11 debugimage, fixes

3 files changed, 34 insertions, 17 deletions

diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index c942f2d..0203305 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,12 +1,16 @@
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 196402945 SHA256 ef3e3bb44efc6151a2cf8d894b771d8739c742423856c8e0916fa17013824c93
+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_x64_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 195553141 SHA256 ef91324c2d5b0d9660150164f4e2b0fcc890ffacf4154447fb8bfc1596f1a8a3
+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 OpenJDK14U-debugimage_ppc64le_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 75782142 SHA256 784aed26441c7460c82c22f65848a967d17aa5c63a17b8b692794c510ba4ccfe
-DIST OpenJDK14U-jdk_ppc64le_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 202921752 SHA256 d758ea2d0916ce8fbcf07af65509701c97f20324cd3632ef1c1ca10568dbede4
+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-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 203990535 SHA256 177fd161ae14df92203d70cd618559daf889ec0c172d6ee615859352f68a2371
-DIST OpenJDK14U-debugimage_x64_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 74306582 SHA256 54bdca8dca799ea40271f338e4fcf446fc0bba065dee37967fde71ede34d2f0c
-DIST OpenJDK14U-jdk_x64_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 202942292 SHA256 ccfc3ad03d168fc8c097f8e3947d865e6f7f1acfc63c0ded67eac091c83699c5
+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
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.8.10.0.21.0.ebuild
index 81410d2..c9b6a62 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.8.10.0.21.0.ebuild
@@ -8,10 +8,16 @@ 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}/OpenJDK${SLOT}U-jdk_${1}_linux_openj9_linuxXL_${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_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? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV}/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
 		)
 	)"
 }
@@ -29,7 +35,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="alsa cups doc +gentoo-vm headless-awt large-heap nsplugin selinux source webstart"
+IUSE="alsa cups debug doc +gentoo-vm headless-awt large-heap nsplugin selinux source webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -63,6 +69,13 @@ pkg_pretend() {
 	fi
 }
 
+do_rm() {
+	rm -v $* || die
+	if use debug ; then
+		rm -v ${S}-debug-image/$* || die
+	fi
+}
+
 src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED%/}/${dest#/}"
@@ -70,16 +83,16 @@ src_install() {
 	# 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
+	do_rm 'lib/libfreetype.*'
 
 	# 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
+		do_rm 'lib/libjsound.*'
 	fi
 
 	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		do_rm 'lib/lib*{[jx]awt,splashscreen}*'
 	fi
 
 	if ! use source ; then
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-14.0.2.12.0.21.0.ebuild
index fe68467..aa6c50b 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-14.0.2.12.0.21.0.ebuild
@@ -9,15 +9,15 @@ abi_uri() {
 	echo "${2-$1}? (
 		large-heap? (
 			debug? (
-				https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV}/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-debugimage_${1}_linux_openj9_linuxXL_${DL_PV/+/_}.tar.gz
 			)
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV}/OpenJDK${SLOT}U-jdk_${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}/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-debugimage_${1}_linux_openj9_${DL_PV/+/_}.tar.gz
 			)
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${DL_PV}/OpenJDK${SLOT}U-jdk_${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
 		)
 	)"
 }