From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 73E1B158170 for ; Thu, 18 Jul 2024 08:18:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6ECE2E2B58; Thu, 18 Jul 2024 08:18:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44F0DE2B58 for ; Thu, 18 Jul 2024 08:18:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39FB1340C7F for ; Thu, 18 Jul 2024 08:18:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 959F11B89 for ; Thu, 18 Jul 2024 08:18:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1721290645.9a96f4986879455085f7f5a4eb194b7954f8c48e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk-bin/Manifest dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild X-VCS-Directories: dev-java/openjdk-bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9a96f4986879455085f7f5a4eb194b7954f8c48e X-VCS-Branch: master Date: Thu, 18 Jul 2024 08:18:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95d0d47a-8947-433b-807a-2ea13a1995e9 X-Archives-Hash: 81bf85fb37b2794be8cb2a13ca70d317 commit: 9a96f4986879455085f7f5a4eb194b7954f8c48e Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jul 18 07:57:34 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jul 18 08:17:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a96f498 dev-java/openjdk-bin: add musl enabled aarch64 binaries Closes: https://bugs.gentoo.org/930108 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/37601 Signed-off-by: Sam James gentoo.org> dev-java/openjdk-bin/Manifest | 1 + ...in-21.0.3_p9.ebuild => openjdk-bin-21.0.3_p9-r1.ebuild} | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index 9c05c23032b7..652d8b40a70b 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -11,6 +11,7 @@ DIST OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.11_9.tar.gz 191737628 BLAKE2B d78 DIST OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.11_9.tar.gz 191615499 BLAKE2B 4b342ebf3da0cf49d448b95dec6b04819d2ab2e31327b793b9d9aef86b4e78ce33a54995a5d0608d14214f3d0fde73d0ad334c9b0e3c5d2cbb6d40c4bb22637f SHA512 7773843e3b2a02ccb70c3ea49639c723f5da715dcb3e27ed85dbd2182648621a5822c49728436377c8e8af4d20231ba5b861e45be17efe44a5a81a92c225a851 DIST OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz 192396023 BLAKE2B 1e5f12041d9c17195f242d7d36edf6995b1f71cb52ca211773faaa0cca6af983ec8c7885d58d4b87b38a0a26f71d088c104cdbcb84fdfffd97643f2a09a2a4ed SHA512 f11e61d91ad27ca31196ded87d06b5e379e4e652c09ffdd5c3d73cdc9fe6c46cd7785838c70514897645213ff6c6948227be27d7fd773949f1055338966ba275 DIST OpenJDK17U-jdk_x64_mac_hotspot_17.0.11_9.tar.gz 180563846 BLAKE2B f9bf368e39d95cce40413caeb98192f88f90cad7dcb486ef5e1d7369cfc346603d37de88c049930b958043621e44c103e020354eb80faff0cf83fac8dc7497a7 SHA512 999ad1fb7c822e9000e734c86e70e73aa572ec1a75d14219b391e9d358d1dba1fd0d9d568df4c28d8ca88fd4341e24feee2f840b6c35c4c530d2cd174dd797b1 +DIST OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.3_9.tar.gz 205753676 BLAKE2B 80d419cb5b75b7117c534e09c174e5b281d6786445b3569a8e566416b22d3efbb15196fb4cc979b32c597663afcb8df3132a363e9fad22ecb053b98d3406c9df SHA512 0a87d9cf60a8843408e55cbdac66e44f988208c9b2117a8ac61d7bc5fc8df9fbdb1a5d75f7d5e100dcad5380f890a067f4ae198880938064534bed6b5a5b313d DIST OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz 205794447 BLAKE2B 4d6ac1fa90b81be10cd32be76665dc26bae59a5c288d1b1f87e396ea356bf46f73b58db06b5b09417714f4638550d7ade55792f276f39dabc100345efd18c28f SHA512 b9cea7a7f4405c66722b3562e0ded7362475146753b1fcc4ad0d068264e9f228b8547dae704c6ce2be9c4a879902c2fbd93524176ffa02ddcb3edc4d4f6759cb DIST OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.3_9.tar.gz 207595331 BLAKE2B 7358f61aaee85fc5ac584307f1d5372de17aa06676aa823de157236e4332184b9212e74cc4214845a9e834ebac88d41ba185d1823257254174a960db88cb0574 SHA512 dafe0f31867f2ef817f188fe1222adefae72fe4443ec95eba8f18d60c141bdca0f63c2591c834c470c7b15d011618c97c45bbc65e746cdc47ba9be9a2f2ce523 DIST OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz 203760093 BLAKE2B 6be42a229745d9f8616b2738a3301642b8358b542625af01aa943779a029e4ef16f70eec437a22e2215a720d99420a01d498093c54387374ab8169a517eff9d9 SHA512 d10f6dea263dcf32e4e356f941fd275a64a4ad331db638332788623240f0f30869932542857653a65fca0e18a49d154fe2dce5bcf645c878ce86efa02fe05471 diff --git a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild similarity index 93% rename from dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild rename to dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild index 664b82161cd3..3a398cc87007 100644 --- a/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-21.0.3_p9-r1.ebuild @@ -6,7 +6,7 @@ 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 baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV}/" local musl= local os=linux @@ -22,24 +22,26 @@ abi_uri() { echo "${2-$1}? ( ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK${SLOT}U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${baseuri}/OpenJDK$(ver_cut 1)U-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz ${musl:+ ) } )" } MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) +DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" +HOMEPAGE="https://adoptium.net" SRC_URI=" $(abi_uri aarch64 arm64) + $(abi_uri aarch64 arm64 musl) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) $(abi_uri x64 amd64 musl) $(abi_uri riscv64 riscv) " +S="${WORKDIR}/jdk-${MY_PV}" -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptium.net" LICENSE="GPL-2-with-classpath-exception" +SLOT=$(ver_cut 1) KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" IUSE="alsa cups headless-awt selinux source" @@ -67,8 +69,6 @@ RDEPEND=" RESTRICT="preserve-libs splitdebug" QA_PREBUILT="*" -S="${WORKDIR}/jdk-${MY_PV}" - pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]]; then die "These binaries require a hardfloat system."