[gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/

[Georgy Yakovlev]

commit:     6bf33a5187c3a84e9bfd245f7405fafe52564283
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 00:42:25 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 00:44:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf33a51

dev-java/openjdk-bin: add musl support for openjdk-bin:11

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjdk-bin/Manifest                         |  1 +
 dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index c4b6173f7f31..0428ac02b0d3 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -2,6 +2,7 @@ DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.13_8.tar.gz 
189667474 BLAKE2B e79
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14_9.tar.gz 189849188 BLAKE2B 
e4d5d5d20b54642cec8941bbfb2a8523ed4f12185bed235d2dded02eca4ef6628ed5b8e36f614278ecad966b2c7cb4ab3b74d696b10718f56faf83834de424db
 SHA512 
299478112d15b335d2cc802e8bcac3a00eb55cfedacbc0c62e462277dce10bfd45de789d760650171a064a574834b2c24e31e70914d63e82362da190e417105d
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.13_8.tar.gz 180757722 BLAKE2B 
b34bb2c2346609da20bc27db5e1dd0f7aa124ea9ac9e7501ce2a374b61596f96e950a7d69e675dad1dd16037183dbbd155089c6b10d965adff56f000ab19355b
 SHA512 
88500ddbff3c58a69ec450428bfa1ade8e01056c926fbaf77d6908d08b24b0e0536a4d067f32cdb50fb6003cdcc2b22509c5478e080e748c001340334514c711
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.13_8.tar.gz 174991442 BLAKE2B 
376fe73257f8518599be31262d83d1a01381cd9891fb45c18460bdf33c3569b3032206363593db5b7e3006b895ab855407a1938cbabed0fc58f3bcc86c650cb4
 SHA512 
d3ef319edc1f29b12e681c09e639cf296ff4e4890c81ecb2c8bb38ea2936f5425ae892420a53db5a0796b192f55a9a8c97b850d8bd400d6d7a8b3c4effc90f34
+DIST OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.14_9.tar.gz 192425435 
BLAKE2B 
3e98f8819bf36aaee0ae009e97c7efa9a26dfc55b856e3d2d098d266621c97b5a8448331888e18eb5a8ea164875020db59cb9be61f3756fa87f9376c2b6e5f6b
 SHA512 
667bc8e6d745c693e5e60e332f491fd485e3f4d99e1543d6e72f1b64956e56b4e6892f3a47e642809378f0a8a8dfaaa034ac96a0aa70b0b7fec51ec53bafbaa7
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz 192958006 BLAKE2B 
441d396e0c43c78bb3802800f58779999dfa2275c4e0e0a048e28e3b99a41044b9c66904f1eba435cc22ab1bcf6d6d98723b8b090eefdece4d712279f36a74fa
 SHA512 
abcbc5b781749e3c8fbcfb999e724d4862c03d60c78962d75d31b7cbc71124b04488872bc70f6a6642ec59b6d2289c391b564fc5fd7f465863f96dd4d2b5207d
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.14_9.tar.gz 193109331 BLAKE2B 
d1f3031c479bc32e3d4d56fb914c33c9e19444ef3b4fd836c52623619872d11cea843904d1425cdbfde2181f41bc63d97c14a479a134ae7280b4b5e49f7789ff
 SHA512 
27d1a8627e6e97d4830f2b8839a7f8455d1e0680853049eb1417f78c5b8e05dc2e8f48520770b422797021a169c80ddbb0c907a5e40e02a4d951a429c5a2c86f
 DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.13_8.tar.gz 190666788 BLAKE2B 
9248072292727e6ac6d3f1783996c13ad7c78418da444d96e8df3c11ac1f2a7c047dcc16951dbabcfa0e46d7121c91e916940ef0749e982f20b6fc36be516d64
 SHA512 
603ddb6f01a556040e56a8f1d0769636295e2c1579f07d1f58828ab1db9634cc07cada66496a6144cc6de29469eedd02e6fa788961a9e4e6b5c7c6a5fd94839e

diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild 
b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
index 8a314444f21d..3488867ebc14 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
@@ -6,14 +6,24 @@ EAPI=8
 inherit java-vm-2 toolchain-funcs
 
 abi_uri() {
+       local 
baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/";
+       local musl=
        local os=linux
+
        case ${2} in
                *-macos)    os=mac      ;;
                *-solaris)  os=solaris  ;;
        esac
+
+       if [[ ${3} == musl ]]; then
+               os=alpine-linux
+               musl=true
+       fi
+
        echo "${2-$1}? (
-                       
https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
-               )"
+               ${musl:+ elibc_musl? ( }
+                       
${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz
+               ${musl:+ ) } )"
 }
 
 MY_PV=${PV/_p/+}
@@ -22,6 +32,7 @@ SLOT=${MY_PV%%[.+]*}
 SRC_URI="
        $(abi_uri aarch64 arm64)
        $(abi_uri x64 amd64)
+       $(abi_uri x64 amd64 musl)
        $(abi_uri x64 x64-macos)
 "