dev-java/openj9-openjdk-bin: debugimage support

2 files changed, 29 insertions, 12 deletions

diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index 826a961..c942f2d 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,8 +1,12 @@
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 196415558 BLAKE2B 4a296081c74ba95c4242d51e5cafb15752acb4616204533c9ca9d958187527d8d7914e4a9839323d0ad2b778def736e5d370ce50fcd6d876a18e0fb5549c28e2 SHA512 882eb3928d8aab29c32a4e39cfc1e20669d11611b2158ac38dc149ef3da4e18c551444db0d8b903897903623869e90da72e78aeb6d2c1fa6d060a4a1694f78f7
-DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 196402945 BLAKE2B 18757be55519a8be40c2a2278761cdf5343049dda6c02f3b493a55042978d048061e109dccb40ebb1eea51fe65a6aa0c32c6b786a4a18c92c938d1cc36a21cd9 SHA512 ac1c65e011e1528dac2d94839fe2a7cc58b341800950e1d7767c585f21106d82e5a7ad6389a167ba0b95ff2e00d6d4470186d8d8339eb01b61952ad52dec8bc0
-DIST OpenJDK11U-jdk_x64_linux_openj9_11.0.8_10_openj9-0.21.0.tar.gz 195566437 BLAKE2B 2d65e5cdf1b8526d4d065c2240814813234d9571dfdb1ca8f438c8f5cf120fda2027ca6cf5470117931aedd5b4758d1663be937dc148cc4b70bb41ecff2692f9 SHA512 74b698cb398e6dbc050b9faa878b496e559ae92bc2a54e8889c37f70bfa05ebd2e9407285fa1c21448a8f3a8a26f01210856ff0bf77c2f33fca29e9115caf52d
-DIST OpenJDK11U-jdk_x64_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 195553141 BLAKE2B 2dcf822d2c9c8d95dce76e3933a538535662051cdeb3c71fdc2a0dc2c59bc14c8ca0cda0f23bd65a14ae1dcf32e93804a4ae07533f4b5f0a21b3903a32e21dbf SHA512 4e4a093bcffeb66c455cec3490eb6e6766a7b174505428fd9c23313d16f22f37d6cf22c186708c3e6c1fcb5aea8772079e392c1556ead4b496774cad995be3c3
-DIST OpenJDK14U-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 203990535 BLAKE2B 0bc831e499bab0f10e55cb05e184a7a30c308146e58b20be5678418b45298ea361ffc3299cc2d03f68af9625e9e004dcb6a0e044e325df361a103eea65324ba5 SHA512 20f28ab961bab0b30f2c7041c7454ee257351e8ebd983d46615a38f8f5ea1c21340f081e2264ddf6ee151b1f15d73fc63caa459e06ed42720fd58f59613c755b
-DIST OpenJDK14U-jdk_ppc64le_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 202921752 BLAKE2B 09da234abbca3f18ca005c8237a7f88735e99ad1f275aee20ce7c100f54c02dad5aa214f895c27d9d330dc2305775691ab91ce8e0ce4e0b5dbb9150f89747c1f SHA512 19b8587eaef417d3a12dd04c6c2b0cb500a4561912cbeb6bea30e38ea55f1b43d39a6f1f8be4bb5532659615e2d5c22107ba1090c1d2f36c69371d0fbacea210
-DIST OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 202955761 BLAKE2B 662f1cd4a6a4e1196a38825f57b29badcfc14b7598a9416c2ee755d2d39faaa243b7e74f0882de72a7dc9d542946038ece587de657694df9ea3e258a74e7a2c1 SHA512 d551304f0e1f153dde05ae6d1dd695dffa4e0c8f2b5776db14c143a2f1f1a8248552de5b7d2ca31dc9044b0dba0871dd08642c9311961d574ba233400c2eb30c
-DIST OpenJDK14U-jdk_x64_linux_openj9_linuxXL_14.0.2_12_openj9-0.21.0.tar.gz 202942292 BLAKE2B 353f61065a5e8842932637ed9ecc743e18ff8b792da8802dae6d6defa23b18780c62c14f8b12786bf0b2073c81a71022a9a40c09981b0e9eaaadcb4281f53110 SHA512 875afe53de8c6413b5b0d6fb2d81be73f6212daa4c94e6b042b886a1702e4619ed1360f00e6db9090c4db41f8f152f851160b81aa187afdba26b524e70debfe2
+DIST OpenJDK11U-jdk_ppc64le_linux_openj9_linuxXL_11.0.8_10_openj9-0.21.0.tar.gz 196402945 SHA256 ef3e3bb44efc6151a2cf8d894b771d8739c742423856c8e0916fa17013824c93
+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_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 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_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 74251342 SHA256 f1dc1dfab7f3ce301e459d92d48c8f266c8f623412a8df5c40ad3c0844d2b45c
+DIST OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz 202955761 SHA256 306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be
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 81410d2..fe68467 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
@@ -8,9 +8,15 @@ 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}/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
 		)
 		!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}/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