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

[Georgy Yakovlev]

commit:     75fcead4d3553e02a6ea4e0c8e26129d2d8e1d0c
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 22:03:08 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 22:16:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75fcead4

dev-java/openjdk-bin: update SRC_URI, add amd64 musl support in 8.352_p08

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

 dev-java/openjdk-bin/Manifest                     |  1 +
 dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild | 24 +++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index ec9f4aab859e..0dc5f5f5977b 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -46,6 +46,7 @@ DIST OpenJDK8U-jdk_arm_linux_hotspot_8u352b08.tar.gz 98283632 
BLAKE2B 936091ac36
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u332b09.tar.gz 100484069 BLAKE2B 
7e3b0186947f19094d88140304e756b7b2728560299f330c84ed8f9ac77c40fb046c2731d22c5d30e5d2837b878caccb19e8f1174f272c2fb29905db15500640
 SHA512 
adcfa446254c7de8b80f040e7f9960625c0314dabc8b457dee9d95216050f9aedc0c59528c29f7f1bc950c3ed0b713f3234dd9f9fb2a5bab7e706dbdb2eef42d
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u345b01.tar.gz 100474631 BLAKE2B 
32c98c9b0c97b427b880589c26002fa67f90980b099090a8b43a0c4b3d71319617126b55da7102abe9d15b0b3569fdd7f4288936607258a278fe805e875d469e
 SHA512 
37501b2c3ebe224404c34a847ed643a95ebf85aa6b8412bc3405ff3afdbecb9a69b2324b774d96d9cb5ba44170d84f6ac0026ea66c1074c13ef06c330952c9fb
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u352b08.tar.gz 100508249 BLAKE2B 
0fe530829d3205904b2ae239598c6c5d158e1be5c87ee3616b15f23088b40f5d800fc5f2fd5ad0aa9342508297eb8b3b33d0c2d4149e12b6a261be7d57764628
 SHA512 
9592e64484b62bef89071862eb5a6e4fde412a99a43c0eaf3f412964016ead60b73fde844b4f1909dd4e839cc7509f65184f9f9445a06642365104f642758a9b
+DIST OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u352b08.tar.gz 100852175 BLAKE2B 
7732a508bfa18a42f9e476aebcac6c2f0477d5fae1eeea6e0f7a3e48b503de0fd05d306d4c5255194eae8cf47703779e3a3bb99bc731d90a3c1bb171baac87a3
 SHA512 
bcabd24baad890f3520d0713d12da0327b19a733e89484edade02b9a12b2e4295fcd34c8ebf914920be04abca6213c0973153898c7c1d09a331db59b84700b1c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz 102918585 BLAKE2B 
55d7ef116ee28f37ab1a96cb8ffe021d1784b208ad248e78d6f0a7f22429364364e00ef17fe6159fac2fde6a0765a20125db6ce17694992dbc9e3b3e054adddf
 SHA512 
9f387fb8b872b65fc6a545151c185b9ad1aaac7ad7cffac4d2b936dedbca116a7d74e56754353ffa4caed394497ca659852f0e5e3803ead10f8fa95d562e28a8
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u345b01.tar.gz 102925260 BLAKE2B 
ce4e79c98f5f3b2119fafd0ad43ca64bc823ff9adf20cd76e4e8c0de34ddc11cce7311d0ffc1cdcaab70632b3c18dca5b57c916a01230b22fcc74c4e8e08e3c9
 SHA512 
92bafba262a269ec3be7d83d8ca36468ad69d850d44b373c04c92a14c74a9aa89314f2aa68a6565c41b302c60fb8d19f1cf0f3075924a497e8be05e8a08ce95d
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u352b08.tar.gz 102942531 BLAKE2B 
3e59f7495e7c79e93b39e596f445738b6c809388367b1f41b5925b6f63bd81feff05dc6587d8bbca6c56187f22c048bf108032a45373096ef95389cc1fba7ebb
 SHA512 
a6dfbc34a95f91749db11fed76e918288f2eb64234bc63f1e39db73cce918de419df6dd7a69fc4aaffac559d0b35c9ed2c782ef061e026096183028ffe24ae95

diff --git a/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild 
b/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
index 7834a4a17075..5e6c7728022f 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.352_p08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,20 +6,26 @@ EAPI=8
 inherit java-vm-2
 
 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}/OpenJDK8U-jdk_${1}_${os}_hotspot_${3-${MY_PV/-/}}.tar.gz
-               )"
+               ${musl:+ elibc_musl? ( }
+                       
${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//-/}.tar.gz
+               ${musl:+ ) } )"
 }
 
-# they have different tarball names for different arches...
-# 
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz
-# 
https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
-
 MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
 SLOT=$(ver_cut 1)
 
@@ -30,6 +36,7 @@ SRC_URI="
        $(abi_uri aarch64 arm64)
        $(abi_uri ppc64le ppc64)
        $(abi_uri x64 amd64)
+       $(abi_uri x64 amd64 musl)
        $(abi_uri x64 x64-macos)
 "
 
@@ -43,7 +50,8 @@ RDEPEND="
        kernel_linux? (
                media-libs/fontconfig:1.0
                media-libs/freetype:2
-               >=sys-libs/glibc-2.2.5:*
+               elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
+               elibc_musl? ( sys-libs/musl )
                sys-libs/zlib
                alsa? ( media-libs/alsa-lib )
                arm? ( dev-libs/libffi-compat:6 )