Adding metadata

5 files changed, 15 insertions, 160 deletions

diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3db04f596a46..2bfafefebf98 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,15 +1,9 @@
-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 OpenJDK-jdk_aarch64_alpine-linux_hotspot_25_3-ea.tar.gz 138220136 BLAKE2B 989edab2bb962e5f6f544979d554d21dec222a1cd95f889c6ce206a3638449a60870ad517957d74fc9c34e2a32361dc4a097f2bc0d5c43512c88967f2f41de8c SHA512 bb8972f82b7eaca9fbef3dc29e59dcc77113b5c72787eff81c95fc63e9914ad1f1c71263768d1e1095c716fde1041ff2fe923ecf3d25f4e9db485c6dc6f0f014
+DIST OpenJDK-jdk_aarch64_linux_hotspot_25_3-ea.tar.gz 138256515 BLAKE2B 26857ba11f956dc0c949baf12b0ec80e19cda80b8ba538bf691fc7a4ac26154043b3a41dbc4751fc7b894ccf27d311e5283af199278aa22cdd99c9a9def6ec3d SHA512 276e4baa27b957be76030f53818e282f54902d95c771b8128479ed2d4d71d41be7e8b953f89348fb7ddbf530c65805963d5f97460d9827e5900147a2f7462286
+DIST OpenJDK-jdk_ppc64le_linux_hotspot_25_3-ea.tar.gz 138778201 BLAKE2B dd4df5b63d467f5a2cfa63916a70a5661bc0fdbece0aecf8a7b106474a614e65bccaed71314483570933aa3497a805bccca61e9f843a501b02a5047a1b639b6d SHA512 f90ac26e3499c6a5cdfa3076ca60b1c29e54833733b8db656fa4ad8624c00c6292e208f2542f14432faaef43064f957a82726acd4180e72d183f560cf6554ed8
+DIST OpenJDK-jdk_riscv64_linux_hotspot_25_3-ea.tar.gz 137106605 BLAKE2B f24168975aadfd570323d47c03c86f8105de3d90281b4c042604cbce14c6ce40964775522585d415cff1d9da77effafe39a120ccfe962e8d61b15683d25a7c2d SHA512 bceda13d658055dbfcb324d3ab8910cc02d7664bc651db203c5b80ed46fc139ee2f892bc52b9dd55326642cf09131079b5b18f7c4d368e427e40dbf65fffbd05
+DIST OpenJDK-jdk_x64_alpine-linux_hotspot_25_3-ea.tar.gz 139326202 BLAKE2B 6b8b7cfd76412d6194f2ad3dc070c901f90ce531e2da31ca1d19d97ba8529aa317bfecdc9eda1eeecedc55776513959665d82768c2da9429eb8a2813e0a06756 SHA512 c5abe9afa715ee2fb4f6d4a91c160e3b6656126acabc3b428a6d75a537f2e337d41ddc15c45007c15050a9fe508a4d2a093cb28b6b74b89b71ee00863be0531d
+DIST OpenJDK-jdk_x64_linux_hotspot_25_3-ea.tar.gz 139228628 BLAKE2B 2dbe8d23fc2ce9af7d4b122c3bbe2efa2e17829a383946969400755f2ead1f8917e7580dce10734cc72cc6b790f431de942e010af0e6eb74e8811b596918e721 SHA512 89c7aec32900c156f5222886e700fd57ba8a2c505d3ab99cd5368907cba3cfa10e9e65fcbd4196b71eef9a2a7f0051e3f3c19a51d0411895a616e523db913b7c
 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
 DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.25_9.tar.gz 177532830 BLAKE2B 5a2e15a9cd601dfbc6749875ee53de1ca5d41c41335e52588c778412499c4825b9108bcf8dacbe250814ff5664d8b8fceefceb738dc24c3ab3d13d292fa3d027 SHA512 8ba8c210717046ab167eeccfc8a3b18e34e77262a0aef866b6268cbd5b91bfd6ed90003ce7de852d6e24f923e044839092e5faac2f3df6273b8b3868eb7e7398
diff --git a/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p2_beta.ebuild
deleted file mode 100644
index 0d6bc9a78d7a..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-25_p2_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
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild b/dev-java/openjdk-bin/openjdk-bin-25_p3_beta.ebuild
index 0d6bc9a78d7a..1df73d6d9ac5 100644
--- a/dev-java/openjdk-bin/openjdk-bin-24_p20_beta.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-25_p3_beta.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
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 906b71ad6e36..11fc442fb4a2 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -2,7 +2,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
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"