gentoo auto-resync : 01:01:2025 - 06:30:57

25 files changed, 12 insertions, 1316 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5de855b7c18e..a9047d23ff5c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 8766a631a509..4e1909f0c9d0 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -5,7 +5,6 @@ AUX dxvk-2.4-d3d8-setup.patch 220 BLAKE2B 7f21542907d02e2924595aaff3270988214913
 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f
 DIST dxvk-2.4.1.tar.gz 1060662 BLAKE2B 43294af5829fe306acdb72c07b94c28d34eb798a2eaf6d2e42c2b80900e9b6f4f323569dfd51d565c836237fddce26b843f69e4ff57fc2a5838382993a9dd6ed SHA512 629e45bbdaddf83cd8a394877289781e8f54330b4c865b2d453ba3068a6054511a3697ca115497b64df0ce9ee36748a7fdb01fdc5f49a7dc44c4a3d3e47bf6de
-DIST dxvk-2.5.1.tar.gz 1130762 BLAKE2B 2941f3702d0f478d140d8f39a97e29f24e8ce6a3f22160fe26a8cfb70a132fc39b43960f34ea3be8786e7ccdbbf4ff2ddc961d2cc93956e63422579cb934b2fb SHA512 44b200e2d468f9280444b888c8326becca123e1c8a50fbfa544165d24fb2a51478e00a8ab93d0777cab47be85ca67f63bb3627ea75757a4e0ab85209f93b1053
 DIST dxvk-2.5.2.tar.gz 1135676 BLAKE2B 4f0f030867365e75ec4fdc56fcbbaba26393ed4beb2fb34c351457fe4a23c2e1d9c50f96370112ac4eb98af86e833788f9b075ca399915e37b87a27591d9847a SHA512 b7ee35911c777e27a56aa3b43c26acec14a03531a39f9c465460011d0f2f0c3ee43d09095fbaa8890beae37dcb48520fe232def79279d6a11d0295224b60ce5f
 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
@@ -14,7 +13,6 @@ DIST vulkan-headers-46dc0f6e514f5730784bb2cac2a7c731636839e8.tar.gz 2255426 BLAK
 EBUILD dxvk-1.10.3-r1.ebuild 4988 BLAKE2B c1a07a25db7117285e6d0ba5bddcc5b9690b9171bf1c887547f6a9e9804bc3366b325859ac4f4d439b702ea38e96c51b5067cc21c354bd98a324430a2166b527 SHA512 8566dad60c3a8cc4e996bd8d1430ad7a62db5eae2860b635a998ea7c87c7f8a9fd2f268b1f736d27addbb3c408dac6ffb7f3993a02fb16d42b9c238f2692a945
 EBUILD dxvk-2.3.1-r1.ebuild 6667 BLAKE2B ac8620ba4b92cfa33c88db128f98304df7060dcdbaddcff8a570ebe9b2a5e9e6a5ab559088b2d2c30254160bfdc91f414a942421bddf387330f72721eedced08 SHA512 ce8129e47bd4a1a8431e052fc60e831ef6fd692d970d430fc4b111d71b4130915967679d8a96d4ba9c4647826dc34c924b585e3b07db67abb78c6b5e1b458de5
 EBUILD dxvk-2.4.1.ebuild 6104 BLAKE2B 74a6bd12561ec92336b95aa9b8aa1c7167fa5ce984f5d8104e0e3d76140a337891a70215d907929bd7d06c8ef7c5e35a24572aff615ab1479357f0e712d8e999 SHA512 042a6473b19dd1d1a735a8092f944944f0c94e40124e6c96f118de08f2bd83a3a1c6e02767f2cb8a475ca40a540b0d264414e956ecc77a939cf89775ec727d65
-EBUILD dxvk-2.5.1.ebuild 6065 BLAKE2B e93f18c43646759f9220da686e014f71fc2f65d22e0edb80456f1ac53334b78599289edc700a97402564285719d75ded9aa3bbd8b0c9c4b908f65afed0b89a37 SHA512 a067fc8c3b09cc67d6aa6c265488e78732b48deb601c3d2a6a26610f391f0c41c9a5bdbddccf8cf7d7688ce933e5e17f4d0bd5f2f47e10f2ba3f99406f8ad44a
-EBUILD dxvk-2.5.2.ebuild 6067 BLAKE2B 825fee4c6315f0341c220c14fed9d241e45d8dca5177ece87ba1369c3893fb20ab28da587603c72e20cb52ff1c1b0072162b0f24170e6632054f9cd9bddb2064 SHA512 2b1185990a72d895d7f7600078a70b8905d856ba34a851ca687764deb2b583c86da96b3035ba6e0c185a0f832135d79afcd5f3c779284795e427165c9128b62a
+EBUILD dxvk-2.5.2.ebuild 6065 BLAKE2B e93f18c43646759f9220da686e014f71fc2f65d22e0edb80456f1ac53334b78599289edc700a97402564285719d75ded9aa3bbd8b0c9c4b908f65afed0b89a37 SHA512 a067fc8c3b09cc67d6aa6c265488e78732b48deb601c3d2a6a26610f391f0c41c9a5bdbddccf8cf7d7688ce933e5e17f4d0bd5f2f47e10f2ba3f99406f8ad44a
 EBUILD dxvk-9999.ebuild 5947 BLAKE2B 3a86082b1890360375d0dba2b037da7b9e6c05440c2f2057283ebe109e22ded34d0c55263c96b1ae28f319a2e5a0a5063111ea38aaca9c74ae6ea7a488dfc770 SHA512 439f121ae0dac4b3f7f0de3bb6ad8ca39dd5fb71d82b7f2544562db4832edb5eccd2a61fb3cb66301f6fd81f40868af3b6a8d8115f5d9ea545ffd2a93b815aa7
 MISC metadata.xml 885 BLAKE2B c21b9383a626cfea8b758d171ebbe7180d7a0dc09da611ad5f05b3e877f4051e33544e29c9c5e58fa20143bf724d8d27da9279bcf49e3465a7aa6cb7eeca4eb1 SHA512 3ad1138cbe63473b6da56d73214913e9a3e68d270e1df01fa4202e76a6efe35c6971595660724e30b16db31fba404441bc36b075e2197944a699c436ed60ebb8
diff --git a/app-emulation/dxvk/dxvk-2.5.1.ebuild b/app-emulation/dxvk/dxvk-2.5.1.ebuild
deleted file mode 100644
index ae26f5d047a0..000000000000
--- a/app-emulation/dxvk/dxvk-2.5.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit flag-o-matic meson-multilib python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git"
-	EGIT_SUBMODULES=(
-		# picky about headers and is cross-compiled making -I/usr/include troublesome
-		include/{spirv,vulkan}
-		subprojects/libdisplay-info
-	)
-else
-	HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764
-	HASH_VULKAN=46dc0f6e514f5730784bb2cac2a7c731636839e8
-	HASH_DISPLAYINFO=275e6459c7ab1ddd4b125f28d0440716e4888078
-	SRC_URI="
-		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-			-> spirv-headers-${HASH_SPIRV}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> vulkan-headers-${HASH_VULKAN}.tar.gz
-		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
-	"
-	KEYWORDS="-* amd64 x86"
-fi
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/"
-
-# setup_dxvk.sh is no longer provided, fetch old until a better solution
-SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
-
-LICENSE="ZLIB Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d8 +d3d9 +d3d10 +d3d11 +dxgi +strip"
-REQUIRED_USE="
-	|| ( d3d8 d3d9 d3d10 d3d11 dxgi )
-	d3d8? ( d3d9 )
-	d3d10? ( d3d11 )
-	d3d11? ( dxgi )
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glslang
-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
-	"${FILESDIR}"/${PN}-2.4-d3d8-setup.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
-		local tool=-w64-mingw32-g++
-		for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
-			if ! type -P ${tool} >/dev/null; then
-				eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
-				eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
-				use abi_x86_32 && use abi_x86_64 &&
-					eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
-				die "USE=crossdev-mingw is set but ${tool} was not found"
-			elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
-				eerror "${PN} requires GCC to be built with --enable-threads=posix"
-				eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
-				die "USE=crossdev-mingw is set but ${tool} does not use POSIX threads"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
-		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
-		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
-		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
-	fi
-	cp -- "${DISTDIR}"/setup_dxvk.sh . || die
-
-	default
-
-	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
-}
-
-src_configure() {
-	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
-
-	# random segfaults been reported with LTO in some games, filter as
-	# a safety (note that optimizing this further won't really help
-	# performance, GPU does the actual work)
-	filter-lto
-
-	# -mavx with mingw-gcc has a history of obscure issues and
-	# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
-	# crashes with -march=skylake >=wine-8.10, similar issues with
-	# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
-	append-flags -mno-avx
-
-	if [[ ${CHOST} != *-mingw* ]]; then
-		if [[ ! -v MINGW_BYPASS ]]; then
-			unset AR CC CXX RC STRIP
-			filter-flags '-fuse-ld=*'
-			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,*' #928038
-		fi
-
-		CHOST_amd64=x86_64-w64-mingw32
-		CHOST_x86=i686-w64-mingw32
-		CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})
-
-		strip-unsupported-flags
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
-	# unset again so meson eclass will set ${CHOST}-gcc + others
-	use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX RC STRIP
-
-	local emesonargs=(
-		--prefix="${EPREFIX}"/usr/lib/${PN}
-		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
-		--force-fallback-for=libdisplay-info # system's is ELF (unusable)
-		$(meson_use {,enable_}d3d8)
-		$(meson_use {,enable_}d3d9)
-		$(meson_use {,enable_}d3d10)
-		$(meson_use {,enable_}d3d11)
-		$(meson_use {,enable_}dxgi)
-		$(usev strip --strip) # portage won't strip .dll, so allow it here
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	dobin setup_dxvk.sh
-	dodoc README.md dxvk.conf
-
-	find "${ED}" -type f -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To enable ${PN} on a wine prefix, you can run the following command:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
-		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
-		elog "removed upstream, handling may change in the future."
-	fi
-
-	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
-	then
-		elog
-		elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to"
-		elog "update old wine prefixes which is typically done by re-running:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-	fi
-}
diff --git a/app-emulation/dxvk/dxvk-2.5.2.ebuild b/app-emulation/dxvk/dxvk-2.5.2.ebuild
index 56cafa91a05c..ae26f5d047a0 100644
--- a/app-emulation/dxvk/dxvk-2.5.2.ebuild
+++ b/app-emulation/dxvk/dxvk-2.5.2.ebuild
@@ -29,7 +29,7 @@ else
 			-> vulkan-headers-${HASH_VULKAN}.tar.gz
 		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
 	"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 2c1c18656d71..61ac8ffd54a8 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -2,5 +2,4 @@ AUX punes-0.111-FULLSCREEN_RESFREQ-fix.patch 985 BLAKE2B b68b81b68eabcab5af17a2a
 AUX punes-0.111-qt6.7_Q_OBJECT.patch 559 BLAKE2B 7e6858bbe360d1d22374e03803cd421c4e66605a20daa35627c4551de61858e911a937ba5c63f4db8eb59a2686b57282aecb2e57ec84685253d924d9d14f3393 SHA512 c9fddb201de54efeedf020f60d42583d5dce62998ba42003c8b021ecd148f3cb1834b3839dd4f8eab2e1fe8742a3630b8e50f61bbef35ef0ca1825cc01a498e5
 DIST punes-0.111.tar.gz 57538299 BLAKE2B a900fe2bc9117e6739e58a43e457bfa466053d5a96ae5ad1333d7e0bc11eafb2408a96dc7e35ddf1a3cee50cafe99549a43d2abb629b106bbb1082878a845cc6 SHA512 6388cdf2b303e217adfe43b1b3b1ef66a75b6adfdb0363b213c47fc129b5815f3e96814ee25a3637147dc184203cef0438930c280f0c6249085ecac1220b435c
 EBUILD punes-0.111-r1.ebuild 1151 BLAKE2B 90ab27d0cec1a8a2758a638073473ac258172ac29f315d62708078d204643b05016f910026c1cca8613911fe2f0453389309536b3776f7f4a396ed367d9009c7 SHA512 32c47eb3034500d6bccd8112c378afbf21212093ba7e9622c7499389a220c8f43932c3f9b432f084b4d68ab0979644b1aca982aa2a2777216319bdd7790ba379
-EBUILD punes-0.111.ebuild 1277 BLAKE2B 1907cfcfe82be3469eecb941c7ab720a14d05a1380b449fac1a7f3f6e55f3fe7e7ae3b87ff5660e2508380032f2607f3b13488ac02ab52bf404d1ccd823d5ea0 SHA512 75a8e5876df8e677bc3b818462aaf621abccf0a9bae025d92556acef14579a25b3c3a66d33c7077c0d6808a69ca034c93b505ae22792937cf3a6a7d6ebae40c2
 MISC metadata.xml 560 BLAKE2B ea221c8fefa3fc3e9f8942ae7cfd642384cde9ec10949bc148e17727e0633f718140fa15675a3268674c80e6b55177ff5573460abd687bc76420673f76aecc8a SHA512 7676ca51eb1d02c6564dfd9ef47975f349856ae9536e3f1d9771bf4c56a2aebe86622461ae50b5989c56fffa1cfa92fc6185f1d62d933c4db5016acc4c280a8f
diff --git a/app-emulation/punes/punes-0.111.ebuild b/app-emulation/punes/punes-0.111.ebuild
deleted file mode 100644
index f37c4e0a94c3..000000000000
--- a/app-emulation/punes/punes-0.111.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Nintendo Entertainment System (NES) emulator"
-HOMEPAGE="https://github.com/punesemu/puNES"
-SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/puNES-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="X cg ffmpeg qt6"
-
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/libglvnd[X?]
-	virtual/glu
-	virtual/udev
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	ffmpeg? ( media-video/ffmpeg:= )
-	qt6? (
-		dev-qt/qtbase:6[gui,network,opengl,widgets]
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-BDEPEND="
-	virtual/pkgconfig
-	qt6? ( dev-qt/qttools[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )"
-
-PATCHES=(
-	"${FILESDIR}/punes-0.111-FULLSCREEN_RESFREQ-fix.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GIT_INFO=OFF
-		-DENABLE_QT6_LIBS=$(usex qt6)
-		-DDISABLE_PORTABLE_MODE=OFF
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_FULLSCREEN_RESFREQ=$(usex X)
-		-DENABLE_OPENGL_CG=$(usex cg)
-	)
-	cmake_src_configure
-}
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index 2f8ae3785347..de62fa5cb9ce 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -1,8 +1,5 @@
 AUX ruffle-0_p20231216-skip-render-tests.patch 662 BLAKE2B 1715c6e5c80c0e4e2a53a70bab319bb78e493a8e48ad01c8ade5ddfdd76e7590506e46f2c2fafb9ac4e732ebefd04fd563e8a2f0c2f5d60bd29d0bf8eb7fbacf SHA512 7d42b5c7f1a11bc7666739fd76e341ff57e2dda25b95e883897d705e0bc37ab0beffa842d34902601b24ced1b0134855c85813067c83a2ea36c73ff7daf7c697
-DIST ruffle-nightly-2024-10-27-vendor.tar.xz 68393412 BLAKE2B 16a3cb7a16900d21c91e900d0dc8b1036120abd2168fea2482473bb9c2170de4e1d5619fad15dd8b9df44228b93167f1b722311f7f54a5dff1a9c78682fdf04a SHA512 d085af00d4417e961bf7e05b7af1c70f222ac1277c701d67ce99084f85648eba521273269732d74ddc281fb71c8762646cd15c6f1f1a05da788f04ea302696b0
-DIST ruffle-nightly-2024-10-27.tar.gz 93507412 BLAKE2B fcbcd5639bffa8fd1157e1f19765e7ea6721073fc9af6579562a5412d1d07086f53de7d099001ab4eb1b4d497077f09dd1a6da6eaf92c71f12cd1c61633d6f78 SHA512 19790a6641c61ef7e2c1ec94039452c06ea95273de2868198a307d21da955d4196ae33e0807c8f8c74e3f996dc8e26bebdd59ad8bdfa40c9fe6a8afcc745e91f
 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
-EBUILD ruffle-0_p20241027-r1.ebuild 2533 BLAKE2B 964fa26f8a82b906670be88c0df4a73bbccd325a28f2454be06ace9eec6e69835d23adc6b20f9f5fec98e1bc6191d5d7446a4edc5c3ca666d92bbcdd78bae750 SHA512 116d0663d0889e4e3b62e3eb4661c6b0c3b6c6eecaabe428d7a38f1d5bece43a0d268e61809b3550e9ae3fba235f26e1dc63284d83ff5a9a07429d5c57878144
 EBUILD ruffle-0_p20241129.ebuild 2625 BLAKE2B 8e1893bbf56737d1d57accdf6da04ca8cff425674b222607fd9b2cb20db1340f0db27d08328e8d61b60bfbe1de13c0f6f3da71e6220755f9baa6b3702a677e83 SHA512 0908e9a179d75cc509315b6c609a17ecd528b7685267a9684e5cdd16a98c913d10a16883d5c4e2605f7404c1c98689d5ae561bdb0a5941ec5390567fd6ccdb8c
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild b/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild
deleted file mode 100644
index a09645653dfa..000000000000
--- a/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RUST_MIN_VER=1.81.0
-inherit cargo desktop optfeature xdg
-
-MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Flash Player emulator written in Rust"
-HOMEPAGE="https://ruffle.rs/"
-SRC_URI="
-	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz
-	https://dev.gentoo.org/~ionen/distfiles/${MY_P}-vendor.tar.xz
-"
-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
-" # crates
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# dlopen: libX* (see winit+x11-dl crates)
-RDEPEND="
-	media-libs/alsa-lib
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXrender
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	virtual/jre:*
-	virtual/pkgconfig
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
-)
-
-src_configure() {
-	local workspaces=(
-		ruffle_{desktop,scanner}
-		exporter
-		$(usev test tests)
-	)
-
-	cargo_src_configure "${workspaces[@]/#/--package=}"
-}
-
-src_test() {
-	local skip=(
-		# may need more investigation, strangely "pass" (xfail) when
-		# RUSTFLAGS is unset, skip for now (bug #915726)
-		--skip from_avmplus/as3/Types/Int/wraparound
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-src_install() {
-	dodoc README.md
-
-	newicon web/packages/extension/assets/images/icon180.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
-		"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
-
-	cd "$(cargo_target_dir)" || die
-	newbin ${PN}_desktop ${PN}
-	newbin exporter ${PN}_exporter
-	dobin ${PN}_scanner
-}
-
-pkg_postinst() {
-	xdg_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
-		elog "There is currently no plans to support wasm builds / browser"
-		elog "extensions, this provides the desktop viewer and other tools."
-	fi
-
-	optfeature "h264 video decoding" media-libs/openh264
-	optfeature "the in-application file picker" sys-apps/xdg-desktop-portal
-}
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
deleted file mode 100644
index d45931ff4c3b..000000000000
--- a/app-emulation/spim/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX spim-8.0-r1-respect_env.patch 5058 BLAKE2B dabd459ef87e3c9db6304703d2067297f4be53af269ab9b1335dc38302c2e828ab6e9b357e45619fbe4dbdb375abb2dd91795e728a25e9772b3bdaf0a7e3e846 SHA512 adc8bb7815f15a0dfbd67e14875d7f5773c3b0153e9f031a957a9b6deeb0cf2dfd1983b835d7446467433c044a1caea0c13ba43ee5e4f77d5096cd62e2c27948
-AUX xspim.svg 8364 BLAKE2B 0a2f13b78c87e821b6d669a750ea1be0003442f75c20c5387954c1e6c11f99f80b9e1a42ea88bc4e894011ff08cb8b40450674ec415d1be18eb63d5e2a9b0188 SHA512 1860705ef2677b5bd84b7cdf4daf3143033050e5ed014e22d63fc3bec48a0a296a9767fa7cbf7ab71f31c5cc712e40be0799a9c43b96c789273de7604d57c0d5
-DIST spim-8.0.tar.gz 355204 BLAKE2B c7da952df552c5e070c601e7c3d251f15988d377e1c9943730f6cf8eee1e3b64ec4a05b56d4bdbc181b811aa349e3b08fccf0b9ccfc3efe2c0e410580e70dd7f SHA512 c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
-EBUILD spim-8.0-r3.ebuild 1576 BLAKE2B ab37042e9965574dff8b900655bc8aee3078b8f47abcf725dad4bedb38d5230c08c8701a13ec8ea036fabc025f955cb5f33dd5afe06e215fc2a1432848a82b59 SHA512 8aee2830467ac0e470da4f3168f414e214239e63b62ed9c892cfe5d3b32b3767581b4ae44c203eb417d0f77f0b7573944453f9020916d8493b5647fff5e9f5ca
-MISC metadata.xml 466 BLAKE2B 2e0cccd76af6fcc335115fb8d07802e3c58f295e0b290f8ff0f981dda3a2e7033924c13db2d92c26855b5da9bddd21371c745b32b5b4ceafabf230df8399158d SHA512 42c939ec68d691f44901ad0a8aebc71bc6d584e1874c773cf63ce6139a14bcc6df24b0d8d7aa5ac880b013d7591f56e37dea9f5dd396c013bf6d173bd7373ec1
diff --git a/app-emulation/spim/files/spim-8.0-r1-respect_env.patch b/app-emulation/spim/files/spim-8.0-r1-respect_env.patch
deleted file mode 100644
index 2d2ca0cf0f3d..000000000000
--- a/app-emulation/spim/files/spim-8.0-r1-respect_env.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- a/spim/Makefile	2010-08-01 22:14:53.352906061 +0200
-+++ b/spim/Makefile	2010-08-01 22:15:00.994905920 +0200
-@@ -66,13 +66,13 @@
- 
- 
- # Full path for the directory that will hold the executable files:
--BIN_DIR = /usr/local/bin
-+BIN_DIR = $(DESTDIR)/usr/bin
- 
- # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib/spim
-+EXCEPTION_DIR = $(DESTDIR)/var/lib/spim
- 
- # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/local/man/en
-+MAN_DIR = $(DESTDIR)/usr/share/man
- 
- 
- # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -104,11 +104,10 @@
- 
- DEFINES = $(ENDIAN) $(MEM_SIZES) -DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" -DSPIM_VERSION="\"`cat ../VERSION`\""
- 
--CC = gcc
--CFLAGS = -I. -I$(CPU_DIR) $(DEFINES) -g -Wall
-+CC ?= gcc
-+CFLAGS += -I. -I$(CPU_DIR) $(DEFINES) -Wall
- YFLAGS = -d --file-prefix=y
- YCFLAGS =
--LDFLAGS = -lm
- CSH = bash
- 
- # lex.yy.c is usually compiled with -O to speed it up.
-@@ -122,10 +121,10 @@
- 
- 
- spim:   force
--	make -f Makefile spim2
-+	$(MAKE) -f Makefile spim2
- 
- spim2:	$(OBJS) spim.o
--	$(CC) -g $(OBJS) spim.o $(LDFLAGS) -o spim -lm
-+	$(CC) $(OBJS) spim.o $(LDFLAGS) -o spim -lm
- 
- 
- force:	configuration
-@@ -143,19 +142,19 @@
- 	@echo
- 	@echo "Testing tt.bare.s:"
- 	$(CSH) -c "./spim -delayed_branches -delayed_loads -noexception -file $(TEST_DIR)/tt.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.core.s:"
- 	$(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.core.s < $(TEST_DIR)/tt.in >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.endian.s:"
- 	$(CSH) -c "./spim -ef $(CPU_DIR)/exceptions.s -file $(TEST_DIR)/tt.endian.s  >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 	@echo
- 
-@@ -166,13 +165,13 @@
- 	@echo
- 	@echo "Testing tt.alu.bare.s:"
- 	$(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.alu.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 
- 	@echo
- 	@echo "Testing tt.fpt.bare.s:"
- 	$(CSH) -c "./spim -bare -noexception -file $(TEST_DIR)/tt.fpu.bare.s >& test.out"
--	@tail -2 test.out
-+	@tail -n2 test.out
- 	@echo
- 	@echo
- 
-@@ -192,8 +191,6 @@
- 	install -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)/exceptions.s
- 
- install-man:
--	install -d $(MAN_DIR)
--	install -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)
- 
- very-clean: clean
- 	rm -f configuration
---- a/xspim/Makefile	2010-08-01 22:14:53.351905921 +0200
-+++ b/xspim/Makefile	2010-08-01 22:26:08.361917058 +0200
-@@ -169,18 +169,18 @@
- 
-          VARDBDIR = $(VARDIR)/lib
- 
--               AR = ar clq
-+               AR = $(AR) clq
- 
- # Nice try but useless: make will inherit BOOTSTRAPCFLAGS
- # from  top Makefile
-   BOOTSTRAPCFLAGS =
- 
--               CC = gcc -m32
--               AS = gcc -m32 -c -x assembler
-+               CC ?= gcc -m32
-+               AS ?= gcc -m32 -c -x assembler
- 
- .SUFFIXES: .cc
- 
--              CXX = c++ -m32
-+              CXX ?= c++ -m32
- 
-           CXXFILT = c++filt
- 
-@@ -199,14 +199,14 @@
-          COMPRESS = compress
-           GZIPCMD = gzip
- 
--              CPP = cpp $(STD_CPP_DEFINES)
--           RAWCPP = cpp -undef $(STD_CPP_OPTIONS)
--    PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
-+              CPP = $(CPP) $(STD_CPP_DEFINES)
-+           RAWCPP = $(CPP) -undef $(STD_CPP_OPTIONS)
-+    PREPROCESSCMD = $(CC) -E $(STD_CPP_DEFINES)
- 
-           INSTALL = install
-      INSTALLFLAGS = -c
- 
--               LD = gcc -m32 -nostdlib
-+               LD ?= $(CC) -nostdlib
- 
-               LEX = flex -l
-                M4 = m4
-@@ -270,18 +270,18 @@
-               COL = col
-          COLFLAGS = -b
- 
--            MODCC = gcc -m32
-+            MODCC ?= $(CC)
- 
--           MODCPP = cpp
-+           MODCPP = $(CPP)
-         MODCFLAGS = $(CFLAGS)
--            MODAS = gcc -m32 -c -x assembler
-+            MODAS ?= $(CC) -c -x assembler
-        MODASFLAGS =
- 
--            MODLD = gcc -m32 -nostdlib
-+            MODLD ?= $(CC) -nostdlib
- 
-        MODLDFLAGS =
- MODLDCOMBINEFLAGS = -r
--            MODAR = ar clq
-+            MODAR ?= $(AR) clq
- 
-         MODRANLIB = ranlib
- 
-@@ -330,7 +330,7 @@
- 
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
--           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+           CFLAGS += $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) 
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-          LDPRELIB =  $(INSTALLED_LIBS)
-         LDPOSTLIB =
-@@ -339,9 +339,9 @@
- 
-            LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
- 
--           CCLINK = $(CC)
-+           CCLINK = $(CC) $(LDFLAGS)
- 
--          CXXLINK = $(CXX)
-+          CXXLINK = $(CXX) $(LDFLAGS)
- 
-      LDSTRIPFLAGS = -x
-    LDCOMBINEFLAGS = -r
diff --git a/app-emulation/spim/files/xspim.svg b/app-emulation/spim/files/xspim.svg
deleted file mode 100644
index 4840b752e16a..000000000000
--- a/app-emulation/spim/files/xspim.svg
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.47pre1 r21720"
-   inkscape:export-filename="/home/maco/src/spim/spim-7.5/debian/16x16.png"
-   inkscape:export-xdpi="30"
-   inkscape:export-ydpi="30"
-   sodipodi:docname="icon.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5060">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3598">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3600" />
-      <stop
-         id="stop5056"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3602" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="linearGradient5070"
-       x1="52.067394"
-       y1="1029.1332"
-       x2="53.406746"
-       y2="1029.1332"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.4933245,-1.255617)" />
-    <filter
-       inkscape:collect="always"
-       id="filter5100"
-       x="-3.8212016"
-       width="8.6424033"
-       y="-0.029297812"
-       height="1.0585956">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.54030659"
-         id="feGaussianBlur5102" />
-    </filter>
-    <inkscape:perspective
-       id="perspective5112"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060-1"
-       id="linearGradient5070-5"
-       x1="52.067394"
-       y1="1029.1332"
-       x2="53.406746"
-       y2="1029.1332"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5.4933245,-1.255617)" />
-    <linearGradient
-       id="linearGradient5060-1">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5062-6" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5064-0" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter5100-9"
-       x="-3.8212016"
-       width="8.6424036"
-       y="-0.029297812"
-       height="1.0585957">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.54030659"
-         id="feGaussianBlur5102-1" />
-    </filter>
-    <linearGradient
-       y2="1029.1332"
-       x2="53.406746"
-       y1="1029.1332"
-       x1="52.067394"
-       gradientTransform="translate(17.106625,4.0807905)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5123"
-       xlink:href="#linearGradient5060-1"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3713695"
-     inkscape:cx="51.128112"
-     inkscape:cy="24.031581"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1278"
-     inkscape:window-height="770"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false"
-     inkscape:snap-grids="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid5169"
-       emppacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:none;stroke:url(#linearGradient5070);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5100)"
-       d="m 47.242591,1005.7474 c 0.02394,0.2045 -0.04024,0.4266 0,0.6278 0.0423,0.2116 0.135488,0.4132 0.156952,0.6279 0.03123,0.3123 0,0.6278 0,0.9417 0,0.7847 0,1.5695 0,2.3542 0,5.4411 0,10.8821 0,16.3231 0,1.8834 0,3.7668 0,5.6502 0,0.6279 0,1.2557 0,1.8835 0,0.2092 0.02311,0.4198 0,0.6278 -0.02946,0.2651 -0.123863,0.52 -0.156952,0.7847 -0.03894,0.3115 0,0.6278 0,0.9418 0,0.4185 0,0.837 0,1.2556 0,0.8894 0,1.7788 0,2.6682 0,0.3139 0.02842,0.6291 0,0.9417 -0.02415,0.2656 -0.130408,0.5193 -0.156952,0.7847 -0.02603,0.2603 0,0.5232 0,0.7848 0,0.2616 0,0.5232 0,0.7848 0,1.3602 0,2.7205 0,4.0807 0,0.074 -0.0071,0.7777 0,0.7848 0.03699,0.037 0.119958,-0.037 0.156952,0 0.005,0 0,0.4328 0,0.4708 0,0.2093 0,0.4186 0,0.6278 0,0.052 0,0.1047 0,0.157 0,0.052 0.05232,0.1569 0,0.1569 -0.05232,0 -0.03699,-0.1199 0,-0.1569 0.03699,-0.037 0.104635,0 0.156952,0"
-       id="path5058" />
-    <path
-       style="fill:none;stroke:url(#linearGradient5123);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter5100-9)"
-       d="m 69.842541,1011.0837 c 0.02394,0.2045 -0.04024,0.4266 0,0.6278 0.0423,0.2116 0.135488,0.4132 0.156952,0.6279 0.03123,0.3123 0,0.6278 0,0.9417 0,0.7847 0,1.5695 0,2.3542 0,5.4411 0,10.8821 0,16.3231 0,1.8834 0,3.7668 0,5.6502 0,0.6279 0,1.2557 0,1.8835 0,0.2092 0.02311,0.4198 0,0.6278 -0.02946,0.2651 -0.123863,0.52 -0.156952,0.7847 -0.03894,0.3115 0,0.6278 0,0.9418 0,0.4185 0,0.837 0,1.2556 0,0.8894 0,1.7788 0,2.6682 0,0.3139 0.02842,0.6291 0,0.9417 -0.02415,0.2656 -0.130408,0.5193 -0.156952,0.7847 -0.02603,0.2603 0,0.5232 0,0.7848 0,0.2616 0,0.5232 0,0.7848 0,1.3602 0,2.7205 0,4.0807 0,0.074 -0.0071,0.7777 0,0.7848 0.03699,0.037 0.119958,-0.037 0.156952,0 0.005,0 0,0.4328 0,0.4708 0,0.2093 0,0.4186 0,0.6278 0,0.052 0,0.1047 0,0.157 0,0.052 0.05232,0.1569 0,0.1569 -0.05232,0 -0.03699,-0.1199 0,-0.1569 0.03699,-0.037 0.104635,0 0.156952,0"
-       id="path5058-2"
-       transform="matrix(0.00689565,0.99997622,-0.99997622,0.00689565,1057.4614,973.82277)" />
-    <rect
-       style="fill:#4e9a06;stroke:#142701;stroke-opacity:1"
-       id="rect2816"
-       width="45"
-       height="45"
-       x="1.5777434"
-       y="1005.2093"
-       rx="1.365"
-       ry="1.3395145" />
-    <rect
-       style="fill:#555753;stroke:#2e3436;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3590"
-       width="26.054052"
-       height="25.426245"
-       x="10.829698"
-       y="1015.1646"
-       rx="1.365"
-       ry="1.3395145" />
-    <text
-       xml:space="preserve"
-       style="font-size:17.58400536px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="3.1478038"
-       y="1042.1913"
-       id="text3592"
-       transform="scale(1.0064984,0.99354354)"><tspan
-         sodipodi:role="line"
-         id="tspan3594"
-         x="3.1478038"
-         y="1042.1913">MIPS</tspan></text>
-  </g>
-</svg>
diff --git a/app-emulation/spim/metadata.xml b/app-emulation/spim/metadata.xml
deleted file mode 100644
index 956e906311b4..000000000000
--- a/app-emulation/spim/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A self-contained simulator that will run MIPS32 assembly language
-		programs.  It also provides a simple debugger and a minimal set of
-		operating system services.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">spimsimulator</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild
deleted file mode 100644
index a011ed2f09c8..000000000000
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs
-
-DESCRIPTION="MIPS Simulator"
-HOMEPAGE="http://spimsimulator.sourceforge.net/"
-SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc X"
-
-RDEPEND="
-	X? (
-		media-fonts/font-adobe-100dpi
-		x11-libs/libXaw
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	app-alternatives/yacc
-	X? ( x11-misc/imake )
-"
-
-# test hangs forever, disabling it
-RESTRICT="test"
-
-src_prepare() {
-	# fix bug #240005 and bug #243588
-	eapply "${FILESDIR}/${P}-r1-respect_env.patch"
-
-	# fix bug #330389
-	sed -i -e 's:-12-\*-75-:-14-\*-100-:g' xspim/xspim.c || die
-
-	default
-}
-
-src_configure() {
-	tc-export CC
-	emake -C spim configuration
-
-	if use X; then
-		emake -C xspim configuration
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${EPREFIX}" -C spim
-
-	if use X; then
-		emake DESTDIR="${EPREFIX}" EXCEPTION_DIR=/var/lib/spim \
-			-C xspim -j1 xspim
-	fi
-}
-
-src_test() {
-	emake -C spim test
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C spim install
-	newman Documentation/spim.man spim.1
-
-	if use X; then
-		emake DESTDIR="${ED}" -C xspim install
-		newman Documentation/xspim.man xspim.1
-	fi
-
-	doicon "${FILESDIR}"/xspim.svg
-	make_desktop_entry xspim xSPIM xspim "ComputerScience;Science;Education"
-
-	dodoc Documentation/SPIM.html
-	dodoc ChangeLog Documentation/BLURB README VERSION
-	if use doc ; then
-		dodoc Documentation/TeX/{cycle,spim}.ps
-	fi
-}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 9de77949cbed..85acd30321da 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -5,7 +5,7 @@ DIST VBoxGuestAdditions_7.1.2.iso 58839040 BLAKE2B 5fe5350d22a47fc9820e18de0a824
 DIST VBoxGuestAdditions_7.1.4.iso 59699200 BLAKE2B 79708a41f105ef651f7fb78f7d6b8aa8e6f8e7d4bd2275042e12f7657ab8023154b3c6c33984aba2a957bd002bf46f987a04757ad9238bd6ba394b1ac5f76f05 SHA512 2bf7556245c08c19d03354ecdff261eacd49b891bc5eb5bc4e112fb2deb9f89e6eb12a2bfcfb7fa0491e27583af44ff04a6a450e33195762d4a76dd4addbd7c2
 EBUILD virtualbox-additions-6.1.50.ebuild 567 BLAKE2B cfacfeed3e15bb0407abaf7b9584d37054ed47cff35bdc80b71f9a97af7a49534ec4ade228ea39e3801f94a25fe6fd872c698d811f14f7ae744e816a0ead9061 SHA512 1fd1aa81f3ff55ca2d71ca5384fdb2bf46c9cdf5bce89917089743a86b92caaf06ffc1e1cf844a10bd2259ebfb59417850eeabd75653cd613c3f64f85ce30c70
 EBUILD virtualbox-additions-7.0.20.ebuild 555 BLAKE2B 2b0398d65ffbc61bb3a6f5833ae5f5fc3bf4582df3caa78007b3da03d840cd2e455cd5bbbe81cbe6b0652613dd7d75acb7d0e0e04312b419717ac7c473ae6163 SHA512 7f10e29a7ee72d988c92228b64a769e00ef42292b26ce61e62182af93938f63489615009f8224b4fef8bd927ee6d24c6301496be50cc3efaa817423b4ac54e84
-EBUILD virtualbox-additions-7.0.22.ebuild 556 BLAKE2B 73f1560fb266d485e972ddc631bdae9aa25b7153ebfe43a242ed2391fe00782fd63ba91559f3f484da3c75c746128b2248dc57a00fee90d6704faed507d6e90f SHA512 50ef140eaf64677cac9c29ffd51cb48cbbfcb22e5c6bcc0ff2a87fb16621d53accab5aa805b85be62e3d0da3ff6f5b5e05d299621ac57b5914ab31042dfbb67f
+EBUILD virtualbox-additions-7.0.22.ebuild 555 BLAKE2B 2b0398d65ffbc61bb3a6f5833ae5f5fc3bf4582df3caa78007b3da03d840cd2e455cd5bbbe81cbe6b0652613dd7d75acb7d0e0e04312b419717ac7c473ae6163 SHA512 7f10e29a7ee72d988c92228b64a769e00ef42292b26ce61e62182af93938f63489615009f8224b4fef8bd927ee6d24c6301496be50cc3efaa817423b4ac54e84
 EBUILD virtualbox-additions-7.1.2.ebuild 576 BLAKE2B 419933ecb873ae67f95affc06086378acfbfb245ad6be2f08154e3613c120788e003b8148cfa13c6012356b906100fc01b0a01b3b8094dd0c48429f93a7c0bfb SHA512 d5841adebee160e71a0a3371c99990dd8a4f2b8436f760b9a0152b9b223274ddef68ce8656cd7707e77e40deb17ae2b13b5caab690dfefedcb067789f8eb6f80
 EBUILD virtualbox-additions-7.1.4.ebuild 576 BLAKE2B 419933ecb873ae67f95affc06086378acfbfb245ad6be2f08154e3613c120788e003b8148cfa13c6012356b906100fc01b0a01b3b8094dd0c48429f93a7c0bfb SHA512 d5841adebee160e71a0a3371c99990dd8a4f2b8436f760b9a0152b9b223274ddef68ce8656cd7707e77e40deb17ae2b13b5caab690dfefedcb067789f8eb6f80
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.22.ebuild
index 92124a9f779e..1cb70c695bbd 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.22.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.22.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3 || ( GPL-3 CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_unpack() {
 	return 0
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 40407c87ae72..4f081878e8f7 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -5,7 +5,7 @@ DIST Oracle_VirtualBox_Extension_Pack-7.1.2.tar.gz 22966287 BLAKE2B aa13d0945a2b
 DIST Oracle_VirtualBox_Extension_Pack-7.1.4.tar.gz 22966826 BLAKE2B 604299cdcd45fae188cb11fcc3657e30da09e4b2f35eecffda8ceaa150b875820453baae65c2b80b8a2700dc2285fe653c99d10288f2b1a637d3a97bfa381123 SHA512 7426c3a3ad11bc2b035b001ac4c364d830384865f486e83255344db0bbdcbb2f7597bd275b88f59f71e21a27481afd03a23f90c0718385fdac11a66bc4bd6a30
 EBUILD virtualbox-extpack-oracle-6.1.50.ebuild 742 BLAKE2B 687dfef72959968f610b73f55ad028e00e59fd9bf4ff7d9d60b77e704bf61395ff1680958455619c5afd2867be365e161e5845b03a53902a7a14f88b7887815a SHA512 00fd45d6068420328b559d7ab7ca491b8dde2b8b96e5bd8a7e46108cf980e38c660425020de6a58501d6b119443f80cbd64fc52ed223f5c9f3ecf8834cf52d02
 EBUILD virtualbox-extpack-oracle-7.0.20.ebuild 797 BLAKE2B 04bab98e17dd3519b1de3a2644a1f150f07bb1b555fb0b65bd8022fd99b71e5631dae91862847feecebb99d7ddac5656fac69e17ab33bb63be5a9c9bbb9a8aa5 SHA512 f28316b58160fcb3e55c72c928974dd1db6239220cc9f61510b9a6408adea2de0cc13faee7e91dcdbe5240eb19f542c85a78c0fea2ac2a2efd37ab0779d05d38
-EBUILD virtualbox-extpack-oracle-7.0.22.ebuild 798 BLAKE2B 44a1206f56d92807da770168cd25cb915a9afa2dd5d771835bcbe63d9244685b2f660a7e1f77b4e24ba4ee35b7c012eecdf2fc3f67b5915e994a8cb34bcce957 SHA512 0f62e25ac4aaa983706863ba84f831fdc41238373df0c8c18bf7071d7646b2ed8cb431367831326a43a7f393b6e29fa20c2711767067ee8e1227dea32020faa0
+EBUILD virtualbox-extpack-oracle-7.0.22.ebuild 797 BLAKE2B 04bab98e17dd3519b1de3a2644a1f150f07bb1b555fb0b65bd8022fd99b71e5631dae91862847feecebb99d7ddac5656fac69e17ab33bb63be5a9c9bbb9a8aa5 SHA512 f28316b58160fcb3e55c72c928974dd1db6239220cc9f61510b9a6408adea2de0cc13faee7e91dcdbe5240eb19f542c85a78c0fea2ac2a2efd37ab0779d05d38
 EBUILD virtualbox-extpack-oracle-7.1.2.ebuild 782 BLAKE2B bba57eaa3723a33d0f4020f6dc8ac4c7e10aaa16464c326d10dbbf20e7be57a3d4c72c07e23efdeb359cf7b17be22824eb9db3f700da54348b488da060fb3394 SHA512 72b27f8120af9f9501011fb6d88b6e5b76493a05af785aa33ec8217892cc7adbfb461bc60f143ba91a9c7126b8436e8565727a2275c0367ebf850bf6fd0b0dbb
 EBUILD virtualbox-extpack-oracle-7.1.4.ebuild 782 BLAKE2B bba57eaa3723a33d0f4020f6dc8ac4c7e10aaa16464c326d10dbbf20e7be57a3d4c72c07e23efdeb359cf7b17be22824eb9db3f700da54348b488da060fb3394 SHA512 72b27f8120af9f9501011fb6d88b6e5b76493a05af785aa33ec8217892cc7adbfb461bc60f143ba91a9c7126b8436e8565727a2275c0367ebf850bf6fd0b0dbb
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.22.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.22.ebuild
index 8c44669215ab..14864047f715 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.22.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.22.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="PUEL-11"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 645a082cb5d2..167c64f734fa 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -15,7 +15,7 @@ DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d
 DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c
 EBUILD virtualbox-guest-additions-6.1.50-r1.ebuild 7487 BLAKE2B 1473cc437f14f11d9a77c72b889ee0a872cacb58ec8919c4bb83a08000212d731864ce00533ca86c758764925f5a595d953d27942e0c0cda94e030a389905542 SHA512 070ea542766af91c52fea0c3835ddae7041d35a064d8a107f77b22a1361613c405b72307735f422abd84b8471626909bc128e91411dfd6188563df3ced777524
 EBUILD virtualbox-guest-additions-7.0.20.ebuild 7544 BLAKE2B 78aeb666e2db0db9e7d8120113e45ee31de38964492dbf725ff1256a817614f834cd546e680743e41a380abf97be97a7698ef0b874b182f069ce710dc6d0148a SHA512 fe700af6d72182109e7dd9dc96263b8b4f17aa381e35b3f196386b3effde9d65b4c4bb30e8c065585455a83240a00148276df38fd5e51c26d172c0bdc73ede20
-EBUILD virtualbox-guest-additions-7.0.22.ebuild 7546 BLAKE2B 9882dc2761761415a6a712696ae43602dbd54bfc190566d1e837ce84799d7e3cf1fe8e54829b01f9b4e8ea2c626cf2bee7824fc636a7808531d6d040d518bbc7 SHA512 d34317da19e8a5f8c2472ffc3511106acf118bdfd18b642cd1402b630541fc0dd80d179fc2d04956062b3ae2a4b64cd52cb9a22a6ab03b40da430b47f3ada1d7
+EBUILD virtualbox-guest-additions-7.0.22.ebuild 7544 BLAKE2B 78aeb666e2db0db9e7d8120113e45ee31de38964492dbf725ff1256a817614f834cd546e680743e41a380abf97be97a7698ef0b874b182f069ce710dc6d0148a SHA512 fe700af6d72182109e7dd9dc96263b8b4f17aa381e35b3f196386b3effde9d65b4c4bb30e8c065585455a83240a00148276df38fd5e51c26d172c0bdc73ede20
 EBUILD virtualbox-guest-additions-7.1.2.ebuild 7565 BLAKE2B d250ddfd0077966a80d702b5e2dedb43136acd1799a5f82fbecee6de8e6c6d121f868106c3aea0860bf26df449086be2cfdfb275ef04b82ea478d583e4791fc2 SHA512 b8effe4b04ad3babcd80274cda2b8ce97b0907063c8c865a421d8e19cfe7ed8c03bbc65c7f85be190955eea37419653eb4c08536ce7b61617024c655058a376f
 EBUILD virtualbox-guest-additions-7.1.4.ebuild 7565 BLAKE2B d250ddfd0077966a80d702b5e2dedb43136acd1799a5f82fbecee6de8e6c6d121f868106c3aea0860bf26df449086be2cfdfb275ef04b82ea478d583e4791fc2 SHA512 b8effe4b04ad3babcd80274cda2b8ce97b0907063c8c865a421d8e19cfe7ed8c03bbc65c7f85be190955eea37419653eb4c08536ce7b61617024c655058a376f
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.22.ebuild
index d04a4c8b8c76..b94640b41c20 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.22.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 # Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
 LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus gui"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index a5b66eaab3a6..d4246d9eadf2 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -8,7 +8,7 @@ DIST vbox-kernel-module-src-7.1.2.tar.xz 738328 BLAKE2B b38f6b3d28581d3c4153d04d
 DIST vbox-kernel-module-src-7.1.4.tar.xz 738112 BLAKE2B 4313b21cd96b0a89edccbcc6bd5402271121df3fb97452d3487ba8b6f07fc952034f8ffa10bfebbde765e6672515041be7a42335d64faece19ec813ec03ce84f SHA512 e4261575209afe28dbc5108d6fd15fb29760aab8e12a9bca14781a7287653aa4366c159fa6af3a8df8d6685846325e23ad82f1aae353c0ec42328933449e77af
 EBUILD virtualbox-modules-6.1.50-r2.ebuild 1052 BLAKE2B 0f1c43ab2798cc3231c78651a21b3f4bd75b168013ffedf9ecd8c049608c3fcce2e981d1609a8b42fd38d25db36caa48518ce37ed7fd6178a796472c7144bf20 SHA512 23801a41671154a5a89560bb3c23a0d41fde2352be6ace937f0c223c356b458b7df2585562b60c4a5294b2c74f3bc13b43ade175c4a42e8221ab38b86aa0bac5
 EBUILD virtualbox-modules-7.0.20.ebuild 941 BLAKE2B 23539d6f2c798b730f2f9afb007158672cabb6e199356b104c5e34b4f8e819e55f77ae1f303d655333cbc4351b67dc44735c131d59bb04031bc7c1b900d49c7b SHA512 379c3e216af76612970ca077c29a3c750de40c9a91dd288754cf55e7612e64227c261ffe2b0ccb8aef21f47ed1afac713295d6f7b063f27fa083715d311f7c75
-EBUILD virtualbox-modules-7.0.22-r1.ebuild 1395 BLAKE2B a60f65d10c144218c1595a2fa265fc162f90c83a81f877242338c084c836f50cacea5a961081b77735473a5ce93fb6bf208779bc8f074e62819ec89fc81b8f2a SHA512 37aaf573dad42c3923329b726b11ad1a3f33b97cfd2164fb258fcf8a73aaf25bb0b566e2369c77702b706aed6013995b8effd5ccb8c281b3af680d0c46e9ef91
+EBUILD virtualbox-modules-7.0.22-r1.ebuild 1394 BLAKE2B 8c71cf7f1564a043ec4cac85707c362db67653d6d46d168e7cbec089990b086e83036463af65e5f02837b74f9067e8a994552483abd8022bfeb5a93184e0458c SHA512 fa6c6925db3b104b3f10e7299f410c1a8a42eaf40d0f38f530d2611db4df5c6d53317bef1aae76fd6bc714a0221d43075deb23d9c383aabafedf136a1280eff2
 EBUILD virtualbox-modules-7.1.2.ebuild 942 BLAKE2B eefe2ce819d229a06584224a5f4ffe531e821df6dcc7b5f761d88605ab854880f9182a22d228953e2194d9a37191e6816fb5db4f87e3e10d324a42f71486ffce SHA512 181fece45985e074c73476473eba544a69151e6e2499e6162ca6019213aff95d6460d240890b01e24ff230eb87070d31f2ab9e595a21545a3020e9f4b1e7da34
 EBUILD virtualbox-modules-7.1.4-r1.ebuild 1395 BLAKE2B a60f65d10c144218c1595a2fa265fc162f90c83a81f877242338c084c836f50cacea5a961081b77735473a5ce93fb6bf208779bc8f074e62819ec89fc81b8f2a SHA512 37aaf573dad42c3923329b726b11ad1a3f33b97cfd2164fb258fcf8a73aaf25bb0b566e2369c77702b706aed6013995b8effd5ccb8c281b3af680d0c46e9ef91
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.22-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.22-r1.ebuild
index d94781cae808..66ff2b117945 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.22-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.22-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 281e37f16151..65f0f628a3f2 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -32,7 +32,7 @@ DIST virtualbox-patches-7.1.4.tar.bz2 6090 BLAKE2B c0edfd36c5e6e74c14180269d3bd9
 DIST virtualbox-patches-7.2.0_pre20241229.tar.bz2 6177 BLAKE2B 4f9d5280fbec82b8fc1d88a663c9285d1ee1e3a5c29dfeea862725f31d1c819cc8da057b9bd95f6d1e867421bad13f0d162acbaea4329f3e5bc8ca6dee8b0baa SHA512 f1dba1a709afa341ffb4012057c4531267f60f9db9bf63f49c235766e6257c0c846d48806179e0dd265be98798f51aab747fe6d96377134c0ca46ba3bd793253
 EBUILD virtualbox-6.1.50-r3.ebuild 18929 BLAKE2B 5361667320ccdc5534959f12f40665f7a8a19e8b09b0b172c3537bb0d93a7bb0117dc35114e27e7a6de35eefb0811aaf94c54568b32cd1dcc62524ec22d7b393 SHA512 54719ef39276acff779d399ed744d5aef88e6275dce7d06cec9fc611335d243b8dd1b817aea56fa5b93b96345f7b19dccdf8facdfc49e58d42524f9050ba7776
 EBUILD virtualbox-7.0.20.ebuild 20842 BLAKE2B ecbe8b10b4f87550cdd04b878009b5443d859f141b5b214cab7cb53c693ee00470e89140f6ee2c66a24435ceba7484ded028a9594b8a7a7594cd00cd59a4ca74 SHA512 9fc697f31fab0ffbea2ac94fe031400ce544d93069a720fc3871452d8074e97fd4a075603732ca1bb5441ddfccf95664f3b5f5ff44b2dd3be4554129121918ba
-EBUILD virtualbox-7.0.22.ebuild 21435 BLAKE2B bdfce53cb9a850400393d8cd3cd9b23b6fed927dae92dca02339526b110aa0ff161df992f609f97d6a7c4780a6aa614040453be90af69cb0849196ef66b42a3f SHA512 9ed429147ed55110a0c7fd52aa8cdf7f08f39e2e852e6ace8a6996c7d88c2c81d1a016ef7ba744a4164941647ef5be450de7fa25c9970add7d136ca593cafeb0
+EBUILD virtualbox-7.0.22.ebuild 21434 BLAKE2B fb52fc8b9bab76528eaac862c49c7abba17825d47ec60ba68d8ca627a53b39f0650f84b838bb41c20650178ce2b44123438264f6363f0448aa941ee3684d3e23 SHA512 4e081da1210560991d4620ea51ffdcedb4dd6425c37196c3524e99d79af3ff8aee587abce00f733953b0bbeff9f644ce2f36d72cfa7229cab6b99fc586ad9c9b
 EBUILD virtualbox-7.1.2.ebuild 21056 BLAKE2B 833942382aea99f46ee96c3a6c7e7d0b2249a95a294fb438b71fcae7da89bc612620f3b68cf07ba4d0d5d4c08c167b35dba71c44aa8da29dea5ec63b1e6544b9 SHA512 739a706265dbefe62af5985c134effe80c6a78d6928c3bb4ff10589b57441a783184b2fc27e50bc4d7296d8a9966f64cf24cde553e45e3771c7b29d3fdb73dd7
 EBUILD virtualbox-7.1.4.ebuild 21860 BLAKE2B 369d710e5651de6ec73d76ee5e5e7912da5f8e8e2917917622ff63c21061a2841a5bc73d44629522e055d360c85ad322520098da7d8c1c44d7e0555ee2be7fc9 SHA512 995390111bf51147a586baad9554fb331557733b5cae5c72039600ecae16f93b7ad245694025c36883a9eeac65d7e3c171d67228a3f4f40a7376940dff49c917
 EBUILD virtualbox-9999.ebuild 21810 BLAKE2B b2d394a5619989c6b27a400c0929f74dca5a135964dc090db3aced0b8f9bd2181386092b538864e9d2da40ad6266c45c2c3ecfc00bd988d53793be31572129c2 SHA512 64654dbe1ddc90b16f1711e3353500eea28ecd71039da8e3c00f1726cd901df5bca0054f6a4f429ee1b0141bfc95170eceaa93a6153507f5e30697fc3e2e3f15
diff --git a/app-emulation/virtualbox/virtualbox-7.0.22.ebuild b/app-emulation/virtualbox/virtualbox-7.0.22.ebuild
index 5e581fdb297a..9914f680db00 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.22.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde +vmmraw vnc"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index 33b9fd809935..7207410d6087 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -12,12 +12,10 @@ AUX wine-proton-9.0-rpath.patch 356 BLAKE2B f988fefb9590d1c8735f480349172b7c7634
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 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-3.tar.gz 49153588 BLAKE2B 81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae SHA512 1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f
 DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9
 EBUILD wine-proton-7.0.6.ebuild 13138 BLAKE2B d309ce8c55dc63f99f54205c9e7601decb0400cd73aa14fd7a10c2b3a45162a8abbb0b32ca8ba21d18637ffb75fe2ab88422c3d7a899679fcc459f1807173901 SHA512 90fcde31389524651e300680554ed27451eba0fb099599ea1a13ea10e24f9c147c8c3555c688262240db8ebc13c061541b841e8dd6d1966ea2d54a70141c8a93
 EBUILD wine-proton-8.0.5c.ebuild 14090 BLAKE2B bff5e2b5f272af1aeaa1ca0de729b71e2629a8006c0700e633ff189b29360a42c51ccdf2e34195a198787c1a30be1e2c98fd92204e0a4ade1f1fda643db0ba26 SHA512 519b265f61adeb062cb886ec1fe109371b40f9fefcf06d9143639141054f2037e1ec25adc832b35fba5f2de234aa1d470edf2500bf0656880be7d32f137d060a
 EBUILD wine-proton-9.0.2.ebuild 14990 BLAKE2B 88c90b9f79fcb843ddcbc976c5e731a778b7c422cefb488fd2a34ff3e5f00eb225d06ee88dc75803a8827da17eff72e60feecba5029974baa393e76ebecfc930 SHA512 cfa95408eedd6a3c121a4b469f3675dbf6aff717c7a405f1068ab02ce6411434dcde561a29fd63d92a32322f38989077ddd98c27ccc05c1f1c453a1a54a367c1
-EBUILD wine-proton-9.0.3.ebuild 14991 BLAKE2B fb49d46c896c8891f141ad42a6c0361f3160681c680a1aabfbe28826f9036f2d11c701d91c8d5309e044b94ef571846822c0b0c694a3905d5ff4902f0b765ecf SHA512 5cab481b8ab3e08948b803ee713af5b30996e659e2bcb713fcc03d4b33fd58599f9a87d9598242d6ce34fe9bafcc90fe919f7a79a36322444fedab4f6503edae
 EBUILD wine-proton-9.0.4.ebuild 14991 BLAKE2B 7b8f8fdfe9784b6d436d36a9258bec4c793ad8f80fa02ec69d50b11fbf3e2bb1b9a522d542517dbba31bc46b96a17ba7ce8a55fd916e6a13e8c2f180152ccc0e SHA512 960a21425ddc327854f3e608569104b2f10226c8309909c8d77fdd66be770d0fd7514de2d55cc6ba1cc7571eb68b73cedc8cb1c7329b542b5093ebfca7d03946
 EBUILD wine-proton-9999.ebuild 15118 BLAKE2B cbd7e649fe3887d2f8ef0c08f0c71c8d5ed7e34b41e24468ffe96658393f2839e2ba73cdc18d066a068756e31c7d47ce674137c38de2f428e77c7f523878775d SHA512 b4bd206699b1d4a9129e0d5a2b39bf506677868a670b660c038df3de9d2b0593029f7ba0faeae793cd09933f83a0b87cc88ae6df7ee6826f19a6bffea3119545
 MISC metadata.xml 1593 BLAKE2B 2e07980ce479dbb737394a5b74576925da936ca2ef5c0767b036cad7f56460ae0a6c73e8a416679f512a5195d037329ce9d3ace9808f68e024baf8640f462d94 SHA512 9f99896328a6337e7a2228977a3b7d853e78aef50a19ee40c43d18f657ead529553d7ea788bae1d408bd074f240cb555ba42558a54cd3ff8ab530b167e813d55
diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
deleted file mode 100644
index 1f038c794152..000000000000
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ /dev/null
@@ -1,448 +0,0 @@
-# Copyright 2022-2024 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.2.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
-)
-
-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() {
-	eselect wine update --if-unset || die
-}