9 files changed, 553 insertions, 10 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1f21fb58c44c..0cf92db1c0dc 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 1e152e87f8b3..8119a5acfe59 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,7 +3,9 @@ AUX free42-3.0.16-fix-build-intel-lib.patch 2435 BLAKE2B d95d31e0322454b0578f52a
 DIST free42-nologo-3.1.9.tgz 7464567 BLAKE2B d3a8e87a71b1e6de0da2f9d0efe20e3131c8589151b1f67873d29aa45131b513a2e7fb127fd93fec35c318ed9ed9959f356df3b8c39ea31ed89022d9d66de3eb SHA512 350a0f15f08afbca04cf59e453ac0e48c78fb068b67746ac4174a595140085a167409a51eb9f627a71b931177495456ab31ae3ec00a9dda29bb21db7244381fd
 DIST free42-nologo-3.2.3.tgz 7474355 BLAKE2B 163251cad1b5cf166a12d83341314c778a220539fd5dcbc44d68358dd8a6923e35611ba0482cdf80f843981368ceaa5c86a67fe89ecbe0d4b613f414036c1782 SHA512 c0e840e387a63212a9386a11e198efe779a9613fe5a8522dc320ee0f04920e637085406de3e906f8819178401aeb5dd3158716fc63b30e009678d834060040dd
 DIST free42-nologo-3.2.7.tgz 7475723 BLAKE2B 66caacdd353886268d16e9429e324fc1218ab102f7508e4440c09d365734b4b9ba58b6e3f779b7981e11191716cc910a7fa219477013fba4963a402f7cc94604 SHA512 e4342d8c9adb05daed67c98d676b0e43c7fb2590fffeabcb9359a957f7ddb989fec89f1bce86db8ef366bcca03ce3feec77f46338fe775df9d3e4f54369ee861
+DIST free42-nologo-3.2.8.tgz 7475999 BLAKE2B 2e4128d090c1ae40a4f22486183cbd5e44a8c4f6c49889cbeb914df01a05e655a4ac7b99d1db5b34b88295fb036267f82f0458d58a384b0d342d1607f898253d SHA512 2612ddb3cdeb7dbe101a42aedfcf8cb1f2ba593d8c038f29ce0e3a49c768f757b0b49a9bd957c6eca7bae1f6159f2ca467c41490a9a529c694bdc3c0b38e4eeb
 EBUILD free42-3.1.9.ebuild 976 BLAKE2B fdac700a7965299f84511ace42e5b49665431f42dd6c02eb4f58e235b60ede1bb719fe5a553242aced72a22572a117cee839522cb98bc10193cf8ff88cfc2dad SHA512 5b994121ff250b72b0b01ac05f00d07d6cb3d8f302b22b5f0d0bb1db6ad7d6a2624f1e7b68fbb980597993992123188a095af46588d54142c86554b09a99ea53
 EBUILD free42-3.2.3.ebuild 978 BLAKE2B 7740899f7b84da3bf6d3c75a77f5d0388434e4407ee56e91eaeafe7d61ff12c2cdb77eff63117822088dd9e7cd68c7ff00a0fdd9f365a8c5376d8fe952a5b776 SHA512 c89f485a258927588315e58af7889cbdd8fe7c32931f7a21f98716d21385e7f9a3d9a6954186a75f18095538b515e26321946e789af70f278f515b0e6f71c4b2
 EBUILD free42-3.2.7.ebuild 978 BLAKE2B 7740899f7b84da3bf6d3c75a77f5d0388434e4407ee56e91eaeafe7d61ff12c2cdb77eff63117822088dd9e7cd68c7ff00a0fdd9f365a8c5376d8fe952a5b776 SHA512 c89f485a258927588315e58af7889cbdd8fe7c32931f7a21f98716d21385e7f9a3d9a6954186a75f18095538b515e26321946e789af70f278f515b0e6f71c4b2
+EBUILD free42-3.2.8.ebuild 978 BLAKE2B 7740899f7b84da3bf6d3c75a77f5d0388434e4407ee56e91eaeafe7d61ff12c2cdb77eff63117822088dd9e7cd68c7ff00a0fdd9f365a8c5376d8fe952a5b776 SHA512 c89f485a258927588315e58af7889cbdd8fe7c32931f7a21f98716d21385e7f9a3d9a6954186a75f18095538b515e26321946e789af70f278f515b0e6f71c4b2
 MISC metadata.xml 346 BLAKE2B e7d31b887aade448cfdd31d3221c1d01f13ae1ad9097c4b18fa39b927401d7aa1c0b0b4bad4c36251b74f976ae79899e1b64b6086656cfbbee2036e1cf85946d SHA512 a848ab39ebadfe8b2c866cec845b16c1a0d92070a8e4365bc576a3d4287078594d0eb41f704f5a2f9b35618e24d91de99f6760ced7d39d9a4f706ca6f5c5480b
diff --git a/app-emulation/free42/free42-3.2.8.ebuild b/app-emulation/free42/free42-3.2.8.ebuild
new file mode 100644
index 000000000000..768a05888a5e
--- /dev/null
+++ b/app-emulation/free42/free42-3.2.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+S=${WORKDIR}/${MY_PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="app-accessibility/at-spi2-core
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.14-fix-makefile.patch"
+	"${FILESDIR}/${PN}-3.0.16-fix-build-intel-lib.patch"
+)
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest
index b576f5117d3e..00a883a030a4 100644
--- a/app-emulation/plus42/Manifest
+++ b/app-emulation/plus42/Manifest
@@ -1,5 +1,7 @@
 AUX plus42-1.0.12-fix-build-intel-lib.patch 2435 BLAKE2B d95d31e0322454b0578f52a1e1ad50213786c14cba8e91bb440fd44397184021da3ce6813eb82114820d9649c8e33969ff5dcfb454c72d7f89b4785564139533 SHA512 7376289f5ed760e48c3c00ee9d1135532cb0aca9ee1eb8116a284925f00d59434544c10de612acaa14f8fd2af409091a19aaf03b01ae80fa185ae3beb70c85cf
 AUX plus42-1.0.9-fix-makefile.patch 713 BLAKE2B fb8ca302a324122cee89d7f3ddab2a0521c8dee1e910ae50efe7ee74ed3781ac7e3c017cc7afbd601cf41527afd61d979396400a5e6dc8e1714ff853ba25a4eb SHA512 532c8b2d88324e3b38ab568beb1ed9b7fce6e91c894c6438657a800ccd32759c82ce9bcbea3828a04985eef18c278004e0a068b88695da5f0e75bd996c6d2fd3
 DIST plus42-upstream-1.2.6.tgz 7651293 BLAKE2B 3f2d62d13d654b52a4479d6afa3719e26acb849fe8a63523df9970c8701046a0b43830bccb0a35f12bdd784b7a858c1f40e16c5c878d413666eacbe7327b08fd SHA512 929e34809d5983654ce4a8fbcce9cb7d486d78c682367e8af02e5d05863c14143f4378bc047051cc13df6d96e4e60b64d74553e278ca7b6e350d0294650569ab
+DIST plus42-upstream-1.2.7.tgz 7654451 BLAKE2B 9f6399d492fcbc7282fcb0e906dd67d09068e5e45969f90e9ae728d0f0371ba98715eb927d7d7795505a30f353df30379e0505cb9fdb1715612dfb4dbe9b686c SHA512 a7dbee0d4454ee4265df3e80d776eb99a8fcbdee8bcd42f83c288684064e9c131ec4de6b74eba8000df22086777c2ffcb07c53d83ed8fe87732c02317d2537c1
 EBUILD plus42-1.2.6.ebuild 1016 BLAKE2B fc38ff157972579b7296a2c6a94f9a0da63b304e1cbaa1f3aacfdf8ef64cd75e374ee4fd383a30576105ea0cdc56c22756881aa1c0f6f7aed4ea8c105f4aae06 SHA512 5891d16cc1f05c8e924b6062332c3ff006ebc9e3b2cd7a408df0d5633759d99f949f6e0bf636dd98e4846c8790378a84a5c0f899a197bacaacfdc392af5ea3ff
+EBUILD plus42-1.2.7.ebuild 1016 BLAKE2B fc38ff157972579b7296a2c6a94f9a0da63b304e1cbaa1f3aacfdf8ef64cd75e374ee4fd383a30576105ea0cdc56c22756881aa1c0f6f7aed4ea8c105f4aae06 SHA512 5891d16cc1f05c8e924b6062332c3ff006ebc9e3b2cd7a408df0d5633759d99f949f6e0bf636dd98e4846c8790378a84a5c0f899a197bacaacfdc392af5ea3ff
 MISC metadata.xml 353 BLAKE2B 62d2057ed40527ddee3b747c7d702009bba223521e3264af5905506515fc67a6baf27938ae03d664eeb713aaeac898b7a1eee0682b69f3659b4dbc6e7eddaef8 SHA512 9633917e4a226c142672cd8bb91d3ca5ec40a2b4600bc8ba60ea959dc871f54881dc331ca5ed0030a4afcbad426c7528667b61289e4ed77e19aa3e9d1c816ce2
diff --git a/app-emulation/plus42/plus42-1.2.7.ebuild b/app-emulation/plus42/plus42-1.2.7.ebuild
new file mode 100644
index 000000000000..8749be2a6c4c
--- /dev/null
+++ b/app-emulation/plus42/plus42-1.2.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-upstream-${PV}"
+
+DESCRIPTION="An Enhanced HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/plus42/"
+SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz"
+S=${WORKDIR}/${MY_PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="app-accessibility/at-spi2-core
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-fix-makefile.patch"
+	"${FILESDIR}/${PN}-1.0.12-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/plus42bin gtk/plus42dec
+}
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index cd6170f32d1e..a9a694f73dfb 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -1,8 +1,8 @@
 AUX ruffle-0_p20231216-skip-render-tests.patch 662 BLAKE2B 1715c6e5c80c0e4e2a53a70bab319bb78e493a8e48ad01c8ade5ddfdd76e7590506e46f2c2fafb9ac4e732ebefd04fd563e8a2f0c2f5d60bd29d0bf8eb7fbacf SHA512 7d42b5c7f1a11bc7666739fd76e341ff57e2dda25b95e883897d705e0bc37ab0beffa842d34902601b24ced1b0134855c85813067c83a2ea36c73ff7daf7c697
-DIST ruffle-nightly-2024-11-29-vendor.tar.xz 67239116 BLAKE2B d2eaaf7c7528207a1fabc67cd52bab37442e4c09a740842840f3e44a0d79c826f17b1014e30fcbb07b9e6346c48d4a92439c209b7f54ddc1897cb4166546a295 SHA512 fbf8589d2c9b21b1cb6e93963e8350fad77854e351538ac8155f16bbc16f0ecb1680f7ac7066d14e7fffefa5ead217acc8b8a9319ded891abdeffd5890797776
-DIST ruffle-nightly-2024-11-29.tar.gz 94965476 BLAKE2B 9440808ebc0f2db33df06f45eaf6b089b56b6ce604537c522ba57bb2e7e6ada4f334fa4e483547af9b203c4047566d88d88dbca93c6ab2dd8d1a5ced20bc6cdb SHA512 380da319ee84bddc9f12d472516471a18177f748b4072d1853e3aa9d6311226230cf5e38ac4b30041507f836ff620c04aa69e6e45407571d752baf77ac7ea42a
 DIST ruffle-nightly-2025-01-24-vendor.tar.xz 67182584 BLAKE2B 0927c7d181f86bb152ef1224efdebc88152b2966a24d11e7434a6b3aff472c8ea47164c9f61f3554561de78bb9a7a9c60648c994fc9feeb03903a72ccd3f8620 SHA512 9cbb5edb8bd7ba8d2a6dccbce20dd8026b3f6f7d47131292e7f55cc3fee7154189b9749b2142d32eaa879b18461c698317dd9b36f808482f656acb9f1dd8253f
 DIST ruffle-nightly-2025-01-24.tar.gz 95156736 BLAKE2B 7d66931308ab93c0e5cb95727297fbbf03406840c4b793033d277ebfa0c5f8a28e627439736fed4bdc537b3363b691da8efc4b1b3f653a9aa31b741dc0746f56 SHA512 b958e9b685ae529a33253a536fb67030ff0cc1bd78967bbefc5146eced710650f277c32ad37d1f4cd6ce1c43b9be6ad28f51b46ce14afe0644137065a7ef0215
-EBUILD ruffle-0_p20241129.ebuild 2625 BLAKE2B 8e1893bbf56737d1d57accdf6da04ca8cff425674b222607fd9b2cb20db1340f0db27d08328e8d61b60bfbe1de13c0f6f3da71e6220755f9baa6b3702a677e83 SHA512 0908e9a179d75cc509315b6c609a17ecd528b7685267a9684e5cdd16a98c913d10a16883d5c4e2605f7404c1c98689d5ae561bdb0a5941ec5390567fd6ccdb8c
+DIST ruffle-nightly-2025-04-16-vendor.tar.xz 24376756 BLAKE2B 138802db5ed2cfd1fbafefd09da399574efb6950cbf5e16ae3eca665bdac87b3c7f03b16c21394e6fc8257359955909aa92daa5ff981a18dda4484a24832bf1d SHA512 021944e8740f06715c3fe7b161830e5fcfc12f61ac42c605af7c1242d9c2eb4f97b4d240ed7764313ae9aa1fa9e4c9a5f42637a67068455adfeb068362224466
+DIST ruffle-nightly-2025-04-16.tar.gz 96183338 BLAKE2B f25f7a1d805fc3390cc6282154d960fd8e7fdeed3d2e04ebd69fe176022e46e27e3d6d2db5dcc3a0aaed18ae72d45b3edeb530597d13d543a4e656e68b5da3f5 SHA512 dbf2b8009416a761d6c2bf43eaecd8b1964f5350bddd5cbf9977be4339d638293458f791fdae004d661128c8eab21fc8d72affc5cc3225056de45f48e070bfd3
 EBUILD ruffle-0_p20250124.ebuild 2608 BLAKE2B 03244fc9fa053369313c4b87ed7fb017473cfd5486f322d1079dd45bd2f9451ed1cf705697367bbe22e9b2ac1feb27c40a87edd9848db0b0043a3cef00da809b SHA512 91cd3390511db757ad3a11f90ca8bb1afe383b42468f9d286ef4dc616a36d1ae48ea431f0dcde27ffcc920b0107dda0e4bf8c2d891704cae5472cd6c73b51ff1
+EBUILD ruffle-0_p20250416.ebuild 2613 BLAKE2B 05bddb915377d6e9bae431c0c2013173c6acb6928dae8f07c80f7cb750268c200b09d769aeb7a6ca17af0c4e1e673194f312dfd1bb09cec31dfce313367dafe9 SHA512 d32790bb6c3d499544dbe2902e91611ad235af98803cfe8d52138e78d49e6b280810aca783aa2728090c82d7e425c8beb85aee58bd5d210df3561874d0962355
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20241129.ebuild b/app-emulation/ruffle/ruffle-0_p20250416.ebuild
index ea019d6c5b1a..3d725b728c16 100644
--- a/app-emulation/ruffle/ruffle-0_p20241129.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20250416.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-RUST_MIN_VER=1.81.0
+RUST_MIN_VER=1.83.0
 inherit cargo desktop optfeature xdg
 
 MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
@@ -20,11 +20,11 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Apache-2.0 MIT )"
 LICENSE+="
-	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC UbuntuFontLicense-1.0 MIT
-	MPL-2.0 OFL-1.1 openssl Unicode-3.0 Unicode-DFS-2016 ZLIB
+	Apache-2.0 BSD BSD-2 Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 OFL-1.1
+	UbuntuFontLicense-1.0 Unicode-3.0 ZLIB openssl
 " # crates
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -92,8 +92,8 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "${PN} is experimental software that is still under heavy development"
 		elog "and only receiving nightly releases. Plans in Gentoo is to update"
-		elog "roughly every months if no known major regressions (feel free to"
-		elog "report if you feel a newer nightly is needed ahead of time)."
+		elog "roughly every two months if no known major regressions (feel free"
+		elog "to report if you feel a newer nightly is needed ahead of time)."
 		elog
 		elog "There is currently no plans to support wasm builds / browser"
 		elog "extensions, this provides the desktop viewer and other tools."
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 9e9299ec3c95..a165d97b5fe2 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,6 +7,7 @@ DIST wine-10.3.tar.xz 32280996 BLAKE2B 49e3e1d4da74a647c01b3326b2d79ac102fa67b43
 DIST wine-10.4.tar.xz 32326532 BLAKE2B f51bee9115f236d13be717f524bfb21d4aa3bd3bc4114d8fe9f106957e01f57e14bdd415e6cc494e6860244d43fd906d69e17055822954490ae6e7562e562e6c SHA512 e1f2bf5bd021fe9937cb27e1ee3ce0e5ff06a32abe3d1e07eb6083f5dcdfcd84e5b4d631dd1a83686dd7a42a1b84eec848ec08a256c2570a709d830ce7f7208a
 DIST wine-10.5.tar.xz 32353760 BLAKE2B a8551905f63ec7806a89986bfdb73b1f171b74f604bd00d9815cf8efe457268b99655b12d0d8d9aa19e08a6566aa4f20ddfc6b4549f4eb81abc49a61d195d444 SHA512 d923e4406665721e1fb6db53cd4199b513b49f9f3a6825327635a2fa169d992067408b8958f749d05d59f66f32bfe418dabb73768fb97a5501c90d1bc0cb7c50
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
+DIST wine-9.0.1.tar.xz 30166464 BLAKE2B 120a4556b18f3336c348e9984afc8c6d3d3d69ef64aa29224dd09ad69684e32ab193f23eb8edceb08e37aff0c96be25b4a3b54874045583dd9c1dabc71ac3a32 SHA512 510ec92b442b5410c05eca5012384669f0bb06acdab9f790527a82276a8ee679a6d2cd2b769a75815d7233ce7421de05457a64596d056552f4507a7a12c9f1a8
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 EBUILD wine-vanilla-10.0-r1.ebuild 14648 BLAKE2B 894e80635d7bfe6969fbe43ba33b5dac9bec408a75f7fc3323dc8d5ab8d68da16055223c2213c1934e194cfbd8d671954c609c790343f21ac068a8121947952b SHA512 c6cf3e31d5fd5c117000d7062e7309c42833d1615eac72851ccd30c89b0ed230ed9d1a18d62a3768380176ca0b2e3c0eb2777bd48d515149c52976c58b230c0c
 EBUILD wine-vanilla-10.3-r1.ebuild 13989 BLAKE2B e744be2b1fd9d7d5b071421e1f8b5aaca10d5466a5f6801a0aeb3f5768c39c570fadcc3f9c3ff79f972d27d6683ee25da0e5d20cf93ca2592740e62395341112 SHA512 c79f0b5351c48941d22d7893823e0a6715b16cefa23ed8b5b87a44728d29b400590399a03a52126ed2cc9687cd0dc3ca185cb4007744f11a3bc0da489f8af714
@@ -14,5 +15,6 @@ EBUILD wine-vanilla-10.4.ebuild 13989 BLAKE2B e744be2b1fd9d7d5b071421e1f8b5aaca1
 EBUILD wine-vanilla-10.5.ebuild 14163 BLAKE2B 9c71d8db35e6adaae3d829afe541d501da9a5a8c445210ad20981148b12a780307183d3c500a47709f833f2dc1ca13a01cfed13666db148859467f4d28830f8a SHA512 f7297f9126c2ff60b2fca4cdb04c4052f43e4cd87f0df5f47145c5cd20dcdd063320aa44edb7bb781470cd6b309f8f277420e3e020b62bd002e3bc5f52f40eac
 EBUILD wine-vanilla-8.0.2.ebuild 12989 BLAKE2B 7d0c26640bdcc8058e39a4b5213b17329297c808e829bef0d6c2e50e2220e4aa391ef61e57d4636a8af41146f2e483efd451e9084b9d4ba1896b8d0ca41d5c54 SHA512 1d54a432b9f0497e9316affb138ff4375f8944ab3765b6b53b4f97e396f6ca1984086c099841170b26d226eeafad4650c609b0c99956351cd0486db488c79544
 EBUILD wine-vanilla-9.0-r1.ebuild 14423 BLAKE2B 896a4b83c3d65911d0e2d972a09b4e3af42b2721250ccc26488ae39d14d17b269e4ba6623483a696a8bc731ef6ad32cb543ce366d216ff3913f3cb4d01e53eed SHA512 476943b64f74527b431b407b5d0ef6a790a244487216af76875d7241ded612d1432cea64306979d19bd9c58e6314d5aab3cfae8680a9d3c90cefa7ab4cc408c8
+EBUILD wine-vanilla-9.0.1.ebuild 14425 BLAKE2B 00d3c6d9d9a8bebad10b915e7a0e931455d9b9b1a86319e9893e3faed535ab47b561e727b60e90595a224dc89adda118425cc49f23fc2c2d5af49e54118658a3 SHA512 9f75d2dafc3d33570e4fc3b2e5e1002b1a5de8869858fb8ce5bdce980c36a4dd1aa346000166ceaffeaa07bf9d9e4e44372ec6cd1d29256b777f339a8f31ebdc
 EBUILD wine-vanilla-9999.ebuild 14163 BLAKE2B 9c71d8db35e6adaae3d829afe541d501da9a5a8c445210ad20981148b12a780307183d3c500a47709f833f2dc1ca13a01cfed13666db148859467f4d28830f8a SHA512 f7297f9126c2ff60b2fca4cdb04c4052f43e4cd87f0df5f47145c5cd20dcdd063320aa44edb7bb781470cd6b309f8f277420e3e020b62bd002e3bc5f52f40eac
 MISC metadata.xml 2609 BLAKE2B 661213a596367cb5a894c3bef5f76760702d98af719dff4f279222a66e70a029a353850e5b23303182c59abfef308248a785d9b347b28b861d36f85286bf2bea SHA512 886470078e89a55ef1aaa248f1b5aab84da1d8ed86fdf387d137fa51badfd9658cb99ac7cd42d321ed212979b690bdb236e9de68c6bdd7e647dc22cbfc75778d
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.1.ebuild
new file mode 100644
index 000000000000..0dfd4e758c18
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.1.ebuild
@@ -0,0 +1,443 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/
+"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos
+	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
+	kerberos +mingw +mono netapi nls odbc opencl +opengl pcap perl
+	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	+truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite
+	xinerama
+"
+# bug #551124 for truetype
+# TODO?: wow64 can be done without mingw if using clang (needs bug #912237)
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )
+	wow64? ( abi_x86_64 !abi_x86_32 mingw )
+"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[X?,${MULTILIB_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	smartcard? ( sys-apps/pcsc-lite[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+	wayland? (
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? (
+		|| (
+			games-emulation/dosbox
+			games-emulation/dosbox-staging
+		)
+	)
+	gecko? (
+		app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}]
+		wow64? ( app-emulation/wine-gecko[abi_x86_32] )
+	)
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	|| (
+		sys-devel/binutils
+		llvm-core/lld
+	)
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
+	) )
+	nls? ( sys-devel/gettext )
+	wayland? ( dev-util/wayland-scanner )
+"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900338)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
+	"${FILESDIR}"/${PN}-10.0-binutils2.44.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) \
+			$(use abi_x86_32 || use wow64 && echo i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	if tc-is-clang; then
+		if use mingw; then
+			# -mabi=ms was ignored by <clang:16 then turned error in :17
+			# if used without --target *-windows, then gets used in install
+			# phase despite USE=mingw, drop as a quick fix for now
+			sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+		else
+			# fails in ./configure unless --enable-archs is passed, allow to
+			# bypass with EXTRA_ECONF but is currently considered unsupported
+			# (by Gentoo) as additional work is needed for (proper) support
+			# note: also fails w/ :17, but unsure if safe to drop w/o mingw
+			[[ ${EXTRA_ECONF} == *--enable-archs* ]] ||
+				die "building ${PN} with clang is only supported with USE=mingw"
+		fi
+	fi
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# datadir is not where wine-mono is installed, so prefixy alternate paths
+	hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	# tip: if need more for user patches, with portage can e.g. do
+	# echo "post_src_prepare() { tools/make_specfiles || die; }" \
+	#     > /etc/portage/env/app-emulation/wine-vanilla
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		$(usev wow64 --enable-archs=x86_64,i386)
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with dbus)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		--without-osmesa # media-libs/mesa no longer supports this
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with smartcard pcsclite)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with wayland)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+
+	# broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849)
+	append-cflags -std=gnu17
+
+	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
+	# (do self test until https://github.com/gentoo/gentoo/pull/28355)
+	if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != @(LLD|GNU\ ld)* ]]
+	then
+		has_version -b sys-devel/binutils &&
+			append-ldflags -fuse-ld=bfd ||
+			append-ldflags -fuse-ld=lld
+		strip-unsupported-flags
+	fi
+
+	if use mingw; then
+		use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+		# CROSSCC was formerly recognized by wine, thus been using similar
+		# variables (subject to change, esp. if ever make a mingw.eclass).
+		local mingwcc_amd64=${CROSSCC:-${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}
+		local mingwcc_x86=${CROSSCC:-${CROSSCC_x86:-i686-w64-mingw32-gcc}}
+		local -n mingwcc=mingwcc_$(usex abi_x86_64 amd64 x86)
+
+		conf+=(
+			ac_cv_prog_x86_64_CC="${mingwcc_amd64}"
+			ac_cv_prog_i386_CC="${mingwcc_x86}"
+
+			CROSSCFLAGS="${CROSSCFLAGS:-$(
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+
+				# some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then
+				# strip-unsupported-flags miss these during compile-only tests
+				# (primarily done for 23.0 profiles' -z, not full coverage)
+				filter-flags '-Wl,-z,*'
+
+				# -mavx with mingw-gcc has a history of issues and still see
+				# users have problems despite -mpreferred-stack-boundary=2
+				append-cflags -mno-avx
+
+				CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
+			)}"
+
+			CROSSLDFLAGS="${CROSSLDFLAGS:-$(
+				filter-flags '-fuse-ld=*'
+
+				CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
+			)}"
+		)
+	fi
+
+	# order matters with multilib: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		if (( bits == 64 )); then
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64,
+	# -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where
+	# one or the other could be missing and that is unexpected for users
+	# and some tools like winetricks)
+	if use abi_x86_64; then
+		if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine64 ${WINE_PREFIX}/bin/wine
+			dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+
+			# also install wine(1) man pages (incl. translations)
+			local man
+			for man in ../build64/loader/wine.*man; do
+				: "${man##*/wine}"
+				: "${_%.*}"
+				insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+				newins ${man} wine.1
+			done
+		elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then
+			dosym wine ${WINE_PREFIX}/bin/wine64
+			dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader
+		fi
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	if use mingw; then
+		# don't let portage try to strip PE files with the wrong
+		# strip executable and instead handle it here (saves ~120MB)
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+
+		if use strip; then
+			ebegin "Stripping Windows (PE) binaries"
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+			eend ${?} || die
+		fi
+	fi
+
+	dodoc ANNOUNCE* AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	if use !abi_x86_32 && use !wow64; then
+		ewarn "32bit support is disabled. While 64bit applications themselves will"
+		ewarn "work, be warned that it is not unusual that installers or other helpers"
+		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
+	elif use abi_x86_32 && { use opengl || use vulkan; }; then
+		# difficult to tell what is needed from here, but try to warn
+		if has_version 'x11-drivers/nvidia-drivers'; then
+			if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then
+				ewarn "x11-drivers/nvidia-drivers is installed but is built without"
+				ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+				ewarn "applications under ${PN} will likely not be usable."
+				ewarn "Multi-card setups may need this on media-libs/mesa as well."
+			fi
+		elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+			ewarn "media-libs/mesa seems to be in use but is built without"
+			ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit"
+			ewarn "applications under ${PN} will likely not be usable."
+		fi
+	fi
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	if has_version -b app-eselect/eselect-wine; then
+		eselect wine update --if-unset || die
+	fi
+}