gentoo auto-resync : 07:01:2025 - 06:41:06

2 files changed, 9 insertions, 12 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 2d63ec3a8448..f5780d99bced 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -9,7 +9,7 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
 DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
 DIST openjdk-17.0.13_p11.tar.gz 107315661 BLAKE2B e403a8f33d4e79dd5c77a5dbfc991b443e15bddefe7cfde6cbd6f8df29f1cf499d0bd467d23f0c1b89b92b1dca16ebfb398a5c64b8787f787465a8a5f50bdfce SHA512 6f2220b3b0b9ab4441968d487858449f0e58400bfbbf8cc322b6c9393ab44869ea27285bed1022ac531f0a9eec5b7d6a07db4f7e78b094bb5ca8cedd5f40711a
 DIST openjdk-21.0.5_p11.tar.gz 112679148 BLAKE2B 6cfb2ab73e1bcc5d74c28f56e163778ca42fa1b9eda5367f2198827eae04d5a269926c97b326d1e71b2a57f2780588f538db8d3a81f367903fd967534747d3af SHA512 2fdfdb7e21fcaf97590fa54317f87169d5fdabf38027f4f6570942b2af637fc9ace3d35c3bbb0df29720e7a0f6d6a4087253a713389743ed7947e433d7b8103b
-DIST openjdk-24.0.1_p0.tar.gz 122453193 BLAKE2B 660539336f68d7ad850e8d9f2e8ad68fe4ef4a8c936c5c2f255b6651d9cd8464cc0c2abebfbdb933d934c44906b3d9bbf3e0321ae1a224ab8a00eea95a827b10 SHA512 db75846a92bb3c8edfcfcc3b35cefd3d80c03c9fd05bf994983174b0696a14e75130283407371eb765d16f5820d5ca4744c94332c8ed5a33560b343effedb37d
+DIST openjdk-25_p4.tar.gz 122617240 BLAKE2B 21f31c40b80e4a7112894bae989c3c67b659ed45c5eca8b2c24d102db2aa259337ec8c6045472bb92383997273a7631cdc8a0ad3c84b120bcd7d1df00dad51b6 SHA512 c5ae04c92008ba868496623eb47edb67317876115af868c49653b3b2d7dfd736dba4ce76e648da5521d5121824f49e3bf9da81d9f411aed761949d29b64cb480
 DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
 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
@@ -25,6 +25,6 @@ DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c
 EBUILD openjdk-11.0.25_p9.ebuild 9003 BLAKE2B e8b0c87b9fb1322893cb137cf7eb94c29e0b4d33720d40d464c5d4c171297642eedcbcb66f637c963c07d83db84d551f7d536e5ba6c8510f6140f6051fa15134 SHA512 3ed25ec77e46faf8843085a3eceabf801a242ed0471eed32d344c871cb1e006477009d9a19db748ff1fd083ac0b7874f364d48360ee258bb57e3bdfcdd79227b
 EBUILD openjdk-17.0.13_p11.ebuild 9423 BLAKE2B 269c2108f9807cac55c140e93901566537d99c865238da907be7e2542664eebde575e02fa425414e786cde43ec804937819e4311036ac9b74c4c81cce964b0fc SHA512 d1c49ce3d13496a945a362fe52b1b6cebe43280b82e41a32180c077e0c9c0e60ef5f4c752a3288331ac33e659e92bdb98f7e54c64d31414cdb600161766c68df
 EBUILD openjdk-21.0.5_p11-r1.ebuild 9561 BLAKE2B 575548b631e2bbcbf26ffac43277da23c9144baac8eb8180dcce946431a059ef049a45059a437ee17f1eac4d1a75a2734801790ab682bd65729e2b070008640d SHA512 fa439baf5c9144f18937c326b5da29c7015aa6e67c024850242510f97e76afc2b84e1e2d09295bbc6f7b9641cf01dfd9d11de43d1004fb359861e70acf0f0661
-EBUILD openjdk-24.0.1_p0.ebuild 9560 BLAKE2B f3596b4640597df3091f18be3a9f246e185c7f3081fa58249fd557715e16d7c84934a7a724af806ec6c1ab0dd938cbf11deaddd7953bf49785ce7247244e7f2a SHA512 6ee4ede48e208897bcae247f8b0c2c0bf2242d27e412642b729bbd6de3edda4c0d64775338542f3037f38ae6629c98a2b6548c493e3f7fa0d3d9c34c5c8acb48
+EBUILD openjdk-25_p4.ebuild 9442 BLAKE2B 9a0e8ee1d523bfbc2243ac4625ded98b953a4e5fcba241e2d66db1397c01e093a500268d48d8a97f1c5d5c4ab838466f70bcd7ba614d39ea13a4a645716f7aec SHA512 7f3f6c90ffbfadd66879e0e35187842f7479d965036bce66205b9d01176cd97dcfaa44905a0724c4c86c0c7efd5d85ee7f2d1b19925f4ac463fe1176b3548514
 EBUILD openjdk-8.432_p06.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
 MISC metadata.xml 1549 BLAKE2B 6c922cbe1dd4261036670a176be092d495024dd25e2ffb83cc1af1e3ad0dda3491e8973cdd7f8688f1c0854acf55cdc11e9d80ac5b9a16b544455d2cd1bdcbfe SHA512 57cd1a08f0479e8b11d37665c1d905255685ed2d8d27f469a9689ffe070c7ee6cd5944a1baf87cb19722b31af56b1a4692f7967e817d1e4ffbf7c4d97881d838
diff --git a/dev-java/openjdk/openjdk-24.0.1_p0.ebuild b/dev-java/openjdk/openjdk-25_p4.ebuild
index 24341f94692b..8d8d8b9b9b4f 100644
--- a/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
+++ b/dev-java/openjdk/openjdk-25_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,6 @@ inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-f
 
 # variable name format: <UPPERCASE_KEYWORD>_XPAK
 PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
-X86_XPAK="21.0.0_p35"
 
 # Usage: bootstrap_uri <keyword> <version> [extracond]
 # Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
@@ -36,19 +35,19 @@ MY_PV="${PV/_p/+}"
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.org"
 SRC_URI="
-	https://github.com/${PN}/jdk24u/archive/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/jdk/archive/jdk-${MY_PV}.tar.gz
 
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
-		$(bootstrap_uri x86 ${X86_XPAK})
 	)
 "
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+# S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+S="${WORKDIR}/jdk-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-#	KEYWORDS="" # not LTS
+#	KEYWORDS="" # LTS but not yet released
 
 # lto temporarily disabled due to https://bugs.gentoo.org/916735
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
@@ -56,7 +55,7 @@ IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap se
 REQUIRED_USE="
 	javafx? ( alsa !headless-awt )
 	!system-bootstrap? ( jbootstrap )
-	!system-bootstrap? ( || ( ppc64 x86 ) )
+	!system-bootstrap? ( ppc64 )
 "
 
 COMMON_DEPEND="
@@ -177,9 +176,6 @@ src_configure() {
 		export JDK_HOME
 	fi
 
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
 	# bug 906987; append-cppflags doesnt work
 	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
 
@@ -211,6 +207,7 @@ src_configure() {
 		--with-lcms="${XPAK_BOOTSTRAP:-system}"
 		--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
 		--with-libpng="${XPAK_BOOTSTRAP:-system}"
+		--with-stdc++lib=dynamic
 		--with-native-debug-symbols=$(usex debug internal none)
 		--with-vendor-name="Gentoo"
 		--with-vendor-url="https://gentoo.org"