commit:     6bae47e49b6e774e915961dc0159b516a6083831
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Dec 26 10:50:33 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 14:34:43 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bae47e4

dev-java/openjdk-bin: drop 24_p20_beta

Since there is a java 25 tinderbox now, :24 isn't needed anymore.

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/openjdk-bin/Manifest                      |   6 -
 .../openjdk-bin/openjdk-bin-24_p20_beta.ebuild     | 136 ---------------------
 2 files changed, 142 deletions(-)

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3db04f596a46..fa0a8753b6ed 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_20-ea.tar.gz 213486173 
BLAKE2B 
429486689b28a436462d20691919ff90f242ea0d7f9e2f35c10596cb21780c14cfc8434531e2c75af0a486cec9004a815815ce0ac759a99612c8d325fd925230
 SHA512 
e003b0f91325560891c831e4e37a641699685b8e32f032040c65bf75c7557f89673976bd87ece4ad31a8e5b46f7854a830d553f91804379661319da087d9a9f1
 DIST OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_2-ea.tar.gz 138188020 BLAKE2B 
5565338caf2b16e8ae91ab78709314b3a1540f24d38230f547113edaa24ce375f2decd19bc17126e48c823342775c6d4747c99167a58d5e15adebb896c99392f
 SHA512 
e1470842b0f023d92a6e228f7ca9a1edd9d27d4ae5850a935ed862176289dfccfac8c9037db38af5cfd70378d4526aa4e46cd3875779b2aabfe60f2394529087
-DIST OpenJDK-jdk_aarch64_linux_hotspot_24_20-ea.tar.gz 213435180 BLAKE2B 
0163fbc674b7f04dc69bf2d57444e2f9625f22050a6ae09bd976d9d393d69c3b557332302a6ff0cc58e04ea910bb4f2bc5fda677024c06ac568df6cc57698d11
 SHA512 
b6fd2b0750e22dd986314314e126932dc95475314636733083d1d0f50c1e298371d418cad098e0062f6e4a3b3d4a2f50e3cf2e7954db407b01ea5f3432e606d2
 DIST OpenJDK-jdk_aarch64_linux_hotspot_25_2-ea.tar.gz 138225211 BLAKE2B 
b6d029aa8870eeb1600e626567bc96c5e9b8a648a984d3e92c18a90f0276c72b6baa5c587842522f5fdf70e47822d1ef79a343869a3d90ebeeee235d728419f3
 SHA512 
dbda88f277a6e915f8866fe408612188e4e0dd9b76acee25707cbbf979eae8fe21b2739a048a1f57039a585c06cd4c710f774732624d238e6c76b1e232dc5ac1
-DIST OpenJDK-jdk_ppc64le_linux_hotspot_24_20-ea.tar.gz 214984344 BLAKE2B 
c6582a845579246f920b0ab94657870650669a30e45f0435a4ad8b63657771b5a708cf5aa417f87d9e2a7dde7fae0603864e21558e022fd39cfa818d1d5bd20b
 SHA512 
f5e8644094b737a3eb8b1d40b2140fbc283e9c397c0dd23bc53c4678430abf84dc8f2e264ac4aee824b135e30dd3df390d8a38af5b7e7ac74e945ce081984f91
 DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_2-ea.tar.gz 138760006 BLAKE2B 
0526ed58a4068f876422d0a99f832a79c8e298e8152ebc29ec2fd281895d87f529c7cff404fff20273bc990cabef337e708a107da4d77686660c9ad796db8d28
 SHA512 
d1ef8bdc32adb89be2c37c8a34d7547705c886ed7fd7b80a65a52b9e7ea1afb86d483edc5b2ead891a1860aad6aebb2f497fc5c11bdad9bc7a6b21f3f49aa31b
-DIST OpenJDK-jdk_riscv64_linux_hotspot_24_20-ea.tar.gz 211454913 BLAKE2B 
c5aec2757115c71abf2a3d711c5cc8074661ba558d7657ceb1774e2a59681a58a08e167eb17aeae7140a61aa8f32cab891c56130ea74db490a51795d81a148c6
 SHA512 
78e601771ce3b22c3ec361aceac53184524eccb6ae0e0434be415a7af4cd528253facaf8d161bdec691946394f8fdc47a0b37d8fd3cffae0627dbcbd347ccf98
 DIST OpenJDK-jdk_riscv64_linux_hotspot_25_2-ea.tar.gz 137068288 BLAKE2B 
ca30c5dc1240edb1c8f580df359937cd25528fa9f11b29f6c6a92aaa668c359c6e0522c886a405e53868c56c769c2ad7cc164837cdea25db8e802946377da5be
 SHA512 
1b1cbb7ee68a4e7de47017be23d3ac66f010e99175ed7d9ef66c216ae2bce6c8eb94629633cfa4ddd4a7d27deb359289bce48d54eec203d0be343c47bc93c318
-DIST OpenJDK-jdk_x64_alpine-linux_hotspot_24_20-ea.tar.gz 215768214 BLAKE2B 
32dc974b0e13a14c79c77333bc2208b29455f5c1f2818bc2480b09ae7ff1f48e2ea9c03ae80264a4bf389bdf3df9f17157456576e943fd71713fae97110404d9
 SHA512 
62f1776e1b34fd5950450745e1de81ade2f882037b8bb707926c9deec19101d3623e1c9d76702d577458cbaf0d1239be5674d3752e8d58eb0200e4b446464fe1
 DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_2-ea.tar.gz 139310462 BLAKE2B 
e6e7f2fc5390b74a2206beda0a40bb83f41c7ae576957499912bb4c56dc64e61af8bf791436d43d433f2ea2249cf77af09e1e0a8960597c3bbc8fd669fd6703a
 SHA512 
a97f506056ea8d97f450e1aa7e4f6f6be39c4d7f006877d40aaef30bce745cab06a80bb53c078973280024c0b84452d2768b03b20eaa6cdfbf9e1ad5d1acdd6d
-DIST OpenJDK-jdk_x64_linux_hotspot_24_20-ea.tar.gz 215528275 BLAKE2B 
abfe4b018d32fcd8c814033bfea181300b3c166694e2e3e58dbba53bf7d2b6236294e619837474cefdea972d229588e41b488d7043aca9533bc14376dcf79da9
 SHA512 
b7ccdb432f7f837acfbe6e617486d032bf6da191ab767e2a607ca4cea0e46b58ebc4d91b9e8611771ae0814ed60db4f9c9def3d1987b85c9f2c31bb43d6bbabc
 DIST OpenJDK-jdk_x64_linux_hotspot_25_2-ea.tar.gz 139202344 BLAKE2B 
e86a13c0a8dcfadbad2142d195afa56658569230fa0df823932be3b961564fa497a3ace37dbea8a98097b6be6fa0aa8ae8756a5e130d4483427a000929ae4ce5
 SHA512 
75cbc70ab4780c201b5158b268808408bcfc383f80deb14a98187439255a2116f7d115028386c35ee7961a0ea43ee2c7db3eebb2d8aeb396a59d0081dfebf428
 DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz 192125336 BLAKE2B 
e083ce8691f8462310eeaa7495d26519754f5bfadc8a786dd188f1dad4dc36164eea9220125340b43c9e6b4321be6e26d66a9c18247a6462e4cae9f453fe1171
 SHA512 
860fff5eff6ef2a29062aac0ee7f90d80dca417fb58ccbf9a9f2ca96a8dc4798a00dab42deedbc64a371d0356b17e6cd12cdc2b2879edfcec9463ffc004ce5fb
 DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.25_9.tar.gz 182871332 BLAKE2B 
ac6ba9e02fcec38dbb685cdebf379ecdcb5041bc53a71a0896baf7f2628faaa0dd1402b045a57010e2495c16e48116fd1216fe6d4b6cf35cbc996dafe8516e0a
 SHA512 
db0761f8b0baa82c61567a869f2c23da61470d055ecbd73c7693a7be37167282af7387006f22a0c7a46e1e71591615fac0431925987af8fb8e36d77207669856

diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild 
b/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild
deleted file mode 100644
index 0d6bc9a78d7a..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-24_p20_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
-}

Reply via email to