gentoo auto-resync : 27:02:2025 - 19:26:39

12 files changed, 9 insertions, 505 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c9592c56e955..d1909a5231c3 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index e604fd1bb48c..be3a6df979fd 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -11,7 +11,6 @@ AUX qemu-8.1.0-also-build-virtfs-proxy-helper.patch 1267 BLAKE2B c9634257cc59a67
 AUX qemu-8.1.0-find-sphinx.patch 427 BLAKE2B 2834abad14361b63b18f05d0e672215b88492f7f6bf2a5b52c21f5f6ebb7e71d6c1904f07238fd9170c12caff33e644b969e7f01d2a530fc53f00c7b39a372d3 SHA512 8824231b5ca80828d8aeee7093e62b892f91fce7bd7d0ed6a0559b8fa88cc1e99d2b7f48b64ce4b6c2225ab3aa697725d9dfaaa5e6a160a63d37460520b41f12
 AUX qemu-8.1.0-skip-tests.patch 2767 BLAKE2B b55b4225f7afa6bc3634fe072c10150e21f9ea109f6706da663f9ab5ca3c05ee5a03fad9061c1e35b8945e009b86715d3fa220b7b30f95597ed933f647e64e33 SHA512 db643b31152c9d10817ee2abf298c728adcf3d2dfc808582a352fb924ea9877865d26cd7c8bec7feacca51741a5498984022f8bc77ca9cacbe0d5088c6e37233
 AUX qemu-9.0.0-also-build-virtfs-proxy-helper.patch 1397 BLAKE2B 636e52b5286c1e939601375bf6aa1805d3b68e0299b9330b04d5f2f2a260e2cc4e8c31e1dd105248acde4a6279b7eb78bd120f9225771c4e1dfe445ebfcd653f SHA512 cc39aeedf99a6d58232acab34170a101fa86d95a9aaa75d472fdfdfc2fe2f22eeef94d20ef75b78d001e929bd49da768e5234ac848ddacb181e39f68bed1c00b
-AUX qemu-9.0.0-capstone-include-path.patch 1433 BLAKE2B 7ad95b5f4ce68ceb74e13183712dc2df6182019efba234f731f19bf0d6275268147f57815121b843dbddc5974f08a1d7b51db8f5ce52671edf47ff28b155ba56 SHA512 3664d3bdc549ce4ed827f08d3e9c75b1656eade4a00d33f0635be25a670a03b8c7571b1f8cee95769cfd78fa57b09c7233e07b2a1279fc4fcc66ba3985768fd9
 AUX qemu-9.0.0-disable-keymap.patch 1434 BLAKE2B daef38624095a5bd861e04930decd86dd8f5a8f505e0a885df1abd5dac79217e7b0db24429bb48d7a95b0c184c24ec2da333528db619955102432b7fd7898707 SHA512 603525c4549b6a7c7f6f83150d47949ace89e659054d1a67b523d61a816c51986a56df2f972a08587a8e127823768cd2f5c6ae3b32c52f893e4fb481b7884aed
 AUX qemu-9.0.0-glibc-2.41.patch 1725 BLAKE2B f113c9a216c83454ca525dfeba4f3bba42995e9ed4eb792f766540e22ccb98d3cf604c4ead1ef0f8f6cb833ad61063fe5a2692d16f2580c7f8b12b75a505d53b SHA512 73a17ec98edbe53b39a2334b371f4794d176f90f401fc5c981944daa409838b20034c4b7c82a212ffce27e8594eef8927d24239676c760cac28c42f8147d6495
 AUX qemu-9.1.0-capstone-include-path.patch 1097 BLAKE2B d59702b5e4ea11dc03e337f9cd281079f1bdbbe727f891b27c52c4a8d0b3579c2d0df1e78f3f81d86f1826f39121005373193dc4cbe2dae55be94aa028beccfc SHA512 dded3cd21740f704dab6c80c6a6037a512aa2f5777b3f7a940d12450c0ee93f0c6a0f3cda537e05d6cd2d8e854752f195f1f420d0fe89270c3f672a49f845f23
diff --git a/app-emulation/qemu/files/qemu-9.0.0-capstone-include-path.patch b/app-emulation/qemu/files/qemu-9.0.0-capstone-include-path.patch
deleted file mode 100644
index 3e0408d6b213..000000000000
--- a/app-emulation/qemu/files/qemu-9.0.0-capstone-include-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 67a8b35e98f5c0853f7cdf26db0ebc6ce20b929c Mon Sep 17 00:00:00 2001
-Message-ID: <67a8b35e98f5c0853f7cdf26db0ebc6ce20b929c.1714317553.git.mprivozn@redhat.com>
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Sun, 28 Apr 2024 17:10:46 +0200
-Subject: [PATCH] Forward ported from qemu-7.1.0-capstone-include-path.patch.
-
-Bug: https://bugs.gentoo.org/873157
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- include/disas/capstone.h | 2 +-
- meson.build              | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/disas/capstone.h b/include/disas/capstone.h
-index e29068dd97..d8fdc5d537 100644
---- a/include/disas/capstone.h
-+++ b/include/disas/capstone.h
-@@ -3,7 +3,7 @@
- 
- #ifdef CONFIG_CAPSTONE
- 
--#include <capstone.h>
-+#include <capstone/capstone.h>
- 
- #else
- 
-diff --git a/meson.build b/meson.build
-index ea3ccff968..c3a2be7b2d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1712,7 +1712,7 @@ if not get_option('capstone').auto() or have_system or have_user
-   # that reports a wrong -I path, causing the #include to
-   # fail later. If the system has such a broken version
-   # do not use it.
--  if capstone.found() and not cc.compiles('#include <capstone.h>',
-+  if capstone.found() and not cc.compiles('#include <capstone/capstone.h>',
-                                           dependencies: [capstone])
-     capstone = not_found
-     if get_option('capstone').enabled()
--- 
-2.43.2
-
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index e150709ad9a7..d1e27ec33a99 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -7,10 +7,8 @@ AUX wine-proton-8.0.5c-vulkan-libm.patch 447 BLAKE2B 026b982714ce21ce6492d5e3b99
 AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634256ef07bfe19bc5a7e04363d1832cc999d7c30b78dc5af2f4a1c9bfac1f4fa5458461b865864dc3bbdff4e9f71fa SHA512 f0de44022c856ed9b058e6c64146e464e375114d56bcc369a7e72df847a4de0ad31cbb06042df3f6836b681cd342b8a228cf514a51ed9796542a4d9ea42a03e6
 AUX wine-proton-9.0.4-binutils2.44.patch 4104 BLAKE2B 4a0884969ade4ea83890672392dd29eb641f6c82ecdd8a6dd47853cc59e2cea73d42a95ce2197fc2833170aed7af508b19136f11859501dec22909297a691905 SHA512 f3bec4565acb4446783e44ac9823978ed1f8881814f7cae7ad5c5bd8d70cf5f13e68f0abefcf1038426b9b055fec1dabf3a6bbfc21bae1420654fdabe7bd206f
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
-DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25 SHA512 82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c
 DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9
 EBUILD wine-proton-8.0.5c.ebuild 14191 BLAKE2B 376f4d84455d00828e8f78b5827b2fd0a8c3b5f55adc1aebc33b7441f0aeddf1ba6197abe33b8e65f2d837b1b6b586f0ac723d56e3b9e9119161cd6d8d473c33 SHA512 b6137a8f43becefc93cd8bec343e892707ec16164cfcb1d692821e57dd56c7ad1d07eb51e702993b119efc5ff9283533cee429e80c89d423007a396b415fab46
-EBUILD wine-proton-9.0.2.ebuild 15091 BLAKE2B c4fad5e3f77dcff8e652260bd3b1a2d51fdefa9b99b16ae69a4908c8ed25b3e1c969af54b22aea27668cdb218626c395fb97646cdc6dfa24d60d5091c71a73c2 SHA512 953d901117744bcf6cc9e30a418db7e4fac621818feff8be22de4c58d0e47fd2d55045201109675111fcd1c84178ebf49a999db300570d414f7b266f0de2b97a
-EBUILD wine-proton-9.0.4.ebuild 15092 BLAKE2B 98f095cfabebfb42eb8863d59ba36445d3aa73fec9dc8578a1ce717d59324d9ca00b2157c0c1183656b293e564f34d9a0a5d14d3511e4a48c211e03772ad0eb5 SHA512 07a4b0cbad4efbfbc30c61a5cc6a4ac9c8a6aee1031385278ecc56d72375e3d2a5d49916b85473a68b60e299be61f200a166640f0eff9b7377e12087758f58ae
+EBUILD wine-proton-9.0.4.ebuild 15091 BLAKE2B 5398c96da48209cad0455f7f51b9eaa465e0b43f7681718dd02973633a43645cf3a7b8fc84db1808f916d0184cebe90bfa27720ba0516b3225d61df88fe79ed1 SHA512 cb3b63362ee57386dc4b70559713a36844998f2de412630b1d4427eeb5189666d40abfe61998b7eb18a6216386099e42ecfed61abbf1d1ad9702587aed652ca1
 EBUILD wine-proton-9999.ebuild 15219 BLAKE2B 4ed5b0718e4e8074ca79c7831961d50906d58c8dd9c9c10cca9aa57d8bab2e90a220905916d86a4a7512760deaa1c0878426d9d116a76b7763176ab4a366de5d SHA512 6fa239d4563edc2385da33dc81e6a1fa079af1d9f473cf5ce5ddf261d8a718cd28733e06e7b6fdb310f04cf6f0a4c776831d14c52f186ace2fd19fa0e90bd4ae
 MISC metadata.xml 1561 BLAKE2B c56918ab8f385550a8afd059d6df3e4c8cec39a0820b327a88b72a8159f1852cdc33c6b5e24cb8bdcef628707b6bc80950044a5998c7ac4c4017b017eef80c29 SHA512 1f5b24e0151d29c377082acab47d58e6b324602b01f688250cd32789a01c5269eb8dc65fc8ba8e0830e54c2c2d07ee5f14876754fe906c6480cdd962c262bb3b
diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
deleted file mode 100644
index 2314a5a096c4..000000000000
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools flag-o-matic multilib multilib-build prefix
-inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
-	EGIT_BRANCH="bleeding-edge"
-else
-	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
-	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
-	KEYWORDS="-* amd64 ~x86"
-fi
-
-DESCRIPTION="Valve Software's fork of Wine"
-HOMEPAGE="https://github.com/ValveSoftware/wine/"
-
-LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
-	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-	perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-	usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
-"
-REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
-
-# 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="
-	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
-	media-libs/freetype[${MULTILIB_USEDEP}]
-	media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-	media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
-	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}]
-	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? (
-		dev-libs/gmp:=[${MULTILIB_USEDEP}]
-		net-libs/gnutls:=[${MULTILIB_USEDEP}]
-	)
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-"
-WINE_COMMON_DEPEND="
-	${WINE_DLOPEN_DEPEND}
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-	)
-	pulseaudio? ( media-libs/libpulse[${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}] )
-"
-RDEPEND="
-	${WINE_COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	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
-	)
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${WINE_COMMON_DEPEND}
-	|| (
-		sys-devel/gcc:*
-		llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
-	)
-	sys-kernel/linux-headers
-	x11-base/xorg-proto
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		sys-devel/binutils
-		llvm-core/lld
-	)
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	!crossdev-mingw? (
-		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
-		wow64? ( dev-util/mingw64-toolchain[abi_x86_32] )
-	)
-"
-IDEPEND=">=app-eselect/eselect-wine-2"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900332)
-	res_getservers # false positive
-)
-QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.4-musl.patch
-	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
-	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
-	"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
-	"${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
-	"${FILESDIR}"/${PN}-9.0-rpath.patch
-	"${FILESDIR}"/${PN}-9.0.4-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"
-				eerror "--> Note that mingw builds are default for ${PN} even without this USE."
-				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
-		# -mabi=ms was ignored by <clang:16 then turned error in :17
-		# and it still gets used in install phase despite --with-mingw,
-		# drop as a quick fix for now which hopefully should be safe
-		sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
-
-		# note: this is kind-of best effort and ignores llvm slots, rather
-		# than do LLVM_SLOT it may(?) be better to force atomic-builtins
-		# then could drop this altogether in the future
-		if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
-			has_version 'llvm-runtimes/compiler-rt[-atomic-builtins(-)]'
-		then
-			# needed by Valve's fsync patches if using compiler-rt w/o atomics
-			sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-				-i dlls/{ntdll,winevulkan}/Makefile.in || die
-		fi
-	fi
-
-	# ensure .desktop calls this variant + slot
-	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
-
-	# similarly to staging, append to `wine --version` for identification
-	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || 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
-	# proton variant also needs specfiles and vulkan
-	tools/make_specfiles || die # perl
-	dlls/winevulkan/make_vulkan -x vk.xml || die # python
-	# 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-proton
-}
-
-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)
-
-		# upstream (Valve) doesn't really support misc configurations (e.g.
-		# adds vulkan code not always guarded by --with-vulkan), so force
-		# some major options that are typically needed by games either way
-		# TODO?: --without-mingw could make sense *if* using clang, assuming
-		# bug #912237 is resolved (consider when do USE=wow64 in proton-9)
-		--with-freetype
-		--with-mingw # needed by many, notably Blizzard titles
-		--with-opengl
-		--with-vulkan
-		--with-x
-
-		# ...and disable most options unimportant for games and unused by
-		# Proton rather than expose as volatile USEs with little support
-		--without-capi
-		--without-cups
-		--without-gphoto
-		--without-gssapi
-		--without-krb5
-		--without-netapi
-		--without-opencl
-		--without-pcap
-		--without-pcsclite
-		--without-sane
-		ac_cv_lib_soname_odbc=
-
-		# afaik wayland support in 9.0.x currently cannot do opengl/vulkan
-		# yet making it mostly pointless for a gaming-oriented build
-		# (IUSE="X wayland" may be added in wine-proton-10 or 11)
-		--without-wayland
-
-		$(use_enable gecko mshtml)
-		$(use_enable mono mscoree)
-		$(use_enable video_cards_amdgpu amd_ags_x64)
-		--disable-tests
-		$(use_with alsa)
-		$(use_with fontconfig)
-		$(use_with gstreamer)
-		$(use_with nls gettext)
-		$(use_with osmesa)
-		--without-oss # media-sound/oss is not packaged (OSSv4)
-		$(use_with pulseaudio pulse)
-		$(use_with sdl)
-		$(use_with ssl gnutls)
-		$(use_with udev)
-		$(use_with udisks dbus) # dbus is only used for udisks
-		$(use_with unwind)
-		$(use_with usb)
-		$(use_with v4l v4l2)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-	)
-
-	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
-
-	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,*'
-
-			CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
-		)}"
-
-		CROSSLDFLAGS="${CROSSLDFLAGS:-$(
-			filter-flags '-fuse-ld=*'
-
-			CC=${mingwcc} test-flags-CCLD ${LDFLAGS}
-		)}"
-	)
-
-	# 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
-
-	# 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
-
-	dodoc ANNOUNCE* AUTHORS README* documentation/README*
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
-}
-
-pkg_postinst() {
-	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
-
-	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; 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
-
-	ewarn
-	ewarn "Warning: please consider ${PN} provided as-is without real"
-	ewarn "support. Upstream does not want bug reports unless can reproduce"
-	ewarn "with real Steam+Proton, and Gentoo is largely unable to help"
-	ewarn "unless it is a build/packaging issue. So, if need support, try"
-	ewarn "normal Wine or Proton instead."
-
-	eselect wine update --if-unset || die
-}
-
-pkg_postrm() {
-	if has_version -b app-eselect/eselect-wine; then
-		eselect wine update --if-unset || die
-	fi
-}
diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
index 62681918df8f..df0e7b0ea031 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
 	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3a8095cc30d6..c61cf5d917c3 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,7 +7,7 @@ DIST wine-10.1.tar.xz 32026152 BLAKE2B 573c4cc10c96c164eb02111b0a457be5500ab42c6
 DIST wine-10.2.tar.xz 32050716 BLAKE2B 78a60d82640c9ffdf8a96b58aaa8a86cce0f67d48dc082e97a2bfaf077f849b99fa7d5418a42d2f18176afedd9a7270a08ca872af5c43c10fd64fe1eddf7cfdf SHA512 893395e29d72898579850c4084838c76b8a53659b4a3917e47d853733fafaa0e57bfde31437862955cdfab94327622eb290488d6120d76eeb2a4fa70dff5ef67
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
-EBUILD wine-vanilla-10.0.ebuild 14593 BLAKE2B 0b3afbb3a4e38d8bc04174d0cd974559c478d4b15353d2689f40566fd0c5428cd1b3d308f8fdf00b5f371552b656700a5fbf8589b2a0f12330fc861cef37fb7f SHA512 37fe8e2621a92a15521bbfd64925f312f7d1a12948411c4537365ce080b121027f311aa0cda9a0a8b44d3d11e271aec24a5202ceeb19823c5d4d4dc7f6305bc5
+EBUILD wine-vanilla-10.0.ebuild 14592 BLAKE2B d303ea6f6ff9ab31a6b3d745a8e30e00c815f0fb765deb60cd47581644671346ea6cc15aed368ccb3ffe3360a89ceff4dca02ff1b491eea07a765824e810fa63 SHA512 3a8cbcd40c28a253e88fe90accadd23c2f5356a373b9fb2ff3873edc932321a1f1afc918bdcdc3a607fae28fe15069b289104b03bfea1072eb03eb4816732c57
 EBUILD wine-vanilla-10.1.ebuild 14594 BLAKE2B f86850e0bfc87a4328d7c43514b6cea1c0ba3f09545f34fa8e3671707ab4d4ff8a81416bb8fd59e9964bd2ac0fc88c918e2b86410af5d87e87fc9e3924c7decb SHA512 4c5cfe5f6cc0027dc4df2d4c6fe2775c7f712e42acc2aedb80f70c81d680aaec427190eac8db2767dabf24991b146f08ad1464c9db972caf8aeeaebc2625b004
 EBUILD wine-vanilla-10.2.ebuild 13899 BLAKE2B d591bd28b254e8599ef55646e43e27e9f7cad7f26b4c3f0307c1e6ae38c6b89ab5b1b459f981e6c164d1d8548a32c278a175324b8c0e8f1472e91967f94ffa8c SHA512 969dca5dcbc35ab8abe61ea08e27dfe2443ca57963c5de63fcef36a86c20d17ab926b17b4bf08522f62a7b8e76277a3b1b793273135429b81b9e8177de442991
 EBUILD wine-vanilla-8.0.2.ebuild 13089 BLAKE2B c6cc4a5e726080e352b6046f2037697daed5255fbfb56f4f7cc1f1c3509f5b610ee70043a25318dd2984f95fd4118845a3e7ea2331f82748ce26c8848d01c825 SHA512 d737c038bb30eac3642c44645f17026c9c82fef4211c78c6152825c902b04267fee8e1922b4102378b0955bdad5055fac12446b36ebfe58612d3023f61018832
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild
index ff3c7bd622bf..6f4ad3813807 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild
@@ -17,7 +17,7 @@ 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"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 22ed3ad764d0..60a2f17f3b5e 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -26,5 +26,5 @@ DIST xen-4.19.1.tar.gz 51991715 BLAKE2B 1e16c15c98b0e02ee55129cde3f41b314a4eaaff
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
 EBUILD xen-tools-4.18.4_pre1.ebuild 16704 BLAKE2B 0d56623c6d7a6dda3607d1f736d9e0a686c5c8b74401eae07a6bd1163a55b928d2aa2014a6d6e96c06e795b464d9db25eb3b0819c82f39e4925a17cdafbe24b0 SHA512 a940167994d4e05eebba6b9d0ef18c22ac95dfb95e1395088697abc8d679388a473d4a51685bb2546a5a817a10a353e94dd264bf02d82c3027fc4dd1b74c2b50
-EBUILD xen-tools-4.19.1.ebuild 16552 BLAKE2B ec9d5c81ab85c139f32be20bce1b930d19f8c01b689336d71087b4575e93db4afa4057402331203a8b368ae121fbb689d668ed40ac349f563952c325137a692e SHA512 5a3888f2f6e63e4a0dff0569386c8ae1e45659c99046cd08bb93d9b7b01da7087948e08c8b8e708737c0e9490e8b28780d96230d4e60598533e865d5b739341c
+EBUILD xen-tools-4.19.1.ebuild 16551 BLAKE2B a6e2e209bd7da9e5de3a631af0fbab25658af37714773182cd46c84ad5d03c1cd7d63493740f3b49e23f74db44cf589329ca2f96315371883500220c08e33939 SHA512 cda95c0aeaf9ff8f831984f73cf837b8c9a7fb8db54688417fe80d66a15d621ce5f38742ff196c2350c688c5e6bcf25089bf31baa816aea764b25f032fbd37e5
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.19.1.ebuild b/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
index 0effdb741757..849888b3e33e 100644
--- a/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.19.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://xenbits.xen.org/git-http/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 
 	SEABIOS_VER="1.16.0"
 	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 512983041303..8f14fb06e5d9 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -3,5 +3,5 @@ DIST xen-4.19.1.tar.gz 51991715 BLAKE2B 1e16c15c98b0e02ee55129cde3f41b314a4eaaff
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
 EBUILD xen-4.18.4_pre1.ebuild 4536 BLAKE2B 48e0eeccede1bb6aa01193d91ddfe5e56da80a464e81fc25109cb588ff3d5283b9138c9097ddec948f7d3a89d0cc3d82eeb1dd06103247487aa87b527a9355f6 SHA512 f4291fa07ee9b145ed99749676c1cd4fb97b55d3684503681a66b2686553adbfc69c7c46bcffef3741fdbda29cf277e9fd5b73aad0a87dacac6b8589b3139ef8
-EBUILD xen-4.19.1.ebuild 4530 BLAKE2B 25b4955125c215fd10fa64b287c85652d58e36d5e5b06b8f6044a4c6c10f5f82cfc7d8bfa69aa47b36c9d556ee665dc4e54b72ffa0c66f61582ded49b782117a SHA512 e1124411694f70bd9fefde87dd2c4538be19a97b3500b94e82311063a97a97b20d0417ed23d7027c9e316c638bf0966e8de5b3c07f68304f87b029a16d0b8cb9
+EBUILD xen-4.19.1.ebuild 4529 BLAKE2B 4c2b89e4c00e40d8cbdf66649964cc74aefe0faf4d1545c63106975425384c21b6e4008b6b6cac8d3f715a5a378b3c577cf0ac3ae5bd54408481bca1f1ec4f0f SHA512 3a99055516ee224982d5c8b84d76360e88eefd43254a826f2f6457bb2d0aef37147806fea78977ca45894e0027c00405ab6671c466b4ae6ac7453da4a4172adc
 MISC metadata.xml 775 BLAKE2B 35370f9f1a629b090ffaf3c984b54fdc195c7f60e5ca8ec12c51d31494ee238e4fc9d29e0aa724109a992a7d4ab0e1663a9764b31f7c7eb98fbbcab68d386809 SHA512 68e59dc5fc7d9478fcef4e346d0124e8fa7497a4fbfce4bc42ff323dc5cd73d5b26d6819639268fc8e555670168835a3dcfa9596eadd74975585183fcd366d18
diff --git a/app-emulation/xen/xen-4.19.1.ebuild b/app-emulation/xen/xen-4.19.1.ebuild
index c389bf646393..0eb1495a605a 100644
--- a/app-emulation/xen/xen-4.19.1.ebuild
+++ b/app-emulation/xen/xen-4.19.1.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
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 
 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0