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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64B0015807B for ; Thu, 24 Oct 2024 07:13:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66C9AE08FC; Thu, 24 Oct 2024 07:13:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4F6BDE08FC for ; Thu, 24 Oct 2024 07:13:28 +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 83256340B57 for ; Thu, 24 Oct 2024 07:13:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9923A1A0F for ; Thu, 24 Oct 2024 07:13:25 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1729753739.e778f50b7acd6e3e9c507834e63dd4c3ada371cd.fordfrog@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-24_p15_beta.ebuild X-VCS-Directories: dev-java/openjdk-bin/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: e778f50b7acd6e3e9c507834e63dd4c3ada371cd X-VCS-Branch: master Date: Thu, 24 Oct 2024 07:13:25 +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: ac350156-72bf-47bf-8882-abfc7dff94f1 X-Archives-Hash: 86bd11c36a2b19a35cb893097788fb08 commit: e778f50b7acd6e3e9c507834e63dd4c3ada371cd Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Oct 23 17:03:59 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Oct 24 07:08:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e778f50b dev-java/openjdk-bin: drop 24_p15_beta Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39091 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/openjdk-bin/Manifest | 6 - .../openjdk-bin/openjdk-bin-24_p15_beta.ebuild | 136 --------------------- 2 files changed, 142 deletions(-) diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index fdc6518e0a0d..49753e372213 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -1,14 +1,8 @@ -DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_15-ea.tar.gz 212878116 BLAKE2B 1e5768eb0d900c7234049173dd2f76a9d1bd1661f8c5a2070400bf26fcb3d4550803b7e91b851152375b7344f164e86d6f33a82c28ee2e8bc4497029030c2281 SHA512 c8646b3f727ca48f7950327c621a8625931965b0a0b1ed4c5811a77d8b189f5295060d51ce3d7b3fa5fee714f44e6513d6fad69ae5cdf9fee314f1d8ee7397d8 DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_24_20-ea.tar.gz 213486173 BLAKE2B 429486689b28a436462d20691919ff90f242ea0d7f9e2f35c10596cb21780c14cfc8434531e2c75af0a486cec9004a815815ce0ac759a99612c8d325fd925230 SHA512 e003b0f91325560891c831e4e37a641699685b8e32f032040c65bf75c7557f89673976bd87ece4ad31a8e5b46f7854a830d553f91804379661319da087d9a9f1 -DIST OpenJDK-jdk_aarch64_linux_hotspot_24_15-ea.tar.gz 212847823 BLAKE2B b3986bd7038734c713a85177c2c87870b58c82f721a3b7328c80fdaba764589b6561d1b0ce7ca8d67a744b6e5acd15a9f51c206db0e06ab789005d44463cd511 SHA512 ece9e3cd2c88bb5455f67bbc185ff5e17f3b2f00c10ab7206a4062baa7852bf8b43abe6bc71f5eb797e87db25c3f4e199e6fd612c5f77c8ef9f58f167ce468da DIST OpenJDK-jdk_aarch64_linux_hotspot_24_20-ea.tar.gz 213435180 BLAKE2B 0163fbc674b7f04dc69bf2d57444e2f9625f22050a6ae09bd976d9d393d69c3b557332302a6ff0cc58e04ea910bb4f2bc5fda677024c06ac568df6cc57698d11 SHA512 b6fd2b0750e22dd986314314e126932dc95475314636733083d1d0f50c1e298371d418cad098e0062f6e4a3b3d4a2f50e3cf2e7954db407b01ea5f3432e606d2 -DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_15-ea.tar.gz 214453128 BLAKE2B 4a99153ca3bcdf94ef8d4fc96b66a80307f09626f63fe0f70451208362d4e4ae6759e0769528041d6c5d629057c10dfb3a173eed8f6ee289fadbd52587163e9c SHA512 80ccf9398534d025e42c44d21a9c3dfb389c6b376c96724e6b086b361fdda1e20880e00ad3f74715068ec69add527f9f2ba363759ac9edb25997096316ddd128 DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_20-ea.tar.gz 214984344 BLAKE2B c6582a845579246f920b0ab94657870650669a30e45f0435a4ad8b63657771b5a708cf5aa417f87d9e2a7dde7fae0603864e21558e022fd39cfa818d1d5bd20b SHA512 f5e8644094b737a3eb8b1d40b2140fbc283e9c397c0dd23bc53c4678430abf84dc8f2e264ac4aee824b135e30dd3df390d8a38af5b7e7ac74e945ce081984f91 -DIST OpenJDK-jdk_riscv64_linux_hotspot_24_15-ea.tar.gz 210831983 BLAKE2B a8603cdc69b8a6608e06dd92d233db8867c633403f976ec62be3bf9d04296e56d89910a38ccae1a130abceedb1122a03eda03f7432abdc2f0f64cc1deeeb72ea SHA512 61e25536620880c5d39df44f740e349ff96075f9208bf6ccde5b4905cddbb0bda793cbcac4875b75e8116a7e443dd28fe9cde2de3d18367a10860a0d5bb55d20 DIST OpenJDK-jdk_riscv64_linux_hotspot_24_20-ea.tar.gz 211454913 BLAKE2B c5aec2757115c71abf2a3d711c5cc8074661ba558d7657ceb1774e2a59681a58a08e167eb17aeae7140a61aa8f32cab891c56130ea74db490a51795d81a148c6 SHA512 78e601771ce3b22c3ec361aceac53184524eccb6ae0e0434be415a7af4cd528253facaf8d161bdec691946394f8fdc47a0b37d8fd3cffae0627dbcbd347ccf98 -DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_15-ea.tar.gz 215189640 BLAKE2B 9eb9f839f7e581ed54647c9a2542c36495b0ba8357422a128e57655ee59518d67f28986889a654a41d50bfc2470e2ef14a91b5aff14c34197c0ee669f1919199 SHA512 3d41bbf1bdef408244eb953463c8f3758700edbd2c348af4cf5f2b854116452d70fffaff4d6cb7195764b6d07a429c0daf125b2761d0069a571fb084eb814bf3 DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_20-ea.tar.gz 215768214 BLAKE2B 32dc974b0e13a14c79c77333bc2208b29455f5c1f2818bc2480b09ae7ff1f48e2ea9c03ae80264a4bf389bdf3df9f17157456576e943fd71713fae97110404d9 SHA512 62f1776e1b34fd5950450745e1de81ade2f882037b8bb707926c9deec19101d3623e1c9d76702d577458cbaf0d1239be5674d3752e8d58eb0200e4b446464fe1 -DIST OpenJDK-jdk_x64_linux_hotspot_24_15-ea.tar.gz 214963834 BLAKE2B 67ef16f4f8471dc307dfa4ad6a1ac6fa4a22d6f643804be928d134202db9196a1cba78bf44cd3bbd872421520c4a96b0df0ee838b9404418cc82e115443e9ffd SHA512 7eb11bc44260e0a6f807593b1c16eff8088c4329ccb9e2a72c5face45383540f59644363c3f9840325eacf23aed7b3ee2a6a4d5998adf92200df0d1912ba2136 DIST OpenJDK-jdk_x64_linux_hotspot_24_20-ea.tar.gz 215528275 BLAKE2B abfe4b018d32fcd8c814033bfea181300b3c166694e2e3e58dbba53bf7d2b6236294e619837474cefdea972d229588e41b488d7043aca9533bc14376dcf79da9 SHA512 b7ccdb432f7f837acfbe6e617486d032bf6da191ab767e2a607ca4cea0e46b58ebc4d91b9e8611771ae0814ed60db4f9c9def3d1987b85c9f2c31bb43d6bbabc DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz 192087968 BLAKE2B 12659ef10cf2728ca5eba2b4eed5f592a5bbff5065f33309498e7a465661957e0e8191bb691a89934a8221e26ae7265f0aca059ba59731b5d9a80e7f6cc55206 SHA512 84dbb810134199cb2f0278ccbcfca2d1abe32bf65bbb399e99c2ea9a027e21c2ace5685adae98930be4a185970640626b5bbbf822d499f815d803fa4485134f7 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171 SHA512 860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild deleted file mode 100644 index 0d6bc9a78d7a..000000000000 --- a/dev-java/openjdk-bin/openjdk-bin-24_p15_beta.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 toolchain-funcs - -abi_uri() { - local baseuri="https://github.com/adoptium/temurin$(ver_cut 1)-binaries/releases/download/jdk-${MY_PV1}/" - 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}? ( - ${musl:+ elibc_musl? ( } - ${baseuri}/OpenJDK-jdk_${1}_${os}_hotspot_${MY_PV2//+/_}.tar.gz - ${musl:+ ) } )" -} - -MY_PV=${PV/_p/+} -MY_PV1=${MY_PV/_beta/-ea-beta} -MY_PV2=${MY_PV1/-beta/} - -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%_beta}" - -LICENSE="GPL-2-with-classpath-exception" -SLOT=$(ver_cut 1) -# KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" -IUSE="alsa cups headless-awt selinux source" - -RDEPEND=" - >=sys-apps/baselayout-java-0.1.0-r1 - kernel_linux? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/harfbuzz - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) - elibc_musl? ( sys-libs/musl ) - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_unpack() { - default - if [[ ${A} == *_mac_* ]] ; then - mv -v "${S}/Contents/Home/"* "${S}" || die - rm -Rf "${S}/Contents" # drop macOS executable - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - - # on macOS if they would exist they would be called .dylib, but most - # importantly, there are no different providers, so everything - # that's shipped works. - if [[ ${A} != *_mac_* ]] ; then - # 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 - - # prefer system copy # https://bugs.gentoo.org/776676 - rm -vf lib/libharfbuzz.so || die - - # 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 - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_postinst() { - java-vm-2_pkg_postinst -}