dev-java/openjdk: common SRC_URI and S for 25_beta35, 26_alpha10

This commit improves the transition from ea (early access) versions to
-ga (general available) released versions.

_alpha versions pull from https://github.com/openjdk/jdk/tags
_beta versions pull from https://github.com/openjdk/jdk${SLOT}u/tags
Versions without '_alpha' or '_beta' in their version strings are final
releases.

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Part-of: https://github.com/gentoo/gentoo/pull/43395
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 60 insertions, 15 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 4ddb013345ba..c7bcb10fa532 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,8 +2,8 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
 DIST openjdk-11.0.28_p6.tar.gz 116599809 BLAKE2B 57ab3c6d469ae75d45ed806fb1973626678c24f8aea125ce8cbd49b9db1eaba5108a70743c7c4966027741a1408f3d8f8fcde64465797c69547d6f73eda283c4 SHA512 01d166fa8a4914c402a340409096530ab6313f5850d13b866ba354e02343a8b567bccee563b1d8b9b4ac5101f16d31c73a6549e21a96dd306da4b644d4609f89
 DIST openjdk-17.0.16_p8.tar.gz 107868532 BLAKE2B 993fea8e3e27fe7e2dfb602544fe5b04d6549bdb6b277ebca824212e2a89bc2fa3c47e04678e7235cb4c400832a7aba976e9f4e3e78c5ad49ca6ac5eb8071ec6 SHA512 df6cf32fa5884a004c1edc8de6fac9210efb740dd962860d415e97cfd3d2a232f19210c3d7fc21d1248e3424a160ca9e087db92c509eb79e815aeec0a40f212c
 DIST openjdk-21.0.8_p9.tar.gz 113761547 BLAKE2B ba9c280a72a1d02860578f9d688297a9e85f841e53c678b69dce1a8c2a6a92eac708d36174a28efb25c7840835a5519b98493653d475a4118c3e949a65e889d0 SHA512 be96bfa216efedd0cb094c8b4a2307f84ff6fa8a3a2c30f2f6610023e24979eee7be6b96305d893eb7cf19ed3750167a76436201cfdbc623713236c852eea917
-DIST openjdk-25_p35.tar.gz 119344880 BLAKE2B 578a783838034c3e14263bcaad500b6b9b258039e9520861535cd0af09bc7c2f24d5d9d2b70cca9af4495323914ad6ef167d9b434129cb189e9c1037d7e1990c SHA512 7a4eb641d0e1d4d91a4437a8cb58a967a316ed51c6c68994b1b8994cfca8d4be1bd37708cb6b88ef3272b4ec8039d5c7bfbe668fdfba6665dd7c7ed7d95621b7
-DIST openjdk-26_p10.tar.gz 119532552 BLAKE2B 392e39b8357e78378dd174fcd9063fc219dcaa88b4ca8f151c7123f001dfb52bb1a14f099400c01e14f0e12a1a5c36039d749114081fa583bf232a45e58d80f4 SHA512 fcfa35529da1bba15e8a7ffb983017a8178dc000e7b6b523a7f5c87ce2a30ff649d7557683220e7000bbb258fed86c5a3cff57fc5775bc466a3de040ddd868c1
+DIST openjdk-25_beta35.tar.gz 119367978 BLAKE2B f8c4287848bb0bac48c725e8ddb839cdfaf2cea49234be06964d6c44f8b814a101c0767aaeedf1fb27fc27f2bff2cbaccc7ab87c15ee9fe8f2db3a1942b71058 SHA512 e50acd11ab5921b5117e9a4ff2b562d4b3c7c1a812a83b9b0d28f0a36d1f9d64ef981e4967b204c20e440f2a8534767063b1b853375d08c1c8dd592d54572b4b
+DIST openjdk-26_alpha10.tar.gz 119532552 BLAKE2B 392e39b8357e78378dd174fcd9063fc219dcaa88b4ca8f151c7123f001dfb52bb1a14f099400c01e14f0e12a1a5c36039d749114081fa583bf232a45e58d80f4 SHA512 fcfa35529da1bba15e8a7ffb983017a8178dc000e7b6b523a7f5c87ce2a30ff649d7557683220e7000bbb258fed86c5a3cff57fc5775bc466a3de040ddd868c1
 DIST openjdk-8.462_p08.tar.gz 92819223 BLAKE2B 4ff02b05348b963799a230756cc7e00eb86bc0c7037da55e38f2b3ef9864e9be6bb38b8f86674741153cbe7e2213de9e5b945231def57dce92a69f8e5ca586fe SHA512 e444fb52190c1464a5707615e2f3046bad5e5273c553a1b04cf93450b32e9bfdd49f06fbbe5d91217b6d22c6398db35c9bcb91010dfb237c760a95de02f6073e
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
diff --git a/dev-java/openjdk/openjdk-25_p35.ebuild b/dev-java/openjdk/openjdk-25_beta35.ebuild
index 57d4c8fc1674..92798f722f2a 100644
--- a/dev-java/openjdk/openjdk-25_p35.ebuild
+++ b/dev-java/openjdk/openjdk-25_beta35.ebuild
@@ -32,19 +32,42 @@ bootstrap_uri() {
 # you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
 # to exact same commit sha. we should always use the full version.
 # -ga tag is just for humans to easily identify General Availability release tag.
-#	MY_PV="${PV%_p*}-ga" # '-ga' isn't available
-MY_PV="${PV/_p/+}"
+# MY_PV="${PV%_p*}-ga"
+
+# Upstream starts new major versions usually in https://github.com/openjdk/jdk.
+# In ebuilds for those early versions, use '_alpha' in the version string.
+# Exapmle: openjdk-26_alpha10.ebuild
+# Later, upstream creates the versioned repository like e.g.
+# https://github.com/openjdk/jdk25u.
+# In ebuilds for those later versions, use '_beta' in the version string.
+# Example: openjdk-25_beta35.ebuild
+if [[ "${PV%_alpha*}" != "${PV}" ]]; then # version string contains "_alpha"
+	MY_PV="${PV/_alpha/+}"
+	JDK_REPO="jdk"
+	MY_VERSION_STRING="${PV%_alpha*}"
+	MY_VERSION_BUILD="${PV#*_alpha}"
+elif [[ "${PV%_beta*}" != "${PV}" ]]; then # version string contains "_beta"
+	MY_PV="${PV/_beta/+}"
+	JDK_REPO="jdk$(ver_cut 1)u"
+	MY_VERSION_STRING="${PV%_beta*}"
+	MY_VERSION_BUILD="${PV#*_beta}"
+else
+	MY_PV="${PV%_p*}-ga"
+	JDK_REPO="jdk$(ver_cut 1)u"
+	MY_VERSION_STRING="${PV%_p*}"
+	MY_VERSION_BUILD="${PV#*_p}"
+fi
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.org"
 SRC_URI="
-	https://github.com/${PN}/jdk25u/archive/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/${JDK_REPO}/archive/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 	)
 "
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+S="${WORKDIR}/${JDK_REPO}-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="$(ver_cut 1)"
@@ -220,8 +243,8 @@ src_configure() {
 		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
+		--with-version-string="${MY_VERSION_STRING}"
+		--with-version-build="${MY_VERSION_BUILD}"
 		--with-zlib="${XPAK_BOOTSTRAP:-system}"
 		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
diff --git a/dev-java/openjdk/openjdk-26_p10.ebuild b/dev-java/openjdk/openjdk-26_alpha10.ebuild
index 3433ef398298..b5a9de53d697 100644
--- a/dev-java/openjdk/openjdk-26_p10.ebuild
+++ b/dev-java/openjdk/openjdk-26_alpha10.ebuild
@@ -32,20 +32,42 @@ bootstrap_uri() {
 # you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
 # to exact same commit sha. we should always use the full version.
 # -ga tag is just for humans to easily identify General Availability release tag.
-#	MY_PV="${PV%_p*}-ga" # '-ga' isn't available
-MY_PV="${PV/_p/+}"
+# MY_PV="${PV%_p*}-ga"
+
+# Upstream starts new major versions usually in https://github.com/openjdk/jdk.
+# In ebuilds for those early versions, use '_alpha' in the version string.
+# Exapmle: openjdk-26_alpha10.ebuild
+# Later, upstream creates the versioned repository like e.g.
+# https://github.com/openjdk/jdk25u.
+# In ebuilds for those later versions, use '_beta' in the version string.
+# Example: openjdk-25_beta35.ebuild
+if [[ "${PV%_alpha*}" != "${PV}" ]]; then # version string contains "_alpha"
+	MY_PV="${PV/_alpha/+}"
+	JDK_REPO="jdk"
+	MY_VERSION_STRING="${PV%_alpha*}"
+	MY_VERSION_BUILD="${PV#*_alpha}"
+elif [[ "${PV%_beta*}" != "${PV}" ]]; then # version string contains "_beta"
+	MY_PV="${PV/_beta/+}"
+	JDK_REPO="jdk$(ver_cut 1)u"
+	MY_VERSION_STRING="${PV%_beta*}"
+	MY_VERSION_BUILD="${PV#*_beta}"
+else
+	MY_PV="${PV%_p*}-ga"
+	JDK_REPO="jdk$(ver_cut 1)u"
+	MY_VERSION_STRING="${PV%_p*}"
+	MY_VERSION_BUILD="${PV#*_p}"
+fi
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.org"
 SRC_URI="
-	https://github.com/${PN}/jdk/archive/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/${JDK_REPO}/archive/jdk-${MY_PV}.tar.gz
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
 	)
 "
-# S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
-S="${WORKDIR}/jdk-jdk-${MY_PV//+/-}"
+S="${WORKDIR}/${JDK_REPO}-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="$(ver_cut 1)"
@@ -224,8 +246,8 @@ src_configure() {
 		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
-		--with-version-string="${PV%_p*}"
-		--with-version-build="${PV#*_p}"
+		--with-version-string="${MY_VERSION_STRING}"
+		--with-version-build="${MY_VERSION_BUILD}"
 		--with-zlib="${XPAK_BOOTSTRAP:-system}"
 		--enable-jvm-feature-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)